Test Setup Failed
Push — development ( d24cd2...0e86e7 )
by Ashutosh
08:42
created
app/Http/Controllers/Order/OrderController.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -105,16 +105,16 @@  discard block
 block discarded – undo
105 105
 
106 106
         return \DataTables::of($query->take(50))
107 107
                         ->setTotalRecords($query->count())
108
-                        ->addColumn('checkbox', function ($model) {
108
+                        ->addColumn('checkbox', function($model) {
109 109
                             return "<input type='checkbox' class='order_checkbox' value=".
110 110
                             $model->id.' name=select[] id=check>';
111 111
                         })
112
-                        ->addColumn('date', function ($model) {
112
+                        ->addColumn('date', function($model) {
113 113
                             $date = $model->created_at;
114 114
 
115 115
                             return "<span style='display:none'>$model->id</span>".$date;
116 116
                         })
117
-                        ->addColumn('client', function ($model) {
117
+                        ->addColumn('client', function($model) {
118 118
                             $user = $this->user->where('id', $model->client)->first();
119 119
                             $first = $user->first_name;
120 120
                             $last = $user->last_name;
@@ -122,28 +122,28 @@  discard block
 block discarded – undo
122 122
 
123 123
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>';
124 124
                         })
125
-                        ->addColumn('productname', function ($model) {
125
+                        ->addColumn('productname', function($model) {
126 126
                             $productid = ($model->product);
127 127
                             $productName = Product::where('id', $productid)->pluck('name')->first();
128 128
 
129 129
                             return $productName;
130 130
                         })
131
-                        ->addColumn('number', function ($model) {
131
+                        ->addColumn('number', function($model) {
132 132
                             return ucfirst($model->number);
133 133
                         })
134
-                        ->addColumn('price_override', function ($model) {
134
+                        ->addColumn('price_override', function($model) {
135 135
                             return ucfirst($model->price_override);
136 136
                         })
137
-                        ->addColumn('order_status', function ($model) {
137
+                        ->addColumn('order_status', function($model) {
138 138
                             return ucfirst($model->order_status);
139 139
                         })
140 140
                         // ->showColumns('number', 'price_override', 'order_status')
141
-                        ->addColumn('update_ends_at', function ($model) {
141
+                        ->addColumn('update_ends_at', function($model) {
142 142
                             $end = $this->getEndDate($model);
143 143
 
144 144
                             return $end;
145 145
                         })
146
-                        ->addColumn('action', function ($model) {
146
+                        ->addColumn('action', function($model) {
147 147
                             $sub = $model->subscription()->first();
148 148
                             $status = $this->checkInvoiceStatusByOrderId($model->id);
149 149
                             $url = $this->getUrl($model, $status, $sub);
@@ -151,30 +151,30 @@  discard block
 block discarded – undo
151 151
                             return $url;
152 152
                         })
153 153
 
154
-                         ->filterColumn('created_at', function ($query, $keyword) {
154
+                         ->filterColumn('created_at', function($query, $keyword) {
155 155
                              $sql = 'created_at like ?';
156 156
                              $query->whereRaw($sql, ["%{$keyword}%"]);
157 157
                          })
158 158
 
159
-                          ->filterColumn('client', function ($query, $keyword) {
159
+                          ->filterColumn('client', function($query, $keyword) {
160 160
                               $sql = 'client like ?';
161 161
                               $query->whereRaw($sql, ["%{$keyword}%"]);
162 162
                           })
163 163
 
164
-                           ->filterColumn('number', function ($query, $keyword) {
164
+                           ->filterColumn('number', function($query, $keyword) {
165 165
                                $sql = 'number like ?';
166 166
                                $query->whereRaw($sql, ["%{$keyword}%"]);
167 167
                            })
168
-                            ->filterColumn('price_override', function ($query, $keyword) {
168
+                            ->filterColumn('price_override', function($query, $keyword) {
169 169
                                 $sql = 'price_override like ?';
170 170
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
171 171
                             })
172
-                             ->filterColumn('order_status', function ($query, $keyword) {
172
+                             ->filterColumn('order_status', function($query, $keyword) {
173 173
                                  $sql = 'order_status like ?';
174 174
                                  $query->whereRaw($sql, ["%{$keyword}%"]);
175 175
                              })
176 176
 
177
-                              ->filterColumn('update_ends_at', function ($query, $keyword) {
177
+                              ->filterColumn('update_ends_at', function($query, $keyword) {
178 178
                                   $sql = 'update_ends_at like ?';
179 179
                                   $query->whereRaw($sql, ["%{$keyword}%"]);
180 180
                               })
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
             $licenseStatus = StatusSetting::pluck('license_status')->first();
226 226
        
227 227
             return view('themes.default1.order.show',
228
-                compact('invoiceItems', 'invoice', 'user', 'order', 'subscription','licenseStatus'));
228
+                compact('invoiceItems', 'invoice', 'user', 'order', 'subscription', 'licenseStatus'));
229 229
         } catch (\Exception $ex) {
230 230
             Bugsnag::notifyException($ex);
231 231
 
Please login to merge, or discard this patch.
app/Http/Controllers/Order/InvoiceController.php 3 patches
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
         $query = $this->advanceSearch($name, $invoice_no, $currency, $status, $from, $till);
130 130
 
131 131
         return \DataTables::of($query->take(100))
132
-         ->setTotalRecords($query->count())
132
+            ->setTotalRecords($query->count())
133 133
 
134
-         ->addColumn('checkbox', function ($model) {
135
-             return "<input type='checkbox' class='invoice_checkbox' 
134
+            ->addColumn('checkbox', function ($model) {
135
+                return "<input type='checkbox' class='invoice_checkbox' 
136 136
                             value=".$model->id.' name=select[] id=check>';
137
-         })
137
+            })
138 138
                         ->addColumn('user_id', function ($model) {
139 139
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
140 140
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 
143 143
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
144 144
                         })
145
-                         ->addColumn('number', function ($model) {
146
-                             return ucfirst($model->number);
147
-                         })
145
+                            ->addColumn('number', function ($model) {
146
+                                return ucfirst($model->number);
147
+                            })
148 148
 
149 149
                         ->addColumn('date', function ($model) {
150 150
                             $date = ($model->created_at);
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
152 152
                             return $date;
153 153
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
154 154
                         })
155
-                         ->addColumn('grand_total', function ($model) {
156
-                             return $model->grand_total;
157
-                         })
158
-                          ->addColumn('status', function ($model) {
159
-                              return ucfirst($model->status);
160
-                          })
155
+                            ->addColumn('grand_total', function ($model) {
156
+                                return $model->grand_total;
157
+                            })
158
+                            ->addColumn('status', function ($model) {
159
+                                return ucfirst($model->status);
160
+                            })
161 161
 
162 162
                         ->addColumn('action', function ($model) {
163 163
                             $action = '';
@@ -175,30 +175,30 @@  discard block
 block discarded – undo
175 175
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
176 176
                                     ."   $action";
177 177
                         })
178
-                         ->filterColumn('user_id', function ($query, $keyword) {
179
-                             $sql = 'first_name like ?';
180
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
181
-                         })
178
+                            ->filterColumn('user_id', function ($query, $keyword) {
179
+                                $sql = 'first_name like ?';
180
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
181
+                            })
182 182
 
183
-                          ->filterColumn('status', function ($query, $keyword) {
184
-                              $sql = 'status like ?';
185
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
186
-                          })
183
+                            ->filterColumn('status', function ($query, $keyword) {
184
+                                $sql = 'status like ?';
185
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
186
+                            })
187 187
 
188 188
                         ->filterColumn('number', function ($query, $keyword) {
189 189
                             $sql = 'number like ?';
190 190
                             $query->whereRaw($sql, ["%{$keyword}%"]);
191 191
                         })
192
-                         ->filterColumn('grand_total', function ($query, $keyword) {
193
-                             $sql = 'grand_total like ?';
194
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
195
-                         })
196
-                          ->filterColumn('date', function ($query, $keyword) {
197
-                              $sql = 'date like ?';
198
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
199
-                          })
200
-
201
-                         ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
192
+                            ->filterColumn('grand_total', function ($query, $keyword) {
193
+                                $sql = 'grand_total like ?';
194
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
195
+                            })
196
+                            ->filterColumn('date', function ($query, $keyword) {
197
+                                $sql = 'date like ?';
198
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
199
+                            })
200
+
201
+                            ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
202 202
                         ->make(true);
203 203
     }
204 204
 
@@ -270,8 +270,8 @@  discard block
 block discarded – undo
270 270
             $code = '';
271 271
             $codevalue = '';
272 272
             if(\Session::has('code')){//If coupon code is applied get it here from Session
273
-              $code = \Session::get('code');
274
-              $codevalue = \Session::get('codevalue');
273
+                $code = \Session::get('code');
274
+                $codevalue = \Session::get('codevalue');
275 275
             }
276 276
             $tax_rule = new \App\Model\Payment\TaxOption();
277 277
             $rule = $tax_rule->findOrFail(1);
@@ -297,8 +297,8 @@  discard block
 block discarded – undo
297 297
             
298 298
             $symbol = $attributes[0]['currency']['symbol'];
299 299
             $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number,
300
-             'date' => $date, 'discount'=>$codevalue,'grand_total' => $grand_total, 'coupon_code'=>$code,'status' => 'pending',
301
-             'currency'  => \Auth::user()->currency, ]);
300
+                'date' => $date, 'discount'=>$codevalue,'grand_total' => $grand_total, 'coupon_code'=>$code,'status' => 'pending',
301
+                'currency'  => \Auth::user()->currency, ]);
302 302
             foreach (\Cart::getContent() as $cart) {
303 303
                 $this->createInvoiceItems($invoice->id, $cart,$codevalue);
304 304
             }
@@ -403,8 +403,8 @@  discard block
 block discarded – undo
403 403
             //     $grand_total = $total;
404 404
             // }
405 405
             $grand_total = $this->getGrandTotal($code, $total, $cost, $productid, $currency);
406
-             $promo = $this->promotion->where('code', $code)->first();
407
-             $codeValue = $this->getCodeValue($promo,$code);//get coupon code value to be added to Invoice
406
+                $promo = $this->promotion->where('code', $code)->first();
407
+                $codeValue = $this->getCodeValue($promo,$code);//get coupon code value to be added to Invoice
408 408
             $grand_total = $qty * $grand_total;
409 409
             if ($grand_total == 0) {
410 410
                 $status = 'success';
@@ -421,11 +421,11 @@  discard block
 block discarded – undo
421 421
             $grand_total = \App\Http\Controllers\Front\CartController::rounding($grand_total);
422 422
 
423 423
             $invoice = Invoice::create(['user_id' => $user_id,'number' => $number, 'date' => $date,
424
-             'coupon_code'=>$code,'discount'=>$codeValue,
424
+                'coupon_code'=>$code,'discount'=>$codeValue,
425 425
                 'grand_total' => $grand_total,  'currency'  => $currency, 'status' => $status, 'description' => $description, ]);
426 426
 
427 427
             $items = $this->createInvoiceItemsByAdmin($invoice->id, $productid,
428
-             $code, $total, $currency, $qty, $agents, $plan, $user_id, $tax_name, $tax_rate);
428
+                $code, $total, $currency, $qty, $agents, $plan, $user_id, $tax_name, $tax_rate);
429 429
             $result = $this->getMessage($items, $user_id);
430 430
         } catch (\Exception $ex) {
431 431
             app('log')->info($ex->getMessage());
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
                 } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
502 502
 
503 503
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
504
-                     ->pluck('tax_classes_id')->first(); //In case of India when
504
+                        ->pluck('tax_classes_id')->first(); //In case of India when
505 505
                     //other tax is available and tax is not enabled
506 506
                     if ($taxClassId) {
507 507
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
@@ -569,10 +569,10 @@  discard block
 block discarded – undo
569 569
         foreach ($taxes as $key => $tax) {
570 570
             if ($taxes[0]) {
571 571
                 $tax_attribute[$key] = ['name' => $tax->name, 'name1' => $name1,
572
-                 'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
573
-                 'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
574
-                 'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
575
-                  'origin_state'               => $origin_state, ];
572
+                    'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
573
+                    'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
574
+                    'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
575
+                    'origin_state'               => $origin_state, ];
576 576
 
577 577
                 $rate = $tax->rate;
578 578
 
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             $from = $request->input('from');
109 109
             $till = $request->input('till');
110 110
 
111
-            return view('themes.default1.invoice.index', compact('name','invoice_no','status','currencies','currency_id','from',
111
+            return view('themes.default1.invoice.index', compact('name', 'invoice_no', 'status', 'currencies', 'currency_id', 'from',
112 112
 
113 113
                 'till'));
114 114
         } catch (\Exception $ex) {
@@ -131,35 +131,35 @@  discard block
 block discarded – undo
131 131
         return \DataTables::of($query->take(100))
132 132
          ->setTotalRecords($query->count())
133 133
 
134
-         ->addColumn('checkbox', function ($model) {
134
+         ->addColumn('checkbox', function($model) {
135 135
              return "<input type='checkbox' class='invoice_checkbox' 
136 136
                             value=".$model->id.' name=select[] id=check>';
137 137
          })
138
-                        ->addColumn('user_id', function ($model) {
138
+                        ->addColumn('user_id', function($model) {
139 139
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
140 140
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
141 141
                             $id = $this->user->where('id', $model->user_id)->first()->id;
142 142
 
143 143
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
144 144
                         })
145
-                         ->addColumn('number', function ($model) {
145
+                         ->addColumn('number', function($model) {
146 146
                              return ucfirst($model->number);
147 147
                          })
148 148
 
149
-                        ->addColumn('date', function ($model) {
149
+                        ->addColumn('date', function($model) {
150 150
                             $date = ($model->created_at);
151 151
 
152 152
                             return $date;
153 153
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
154 154
                         })
155
-                         ->addColumn('grand_total', function ($model) {
155
+                         ->addColumn('grand_total', function($model) {
156 156
                              return $model->grand_total;
157 157
                          })
158
-                          ->addColumn('status', function ($model) {
158
+                          ->addColumn('status', function($model) {
159 159
                               return ucfirst($model->status);
160 160
                           })
161 161
 
162
-                        ->addColumn('action', function ($model) {
162
+                        ->addColumn('action', function($model) {
163 163
                             $action = '';
164 164
 
165 165
                             $check = $this->checkExecution($model->id);
@@ -175,25 +175,25 @@  discard block
 block discarded – undo
175 175
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
176 176
                                     ."   $action";
177 177
                         })
178
-                         ->filterColumn('user_id', function ($query, $keyword) {
178
+                         ->filterColumn('user_id', function($query, $keyword) {
179 179
                              $sql = 'first_name like ?';
180 180
                              $query->whereRaw($sql, ["%{$keyword}%"]);
181 181
                          })
182 182
 
183
-                          ->filterColumn('status', function ($query, $keyword) {
183
+                          ->filterColumn('status', function($query, $keyword) {
184 184
                               $sql = 'status like ?';
185 185
                               $query->whereRaw($sql, ["%{$keyword}%"]);
186 186
                           })
187 187
 
188
-                        ->filterColumn('number', function ($query, $keyword) {
188
+                        ->filterColumn('number', function($query, $keyword) {
189 189
                             $sql = 'number like ?';
190 190
                             $query->whereRaw($sql, ["%{$keyword}%"]);
191 191
                         })
192
-                         ->filterColumn('grand_total', function ($query, $keyword) {
192
+                         ->filterColumn('grand_total', function($query, $keyword) {
193 193
                              $sql = 'grand_total like ?';
194 194
                              $query->whereRaw($sql, ["%{$keyword}%"]);
195 195
                          })
196
-                          ->filterColumn('date', function ($query, $keyword) {
196
+                          ->filterColumn('date', function($query, $keyword) {
197 197
                               $sql = 'date like ?';
198 198
                               $query->whereRaw($sql, ["%{$keyword}%"]);
199 199
                           })
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
         try {
270 270
             $code = '';
271 271
             $codevalue = '';
272
-            if(\Session::has('code')){//If coupon code is applied get it here from Session
272
+            if (\Session::has('code')) {//If coupon code is applied get it here from Session
273 273
               $code = \Session::get('code');
274 274
               $codevalue = \Session::get('codevalue');
275 275
             }
@@ -297,10 +297,10 @@  discard block
 block discarded – undo
297 297
             
298 298
             $symbol = $attributes[0]['currency']['symbol'];
299 299
             $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number,
300
-             'date' => $date, 'discount'=>$codevalue,'grand_total' => $grand_total, 'coupon_code'=>$code,'status' => 'pending',
300
+             'date' => $date, 'discount'=>$codevalue, 'grand_total' => $grand_total, 'coupon_code'=>$code, 'status' => 'pending',
301 301
              'currency'  => \Auth::user()->currency, ]);
302 302
             foreach (\Cart::getContent() as $cart) {
303
-                $this->createInvoiceItems($invoice->id, $cart,$codevalue);
303
+                $this->createInvoiceItems($invoice->id, $cart, $codevalue);
304 304
             }
305 305
             $this->sendMail($user_id, $invoice->id);
306 306
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
         }
314 314
     }
315 315
 
316
-    public function createInvoiceItems($invoiceid, $cart,$codevalue='')
316
+    public function createInvoiceItems($invoiceid, $cart, $codevalue = '')
317 317
     {
318 318
         try {
319 319
             $planid = 0;
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             // }
405 405
             $grand_total = $this->getGrandTotal($code, $total, $cost, $productid, $currency);
406 406
              $promo = $this->promotion->where('code', $code)->first();
407
-             $codeValue = $this->getCodeValue($promo,$code);//get coupon code value to be added to Invoice
407
+             $codeValue = $this->getCodeValue($promo, $code); //get coupon code value to be added to Invoice
408 408
             $grand_total = $qty * $grand_total;
409 409
             if ($grand_total == 0) {
410 410
                 $status = 'success';
@@ -420,9 +420,9 @@  discard block
 block discarded – undo
420 420
             $grand_total = $this->calculateTotal($tax_rate, $grand_total);
421 421
             $grand_total = \App\Http\Controllers\Front\CartController::rounding($grand_total);
422 422
 
423
-            $invoice = Invoice::create(['user_id' => $user_id,'number' => $number, 'date' => $date,
424
-             'coupon_code'=>$code,'discount'=>$codeValue,
425
-                'grand_total' => $grand_total,  'currency'  => $currency, 'status' => $status, 'description' => $description, ]);
423
+            $invoice = Invoice::create(['user_id' => $user_id, 'number' => $number, 'date' => $date,
424
+             'coupon_code'=>$code, 'discount'=>$codeValue,
425
+                'grand_total' => $grand_total, 'currency'  => $currency, 'status' => $status, 'description' => $description, ]);
426 426
 
427 427
             $items = $this->createInvoiceItemsByAdmin($invoice->id, $productid,
428 428
              $code, $total, $currency, $qty, $agents, $plan, $user_id, $tax_name, $tax_rate);
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -269,7 +269,8 @@  discard block
 block discarded – undo
269 269
         try {
270 270
             $code = '';
271 271
             $codevalue = '';
272
-            if(\Session::has('code')){//If coupon code is applied get it here from Session
272
+            if(\Session::has('code')) {
273
+//If coupon code is applied get it here from Session
273 274
               $code = \Session::get('code');
274 275
               $codevalue = \Session::get('codevalue');
275 276
             }
@@ -498,7 +499,8 @@  discard block
 block discarded – undo
498 499
             if ($this->tax_option->findOrFail(1)->inclusive == 0) {
499 500
                 if ($this->tax_option->findOrFail(1)->tax_enable == 1) {
500 501
                     $taxs = $this->getTaxWhenEnable($productid, $taxs[0], $userid);
501
-                } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
502
+                } elseif ($this->tax_option->tax_enable == 0) {
503
+//if tax_enable is 0
502 504
 
503 505
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
504 506
                      ->pluck('tax_classes_id')->first(); //In case of India when
@@ -507,13 +509,15 @@  discard block
 block discarded – undo
507 509
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
508 510
                         $taxs = $rate['taxes'];
509 511
                         $rate = $rate['rate'];
510
-                    } elseif ($geoip_country != 'IN') {//In case of other country
512
+                    } elseif ($geoip_country != 'IN') {
513
+//In case of other country
511 514
                         // when tax is available and tax is not enabled(Applicable
512 515
                         //when Global Tax class for any country and state is not there)
513 516
 
514 517
                         $taxClassId = Tax::where('state', $geoip_state)
515 518
                         ->orWhere('country', $geoip_country)->pluck('tax_classes_id')->first();
516
-                        if ($taxClassId) { //if state equals the user State
519
+                        if ($taxClassId) {
520
+//if state equals the user State
517 521
                             $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
518 522
                             $taxs = $rate['taxes'];
519 523
                             $rate = $rate['rate'];
@@ -555,11 +559,13 @@  discard block
 block discarded – undo
555 559
         $i_gst = 0;
556 560
         $ut_gst = 0;
557 561
         $state_code = '';
558
-        if ($user_state != '') {//Get the CGST,SGST,IGST,STATE_CODE of the user
562
+        if ($user_state != '') {
563
+//Get the CGST,SGST,IGST,STATE_CODE of the user
559 564
             $tax = $this->getTaxWhenState($user_state, $productid, $origin_state);
560 565
             $taxes = $tax['taxes'];
561 566
             $value = $tax['value'];
562
-        } else {//If user from other Country
567
+        } else {
568
+//If user from other Country
563 569
             $tax = $this->getTaxWhenOtherCountry($geoip_state, $geoip_country, $productid);
564 570
             $taxes = $tax['taxes'];
565 571
             $value = $tax['value'];
Please login to merge, or discard this patch.
app/Http/Controllers/Order/ExtendedOrderController.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -49,16 +49,16 @@  discard block
 block discarded – undo
49 49
             $this->domain($domain, $join);
50 50
 
51 51
             $join = $join->orderBy('created_at', 'desc')
52
-           ->select(
53
-               'orders.id',
54
-               'orders.created_at',
55
-               'client',
56
-               'price_override',
57
-               'order_status',
58
-               'product',
59
-               'number',
60
-               'serial_key'
61
-           );
52
+            ->select(
53
+                'orders.id',
54
+                'orders.created_at',
55
+                'client',
56
+                'price_override',
57
+                'order_status',
58
+                'product',
59
+                'number',
60
+                'serial_key'
61
+            );
62 62
 
63 63
             return $join;
64 64
         } catch (\Exception $ex) {
@@ -268,17 +268,17 @@  discard block
 block discarded – undo
268 268
                 case '1':
269 269
                    $lastFour = '000'.$agents;
270 270
                     break;
271
-                   case '2':
271
+                    case '2':
272 272
 
273 273
                     $lastFour = '00'.$agents;
274
-                     break;
275
-                      case '3':
274
+                        break;
275
+                        case '3':
276 276
                     $lastFour = '0'.$agents;
277
-                     break;
278
-                      case '4':
277
+                        break;
278
+                        case '4':
279 279
                     $lastFour = $agents;
280 280
 
281
-                     break;
281
+                        break;
282 282
                 default:
283 283
                     $lastFour = '0000';
284 284
                     break;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
 
63 63
             return $join;
64 64
         } catch (\Exception $ex) {
65
-            return redirect()->back()->with('fails',$ex->getMessage());
65
+            return redirect()->back()->with('fails', $ex->getMessage());
66 66
         }
67 67
     }
68 68
 
Please login to merge, or discard this patch.
app/Http/Controllers/Order/BaseOrderController.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
 
110 110
             if ($plan_id != 0) {
111 111
             $this->addSubscription($order->id, $plan_id, $version, $product, $serial_key);
112
-           }
112
+            }
113 113
 
114 114
             $this->sendOrderMail($user_id, $order->id, $item->id);
115 115
             //Update Subscriber To Mailchimp
116 116
             $mailchimpStatus = StatusSetting::pluck('mailchimp_status')->first();
117 117
             if ($mailchimpStatus == 1) {
118
-             $this->addtoMailchimp($product, $user_id, $item);
119
-           }
118
+                $this->addtoMailchimp($product, $user_id, $item);
119
+            }
120 120
 
121 121
         } catch (\Exception $ex) {
122 122
             Bugsnag::notifyException($ex);
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
         $data = $template->data;
295 295
         $replace = [
296 296
             'name'          => $user->first_name.' '.$user->last_name,
297
-             'serialkeyurl' => $myaccounturl,
297
+                'serialkeyurl' => $myaccounturl,
298 298
             'downloadurl'   => $downloadurl,
299 299
             'invoiceurl'    => $invoiceurl,
300 300
             'product'       => $product,
Please login to merge, or discard this patch.
app/Http/Controllers/Front/BaseClientController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         } catch (\Exception $e) {
182 182
             app('log')->error($e->getMessage());
183 183
             $result = [$e->getMessage()];
184
-            Bugsnag::notifyException( $result);
184
+            Bugsnag::notifyException($result);
185 185
 
186 186
             return response()->json(compact('result'), 500);
187 187
         }
@@ -203,27 +203,27 @@  discard block
 block discarded – undo
203 203
             }
204 204
 
205 205
             return \DataTables::of($invoices->get())
206
-             ->addColumn('number', function ($model) {
206
+             ->addColumn('number', function($model) {
207 207
                  return $model->number;
208 208
              })
209
-            ->addColumn('products', function ($model) {
209
+            ->addColumn('products', function($model) {
210 210
                 $invoice = $this->invoice->find($model->id);
211 211
                 $products = $invoice->invoiceItem()->pluck('product_name')->toArray();
212 212
 
213 213
                 return ucfirst(implode(',', $products));
214 214
             })
215
-            ->addColumn('date', function ($model) {
215
+            ->addColumn('date', function($model) {
216 216
                 $date = date_create($model->created_at);
217 217
 
218 218
                 return date_format($date, 'M j, Y, g:i a');
219 219
             })
220
-            ->addColumn('total', function ($model) {
220
+            ->addColumn('total', function($model) {
221 221
                 return currency_format($model->grand_total, $code = $model->currency);
222 222
             })
223
-            ->addColumn('status', function ($model) {
223
+            ->addColumn('status', function($model) {
224 224
                 return ucfirst($model->status);
225 225
             })
226
-            ->addColumn('action', function ($model) {
226
+            ->addColumn('action', function($model) {
227 227
                 if (\Auth::user()->role == 'admin') {
228 228
                     $url = '/invoices/show?invoiceid='.$model->id;
229 229
                 } else {
Please login to merge, or discard this patch.
app/Http/Controllers/Front/PageController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,17 +49,17 @@  discard block
 block discarded – undo
49 49
     public function getPages()
50 50
     {
51 51
         return \DataTables::of($this->page->get())
52
-                        ->addColumn('checkbox', function ($model) {
52
+                        ->addColumn('checkbox', function($model) {
53 53
                             return "<input type='checkbox' class='page_checkbox' 
54 54
                             value=".$model->id.' name=select[] id=check>';
55 55
                         })
56
-                        ->addColumn('name', function ($model) {
56
+                        ->addColumn('name', function($model) {
57 57
                             return ucfirst($model->name);
58 58
                         })
59
-                        ->addColumn('url', function ($model) {
59
+                        ->addColumn('url', function($model) {
60 60
                             return $model->url;
61 61
                         })
62
-                        ->addColumn('created_at', function ($model) {
62
+                        ->addColumn('created_at', function($model) {
63 63
                             $created = $model->created_at;
64 64
                             if ($created) {
65 65
                                 $date1 = new \DateTime($created);
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
                             return $createdate;
72 72
                         })
73 73
 
74
-                        ->addColumn('action', function ($model) {
74
+                        ->addColumn('action', function($model) {
75 75
                             return '<a href='.url('pages/'.$model->id.'/edit')
76 76
                             ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
77 77
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
78 78
                         })
79 79
 
80
-                          ->rawColumns(['checkbox', 'name', 'url',  'created_at', 'action'])
80
+                          ->rawColumns(['checkbox', 'name', 'url', 'created_at', 'action'])
81 81
                         ->make(true);
82 82
         // ->searchColumns('name', 'content')
83 83
                         // ->orderColumns('name')
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
             $selectedParent = $this->page->where('id', $id)->pluck('parent_page_id')->toArray();
110 110
             $parentName = $this->page->where('id', $selectedParent)->pluck('name', 'id')->toArray();
111 111
 
112
-            return view('themes.default1.front.page.edit', compact('parents', 'page', 'default', 'selectedDefault', 'publishingDate','selectedParent',
112
+            return view('themes.default1.front.page.edit', compact('parents', 'page', 'default', 'selectedDefault', 'publishingDate', 'selectedParent',
113 113
                 'parentName'));
114 114
         } catch (\Exception $ex) {
115 115
             return redirect()->back()->with('fails', $ex->getMessage());
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
             $trasform = [];
360 360
             $templates = $this->getTemplateOne($productsRelatedToGroup, $data, $trasform);
361 361
 
362
-            return view('themes.default1.common.template.shoppingcart', compact('templates','headline','tagline'));
362
+            return view('themes.default1.common.template.shoppingcart', compact('templates', 'headline', 'tagline'));
363 363
         } catch (\Exception $ex) {
364 364
             app('log')->error($ex->getMessage());
365 365
             Bugsnag::notifyException($ex);
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/BasePromotionController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
                 $planid = \Session::get('plan');
61 61
             }
62 62
             if (count(\Cart::getContent())) {
63
-                $product_price =  $cart_control->planCost($productid, $userid, $planid = '');
63
+                $product_price = $cart_control->planCost($productid, $userid, $planid = '');
64 64
             }
65 65
             $updated_price = $this->findCost($promotion_type, $promotion_value, $product_price, $productid);
66 66
 
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/PromotionController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                             ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
88 88
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
89 89
                         })
90
-                         ->rawColumns(['checkbox', 'code', 'products', 'action'])
90
+                            ->rawColumns(['checkbox', 'code', 'products', 'action'])
91 91
 
92 92
                         ->make(true);
93 93
     }
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
                 'price'     => $value,
284 284
                 'conditions' => $coupon,
285 285
              
286
-           // new item price, price can also be a string format like so: '98.67'
286
+            // new item price, price can also be a string format like so: '98.67'
287 287
                 ]);
288 288
                 \Session::put('usage', 1);
289 289
                 \Session::put('code', $promo->code);
Please login to merge, or discard this patch.
app/Http/Controllers/User/AdminOrderInvoiceController.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -32,32 +32,32 @@  discard block
 block discarded – undo
32 32
                         ->addColumn('total', function ($model) use ($client) {
33 33
                             return currency_format($model->grand_total, $code = $client->currency);
34 34
                         })
35
-                         ->addColumn('paid', function ($model) use ($client) {
36
-                             $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
37
-                             $c = count($payment);
38
-                             $sum = 0;
35
+                            ->addColumn('paid', function ($model) use ($client) {
36
+                                $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
37
+                                $c = count($payment);
38
+                                $sum = 0;
39 39
 
40 40
                             for ($i=0; $i <= $c-1; $i++) {
41 41
                                 $sum = $sum + $payment[$i]->amount;
42 42
                             }
43 43
 
44
-                             return currency_format($sum, $code = $client->currency);
45
-                         })
46
-                         ->addColumn('balance', function ($model) use ($client) {
47
-                             $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
48
-                             $c = count($payment);
49
-                             $sum = 0;
44
+                                return currency_format($sum, $code = $client->currency);
45
+                            })
46
+                            ->addColumn('balance', function ($model) use ($client) {
47
+                                $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
48
+                                $c = count($payment);
49
+                                $sum = 0;
50 50
 
51 51
                             for ($i=0; $i <= $c-1; $i++) {
52 52
                                 $sum = $sum + $payment[$i]->amount;
53 53
                             }
54
-                             $pendingAmount = ($model->grand_total)-($sum);
54
+                                $pendingAmount = ($model->grand_total)-($sum);
55 55
 
56
-                             return currency_format($pendingAmount, $code = $client->currency);
57
-                         })
58
-                          ->addColumn('status', function ($model) {
59
-                              return $model->status;
60
-                          })
56
+                                return currency_format($pendingAmount, $code = $client->currency);
57
+                            })
58
+                            ->addColumn('status', function ($model) {
59
+                                return $model->status;
60
+                            })
61 61
                         ->addColumn('action', function ($model) {
62 62
                             $action = '';
63 63
                             $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController();
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
79 79
                                     ."   $editAction $action";
80 80
                         })
81
-                         ->rawColumns(['checkbox', 'date', 'invoice_no', 'total', 'paid', 'balance', 'status', 'action'])
81
+                            ->rawColumns(['checkbox', 'date', 'invoice_no', 'total', 'paid', 'balance', 'status', 'action'])
82 82
                         ->make(true);
83 83
     }
84 84
 
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
 
107 107
                             return $number;
108 108
                         })
109
-                         ->addColumn('total', function ($model) use ($client) {
110
-                             $price = currency_format($model->price_override, $code = $client->currency);
109
+                            ->addColumn('total', function ($model) use ($client) {
110
+                                $price = currency_format($model->price_override, $code = $client->currency);
111 111
 
112
-                             return $price;
113
-                         })
114
-                         ->addColumn('status', function ($model) {
115
-                             $status = $model->order_status;
112
+                                return $price;
113
+                            })
114
+                            ->addColumn('status', function ($model) {
115
+                                $status = $model->order_status;
116 116
 
117
-                             return $status;
118
-                         })
117
+                                return $status;
118
+                            })
119 119
                         ->addColumn('action', function ($model) {
120 120
                             return '<a href='.url('orders/'.$model->id)." 
121 121
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye' 
@@ -151,32 +151,32 @@  discard block
 block discarded – undo
151 151
                             return $model->payment_method;
152 152
                         })
153 153
 
154
-                         ->addColumn('total', function ($model) use ($client, $extraAmt) {
154
+                            ->addColumn('total', function ($model) use ($client, $extraAmt) {
155 155
                             if ($model->invoice_id == 0) {
156 156
                                 $amount = currency_format($extraAmt, $code = $client->currency);
157 157
                             } else {
158 158
                                 $amount = currency_format($model->amount, $code = $client->currency);
159 159
                             }
160 160
 
161
-                             return $amount;
162
-                         })
163
-                         ->addColumn('status', function ($model) {
164
-                             return ucfirst($model->payment_status);
165
-                         })
161
+                                return $amount;
162
+                            })
163
+                            ->addColumn('status', function ($model) {
164
+                                return ucfirst($model->payment_status);
165
+                            })
166 166
 
167
-                         ->addColumn('action', function ($model) {
168
-                             '<input type="hidden" class="paymentid" value="{{$model->id}}">';
167
+                            ->addColumn('action', function ($model) {
168
+                                '<input type="hidden" class="paymentid" value="{{$model->id}}">';
169 169
                             if ($model->invoice_id == 0) {
170 170
                                 return '<a href='.url("payments/".$model->id."/edit/")." class='btn btn-sm btn-primary btn-xs'> <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
171 171
                                 ;
172 172
                             } else {
173 173
                                 return '--';
174 174
                             }
175
-                         })
175
+                            })
176 176
                             
177 177
                       
178 178
                         ->rawColumns(['checkbox', 'invoice_no', 'date', 'payment_method', 'total', 'status','action'])
179 179
 
180 180
                         ->make(true);
181
-     }
181
+        }
182 182
 }
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
         $invoices = $invoice->where('user_id', $id)->orderBy('created_at', 'desc')->get();
15 15
 
16 16
         return\ DataTables::of($invoices)
17
-                        ->addColumn('checkbox', function ($model) {
17
+                        ->addColumn('checkbox', function($model) {
18 18
                             return "<input type='checkbox' class='invoice_checkbox' 
19 19
                             value=".$model->id.' name=select[] id=check>';
20 20
                         })
21
-                        ->addColumn('date', function ($model) use ($client) {
21
+                        ->addColumn('date', function($model) use ($client) {
22 22
                             $date1 = new \DateTime($model->date);
23 23
                             $tz = $client->timezone()->first()->name;
24 24
                             $date1->setTimezone(new \DateTimeZone($tz));
@@ -26,39 +26,39 @@  discard block
 block discarded – undo
26 26
 
27 27
                             return $date;
28 28
                         })
29
-                        ->addColumn('invoice_no', function ($model) {
29
+                        ->addColumn('invoice_no', function($model) {
30 30
                             return      '<a href='.url('invoices/show?invoiceid='.$model->id).'>'.$model->number.'</a>';
31 31
                         })
32
-                        ->addColumn('total', function ($model) use ($client) {
32
+                        ->addColumn('total', function($model) use ($client) {
33 33
                             return currency_format($model->grand_total, $code = $client->currency);
34 34
                         })
35
-                         ->addColumn('paid', function ($model) use ($client) {
35
+                         ->addColumn('paid', function($model) use ($client) {
36 36
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
37 37
                              $c = count($payment);
38 38
                              $sum = 0;
39 39
 
40
-                            for ($i=0; $i <= $c-1; $i++) {
40
+                            for ($i = 0; $i <= $c - 1; $i++) {
41 41
                                 $sum = $sum + $payment[$i]->amount;
42 42
                             }
43 43
 
44 44
                              return currency_format($sum, $code = $client->currency);
45 45
                          })
46
-                         ->addColumn('balance', function ($model) use ($client) {
46
+                         ->addColumn('balance', function($model) use ($client) {
47 47
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
48 48
                              $c = count($payment);
49 49
                              $sum = 0;
50 50
 
51
-                            for ($i=0; $i <= $c-1; $i++) {
51
+                            for ($i = 0; $i <= $c - 1; $i++) {
52 52
                                 $sum = $sum + $payment[$i]->amount;
53 53
                             }
54
-                             $pendingAmount = ($model->grand_total)-($sum);
54
+                             $pendingAmount = ($model->grand_total) - ($sum);
55 55
 
56 56
                              return currency_format($pendingAmount, $code = $client->currency);
57 57
                          })
58
-                          ->addColumn('status', function ($model) {
58
+                          ->addColumn('status', function($model) {
59 59
                               return $model->status;
60 60
                           })
61
-                        ->addColumn('action', function ($model) {
61
+                        ->addColumn('action', function($model) {
62 62
                             $action = '';
63 63
                             $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController();
64 64
                             $check = $cont->checkExecution($model->id);
@@ -88,35 +88,35 @@  discard block
 block discarded – undo
88 88
         $order = $client->order()->orderBy('created_at', 'desc')->get();
89 89
 
90 90
         return\ DataTables::of($order)
91
-                        ->addColumn('checkbox', function ($model) {
91
+                        ->addColumn('checkbox', function($model) {
92 92
                             return "<input type='checkbox' class='order_checkbox' 
93 93
                             value=".$model->id.' name=select[] id=checkorder>';
94 94
                         })
95
-                        ->addColumn('date', function ($model) {
95
+                        ->addColumn('date', function($model) {
96 96
                             return ucfirst($model->created_at);
97 97
                         })
98
-                        ->addColumn('product', function ($model) {
98
+                        ->addColumn('product', function($model) {
99 99
                             $productName = $model->product()->first() && $model->product()->first()->name ?
100 100
                             $model->product()->first()->name : 'Unknown';
101 101
 
102 102
                             return $productName;
103 103
                         })
104
-                        ->addColumn('number', function ($model) {
104
+                        ->addColumn('number', function($model) {
105 105
                             $number = $model->number;
106 106
 
107 107
                             return $number;
108 108
                         })
109
-                         ->addColumn('total', function ($model) use ($client) {
109
+                         ->addColumn('total', function($model) use ($client) {
110 110
                              $price = currency_format($model->price_override, $code = $client->currency);
111 111
 
112 112
                              return $price;
113 113
                          })
114
-                         ->addColumn('status', function ($model) {
114
+                         ->addColumn('status', function($model) {
115 115
                              $status = $model->order_status;
116 116
 
117 117
                              return $status;
118 118
                          })
119
-                        ->addColumn('action', function ($model) {
119
+                        ->addColumn('action', function($model) {
120 120
                             return '<a href='.url('orders/'.$model->id)." 
121 121
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye' 
122 122
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>";
@@ -133,25 +133,25 @@  discard block
 block discarded – undo
133 133
         $extraAmt = $this->getExtraAmtPaid($id);
134 134
 
135 135
         return\ DataTables::of($payments)
136
-                        ->addColumn('checkbox', function ($model) {
136
+                        ->addColumn('checkbox', function($model) {
137 137
                             return "<input type='checkbox' class='payment_checkbox' 
138 138
                             value=".$model->id.' name=select[] id=checkpayment>';
139 139
                         })
140
-                        ->addColumn('invoice_no', function ($model) {
140
+                        ->addColumn('invoice_no', function($model) {
141 141
                             return $model->invoice()->first() ? $model->invoice()->first()->number : '--';
142 142
                         })
143
-                        ->addColumn('date', function ($model) {
143
+                        ->addColumn('date', function($model) {
144 144
                             $date = $model->created_at;
145 145
                             $date1 = new \DateTime($date);
146 146
                             $date = $date1->format('M j, Y, g:i a ');
147 147
 
148 148
                             return $date;
149 149
                         })
150
-                        ->addColumn('payment_method', function ($model) {
150
+                        ->addColumn('payment_method', function($model) {
151 151
                             return $model->payment_method;
152 152
                         })
153 153
 
154
-                         ->addColumn('total', function ($model) use ($client, $extraAmt) {
154
+                         ->addColumn('total', function($model) use ($client, $extraAmt) {
155 155
                             if ($model->invoice_id == 0) {
156 156
                                 $amount = currency_format($extraAmt, $code = $client->currency);
157 157
                             } else {
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
160 160
 
161 161
                              return $amount;
162 162
                          })
163
-                         ->addColumn('status', function ($model) {
163
+                         ->addColumn('status', function($model) {
164 164
                              return ucfirst($model->payment_status);
165 165
                          })
166 166
 
167
-                         ->addColumn('action', function ($model) {
167
+                         ->addColumn('action', function($model) {
168 168
                              '<input type="hidden" class="paymentid" value="{{$model->id}}">';
169 169
                             if ($model->invoice_id == 0) {
170 170
                                 return '<a href='.url("payments/".$model->id."/edit/")." class='btn btn-sm btn-primary btn-xs'> <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
                          })
176 176
                             
177 177
                       
178
-                        ->rawColumns(['checkbox', 'invoice_no', 'date', 'payment_method', 'total', 'status','action'])
178
+                        ->rawColumns(['checkbox', 'invoice_no', 'date', 'payment_method', 'total', 'status', 'action'])
179 179
 
180 180
                         ->make(true);
181 181
      }
Please login to merge, or discard this patch.