From 1d39d391b82355f578dc87da2638d31c869f880a Mon Sep 17 00:00:00 2001
From: jithendraprasad9999 <jithendra.prasad@icuboid.com>
Date: Wed, 10 Aug 2022 16:01:34 +0530
Subject: [PATCH 1/2] Checkout attribute validation from Backend And unified
 checkout buttons code

---
 .../Views/ShoppingCart/CartSummary.cshtml     | 44 +++++++------------
 .../ShoppingCart/_CheckoutAttributes.cshtml   |  6 +--
 .../Views/ShoppingCart/_ModelScript.cshtml    | 41 ++++++++++++++++-
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/src/Web/Grand.Web/Views/ShoppingCart/CartSummary.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/CartSummary.cshtml
index 9c9d21b57..74a13a6f7 100644
--- a/src/Web/Grand.Web/Views/ShoppingCart/CartSummary.cshtml
+++ b/src/Web/Grand.Web/Views/ShoppingCart/CartSummary.cshtml
@@ -187,42 +187,27 @@
                                                 else
                                                 {
                                                     <span class="read"
-                                                          onclick="window.open('@Url.RouteUrl("PagePopup", new { SystemName = PageSeNameConstants.Conditionsofuse })', 450, 500, true)">
+                                                      onclick="window.open('@Url.RouteUrl("PagePopup", new { SystemName = PageSeNameConstants.Conditionsofuse })', 450, 500, true)">
                                                         @Loc["Checkout.TermsOfService.Read"]
                                                     </span>
                                                 }
                                             </b-form-checkbox>
                                             <div class="alert alert-info my-2" v-show="vmorder.acceptTerms">@Loc["Checkout.TermsOfService.PleaseAccept"]</div>
                                         </div>
-                                        <div class="checkout-buttons flex-sm-nowrap flex-wrap text-center mt-3">
-                                            <b-button type="button" id="checkoutasguest" v-if="vmorder.cart.ShowCheckoutAsGuestButton" @@click="vmorder.termsCheck(true)" 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="vmorder.termsCheck(false)" variant="info" class="checkout-button mt-sm-0 mt-1">
-                                                <span v-if="vmorder.cart.IsGuest">
-                                                    @Loc["Checkout.Button.Login"]
-                                                </span>
-                                                <span v-else>
-                                                    @Loc["Checkout.Button"]
-                                                </span>
-                                            </b-button>
-                                        </div>
-                                    </template>
-                                    <template v-else>
-                                        <div class="checkout-buttons flex-sm-nowrap flex-wrap text-center mt-3">
-                                            <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">
-                                                <span v-if="vmorder.cart.IsGuest">
-                                                    @Loc["Checkout.Button.Login"]
-                                                </span>
-                                                <span v-else>
-                                                    @Loc["Checkout.Button"]
-                                                </span>
-                                            </b-button>
-                                        </div>
                                     </template>
+                                    <div class="checkout-buttons flex-sm-nowrap flex-wrap text-center mt-3">
+                                        <b-button type="button" id="checkoutasguest" v-if="vmorder.cart.ShowCheckoutAsGuestButton" @@click="vmorder.CheckoutAndValidate(true)" 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="vmorder.CheckoutAndValidate(false)" variant="info" class="checkout-button mt-sm-0 mt-1">
+                                            <span v-if="vmorder.cart.IsGuest">
+                                                @Loc["Checkout.Button.Login"]
+                                            </span>
+                                            <span v-else>
+                                                @Loc["Checkout.Button"]
+                                            </span>
+                                        </b-button>
+                                    </div>
                                 </template>
                             </template>
                             <div class="addon-buttons">
@@ -232,6 +217,7 @@
                             </div>
                         </div>
                     </div>
+                    @await Component.InvokeAsync("Widget", new { widgetZone = "order_summary_content_below" })
                 </div>
             </div>
         </form>
diff --git a/src/Web/Grand.Web/Views/ShoppingCart/_CheckoutAttributes.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/_CheckoutAttributes.cshtml
index 5091f1310..d2b1f7e46 100644
--- a/src/Web/Grand.Web/Views/ShoppingCart/_CheckoutAttributes.cshtml
+++ b/src/Web/Grand.Web/Views/ShoppingCart/_CheckoutAttributes.cshtml
@@ -15,10 +15,8 @@
             </template>
             <template v-if="attribute.AttributeControlType == 1">
                 <label :for="'checkout_attribute_' + attribute.Id" class="sr-only">checkout_attribute_{{attribute.Id}}</label>
-                <select :id="'checkout_attribute_' + attribute.Id" class="form-control custom-select" onchange="checkoutAttributeChange()" :name="'checkout_attribute_' + attribute.Id">
-                    <template v-if="attribute.IsRequired == false">
-                        <option value="">---</option>
-                    </template>
+                <select :id="'checkout_attribute_' + attribute.Id" class="form-control custom-select" onchange="checkoutAttributeChange()" :name="'checkout_attribute_' + attribute.Id">                 
+                    <option value="">---</option>                  
                     <option v-for="attributeValue in attribute.Values" :selected="attributeValue.IsPreSelected" :value="attributeValue.Id">
                         <template v-if="attributeValue.PriceAdjustment == null">
                             {{attributeValue.Name}}
diff --git a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
index 87108899e..3770608e9 100644
--- a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
+++ b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
@@ -63,7 +63,7 @@
             termsCheck(guest) {
                 if (vmorder.cart.MinOrderSubtotalWarning == null) {
                     if (this.terms) {
-                        if (guest) {
+                        if (guest) {                          
                             window.location = '@Url.RouteUrl("Checkout")';
                         } else {
                             document.getElementById('shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');
@@ -75,6 +75,43 @@
                         vmorder.acceptTerms = true;
                     }
                 }
+            },
+             CheckoutAndValidate(guest) {
+                 if (vmorder.cart.MinOrderSubtotalWarning == null) {
+                     if (vmorder.cart.TermsOfServiceOnShoppingCartPage) {
+                         if (this.terms) {
+                             if (guest) {
+                                 vmorder.SafeNavigateToCheckout();
+                             } else {
+                                 document.getElementById('shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');
+                                 document.getElementById('shopping-cart-form').submit();
+                             }
+                             vmorder.acceptTerms = false;
+                         }
+                         else {
+                             vmorder.acceptTerms = true;
+                         }
+                     } else {
+                         if (guest) {
+                             vmorder.SafeNavigateToCheckout();
+                         } else {
+                             document.getElementById('shopping-cart-form').setAttribute('action', '@Url.RouteUrl("StartCheckout")');
+                             document.getElementById('shopping-cart-form').submit();
+                         }
+                     }
+                 }
+            },
+            SafeNavigateToCheckout(){
+                axios({
+                    url: '@Url.Action("Index", "Checkout")',                  
+                    method: 'get',
+                }).then(function(response) {
+                   if (response.status === 200) {
+                       window.location.href = response.request.responseURL;
+                }
+                }).catch(function(error) {
+                    alert(error)
+                });
             },
             ApplyGiftVoucher(href) {
                 var bodyFormData = new FormData();
@@ -190,6 +227,7 @@
                 });
             },
             deleteitem(href) {
+                document.getElementById("app").setAttribute("v-cloak", true);
                 axios({
                     method: 'post',
                     url: href,
@@ -205,6 +243,7 @@
                         document.querySelector('.qty-indicator.cart-qty').innerText = response.data.totalproducts;
                     }
                 }).then(function () {
+                    document.getElementById("app").removeAttribute("v-cloak", true);
                     this.vmorder.updateTotals();
                 });
             },

From 40020bbdf7da6678f083352320c993d5e268f2d5 Mon Sep 17 00:00:00 2001
From: jithendraprasad9999 <jithendra.prasad@icuboid.com>
Date: Wed, 10 Aug 2022 16:19:03 +0530
Subject: [PATCH 2/2] corrected the path

---
 src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
index 3770608e9..4f38f8c85 100644
--- a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
+++ b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml
@@ -103,7 +103,7 @@
             },
             SafeNavigateToCheckout(){
                 axios({
-                    url: '@Url.Action("Index", "Checkout")',                  
+                    url: "/Checkout/Index",                  
                     method: 'get',
                 }).then(function(response) {
                    if (response.status === 200) {