From c972a0f10c580538bd0d4ef4b5777fdccb0a7da4 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 11:59:11 -0500
Subject: [PATCH 01/23] CASH-144

CASH-144 checking expired session and routing to return user from the validateSession function in analytics does not prevent the forward click.  So move the expiration check and routing to the forward and back buttons and skip the emit click when expired.
---
 src/fmg-components/nav-bar/nav-bar.vue | 25 +++++++++++++++++++++++--
 src/mixins/analytics-mixin.js          | 21 +++++++++++----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index 631e5c0e5..6f981f9e0 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,6 +45,9 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -94,10 +97,28 @@ export default {
             document.onkeydown = function (e) {
                 return false;
             };
-            this.$emit("ForwardClicked");
+             // check session expired and initSession to recreate cookies
+             if (analyticsMixin.methods.sessionExpired()) {
+                this.routeReturnUser();
+            } else {
+                this.$emit("ForwardClicked");
+            }
         },
         linkClick() {
-            this.$emit("BackClicked");
+             // check session expired and initSession to recreate cookies
+             if (analyticsMixin.methods.sessionExpired()) {
+                this.routeReturnUser();
+            } else {
+                this.$emit("BackClicked");
+            }
+        },
+        routeReturnUser() {
+            analyticsMixin.methods.initSession();
+
+            router.push({
+                path: "/",
+                query: { fmgPage: fmgPageValues.RETURN_USER },
+            });
         },
     },
 };
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 6f7f67c6f..1c70722a1 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -712,11 +712,8 @@ export default {
             return !areAllSessionCookiesSet();
         },
 
-        async validateSession() {
-            // The noSession function checks the cookies related to analytics logging(sid).  it is not the funnel info cookie.
-            // The sid cookie for analytics will expire every 30 minutes and get recreated in initSession.  If this happens
-            // and we also have the funnel cookie present, that indicates they have an existing session that is now expired
-            // so route them to the return user page.
+        // sessionExpired is true when one of the analytics cookies(sid, dxdev) has expired but we still have the funnelSessionInfo cookie
+        sessionExpired() {
             const fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE) === "true";
             const funnelCookieLastTouched = getFunnelCookie()?.LastTouched;
             if (
@@ -725,11 +722,15 @@ export default {
                 funnelCookieLastTouched !== null &&
                 funnelCookieLastTouched !== undefined
             ) {
-                await this.initSession();
-                router.push({
-                    path: "/",
-                    query: { fmgPage: fmgPageValues.RETURN_USER },
-                });
+                return true;
+            } else {
+                return false;
+            }
+        },
+
+        async validateSession() {
+            // do not init session if it is expired.  let the click event on nav-bar handle session expired logic
+            if (this.sessionExpired()) {
                 return;
             }
 

From 16093ecaf7167a1b89e8737dadaf5d99ddde66d4 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 13:43:23 -0500
Subject: [PATCH 02/23] CASH-139

CASH-139 remove fromHeritage querystring once validation is checked so expiration works on service location
---
 src/router/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index d956af773..75b01cea8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -56,6 +56,11 @@ const routes = [
                 log(" --cookie: ", getFunnelCookie());
                 log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
 
+                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
+                if (to.query) {
+                    delete to.query[queryStrings.FROM_HERITAGE];
+                }
+
                 await analyticsMixin.methods.validateSession();
 
                 if (getFunnelCookie()?.SuppressConceptFunnel) {

From a6d038870e8b3d1b03169730cc88d3ef5584541b Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 14:04:53 -0500
Subject: [PATCH 03/23] CASH-139

CASH-139 validate session out of order
---
 src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 75b01cea8..49d3b0e4f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -56,13 +56,13 @@ const routes = [
                 log(" --cookie: ", getFunnelCookie());
                 log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
 
+                await analyticsMixin.methods.validateSession();
+                
                 // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
                 if (to.query) {
                     delete to.query[queryStrings.FROM_HERITAGE];
                 }
 
-                await analyticsMixin.methods.validateSession();
-
                 if (getFunnelCookie()?.SuppressConceptFunnel) {
                     log(" --go to heritage suppressConceptFunnel: ");
                     await navigateToHeritageFunnel({ shouldSaveSession: false });

From 5dede2978f060830210d1c147bb57f855d531afd Mon Sep 17 00:00:00 2001
From: Johnny shultz <John.Shultz@safelite.com>
Date: Thu, 23 Jan 2025 16:51:53 -0500
Subject: [PATCH 04/23] CASH-109-specs

CASH-109-specs clean up on return-user.spec.js
---
 jest.config.js                              |   1 -
 src/layouts/return-user/return-user.spec.js | 312 ++++++++++++++++++++
 2 files changed, 312 insertions(+), 1 deletion(-)
 create mode 100644 src/layouts/return-user/return-user.spec.js

diff --git a/jest.config.js b/jest.config.js
index 052e1c47b..ce4aa3ad6 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -27,7 +27,6 @@ module.exports = {
     "!src/layouts/insurance/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance-company/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance-company/insurance-company-question/*.vue", // Temp test exclusion while in development
-    "!src/layouts/return-user/*.vue", // Temp test exclusion while in development
     // END
   ], // ! means exclude from coverage.
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
diff --git a/src/layouts/return-user/return-user.spec.js b/src/layouts/return-user/return-user.spec.js
new file mode 100644
index 000000000..dc631ce62
--- /dev/null
+++ b/src/layouts/return-user/return-user.spec.js
@@ -0,0 +1,312 @@
+// Components
+import returnUser from "@/layouts/return-user/return-user.vue";
+
+// Supporting Files
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper";
+import baseMixin from "@/mixins/base-mixin.js";
+import { dispatchStoreAction } from "@/mixins/base-mixin.js";
+import store from "@/store";
+import router from "@/router";
+import navbar from "@/fmg-components/nav-bar/nav-bar";
+import { Form } from "vee-validate";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
+
+import { experimentSettings } from "../../constants/experiments";
+import { storeActions } from "@/constants/store-actions";
+import buttonMain from "@/ux-components/button-main/button-main";
+
+// Constants
+
+// Setup global mocks
+let mockStoreActionData = {};
+
+let mockStoreData = {};
+let mockExperimentSettings = {
+    experiments: [
+        {
+            universeName: "ConceptFunnel",
+            settings: {
+                SuppressVinCapture: false,
+            },
+        },
+    ],
+};
+
+function resetMockStoreData() {
+    mockStoreData = {
+        vehicle: {
+            year: "2000",
+            make: "TestMake",
+            model: "TestModel",
+            style: "TestStyle",
+            carId: "TestID",
+            vin: null,
+            registration: {
+                licensePlate: null,
+            },
+        },
+        serviceLocation: {
+            address: null,
+            address2: null,
+            city: null,
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null,
+            appointmentType: null,
+            isVehicleProtected: null,
+            provider: {
+                providerNumber: null,
+                address: {
+                    streetAddress: null,
+                    city: null,
+                    state: null,
+                    zipCode: null,
+                    zipCodeCtu: null,
+                },
+            },
+            techNotes: null,
+        },
+        customer: {
+            firstName: null,
+            lastName: null,
+            emailAddress: null,
+            phoneNumber: null,
+            isSmsOptIn: null,
+        },
+        damage: {
+            isRepair: false,
+            numberOfChips: null,
+            glassToReplace: [{ glassLocation: "Windshield", glassName: "windshield" }],
+            partQuestionAnswers: null,
+            moldingQuestionAnswers: null,
+            capabilityQuestionAnswers: null,
+            dateOfLoss: null,
+            damageCause: null,
+        },
+        lineItems: {
+            glassParts: [
+                {
+                    canSafeliteRecalibrate: true,
+                    childParts: [
+                        {
+                            kitPrice: 0,
+                            laborAmount: 23.55,
+                            partNumber: "GGG FW4896",
+                            salesTax: 1.77,
+                            sellingPrice: 0,
+                        },
+                    ],
+                    color: "Green Tint",
+                    description:
+                        "solar, soundproofing, lane keep assist, lane departure warning system, w/adaptive cruise control",
+                    id: "db22fd44-10dd-456f-979b-ff88cf68cca6",
+                    kitPrice: 0,
+                    laborAmount: 60,
+                    partNumber: "FW04896GTYN",
+                    partType: "WINDSHIELD",
+                    recalibrationType: "STATIC",
+                    requiresCapabilityQuestions: false,
+                    requiresRecalibration: true,
+                    salesTax: 63.86,
+                    sellingPrice: 791.46,
+                },
+            ],
+            supportingItems: null,
+            vaps: null,
+            serverData: null,
+            promos: null,
+        },
+        payment: {
+            isInsurance: null,
+            insuranceCoverage: {
+                isVerified: null,
+                coverageStatus: null,
+                coverageType: null,
+                coverageVerificationType: null,
+            },
+            parentAccountNumber: 0,
+            billToAccountNumber: null,
+            isPia: null,
+            piaType: null,
+            inactivePromos: null,
+            paypalToken: null,
+            nextGenSettledAmount: 0,
+            ccToken: {
+                subscriptionId: null,
+                expMonth: null,
+                expYear: null,
+                cardType: null,
+                billToPostalCode: null,
+                billToFirstName: null,
+                billToLastName: null,
+                referenceNumber: null,
+                authCode: null,
+                transactionId: null,
+                transReferenceNumber: null,
+                lastFour: null,
+            },
+        },
+        policy: {
+            currentDeductible: 0,
+            policyNumber: null,
+            isItac: false,
+            additionalAuthFlag: null,
+            isNoComp: false,
+            insuranceCompanyName: null,
+        },
+        schedule: {
+            date: null,
+            startTime: null,
+            endTime: null,
+            routeCode: null,
+            jobMaxMinutes: null,
+            jobMinMinutes: null,
+        },
+        externalParameterServiceZip: {
+            zipCode: null,
+            emailAddress: null,
+        },
+        externalParameterState: { isExternalParameter: false },
+    };
+}
+
+function applyMockStoreDataToGetters() {
+    store.getters = {
+        vehicle: mockStoreData.vehicle,
+    };
+    store.state.order = mockStoreData;
+    store.state.applicationUser.experiments = mockExperimentSettings;
+}
+
+async function mockDispatchStoreAction(actionName) {
+    return mockStoreActionData[actionName];
+}
+
+jest.mock("@/mixins/base-mixin.js", () => ({
+    methods: {
+        dispatchStoreAction: jest.fn(),
+        dispatchStoreActionWithLogging: jest.fn().mockImplementation(mockDispatchStoreAction),
+    },
+}));
+
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: () => Promise.resolve("content"),
+}));
+
+jest.mock("@/helpers/heritage-integration/order-helper.js", () => ({
+    saveSession: jest.fn(),
+}));
+
+jest.mock("@/helpers/heritage-integration/cookie-helper", () => ({
+    deleteFunnelCookie: jest.fn(),
+    getFunnelCookie: jest.fn(),
+}));
+
+router.navigateWithoutSaving = jest.fn();
+router.navigateWithSaving = jest.fn();
+
+// Tests
+describe("return-user.vue", () => {
+    beforeEach(() => {
+        resetMockStoreData();
+        jest.clearAllMocks();
+    });
+
+    describe("Test prerequisites are valid and child components are rendered", () => {
+        test("expect pagePrerequisites are valid to be called", () => {
+            // Arrange
+            const wrapper = setupMocks({});
+
+            applyMockStoreDataToGetters();
+
+            // Act
+            const pagePrerequisitesSpy = jest.spyOn(wrapper.vm, "arePagePrerequisitesValid");
+
+            wrapper.vm.arePagePrerequisitesValid();
+
+            // Assert
+            expect(pagePrerequisitesSpy).toBeCalled();
+            expect(getFunnelCookie).toHaveBeenCalled();
+        });
+
+        test("renders child components", () => {
+            const wrapper = setupMocks({});
+
+            expect(wrapper.findComponent(funnelHeader).exists()).toBe(true);
+            expect(wrapper.findComponent(funnelSubHeader).exists()).toBe(true);
+            expect(wrapper.findComponent(navbar).exists()).toBe(true);
+        });
+    });
+
+    describe("Navigation", () => {
+        test("Check forwardButtonAction is working", async () => {
+            // Arrange
+            const wrapper = setupMocks({});
+            // Act
+
+            await wrapper.vm.forwardButtonAction();
+
+            // Assert
+            expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
+                navigationScenarios.CLICKED_FORWARD,
+                wrapper.vm.$route
+            );
+        });
+        test("expect functions in startOver to be called", async () => {
+            //Arrange
+            const wrapper = setupMocks({});
+
+            // Act
+            const dispatchStoreActionSpy = jest.spyOn(wrapper.vm, "dispatchStoreAction");
+
+            await wrapper.vm.$nextTick();
+            await wrapper.vm.startOver();
+
+            // Assert
+            expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
+                navigationScenarios.CLICKED_FORWARD,
+                wrapper.vm.$route
+            );
+
+            expect(dispatchStoreActionSpy).toHaveBeenCalledWith(storeActions.RESET_STATE);
+            expect(deleteFunnelCookie).toHaveBeenCalled();
+        });
+    });
+});
+
+function setupMocks({ customMountOptions }) {
+    const route = { query: { fmgPage: "return-user" }, params: {} };
+
+    baseMixin.methods.ResetExternalParamsAndHideModal = jest.fn();
+
+    const mountOptions = getMountOptions({
+        ...customMountOptions,
+        route: route,
+    });
+
+    mountOptions.global.mocks["$store"] = store;
+    mountOptions.global.mocks["$router"] = router;
+    baseMixin.methods.isFormValid = jest.fn().mockReturnValue(true);
+    mountOptions["attachTo"] = document.body;
+
+    const wrapper = shallowMount(returnUser, mountOptions, {
+        stubs: {
+            Form,
+            funnelHeader,
+            funnelSubHeader,
+            navbar,
+            loadingModal: true,
+            buttonMain,
+        },
+    });
+
+    return wrapper;
+}

From ccc3feb15ef22a8ffd00299d2015236089b6f9b3 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 24 Jan 2025 13:50:40 -0500
Subject: [PATCH 05/23] CASH-160

CASH-160 promo code lost coming from content site /cjrepair.  Added all passed querystring keys to the redirect to return-user so they're not lost.
---
 src/helpers/querystring-helper.js | 14 ++++++++++++++
 src/router/index.js               | 11 +++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/helpers/querystring-helper.js b/src/helpers/querystring-helper.js
index 38583b1ae..8c40c91b7 100644
--- a/src/helpers/querystring-helper.js
+++ b/src/helpers/querystring-helper.js
@@ -8,3 +8,17 @@ export function getQuerystringParameter(key) {
 
     return lowerCaseParams.get(key) ? lowerCaseParams.get(key) : null;
 }
+
+// if you add the fmgPage to the querystringobject before calling, then pass true for skipFmgPageName
+export function buildQuerystringObject(qso, skipFmgPageName=false) {
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+    
+    for (const [name, value] of urlParams) {
+        if (name.toLowerCase() === "fmgpage" && skipFmgPageName) {
+            continue;
+        }
+        qso[name] = value;
+    }
+    return qso;
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d956af773..73a8545f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"
 import { routingTable } from "@/router/router-constants/routing-table.js";
 import { globalEvents, globalEventTypes } from "@/constants/events";
 import { queryStrings } from "@/constants/query-strings";
-import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { getQuerystringParameter, buildQuerystringObject } from "@/helpers/querystring-helper";
 import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
@@ -108,14 +108,13 @@ const routes = [
                         var qso = {
                             fmgPage: fmgPageValues.RETURN_USER,
                         };
-                        const lg = getQuerystringParameter(queryStrings.LOG);
-                        if (lg) {
-                            qso[queryStrings.LOG] = true;
-                        }
+
+                        const newQueryString = buildQuerystringObject(qso, true);
+                        log(" -- returnUser add querystring: " + JSON.stringify(newQueryString));
 
                         router.push({
                             path: "/",
-                            query: Object.assign({}, qso),
+                            query: Object.assign({}, newQueryString),
                         });
                         return;
                     }

From 2a97b02b040637c4a8a73493a1daa1e49eda82c1 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Mon, 27 Jan 2025 17:30:40 +0530
Subject: [PATCH 06/23] CASH-57

Remove zip code matching condition causing zip code state validation
---
 .../mobile-location-modal-questions.vue       | 79 ++++++++-----------
 1 file changed, 34 insertions(+), 45 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 84087cb6e..d88bd53e2 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -241,57 +241,46 @@ export default {
             this.displayMismatchStateAndZipAlert = false;
         },
         async setMobileLocation() {
-            if (
-                this.internalModel.addressQuestions.zipCode !==
-                this.modelValue.addressQuestions.zipCode
-            ) {
-                this.resetAlerts();
-                // Validate the Zip Code
-                const zipCodeData = await this.getZipCodeData(
-                    this.internalModel.addressQuestions.zipCode,
+            this.resetAlerts();
+            // Validate the Zip Code
+            const zipCodeData = await this.getZipCodeData(
+                this.internalModel.addressQuestions.zipCode,
+                "service-location"
+            );
+
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+                this.resetModalButtonStyle();
+            } else if (zipCodeData.state != this.internalModel.addressQuestions.state) {
+                this.displayMismatchStateAndZipAlert = true;
+                this.resetModalButtonStyle();
+            } else {
+                // retrieve mobile fee part
+                const serviceZipCode = this.internalModel.addressQuestions.zipCode;
+                const mobileFeePart = await getPricedMobileFeePart(
+                    serviceZipCode,
                     "service-location"
                 );
 
-                if (!zipCodeData.isValid) {
-                    this.displayInvalidZipAlert = true;
-                    this.resetModalButtonStyle();
-                } else if (zipCodeData.state != this.internalModel.addressQuestions.state) {
-                    this.displayMismatchStateAndZipAlert = true;
-                    this.resetModalButtonStyle();
-                } else {
-                    // retrieve mobile fee part
-                    const serviceZipCode = this.internalModel.addressQuestions.zipCode;
-                    const mobileFeePart = await getPricedMobileFeePart(
-                        serviceZipCode,
-                        "service-location"
-                    );
+                // retrieve serviceability details
+                const serviceabilityDetails = await getServiceabilityDetails(
+                    serviceZipCode,
+                    null,
+                    "service-location"
+                );
 
-                    // retrieve serviceability details
-                    const serviceabilityDetails = await getServiceabilityDetails(
-                        serviceZipCode,
-                        null,
-                        "service-location"
-                    );
+                const billToAccountNumber = await getBillToAccountNumber(
+                    this.internalModel.zipCodeCtu
+                );
 
-                    const billToAccountNumber = await getBillToAccountNumber(
-                        this.internalModel.zipCodeCtu
-                    );
+                // update content related to service zip code
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-serviceability", serviceabilityDetails.data);
+                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
+                this.$emit("updated-mobile-ctu", zipCodeData.zipCodeCtu);
+                this.$emit("updated-bill-to-account-number", billToAccountNumber);
 
-                    // update content related to service zip code
-                    this.$emit("updated-mobile-fee-part", mobileFeePart);
-                    this.$emit("updated-serviceability", serviceabilityDetails.data);
-                    this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
-                    this.$emit("updated-mobile-ctu", zipCodeData.zipCodeCtu);
-                    this.$emit("updated-bill-to-account-number", billToAccountNumber);
-
-                    // update the page level model
-                    this.$emit("update:modelValue", this.internalModel);
-
-                    //Page advance to Schedule page
-                    this.$emit("mobileLocationSelected");
-                }
-            } else {
-                // Update the page level model
+                // update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
                 //Page advance to Schedule page

From c5ad651546aebfdf8e63ce95b9f5e2a1a94e5a5a Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 27 Jan 2025 13:50:21 -0500
Subject: [PATCH 07/23] CASH-109

CASH-109 do not use the funnel session cookie as it will be deleted when the browser closes.  instead, look at vuex and make sure they at least have a vehicle year to determine if they have visited the site before.
---
 src/fmg-components/nav-bar/nav-bar.vue      |  8 ++++----
 src/layouts/quote/quote.vue                 |  2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue |  2 +-
 src/mixins/analytics-mixin.js               | 10 ++--------
 src/router/index.js                         | 19 ++++++++-----------
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index 6f981f9e0..f23ecd244 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -97,16 +97,16 @@ export default {
             document.onkeydown = function (e) {
                 return false;
             };
-             // check session expired and initSession to recreate cookies
-             if (analyticsMixin.methods.sessionExpired()) {
+            // check session expired and initSession to recreate cookies
+            if (analyticsMixin.methods.sessionExpired()) {
                 this.routeReturnUser();
             } else {
                 this.$emit("ForwardClicked");
             }
         },
         linkClick() {
-             // check session expired and initSession to recreate cookies
-             if (analyticsMixin.methods.sessionExpired()) {
+            // check session expired and initSession to recreate cookies
+            if (analyticsMixin.methods.sessionExpired()) {
                 this.routeReturnUser();
             } else {
                 this.$emit("BackClicked");
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f3590cbc3..860aaf087 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -298,7 +298,7 @@ export default {
             //   to restore, uncomment the 2 lines below
             // vm.showSaveProgressPopup = showSaveProgressPopup;
             // vm.showSaveProgressModal = showSaveProgressModal;
-            
+
             vm.addableVaps = addableVaps;
             vm.lineItems = lineItems;
             vm.availableLineItems = pricingResults;
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 43f66c376..832589043 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -97,7 +97,7 @@ export default {
             // turned off Save Your Progress for 1/23/25 release
             //   to restore, uncomment line below
             // vm.showSaveProgressModal = !(emailFromStore?.length > 0);
-            
+
             // Glass Part Question dynamic component
             Object.keys(vm.$refs)
                 .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 1c70722a1..9bb8f0cda 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -712,16 +712,10 @@ export default {
             return !areAllSessionCookiesSet();
         },
 
-        // sessionExpired is true when one of the analytics cookies(sid, dxdev) has expired but we still have the funnelSessionInfo cookie
+        // sessionExpired is true when one of the analytics cookies(sid, dxdev) has expired but we still have the vehicle year in vuex
         sessionExpired() {
             const fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE) === "true";
-            const funnelCookieLastTouched = getFunnelCookie()?.LastTouched;
-            if (
-                this.noSession() &&
-                !fromHeritage &&
-                funnelCookieLastTouched !== null &&
-                funnelCookieLastTouched !== undefined
-            ) {
+            if (this.noSession() && !fromHeritage && store.getters.order.vehicle?.year > 0) {
                 return true;
             } else {
                 return false;
diff --git a/src/router/index.js b/src/router/index.js
index 49d3b0e4f..adbb2d022 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@ const routes = [
                 log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
 
                 await analyticsMixin.methods.validateSession();
-                
+
                 // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
                 if (to.query) {
                     delete to.query[queryStrings.FROM_HERITAGE];
@@ -100,14 +100,12 @@ const routes = [
                 }
                 // On entering the funnel "fresh", read cookie information, decide what to do next.
                 else if (from.redirectedFrom === undefined || fromReturnUser) {
-                    // if entering the funnel from the content site, check and see if there is already a funnel cookie.
+                    // if entering the funnel from the content site, check and see if there is already a vehicle year in vuex.
                     // if so, send them to return-user page.
-                    const funnelCookieLastTouched = getFunnelCookie()?.LastTouched;
                     if (
                         fromContentSite &&
-                        funnelCookieLastTouched !== null &&
-                        funnelCookieLastTouched !== undefined &&
-                        !toReturnUserPage
+                        !toReturnUserPage &&
+                        store.getters.order.vehicle?.year > 0
                     ) {
                         log(" --from content site navigate to return user");
                         var qso = {
@@ -178,8 +176,7 @@ const routes = [
                         // clear part related state because heritage selected a new vehicle
                         if (
                             to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            eval(getFunnelCookie()?.HasDelayedClaimRegistration &&
-                            !fromReturnUser)
+                            eval(getFunnelCookie()?.HasDelayedClaimRegistration && !fromReturnUser)
                         ) {
                             store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
                         }
@@ -187,7 +184,7 @@ const routes = [
                         // if coming from the return user page, clear the destination page so implicit navigation runs
                         log(" --to.query ", JSON.stringify(to.query));
                         if (fromReturnUser && to.query) {
-                            log( " --clear to.query");
+                            log(" --clear to.query");
                             delete to.query[queryStrings.FMG_PAGE];
 
                             //to.query[queryStrings.FMG_PAGE] = "";
@@ -571,7 +568,7 @@ async function navigate(
         const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
         const logQs = getQuerystringParameter(queryStrings.LOG);
         baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
-        
+
         log("------------- router index.js navigate start -----------------");
         log(" --scenario: ", scenario);
         log(" --isSavingNavigation: ", isSavingNavigation);
@@ -636,7 +633,7 @@ function getNavigationMap(scenario, currentRoute) {
 function log(message, data) {
     const log = getQuerystringParameter(queryStrings.LOG);
     baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
-    
+
     data = data ?? "";
     const outData = typeof data === "object" ? JSON.stringify(data) : data;
 

From a8a959e49145db218e958e3ced060211a835f287 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 27 Jan 2025 18:02:34 -0500
Subject: [PATCH 08/23] Change eval to getBoolFromString helper

---
 src/helpers/boolean-helper.js                 |  19 +++
 src/helpers/boolean-helper.spec.js            | 146 ++++++++++++++++++
 src/layouts/payment-method/payment-method.vue |   5 +-
 src/layouts/payment/payment.vue               |   3 +-
 src/layouts/quote/quote.vue                   |   5 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |   3 +-
 src/router/index.js                           |  16 +-
 7 files changed, 184 insertions(+), 13 deletions(-)
 create mode 100644 src/helpers/boolean-helper.js
 create mode 100644 src/helpers/boolean-helper.spec.js

diff --git a/src/helpers/boolean-helper.js b/src/helpers/boolean-helper.js
new file mode 100644
index 000000000..71016ef06
--- /dev/null
+++ b/src/helpers/boolean-helper.js
@@ -0,0 +1,19 @@
+export function getBoolFromString(str) {
+    // Catch edge cases
+    if (str === null || str === undefined) {
+        return false;
+    }
+
+    if (typeof str === "boolean") {
+        return str;
+    }
+
+    if (typeof str !== "string") {
+        return false;
+    }
+
+    // string logic
+    const toLower = str?.toLowerCase();
+
+    return toLower === "true";
+}
diff --git a/src/helpers/boolean-helper.spec.js b/src/helpers/boolean-helper.spec.js
new file mode 100644
index 000000000..37045d132
--- /dev/null
+++ b/src/helpers/boolean-helper.spec.js
@@ -0,0 +1,146 @@
+import { getBoolFromString } from "./boolean-helper";
+
+describe("getBoolFromString", () => {
+    describe("Happy paths", () => {
+        test("\"true\" -> true", () => {
+            const input = "true";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(true);
+        });
+
+        test("\"false\" -> false", () => {
+            const input = "false";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(false);
+        });
+
+        test("\"other string\" -> false", () => {
+            const input = "some random value";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(false);
+        });
+    });
+
+    describe("Capitalization", () => {
+        test("\"TRUE\" -> true", () => {
+            const input = "TRUE";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(true);
+        });
+
+        test("\"True\" -> true", () => {
+            const input = "True";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(true);
+        });
+
+        test("\"FALSE\" -> false", () => {
+            const input = "FALSE";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(false);
+        });
+
+        test("\"False\" -> false", () => {
+            const input = "False";
+
+            const output = getBoolFromString(input);
+
+            expect(output).toBe(false);
+        });
+    });
+
+    describe("Graceful type errors", () => {
+        describe("Boolean", () => {
+            test("true -> true", () => {
+                const input = true;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(true);
+            });
+            
+            test("false -> false", () => {
+                const input = false;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+        });
+
+        describe("Empty", () => {
+            test("undefined -> false", () => {
+                const input = undefined;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+
+            test("null -> false", () => {
+                const input = null;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+
+            test("{} -> false", () => {
+                const input = {};
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+        });
+
+        describe("Other types", () => {
+            test("1 -> false", () => {
+                const input = 1;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+
+            test("Object -> false", () => {
+                const input = {
+                    test: true,
+                    true: true,
+                };
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+
+            test("function -> false", () => {
+                const input = () => true;
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            });
+
+            test("array -> false", () => {
+                const input = [true];
+
+                const output = getBoolFromString(input);
+
+                expect(output).toBe(false);
+            })
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 38fa19611..add9339c1 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -156,6 +156,7 @@ import { mapTaxedLineItemsToStoreFormat } from "../../store";
 import { coverageStatus } from "@/constants/insurance";
 import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
 import { containsRecalParts } from "@/helpers/recal-helper";
+import { getBoolFromString } from "@/helpers/boolean-helper";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -429,7 +430,7 @@ export default {
             // prettier-ignore
             {
                 const log = getQuerystringParameter(queryStrings.LOG);
-                const logAsBool = (log?.toLowerCase() === "true");
+                const logAsBool = getBoolFromString(log);
                 if (logAsBool || !preReqResult) {
                     console.log("------------- payment-method.vue pagePrereqs start -----------------");
                     console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile);
@@ -786,7 +787,7 @@ export default {
         shouldDisplayPiaAlert() {
             return (
                 this.$route.query[queryStrings.DISPLAY_PIA_ALERT] ||
-                eval(window.history.state.displayPiaAlert)
+                getBoolFromString(window.history.state.displayPiaAlert)
             );
         },
         // Necessary to make the watcher of lineItems work
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index ce5e6bcbe..5ffb04faa 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -234,6 +234,7 @@ import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js"
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
 import { routerParams } from "@/router/router-constants/router-params";
 import { coverageStatus } from "@/constants/insurance";
+import { getBoolFromString } from "@/helpers/boolean-helper.js";
 
 export default {
     name: "payment",
@@ -800,7 +801,7 @@ export default {
         shouldDisplayPiaAlert(payMethod) {
             return (
                 this.$route.query[queryStrings.DISPLAY_PIA_ALERT] === payMethod ||
-                eval(window.history.state.displayPiaAlert)
+                getBoolFromString(window.history.state.displayPiaAlert)
             );
         },
     },
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f3590cbc3..61034fe5e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -159,6 +159,7 @@ import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigat
 import { containsRecalParts } from "@/helpers/recal-helper";
 import { externalParameterStatus } from "@/constants/external-parameters";
 import { saveQuote } from "@/helpers/heritage-integration/order-helper.js";
+import { getBoolFromString } from "@/helpers/boolean-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -298,7 +299,7 @@ export default {
             //   to restore, uncomment the 2 lines below
             // vm.showSaveProgressPopup = showSaveProgressPopup;
             // vm.showSaveProgressModal = showSaveProgressModal;
-            
+
             vm.addableVaps = addableVaps;
             vm.lineItems = lineItems;
             vm.availableLineItems = pricingResults;
@@ -407,7 +408,7 @@ export default {
                 baseMixin.methods.ResetExternalParamsAndHideModal();
             } else {
                 // user came from an external source, however, the externalParms may have been reset on service-zip, property-questions, etc...
-                if (eval(store.getters.externalParameterQuote?.isInsurance)) {
+                if (getBoolFromString(store.getters.externalParameterQuote?.isInsurance)) {
                     // did user intentionally select insurance?
                     vm.isInsuranceSelected = true;
                     vm.servicePackage = store.getters.externalParameterQuote.servicePackage;
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7cce1c120..6e9c4b198 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -102,6 +102,7 @@ import { routerParams } from "@/router/router-constants/router-params";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { nextTick } from "vue";
+import { getBoolFromString } from "@/helpers/boolean-helper";
 // DEFINE VALIDATION RULES
 defineRule("replace-options-required", required(errorMessages.REPLACE_OPTIONS_REQUIRED));
 
@@ -622,7 +623,7 @@ export default {
             );
         },
         shouldDisplayVehicleChangeAlert() {
-            return eval(window.history.state.displayVehicleChangeAlert);
+            return getBoolFromString(window.history.state.displayVehicleChangeAlert);
         },
         shouldHideBackButton() {
             return this.$store.getters.requiresVerifiedRedirecting;
diff --git a/src/router/index.js b/src/router/index.js
index 49d3b0e4f..52b9023b9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,6 +38,7 @@ import { applicationConfig } from "../constants/application-config";
 import { shouldStripPromoQueryString } from "@/helpers/promotions-helper";
 import bailout from "@/layouts/bailout/bailout";
 import { nextTick } from "vue";
+import { getBoolFromString } from "@/helpers/boolean-helper";
 
 const routes = [
     {
@@ -57,7 +58,7 @@ const routes = [
                 log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
 
                 await analyticsMixin.methods.validateSession();
-                
+
                 // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
                 if (to.query) {
                     delete to.query[queryStrings.FROM_HERITAGE];
@@ -178,8 +179,9 @@ const routes = [
                         // clear part related state because heritage selected a new vehicle
                         if (
                             to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            eval(getFunnelCookie()?.HasDelayedClaimRegistration &&
-                            !fromReturnUser)
+                            getBoolFromString(
+                                getFunnelCookie()?.HasDelayedClaimRegistration && !fromReturnUser
+                            )
                         ) {
                             store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
                         }
@@ -187,7 +189,7 @@ const routes = [
                         // if coming from the return user page, clear the destination page so implicit navigation runs
                         log(" --to.query ", JSON.stringify(to.query));
                         if (fromReturnUser && to.query) {
-                            log( " --clear to.query");
+                            log(" --clear to.query");
                             delete to.query[queryStrings.FMG_PAGE];
 
                             //to.query[queryStrings.FMG_PAGE] = "";
@@ -427,7 +429,7 @@ router.afterEach(async (to, from) => {
     store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
 
     // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate
-    if (eval(window.history.state.isSavingNavigation)) {
+    if (getBoolFromString(window.history.state.isSavingNavigation)) {
         if (
             store.getters.applicationUser.savedSessionId ||
             store.getters.order.customer?.emailAddress
@@ -571,7 +573,7 @@ async function navigate(
         const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
         const logQs = getQuerystringParameter(queryStrings.LOG);
         baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
-        
+
         log("------------- router index.js navigate start -----------------");
         log(" --scenario: ", scenario);
         log(" --isSavingNavigation: ", isSavingNavigation);
@@ -636,7 +638,7 @@ function getNavigationMap(scenario, currentRoute) {
 function log(message, data) {
     const log = getQuerystringParameter(queryStrings.LOG);
     baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
-    
+
     data = data ?? "";
     const outData = typeof data === "object" ? JSON.stringify(data) : data;
 

From 009f07df057dd9ee272c5c269d995165672eaf91 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 27 Jan 2025 18:06:01 -0500
Subject: [PATCH 09/23] Prettier + parenthesis change

---
 src/helpers/boolean-helper.spec.js | 20 ++++++++++----------
 src/helpers/querystring-helper.js  |  6 +++---
 src/router/index.js                |  5 ++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/helpers/boolean-helper.spec.js b/src/helpers/boolean-helper.spec.js
index 37045d132..189bd2a78 100644
--- a/src/helpers/boolean-helper.spec.js
+++ b/src/helpers/boolean-helper.spec.js
@@ -2,7 +2,7 @@ import { getBoolFromString } from "./boolean-helper";
 
 describe("getBoolFromString", () => {
     describe("Happy paths", () => {
-        test("\"true\" -> true", () => {
+        test('"true" -> true', () => {
             const input = "true";
 
             const output = getBoolFromString(input);
@@ -10,7 +10,7 @@ describe("getBoolFromString", () => {
             expect(output).toBe(true);
         });
 
-        test("\"false\" -> false", () => {
+        test('"false" -> false', () => {
             const input = "false";
 
             const output = getBoolFromString(input);
@@ -18,7 +18,7 @@ describe("getBoolFromString", () => {
             expect(output).toBe(false);
         });
 
-        test("\"other string\" -> false", () => {
+        test('"other string" -> false', () => {
             const input = "some random value";
 
             const output = getBoolFromString(input);
@@ -28,7 +28,7 @@ describe("getBoolFromString", () => {
     });
 
     describe("Capitalization", () => {
-        test("\"TRUE\" -> true", () => {
+        test('"TRUE" -> true', () => {
             const input = "TRUE";
 
             const output = getBoolFromString(input);
@@ -36,7 +36,7 @@ describe("getBoolFromString", () => {
             expect(output).toBe(true);
         });
 
-        test("\"True\" -> true", () => {
+        test('"True" -> true', () => {
             const input = "True";
 
             const output = getBoolFromString(input);
@@ -44,7 +44,7 @@ describe("getBoolFromString", () => {
             expect(output).toBe(true);
         });
 
-        test("\"FALSE\" -> false", () => {
+        test('"FALSE" -> false', () => {
             const input = "FALSE";
 
             const output = getBoolFromString(input);
@@ -52,7 +52,7 @@ describe("getBoolFromString", () => {
             expect(output).toBe(false);
         });
 
-        test("\"False\" -> false", () => {
+        test('"False" -> false', () => {
             const input = "False";
 
             const output = getBoolFromString(input);
@@ -70,7 +70,7 @@ describe("getBoolFromString", () => {
 
                 expect(output).toBe(true);
             });
-            
+
             test("false -> false", () => {
                 const input = false;
 
@@ -140,7 +140,7 @@ describe("getBoolFromString", () => {
                 const output = getBoolFromString(input);
 
                 expect(output).toBe(false);
-            })
+            });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/helpers/querystring-helper.js b/src/helpers/querystring-helper.js
index 8c40c91b7..e6c488b1d 100644
--- a/src/helpers/querystring-helper.js
+++ b/src/helpers/querystring-helper.js
@@ -10,10 +10,10 @@ export function getQuerystringParameter(key) {
 }
 
 // if you add the fmgPage to the querystringobject before calling, then pass true for skipFmgPageName
-export function buildQuerystringObject(qso, skipFmgPageName=false) {
+export function buildQuerystringObject(qso, skipFmgPageName = false) {
     const queryString = window.location.search;
     const urlParams = new URLSearchParams(queryString);
-    
+
     for (const [name, value] of urlParams) {
         if (name.toLowerCase() === "fmgpage" && skipFmgPageName) {
             continue;
@@ -21,4 +21,4 @@ export function buildQuerystringObject(qso, skipFmgPageName=false) {
         qso[name] = value;
     }
     return qso;
-}
\ No newline at end of file
+}
diff --git a/src/router/index.js b/src/router/index.js
index f1bca935d..a0be7d09e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -176,9 +176,8 @@ const routes = [
                         // clear part related state because heritage selected a new vehicle
                         if (
                             to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            getBoolFromString(
-                                getFunnelCookie()?.HasDelayedClaimRegistration && !fromReturnUser
-                            )
+                            getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration) &&
+                            !fromReturnUser
                         ) {
                             store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
                         }

From c353fa4815417846baf716457d678c2d2a504fbd Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 28 Jan 2025 08:23:41 -0500
Subject: [PATCH 10/23] CASH-164

CASH-164 add session check on modal continue button
---
 src/digital-components/modal/modal.vue | 13 ++++++++++++-
 src/helpers/querystring-helper.js      |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 58260e831..571c0aeb8 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -45,6 +45,9 @@
 </template>
 
 <script>
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -86,7 +89,15 @@ export default {
         async validateAndEmit() {
             const validationResult = await this.validate();
             if (validationResult.valid) {
-                this.$emit("footer-button-event");
+                if (analyticsMixin.methods.sessionExpired()) {
+                    analyticsMixin.methods.initSession();
+                    router.push({
+                        path: "/",
+                        query: { fmgPage: fmgPageValues.RETURN_USER },
+                    });
+                } else {
+                    this.$emit("footer-button-event");
+                }
             } else {
                 this.resetButtonStyle();
             }
diff --git a/src/helpers/querystring-helper.js b/src/helpers/querystring-helper.js
index 8c40c91b7..e6c488b1d 100644
--- a/src/helpers/querystring-helper.js
+++ b/src/helpers/querystring-helper.js
@@ -10,10 +10,10 @@ export function getQuerystringParameter(key) {
 }
 
 // if you add the fmgPage to the querystringobject before calling, then pass true for skipFmgPageName
-export function buildQuerystringObject(qso, skipFmgPageName=false) {
+export function buildQuerystringObject(qso, skipFmgPageName = false) {
     const queryString = window.location.search;
     const urlParams = new URLSearchParams(queryString);
-    
+
     for (const [name, value] of urlParams) {
         if (name.toLowerCase() === "fmgpage" && skipFmgPageName) {
             continue;
@@ -21,4 +21,4 @@ export function buildQuerystringObject(qso, skipFmgPageName=false) {
         qso[name] = value;
     }
     return qso;
-}
\ No newline at end of file
+}

From e6df30696b9ec9b43dca4fb838b07cc8d9f6d2ba Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 28 Jan 2025 09:59:00 -0500
Subject: [PATCH 11/23] CASH-48: front end work to call new log-part-questions
 endpoint

---
 src/constants/endpoints.js                |  4 +++
 src/constants/store-actions.js            | 11 ++++---
 src/layouts/confirmation/confirmation.vue | 37 +++++++++++++++++++++++
 src/store/index.js                        | 34 +++++++++++++++++++++
 4 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index c972d8118..43bf8c926 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -168,6 +168,10 @@ const endpoints = {
         url: "/analytics/api/v1/analytics/initialize",
         method: "POST",
     },
+    LogPartQuestions: {
+        url: "/analytics/api/v1/analytics/log-part-questions",
+        method: "POST",
+    },
     GetExperimentsByUser: {
         url: "/analytics/api/v1/analytics/get-experiments",
         method: "GET",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 45a18bace..aee8d705f 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -42,10 +42,6 @@ const storeActions = {
     VALIDATE_ZIP: "validateZip",
     PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA: "priceOrderItemsAndSaveServerData",
     TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA: "taxOrderItemsAndSaveServerData",
-    LOG_EXPERIMENT_EXPOSURE: "logExperimentExposure",
-    LOG_PAGE_VIEW: "logPageView",
-    LOG_CUSTOM_EVENT: "logCustomEvent",
-    INITIALIZE_SESSION: "initializeSession",
     GET_EXPERIMENTS_BY_USER: "GetExperimentsByUser",
     RUN_EXPERIMENTS_FOR_TRIGGER: "runExperimentsForTrigger",
     CLEAR_VIN: "clearVin",
@@ -57,6 +53,13 @@ const storeActions = {
     GET_BILL_TO_ACCOUNT_NUMBER: "getBillToAccountNumber",
     GET_RECAL_PARTS_AND_SAVE_TO_LINE_ITEMS: "getRecalPartsAndSaveToLineItems",
 
+    // Analytics
+    LOG_EXPERIMENT_EXPOSURE: "logExperimentExposure",
+    LOG_PAGE_VIEW: "logPageView",
+    LOG_CUSTOM_EVENT: "logCustomEvent",
+    INITIALIZE_SESSION: "initializeSession",
+    LOG_PART_QUESTIONS: "logPartQuestions",
+
     // DEPENDENCY MUTATIONS
     RESET_VEHICLE_STATE_AND_DEPENDENCIES: "resetVehicleStateAndDependencies",
     RESET_DAMAGE_STATE_AND_DEPENDENCIES: "resetDamageAndDependencies",
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 90886a9b7..26c0fd4a5 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -114,6 +114,43 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const hasRecalPriceRemoveExperiment = await store.getters.shouldHideRecalibration;
 
+        // send part question data to SPS API for logging
+        const orderFromStore = await deepClone(store.getters.order);
+        const applicationUserFromStore =  await deepClone(store.getters.applicationUser);
+        const ctu = orderFromStore.workOrderNumber?.split("-")[0];
+        const partsOrQuestions = applicationUserFromStore.pageData["part-questions"].partsOrQuestions;
+        const onlyPartsWithQuestions = partsOrQuestions.filter((part) => {
+            return part.partQuestions?.length > 0;
+        });
+
+        onlyPartsWithQuestions.forEach(part => {
+            const payloadPartQuestions = [];
+            part.partQuestions.forEach(question => {
+                payloadPartQuestions.push({
+                    questionSeq: question.questionSequence,
+                    questionText: question.questionText,
+                    answerText: question.answerSelected.split("|")[3],
+                    basePart: question.answerSelected.split("|")[2],
+                });
+            });
+            const payload = {
+                eon: orderFromStore.eon,
+                ctu: ctu,
+                workOrderId: orderFromStore.workOrderId,
+                workOrderNumber: orderFromStore.workOrderNumber,
+                carId: orderFromStore.vehicle.carId,
+                glassLocation: part.glassLocation,
+                partQuestions: payloadPartQuestions,
+            };
+
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.LOG_PART_QUESTIONS,
+                payload,
+                false
+            );
+        });
+
+        // Create order
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
 
         // Call APIs
diff --git a/src/store/index.js b/src/store/index.js
index f423fb58d..ede3955cc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1437,6 +1437,40 @@ export const actions = {
             });
     },
 
+    logPartQuestions(
+        context,
+        {
+            eon,
+            ctu,
+            workOrderId,
+            workOrderNumber,
+            carId,
+            glassLocation,
+            partQuestions,
+            userAgent,
+        }
+    ) {
+
+        var payload = {
+            applicationName: applicationConfig.ANALYTICS_APPLICATION_NAME,
+            eon: eon,
+            ctu: ctu,
+            workOrderId: workOrderId,
+            workOrderNumber: workOrderNumber,
+            carId: carId,
+            glassLocation: glassLocation,
+            partQuestions: partQuestions,
+            userAgent: navigator.userAgent
+        };
+
+        return globalMethods
+            .callHttpClient({
+                method: endpoints.LogPartQuestions.method,
+                endpoint: endpoints.LogPartQuestions.url,
+                payload: payload,
+            });
+    },
+
     // Misc Actions
     setReferralInformation(context, { referralNumber, referralDate, referralCorrelationId, eon }) {
         context.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);

From e6df11f3f6472edd7761103b2440dfb55dd29a08 Mon Sep 17 00:00:00 2001
From: Johnny shultz <John.Shultz@safelite.com>
Date: Tue, 28 Jan 2025 14:31:24 -0500
Subject: [PATCH 12/23] Cash-93

CASH-93 added log-enabled header
---
 src/constants/header-keys.js | 1 +
 src/global-methods.js        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js
index 2f7598244..d9b3578c4 100644
--- a/src/constants/header-keys.js
+++ b/src/constants/header-keys.js
@@ -5,4 +5,5 @@ export const headerKeys = {
     SESSION_SEQUENCE_NUMBER: "X-Session-Sequence-Number",
     TRANSACTION_ID: "X-Transaction-Id",
     EON: "X-Enterprise-Order-Number",
+    LOG_ENABLED: "log-enabled"
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index 77255e99d..ce82a4c3f 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -70,6 +70,7 @@ export default {
                 [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
                 [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
                 [headerKeys.EON]: order?.eon,
+                [headerKeys.LOG_ENABLED]: store.getters.applicationUser.loggingOption,
             };
 
             axios({

From 134c78204c26fe96d5b1010e56ebff67539df412 Mon Sep 17 00:00:00 2001
From: Johnny shultz <John.Shultz@safelite.com>
Date: Tue, 28 Jan 2025 14:44:36 -0500
Subject: [PATCH 13/23] CASH-93

CASH-93 added null check to header
---
 src/global-methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/global-methods.js b/src/global-methods.js
index ce82a4c3f..164900c33 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -70,7 +70,7 @@ export default {
                 [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
                 [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
                 [headerKeys.EON]: order?.eon,
-                [headerKeys.LOG_ENABLED]: store.getters.applicationUser.loggingOption,
+                [headerKeys.LOG_ENABLED]: store.getters.applicationUser.loggingOption ?? false,
             };
 
             axios({

From c9b9476976cf691265a4d075706672f38eb85a52 Mon Sep 17 00:00:00 2001
From: Johnny shultz <John.Shultz@safelite.com>
Date: Tue, 28 Jan 2025 15:04:12 -0500
Subject: [PATCH 14/23] Cash-93

CASH- 93 include undefined in check
---
 src/global-methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/global-methods.js b/src/global-methods.js
index 164900c33..ba6cec1ec 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -70,7 +70,7 @@ export default {
                 [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
                 [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
                 [headerKeys.EON]: order?.eon,
-                [headerKeys.LOG_ENABLED]: store.getters.applicationUser.loggingOption ?? false,
+                [headerKeys.LOG_ENABLED]: store.getters.applicationUser?.loggingOption ?? false,
             };
 
             axios({

From 833d6f248a483a88a4113449a390ce5289a4197c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 28 Jan 2025 19:14:43 -0500
Subject: [PATCH 15/23] CASH-48: update application name value

---
 src/store/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index c45fe7eee..fa83032d5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1458,9 +1458,8 @@ export const actions = {
             userAgent,
         }
     ) {
-
         var payload = {
-            applicationName: applicationConfig.ANALYTICS_APPLICATION_NAME,
+            applicationName: applicationConfig.APPLICATION_NAME,
             eon: eon,
             ctu: ctu,
             workOrderId: workOrderId,

From 042e8962352a96f3623a831b55caf34b7d645c48 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Wed, 29 Jan 2025 11:14:31 -0500
Subject: [PATCH 16/23] CASH-69: Add MSR experiment. Filter recal part by
 partType instead of part number

---
 src/constants/experiments.js                       |  2 ++
 src/constants/part-number-strings.js               |  7 +++++++
 .../service-location/service-location.spec.js      |  4 ++++
 src/layouts/service-location/service-location.vue  | 14 ++++++++++++--
 src/store/index.js                                 | 14 ++++++++------
 5 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 src/constants/part-number-strings.js

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index 83555fc04..92d27a4a1 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -1,6 +1,7 @@
 const experimentUniverses = {
     CONCEPT_FUNNEL: "ConceptFunnel",
     RECAL_PRICE_REMOVAL: "NextGen_RecalPriceRemoval",
+    MSR: "MSR",
 };
 
 const experimentSettings = {
@@ -16,6 +17,7 @@ const experimentSettings = {
     RECAL_PRICE_REMOVE: "RecalPriceRemove",
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL: "NextGen_InternalInsuranceTabDisplayThreshold",
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL: "NextGen_ExternalInsuranceTabDisplayThreshold",
+    DISPLAY_MSR: "DisplayMSR",
 };
 
 const experimentTriggers = {
diff --git a/src/constants/part-number-strings.js b/src/constants/part-number-strings.js
new file mode 100644
index 000000000..c32864a87
--- /dev/null
+++ b/src/constants/part-number-strings.js
@@ -0,0 +1,7 @@
+const partNumberStrings = {
+    // Recalibration
+    MOBILE_STATIC_RECAL_FEE: "RECAL MOBILE",
+    MOBILE_DUAL_RECAL_FEE: "RECAL MOBILEDUAL",
+};
+
+export { partNumberStrings };
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 6333082ec..54f28a89c 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -7,6 +7,7 @@ import { getMountOptions } from "@/helpers/unit-test-helper";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
+import { experimentSettings } from "@/constants/experiments";
 
 // Define Mocks
 jest.mock("@/helpers/cms-content-helper", () => ({
@@ -199,6 +200,9 @@ beforeEach(() => {
                 zipCode: "43054",
             },
         },
+        experimentSettings: {
+            settingName: experimentSettings.DISPLAY_MSR,
+        },
     };
 });
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 71bfa4b01..9addea705 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -139,6 +139,8 @@ import contentGroupModal from "@/fmg-components/content-group-modal/content-grou
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
+import experimentMixin from "@/mixins/experiment-mixin.js";
+import { experimentSettings } from "@/constants/experiments";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -151,6 +153,7 @@ import {
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { applicationConfig } from "@/constants/application-config";
 import { Provider } from "@/layouts/service-location/classes/provider";
+import { partNumberStrings } from "@/constants/part-number-strings";
 
 import store from "@/store";
 
@@ -159,7 +162,6 @@ import { defineRule } from "vee-validate";
 import { errorMessages } from "@/constants/error-messages";
 
 const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
-const MOBILE_STATIC_RECAL_FEE_PART_NUMBER = "RECAL MOBILE";
 
 // DEFINE VALIDATION RULES
 defineRule("mobile-location-required", (value) => {
@@ -319,11 +321,19 @@ export default {
         },
         isMobileStaticRecalibrationApplicable() {
             return (
+                this.displayMSR &&
                 this.isVehicleMobileStaticRecalibrationApplicable &&
-                this.mobileFeePart?.partNumber == MOBILE_STATIC_RECAL_FEE_PART_NUMBER &&
+                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
                 (this.isInsurance ? this.mobileFeePart?.isInsurable : true)
             );
         },
+        displayMSR() {
+            return (
+                experimentMixin.methods
+                    .getSettingValue(experimentSettings.DISPLAY_MSR)
+                    ?.toLowerCase() === "true"
+            );
+        },
         mobileFeeApplies() {
             if (
                 this.mobileFeePart?.laborAmount > 0 ||
diff --git a/src/store/index.js b/src/store/index.js
index fa83032d5..48c6078c7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1671,10 +1671,10 @@ export const actions = {
         var endPoint = `${endpoints.GetMobileFeePart.url}/?serviceType=${serviceType}&facilityType=${facilityType}&parentAccountNumber=${parentAccountNumber}&billToAccountNumber=${billToAccountNumber}&providerNumber=${providerNumber}&isItacOptimized=${isItacOptimized}&zipCode=${zipCode}`;
 
         if (isMobileStaticRecalibrationApplicable) {
-            const staticRecalPartNumber = getStaticRecalPartNumber(order.lineItems?.glassParts[0]);
+            const recalPartNumber = getRecalPartNumber(order.lineItems?.glassParts[0]);
             const carId = order.vehicle?.carId;
-            if (staticRecalPartNumber && carId) {
-                endPoint = `${endPoint}&partNumbers=${staticRecalPartNumber}&carId=${carId}`;
+            if (recalPartNumber && carId) {
+                endPoint = `${endPoint}&partNumbers=${recalPartNumber}&carId=${carId}`;
             }
         }
 
@@ -3718,9 +3718,11 @@ function saveExternalParameterState(externalParameterState) {
     window.sessionStorage.setItem("externalParameterState", JSON.stringify(externalParameterState));
 }
 
-//This function checks if static recalibration is available for the vehicle and returns the part number for it.
-function getStaticRecalPartNumber(glassPartsArray) {
-    const recalPart = glassPartsArray.childParts.find((item) => item.partNumber === "RECAL STATIC");
+//This function finds the recalibration part and returns the part number for it.
+function getRecalPartNumber(glassPartsArray) {
+    const recalPart = glassPartsArray.childParts.find(
+        (item) => item.partType === partTypeStrings.ADAS_RECALIBRATION
+    );
     if (recalPart) {
         return recalPart.partNumber;
     } else {

From 5e47dd7bd26b481793d0dc3fc9c5545b88ab52f2 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Wed, 29 Jan 2025 15:24:37 -0500
Subject: [PATCH 17/23] CASH-166 | Changes to how experiment endpoints are
 called

"run" endpoint changed parameter name to deviceId to better reflect what is being passed

"logExposure" sends deviceId as well as userId now because it is used by new functionality
---
 src/layouts/vehicle/vehicle.vue | 3 ++-
 src/router/index.js             | 4 ++--
 src/store/index.js              | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 1009b9713..2d78c036b 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -80,7 +80,7 @@ import vehicleQuestion from "@/layouts/vehicle/vehicle-question/vehicle-question
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { experimentUniverses } from "@/constants/experiments";
-import { getSessionKeyValue, getUserIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import { getSessionKeyValue, getUserIdValue, getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
@@ -185,6 +185,7 @@ export default {
                 storeActions.LOG_EXPERIMENT_EXPOSURE,
                 {
                     userId: getUserIdValue(),
+                    deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
                     pageName: to.query.fmgPage,
                     experiment: experimentForLogging,
diff --git a/src/router/index.js b/src/router/index.js
index a0be7d09e..76d1203b7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -797,7 +797,7 @@ async function runExperiments(nextPage) {
         await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
             {
-                userId: getDeviceIdValue(),
+                deviceId: getDeviceIdValue(),
                 triggerEvent: experimentTriggers.SITE_ENTRY,
                 triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
             },
@@ -808,7 +808,7 @@ async function runExperiments(nextPage) {
     await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
         {
-            userId: getDeviceIdValue(),
+            deviceId: getDeviceIdValue(),
             triggerEvent: experimentTriggers.PAGE_ENTRY,
             triggerValue: nextPage,
         },
diff --git a/src/store/index.js b/src/store/index.js
index f423fb58d..0e2d6370e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1244,7 +1244,7 @@ export const actions = {
     // Analytics Actions
     logExperimentExposure(
         context,
-        { payload: { userId, sessionKey, pageName, experiment }, pageNameToLog }
+        { payload: { userId, deviceId, sessionKey, pageName, experiment }, pageNameToLog }
     ) {
         return globalMethods.callHttpClient({
             method: endpoints.LogExperimentExposureIfAssigned.method,
@@ -1252,6 +1252,7 @@ export const actions = {
             payload: {
                 experimentForLogging: {
                     userId: userId,
+                    deviceId: deviceId,
                     experimentUniverseId: experiment.universeId,
                     experimentUniverseName: experiment.universeName,
                     experimentTestId: experiment.testId,
@@ -1455,7 +1456,7 @@ export const actions = {
 
     async runExperimentsForTrigger(
         context,
-        { payload: { userId, triggerEvent, triggerValue }, pageNameToLog }
+        { payload: { deviceId, triggerEvent, triggerValue }, pageNameToLog }
     ) {
         if (triggerEvent == experimentTriggers.SITE_ENTRY) {
             context.commit(storeMutations.UPDATE_TRIGGERED_SITE_ENTRY, true);
@@ -1463,7 +1464,7 @@ export const actions = {
 
         var payload = {
             applicationName: applicationConfig.APPLICATION_NAME,
-            userId: userId,
+            deviceId: deviceId,
             triggerEvent: triggerEvent,
             triggerValue: triggerValue,
             experimentOrder: context.getters.experimentOrder,

From 3456d7ff2f09c9e664dadca0ef57379939519d38 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 31 Jan 2025 08:47:46 -0500
Subject: [PATCH 18/23] CASH-177: restore SYP Save Your Progress feature

---
 src/layouts/capability-questions/capability-questions.vue | 4 +---
 src/layouts/molding-questions/molding-questions.vue       | 4 +---
 src/layouts/part-questions/part-questions.vue             | 4 +---
 src/layouts/quote/quote.vue                               | 8 ++------
 src/layouts/vehicle-parts/vehicle-parts.vue               | 4 +---
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 57567e128..1896513a1 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -64,9 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            // turned off Save Your Progress for 1/23/25 release
-            //   to restore, uncomment line below
-            // vm.showSaveProgressModal = !(emailFromStore?.length > 0);
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     await baseMixin.methods.dispatchStoreAction(
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 4da3588d7..1bcc3d7a8 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -64,9 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            // turned off Save Your Progress for 1/23/25 release
-            //   to restore, uncomment line below
-            // vm.showSaveProgressModal = !(emailFromStore?.length > 0);
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     await baseMixin.methods.dispatchStoreAction(
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 37f005d48..f905e86c7 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -64,9 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            // turned off Save Your Progress for 1/23/25 release
-            //   to restore, uncomment line below
-            // vm.showSaveProgressModal = !(emailFromStore?.length > 0);
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     const serviceState = store.getters.order.serviceLocation.state;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 61034fe5e..4428f6e40 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -294,12 +294,8 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-
-            // turned off Save Your Progress for 1/23/25 release
-            //   to restore, uncomment the 2 lines below
-            // vm.showSaveProgressPopup = showSaveProgressPopup;
-            // vm.showSaveProgressModal = showSaveProgressModal;
-
+            vm.showSaveProgressPopup = showSaveProgressPopup;
+            vm.showSaveProgressModal = showSaveProgressModal;
             vm.addableVaps = addableVaps;
             vm.lineItems = lineItems;
             vm.availableLineItems = pricingResults;
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 832589043..4b68007f9 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -94,9 +94,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            // turned off Save Your Progress for 1/23/25 release
-            //   to restore, uncomment line below
-            // vm.showSaveProgressModal = !(emailFromStore?.length > 0);
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
 
             // Glass Part Question dynamic component
             Object.keys(vm.$refs)

From 00596bc232b41201ad126e543bc2ff6e693b136a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 31 Jan 2025 16:21:16 -0500
Subject: [PATCH 19/23] CASH-177: necessary structure and CSS updates due to
 modal markup changes made on SYP modal question

---
 .../save-progress-modal-question.vue          | 78 +++++++++++++------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
index 48973c2e5..5b885f27f 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
@@ -1,13 +1,12 @@
 <template>
     <div class="save-progress-modal-question" :class="isProgressSaved ? 'progress-saved' : ''">
         <buttonMain
-            ref="buttonMain"
             type="button"
             v-if="!isProgressSaved"
             :buttonText="buttonText"
             loaderColor="white"
             :suppressLoader="true"
-            class="save-progress-button"
+            class="open-save-progress-button"
             @click-event="openModal" />
         <alert
             class="my-4"
@@ -21,12 +20,14 @@
             :onModalClosedCallback="onModalClosed"
             :footerButtonText="modalButtonText"
             @footer-button-event="saveProgress">
-            <p class="modal-body-inner">{{ modalBodyText }}</p>
+            <p class="modal-body-inner" v-html="modalBodyText"></p>
             <saveProgressQuestion
                 ref="saveProgressQuestion"
                 v-model="userInput"
                 cmsWidgetName="SaveProgressQuestionWidget" />
-            <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
+            <template v-slot:modal-footer-slot>
+                <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
+            </template>
         </modal>
     </div>
 </template>
@@ -112,7 +113,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .save-progress-modal-question {
     margin-bottom: 1.5rem;
     order: 2;
@@ -128,7 +129,7 @@ export default {
         background: none;
     }
 
-    .save-progress-button {
+    .open-save-progress-button {
         order: 4;
         position: relative;
         color: $blue;
@@ -160,12 +161,57 @@ export default {
             transition: background 0s 0s ease-in-out;
         }
     }
-    :deep(.alert) {
+    .modal.modal-component .modal-dialog .modal-content {
+        .modal-header {
+            padding-top: 0;
+            margin-top: 1.875rem;
+        }
+        .modal-body {
+            display: flex;
+            flex-direction: column;
+            padding: 0 1.5rem;
+
+            .textbox-question {
+                padding: 0;
+                margin: 0 0 1.5rem 0;
+
+                label {
+                    text-align: left;
+                    font-weight: 900;
+                }
+            }
+        }
+        .modal-body-inner {
+            text-align: center;
+            margin-bottom: 1.5rem;
+        }
+        .modal-disclaimer {
+            font-size: 0.75rem;
+            order: 2;
+            text-align: left;
+            margin: 0;
+
+            a {
+                text-decoration: none;
+            }
+        }
+        .modal-footer {
+            margin: 0 0 1.5rem 0;
+            padding-top: 0;
+            padding-bottom: 0;
+
+            button.btn {
+                margin-bottom: 1.5rem;
+            }
+        }
+    }
+    
+    .alert {
         border-radius: $border-radius-lg;
         border: 1px solid $green;
         margin-top: 0;
     }
-    :deep(.alert-heading) {
+    .alert-heading {
         position: relative;
         font-weight: 600;
         font-size: 1rem;
@@ -183,20 +229,4 @@ export default {
         }
     }
 }
-.applied-promo {
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 24px;
-    color: $green;
-
-    .promo-code {
-        text-transform: uppercase;
-    }
-}
-.alert {
-    color: $red;
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 24px;
-}
 </style>

From 9443e3182510b4819605774fb24fbaf9ab81df93 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 31 Jan 2025 17:02:10 -0500
Subject: [PATCH 20/23] CASH-177: necessary structure and CSS updates due to
 modal markup changes made on SYP /quote popup question

---
 .../save-progress-popup-question.vue          | 96 ++++++++++++-------
 1 file changed, 63 insertions(+), 33 deletions(-)

diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
index 808163fe6..5d98d5c4b 100644
--- a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
+++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
@@ -14,20 +14,22 @@
                 v-model="userInput"
                 cmsWidgetName="SaveProgressPopupQuestionWidget"
                 class="save-progress-popup-question" />
-            <buttonMain
-                ref="skipButton"
-                type="button"
-                :buttonText="buttonText"
-                loaderColor="white"
-                :suppressLoader="true"
-                class="skip-button"
-                @click-event="closeModal" />
+            <template v-slot:modal-footer-slot>
+                <buttonMain
+                    ref="skipButton"
+                    type="button"
+                    :buttonText="buttonText"
+                    loaderColor="white"
+                    :suppressLoader="true"
+                    class="skip-button"
+                    @click-event="closeModal" />
+                <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
+            </template>
             <alert
                 class="my-4"
                 v-if="isProgressSaved"
                 cmsWidgetName="SaveProgressModalAlertWidget"
                 alertClass="alert-success" />
-            <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
         </modal>
     </div>
 </template>
@@ -205,35 +207,63 @@ export default {
             left: 0;
         }
     }
-    .modal-footer {
-        order: 3;
-        padding: 0;
-    }
-    .modal-disclaimer {
-        order: 4;
+    .modal.modal-component .modal-dialog .modal-content {
+        p.modal-body {
+            padding: 0;
+        }
+        .modal-body {
+            display: flex;
+            flex-direction: column;
+            padding: 0 1.5rem;
+
+            .textbox-question {
+                padding: 0;
+                margin: 0 0 1.5rem 0;
+                
+                label {
+                    text-align: left;
+                    font-weight: 900;
+                }
+            }
+        }
+        .modal-body-inner {
+            text-align: center;
+            margin-bottom: 1.5rem;
+        }
+        .modal-footer {
+            padding: 0 1.5rem;
+            margin: 0 0 1.5rem 0;
+
+            button.btn {
+                order: 1;
+                margin-bottom: 1.5rem;
+            }
+            button.btn.skip-button {
+                padding: 0;
+                order: 2;
+                font-size: 1rem;
+            }
+            .modal-disclaimer {
+                font-size: 0.75rem;
+                text-align: left;
+                order: 3;
+                margin: 0;
+
+                a {
+                    text-decoration: none;
+                }
+            }
+        }
     }
 
     &.progress-saved {
-        .modal-footer,
-        .save-progress-popup-question {
+        .modal-footer-button,
+        .modal-disclaimer  {
             display: none;
         }
+        .skip-button {
+            margin-bottom: 0;
+        }
     }
 }
-.applied-promo {
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 24px;
-    color: $green;
-
-    .promo-code {
-        text-transform: uppercase;
-    }
-}
-.alert {
-    color: $red;
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 24px;
-}
 </style>

From b5f158ce803047ff84352d58e5702dd8cf054a48 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 31 Jan 2025 17:05:57 -0500
Subject: [PATCH 21/23] CASH-177: adding 2nd slot to modal / removing
 SYP-specific CSS

---
 src/digital-components/modal/modal.vue | 52 +-------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 571c0aeb8..72ed56035 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -29,9 +29,10 @@
                     <slot></slot>
                 </div>
                 <div class="modal-footer">
+                    <slot name="modal-footer-slot"></slot>
                     <modalButtonMain
                         isPrimary
-                        class="w-100"
+                        class="w-100 modal-footer-button"
                         :id="modalId + '-modalbtn'"
                         ref="modalButtonMain"
                         loaderColor="white"
@@ -258,56 +259,7 @@ export default {
         }
     }
 }
-.save-progress-modal-question {
-    p.modal-body {
-        padding: 0;
-    }
-    .modal-body {
-        display: flex;
-        flex-direction: column;
 
-        .textbox-question {
-            padding: 0;
-
-            margin: 0 0 1.5rem 0;
-        }
-    }
-}
-
-.save-progress-modal-question,
-.save-progress-popup-question {
-    p.modal-body {
-        padding: 0;
-    }
-    .modal-body {
-        display: flex;
-        flex-direction: column;
-
-        .textbox-question {
-            label {
-                text-align: left;
-                font-weight: 900;
-            }
-        }
-    }
-    .modal-body-inner {
-        text-align: center;
-        margin-bottom: 1.5rem;
-    }
-    .modal-disclaimer {
-        font-size: 0.75rem;
-        order: 2;
-        text-align: left;
-        a {
-            text-decoration: none;
-        }
-    }
-    .modal-footer {
-        margin: 0 0 1.5rem 0;
-        padding-top: 0;
-        padding-bottom: 0;
-    }
-}
 body {
     .modal-backdrop {
         height: 100%;

From 829567d4018072e25fbbe0bdc85e2b4d15020869 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Sun, 2 Feb 2025 11:11:49 -0500
Subject: [PATCH 22/23] CASH-48

CASH-48 switch to order object from applicationUser
---
 src/constants/endpoints.js                |  2 +-
 src/layouts/confirmation/confirmation.vue | 52 +++++++++++------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 43bf8c926..29d36d091 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -125,7 +125,7 @@ const endpoints = {
         method: "POST",
     },
     SaveQuote: {
-        url: "/order/api/v1/order/initiate-saved-progress-email",
+        url: "/order/api/v1/order/save-progress",
         method: "POST",
     },
     GetSignature: {
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 26c0fd4a5..f699d6a59 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -116,40 +116,40 @@ export default {
 
         // send part question data to SPS API for logging
         const orderFromStore = await deepClone(store.getters.order);
-        const applicationUserFromStore =  await deepClone(store.getters.applicationUser);
-        const ctu = orderFromStore.workOrderNumber?.split("-")[0];
-        const partsOrQuestions = applicationUserFromStore.pageData["part-questions"].partsOrQuestions;
-        const onlyPartsWithQuestions = partsOrQuestions.filter((part) => {
-            return part.partQuestions?.length > 0;
-        });
+        const ctu = orderFromStore.serviceLocation?.zipCodeCtu
 
-        onlyPartsWithQuestions.forEach(part => {
+        const partsOrQuestions = orderFromStore.damage?.partQuestionAnswers;
+
+        partsOrQuestions.forEach(pqa => {
             const payloadPartQuestions = [];
-            part.partQuestions.forEach(question => {
+            pqa.answeredQuestions.forEach(answer => {
                 payloadPartQuestions.push({
-                    questionSeq: question.questionSequence,
-                    questionText: question.questionText,
-                    answerText: question.answerSelected.split("|")[3],
-                    basePart: question.answerSelected.split("|")[2],
+                    questionSeq: answer?.questionNum,
+                    questionText: answer?.questionText,
+                    answerText: answer?.selectedAnswerText,
+                    basePart: pqa?.result,
                 });
             });
-            const payload = {
-                eon: orderFromStore.eon,
-                ctu: ctu,
-                workOrderId: orderFromStore.workOrderId,
-                workOrderNumber: orderFromStore.workOrderNumber,
-                carId: orderFromStore.vehicle.carId,
-                glassLocation: part.glassLocation,
-                partQuestions: payloadPartQuestions,
-            };
 
-            baseMixin.methods.dispatchStoreAction(
-                storeActions.LOG_PART_QUESTIONS,
-                payload,
-                false
-            );
+            const payload = {
+            eon: orderFromStore.eon,
+            ctu: ctu,
+            workOrderId: orderFromStore.workOrderId,
+            workOrderNumber: orderFromStore.workOrderNumber,
+            carId: orderFromStore.vehicle.carId,
+            glassLocation: pqa?.glassLocation,
+            partQuestions: payloadPartQuestions,
+        };
+
+        baseMixin.methods.dispatchStoreAction(
+            storeActions.LOG_PART_QUESTIONS,
+            payload,
+            false
+        );
+
         });
 
+
         // Create order
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
 

From d5eee99b01dda8e592f52f7b8a1e0be40929474d Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 3 Feb 2025 10:53:31 -0500
Subject: [PATCH 23/23] CASH-183 | Update experiment logging for debugging in
 dev-qa

These changes must be removed before any release
---
 src/layouts/vehicle/vehicle.vue | 10 +++++++---
 src/router/index.js             |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index c81dfa2b0..79fad6313 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -80,7 +80,11 @@ import vehicleQuestion from "@/layouts/vehicle/vehicle-question/vehicle-question
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { experimentUniverses } from "@/constants/experiments";
-import { getSessionKeyValue, getUserIdValue, getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import {
+    getSessionKeyValue,
+    getUserIdValue,
+    getDeviceIdValue,
+} from "@/helpers/heritage-integration/cookie-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
@@ -188,10 +192,10 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: "vehicle-logExposure", //to.query.fmgPage,
                     experiment: experimentForLogging,
                 },
-                "vehicle",
+                "vehicle-logExposure",
                 false
             );
         }
diff --git a/src/router/index.js b/src/router/index.js
index 76d1203b7..918688a3c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -810,7 +810,7 @@ async function runExperiments(nextPage) {
         {
             deviceId: getDeviceIdValue(),
             triggerEvent: experimentTriggers.PAGE_ENTRY,
-            triggerValue: nextPage,
+            triggerValue: nextPage == "vehicle" ? "vehicle-pageEntry" : nextPage,
         },
         nextPage
     );