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

Reverted Two Files

This commit is contained in:
devansh bawari 2020-11-10 12:40:36 +05:30
parent 8c0395e8f7
commit d054bf8242
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -5,15 +5,7 @@
@stop
@section('content-wrapper')
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<checkout
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</checkout>
<checkout></checkout>
@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);
}
}
})

25
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
View File

@ -5,15 +5,7 @@
@stop
@section('content-wrapper')
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<checkout
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</checkout>
<checkout></checkout>
@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);
}
}
});