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

Changes Done According To Method

This commit is contained in:
devansh bawari 2020-11-16 20:26:49 +05:30
parent 88e85cbbe3
commit 8e6db8509d
9 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php
View File

@ -168,13 +168,9 @@ class CheckoutController extends Controller
*/
public function checkMinimumOrder()
{
$cart = Cart::getCart();
$cartBaseSubTotal = (float) $cart->base_sub_total;
$minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$status = $cartBaseSubTotal >= $minimumOrderAmount;
$status = Cart::checkMinimumOrder();
return response()->json([
'status' => ! $status ? false : true,

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

@ -230,7 +230,7 @@ class OnepageController extends Controller
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
if (! ($cart->base_sub_total >= $minimumOrderAmount)) {
if (! $cart->checkMinimumOrder()) {
throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]));
}

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

@ -9,24 +9,17 @@ export default {
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
methods: {
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.getCartDetails().base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total >= minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.flashMessages = [{'type': 'alert-warning', 'message': this.minimumOrderMessage}];
this.$root.addFlashMessages();
}
},
getCartDetails: function () {
return JSON.parse(this.cartDetails);
}
}
}

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

@ -138,8 +138,7 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="btn btn-lg btn-primary"
text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</proceed-to-checkout>
@endif

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

@ -96,8 +96,7 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="btn btn-primary btn-lg"
text="{{ __('shop::app.minicart.checkout') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"
style="color: white;">
</proceed-to-checkout>

7
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue
View File

@ -74,7 +74,7 @@
'checkoutUrl',
'checkoutText',
'subtotalText',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
@ -122,10 +122,7 @@
},
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.cartInformation.raw.base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total >= minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage);
}

11
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/proceed-to-checkout.vue
View File

@ -9,23 +9,16 @@ export default {
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
methods: {
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.getCartDetails().base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total >= minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage);
}
},
getCartDetails: function () {
return JSON.parse(this.cartDetails);
}
}
}

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

@ -9,7 +9,7 @@
checkout-text="{{ __('shop::app.minicart.checkout') }}"
checkout-url="{{ route('shop.checkout.onepage.index') }}"
subtotal-text="{{ __('shop::app.checkout.cart.cart-subtotal') }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
is-minimum-order-completed="{{ Cart::checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</mini-cart>
</div>

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

@ -53,8 +53,7 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="theme-btn text-uppercase col-12 remove-decoration fw6 text-center"
text="{{ __('velocity::app.checkout.proceed') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</proceed-to-checkout>
</div>