@@ -335,7 +335,7 @@ |
||
| 335 | 335 | } |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | - public function getUrl($repo,$ver) |
|
| 338 | + public function getUrl($repo, $ver) |
|
| 339 | 339 | { |
| 340 | 340 | //For Satellite Helpdesk |
| 341 | 341 | if ($repo == 'faveo-satellite-helpdesk-advance') { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | $state_code = $user_state->state_code; |
| 33 | 33 | if ($state_code == $origin_state) {//If user and origin state are same |
| 34 | 34 | $taxClassId = TaxClass::where('name', 'Intra State GST') |
| 35 | - ->pluck('id')->toArray(); //Get the class Id of state |
|
| 35 | + ->pluck('id')->toArray(); //Get the class Id of state |
|
| 36 | 36 | if ($taxClassId) { |
| 37 | 37 | $taxes = $cartController->getTaxByPriority($taxClassId); |
| 38 | 38 | $value = $cartController->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes); |
@@ -121,21 +121,21 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>'; |
| 123 | 123 | }) |
| 124 | - ->addColumn('number', function ($model) { |
|
| 125 | - return ucfirst($model->number); |
|
| 126 | - }) |
|
| 124 | + ->addColumn('number', function ($model) { |
|
| 125 | + return ucfirst($model->number); |
|
| 126 | + }) |
|
| 127 | 127 | |
| 128 | 128 | ->addColumn('date', function ($model) { |
| 129 | 129 | $date = date_create($model->created_at); |
| 130 | 130 | |
| 131 | 131 | return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m'); |
| 132 | 132 | }) |
| 133 | - ->addColumn('grand_total', function ($model) { |
|
| 134 | - return ucfirst($model->number); |
|
| 135 | - }) |
|
| 136 | - ->addColumn('status', function ($model) { |
|
| 137 | - return ucfirst($model->status); |
|
| 138 | - }) |
|
| 133 | + ->addColumn('grand_total', function ($model) { |
|
| 134 | + return ucfirst($model->number); |
|
| 135 | + }) |
|
| 136 | + ->addColumn('status', function ($model) { |
|
| 137 | + return ucfirst($model->status); |
|
| 138 | + }) |
|
| 139 | 139 | |
| 140 | 140 | ->addColumn('action', function ($model) { |
| 141 | 141 | $action = ''; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | ." $action"; |
| 155 | 155 | }) |
| 156 | 156 | |
| 157 | - ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action']) |
|
| 157 | + ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action']) |
|
| 158 | 158 | ->make(true); |
| 159 | 159 | } |
| 160 | 160 | |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | $symbol = $attributes[0]['currency'][0]['code']; |
| 284 | 284 | //dd($symbol); |
| 285 | 285 | $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number, |
| 286 | - 'date' => $date, 'grand_total' => $grand_total, 'status' => 'pending', |
|
| 287 | - 'currency' => $symbol, ]); |
|
| 286 | + 'date' => $date, 'grand_total' => $grand_total, 'status' => 'pending', |
|
| 287 | + 'currency' => $symbol, ]); |
|
| 288 | 288 | |
| 289 | 289 | foreach (\Cart::getContent() as $cart) { |
| 290 | 290 | $this->createInvoiceItems($invoice->id, $cart); |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | 'currency' => $currency, 'status' => 'pending', 'description' => $description, ]); |
| 390 | 390 | |
| 391 | 391 | $items = $this->createInvoiceItemsByAdmin($invoice->id, $productid, |
| 392 | - $code, $total, $currency, $qty, $plan, $user_id, $tax_name, $tax_rate); |
|
| 392 | + $code, $total, $currency, $qty, $plan, $user_id, $tax_name, $tax_rate); |
|
| 393 | 393 | $result = $this->getMessage($items, $user_id); |
| 394 | 394 | } catch (\Exception $ex) { |
| 395 | 395 | app('log')->useDailyFiles(storage_path().'/laravel.log'); |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0 |
| 539 | 539 | |
| 540 | 540 | $taxClassId = Tax::where('country', '')->where('state', 'Any State') |
| 541 | - ->pluck('tax_classes_id')->first(); //In case of India when |
|
| 541 | + ->pluck('tax_classes_id')->first(); //In case of India when |
|
| 542 | 542 | //other tax is available and tax is not enabled |
| 543 | 543 | if ($taxClassId) { |
| 544 | 544 | $rate = $this->getTotalRate($taxClassId, $productid, $taxs); |
@@ -607,10 +607,10 @@ discard block |
||
| 607 | 607 | foreach ($taxes as $key => $tax) { |
| 608 | 608 | if ($taxes[0]) { |
| 609 | 609 | $tax_attribute[$key] = ['name' => $tax->name, 'name1' => $name1, |
| 610 | - 'name2' => $name2, 'name3' => $name3, 'name4' => $name4, |
|
| 611 | - 'rate' => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst, |
|
| 612 | - 'rate3' => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code, |
|
| 613 | - 'origin_state' => $origin_state, ]; |
|
| 610 | + 'name2' => $name2, 'name3' => $name3, 'name4' => $name4, |
|
| 611 | + 'rate' => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst, |
|
| 612 | + 'rate3' => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code, |
|
| 613 | + 'origin_state' => $origin_state, ]; |
|
| 614 | 614 | |
| 615 | 615 | $rate = $tax->rate; |
| 616 | 616 | |
@@ -819,8 +819,8 @@ discard block |
||
| 819 | 819 | } |
| 820 | 820 | |
| 821 | 821 | return view('themes.default1.invoice.payment', |
| 822 | - compact('invoice_status', 'payment_status', |
|
| 823 | - 'payment_method', 'invoice_id', 'domain', 'invoice')); |
|
| 822 | + compact('invoice_status', 'payment_status', |
|
| 823 | + 'payment_method', 'invoice_id', 'domain', 'invoice')); |
|
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | return redirect()->back(); |
@@ -858,7 +858,7 @@ discard block |
||
| 858 | 858 | case 1: |
| 859 | 859 | $percentage = $price * ($value / 100); |
| 860 | 860 | |
| 861 | - return $price - $percentage; |
|
| 861 | + return $price - $percentage; |
|
| 862 | 862 | case 2: |
| 863 | 863 | return $price - $value; |
| 864 | 864 | case 3: |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | $payment_date = \Carbon\Carbon::now()->toDateTimeString(); |
| 891 | 891 | $amount = $grand_total; |
| 892 | 892 | $paymentRenewal = $this->updateInvoicePayment($invoiceid, $payment_method, |
| 893 | - $payment_status, $payment_date, $amount); |
|
| 893 | + $payment_status, $payment_date, $amount); |
|
| 894 | 894 | |
| 895 | 895 | return redirect()->back()->with('success', 'Payment Accepted Successfully'); |
| 896 | 896 | } catch (\Exception $ex) { |