diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 58e9bc39d..39a37f18b 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -13,7 +13,7 @@ use Webkul\Checkout\Models\CartPayment; use Webkul\Customer\Repositories\WishlistRepository; /** - * Facade for all the methods to be implemented in Cart. + * Facades handler for all the methods to be implemented in Cart. * * @author Prashant Singh * @author Jitendra Singh diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 00c2d5fee..c7c9b01f9 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -108,7 +108,7 @@ class CartController extends Controller } catch(\Exception $e) { session()->flash('error', trans($e->getMessage())); - + return redirect()->back(); } } @@ -191,7 +191,6 @@ class CartController extends Controller Cart::collectTotals(); - if (! $result) { return redirect()->back(); } else { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index f47a2b057..f69d4dfd4 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -25,6 +25,10 @@ {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.before', ['cart' => $cart]) !!} + @php + Cart::collectTotals(); + @endphp + {{ core()->currency($cart->base_sub_total) }} {!! view_render_event('bagisto.shop.checkout.cart-mini.subtotal.after', ['cart' => $cart]) !!} diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js index acf0d5b90..cc2d629f2 100755 --- a/packages/Webkul/Shop/webpack.mix.js +++ b/packages/Webkul/Shop/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/themes/default/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/themes/default/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications();