Completed
Push — master ( 78c3e4...d34386 )
by vijay
65:32
created
app/Exceptions/Handler.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,6 +55,9 @@  discard block
 block discarded – undo
55 55
         }
56 56
     }
57 57
 
58
+    /**
59
+     * @param Exception $e
60
+     */
58 61
     protected function renderException($e) {
59 62
         switch ($e) {
60 63
 
@@ -101,8 +104,8 @@  discard block
 block discarded – undo
101 104
 
102 105
     /**
103 106
      * Common finction to render both types of codes
104
-     * @param type $request
105
-     * @param type $e
107
+     * @param \Illuminate\Http\Request $request
108
+     * @param Exception $e
106 109
      * @return type mixed
107 110
      */
108 111
     public function common($request, $e) {
Please login to merge, or discard this patch.
config/transform.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
     ],
64 64
     
65 65
     "subscription_over_mail"=>[
66
-         "name"=>"{{name}}",
66
+            "name"=>"{{name}}",
67 67
         "number"=>"{{number}}",
68 68
         "product"=>"{{product}}",
69 69
         "expiry"=>"{{expiry}}",
Please login to merge, or discard this patch.
app/Http/Controllers/Order/InvoiceController.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -94,27 +94,27 @@  discard block
 block discarded – undo
94 94
         //dd($this->invoice->get());
95 95
         //$invoice = \DB::table('invoices');
96 96
         return \Datatable::Collection($this->invoice->select('id', 'user_id', 'number', 'date', 'grand_total', 'status', 'created_at')->get())
97
-                        ->addColumn('#', function ($model) {
98
-                            return "<input type='checkbox' value=" . $model->id . ' name=select[] id=check>';
97
+                        ->addColumn('#', function($model) {
98
+                            return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
99 99
                         })
100
-                        ->addColumn('user_id', function ($model) {
100
+                        ->addColumn('user_id', function($model) {
101 101
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
102 102
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
103 103
                             $id = $this->user->where('id', $model->user_id)->first()->id;
104 104
 
105
-                            return '<a href=' . url('clients/' . $id) . '>' . ucfirst($first) . ' ' . ucfirst($last) . '</a>';
105
+                            return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
106 106
                         })
107 107
                         ->showColumns('number', 'created_at', 'grand_total', 'status')
108
-                        ->addColumn('action', function ($model) {
108
+                        ->addColumn('action', function($model) {
109 109
                             $action = '';
110 110
 
111 111
                             $check = $this->checkExecution($model->id);
112 112
                             if ($check == false) {
113
-                                $action = '<a href=' . url('order/execute?invoiceid=' . $model->id) . " class='btn btn-sm btn-primary'>Execute Order</a>";
113
+                                $action = '<a href='.url('order/execute?invoiceid='.$model->id)." class='btn btn-sm btn-primary'>Execute Order</a>";
114 114
                             }
115 115
 
116 116
 
117
-                            return '<a href=' . url('invoices/show?invoiceid=' . $model->id) . " class='btn btn-sm btn-primary'>View</a>"
117
+                            return '<a href='.url('invoices/show?invoiceid='.$model->id)." class='btn btn-sm btn-primary'>View</a>"
118 118
                                     . "   $action";
119 119
                         })
120 120
                         ->searchColumns('created_at', 'user_id', 'number', 'grand_total', 'status')
@@ -228,8 +228,8 @@  discard block
 block discarded – undo
228 228
             if (!empty($tax)) {
229 229
                 foreach ($tax as $key => $value) {
230 230
                     //dd($value);
231
-                    $tax_name .= $value['name'] . ',';
232
-                    $tax_rate .= $value['rate'] . ',';
231
+                    $tax_name .= $value['name'].',';
232
+                    $tax_rate .= $value['rate'].',';
233 233
                 }
234 234
             }
235 235
             //dd('dsjcgv');
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
 
333 333
             foreach ($cart->attributes['tax'] as $tax) {
334 334
                 //dd($tax['name']);
335
-                $tax_name .= $tax['name'] . ',';
336
-                $tax_percentage .= $tax['rate'] . ',';
335
+                $tax_name .= $tax['name'].',';
336
+                $tax_percentage .= $tax['rate'].',';
337 337
             }
338 338
 
339 339
 //            dd($tax_name);
@@ -407,8 +407,8 @@  discard block
 block discarded – undo
407 407
             if (!empty($tax)) {
408 408
                 foreach ($tax as $key => $value) {
409 409
                     //dd($value);
410
-                    $tax_name .= $value['name'] . ',';
411
-                    $tax_rate .= $value['rate'] . ',';
410
+                    $tax_name .= $value['name'].',';
411
+                    $tax_rate .= $value['rate'].',';
412 412
                 }
413 413
             }
414 414
             $subtotal = $this->calculateTotal($tax_rate, $subtotal);
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
             //return view('themes.default1.invoice.pdfinvoice', compact('invoiceItems', 'invoice', 'user'));
631 631
             $pdf = \PDF::loadView('themes.default1.invoice.newpdf', compact('invoiceItems', 'invoice', 'user'));
632 632
 
633
-            return $pdf->download($user->first_name . '-invoice.pdf');
633
+            return $pdf->download($user->first_name.'-invoice.pdf');
634 634
         } catch (\Exception $ex) {
635 635
             dd($ex);
636 636
             return redirect()->back()->with('fails', $ex->getMessage());
@@ -676,44 +676,44 @@  discard block
 block discarded – undo
676 676
                     } else {
677 677
                         echo "<div class='alert alert-danger alert-dismissable'>
678 678
                     <i class='fa fa-ban'></i>
679
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
679
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
680 680
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
681
-                        ' . \Lang::get('message.no-record') . '
681
+                        ' . \Lang::get('message.no-record').'
682 682
                 </div>';
683 683
                         //echo \Lang::get('message.no-record') . '  [id=>' . $id . ']';
684 684
                     }
685 685
                 }
686 686
                 echo "<div class='alert alert-success alert-dismissable'>
687 687
                     <i class='fa fa-ban'></i>
688
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.success') . '
688
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.success').'
689 689
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
690
-                        ' . \Lang::get('message.deleted-successfully') . '
690
+                        ' . \Lang::get('message.deleted-successfully').'
691 691
                 </div>';
692 692
             } else {
693 693
                 echo "<div class='alert alert-danger alert-dismissable'>
694 694
                     <i class='fa fa-ban'></i>
695
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
695
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
696 696
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
697
-                        ' . \Lang::get('message.select-a-row') . '
697
+                        ' . \Lang::get('message.select-a-row').'
698 698
                 </div>';
699 699
                 //echo \Lang::get('message.select-a-row');
700 700
             }
701 701
         } catch (\Exception $e) {
702 702
             echo "<div class='alert alert-danger alert-dismissable'>
703 703
                     <i class='fa fa-ban'></i>
704
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
704
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
705 705
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
706
-                        ' . $e->getMessage() . '
706
+                        ' . $e->getMessage().'
707 707
                 </div>';
708 708
         }
709 709
     }
710 710
 
711 711
     public function setDomain($productid, $domain) {
712 712
         try {
713
-            if (\Session::has('domain' . $productid)) {
714
-                \Session::forget('domain' . $productid);
713
+            if (\Session::has('domain'.$productid)) {
714
+                \Session::forget('domain'.$productid);
715 715
             }
716
-            \Session::put('domain' . $productid, $domain);
716
+            \Session::put('domain'.$productid, $domain);
717 717
         } catch (\Exception $ex) {
718 718
             throw new \Exception($ex->getMessage());
719 719
         }
@@ -721,8 +721,8 @@  discard block
 block discarded – undo
721 721
 
722 722
     public function domain($id) {
723 723
         try {
724
-            if (\Session::has('domain' . $id)) {
725
-                $domain = \Session::get('domain' . $id);
724
+            if (\Session::has('domain'.$id)) {
725
+                $domain = \Session::get('domain'.$id);
726 726
             } else {
727 727
                 $domain = '';
728 728
             }
@@ -868,25 +868,25 @@  discard block
 block discarded – undo
868 868
                     } else {
869 869
                         echo "<div class='alert alert-danger alert-dismissable'>
870 870
                     <i class='fa fa-ban'></i>
871
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
871
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
872 872
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
873
-                        ' . \Lang::get('message.no-record') . '
873
+                        ' . \Lang::get('message.no-record').'
874 874
                 </div>';
875 875
                         //echo \Lang::get('message.no-record') . '  [id=>' . $id . ']';
876 876
                     }
877 877
                 }
878 878
                 echo "<div class='alert alert-success alert-dismissable'>
879 879
                     <i class='fa fa-ban'></i>
880
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.success') . '
880
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.success').'
881 881
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
882
-                        ' . \Lang::get('message.deleted-successfully') . '
882
+                        ' . \Lang::get('message.deleted-successfully').'
883 883
                 </div>';
884 884
             } else {
885 885
                 echo "<div class='alert alert-danger alert-dismissable'>
886 886
                     <i class='fa fa-ban'></i>
887
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
887
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
888 888
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
889
-                        ' . \Lang::get('message.select-a-row') . '
889
+                        ' . \Lang::get('message.select-a-row').'
890 890
                 </div>';
891 891
                 //echo \Lang::get('message.select-a-row');
892 892
             }
@@ -894,9 +894,9 @@  discard block
 block discarded – undo
894 894
             dd($e);
895 895
             echo "<div class='alert alert-danger alert-dismissable'>
896 896
                     <i class='fa fa-ban'></i>
897
-                    <b>" . \Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
897
+                    <b>" . \Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
898 898
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
899
-                        ' . $e->getMessage() . '
899
+                        ' . $e->getMessage().'
900 900
                 </div>';
901 901
         }
902 902
     }
@@ -973,7 +973,7 @@  discard block
 block discarded – undo
973 973
         $subject = $template->name;
974 974
         $data = $template->data;
975 975
         $replace = [
976
-            'name' => $user->first_name . ' ' . $user->last_name,
976
+            'name' => $user->first_name.' '.$user->last_name,
977 977
             'number' => $number,
978 978
             'address' => $user->address,
979 979
             'invoiceurl' => $invoiceurl,
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
 
995 995
     public function invoiceUrl($invoiceid) {
996 996
 
997
-        $url = url('my-invoice/' . $invoiceid);
997
+        $url = url('my-invoice/'.$invoiceid);
998 998
         return $url;
999 999
     }
1000 1000
 
@@ -1004,27 +1004,27 @@  discard block
 block discarded – undo
1004 1004
         $content = "";
1005 1005
         if ($items->count() > 0) {
1006 1006
             foreach ($items as $item) {
1007
-                $content .= '<tr>' .
1008
-                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">' . $invoice->number . '</td>' .
1009
-                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">' . $item->product_name . '</td>' .
1010
-                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">'.$this->currency($invoiceid).' '. $item->subtotal . '</td>' .
1007
+                $content .= '<tr>'.
1008
+                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">'.$invoice->number.'</td>'.
1009
+                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">'.$item->product_name.'</td>'.
1010
+                        '<td style="border-bottom: 1px solid#ccc; color: #333; font-family: Arial,sans-serif; font-size: 14px; line-height: 20px; padding: 15px 8px;" valign="top">'.$this->currency($invoiceid).' '.$item->subtotal.'</td>'.
1011 1011
                         '</tr>';
1012 1012
             }
1013 1013
         }
1014 1014
         return $content;
1015 1015
     }
1016 1016
     
1017
-    public function currency($invoiceid){
1017
+    public function currency($invoiceid) {
1018 1018
         $invoice = $this->invoice->find($invoiceid);
1019 1019
         $currency_code = $invoice->currency;
1020 1020
         $cur = ' '; 
1021
-        if($invoice->grand_total==0){
1021
+        if ($invoice->grand_total == 0) {
1022 1022
             return $cur;
1023 1023
         }
1024
-        $currency = $this->currency->where('code',$currency_code)->first();
1025
-        if($currency){
1024
+        $currency = $this->currency->where('code', $currency_code)->first();
1025
+        if ($currency) {
1026 1026
             $cur = $currency->symbol;
1027
-            if(!$cur){
1027
+            if (!$cur) {
1028 1028
                 $cur = $currency->code;
1029 1029
             }
1030 1030
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Common/CronController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -412,11 +412,11 @@  discard block
 block discarded – undo
412 412
         //check in the settings
413 413
         $settings = new \App\Model\Common\Setting();
414 414
         $setting = $settings->where('id', 1)->first();
415
-        $url = url('renew/' . $sub);
415
+        $url = url('renew/'.$sub);
416 416
         //template
417 417
         $templates = new \App\Model\Common\Template();
418 418
         $temp_id = $setting->subscription_going_to_end_mail;
419
-        if($end<date('Y-m-d H:m:i')){
419
+        if ($end < date('Y-m-d H:m:i')) {
420 420
             $temp_id = $setting->subscription_over_mail;
421 421
         }
422 422
         $template = $templates->where('id', $temp_id)->first();
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
         $data = $template->data;
427 427
         $date = date_create($end);
428 428
         $end = date_format($date, 'l, F j, Y H:m A');
429
-        $replace = ['name' => ucfirst($user->first_name) . ' ' . ucfirst($user->last_name),
429
+        $replace = ['name' => ucfirst($user->first_name).' '.ucfirst($user->last_name),
430 430
             'expiry' => $end,
431 431
             'product' => $product,
432 432
             'number' => $order->number,
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
             $type = $temp_type->where('id', $type_id)->first()->name;
440 440
         }
441 441
         $templateController = new \App\Http\Controllers\Common\TemplateController();
442
-        $mail = $templateController->mailing($from, $to, $data, $subject, $replace,$type);
442
+        $mail = $templateController->mailing($from, $to, $data, $subject, $replace, $type);
443 443
         return $mail;
444 444
     }
445 445
 
Please login to merge, or discard this patch.
storage/fonts/Times-Italic.afm.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return array (
2
-  'codeToName' => 
3
-  array (
2
+    'codeToName' => 
3
+    array (
4 4
     32 => 'space',
5 5
     160 => 'space',
6 6
     33 => 'exclam',
@@ -218,35 +218,35 @@  discard block
 block discarded – undo
218 218
     158 => 'zcaron',
219 219
     185 => 'onesuperior',
220 220
     128 => 'Euro',
221
-  ),
222
-  'isUnicode' => false,
223
-  'FontName' => 'Times-Italic',
224
-  'FullName' => 'Times Italic',
225
-  'FamilyName' => 'Times',
226
-  'Weight' => 'Medium',
227
-  'ItalicAngle' => '-15.5',
228
-  'IsFixedPitch' => 'false',
229
-  'CharacterSet' => 'ExtendedRoman',
230
-  'FontBBox' => 
231
-  array (
221
+    ),
222
+    'isUnicode' => false,
223
+    'FontName' => 'Times-Italic',
224
+    'FullName' => 'Times Italic',
225
+    'FamilyName' => 'Times',
226
+    'Weight' => 'Medium',
227
+    'ItalicAngle' => '-15.5',
228
+    'IsFixedPitch' => 'false',
229
+    'CharacterSet' => 'ExtendedRoman',
230
+    'FontBBox' => 
231
+    array (
232 232
     0 => '-169',
233 233
     1 => '-217',
234 234
     2 => '1010',
235 235
     3 => '883',
236
-  ),
237
-  'UnderlinePosition' => '-100',
238
-  'UnderlineThickness' => '50',
239
-  'Version' => '002.000',
240
-  'EncodingScheme' => 'WinAnsiEncoding',
241
-  'CapHeight' => '653',
242
-  'XHeight' => '441',
243
-  'Ascender' => '683',
244
-  'Descender' => '-217',
245
-  'StdHW' => '32',
246
-  'StdVW' => '76',
247
-  'StartCharMetrics' => '317',
248
-  'C' => 
249
-  array (
236
+    ),
237
+    'UnderlinePosition' => '-100',
238
+    'UnderlineThickness' => '50',
239
+    'Version' => '002.000',
240
+    'EncodingScheme' => 'WinAnsiEncoding',
241
+    'CapHeight' => '653',
242
+    'XHeight' => '441',
243
+    'Ascender' => '683',
244
+    'Descender' => '-217',
245
+    'StdHW' => '32',
246
+    'StdVW' => '76',
247
+    'StartCharMetrics' => '317',
248
+    'C' => 
249
+    array (
250 250
     32 => 250,
251 251
     160 => 250,
252 252
     33 => 333,
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
     185 => 300,
564 564
     'imacron' => 278,
565 565
     128 => 500,
566
-  ),
567
-  'CIDtoGID_Compressed' => true,
568
-  'CIDtoGID' => 'eJwDAAAAAAE=',
569
-  '_version_' => 6,
566
+    ),
567
+    'CIDtoGID_Compressed' => true,
568
+    'CIDtoGID' => 'eJwDAAAAAAE=',
569
+    '_version_' => 6,
570 570
 );
571 571
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1
-<?php return array (
1
+<?php return array(
2 2
   'codeToName' => 
3
-  array (
3
+  array(
4 4
     32 => 'space',
5 5
     168 => 'dieresis',
6 6
     169 => 'copyright',
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
   'Ascender' => '857',
537 537
   'Descender' => '-143',
538 538
   'FontBBox' => 
539
-  array (
539
+  array(
540 540
     0 => '-11',
541 541
     1 => '-156',
542 542
     2 => '1291',
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
   ),
545 545
   'StartCharMetrics' => '557',
546 546
   'C' => 
547
-  array (
547
+  array(
548 548
     32 => 250,
549 549
     160 => 250,
550 550
     168 => 1000,
Please login to merge, or discard this patch.