Completed
Branch feature-dynamic-fields (3b03cc)
by Ashutosh
09:05
created
app/Http/Kernel.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
18 18
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
19 19
         // \App\Http\Middleware\TrimStrings::class,
20
-          \Illuminate\Session\Middleware\StartSession::class,
21
-             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
20
+            \Illuminate\Session\Middleware\StartSession::class,
21
+                \Illuminate\View\Middleware\ShareErrorsFromSession::class,
22 22
         // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
23 23
     ];
24 24
 
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
29 29
      */
30 30
     protected $middlewareGroups = [
31 31
         'web' => [
32
-             \App\Http\Middleware\Install::class,
32
+                \App\Http\Middleware\Install::class,
33 33
             \App\Http\Middleware\EncryptCookies::class,
34 34
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
35 35
             // \Illuminate\Session\Middleware\StartSession::class,
36 36
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
37 37
             // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
38
-           // \App\Http\Middleware\VerifyCsrfToken::class,
38
+            // \App\Http\Middleware\VerifyCsrfToken::class,
39 39
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
40 40
 
41
-             // \App\Http\Middleware\IsInstalled::class,
41
+                // \App\Http\Middleware\IsInstalled::class,
42 42
 
43 43
         ],
44
-         'admin'        => [\App\Http\Middleware\Admin::class],
45
-          'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
46
-           'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
44
+            'admin'        => [\App\Http\Middleware\Admin::class],
45
+            'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
46
+            'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
47 47
         'auth.basic'    => [\Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class],
48 48
 
49 49
         'api' => [
Please login to merge, or discard this patch.
app/Providers/RouteServiceProvider.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
app/Model/Payment/Plan.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
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()
Please login to merge, or discard this patch.
app/Model/Order/Invoice.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
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()
Please login to merge, or discard this patch.
app/Model/Payment/PlanPrice.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         return '';
34 34
 
35 35
         // return "Product  has been {$eventName}";
36
-         // \Auth::user()->activity;
36
+            // \Auth::user()->activity;
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
app/Model/Payment/TaxOption.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
app/Model/Product/Addon.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
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()
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/TaxController.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/PromotionController.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                             ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
88 88
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
89 89
                         })
90
-                         ->rawColumns(['checkbox', 'code', 'products', 'action'])
90
+                            ->rawColumns(['checkbox', 'code', 'products', 'action'])
91 91
 
92 92
                         ->make(true);
93 93
     }
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             ->pluck('product_id', 'product_id')->toArray();
150 150
 
151 151
             return view('themes.default1.payment.promotion.edit',
152
-             compact('product', 'promotion', 'selectedProduct', 'type'));
152
+                compact('product', 'promotion', 'selectedProduct', 'type'));
153 153
         } catch (\Exception $ex) {
154 154
             return redirect()->back()->with('fails', $ex->getMessage());
155 155
         }
@@ -255,12 +255,12 @@  discard block
 block discarded – undo
255 255
 
256 256
             $userId = \Auth::user()->id;
257 257
             \Cart::update($productid, [
258
-           'id'        => $productid,
259
-           'price'     => $value,
260
-          'conditions' => $coupon,
258
+            'id'        => $productid,
259
+            'price'     => $value,
260
+            'conditions' => $coupon,
261 261
 
262
-           // new item price, price can also be a string format like so: '98.67'
263
-          ]);
262
+            // new item price, price can also be a string format like so: '98.67'
263
+            ]);
264 264
             $items = \Cart::getContent();
265 265
             \Session::put('items', $items);
266 266
 
Please login to merge, or discard this patch.