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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Fix #400 - return url when anonymous checkout is not allowed (#402)
Krzysztof Pajak5081917034d7
diff --git a/src/Web/Grand.Web/Views/ShoppingCart/Partials/CartSummary.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/Partials/CartSummary.cshtmlindex a5263a1a5..8727dca03 100644--- a/src/Web/Grand.Web/Views/ShoppingCart/Partials/CartSummary.cshtml+++ b/src/Web/Grand.Web/Views/ShoppingCart/Partials/CartSummary.cshtml@@ -213,7 +213,7 @@<b-button type="button" id="checkoutasguest" v-if="vmorder.cart.ShowCheckoutAsGuestButton" @@click="location.href='@Url.RouteUrl("Checkout")'" variant="secondary" class="checkout-as-guest-button mx-sm-1 mx-0">@Loc["Account.Login.CheckoutAsGuest"]</b-button>- <b-button id="checkout" name="checkout" @@click="document.querySelector('#shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');document.querySelector('#shopping-cart-form').submit();" variant="info" class="checkout-button mt-sm-0 mt-1">+ <b-button id="checkout" name="checkout" @@click="vmorder.checkout(false)" variant="info" class="checkout-button mt-sm-0 mt-1"><span v-if="vmorder.cart.IsGuest">@Loc["Checkout.Button.Login"]</span>diff --git a/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtmlindex 3aa62a6a7..bf0ab4413 100644--- a/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml+++ b/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml@@ -61,12 +61,7 @@termsCheck(guest) {if (vmorder.cart.MinOrderSubtotalWarning == null) {if (this.terms) {- if (guest) {- window.location = '@Url.RouteUrl("Checkout")';- } else {- document.getElementById('shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');- document.getElementById('shopping-cart-form').submit();- }+ vmorder.checkout(guest);vmorder.acceptTerms = false;}else {@@ -74,6 +69,19 @@}}},+ checkout(guest) {+ if (guest) {+ window.location = '@Url.RouteUrl("Checkout")';+ } else {+ if (!vmorder.cart.ShowCheckoutAsGuestButton && vmorder.cart.IsGuest) {+ window.location = '@Url.RouteUrl("Login")[email protected]("ShoppingCart")';+ }+ else {+ document.getElementById('shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');+ document.getElementById('shopping-cart-form').submit();+ }+ }+ },ApplyGiftVoucher(href) {var bodyFormData = new FormData();bodyFormData.append('giftvouchercouponcode', document.getElementById('giftvouchercouponcode').value);