@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | protected function mapWebRoutes() |
53 | 53 | { |
54 | 54 | Route::middleware('web') |
55 | - ->namespace($this->namespace) |
|
56 | - ->group(base_path('routes/web.php')); |
|
55 | + ->namespace($this->namespace) |
|
56 | + ->group(base_path('routes/web.php')); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | protected function mapApiRoutes() |
67 | 67 | { |
68 | 68 | Route::prefix('api') |
69 | - ->middleware('api') |
|
70 | - ->namespace($this->namespace) |
|
71 | - ->group(base_path('routes/api.php')); |
|
69 | + ->middleware('api') |
|
70 | + ->namespace($this->namespace) |
|
71 | + ->group(base_path('routes/api.php')); |
|
72 | 72 | } |
73 | 73 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | return ''; |
32 | 32 | |
33 | 33 | // return "Product has been {$eventName}"; |
34 | - // \Auth::user()->activity; |
|
34 | + // \Auth::user()->activity; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function planPrice() |
@@ -37,7 +37,7 @@ |
||
37 | 37 | return ''; |
38 | 38 | |
39 | 39 | // return "Product has been {$eventName}"; |
40 | - // \Auth::user()->activity; |
|
40 | + // \Auth::user()->activity; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function invoiceItem() |
@@ -33,6 +33,6 @@ |
||
33 | 33 | return ''; |
34 | 34 | |
35 | 35 | // return "Product has been {$eventName}"; |
36 | - // \Auth::user()->activity; |
|
36 | + // \Auth::user()->activity; |
|
37 | 37 | } |
38 | 38 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | protected $fillable = ['tax_enable', 'inclusive', 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no']; |
13 | 13 | protected static $logName = 'Tax Class'; |
14 | 14 | protected static $logAttributes = ['tax_enable', 'inclusive', |
15 | - 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no', ]; |
|
15 | + 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no', ]; |
|
16 | 16 | protected static $logOnlyDirty = true; |
17 | 17 | |
18 | 18 | public function getDescriptionForEvent(string $eventName): string |
@@ -8,7 +8,7 @@ |
||
8 | 8 | { |
9 | 9 | protected $table = 'addons'; |
10 | 10 | protected $fillable = ['product', 'subscription', 'name', |
11 | - 'description', 'regular_price', 'selling_price', 'tax_addon', |
|
11 | + 'description', 'regular_price', 'selling_price', 'tax_addon', |
|
12 | 12 | 'show_on_order', 'auto_active_payment', 'suspend_parent', ]; |
13 | 13 | |
14 | 14 | public function relation() |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | ->addColumn('country', function ($model) { |
86 | 86 | if ($this->country->where('country_code_char2', $model->country)->first()) { |
87 | 87 | return ucfirst($this->country |
88 | - ->where('country_code_char2', $model->country)->first()->country_name); |
|
88 | + ->where('country_code_char2', $model->country)->first()->country_name); |
|
89 | 89 | } |
90 | 90 | }) |
91 | 91 | ->addColumn('state', function ($model) { |
@@ -112,27 +112,27 @@ discard block |
||
112 | 112 | public function getTaxTable() |
113 | 113 | { |
114 | 114 | return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get()) |
115 | - ->addColumn('id', function ($model) { |
|
116 | - return $model->id; |
|
117 | - }) |
|
118 | - |
|
119 | - ->addColumn('state', function ($model) { |
|
120 | - return ucfirst($model->state); |
|
121 | - }) |
|
122 | - ->addColumn('c_gst', function ($model) { |
|
123 | - return ucfirst($model->c_gst); |
|
124 | - }) |
|
125 | - ->addColumn('s_gst', function ($model) { |
|
126 | - return ucfirst($model->s_gst); |
|
127 | - }) |
|
128 | - ->addColumn('i_gst', function ($model) { |
|
129 | - return ucfirst($model->i_gst); |
|
130 | - }) |
|
131 | - ->addColumn('ut_gst', function ($model) { |
|
132 | - return ucfirst($model->ut_gst); |
|
133 | - }) |
|
134 | - ->rawColumns(['id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst']) |
|
135 | - ->make(true); |
|
115 | + ->addColumn('id', function ($model) { |
|
116 | + return $model->id; |
|
117 | + }) |
|
118 | + |
|
119 | + ->addColumn('state', function ($model) { |
|
120 | + return ucfirst($model->state); |
|
121 | + }) |
|
122 | + ->addColumn('c_gst', function ($model) { |
|
123 | + return ucfirst($model->c_gst); |
|
124 | + }) |
|
125 | + ->addColumn('s_gst', function ($model) { |
|
126 | + return ucfirst($model->s_gst); |
|
127 | + }) |
|
128 | + ->addColumn('i_gst', function ($model) { |
|
129 | + return ucfirst($model->i_gst); |
|
130 | + }) |
|
131 | + ->addColumn('ut_gst', function ($model) { |
|
132 | + return ucfirst($model->ut_gst); |
|
133 | + }) |
|
134 | + ->rawColumns(['id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst']) |
|
135 | + ->make(true); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | ->withInput(); |
369 | 369 | } |
370 | 370 | $this->tax_class->fill($request->except('tax-name', 'level', |
371 | - 'active', 'country', 'country1', 'rate'))->save(); |
|
371 | + 'active', 'country', 'country1', 'rate'))->save(); |
|
372 | 372 | $country = ($request->input('rate')) ? $request->input('country') : $request->input('country1'); |
373 | 373 | |
374 | 374 | $this->tax->fill($request->except('tax-name', 'name', 'country'))->save(); |
@@ -48,7 +48,7 @@ |
||
48 | 48 | $dbpassword = $this->ask('Enter your database password (blank if not entered)', false); |
49 | 49 | $port = $this->ask('Enter your sql port (blank if not entered)', false); |
50 | 50 | $array = ['DB_TYPE' => $default, 'DB_HOST' => $host, |
51 | - 'DB_DATABASE' => $database, 'DB_USERNAME' => $dbusername, 'DB_PASSWORD' => $dbpassword, ]; |
|
51 | + 'DB_DATABASE' => $database, 'DB_USERNAME' => $dbusername, 'DB_PASSWORD' => $dbpassword, ]; |
|
52 | 52 | $this->updateDBEnv($array); |
53 | 53 | $this->call('key:generate'); |
54 | 54 | $this->call('migrate'); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | public function getBundles() |
48 | 48 | { |
49 | 49 | return \Datatable::collection($this->bundle->select('id', 'name', |
50 | - 'valid_from', 'valid_till', 'uses', 'maximum_uses')->get()) |
|
50 | + 'valid_from', 'valid_till', 'uses', 'maximum_uses')->get()) |
|
51 | 51 | ->addColumn('#', function ($model) { |
52 | 52 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
53 | 53 | }) |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | return view('themes.default1.product.bundle.edit', |
151 | - compact('products', 'bundle', 'relation', 'till', 'from')); |
|
151 | + compact('products', 'bundle', 'relation', 'till', 'from')); |
|
152 | 152 | } catch (\Exception $e) { |
153 | 153 | return redirect()->back()->with('fails', $e->getMessage()); |
154 | 154 | } catch (\InvalidArgumentException $e) { |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $from = null; |
158 | 158 | |
159 | 159 | return view('themes.default1.product.bundle.edit', |
160 | - compact('products', 'bundle', 'relation', 'till', 'from')); |
|
160 | + compact('products', 'bundle', 'relation', 'till', 'from')); |
|
161 | 161 | } |
162 | 162 | } |
163 | 163 | } |