From 193d660e8b2bb5fef8b969b6bdfa7947a6ced841 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 19 Nov 2024 13:14:13 -0500
Subject: [PATCH 1/4] WIP

---
 src/fmg-components/cart/cart.vue          |  1 +
 src/layouts/confirmation/confirmation.vue | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 95d9cc239..eebc23555 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="cart">
+        Should Hide Recal {{ shouldHideRecalibration }} // isInsurnce {{ isInsurance }}
         <div class="px-0" v-if="isCartReadyToLoad">
             <div
                 class="row vin-toggle flex align-items-center pt-4"
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index c15eb2995..10e6d1e92 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -111,6 +111,9 @@ import { containsRecalParts } from "@/helpers/recal-helper.js";
 export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
+        const hasRecalPriceRemoveExperiment = await store.getters.shouldHideRecalibration;
+        console.log("Has recal", hasRecalPriceRemoveExperiment);
+
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
 
         // Call APIs
@@ -155,15 +158,14 @@ export default {
         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) {
+                console.log("is NoComp OR Itac...");
                 return false;
             }
+            console.log("hasRecalPriceRemoveExperiment: ", hasRecalPriceRemoveExperiment);
+            console.log("isRecalibrationOnOrder: ", isRecalibrationOnOrder);
 
             return hasRecalPriceRemoveExperiment && isRecalibrationOnOrder;
         };
@@ -344,7 +346,9 @@ export default {
             }
             if (this.AppointmentType == AppointmentTypeStrings.DROP_OFF) {
                 if (
-                    this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)
+                    this.submittedOrder?.schedule?.routeCode.includes(
+                        RouteCodeFlags.OVERNIGHT_DROP_OFF
+                    )
                 ) {
                     return `Drop off before 5:30 PM`;
                 } else {

From a74ae7d68737c7498885d9367fd8e0d43a85c379 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 22 Nov 2024 13:03:14 -0500
Subject: [PATCH 2/4] CSR-2383 fix collapsed cart on confirmation page.

---
 src/fmg-components/cart/cart.vue          | 1 -
 src/layouts/confirmation/confirmation.vue | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 1130d3059..52049b0c9 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="cart">
-        Should Hide Recal {{ shouldHideRecalibration }} // isInsurnce {{ isInsurance }}
         <div class="px-0" v-if="isCartReadyToLoad">
             <div
                 class="row vin-toggle flex align-items-center pt-4"
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 10e6d1e92..d1a76d764 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -112,7 +112,6 @@ export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
         const hasRecalPriceRemoveExperiment = await store.getters.shouldHideRecalibration;
-        console.log("Has recal", hasRecalPriceRemoveExperiment);
 
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
 
@@ -161,11 +160,8 @@ export default {
 
         const shouldHideRecalibration = () => {
             if (isNoComp || isItac) {
-                console.log("is NoComp OR Itac...");
                 return false;
             }
-            console.log("hasRecalPriceRemoveExperiment: ", hasRecalPriceRemoveExperiment);
-            console.log("isRecalibrationOnOrder: ", isRecalibrationOnOrder);
 
             return hasRecalPriceRemoveExperiment && isRecalibrationOnOrder;
         };

From b55c6e8b7c584f3d2e116ed3cc946196243a4db1 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 22 Nov 2024 16:00:27 -0500
Subject: [PATCH 3/4] CSR-2410: fix

---
 src/fmg-components/cart/cart.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 52049b0c9..811173070 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -749,8 +749,12 @@ export default {
         recycleFeeCartItemName() {
             return this.getCmsContent("RecycleFeeTextWidget", "Text");
         },
-        requiresRecycleFeeCartItem() {
-            return !this.isRepair;
+        showRecycleFeeCartItem() {
+            if (!this.isInsurance || this.isItac || this.isNoComp) {  // CASH, ITAC, NOCOMP ORDERS
+                return !this.isRepair;
+            } else {
+                return false;
+            }
         },
         recycleFeeCartItem() {
             let cartItem = null;
@@ -759,7 +763,7 @@ export default {
                 (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE
             );
 
-            if (!recycleFeeLineItem && this.requiresRecycleFeeCartItem) {
+            if (!recycleFeeLineItem && this.showRecycleFeeCartItem) {
                 recycleFeeLineItem = {
                     partNumber: partTypeStrings.RECYCLE_FEE,
                     partType: partTypeStrings.REPLACE_FEE,

From 6919aeee0015720a795ca7d28e81b032d940c96b Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Sun, 24 Nov 2024 20:12:04 -0500
Subject: [PATCH 4/4] CSR-2407 dup check

CSR-2407 dup check will return to nextgen from heritage possibly unverified without vin so send to estimate page instead of vin-lookup
---
 src/layouts/vehicle-damage/vehicle-damage.vue | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 732e23ba9..7cce1c120 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -436,7 +436,6 @@ export default {
                 policy.policyNumber !== "";
 
             const skipVin = await skipVinLookup();
-
             if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
@@ -455,13 +454,22 @@ export default {
                             { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                         );
                     } else {
-                        this.$router.navigateWithSaving(
-                            this.navigationScenarios
-                                .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
-                        );
+                        if (store.getters.vehicle.vin) {
+                            this.$router.navigateWithSaving(
+                                this.navigationScenarios
+                                    .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            );
+                        } else {
+                            this.$router.navigateWithSaving(
+                                this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            );
+                        }
                     }
                 }
             }