From d054bf82424dd2328af67defb99a100ebe7966b5 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 10 Nov 2020 12:40:36 +0530 Subject: [PATCH] Reverted Two Files --- .../views/checkout/onepage.blade.php | 25 +------------------ .../views/shop/checkout/onepage.blade.php | 25 +------------------ 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index b1ac74180..c523f4d80 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -5,15 +5,7 @@ @stop @section('content-wrapper') - @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; - @endphp - - - + @endsection @push('scripts') @@ -131,15 +123,8 @@ Vue.component('checkout', { template: '#checkout-template', - inject: ['$validator'], - props: [ - 'cartDetails', - 'minimumOrderAmount', - 'minimumOrderMessage' - ], - data: function() { return { step_numbers: { @@ -192,10 +177,6 @@ created: function() { this.getOrderSummary(); - if (! (this.getCartDetails().base_sub_total > this.minimumOrderAmount)) { - window.flashMessages = [{'type': 'alert-error', 'message': this.minimumOrderMessage }]; - } - if(! customerAddress) { this.new_shipping_address = true; this.new_billing_address = true; @@ -452,10 +433,6 @@ backToSavedShippingAddress: function() { this.new_shipping_address = false; }, - - getCartDetails: function () { - return JSON.parse(this.cartDetails); - } } }) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php index f85bf203a..1832feeb8 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php @@ -5,15 +5,7 @@ @stop @section('content-wrapper') - @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; - @endphp - - - + @endsection @push('scripts') @@ -120,15 +112,8 @@ Vue.component('checkout', { template: '#checkout-template', - inject: ['$validator'], - props: [ - 'cartDetails', - 'minimumOrderAmount', - 'minimumOrderMessage' - ], - data: function () { return { allAddress: {}, @@ -174,10 +159,6 @@ created: function () { this.getOrderSummary(); - if (! (this.getCartDetails().base_sub_total > this.minimumOrderAmount)) { - window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage); - } - if (! customerAddress) { this.new_shipping_address = true; this.new_billing_address = true; @@ -563,10 +544,6 @@ setTimeout(() => { this.validateForm('address-form'); }, 0); - }, - - getCartDetails: function () { - return JSON.parse(this.cartDetails); } } });