Completed
Push — development ( 059e30...d1b094 )
by Ashutosh
09:16
created
app/Http/Controllers/Common/BaseTemplateController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     }
54 54
 
55 55
     public function getResult($country, $geoip_country, $state, $geoip_state,
56
-     $shop, $cart, $cart1, $shop1, $rate, $product, $price)
56
+        $shop, $cart, $cart1, $shop1, $rate, $product, $price)
57 57
     {
58 58
         if ($country == $geoip_country || $state == $geoip_state || ($country == '' && $state == '')) {
59 59
             $result = $this->getCartResult($product, $shop, $cart, $rate, $price, $cart1, $shop1);
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,8 @@
 block discarded – undo
130 130
             $currencyAndSymbol = $cart_controller->currency();
131 131
             $currency = $currencyAndSymbol['currency'];
132 132
             $symbol = $currencyAndSymbol['symbol'];
133
-            if ($symbol == '') {  //If user has no currency symbol(In case of old customers)
133
+            if ($symbol == '') {
134
+//If user has no currency symbol(In case of old customers)
134 135
                 $user = \Auth::user();
135 136
                 $symbol = Currency::where('code', $currency)->pluck('symbol')->first();
136 137
                 $symbol = $user->update(['currency_symbol'=> $symbol]);
Please login to merge, or discard this patch.
app/Model/Product/Subscription.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
     'user_id', 'plan_id', 'order_id', 'deny_after_subscription', 'version', 'product_id', ];
14 14
     protected $dates = ['ends_at'];
15 15
     protected static $logName = 'Subscription';
16
-    protected static $logAttributes = ['ends_at', 'user_id', 'plan_id', 'order_id',  'version', 'product_id'];
16
+    protected static $logAttributes = ['ends_at', 'user_id', 'plan_id', 'order_id', 'version', 'product_id'];
17 17
     protected static $logOnlyDirty = true;
18 18
 
19 19
     public function getDescriptionForEvent(string $eventName): string
Please login to merge, or discard this patch.
app/Http/Controllers/Order/BaseRenewController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
             ]);
116 116
             $this->createOrderInvoiceRelation($orderid, $invoice->id);
117 117
             $items = $controller->createInvoiceItemsByAdmin($invoice->id, $product->id,
118
-             $code, $product_cost, $currency, $qty = 1);
118
+                $code, $product_cost, $currency, $qty = 1);
119 119
 
120 120
             return $items;
121 121
         } catch (Exception $ex) {
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/Http/Controllers/Front/BaseCartController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@
 block discarded – undo
238 238
                 }
239 239
 
240 240
                 $items = ['id' => $id, 'name' => $productName, 'price' => $actualPrice,
241
-                 'quantity'    => $qty, 'attributes' => ['currency' => [[$currency]]], ];
241
+                    'quantity'    => $qty, 'attributes' => ['currency' => [[$currency]]], ];
242 242
                 $items = array_merge($items, $taxConditions);
243 243
 
244 244
                 return $items;
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/BaseAuthController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
             <br>OTP has been sent to '.$number.'.<br>Please enter the 
116 116
             OTP received on your mobile No below. Incase you did not recieve OTP,
117 117
             please get in touch with us on <a href="mailto:[email protected]">
118
-            [email protected]</a>', ];
118
+            [email protected]</a>',];
119 119
 
120 120
             return response()->json($response);
121 121
         } catch (\Exception $ex) {
Please login to merge, or discard this patch.
app/Http/Controllers/Order/BaseInvoiceController.php 2 patches
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -86,7 +86,8 @@  discard block
 block discarded – undo
86 86
         $i_gst = $user_state->i_gst;
87 87
         $ut_gst = $user_state->ut_gst;
88 88
         $state_code = $user_state->state_code;
89
-        if ($state_code == $origin_state) {//If user and origin state are same
89
+        if ($state_code == $origin_state) {
90
+//If user and origin state are same
90 91
             $taxClassId = TaxClass::where('name', 'Intra State GST')
91 92
              ->pluck('id')->toArray(); //Get the class Id  of state
92 93
             if ($taxClassId) {
@@ -95,7 +96,8 @@  discard block
 block discarded – undo
95 96
             } else {
96 97
                 $taxes = [0];
97 98
             }
98
-        } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {//If user is from other state
99
+        } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {
100
+//If user is from other state
99 101
 
100 102
             $taxClassId = TaxClass::where('name', 'Inter State GST')
101 103
             ->pluck('id')->toArray(); //Get the class Id  of state
@@ -105,7 +107,8 @@  discard block
 block discarded – undo
105 107
             } else {
106 108
                 $taxes = [0];
107 109
             }
108
-        } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {//if user from Union Territory
110
+        } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {
111
+//if user from Union Territory
109 112
             $taxClassId = TaxClass::where('name', 'Union Territory GST')
110 113
         ->pluck('id')->toArray(); //Get the class Id  of state
111 114
             if ($taxClassId) {
@@ -130,14 +133,16 @@  discard block
 block discarded – undo
130 133
         ->pluck('tax_classes_id')->first();
131 134
         $value = '';
132 135
         $rate = '';
133
-        if ($taxClassId) { //if state equals the user State
136
+        if ($taxClassId) {
137
+//if state equals the user State
134 138
 
135 139
             $taxes = $cartController->getTaxByPriority($taxClassId);
136 140
 
137 141
             // $taxes = $this->cartController::getTaxByPriority($taxClassId);
138 142
             $value = $cartController->getValueForOthers($productid, $taxClassId, $taxes);
139 143
             $rate = $value;
140
-        } else {//if Tax is selected for Any State Any Country
144
+        } else {
145
+//if Tax is selected for Any State Any Country
141 146
             $taxClassId = Tax::where('country', '')->where('state', 'Any State')->pluck('tax_classes_id')->first();
142 147
             if ($taxClassId) {
143 148
                 $taxes = $cartController->getTaxByPriority($taxClassId);
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
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);
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/PromotionController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -59,17 +59,17 @@  discard block
 block discarded – undo
59 59
         $new_promotion = $this->promotion->select('code', 'type', 'id')->get();
60 60
 
61 61
         return\ DataTables::of($new_promotion)
62
-                            ->addColumn('checkbox', function ($model) {
62
+                            ->addColumn('checkbox', function($model) {
63 63
                                 return "<input type='checkbox' class='promotion_checkbox'
64 64
                                  value=".$model->id.' name=select[] id=check>';
65 65
                             })
66
-                        ->addColumn('code', function ($model) {
66
+                        ->addColumn('code', function($model) {
67 67
                             return ucfirst($model->code);
68 68
                         })
69
-                        ->addColumn('type', function ($model) {
69
+                        ->addColumn('type', function($model) {
70 70
                             return $this->type->where('id', $model->type)->first()->name;
71 71
                         })
72
-                        ->addColumn('products', function ($model) {
72
+                        ->addColumn('products', function($model) {
73 73
                             $selected = $this->promoRelation->select('product_id')
74 74
                             ->where('promotion_id', $model->id)->get();
75 75
                             $result = [];
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                                 return 'None';
83 83
                             }
84 84
                         })
85
-                        ->addColumn('action', function ($model) {
85
+                        ->addColumn('action', function($model) {
86 86
                             return '<a href='.url('promotions/'.$model->id.'/edit')
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>";
Please login to merge, or discard this 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.