Merge pull request #2461 from shubhwebkul/velocity-updated
misc. bug fixes
This commit is contained in:
Jitendra Singh
GitHub
commit
4f38211b71
|
|
@ -116,6 +116,7 @@
|
|||
allAddress: {},
|
||||
current_step: 1,
|
||||
completed_step: 0,
|
||||
isCheckPayment: true,
|
||||
is_customer_exist: 0,
|
||||
disable_button: false,
|
||||
reviewComponentKey: 0,
|
||||
|
|
@ -204,7 +205,7 @@
|
|||
isManualValidationFail = this.validateAddressForm();
|
||||
}
|
||||
|
||||
if (!isManualValidationFail) {
|
||||
if (! isManualValidationFail) {
|
||||
this.$validator.validateAll(scope)
|
||||
.then(result => {
|
||||
if (result) {
|
||||
|
|
@ -403,24 +404,29 @@
|
|||
savePayment: function() {
|
||||
this.disable_button = true;
|
||||
|
||||
this.$http.post("{{ route('shop.checkout.save-payment') }}", {'payment': this.selected_payment_method})
|
||||
.then(response => {
|
||||
this.disable_button = false;
|
||||
if (this.isCheckPayment) {
|
||||
this.isCheckPayment = false;
|
||||
|
||||
this.showSummarySection = true;
|
||||
this.$http.post("{{ route('shop.checkout.save-payment') }}", {'payment': this.selected_payment_method})
|
||||
.then(response => {
|
||||
this.isCheckPayment = true;
|
||||
this.disable_button = false;
|
||||
|
||||
reviewHtml = Vue.compile(response.data.html)
|
||||
this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
|
||||
this.current_step = this.step_numbers[response.data.jump_to_section];
|
||||
this.showSummarySection = true;
|
||||
|
||||
document.body.style.cursor = 'auto';
|
||||
reviewHtml = Vue.compile(response.data.html)
|
||||
this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
|
||||
this.current_step = this.step_numbers[response.data.jump_to_section];
|
||||
|
||||
this.getOrderSummary();
|
||||
})
|
||||
.catch(error => {
|
||||
this.disable_button = false;
|
||||
this.handleErrorResponse(error.response, 'payment-form')
|
||||
});
|
||||
document.body.style.cursor = 'auto';
|
||||
|
||||
this.getOrderSummary();
|
||||
})
|
||||
.catch(error => {
|
||||
this.disable_button = false;
|
||||
this.handleErrorResponse(error.response, 'payment-form')
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
placeOrder: function() {
|
||||
|
|
@ -482,13 +488,17 @@
|
|||
},
|
||||
|
||||
backToSavedBillingAddress: function() {
|
||||
this.isPlaceOrderEnabled = true;
|
||||
this.new_billing_address = false;
|
||||
setTimeout(() => {
|
||||
this.validateForm('address-form');
|
||||
}, 0);
|
||||
},
|
||||
|
||||
backToSavedShippingAddress: function() {
|
||||
this.isPlaceOrderEnabled = true;
|
||||
this.new_shipping_address = false;
|
||||
setTimeout(() => {
|
||||
this.validateForm('address-form');
|
||||
}, 0);
|
||||
},
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -67,12 +67,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="message"></div>
|
||||
|
||||
<div
|
||||
class="control-group"
|
||||
:class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
|
||||
|
||||
<div :class="`col-12 mt15 has-error ${errors.has('address-form.billing[address_id]') ? 'has-error' : ''}`">
|
||||
<span
|
||||
class="control-error"
|
||||
v-if="errors.has('address-form.billing[address_id]')">
|
||||
|
|
@ -88,7 +83,7 @@
|
|||
class="ml0"
|
||||
id="billing[use_for_shipping]"
|
||||
name="billing[use_for_shipping]"
|
||||
@change="validateForm('address-form')"
|
||||
@change="setTimeout(() => validateForm('address-form'), 0)"
|
||||
v-model="address.billing.use_for_shipping" />
|
||||
|
||||
<span class="ml-5">
|
||||
|
|
@ -147,14 +142,13 @@
|
|||
<i class="rango-arrow"></i>
|
||||
</div>
|
||||
|
||||
<div class="address-container row mb30" slot="body">
|
||||
<div class="address-container row mb30 remove-padding-margin" slot="body">
|
||||
<div
|
||||
class="col-lg-6 address-holder"
|
||||
class="col-lg-6 address-holder pl0"
|
||||
v-for='(addresses, index) in this.allAddress'>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body row">
|
||||
|
||||
<div class="col-1">
|
||||
<input
|
||||
type="radio"
|
||||
|
|
@ -187,7 +181,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-6 address-holder">
|
||||
<div class="col-lg-6 address-holder pl0">
|
||||
<div class="card">
|
||||
<div class="card-body add-address-button">
|
||||
<div class="cursor-pointer" @click="newShippingAddress()">
|
||||
|
|
@ -200,9 +194,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="message"></div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
|
||||
<div :class="`col-12 mt15 has-error pl0 ${errors.has('address-form.shipping[address_id]') ? 'has-error' : ''}`">
|
||||
<span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
|
||||
@{{ errors.first('address-form.shipping[address_id]') }}
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
|
||||
<button
|
||||
type="submit"
|
||||
class="theme-btn ml10 mb20" @click="showModal('deleteProfile')" >
|
||||
class="theme-btn mb20" @click="showModal('deleteProfile')" >
|
||||
{{ __('shop::app.customer.account.address.index.delete') }}
|
||||
</button>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue