Completed
Pull Request — development (#482)
by Ashutosh
19:30 queued 09:46
created
app/Http/Controllers/User/ClientController.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -75,18 +75,18 @@  discard block
 block discarded – undo
75 75
          $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
76 76
 
77 77
         return\ DataTables::of($user->get())
78
-                         ->addColumn('checkbox', function ($model) {
78
+                         ->addColumn('checkbox', function($model) {
79 79
                              return "<input type='checkbox' class='user_checkbox' 
80 80
                             value=".$model->id.' name=select[] id=check>';
81 81
                          })
82
-                        ->addColumn('first_name', function ($model) {
82
+                        ->addColumn('first_name', function($model) {
83 83
                             return '<a href='.url('clients/'.$model->id).'>'
84 84
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
85 85
                         })
86
-                         ->addColumn('email', function ($model) {
86
+                         ->addColumn('email', function($model) {
87 87
                              return $model->email;
88 88
                          })
89
-                          ->addColumn('created_at', function ($model) {
89
+                          ->addColumn('created_at', function($model) {
90 90
                               $ends = $model->created_at;
91 91
                               if ($ends) {
92 92
                                   $date = date_create($ends);
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                               return $end;
97 97
                           })
98 98
                         // ->showColumns('email', 'created_at')
99
-                        ->addColumn('active', function ($model) {
99
+                        ->addColumn('active', function($model) {
100 100
                             if ($model->active == 1) {
101 101
                                 $email = "<span class='glyphicon glyphicon-envelope'
102 102
                                  style='color:green' title='verified email'></span>";
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 
115 115
                             return $email.'&nbsp;&nbsp;'.$mobile;
116 116
                         })
117
-                        ->addColumn('action', function ($model) {
117
+                        ->addColumn('action', function($model) {
118 118
                             return '<a href='.url('clients/'.$model->id.'/edit')
119 119
                             ." class='btn btn-sm btn-primary btn-xs'>
120 120
                             <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>"
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                                     <i class='fa fa-eye' style='color:white;'> </i>&nbsp;&nbsp;View</a>";
124 124
                             // return 'hhhh';
125 125
                         })
126
-                        ->rawColumns(['checkbox', 'first_name', 'email',  'created_at', 'active', 'action'])
126
+                        ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action'])
127 127
                         ->make(true);
128 128
 
129 129
         // ->searchColumns('email', 'first_name')
Please login to merge, or discard this patch.
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -73,29 +73,29 @@  discard block
 block discarded – undo
73 73
         $position = $request->input('position');
74 74
 
75 75
         $user = $this->advanceSearch($name, $username, $company,
76
-         $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
76
+            $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
77 77
 
78 78
         return\ DataTables::of($user->get())
79
-                         ->addColumn('checkbox', function ($model) {
80
-                             return "<input type='checkbox' class='user_checkbox' 
79
+                            ->addColumn('checkbox', function ($model) {
80
+                                return "<input type='checkbox' class='user_checkbox' 
81 81
                             value=".$model->id.' name=select[] id=check>';
82
-                         })
82
+                            })
83 83
                         ->addColumn('first_name', function ($model) {
84 84
                             return '<a href='.url('clients/'.$model->id).'>'
85 85
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
86 86
                         })
87
-                         ->addColumn('email', function ($model) {
88
-                             return $model->email;
89
-                         })
90
-                          ->addColumn('created_at', function ($model) {
91
-                              $ends = $model->created_at;
92
-                              if ($ends) {
93
-                                  $date = date_create($ends);
94
-                                  $end = date_format($date, 'l, F j, Y H:m');
95
-                              }
96
-
97
-                              return $end;
98
-                          })
87
+                            ->addColumn('email', function ($model) {
88
+                                return $model->email;
89
+                            })
90
+                            ->addColumn('created_at', function ($model) {
91
+                                $ends = $model->created_at;
92
+                                if ($ends) {
93
+                                    $date = date_create($ends);
94
+                                    $end = date_format($date, 'l, F j, Y H:m');
95
+                                }
96
+
97
+                                return $end;
98
+                            })
99 99
                         // ->showColumns('email', 'created_at')
100 100
                         ->addColumn('active', function ($model) {
101 101
                             if ($model->active == 1) {
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
             return view('themes.default1.user.client.show',
210 210
                 compact('id', 'client', 'invoices', 'model_popup', 'orders',
211
-                 'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'extraAmt'));
211
+                    'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'extraAmt'));
212 212
         } catch (\Exception $ex) {
213 213
             app('log')->useDailyFiles(storage_path().'/logs/laravel.log');
214 214
             app('log')->info($ex->getMessage());
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
                 return \Response::json([]);
403 403
             }
404 404
             $users = User::where('email', 'LIKE', '%'.$term.'%')
405
-             ->orWhere('first_name', 'LIKE', '%'.$term.'%')
406
-             ->orWhere('last_name', 'LIKE', '%'.$term.'%')
407
-             ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
405
+                ->orWhere('first_name', 'LIKE', '%'.$term.'%')
406
+                ->orWhere('last_name', 'LIKE', '%'.$term.'%')
407
+                ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
408 408
             $formatted_tags = [];
409 409
 
410 410
             foreach ($users as $user) {
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
     }
421 421
 
422 422
     public function advanceSearch($name = '', $username = '', $company = '',
423
-     $mobile = '', $email = '', $country = '', $industry = '',
424
-      $company_type = '', $company_size = '', $role = '', $position = '')
423
+        $mobile = '', $email = '', $country = '', $industry = '',
424
+        $company_type = '', $company_size = '', $role = '', $position = '')
425 425
     {
426 426
         $join = \DB::table('users');
427 427
         $join = $this->getNamUserCom($join, $name, $username, $company);
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 
432 432
         $join = $join->orderBy('created_at', 'desc')
433 433
         ->select('id', 'first_name', 'last_name', 'email', 'created_at',
434
-         'active', 'mobile_verified', 'role', 'position');
434
+            'active', 'mobile_verified', 'role', 'position');
435 435
 
436 436
         return $join;
437 437
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Order/TaxRatesAndCodeExpiryController.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
                         '<td style="border-bottom: 1px solid#ccc; color: #333; 
184 184
                         font-family: Arial,sans-serif; font-size: 14px; line-height: 20px;
185 185
                          padding: 15px 8px;" valign="top">'.$this->currency($invoiceid).' '
186
-                         .$item->subtotal.'</td>'.
186
+                            .$item->subtotal.'</td>'.
187 187
                         '</tr>';
188 188
             }
189 189
         }
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
             $orders = $order->where('client', $clientid)->get();
281 281
 
282 282
             return view('themes.default1.invoice.editPayment', compact('amountReceived','clientid', 'client', 'invoices',  'orders',
283
-                  'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
283
+                    'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
284 284
         } catch (Exception $e) {
285 285
             Bugsnag::notifyException($e);
286 286
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -279,7 +279,7 @@
 block discarded – undo
279 279
             $currency = $client->currency;
280 280
             $orders = $order->where('client', $clientid)->get();
281 281
 
282
-            return view('themes.default1.invoice.editPayment', compact('amountReceived','clientid', 'client', 'invoices',  'orders',
282
+            return view('themes.default1.invoice.editPayment', compact('amountReceived', 'clientid', 'client', 'invoices', 'orders',
283 283
                   'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
284 284
         } catch (Exception $e) {
285 285
             Bugsnag::notifyException($e);
Please login to merge, or discard this patch.
app/Model/Order/Payment.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 {
9 9
     protected $table = 'payments';
10 10
     protected $fillable = ['parent_id', 'invoice_id', 'amount',
11
-     'payment_method', 'user_id', 'payment_status', 'created_at', 'amt_to_credit', ];
11
+        'payment_method', 'user_id', 'payment_status', 'created_at', 'amt_to_credit', ];
12 12
 
13 13
     public function invoice()
14 14
     {
Please login to merge, or discard this patch.