ladybirdweb / agorainvoicing

app/Http/Controllers/User/AdminOrderInvoiceController.php

Spacing +22 added lines, -22 removed lines

@@ -14,11 +14,11 @@ 
         $invoices = $invoice->where('user_id', $id)->orderBy('created_at', 'desc')->get();
 
         return\ DataTables::of($invoices)
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='invoice_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
                         })
-                        ->addColumn('date', function ($model) use ($client) {
+                        ->addColumn('date', function($model) use ($client) {
                             $date1 = new \DateTime($model->date);
                             // $tz = \Auth::user()->timezone()->first()->name;
                             // $date1->setTimezone(new \DateTimeZone($tz));
@@ -26,13 +26,13 @@ 
 
                             return $date;
                         })
-                        ->addColumn('invoice_no', function ($model) {
+                        ->addColumn('invoice_no', function($model) {
                             return      '<a href='.url('invoices/show?invoiceid='.$model->id).'>'.$model->number.'</a>';
                         })
-                        ->addColumn('total', function ($model) use ($client) {
+                        ->addColumn('total', function($model) use ($client) {
                             return currency_format($model->grand_total, $code = $client->currency);
                         })
-                         ->addColumn('paid', function ($model) use ($client) {
+                         ->addColumn('paid', function($model) use ($client) {
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
                              $c = count($payment);
                              $sum = 0;
@@ -43,7 +43,7 @@ 
 
                              return currency_format($sum, $code = $client->currency);
                          })
-                         ->addColumn('balance', function ($model) use ($client) {
+                         ->addColumn('balance', function($model) use ($client) {
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
                              $c = count($payment);
                              $sum = 0;
@@ -55,10 +55,10 @@ 
 
                              return currency_format($pendingAmount, $code = $client->currency);
                          })
-                          ->addColumn('status', function ($model) {
+                          ->addColumn('status', function($model) {
                               return $model->status;
                           })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             $action = '';
                             $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController();
                             $check = $cont->checkExecution($model->id);
@@ -88,35 +88,35 @@ 
         $order = $client->order()->orderBy('created_at', 'desc')->get();
 
         return\ DataTables::of($order)
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='order_checkbox' 
                             value=".$model->id.' name=select[] id=checkorder>';
                         })
-                        ->addColumn('date', function ($model) {
+                        ->addColumn('date', function($model) {
                             return ucfirst($model->created_at);
                         })
-                        ->addColumn('product', function ($model) {
+                        ->addColumn('product', function($model) {
                             $productName = $model->product()->first() && $model->product()->first()->name ?
                             $model->product()->first()->name : 'Unknown';
 
                             return $productName;
                         })
-                        ->addColumn('number', function ($model) {
+                        ->addColumn('number', function($model) {
                             $number = $model->number;
 
                             return $number;
                         })
-                         ->addColumn('total', function ($model) use ($client) {
+                         ->addColumn('total', function($model) use ($client) {
                              $price = currency_format($model->price_override, $code = $client->currency);
 
                              return $price;
                          })
-                         ->addColumn('status', function ($model) {
+                         ->addColumn('status', function($model) {
                              $status = $model->order_status;
 
                              return $status;
                          })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('orders/'.$model->id)." 
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye' 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>";
@@ -133,25 +133,25 @@ 
         $extraAmt = $this->getExtraAmtPaid($id);
 
         return\ DataTables::of($payments)
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='payment_checkbox' 
                             value=".$model->id.' name=select[] id=checkpayment>';
                         })
-                        ->addColumn('invoice_no', function ($model) {
+                        ->addColumn('invoice_no', function($model) {
                             return $model->invoice()->first() ? $model->invoice()->first()->number : '--';
                         })
-                        ->addColumn('date', function ($model) {
+                        ->addColumn('date', function($model) {
                             $date = $model->created_at;
                             $date1 = new \DateTime($date);
                             $date = $date1->format('M j, Y, g:i a ');
 
                             return $date;
                         })
-                        ->addColumn('payment_method', function ($model) {
+                        ->addColumn('payment_method', function($model) {
                             return $model->payment_method;
                         })
 
-                         ->addColumn('total', function ($model) use ($client, $extraAmt) {
+                         ->addColumn('total', function($model) use ($client, $extraAmt) {
                              if ($model->invoice_id == 0) {
                                  $amount = currency_format($extraAmt, $code = $client->currency);
                              } else {
@@ -160,11 +160,11 @@ 
 
                              return $amount;
                          })
-                         ->addColumn('status', function ($model) {
+                         ->addColumn('status', function($model) {
                              return ucfirst($model->payment_status);
                          })
 
-                         ->addColumn('action', function ($model) {
+                         ->addColumn('action', function($model) {
                              '<input type="hidden" class="paymentid" value="{{$model->id}}">';
                              if ($model->invoice_id == 0) {
                                  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>";

app/Http/Controllers/RazorpayController.php

Indentation +4 added lines, -4 removed lines

@@ -82,8 +82,8 @@ 
                     $status = $view['status'];
                     $message = $view['message'];
                     \Session::forget('items');
-                     \Session::forget('code');
-                     \Session::forget('codevalue');
+                        \Session::forget('code');
+                        \Session::forget('codevalue');
                 } else {
                     //Afer Renew
                     $control->successRenew($invoice);
@@ -97,7 +97,7 @@ 
 
                 return redirect()->back()->with($status, $message);
             } catch (\Exception $ex) {
-                 throw new \Exception($ex->getMessage(), $ex->getCode(), $ex->getPrevious());
+                    throw new \Exception($ex->getMessage(), $ex->getCode(), $ex->getPrevious());
             }
         }
     }
@@ -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];
     }

app/Http/Controllers/Product/ExtendedBaseProductController.php

Indentation +6 added lines, -6 removed lines

@@ -41,15 +41,15 @@ 
             return $model->file;
         })
         ->addColumn('action', function ($model) {
-           return "<p><button data-toggle='modal' 
+            return "<p><button data-toggle='modal' 
              data-id=".$model->id." data-title='$model->title' data-description='$model->description' data-version='$model->version'data-file='$model->file'
              class='btn btn-sm btn-primary btn-xs editUploadsOption'><i class='fa fa-edit'
              style='color:white;'> </i>&nbsp;&nbsp;Edit</button>&nbsp;</p>";
 
-         //    return '<a href='.('#edit-upload-option/'.$model->id).' 
-         // class=" btn btn-sm btn-primary editupload" data-title="'.$model->title.'"
-         //  data-description="'.$model->description.'" data-version="'
-         //      .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>';
+            //    return '<a href='.('#edit-upload-option/'.$model->id).' 
+            // class=" btn btn-sm btn-primary editupload" data-title="'.$model->title.'"
+            //  data-description="'.$model->description.'" data-version="'
+            //      .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>';
         })
         ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action'])
         ->make(true);
@@ -111,7 +111,7 @@ 
             if ($product->require_domain == 1) {
                 $field .= "<div class='col-md-4 form-group'>
                         <label class='required'>"./* @scrutinizer ignore-type */
-                         \Lang::get('message.domain')."</label>
+                            \Lang::get('message.domain')."</label>
                         <input type='text' name='domain' class='form-control' 
                         id='domain' placeholder='http://example.com'>
                 </div>";

Spacing +8 added lines, -8 removed lines

@@ -19,28 +19,28 @@ 
         ->get();
 
         return \DataTables::of($new_upload)
-        ->addColumn('checkbox', function ($model) {
+        ->addColumn('checkbox', function($model) {
             return "<input type='checkbox' class='upload_checkbox' value=".$model->id.' name=select[] id=checks>';
         })
 
-        ->addColumn('product_id', function ($model) {
+        ->addColumn('product_id', function($model) {
             return ucfirst($this->product->where('id', $model->product_id)->first()->name);
         })
 
-        ->addColumn('title', function ($model) {
+        ->addColumn('title', function($model) {
             return ucfirst($model->title);
         })
-        ->addColumn('description', function ($model) {
+        ->addColumn('description', function($model) {
             return ucfirst($model->description);
         })
-        ->addColumn('version', function ($model) {
+        ->addColumn('version', function($model) {
             return $model->version;
         })
 
-        ->addColumn('file', function ($model) {
+        ->addColumn('file', function($model) {
             return $model->file;
         })
-        ->addColumn('action', function ($model) {
+        ->addColumn('action', function($model) {
            return "<p><button data-toggle='modal' 
              data-id=".$model->id." data-title='$model->title' data-description='$model->description' data-version='$model->version'data-file='$model->file'
              class='btn btn-sm btn-primary btn-xs editUploadsOption'><i class='fa fa-edit'
@@ -65,7 +65,7 @@ 
 
         try {
             $file_upload = ProductUpload::find($id);
-            $file_upload->where('id',$id)->update(['title'=>$request->input('producttitle'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
+            $file_upload->where('id', $id)->update(['title'=>$request->input('producttitle'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
             if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
                 $productSku = $file_upload->product->product_sku;

Braces +2 added lines, -1 removed lines

@@ -67,7 +67,8 @@
             $file_upload = ProductUpload::find($id);
             $file_upload->where('id',$id)->update(['title'=>$request->input('producttitle'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
-            if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
+            if ($autoUpdateStatus == 1) {
+//If License Setting Status is on,Add Product to the AutoUpdate Script
                 $productSku = $file_upload->product->product_sku;
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
                 $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);

app/Http/Controllers/Front/CheckoutController.php

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 
     public function postCheckout(Request $request)
     {
-        $this->validate($request,[
+        $this->validate($request, [
             'payment_gateway'=>'required',
         ]);
         $invoice_controller = new \App\Http\Controllers\Order\InvoiceController();

app/Http/Controllers/Order/InvoiceController.php

Indentation +41 added lines, -41 removed lines

@@ -130,12 +130,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;
@@ -143,9 +143,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);
@@ -153,12 +153,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 = '';
@@ -176,30 +176,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);
     }
 
@@ -294,8 +294,8 @@ 
 
             $symbol = $attributes[0]['currency']['symbol'];
             $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number,
-             'date'                                      => $date, 'discount'=>$codevalue, 'grand_total' => $grand_total, 'coupon_code'=>$code, 'status' => 'pending',
-             'currency'                                  => \Auth::user()->currency, ]);
+                'date'                                      => $date, 'discount'=>$codevalue, 'grand_total' => $grand_total, 'coupon_code'=>$code, 'status' => 'pending',
+                'currency'                                  => \Auth::user()->currency, ]);
             foreach (\Cart::getContent() as $cart) {
                 $this->createInvoiceItems($invoice->id, $cart, $codevalue);
             }
@@ -415,11 +415,11 @@ 
             $grand_total = \App\Http\Controllers\Front\CartController::rounding($grand_total);
 
             $invoice = Invoice::create(['user_id' => $user_id, 'number' => $number, 'date' => $date,
-             'coupon_code'                        => $code, 'discount'=>$codeValue,
+                'coupon_code'                        => $code, 'discount'=>$codeValue,
                 'grand_total'                     => $grand_total,  '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());
@@ -491,13 +491,13 @@ 
             $cartController = new CartController();
             if ($this->tax_option->findOrFail(1)->inclusive == 0) {
                 $tax_class_id = TaxProductRelation::where('product_id', $productid)->pluck('tax_class_id')->toArray();
-                 if (count($tax_class_id) > 0) {
+                    if (count($tax_class_id) > 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
 
                     $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);
@@ -566,10 +566,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;
 

Braces +10 added lines, -5 removed lines

@@ -494,7 +494,8 @@ 
                  if (count($tax_class_id) > 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
@@ -503,13 +504,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'];
@@ -552,11 +555,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'];

app/Http/Controllers/Order/RenewController.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $sub->update_ends_at = $updatesExpiry;
             $sub->support_ends_at = $supportExpiry;
             $sub->save();
-              $licenseStatus = StatusSetting::pluck('license_status')->first();
+                $licenseStatus = StatusSetting::pluck('license_status')->first();
             if ($licenseStatus == 1) {
                 $this->editDateInAPL($sub, $updatesExpiry, $licenseExpiry, $supportExpiry);
             }

Spacing +1 added lines, -1 removed lines

@@ -263,7 +263,7 @@
             $productid = $sub->product_id;
             $plans = $this->plan->pluck('name', 'id')->toArray();
 
-            return view('themes.default1.renew.renew', compact('id','productid', 'plans', 'userid'));
+            return view('themes.default1.renew.renew', compact('id', 'productid', 'plans', 'userid'));
         } catch (Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
         }

app/Http/Controllers/Order/BaseRenewController.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
             ]);
             $this->createOrderInvoiceRelation($orderid, $invoice->id);
             $items = $controller->createInvoiceItemsByAdmin($invoice->id, $product->id,
-             $code, $renewalPrice, $currency, $qty = 1, $agents);
+                $code, $renewalPrice, $currency, $qty = 1, $agents);
 
             return $items;
         } catch (Exception $ex) {

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             if ($code != '') {
                 $product_cost = $controller->checkCode($code, $product->id, $currency);
             }
-            $renewalPrice = $cost;//Get Renewal Price before calculating tax over it to save as regular price of product
+            $renewalPrice = $cost; //Get Renewal Price before calculating tax over it to save as regular price of product
             $cost = $this->tax($product, $renewalPrice, $user->id);
             $currency = $this->getUserCurrencyById($user->id);
             $number = rand(11111111, 99999999);

app/Http/Controllers/Order/OrderController.php

Spacing +16 added lines, -16 removed lines

@@ -105,16 +105,16 @@ 
 
         return \DataTables::of($query->take(50))
                         ->setTotalRecords($query->count())
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='order_checkbox' value=".
                             $model->id.' name=select[] id=check>';
                         })
-                        ->addColumn('date', function ($model) {
+                        ->addColumn('date', function($model) {
                             $date = $model->created_at;
 
                             return "<span style='display:none'>$model->id</span>".$date;
                         })
-                        ->addColumn('client', function ($model) {
+                        ->addColumn('client', function($model) {
                             $user = $this->user->where('id', $model->client)->first();
                             $first = $user->first_name;
                             $last = $user->last_name;
@@ -122,59 +122,59 @@ 
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>';
                         })
-                        ->addColumn('productname', function ($model) {
+                        ->addColumn('productname', function($model) {
                             $productid = ($model->product);
                             $productName = Product::where('id', $productid)->pluck('name')->first();
 
                             return $productName;
                         })
-                        ->addColumn('number', function ($model) {
+                        ->addColumn('number', function($model) {
                             return ucfirst($model->number);
                         })
-                        ->addColumn('price_override', function ($model) {
+                        ->addColumn('price_override', function($model) {
                             $currency = $model->user()->find($model->client)->currency;
-                            return currency_format($model->price_override,$code = $currency);
+                            return currency_format($model->price_override, $code = $currency);
                         })
-                        ->addColumn('order_status', function ($model) {
+                        ->addColumn('order_status', function($model) {
                             return ucfirst($model->order_status);
                         })
                         // ->showColumns('number', 'price_override', 'order_status')
-                        ->addColumn('update_ends_at', function ($model) {
+                        ->addColumn('update_ends_at', function($model) {
                             $end = $this->getEndDate($model);
 
                             return $end;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             $sub = $model->subscription()->first();
                             $status = $this->checkInvoiceStatusByOrderId($model->id);
                             $url = $this->getUrl($model, $status, $sub);
                             return $url;
                         })
 
-                         ->filterColumn('created_at', function ($query, $keyword) {
+                         ->filterColumn('created_at', function($query, $keyword) {
                              $sql = 'created_at like ?';
                              $query->whereRaw($sql, ["%{$keyword}%"]);
                          })
 
-                          ->filterColumn('client', function ($query, $keyword) {
+                          ->filterColumn('client', function($query, $keyword) {
                               $sql = 'client like ?';
                               $query->whereRaw($sql, ["%{$keyword}%"]);
                           })
 
-                           ->filterColumn('number', function ($query, $keyword) {
+                           ->filterColumn('number', function($query, $keyword) {
                                $sql = 'number like ?';
                                $query->whereRaw($sql, ["%{$keyword}%"]);
                            })
-                            ->filterColumn('price_override', function ($query, $keyword) {
+                            ->filterColumn('price_override', function($query, $keyword) {
                                 $sql = 'price_override like ?';
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
                             })
-                             ->filterColumn('order_status', function ($query, $keyword) {
+                             ->filterColumn('order_status', function($query, $keyword) {
                                  $sql = 'order_status like ?';
                                  $query->whereRaw($sql, ["%{$keyword}%"]);
                              })
 
-                              ->filterColumn('update_ends_at', function ($query, $keyword) {
+                              ->filterColumn('update_ends_at', function($query, $keyword) {
                                   $sql = 'update_ends_at like ?';
                                   $query->whereRaw($sql, ["%{$keyword}%"]);
                               })