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

Merge pull request #4601 from rahulshukla-webkul/4590 

Issue #4590 fixed
This commit is contained in:
Glenn Hermans 2021-02-11 11:57:38 +01:00 committed by GitHub
parent 8e2083204b c35fe27888
commit 4d005d9041
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 16 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 = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$minimumOrderAmount = (float) 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/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

12
packages/Webkul/Shop/publishable/assets/js/shop.js.LICENSE.txt
View File

@ -1,17 +1,17 @@
/*!
* Sizzle CSS Selector Engine v2.3.5
* Sizzle CSS Selector Engine v2.3.4
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
* Date: 2019-04-08
*/
/*!
* Vue.js v2.6.12
* (c) 2014-2020 Evan You
* Vue.js v2.6.11
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
@ -27,7 +27,7 @@
*/
/*!
* jQuery JavaScript Library v3.5.1
* jQuery JavaScript Library v3.4.1
* https://jquery.com/
*
* Includes Sizzle.js
@ -37,7 +37,7 @@
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2020-05-04T22:49Z
* Date: 2019-05-01T21:04Z
*/
/**

4
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=83c93b077da401f7b709",
"/css/shop.css": "/css/shop.css?id=5010731b9744e6f9a8d2"
"/js/shop.js": "/js/shop.js?id=f1380c0210d5af3612b5",
"/css/shop.css": "/css/shop.css?id=9eda91883c592e62fe40"
}

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

@ -74,7 +74,7 @@ class OnepageController extends Controller
return redirect()->route('customer.session.index');
}
$minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$minimumOrderAmount = (float) 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)]));

2
packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue
View File

@ -17,7 +17,7 @@ export default {
checkMinimumOrder: function (e) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.flashMessages = [{'type': 'alert-warning', 'message': this.minimumOrderMessage}];
window.flashMessages = [{'type': 'alert-warning', 'message': this.minimumOrderMessage.replace(/\ /g, ' ') }];
this.$root.addFlashMessages();
}
}

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

@ -129,7 +129,7 @@
@if (! cart()->hasError())
@php
$minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$minimumOrderAmount = (float) 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 = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$minimumOrderAmount = (float) 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 = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<proceed-to-checkout