@@ -33,17 +33,17 @@ discard block |
||
| 33 | 33 | public function getCurrency() |
| 34 | 34 | { |
| 35 | 35 | return \DataTables::of($this->currency->select('name', 'id')->where('id', '!=', 1)->get()) |
| 36 | - ->addColumn('checkbox', function ($model) { |
|
| 36 | + ->addColumn('checkbox', function($model) { |
|
| 37 | 37 | return "<input type='checkbox' class='currency_checkbox' value=".$model->id.' name=select[] id=check>'; |
| 38 | 38 | }) |
| 39 | - ->addColumn('name', function ($model) { |
|
| 39 | + ->addColumn('name', function($model) { |
|
| 40 | 40 | return $model->name; |
| 41 | 41 | }) |
| 42 | - ->addColumn('base_conversion', function ($model) { |
|
| 42 | + ->addColumn('base_conversion', function($model) { |
|
| 43 | 43 | return $model->base_conversion; |
| 44 | 44 | }) |
| 45 | 45 | // ->showColumns('name', 'base_conversion') |
| 46 | - ->addColumn('action', function ($model) { |
|
| 46 | + ->addColumn('action', function($model) { |
|
| 47 | 47 | //return "<a href=" . url('products/' . $model->id . '/edit') . " class='btn btn-sm btn-primary'>Edit</a>"; |
| 48 | 48 | //return "<a href=#create class='btn btn-primary pull-right' data-toggle=modal data-target=#edit".$model->id.">".\Lang::get('message.create')."</a>". include base_path(). '/resources/views/themes/default1/payment/currency/edit.blade.php'; |
| 49 | 49 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | return redirect()->back()->with('success', \Lang::get('message.updated-successfully')); |
| 189 | 189 | } catch (\Exception $ex) { |
| 190 | - return redirect()->back()->with('fails',$ex->getMessage()); |
|
| 190 | + return redirect()->back()->with('fails', $ex->getMessage()); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
@@ -120,21 +120,21 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>'; |
| 122 | 122 | }) |
| 123 | - ->addColumn('number', function ($model) { |
|
| 124 | - return ucfirst($model->number); |
|
| 125 | - }) |
|
| 123 | + ->addColumn('number', function ($model) { |
|
| 124 | + return ucfirst($model->number); |
|
| 125 | + }) |
|
| 126 | 126 | |
| 127 | 127 | ->addColumn('date', function ($model) { |
| 128 | 128 | $date = date_create($model->created_at); |
| 129 | 129 | |
| 130 | 130 | return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m'); |
| 131 | 131 | }) |
| 132 | - ->addColumn('grand_total', function ($model) { |
|
| 133 | - return ucfirst($model->number); |
|
| 134 | - }) |
|
| 135 | - ->addColumn('status', function ($model) { |
|
| 136 | - return ucfirst($model->status); |
|
| 137 | - }) |
|
| 132 | + ->addColumn('grand_total', function ($model) { |
|
| 133 | + return ucfirst($model->number); |
|
| 134 | + }) |
|
| 135 | + ->addColumn('status', function ($model) { |
|
| 136 | + return ucfirst($model->status); |
|
| 137 | + }) |
|
| 138 | 138 | |
| 139 | 139 | ->addColumn('action', function ($model) { |
| 140 | 140 | $action = ''; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | ." $action"; |
| 149 | 149 | }) |
| 150 | 150 | |
| 151 | - ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action']) |
|
| 151 | + ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action']) |
|
| 152 | 152 | ->make(true); |
| 153 | 153 | } |
| 154 | 154 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | case 1: |
| 494 | 494 | $percentage = $price * ($value / 100); |
| 495 | 495 | |
| 496 | - return $price - $percentage; |
|
| 496 | + return $price - $percentage; |
|
| 497 | 497 | case 2: |
| 498 | 498 | return $price - $value; |
| 499 | 499 | case 3: |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | return $price; |
| 562 | 562 | } |
| 563 | 563 | } catch (\Exception $ex) { |
| 564 | - throw new \Exception(\Lang::get('message.check-code-error')); |
|
| 564 | + throw new \Exception(\Lang::get('message.check-code-error')); |
|
| 565 | 565 | } |
| 566 | 566 | } |
| 567 | 567 | |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0 |
| 628 | 628 | |
| 629 | 629 | $taxClassId = Tax::where('country', '')->where('state', 'Any State') |
| 630 | - ->pluck('tax_classes_id')->first(); //In case of India when other tax is available and tax is not enabled |
|
| 630 | + ->pluck('tax_classes_id')->first(); //In case of India when other tax is available and tax is not enabled |
|
| 631 | 631 | if ($taxClassId) { |
| 632 | 632 | $rate = $this->getTotalRate($taxClassId, $productid, $taxs); |
| 633 | 633 | $taxs = $rate['taxes']; |
@@ -110,33 +110,33 @@ discard block |
||
| 110 | 110 | // $new_invoice = $invoice->select('id', 'user_id', 'number', 'date', 'grand_total', 'status', 'created_at'); |
| 111 | 111 | |
| 112 | 112 | return \DataTables::of($invoice->get()) |
| 113 | - ->addColumn('checkbox', function ($model) { |
|
| 113 | + ->addColumn('checkbox', function($model) { |
|
| 114 | 114 | return "<input type='checkbox' class='invoice_checkbox' value=".$model->id.' name=select[] id=check>'; |
| 115 | 115 | }) |
| 116 | - ->addColumn('user_id', function ($model) { |
|
| 116 | + ->addColumn('user_id', function($model) { |
|
| 117 | 117 | $first = $this->user->where('id', $model->user_id)->first()->first_name; |
| 118 | 118 | $last = $this->user->where('id', $model->user_id)->first()->last_name; |
| 119 | 119 | $id = $this->user->where('id', $model->user_id)->first()->id; |
| 120 | 120 | |
| 121 | 121 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>'; |
| 122 | 122 | }) |
| 123 | - ->addColumn('number', function ($model) { |
|
| 123 | + ->addColumn('number', function($model) { |
|
| 124 | 124 | return ucfirst($model->number); |
| 125 | 125 | }) |
| 126 | 126 | |
| 127 | - ->addColumn('date', function ($model) { |
|
| 127 | + ->addColumn('date', function($model) { |
|
| 128 | 128 | $date = date_create($model->created_at); |
| 129 | 129 | |
| 130 | 130 | return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m'); |
| 131 | 131 | }) |
| 132 | - ->addColumn('grand_total', function ($model) { |
|
| 132 | + ->addColumn('grand_total', function($model) { |
|
| 133 | 133 | return ucfirst($model->number); |
| 134 | 134 | }) |
| 135 | - ->addColumn('status', function ($model) { |
|
| 135 | + ->addColumn('status', function($model) { |
|
| 136 | 136 | return ucfirst($model->status); |
| 137 | 137 | }) |
| 138 | 138 | |
| 139 | - ->addColumn('action', function ($model) { |
|
| 139 | + ->addColumn('action', function($model) { |
|
| 140 | 140 | $action = ''; |
| 141 | 141 | |
| 142 | 142 | $check = $this->checkExecution($model->id); |
@@ -555,8 +555,8 @@ discard block |
||
| 555 | 555 | return $value; |
| 556 | 556 | } else { |
| 557 | 557 | $product = $this->product->find($productid); |
| 558 | - $plans = Plan::where('product',$product)->pluck('id')->first(); |
|
| 559 | - $price = PlanPrice::where('currency',$currency)->where('plan_id',$plans)->pluck('add_price')->first(); |
|
| 558 | + $plans = Plan::where('product', $product)->pluck('id')->first(); |
|
| 559 | + $price = PlanPrice::where('currency', $currency)->where('plan_id', $plans)->pluck('add_price')->first(); |
|
| 560 | 560 | |
| 561 | 561 | return $price; |
| 562 | 562 | } |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | $this->middleware('admin'); |
| 17 | 17 | $product = new Product(); |
| 18 | 18 | $this->product = $product; |
| 19 | - $plan = new Plan(); |
|
| 20 | - $this->plan = $plan; |
|
| 19 | + $plan = new Plan(); |
|
| 20 | + $this->plan = $plan; |
|
| 21 | 21 | $service = new Service(); |
| 22 | 22 | $this->service = $service; |
| 23 | 23 | } |