From c763bbced181c7e5fc57abaa7c1b06f8ada4d3a4 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 5 Feb 2021 16:39:46 +0530 Subject: [PATCH 1/2] Issue #4561 fixed --- .../Shop/src/Http/Controllers/OnepageController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index f3abafb3e..5973cd768 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -74,6 +74,14 @@ class OnepageController extends Controller return redirect()->route('customer.session.index'); } + $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + + if (! $cart->checkMinimumOrder()) { + session()->flash('warning', trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); + + return redirect()->back(); + } + Cart::collectTotals(); return view($this->_config['view'], compact('cart')); From 94491226d867d064da3819be747f98706b034e70 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 8 Feb 2021 15:47:33 +0530 Subject: [PATCH 2/2] decimal field for minimum order --- .../Paypal/src/Http/Controllers/SmartButtonController.php | 2 +- packages/Webkul/Sales/src/Config/system.php | 2 +- .../Webkul/Shop/src/Http/Controllers/OnepageController.php | 4 ++-- .../Shop/src/Resources/views/checkout/cart/index.blade.php | 2 +- .../src/Resources/views/checkout/cart/mini-cart.blade.php | 2 +- .../src/Resources/views/shop/checkout/total/summary.blade.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php index f0d0fba21..b193fbb35 100755 --- a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php +++ b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php @@ -278,7 +278,7 @@ class SmartButtonController extends Controller { $cart = Cart::getCart(); - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 985500dd4..34bdbbae0 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -52,7 +52,7 @@ return [ 'name' => 'minimum_order_amount', 'title' => 'admin::app.admin.system.minimum-order-amount', 'type' => 'text', - 'validation' => 'numeric', + 'validation' => 'decimal', 'channel_based' => true, 'locale_based' => true, ], diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 5973cd768..f7e2e17ba 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -74,7 +74,7 @@ class OnepageController extends Controller return redirect()->route('customer.session.index'); } - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { session()->flash('warning', trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); @@ -236,7 +236,7 @@ class OnepageController extends Controller { $cart = Cart::getCart(); - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index d44caa83c..b2e84e9e8 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -131,7 +131,7 @@ @if (! cart()->hasError()) @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp {{ __('shop::app.minicart.view-cart') }} @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp