diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index e59c4bde3..776e31b0b 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -841,10 +841,10 @@ class Cart { } else if ($item->product->name != $item->name) { $item->update(['name' => $item->product->name]); - } else if($this->price->getMinimalPrice($item->child->product) != $item->price) { + } else if ($this->price->getMinimalPrice($item->child->product) != $item->price) { // $price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price; - if((float)$item->custom_price) { + if ((float)$item->custom_price) { $price = $item->custom_price; } else { $price = $this->price->getMinimalPrice($item->child->product); @@ -868,10 +868,10 @@ class Cart { } else if ($this->price->getMinimalPrice($item->product) != $item->price) { // $price = (float) $item->custom_price ? $item->custom_price : $item->product->price; - if((float)$item->custom_price) { + if ((float)$item->custom_price) { $price = $item->custom_price; } else { - $price = $this->price->getMinimalPrice($item->child->product); + $price = $this->price->getMinimalPrice($item->product); } $item->update([ diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php index aea2831b8..e1d6a9ad4 100755 --- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php +++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php @@ -29,6 +29,8 @@ class Bouncer public function checkIfAuthorized($request) { + // dd(auth()->guard('admin')->user()->role); + if (! $role = auth()->guard('admin')->user()->role) abort(401, 'This action is unauthorized.'); diff --git a/public/installer/install.php b/public/installer/install.php index b597ab0a9..b3db2155a 100755 --- a/public/installer/install.php +++ b/public/installer/install.php @@ -21,6 +21,7 @@ if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line); + if (count($rowValues) === 2) { if (in_array($rowValues[0], $databaseArray)) { $key[] = $rowValues[0]; diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100755 index 1b07f5b35..000000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - -
-
- -