Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

checkout - navigation changes

DanielŻuławskie6a00a4f5385
diff --git a/src/Web/Grand.Web/Views/Checkout/Start.cshtml b/src/Web/Grand.Web/Views/Checkout/Start.cshtml
index fc2279363..d176ecec8 100644
--- a/src/Web/Grand.Web/Views/Checkout/Start.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Start.cshtml
@@ -42,23 +42,23 @@
@if (Model.ShippingRequired)
{
<div class="card-header" role="tab">
- <button block v-b-toggle.opc-shipping id="button-shipping" class="btn btn-info">@shippingAddressStepNumber. @Loc["Checkout.ShippingAddress"]</button>
+ <button block v-b-toggle.opc-shipping id="button-shipping" ref="buttonShipping" class="btn btn-info">@shippingAddressStepNumber. @Loc["Checkout.ShippingAddress"]</button>
</div>
}
<div class="card-header" role="tab">
- <button block v-b-toggle.opc-billing id="button-billing" class="allow btn btn-info">@billingAddressStepNumber. @Loc["Checkout.BillingAddress"]</button>
+ <button block v-b-toggle.opc-billing id="button-billing" ref="buttonBilling" class="allow btn btn-info">@billingAddressStepNumber. @Loc["Checkout.BillingAddress"]</button>
</div>
@if (Model.ShippingRequired)
{
<div class="card-header" role="tab">
- <button block v-b-toggle.opc-shipping-method id="button-shipping-method" class="btn btn-info">@shippingMethodStepNumber. @Loc["Checkout.ShippingMethod"]</button>
+ <button block v-b-toggle.opc-shipping-method id="button-shipping-method" ref="buttonShippingMethod" class="btn btn-info">@shippingMethodStepNumber. @Loc["Checkout.ShippingMethod"]</button>
</div>
}
<div class="card-header" role="tab">
- <button block v-b-toggle.opc-payment-method id="button-payment-method" class="btn btn-info">@paymentMethodStepNumber. @Loc["Checkout.PaymentMethod"]</button>
+ <button block v-b-toggle.opc-payment-method id="button-payment-method" ref="buttonPaymentMethod" class="btn btn-info">@paymentMethodStepNumber. @Loc["Checkout.PaymentMethod"]</button>
</div>
<div class="card-header" role="tab">
- <button block v-b-toggle.opc-payment-info id="button-payment-info" class="btn btn-info">@paymentInfoStepNumber. @Loc["Checkout.PaymentInfo"]</button>
+ <button block v-b-toggle.opc-payment-info id="button-payment-info" ref="buttonPaymentInfo" class="btn btn-info">@paymentInfoStepNumber. @Loc["Checkout.PaymentInfo"]</button>
</div>
<div class="card-header" role="tab">
<button block v-b-toggle.opc-confirm-order id="button-confirm-order" class="btn btn-info">@confirmOrderStepNumber. @Loc["Checkout.ConfirmOrder"]</button>
@@ -78,10 +78,10 @@
<div id="checkout-shipping-load">
<partial name="_ShippingAddress" model="Model.ShippingAddress" />
</div>
- <input type="submit" id="opc-shipping-submit" class="d-none" />
+ <input type="submit" ref="shippingSubmit" id="opc-shipping-submit" class="d-none" />
</form>
<div class="col-12 buttons py-1 px-0 mt-3" id="shipping-buttons-container">
- <input type="button" class="btn btn-info new-address-next-step-button" title="@Loc["Common.Continue"]" onclick="document.getElementById('opc-shipping-submit').click()" value="@Loc["Common.Continue"]" />
+ <input type="button" class="btn btn-info new-address-next-step-button" title="@Loc["Common.Continue"]" @if (Model.ShippingAddress.ExistingAddresses.Any()) { <text>@@click="vmorder.saveStep('vShipping', 'shippingSubmit', vm.$refs.shippingSelect.value === '')"</text> } else { <text>@@click="vmorder.saveStep('vShipping', 'shippingSubmit', true)"</text> } value="@Loc["Common.Continue"]" />
<span id="shipping-please-wait" class="please-wait" style="display: none;"> @Loc["Common.LoadingNextStep"]</span>
</div>
</div>
@@ -103,12 +103,15 @@
<partial name="_BillingWithoutShipping" model="Model.BillingAddress" />
}
</div>
- <input type="submit" id="opc-billing-submit" class="d-none" />
+ <input type="submit" ref="billingSubmit" id="opc-billing-submit" class="d-none" />
</form>
</validation-observer>
<div class="col-12 buttons py-1 mt-3 px-0" id="billing-buttons-container">
- <a class="btn btn-secondary" id="back-billing" href="#" onclick="vmorder.Checkout.back(); return false; ">@Loc["Common.Back"]</a>
- <input type="button" title="@Loc["Common.Continue"]" class="btn btn-info new-address-next-step-button" onclick="document.getElementById('opc-billing-submit').click()" value="@Loc["Common.Continue"]" />
+ @if (Model.ShippingRequired)
+ {
+ <a class="btn btn-secondary" id="back-billing" href="#" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</a>
+ }
+ <input type="button" title="@Loc["Common.Continue"]" class="btn btn-info new-address-next-step-button" @if (Model.BillingAddress.ExistingAddresses.Any()) { <text>@@click="vmorder.saveStep('vBilling', 'billingSubmit', vm.$refs.billingSelect.value === '')"</text> } else { <text>@@click="vmorder.saveStep('vBilling', 'billingSubmit', true)"</text> } value="@Loc["Common.Continue"]" />
<span class="please-wait" id="billing-please-wait" style="display: none;">@Loc["Common.LoadingNextStep"]</span>
</div>
</div>
@@ -125,8 +128,8 @@
<partial name="_ShippingMethods" model="Model" />
</div>
<div class="col-12 buttons py-1 px-0 mt-3" id="shipping-method-buttons-container">
- <a class="btn btn-secondary" href="#" id="back-shipping_method" onclick="vmorder.Checkout.back(); return false;">@Loc["Common.Back"]</a>
- <input type="button" class="btn btn-info shipping-method-next-step-button" onclick="vmorder.vShippingMethod.save()" value="@Loc["Common.Continue"]" />
+ <a class="btn btn-secondary" href="#" id="back-shipping_method" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</a>
+ <input type="button" class="btn btn-info shipping-method-next-step-button" @@click="vmorder.saveStep('vShippingMethod', null, false)" value="@Loc["Common.Continue"]" />
<span id="shipping-method-please-wait" class="please-wait" style="display: none;">@Loc["Common.LoadingNextStep"]</span>
</div>
</form>
@@ -147,9 +150,9 @@
<div class="col-12 buttons py-1 mt-3 px-0" id="payment-method-buttons-container">
@if (paymentMethodStepNumber > 1)
{
- <a class="btn btn-secondary" href="#" id="back-payment_method" onclick="vmorder.Checkout.back(); return false;">@Loc["Common.Back"]</a>
+ <a class="btn btn-secondary" href="#" id="back-payment_method" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</a>
}
- <input type="button" class="btn btn-info payment-method-next-step-button" @@click="vmorder.setDisabled(event)" onclick="vmorder.vPaymentMethod.save()" value="@Loc["Common.Continue"]" />
+ <input type="button" class="btn btn-info payment-method-next-step-button" @@click="vmorder.saveStep('vPaymentMethod', null, false);vmorder.setDisabled(event)" value="@Loc["Common.Continue"]" />
<span class="please-wait" id="payment-method-please-wait" style="display: none;">@Loc["Common.LoadingNextStep"]</span>
</div>
</div>
@@ -167,9 +170,9 @@
<div class="col-12 buttons py-1 mt-3 px-0" id="payment-info-buttons-container">
@if (!Model.HasSinglePaymentMethod || paymentMethodStepNumber > 1)
{
- <a class="btn btn-secondary" href="#" id="back-payment_info" onclick="vmorder.Checkout.back();return false;">@Loc["Common.Back"]</a>
+ <a class="btn btn-secondary" href="#" id="back-payment_info" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</a>
}
- <input type="button" class="btn btn-info payment-info-next-step-button" onclick="vmorder.vPaymentInfo.save()" value="@Loc["Common.Continue"]" />
+ <input type="button" class="btn btn-info payment-info-next-step-button" @@click="vmorder.saveStep('vPaymentInfo', null, false)" value="@Loc["Common.Continue"]" />
<span class="please-wait" id="payment-info-please-wait" style="display: none;">@Loc["Common.LoadingNextStep"]</span>
</div>
</div>
@@ -182,7 +185,7 @@
<partial name="_ConfirmOrder" />
</div>
<div id="confirm-order-buttons-container">
- <a class="btn btn-secondary sr-only" href="#" id="back-confirm_order" onclick="vmorder.Checkout.back(); return false;">@Loc["Common.Back"]</a>
+ <a class="btn btn-secondary sr-only" href="#" id="back-confirm_order" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</a>
<span class="please-wait" id="confirm-order-please-wait" style="display: none;">@Loc["Checkout.SubmittingOrder"]</span>
</div>
</div>
diff --git a/src/Web/Grand.Web/Views/Checkout/_BillingAddress.cshtml b/src/Web/Grand.Web/Views/Checkout/_BillingAddress.cshtml
index 37eb6830c..9e0c6930c 100644
--- a/src/Web/Grand.Web/Views/Checkout/_BillingAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_BillingAddress.cshtml
@@ -4,7 +4,7 @@
<div class="section select-billing-address">
<label for="billing-address-select">@Loc["Checkout.SelectBillingAddressOrEnterNewOne"]</label>
<div>
- <select name="billing_address_id" id="billing-address-select" class="custom-select address-select" title="" onchange="vmorder.vBilling.newAddress(!this.value)">
+ <select name="billing_address_id" id="billing-address-select" ref="billingSelect" class="custom-select address-select" title="" onchange="vmorder.vBilling.newAddress(!this.value)">
<template v-for="address in vmorder.BillingExistingAddresses">
<option :value="address.Id">
{{address.FirstName}}
diff --git a/src/Web/Grand.Web/Views/Checkout/_BillingWithoutShipping.cshtml b/src/Web/Grand.Web/Views/Checkout/_BillingWithoutShipping.cshtml
index 5838647f0..ddc7b0f56 100644
--- a/src/Web/Grand.Web/Views/Checkout/_BillingWithoutShipping.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_BillingWithoutShipping.cshtml
@@ -8,7 +8,7 @@
<label class="genera" for="billing-address-select">@Loc["Checkout.SelectBillingAddressOrEnterNewOne"]</label>
</div>
<div class="col-12 px-0">
- <select name="billing_address_id" id="billing-address-select" class="custom-select address-select"
+ <select name="billing_address_id" ref="billingSelect" id="billing-address-select" class="custom-select address-select"
title="" onchange="vmorder.vBilling.newAddress(!this.value)">
@foreach (var address in Model.ExistingAddresses)
{
@@ -65,11 +65,4 @@
</div>
</div>
@await Component.InvokeAsync("Widget", new { widgetZone = "checkout_billing_address_bottom" })
-</div>
-<script asp-location="Footer" asp-order="301">
- document.addEventListener("DOMContentLoaded", function () {
- if (document.getElementById("billing-address-select") == null) {
- document.querySelector('#billing-buttons-container .new-address-next-step-button').setAttribute('onclick', "vmorder.BillingAddress = true; document.getElementById('opc-billing-submit').click()");
- }
- });
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Views/Checkout/_ConfirmOrder.cshtml b/src/Web/Grand.Web/Views/Checkout/_ConfirmOrder.cshtml
index 9c2d52ea1..5335873fd 100644
--- a/src/Web/Grand.Web/Views/Checkout/_ConfirmOrder.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_ConfirmOrder.cshtml
@@ -32,8 +32,8 @@
</button>
</template>
<template v-else>
- <button class="btn btn-secondary" id="new-back-confirm_order">@Loc["Common.Back"]</button>
- <input type="button" class="btn btn-info confirm-order-next-step-button" onclick="vmorder.vConfirmOrder.save()" value="@Loc["Common.Confirm"]" />
+ <button class="btn btn-secondary" id="new-back-confirm_order" @@click="vmorder.backStep(vmorder.previousStep)">@Loc["Common.Back"]</button>
+ <input type="button" class="btn btn-info confirm-order-next-step-button" @@click="vmorder.vConfirmOrder.save()" value="@Loc["Common.Confirm"]" />
</template>
</div>
</div>
diff --git a/src/Web/Grand.Web/Views/Checkout/_ShippingAddress.cshtml b/src/Web/Grand.Web/Views/Checkout/_ShippingAddress.cshtml
index 2fa219e54..dd034b1e7 100644
--- a/src/Web/Grand.Web/Views/Checkout/_ShippingAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_ShippingAddress.cshtml
@@ -6,7 +6,7 @@
<div class="bill-to-same-address">
<p class="selector">
<label class="custom-control custom-checkbox">
- <input asp-for="BillToTheSameAddress" class="custom-control-input" />
+ <input asp-for="BillToTheSameAddress" class="custom-control-input" :disabled="vmorder.PickUpInStore" />
<span class="custom-control-label"></span>
<span class="custom-control-description">@Loc["Checkout.BillToTheSameAddress"]</span>
</label>
@@ -15,68 +15,69 @@
}
<partial name="_ShippingAddressPickupInStore" model="Model" />
-
- @if (Model.ExistingAddresses.Any())
- {
- <div class="select-shipping-address">
- <div class="col-12 px-0">
- <label class="genera" for="shipping-address-select">@Loc["Checkout.SelectShippingAddressOrEnterNewOne"]</label>
- </div>
- <div class="col-12 px-0">
- <select name="shipping_address_id" id="shipping-address-select" class="custom-select address-select"
- title="" onchange="vmorder.vShipping.newAddress(!this.value)">
- @foreach (var address in Model.ExistingAddresses)
- {
- var addressLine = "";
- addressLine += address.FirstName;
- addressLine += " " + address.LastName;
- if (address.StreetAddressEnabled && !String.IsNullOrEmpty(address.Address1))
- {
- addressLine += ", " + address.Address1;
- }
- if (address.CityEnabled && !String.IsNullOrEmpty(address.City))
- {
- addressLine += ", " + address.City;
- }
- if (address.StateProvinceEnabled && !String.IsNullOrEmpty(address.StateProvinceName))
- {
- addressLine += ", " + address.StateProvinceName;
- }
- if (address.ZipPostalCodeEnabled && !String.IsNullOrEmpty(address.ZipPostalCode))
- {
- addressLine += " " + address.ZipPostalCode;
- }
- if (address.CountryEnabled && !String.IsNullOrWhiteSpace(address.CountryName))
+ <div v-show="vmorder.shippingContainer">
+ @if (Model.ExistingAddresses.Any())
+ {
+ <div class="select-shipping-address">
+ <div class="col-12 px-0">
+ <label class="genera" for="shipping-address-select">@Loc["Checkout.SelectShippingAddressOrEnterNewOne"]</label>
+ </div>
+ <div class="col-12 px-0">
+ <select name="shipping_address_id" ref="shippingSelect" id="shipping-address-select" class="custom-select address-select"
+ onchange="vmorder.vShipping.newAddress(!this.value)">
+ @foreach (var address in Model.ExistingAddresses)
{
- addressLine += ", " + address.CountryName;
+ var addressLine = "";
+ addressLine += address.FirstName;
+ addressLine += " " + address.LastName;
+ if (address.StreetAddressEnabled && !String.IsNullOrEmpty(address.Address1))
+ {
+ addressLine += ", " + address.Address1;
+ }
+ if (address.CityEnabled && !String.IsNullOrEmpty(address.City))
+ {
+ addressLine += ", " + address.City;
+ }
+ if (address.StateProvinceEnabled && !String.IsNullOrEmpty(address.StateProvinceName))
+ {
+ addressLine += ", " + address.StateProvinceName;
+ }
+ if (address.ZipPostalCodeEnabled && !String.IsNullOrEmpty(address.ZipPostalCode))
+ {
+ addressLine += " " + address.ZipPostalCode;
+ }
+ if (address.CountryEnabled && !String.IsNullOrWhiteSpace(address.CountryName))
+ {
+ addressLine += ", " + address.CountryName;
+ }
+ <option value="@(address.Id)">@(addressLine)</option>
}
- <option value="@(address.Id)">@(addressLine)</option>
- }
- <option value="" selected="@Model.NewAddressPreselected">@Loc["Checkout.NewAddress"]</option>
- </select>
- </div>
- </div>
- }
- @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_shipping_address_middle" })
- <div class="new-shipping-address" id="shipping-new-address-form">
- <div class="enter-address">
- @{
- var dataDictAddress = new ViewDataDictionary(ViewData);
- dataDictAddress.TemplateInfo.HtmlFieldPrefix = "ShippingNewAddress";
- <partial name="_CreateOrUpdateAddress" model="Model.NewAddress" view-data="dataDictAddress" />
- }
- <div asp-validation-summary="ModelOnly" class="message-error"></div>
- <template v-if="vmorder.shippingAddressErrors !== null">
- <div class="alert alert-danger">
- <ul class="m-0 p-0">
- <template v-for="message in vmorder.shippingAddressErrors">
- <li>
- {{message}}
- </li>
- </template>
- </ul>
+ <option value="" selected="@Model.NewAddressPreselected">@Loc["Checkout.NewAddress"]</option>
+ </select>
</div>
- </template>
+ </div>
+ }
+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_shipping_address_middle" })
+ <div class="new-shipping-address" id="shipping-new-address-form" ref="newShippingAddress">
+ <div class="enter-address">
+ @{
+ var dataDictAddress = new ViewDataDictionary(ViewData);
+ dataDictAddress.TemplateInfo.HtmlFieldPrefix = "ShippingNewAddress";
+ <partial name="_CreateOrUpdateAddress" model="Model.NewAddress" view-data="dataDictAddress" />
+ }
+ <div asp-validation-summary="ModelOnly" class="message-error"></div>
+ <template v-if="vmorder.shippingAddressErrors !== null">
+ <div class="alert alert-danger">
+ <ul class="m-0 p-0">
+ <template v-for="message in vmorder.shippingAddressErrors">
+ <li>
+ {{message}}
+ </li>
+ </template>
+ </ul>
+ </div>
+ </template>
+ </div>
</div>
</div>
@await Component.InvokeAsync("Widget", new { widgetZone = "checkout_shipping_address_bottom" })
diff --git a/src/Web/Grand.Web/Views/Checkout/_ShippingAddressPickupInStore.cshtml b/src/Web/Grand.Web/Views/Checkout/_ShippingAddressPickupInStore.cshtml
index 7d15f75cf..bf86050a8 100644
--- a/src/Web/Grand.Web/Views/Checkout/_ShippingAddressPickupInStore.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_ShippingAddressPickupInStore.cshtml
@@ -6,7 +6,7 @@
<div class="section pickup-in-store">
<p class="selector">
<label class="custom-control custom-checkbox">
- <input asp-for="PickUpInStore" class="custom-control-input" onclick="vmorder.vShipping.togglePickUpInStore(this)" />
+ <input asp-for="PickUpInStore" class="custom-control-input" v-model="vmorder.PickUpInStore" />
<span class="custom-control-label"></span>
<span class="custom-control-description" for="@Html.IdFor(model => model.PickUpInStore)">
@Loc["Checkout.PickupPoints"]
diff --git a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js
index 365805bcb..109f2510e 100644
--- a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js
+++ b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js
@@ -59,9 +59,35 @@ var vmorder = new Vue({
selectedShippingMethod: 0,
shippingAddressErrors: null,
billingAddressErrors: null,
+ PickUpInStore: false,
+ shippingContainer: true,
+ validPayment: true,
+ previousStep: [],
}
},
methods: {
+ saveStep(step, submitter, form) {
+ if (this.PickUpInStore && step === 'vShipping') {
+ vmorder[step].save();
+ } else {
+ if (form) {
+ if (step === 'vBilling') {
+ vmorder.BillingAddress = true;
+ } else {
+ vmorder.BillingAddress = false;
+ }
+ vm.$refs[submitter].click();
+ } else {
+ vmorder[step].save();
+ }
+ }
+ },
+ backStep(step) {
+ const last = step[step.length - 1];
+ vmorder.Checkout.back();
+ vm.$refs[last].click();
+ vmorder.previousStep.pop();
+ },
formCheckoutSubmit() {
if (vmorder.BillingAddress) {
vmorder.vBilling.save();
@@ -204,6 +230,7 @@ var vmorder = new Vue({
vmorder.PaymentViewComponentName = model.PaymentViewComponentName;
vmorder.PaymentInfo = true;
vmorder.paymentBusy = true;
+ vmorder.validPayment = true;
document.querySelector(".payment-info-next-step-button").classList.add("disabled");
document.querySelector(".payment-info-next-step-button").setAttribute("onclick", "vmorder.vPaymentInfo.save()");
axios({
@@ -237,11 +264,6 @@ var vmorder = new Vue({
vmorder.Confirm = true;
- setTimeout(function () {
- var c_back = document.getElementById('back-confirm_order').getAttribute('onclick');
- document.getElementById('new-back-confirm_order').setAttribute('onclick', c_back);
- }, 300);
-
this.updateOrderSummary(true);
vmorder.updateTotals();
}
@@ -302,51 +324,8 @@ var vmorder = new Vue({
if (isNew) {
this.resetSelectedAddress();
document.querySelector('#shipping-new-address-form').style.display = 'block';
- document.querySelector('#shipping-buttons-container .new-address-next-step-button').setAttribute('onclick', "document.getElementById('opc-shipping-submit').click()");
} else {
document.querySelector('#shipping-new-address-form').style.display = 'none';
- document.querySelector('#shipping-buttons-container .new-address-next-step-button').setAttribute('onclick', "vmorder.vShipping.save();");
- }
- },
-
- togglePickUpInStore: function (pickupInStoreInput) {
- if (pickupInStoreInput.checked) {
-
- if (document.querySelector('.select-shipping-address'))
- document.querySelector('.select-shipping-address').style.display = 'none';
-
- document.querySelector('#pickup-points-form').style.display = 'block';
- document.getElementById("BillToTheSameAddress").disabled = true;
- if (document.getElementById("select-shipping-address")) {
- if (document.getElementById("shipping-address-select").value !== '') {
- document.querySelector('#shipping-new-address-form').style.display = 'none';
- }
- } else {
- document.querySelector('#shipping-buttons-container .new-address-next-step-button').setAttribute('onclick', "document.getElementById('opc-shipping-submit').click()");
- document.querySelector('#shipping-new-address-form').style.display = 'none';
- }
- }
- else {
- if (document.querySelector('.select-shipping-address'))
- document.querySelector('.select-shipping-address').style.display = 'block';
-
- document.querySelector('#pickup-points-form').style.display = 'none';
- document.getElementById("BillToTheSameAddress").disabled = false;
- if (document.getElementById("select-shipping-address")) {
- if (document.getElementById("shipping-address-select").value == '') {
- document.querySelector('#shipping-new-address-form').style.display = 'block';
- }
- } else {
- if (document.getElementById("shipping-address-select")) {
- if (document.getElementById("shipping-address-select").value == '') {
- document.querySelector('#shipping-buttons-container .new-address-next-step-button').setAttribute('onclick', "document.getElementById('opc-shipping-submit').click()");
- document.querySelector('#shipping-new-address-form').style.display = 'block';
- }
- } else {
- document.querySelector('#shipping-new-address-form').style.display = 'block';
- }
- }
-
}
},
@@ -370,7 +349,7 @@ var vmorder = new Vue({
}).then(function (response) {
if (response.data.goto_section !== undefined) {
if (!(response.data.update_section.name == "shipping")) {
- document.querySelector('#back-' + response.data.goto_section).setAttribute('onclick', 'document.querySelector("#button-shipping").click(); vmorder.BillingAddress = false;');
+ vmorder.previousStep.push('buttonShipping');
vmorder.vShipping.nextStep(response);
}
}
@@ -419,13 +398,11 @@ var vmorder = new Vue({
vmorder.BillingNewAddressPreselected = true;
if (document.querySelector('#billing-new-address-form'))
document.querySelector('#billing-new-address-form').style.display = 'block';
- document.querySelector('#billing-buttons-container .new-address-next-step-button').setAttribute('onclick', "vmorder.BillingAddress = true; document.getElementById('opc-billing-submit').click()");
} else {
vmorder.BillingNewAddressPreselected = false;
if (document.querySelector('#billing-new-address-form'))
document.querySelector('#billing-new-address-form').style.display = 'none';
- document.querySelector('#billing-buttons-container .new-address-next-step-button').setAttribute('onclick', "vmorder.vBilling.save();");
}
},
@@ -450,7 +427,7 @@ var vmorder = new Vue({
data: data,
}).then(function (response) {
if (document.querySelector('#back-' + response.data.goto_section)) {
- document.querySelector('#back-' + response.data.goto_section).setAttribute('onclick', 'document.querySelector("#button-billing").click(); vmorder.ShippingMethod = false;');
+ vmorder.previousStep.push('buttonBilling');
}
if (response.data.wrong_billing_address) {
vmorder.billingAddressErrors = response.data.model_state;
@@ -531,7 +508,7 @@ var vmorder = new Vue({
} else {
vmorder.ShippingMethodError = undefined;
}
- document.querySelector('#back-' + response.data.goto_section).setAttribute('onclick', 'document.querySelector("#button-shipping-method").click(); vmorder.PaymentMethod = false;');
+ vmorder.previousStep.push('buttonShippingMethod');
vmorder.vShippingMethod.nextStep(response);
}).catch(function (error) {
error.axiosFailure;
@@ -609,7 +586,7 @@ var vmorder = new Vue({
}).then(function (response) {
if (response.data.goto_section !== undefined) {
vmorder.vPaymentMethod.nextStep(response);
- document.querySelector('#back-' + response.data.goto_section).setAttribute('onclick', 'document.querySelector("#button-payment-method").click(); vmorder.PaymentInfo = false;');
+ vmorder.previousStep.push('buttonPaymentMethod');
}
if (response.data.error) {
alert(response.data.message);
@@ -652,42 +629,44 @@ var vmorder = new Vue({
},
save: function () {
- if (vmorder.Checkout.loadWaiting != false) return;
+ if (vmorder.validPayment) {
+ if (vmorder.Checkout.loadWaiting != false) return;
- vmorder.Checkout.setLoadWaiting('payment-info');
- var form = document.querySelector(this.form);
- var data = new FormData(form);
-
- axios({
- url: this.saveUrl,
- method: 'post',
- data: data,
- }).then(function (response) {
- if (response.data.goto_section !== undefined) {
- document.querySelector('#back-' + response.data.goto_section).setAttribute('onclick', 'document.querySelector("#button-payment-info").click();vmorder.Confirm = false;');
- vmorder.vPaymentInfo.nextStep(response);
- }
- if (response.data.update_section !== undefined && response.data.update_section.name == 'payment-info') {
- var model = response.data.update_section.model;
- vm.PaymentViewComponentName = model.PaymentViewComponentName,
- vm.PaymentInfo = true;
+ vmorder.Checkout.setLoadWaiting('payment-info');
+ var form = document.querySelector(this.form);
+ var data = new FormData(form);
- axios({
- baseURL: '/Component/Form?Name=' + model.PaymentViewComponentName,
- method: 'post',
- data: data,
- }).then(response => {
- var html = response.data;
- document.querySelector('.payment-info .info').innerHTML = html;
- })
+ axios({
+ url: this.saveUrl,
+ method: 'post',
+ data: data,
+ }).then(function (response) {
+ if (response.data.goto_section !== undefined) {
+ vmorder.previousStep.push('buttonPaymentInfo');
+ vmorder.vPaymentInfo.nextStep(response);
+ }
+ if (response.data.update_section !== undefined && response.data.update_section.name == 'payment-info') {
+ var model = response.data.update_section.model;
+ vm.PaymentViewComponentName = model.PaymentViewComponentName,
+ vm.PaymentInfo = true;
+
+ axios({
+ baseURL: '/Component/Form?Name=' + model.PaymentViewComponentName,
+ method: 'post',
+ data: data,
+ }).then(response => {
+ var html = response.data;
+ document.querySelector('.payment-info .info').innerHTML = html;
+ })
- }
+ }
- }).catch(function (error) {
- error.axiosFailure;
- }).then(function () {
- vmorder.vPaymentInfo.resetLoadWaiting()
- });
+ }).catch(function (error) {
+ error.axiosFailure;
+ }).then(function () {
+ vmorder.vPaymentInfo.resetLoadWaiting()
+ });
+ }
},
resetLoadWaiting: function () {
@@ -823,10 +802,6 @@ var vmorder = new Vue({
if (document.querySelector("#billing-address-select")) {
vmorder.vBilling.newAddress(!document.querySelector('#billing-address-select').value);
}
- if (document.querySelector("#PickUpInStore")) {
- vmorder.vShipping.togglePickUpInStore(document.querySelector("#PickUpInStore"));
- }
-
});
},
vmresetSteps(e) {
@@ -872,6 +847,9 @@ var vmorder = new Vue({
this.otherScripts();
},
watch: {
+ PickUpInStore() {
+ this.shippingContainer = !this.shippingContainer;
+ },
terms: function () {
if (this.terms == true) {
this.acceptTerms = false;
@@ -882,13 +860,6 @@ var vmorder = new Vue({
vmorder.Checkout.init('/cart/');
}
},
- BillingAddress: function () {
- setTimeout(function () {
- if (document.getElementById("billing-address-select")) {
- document.querySelector('#billing-buttons-container .new-address-next-step-button').setAttribute('onclick', "vmorder.BillingAddress = true; document.getElementById('opc-billing-submit').click()");
- }
- }, 300);
- },
vShipping: function () {
if (this.vShipping !== null) {
if (document.getElementById("shipping-address-select")) {