From 27d9604c92c7d627adf8fb926454366b47d5d817 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 14 Nov 2024 10:56:06 -0500
Subject: [PATCH 1/5] Use loading modal for navigation on payment-method.

---
 src/layouts/payment-method/payment-method.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 5a595a99b..f4972a054 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -525,6 +525,8 @@ export default {
         async forwardButtonAction() {
             this.forwardClicked = true;
 
+            this.$refs.loadingModal.showModal();
+
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAYMENT_METHOD_CHOICE,
                 this.paymentMethod,
@@ -575,7 +577,6 @@ export default {
             }
         },
         async setupPia() {
-            this.$refs.loadingModal.showModal();
             // we need a work order number for pia so we can pass it to safeliteHop.
             // this will create one in delete substatus.
             try {

From d5d0e7a48046ee61f392bdca6d146c4ad780390e Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Thu, 14 Nov 2024 23:47:34 +0530
Subject: [PATCH 2/5] CSR-2371

revert previous commit and check experiment for recal disclaimer
---
 src/layouts/quote/quote.vue | 9 ++++++++-
 src/store/index.js          | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index df93bd338..3f0da0131 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -436,8 +436,15 @@ export default {
                 (!this.isRecalibrationOnOrder || !this.shouldHideRecalibration)
             );
         },
+        isRecalPriceRemove() {
+            return (
+                experimentMixin.methods
+                    .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
+                    ?.toLowerCase() === "true"
+            );
+        },
         showRecalDisclaimer() {
-            return this.isRecalibrationOnOrder && this.shouldHideRecalibration;
+            return this.isRecalibrationOnOrder && this.isRecalPriceRemove;
         },
     },
     methods: {
diff --git a/src/store/index.js b/src/store/index.js
index 9ee0e6e19..ca10f8f62 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -826,6 +826,10 @@ export const getters = {
             order = state.order;
         }
 
+        if (order.payment.isInsurance) {
+            return false;
+        }
+
         return (
             experimentMixin.methods
                 .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)

From 1a124c4608806100a243c930e934f11dedbe28e0 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 14 Nov 2024 16:09:47 -0500
Subject: [PATCH 3/5] Fix failing test

---
 src/layouts/payment-method/payment-method.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/payment-method/payment-method.spec.js b/src/layouts/payment-method/payment-method.spec.js
index c9f67bca1..65c3b9a11 100644
--- a/src/layouts/payment-method/payment-method.spec.js
+++ b/src/layouts/payment-method/payment-method.spec.js
@@ -113,5 +113,7 @@ function setupMocks() {
 
     const wrapper = shallowMount(customerDetails, mountOptions);
 
+    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+
     return { wrapper };
 }

From 08a21a22a4f79bd923b3b770e6e82e9e63fa9f01 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 15 Nov 2024 08:52:02 -0500
Subject: [PATCH 4/5] CSR-2383 fix cart expand on confirmation page.

---
 src/fmg-components/cart/cart.vue          | 12 ++++++++--
 src/layouts/confirmation/confirmation.vue | 29 +++++++++++++++--------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index b7ae6c7a3..95d9cc239 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="cart">
-        <div class="px-0">
+        <div class="px-0" v-if="isCartReadyToLoad">
             <div
                 class="row vin-toggle flex align-items-center pt-4"
                 :class="[isExpanded ? 'expanded' : '']"
@@ -196,7 +196,7 @@ export default {
     },
     data() {
         return {
-            isExpanded: this.shouldHideRecalibration,
+            isExpanded: false,
             currencyFormatter: new Intl.NumberFormat("en-US", {
                 style: "currency",
                 currency: "USD",
@@ -210,6 +210,9 @@ export default {
         toggleIsExpanded() {
             this.isExpanded = !this.isExpanded;
         },
+        updateIsExpandedWithDefault() {
+            this.isExpanded = this.shouldHideRecalibration;
+        },
         getVapsPrice(packageName) {
             const vapsItems = this.getVapsCartItemsForSelectedPackage(packageName);
 
@@ -313,6 +316,11 @@ export default {
         },
     },
     computed: {
+        isCartReadyToLoad() {
+            var myReturn = this.shouldHideRecalibration !== null;
+            this.updateIsExpandedWithDefault();
+            return myReturn;
+        },
         lineItems: {
             get: function () {
                 return this.modelValue;
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 5464388fe..f7cc1e748 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -103,6 +103,7 @@ import { get12HourTimeFormat, get12HourTimeMobileFormat } from "@/helpers/date-h
 import { coverageStatus } from "@/constants/insurance";
 import { getDisplayTextForDurationLength } from "@/helpers/duration-length-helper";
 import { experimentSettings } from "@/constants/experiments";
+import experimentMixin from "@/mixins/experiment-mixin.js";
 import { partTypeStrings } from "@/constants/part-type-strings";
 import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
 import { containsRecalParts } from "@/helpers/recal-helper.js";
@@ -151,12 +152,29 @@ export default {
         const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
         const lineItemsFromSubmittedOrder = deepClone(submittedOrder.lineItems);
 
+        const isNoComp = submittedOrder?.policy?.isNoComp;
+        const isItac = submittedOrder?.policy?.isItac;
+        const isRecalibrationOnOrder = containsRecalParts(lineItemsFromSubmittedOrder);
+        const hasRecalPriceRemoveExperiment =
+            experimentMixin.methods
+                .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
+                ?.toLowerCase() === "true";
+
+        const shouldHideRecalibration = () => {
+            if (isNoComp || isItac) {
+                return false;
+            }
+
+            return hasRecalPriceRemoveExperiment && isRecalibrationOnOrder;
+        };
+
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.lineItems = lineItemsFromSubmittedOrder;
             vm.vaps = availableVaps;
             vm.submittedOrder = submittedOrder;
+            vm.shouldHideRecalibration = shouldHideRecalibration();
         });
     },
     data() {
@@ -164,22 +182,13 @@ export default {
             lineItems: [],
             vaps: [],
             submittedOrder: null,
+            shouldHideRecalibration: null,
         };
     },
     computed: {
         isRecalibrationOnOrder() {
             return containsRecalParts(this?.lineItems);
         },
-        shouldHideRecalibration() {
-            if (this.isNoComp || this.isItac) {
-                return false;
-            }
-
-            return (
-                this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() ===
-                    "true" && this.isRecalibrationOnOrder
-            );
-        },
         ShowCart() {
             if (this.isPia && this.submittedOrder?.settledTenderAmount == 0) {
                 // settleTenderAmount always shows 0 via localhost or dev.

From d0bf754338cb2f0a04283e284c5467365d7ba408 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 15 Nov 2024 09:08:12 -0500
Subject: [PATCH 5/5] Update unit test for deleted code.

---
 src/layouts/confirmation/confirmation.spec.js | 134 ------------------
 1 file changed, 134 deletions(-)

diff --git a/src/layouts/confirmation/confirmation.spec.js b/src/layouts/confirmation/confirmation.spec.js
index 2141d0591..45347491a 100644
--- a/src/layouts/confirmation/confirmation.spec.js
+++ b/src/layouts/confirmation/confirmation.spec.js
@@ -559,140 +559,6 @@ describe("computed properties...", () => {
         // Assert
         expect(testValue).toEqual("Duration: Overnight");
     });
-
-    test("NoComp should return false for shouldHideRecalibration", () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        wrapper.vm.submittedOrder = {
-            vehicle: {
-                imageUrl: "",
-            },
-            schedule: {
-                endTime: "10:00",
-                date: "2024-09-28",
-                jobMaxMinutes: 120,
-                jobMinMinutes: 60,
-                routeCode: "",
-            },
-            policy: {
-                isNoComp: true,
-            },
-            serviceLocation: store.getters.order.serviceLocation,
-        };
-        wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
-        // Act
-        const testValue = wrapper.vm.shouldHideRecalibration;
-
-        // Assert
-        expect(testValue).toEqual(false);
-    });
-    test("Itac should return false for shouldHideRecalibration", () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        wrapper.vm.submittedOrder = {
-            vehicle: {
-                imageUrl: "",
-            },
-            schedule: {
-                endTime: "10:00",
-                date: "2024-09-28",
-                jobMaxMinutes: 120,
-                jobMinMinutes: 60,
-                routeCode: "",
-            },
-            policy: {
-                isItac: true,
-            },
-            serviceLocation: store.getters.order.serviceLocation,
-        };
-        wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
-        // Act
-        const testValue = wrapper.vm.shouldHideRecalibration;
-
-        // Assert
-        expect(testValue).toEqual(false);
-    });
-    test("Not Itac/NoComp with Recal should return true for shouldHideRecalibration", async () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        const lineItems = {
-            glassParts: [
-                {
-                    partType: "RECALIBRATION",
-                },
-            ],
-        };
-
-        wrapper.vm.submittedOrder = {
-            vehicle: {
-                imageUrl: "",
-            },
-            schedule: {
-                endTime: "10:00",
-                date: "2024-09-28",
-                jobMaxMinutes: 120,
-                jobMinMinutes: 60,
-                routeCode: "",
-            },
-            policy: {
-                isItac: false,
-                isNoComp: false,
-            },
-            lineItems: {
-                glassParts: {
-                    partType: "Recalibration",
-                },
-            },
-            serviceLocation: store.getters.order.serviceLocation,
-        };
-
-        wrapper.setData({ lineItems: lineItems });
-        await wrapper.vm.$nextTick();
-
-        // Act
-        const testValue = wrapper.vm.shouldHideRecalibration;
-
-        // Assert
-        expect(testValue).toEqual(true);
-    });
-    test("Itac/NoComp with Recal should return false for shouldHideRecalibration", async () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        const lineItems = {
-            glassParts: [
-                {
-                    partType: "RECALIBRATION",
-                },
-            ],
-        };
-
-        wrapper.vm.submittedOrder = {
-            vehicle: {
-                imageUrl: "",
-            },
-            schedule: {
-                endTime: "10:00",
-                date: "2024-09-28",
-                jobMaxMinutes: 120,
-                jobMinMinutes: 60,
-                routeCode: "",
-            },
-            policy: {
-                isItac: true,
-                isNoComp: false,
-            },
-            serviceLocation: store.getters.order.serviceLocation,
-        };
-
-        wrapper.setData({ lineItems: lineItems });
-        await wrapper.vm.$nextTick();
-
-        // Act
-        const testValue = wrapper.vm.shouldHideRecalibration;
-
-        // Assert
-        expect(testValue).toEqual(false);
-    });
 });
 
 function setupMocks({ customMountOptions }) {