ladybirdweb / agorainvoicing

app/Http/Controllers/RazorpayController.php

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,8 @@
         $api = new Api($rzp_key, $rzp_secret);
         $payment = $api->payment->fetch($input['razorpay_payment_id']);
 
-        if (count($input) && !empty($input['razorpay_payment_id'])) { //Verify Razorpay Payment Id and Signature
+        if (count($input) && !empty($input['razorpay_payment_id'])) {
+//Verify Razorpay Payment Id and Signature
 
             //Fetch payment information by razorpay_payment_id
             try {

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
         \Cart::clear();
         $status = 'success';
         $message = view('themes.default1.front.postPaymentTemplate', compact('invoice','date','orders',
-             'invoiceItems', 'state', 'currency'))->render();
+                'invoiceItems', 'state', 'currency'))->render();
 
         return ['status'=>$status, 'message'=>$message];
     }

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 
         \Cart::clear();
         $status = 'success';
-        $message = view('themes.default1.front.postPaymentTemplate', compact('invoice','date','orders',
+        $message = view('themes.default1.front.postPaymentTemplate', compact('invoice', 'date', 'orders',
              'invoiceItems', 'state', 'currency'))->render();
 
         return ['status'=>$status, 'message'=>$message];
@@ -147,7 +147,7 @@ 
         \Cart::clear();
         $status = 'success';
 
-        $message = view('themes.default1.front.postRenewTemplate', compact('invoice','date','order',
+        $message = view('themes.default1.front.postRenewTemplate', compact('invoice', 'date', 'order',
             'product', 'invoiceItem', 'state', 'currency'))->render();
 
         return ['status'=>$status, 'message'=>$message];

app/Model/Payment/PlanPrice.php

Indentation +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
         return '';
 
         // return "Product  has been {$eventName}";
-         // \Auth::user()->activity;
+            // \Auth::user()->activity;
     }
 }

app/Model/Payment/TaxOption.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     protected $fillable = ['tax_enable', 'inclusive', 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no'];
     protected static $logName = 'Tax Class';
     protected static $logAttributes = ['tax_enable', 'inclusive',
-     'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no', ];
+        'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no', ];
     protected static $logOnlyDirty = true;
 
     public function getDescriptionForEvent(string $eventName): string

app/Http/Controllers/Order/BaseInvoiceController.php

Braces +10 added lines, -5 removed lines

@@ -86,7 +86,8 @@ 
         $i_gst = $user_state->i_gst;
         $ut_gst = $user_state->ut_gst;
         $state_code = $user_state->state_code;
-        if ($state_code == $origin_state) {//If user and origin state are same
+        if ($state_code == $origin_state) {
+//If user and origin state are same
             $taxClassId = TaxClass::where('name', 'Intra State GST')
              ->pluck('id')->toArray(); //Get the class Id  of state
             if ($taxClassId) {
@@ -95,7 +96,8 @@ 
             } else {
                 $taxes = [0];
             }
-        } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {//If user is from other state
+        } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {
+//If user is from other state
 
             $taxClassId = TaxClass::where('name', 'Inter State GST')
             ->pluck('id')->toArray(); //Get the class Id  of state
@@ -105,7 +107,8 @@ 
             } else {
                 $taxes = [0];
             }
-        } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {//if user from Union Territory
+        } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {
+//if user from Union Territory
             $taxClassId = TaxClass::where('name', 'Union Territory GST')
         ->pluck('id')->toArray(); //Get the class Id  of state
             if ($taxClassId) {
@@ -130,14 +133,16 @@ 
         ->pluck('tax_classes_id')->first();
         $value = '';
         $rate = '';
-        if ($taxClassId) { //if state equals the user State
+        if ($taxClassId) {
+//if state equals the user State
 
             $taxes = $cartController->getTaxByPriority($taxClassId);
 
             // $taxes = $this->cartController::getTaxByPriority($taxClassId);
             $value = $cartController->getValueForOthers($productid, $taxClassId, $taxes);
             $rate = $value;
-        } else {//if Tax is selected for Any State Any Country
+        } else {
+//if Tax is selected for Any State Any Country
             $taxClassId = Tax::where('country', '')->where('state', 'Any State')->pluck('tax_classes_id')->first();
             if ($taxClassId) {
                 $taxes = $cartController->getTaxByPriority($taxClassId);

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $state_code = $user_state->state_code;
         if ($state_code == $origin_state) {//If user and origin state are same
             $taxClassId = TaxClass::where('name', 'Intra State GST')
-             ->pluck('id')->toArray(); //Get the class Id  of state
+                ->pluck('id')->toArray(); //Get the class Id  of state
             if ($taxClassId) {
                 $taxes = $cartController->getTaxByPriority($taxClassId);
                 $value = $cartController->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes);

app/Model/Product/Addon.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     protected $table = 'addons';
     protected $fillable = ['product', 'subscription', 'name',
-     'description', 'regular_price', 'selling_price', 'tax_addon',
+        'description', 'regular_price', 'selling_price', 'tax_addon',
         'show_on_order', 'auto_active_payment', 'suspend_parent', ];
 
     public function relation()

app/Http/Controllers/Payment/PromotionController.php

Spacing +5 added lines, -5 removed lines

@@ -59,17 +59,17 @@ 
         $new_promotion = $this->promotion->select('code', 'type', 'id')->get();
 
         return\ DataTables::of($new_promotion)
-                            ->addColumn('checkbox', function ($model) {
+                            ->addColumn('checkbox', function($model) {
                                 return "<input type='checkbox' class='promotion_checkbox'
                                  value=".$model->id.' name=select[] id=check>';
                             })
-                        ->addColumn('code', function ($model) {
+                        ->addColumn('code', function($model) {
                             return ucfirst($model->code);
                         })
-                        ->addColumn('type', function ($model) {
+                        ->addColumn('type', function($model) {
                             return $this->type->where('id', $model->type)->first()->name;
                         })
-                        ->addColumn('products', function ($model) {
+                        ->addColumn('products', function($model) {
                             $selected = $this->promoRelation->select('product_id')
                             ->where('promotion_id', $model->id)->get();
                             $result = [];
@@ -82,7 +82,7 @@ 
                                 return 'None';
                             }
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('promotions/'.$model->id.'/edit')
                             ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";

Indentation +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
                             ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
                         })
-                         ->rawColumns(['checkbox', 'code', 'products', 'action'])
+                            ->rawColumns(['checkbox', 'code', 'products', 'action'])
 
                         ->make(true);
     }
@@ -149,7 +149,7 @@ 
             ->pluck('product_id', 'product_id')->toArray();
 
             return view('themes.default1.payment.promotion.edit',
-             compact('product', 'promotion', 'selectedProduct', 'type'));
+                compact('product', 'promotion', 'selectedProduct', 'type'));
         } catch (\Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
         }
@@ -255,12 +255,12 @@ 
 
             $userId = \Auth::user()->id;
             \Cart::update($productid, [
-           'id'        => $productid,
-           'price'     => $value,
-          'conditions' => $coupon,
+            'id'        => $productid,
+            'price'     => $value,
+            'conditions' => $coupon,
 
-           // new item price, price can also be a string format like so: '98.67'
-          ]);
+            // new item price, price can also be a string format like so: '98.67'
+            ]);
             $items = \Cart::getContent();
             \Session::put('items', $items);
 

app/Http/Controllers/Payment/TaxController.php

Spacing +14 added lines, -14 removed lines

@@ -70,37 +70,37 @@ 
     public function getTax()
     {
         return \DataTables::of($this->tax->select('id', 'tax_classes_id', 'name', 'country', 'state', 'rate')->get())
-                            ->addColumn('checkbox', function ($model) {
+                            ->addColumn('checkbox', function($model) {
                                 return "<input type='checkbox' class='tax_checkbox' 
                                 value=".$model->id.' name=select[] id=check>';
                             })
-                            ->addColumn('tax_classes_id', function ($model) {
+                            ->addColumn('tax_classes_id', function($model) {
                                 return ucfirst($this->tax_class->where('id', $model->tax_classes_id)->first()->name);
                             })
-                            ->addColumn('name', function ($model) {
+                            ->addColumn('name', function($model) {
                                 return ucfirst($model->name);
                             })
 
                             // ->showColumns('name', 'level')
-                            ->addColumn('country', function ($model) {
+                            ->addColumn('country', function($model) {
                                 if ($this->country->where('country_code_char2', $model->country)->first()) {
                                     return ucfirst($this->country
                                       ->where('country_code_char2', $model->country)->first()->country_name);
                                 }
                             })
-                            ->addColumn('state', function ($model) {
+                            ->addColumn('state', function($model) {
                                 if ($this->state->where('state_subdivision_code', $model->state)->first()) {
                                     return $this->state
                                     ->where('state_subdivision_code', $model->state)
                                     ->first()->state_subdivision_name;
                                 }
                             })
-                            ->addColumn('rate', function ($model) {
+                            ->addColumn('rate', function($model) {
                                 return $model->rate;
                             })
 
                             // ->showColumns('rate')
-                            ->addColumn('action', function ($model) {
+                            ->addColumn('action', function($model) {
                                 return '<a href='.url('tax/'.$model->id.'/edit').
                                 " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
                                 style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
@@ -112,26 +112,26 @@ 
     public function getTaxTable()
     {
         return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get())
-                         ->addColumn('id', function ($model) {
+                         ->addColumn('id', function($model) {
                              return $model->id;
                          })
 
-                         ->addColumn('state', function ($model) {
+                         ->addColumn('state', function($model) {
                              return ucfirst($model->state);
                          })
-                         ->addColumn('c_gst', function ($model) {
+                         ->addColumn('c_gst', function($model) {
                              return ucfirst($model->c_gst);
                          })
-                         ->addColumn('s_gst', function ($model) {
+                         ->addColumn('s_gst', function($model) {
                              return ucfirst($model->s_gst);
                          })
-                         ->addColumn('i_gst', function ($model) {
+                         ->addColumn('i_gst', function($model) {
                              return ucfirst($model->i_gst);
                          })
-                         ->addColumn('ut_gst', function ($model) {
+                         ->addColumn('ut_gst', function($model) {
                              return ucfirst($model->ut_gst);
                          })
-                          ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
+                          ->rawColumns(['id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst'])
                           ->make(true);
     }
 

Indentation +23 added lines, -23 removed lines

@@ -85,7 +85,7 @@ 
                             ->addColumn('country', function ($model) {
                                 if ($this->country->where('country_code_char2', $model->country)->first()) {
                                     return ucfirst($this->country
-                                      ->where('country_code_char2', $model->country)->first()->country_name);
+                                        ->where('country_code_char2', $model->country)->first()->country_name);
                                 }
                             })
                             ->addColumn('state', function ($model) {
@@ -112,27 +112,27 @@ 
     public function getTaxTable()
     {
         return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get())
-                         ->addColumn('id', function ($model) {
-                             return $model->id;
-                         })
-
-                         ->addColumn('state', function ($model) {
-                             return ucfirst($model->state);
-                         })
-                         ->addColumn('c_gst', function ($model) {
-                             return ucfirst($model->c_gst);
-                         })
-                         ->addColumn('s_gst', function ($model) {
-                             return ucfirst($model->s_gst);
-                         })
-                         ->addColumn('i_gst', function ($model) {
-                             return ucfirst($model->i_gst);
-                         })
-                         ->addColumn('ut_gst', function ($model) {
-                             return ucfirst($model->ut_gst);
-                         })
-                          ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
-                          ->make(true);
+                            ->addColumn('id', function ($model) {
+                                return $model->id;
+                            })
+
+                            ->addColumn('state', function ($model) {
+                                return ucfirst($model->state);
+                            })
+                            ->addColumn('c_gst', function ($model) {
+                                return ucfirst($model->c_gst);
+                            })
+                            ->addColumn('s_gst', function ($model) {
+                                return ucfirst($model->s_gst);
+                            })
+                            ->addColumn('i_gst', function ($model) {
+                                return ucfirst($model->i_gst);
+                            })
+                            ->addColumn('ut_gst', function ($model) {
+                                return ucfirst($model->ut_gst);
+                            })
+                            ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
+                            ->make(true);
     }
 
     /**
@@ -368,7 +368,7 @@ 
                                         ->withInput();
                 }
                 $this->tax_class->fill($request->except('tax-name', 'level',
-                  'active', 'country', 'country1', 'rate'))->save();
+                    'active', 'country', 'country1', 'rate'))->save();
                 $country = ($request->input('rate')) ? $request->input('country') : $request->input('country1');
 
                 $this->tax->fill($request->except('tax-name', 'name', 'country'))->save();

app/Http/Controllers/Order/SubscriptionController.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         //dd($this->invoice->get());
         return \Datatable::collection($this->subscription->get())
 
-                        ->addColumn('user_id', function ($model) {
+                        ->addColumn('user_id', function($model) {
                             $user = $model->user()->first();
                             $first = $user->first_name;
                             $last = $user->last_name;
@@ -55,18 +55,18 @@ 
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                        ->addColumn('plan_id', function ($model) {
+                        ->addColumn('plan_id', function($model) {
                             $name = $this->plan->where('id', $model->plan_id)->first()->name;
 
                             return $name;
                         })
-                        ->addColumn('order_id', function ($model) {
+                        ->addColumn('order_id', function($model) {
                             $name = $this->order->where('id', $model->order_id)->first()->id;
 
                             return $name;
                         })
                         ->showColumns('ends_at')
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('subscriptions/'.$model->id)." 
                             class='btn btn-sm btn-primary'>View</a>";
                         })

app/Http/Controllers/Order/InvoiceController.php

Braces +10 added lines, -5 removed lines

@@ -475,7 +475,8 @@ 
             if ($this->tax_option->findOrFail(1)->inclusive == 0) {
                 if ($this->tax_option->findOrFail(1)->tax_enable == 1) {
                     $taxs = $this->getTaxWhenEnable($productid, $taxs[0], $userid);
-                } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
+                } elseif ($this->tax_option->tax_enable == 0) {
+//if tax_enable is 0
 
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
                      ->pluck('tax_classes_id')->first(); //In case of India when
@@ -484,13 +485,15 @@ 
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
                         $taxs = $rate['taxes'];
                         $rate = $rate['rate'];
-                    } elseif ($geoip_country != 'IN') {//In case of other country
+                    } elseif ($geoip_country != 'IN') {
+//In case of other country
                         // when tax is available and tax is not enabled(Applicable
                         //when Global Tax class for any country and state is not there)
 
                         $taxClassId = Tax::where('state', $geoip_state)
                         ->orWhere('country', $geoip_country)->pluck('tax_classes_id')->first();
-                        if ($taxClassId) { //if state equals the user State
+                        if ($taxClassId) {
+//if state equals the user State
                             $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
                             $taxs = $rate['taxes'];
                             $rate = $rate['rate'];
@@ -533,11 +536,13 @@ 
         $i_gst = 0;
         $ut_gst = 0;
         $state_code = '';
-        if ($user_state != '') {//Get the CGST,SGST,IGST,STATE_CODE of the user
+        if ($user_state != '') {
+//Get the CGST,SGST,IGST,STATE_CODE of the user
             $tax = $this->getTaxWhenState($user_state, $productid, $origin_state);
             $taxes = $tax['taxes'];
             $value = $tax['value'];
-        } else {//If user from other Country
+        } else {
+//If user from other Country
             $tax = $this->getTaxWhenOtherCountry($geoip_state, $geoip_country, $productid);
             $taxes = $tax['taxes'];
             $value = $tax['value'];

Indentation +39 added lines, -39 removed lines

@@ -129,12 +129,12 @@ 
         $query = $this->advanceSearch($name, $invoice_no, $currency, $status, $from, $till);
 
         return \DataTables::of($query->take(100))
-         ->setTotalRecords($query->count())
+            ->setTotalRecords($query->count())
 
-         ->addColumn('checkbox', function ($model) {
-             return "<input type='checkbox' class='invoice_checkbox' 
+            ->addColumn('checkbox', function ($model) {
+                return "<input type='checkbox' class='invoice_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
-         })
+            })
                         ->addColumn('user_id', function ($model) {
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
@@ -142,9 +142,9 @@ 
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                         ->addColumn('number', function ($model) {
-                             return ucfirst($model->number);
-                         })
+                            ->addColumn('number', function ($model) {
+                                return ucfirst($model->number);
+                            })
 
                         ->addColumn('date', function ($model) {
                             $date = ($model->created_at);
@@ -152,12 +152,12 @@ 
                             return $date;
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
                         })
-                         ->addColumn('grand_total', function ($model) {
-                             return $model->grand_total;
-                         })
-                          ->addColumn('status', function ($model) {
-                              return ucfirst($model->status);
-                          })
+                            ->addColumn('grand_total', function ($model) {
+                                return $model->grand_total;
+                            })
+                            ->addColumn('status', function ($model) {
+                                return ucfirst($model->status);
+                            })
 
                         ->addColumn('action', function ($model) {
                             $action = '';
@@ -175,30 +175,30 @@ 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
                                     ."   $action";
                         })
-                         ->filterColumn('user_id', function ($query, $keyword) {
-                             $sql = 'first_name like ?';
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
-                         })
+                            ->filterColumn('user_id', function ($query, $keyword) {
+                                $sql = 'first_name like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
 
-                          ->filterColumn('status', function ($query, $keyword) {
-                              $sql = 'status like ?';
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
-                          })
+                            ->filterColumn('status', function ($query, $keyword) {
+                                $sql = 'status like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
 
                         ->filterColumn('number', function ($query, $keyword) {
                             $sql = 'number like ?';
                             $query->whereRaw($sql, ["%{$keyword}%"]);
                         })
-                         ->filterColumn('grand_total', function ($query, $keyword) {
-                             $sql = 'grand_total like ?';
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
-                         })
-                          ->filterColumn('date', function ($query, $keyword) {
-                              $sql = 'date like ?';
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
-                          })
-
-                         ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
+                            ->filterColumn('grand_total', function ($query, $keyword) {
+                                $sql = 'grand_total like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
+                            ->filterColumn('date', function ($query, $keyword) {
+                                $sql = 'date like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
+
+                            ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
                         ->make(true);
     }
 
@@ -292,8 +292,8 @@ 
 
             $symbol = $attributes[0]['currency']['symbol'];
             $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number,
-             'date'                                      => $date, 'grand_total' => $grand_total, 'status' => 'pending',
-             'currency'                                  => \Auth::user()->currency, ]);
+                'date'                                      => $date, 'grand_total' => $grand_total, 'status' => 'pending',
+                'currency'                                  => \Auth::user()->currency, ]);
             foreach (\Cart::getContent() as $cart) {
                 $this->createInvoiceItems($invoice->id, $cart);
             }
@@ -410,7 +410,7 @@ 
                 'currency'                        => $currency, 'status' => $status, 'description' => $description, ]);
 
             $items = $this->createInvoiceItemsByAdmin($invoice->id, $productid,
-             $code, $total, $currency, $qty, $agents, $plan, $user_id, $tax_name, $tax_rate);
+                $code, $total, $currency, $qty, $agents, $plan, $user_id, $tax_name, $tax_rate);
             $result = $this->getMessage($items, $user_id);
         } catch (\Exception $ex) {
             app('log')->info($ex->getMessage());
@@ -486,7 +486,7 @@ 
                 } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
 
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
-                     ->pluck('tax_classes_id')->first(); //In case of India when
+                        ->pluck('tax_classes_id')->first(); //In case of India when
                     //other tax is available and tax is not enabled
                     if ($taxClassId) {
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
@@ -554,10 +554,10 @@ 
         foreach ($taxes as $key => $tax) {
             if ($taxes[0]) {
                 $tax_attribute[$key] = ['name' => $tax->name, 'name1' => $name1,
-                 'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
-                 'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
-                 'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
-                  'origin_state'               => $origin_state, ];
+                    'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
+                    'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
+                    'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
+                    'origin_state'               => $origin_state, ];
 
                 $rate = $tax->rate;
 

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
             $from = $request->input('from');
             $till = $request->input('till');
 
-            return view('themes.default1.invoice.index', compact('name','invoice_no','status','currencies','currency_id','from',
+            return view('themes.default1.invoice.index', compact('name', 'invoice_no', 'status', 'currencies', 'currency_id', 'from',
 
                 'till'));
         } catch (\Exception $ex) {
@@ -131,35 +131,35 @@ 
         return \DataTables::of($query->take(100))
          ->setTotalRecords($query->count())
 
-         ->addColumn('checkbox', function ($model) {
+         ->addColumn('checkbox', function($model) {
              return "<input type='checkbox' class='invoice_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
          })
-                        ->addColumn('user_id', function ($model) {
+                        ->addColumn('user_id', function($model) {
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
                             $id = $this->user->where('id', $model->user_id)->first()->id;
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                         ->addColumn('number', function ($model) {
+                         ->addColumn('number', function($model) {
                              return ucfirst($model->number);
                          })
 
-                        ->addColumn('date', function ($model) {
+                        ->addColumn('date', function($model) {
                             $date = ($model->created_at);
 
                             return $date;
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
                         })
-                         ->addColumn('grand_total', function ($model) {
+                         ->addColumn('grand_total', function($model) {
                              return $model->grand_total;
                          })
-                          ->addColumn('status', function ($model) {
+                          ->addColumn('status', function($model) {
                               return ucfirst($model->status);
                           })
 
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             $action = '';
 
                             $check = $this->checkExecution($model->id);
@@ -175,25 +175,25 @@ 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
                                     ."   $action";
                         })
-                         ->filterColumn('user_id', function ($query, $keyword) {
+                         ->filterColumn('user_id', function($query, $keyword) {
                              $sql = 'first_name like ?';
                              $query->whereRaw($sql, ["%{$keyword}%"]);
                          })
 
-                          ->filterColumn('status', function ($query, $keyword) {
+                          ->filterColumn('status', function($query, $keyword) {
                               $sql = 'status like ?';
                               $query->whereRaw($sql, ["%{$keyword}%"]);
                           })
 
-                        ->filterColumn('number', function ($query, $keyword) {
+                        ->filterColumn('number', function($query, $keyword) {
                             $sql = 'number like ?';
                             $query->whereRaw($sql, ["%{$keyword}%"]);
                         })
-                         ->filterColumn('grand_total', function ($query, $keyword) {
+                         ->filterColumn('grand_total', function($query, $keyword) {
                              $sql = 'grand_total like ?';
                              $query->whereRaw($sql, ["%{$keyword}%"]);
                          })
-                          ->filterColumn('date', function ($query, $keyword) {
+                          ->filterColumn('date', function($query, $keyword) {
                               $sql = 'date like ?';
                               $query->whereRaw($sql, ["%{$keyword}%"]);
                           })