merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4562 from rahulshukla-webkul/4561 

Issue #4561 fixed
This commit is contained in:
Glenn Hermans 2021-02-08 14:55:49 +01:00 committed by GitHub
parent f305345a72 75ea2e3e13
commit b7a70d7f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php
View File

@ -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)]));

2
packages/Webkul/Sales/src/Config/system.php
View File

@ -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,
],

10
packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
View File

@ -74,6 +74,14 @@ class OnepageController extends Controller
return redirect()->route('customer.session.index');
}
$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)]));
return redirect()->back();
}
Cart::collectTotals();
return view($this->_config['view'], compact('cart'));
@ -228,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)]));

2
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -129,7 +129,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
<proceed-to-checkout

2
packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
View File

@ -87,7 +87,7 @@
<a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.minicart.view-cart') }}</a>
@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
<proceed-to-checkout

2
packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php
View File

@ -46,7 +46,7 @@
<div class="row">
@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
<proceed-to-checkout