Fixed checkout issue
This commit is contained in:
parent
5e754cbdfe
commit
f8db35504c
|
|
@ -277,17 +277,9 @@
|
|||
.then(function(response) {
|
||||
this_this.disable_button = false;
|
||||
|
||||
<<<<<<< HEAD
|
||||
paymentHtml = Vue.compile(response.data.html)
|
||||
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] + 1;
|
||||
this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
|
||||
=======
|
||||
if (response.data.jump_to_section == 'payment') {
|
||||
paymentHtml = Vue.compile(response.data.html)
|
||||
paymentMethods = response.data.paymentMethods;
|
||||
this_this.completedStep = 2;
|
||||
this_this.currentStep = 3;
|
||||
>>>>>>> fc920e14c53a3398cf3baf28ecf83bcb6e410d67
|
||||
|
||||
this_this.getOrderSummary();
|
||||
})
|
||||
|
|
|
|||
|
|
@ -307,13 +307,6 @@
|
|||
@endauth
|
||||
</div>
|
||||
|
||||
@auth('customer')
|
||||
<a class="btn btn-lg btn-primary" @click = backToSavedShippingAddress()>
|
||||
{{ __('shop::app.checkout.onepage.back') }}
|
||||
</a>
|
||||
@endauth
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
|
||||
<label for="shipping[first_name]" class="required">
|
||||
{{ __('shop::app.checkout.onepage.first-name') }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue