From ced43b7c19cf82c4ed5f61a9a5632e5bd1d3169f Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 5 Jun 2026 15:22:24 -0400
Subject: [PATCH 01/23] CASH-938 verify details page

CASH-938 verify details page
---
 src/constants/insurance.js                    |   1 +
 .../funnel-sub-header/funnel-sub-header.vue   |  15 +-
 .../duplicate-check/duplicate-check.vue       |  25 +--
 src/layouts/endorsements/endorsements.vue     |  25 +--
 src/layouts/policy-info/policy-info.vue       |  35 ++---
 src/layouts/verify-details/verify-details.vue | 146 +++++++++++++++++-
 6 files changed, 172 insertions(+), 75 deletions(-)

diff --git a/src/constants/insurance.js b/src/constants/insurance.js
index 1439fafcb..2b0cacc53 100644
--- a/src/constants/insurance.js
+++ b/src/constants/insurance.js
@@ -89,4 +89,5 @@ export const NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS = [
 export const PARENT_ACCOUNT_NUMBERS = {
     STATE_FARM: "711310",
     USAA: "900040",
+    GEICO: "250034",
 };
diff --git a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
index 4002b28fb..8c3c2fed2 100644
--- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
@@ -39,6 +39,14 @@ export default {
             default: "dark-header",
         },
         alignLeft: Boolean,
+        overrideHeaderText: {
+            type: String,
+            default: "",
+        },
+        overrideHeaderSubText: {
+            type: String,
+            default: "",
+        },
     },
     components: {
         buttonBack,
@@ -48,10 +56,13 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "HeaderSubText");
         },
         text() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+            return this.overrideHeaderText || this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         subText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderSubText");
+            return (
+                this.overrideHeaderSubText ||
+                this.getCmsContent(this.cmsWidgetName, "HeaderSubText")
+            );
         },
         backButtonAccessibleText() {
             return this.getCmsContent(this.cmsWidgetName, "BackButtonAccessibleText");
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 13dd18c11..587babde5 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -8,19 +8,10 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-
-                    <textBlock
-                        cmsWidgetName="DupCheckPageTitleWidget"
-                        typeStyle="h1"
-                        :customText="pageTitleText"
-                        class="mb-5 text-left text-md-left cc-page-title" />
-
-                    <textBlock
-                        cmsWidgetName="DupCheckPageInstructionsWidget"
-                        typeStyle="body"
-                        :customText="pageInstructionsText"
-                        class="mb-5 text-left text-md-left cc-page-instructions" />
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader"
+                        :alignLeft="true" />
 
                     <buttonQuestion
                         :questionText="existingClaimsQuestionText"
@@ -60,7 +51,6 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import textBlock from "@/digital-components/text-block/text-block";
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import { Form } from "vee-validate";
 
@@ -82,7 +72,6 @@ export default {
         funnelHeader,
         insuranceNavBar,
         funnelSubHeader,
-        textBlock,
         buttonQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -116,12 +105,6 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
-        pageTitleText() {
-            return this.getCmsContent("DupCheckPageTitleWidget", "Text");
-        },
-        pageInstructionsText() {
-            return this.getCmsContent("DupCheckPageInstructionsWidget", "Text");
-        },
         existingClaimsQuestionText() {
             return this.getCmsContent("ExistingClaimsListWidget", "QuestionText");
         },
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index 6f113ed6c..0d6591544 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -8,19 +8,10 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-
-                    <textBlock
-                        cmsWidgetName="EndorsementsPageAdditionalInfoWidget"
-                        typeStyle="h1"
-                        :customText="endorsementHeading"
-                        class="mb-5 text-left text-md-left page-title" />
-
-                    <textBlock
-                        cmsWidgetName="MoreDetailsWidget"
-                        typeStyle="body"
-                        :customText="moreDetailsText"
-                        class="mb-5 text-left text-md-left page-instructions" />
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader"
+                        :alignLeft="true" />
 
                     <buttonQuestion
                         :questionText="schoolEndorsementQuestionText"
@@ -64,7 +55,6 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { debugLog } from "@/helpers/debug-log-helper";
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "endorsements",
@@ -80,7 +70,6 @@ export default {
         insuranceNavBar,
         funnelSubHeader,
         buttonQuestion,
-        textBlock,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -113,12 +102,6 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
-        endorsementHeading() {
-            return this.getCmsContent("EndorsementsPageAdditionalInfoWidget", "Text");
-        },
-        moreDetailsText() {
-            return this.getCmsContent("MoreDetailsWidget", "Text");
-        },
         schoolEndorsementQuestionText() {
             return this.getCmsContent("SchoolEndorsmentQuestionWidget", "QuestionText");
         },
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 4c47f1847..d0c642fb1 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -8,19 +8,12 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-
-                    <textBlock
-                        cmsWidgetName="PageTitleWidget"
-                        typeStyle="h1"
-                        :customText="pageTitleText"
-                        class="mb-5 text-left text-md-left cc-page-title" />
-
-                    <textBlock
-                        cmsWidgetName="PageInstructionsWidget"
-                        typeStyle="body"
-                        :customText="pageInstructionsText"
-                        class="mb-5 text-left text-md-left" />
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader pb-4"
+                        :alignLeft="true"
+                        :overrideHeaderText="subHeaderTextOverride"
+                        :overrideHeaderSubText="subHeaderSubTextOverride" />
 
                     <textboxQuestion
                         isRequired
@@ -213,7 +206,6 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import textBlock from "@/digital-components/text-block/text-block";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import datePickerPopup from "@/digital-components/date-picker-popup/date-picker-popup";
 import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
@@ -274,7 +266,6 @@ export default {
         funnelHeader,
         insuranceNavBar,
         funnelSubHeader,
-        textBlock,
         textboxQuestion,
         datePickerPopup,
         dropdownQuestion,
@@ -291,17 +282,11 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
-        pageTitleText() {
-            return (
-                this.clientConfig?.PageTitleOverrideWidget?.Text ||
-                this.getCmsContent("PageTitleWidget", "Text")
-            );
+        subHeaderTextOverride() {
+            return this.clientConfig?.PageTitleOverrideWidget?.Text || "";
         },
-        pageInstructionsText() {
-            return (
-                this.clientConfig?.PageInstructionsOverrideWidget?.Text ||
-                this.getCmsContent("PageInstructionsWidget", "Text")
-            );
+        subHeaderSubTextOverride() {
+            return this.clientConfig?.PageInstructionsOverrideWidget?.Text || "";
         },
         isUSAA() {
             return (
diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index a3e00eb7f..82bed491e 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -4,13 +4,63 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
+        <div class="page-gradient"></div>            
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader pb-4"
+                        :alignLeft="true" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="PolicyNumberWidget"
+                        v-model="policyNumber"
+                        inputId="policyNumber"
+                        validationRules="policy-number-required" />
+
+                    <datePickerPopup
+                        v-if="displayDateOfBirth"
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="DateOfBirthWidget"
+                        v-model="dateOfBirth"
+                        customInputId="dateOfBirth"
+                        placeholderText="MM/DD/YYYY"
+                        validationRules="date-of-birth-required"
+                        format="MM/dd/yyyy"
+                        modelType="MM/dd/yyyy"
+                        :enableTimePicker="false"
+                        :textInputOnly="true"
+                        :maxDate="today"
+                        :preventMinMaxNavigation="true" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="ZipWidget"
+                        v-model="policyZip"
+                        inputId="policyZip"
+                        maxLength="5"
+                        validationRules="zip-code-required|zip-code-format" />
+
+                    <datePickerPopup
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="DateOfLossWidget"
+                        v-model="dateOfLoss"
+                        customInputId="dateOfLoss"
+                        placeholderText="MM/DD/YYYY"
+                        validationRules="date-of-loss-required"
+                        format="MM/dd/yyyy"
+                        modelType="MM/dd/yyyy"
+                        :enableTimePicker="false"
+                        :textInput="true"
+                        :maxDate="today"
+                        :preventMinMaxNavigation="true" />
+
                     <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -28,25 +78,51 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import { Form } from "vee-validate";
+import datePickerPopup from "@/digital-components/date-picker-popup/date-picker-popup";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import { Form, defineRule } from "vee-validate";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import { regex } from "@/helpers/validation-rules";
+import { PARENT_ACCOUNT_NUMBERS } from "@/constants/insurance";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
+import store from "@/store";
+
+// DEFINE VALIDATION RULES
+defineRule("policy-number-required", required(errorMessages.POLICY_NUMBER_REQUIRED));
+defineRule("zip-code-required", required(errorMessages.ZIP_REQUIRED));
+defineRule("zip-code-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.ZIP_FORMAT));
+defineRule("date-of-loss-required", required(errorMessages.DATE_OF_LOSS_REQUIRED));
+defineRule("date-of-birth-required", required(errorMessages.DATE_OF_BIRTH_REQUIRED));
 
 export default {
     name: "verify-details",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+            policyNumber: this.getPolicyNumberFromStore(),
+            policyZip: this.getPolicyZipFromStore(),
+            dateOfLoss: this.getDateOfLossFromStore(),
+            dateOfBirth: this.getDateOfBirthFromStore(),
+        };
     },
     components: {
         Form,
         funnelHeader,
         insuranceNavBar,
         funnelSubHeader,
+        datePickerPopup,
+        textboxQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
+
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
         const promiseResultMap = [
@@ -54,10 +130,19 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(
+                `verify-details clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
@@ -65,9 +150,43 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
+        today() {
+            return new Date();
+        },
+        parsedClientConfig() {
+            const raw = this.clientConfig?.ConfigWidget?.Text;
+            if (!raw) return {};
+            try {
+                return JSON.parse(raw);
+            } catch (err) {
+                console.warn("Failed to parse clientConfig.ConfigWidget.Text", err);
+                return {};
+            }
+        },
+        isGeico() {
+            return (
+                store.getters.order?.payment?.parentAccountNumber?.toString() ===
+                PARENT_ACCOUNT_NUMBERS.GEICO
+            );
+        },
+        displayDateOfBirth() {
+            return this.parsedClientConfig.displayDateOfBirth && this.isGeico ? true : false;
+        },
     },
 
     methods: {
+        getPolicyNumberFromStore() {
+            return store.getters.order.policy.policyNumber;
+        },
+        getPolicyZipFromStore() {
+            return store.getters.order.policy.zipCode;
+        },
+        getDateOfLossFromStore() {
+            return store.getters.order.damage.dateOfLoss;
+        },
+        getDateOfBirthFromStore() {
+            return store.getters.order.policy.dateOfBirth;
+        },
         cancelButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
@@ -92,3 +211,18 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.cc-page-title {
+    font-size: 20px !important;
+    line-height: 1.325;
+    font-weight: 300;
+    color: $black;
+}
+.cc-page-instructions {
+    font-size: 16px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
+</style>
\ No newline at end of file

From 576496dc5a690478f87e312614b8e4c1e9c7c811 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 5 Jun 2026 15:31:14 -0400
Subject: [PATCH 02/23] CASH-938 typo

CASH-938 typo
---
 src/layouts/policy-info/policy-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index d0c642fb1..f752c1611 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -39,7 +39,7 @@
                         format="MM/dd/yyyy"
                         modelType="MM/dd/yyyy"
                         :enableTimePicker="false"
-                        :textInputOnly="true"
+                        :textInput="true"
                         :maxDate="today"
                         :preventMinMaxNavigation="true" />
 

From 4d31733fe6b19596db7b6b6446d88f60936ec94a Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 5 Jun 2026 15:36:27 -0400
Subject: [PATCH 03/23] prettier

---
 src/layouts/verify-details/verify-details.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index 82bed491e..9fcf1c375 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -4,7 +4,7 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>            
+        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
@@ -225,4 +225,4 @@ export default {
     color: $gray-600;
     line-height: 1.625;
 }
-</style>
\ No newline at end of file
+</style>

From 8c3bc461e2c4b682891f629e3c5d36cc436f8162 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sat, 6 Jun 2026 06:38:04 -0400
Subject: [PATCH 04/23] CASH-940 policy-info-submitted content

CASH-940 policy-info-submitted content
---
 .../policy-info-submitted.vue                 | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index 4b93def2e..e79cb30a2 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -1,5 +1,5 @@
 <template>
-    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
         <funnelHeader
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
@@ -8,17 +8,22 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
-                    <insuranceNavBar
-                        cmsWidgetName="FunnelFooterWidget"
-                        ref="navbar"
-                        :isForwardActionDisabled="!meta.valid"
-                        @cancel-clicked="cancelButtonAction"
-                        @back-clicked="backButtonAction"
-                        @ForwardClicked="forwardButtonAction" />
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader pb-4"
+                        :alignLeft="true" />
+                        
+                    <buttonMain
+                        ref="buttonMain"
+                        class="mb-3"
+                        isPrimary
+                        :buttonText="ContinueButtonCopy"
+                        loaderColor="white"
+                        :aria-disabled="false"
+                        :isDisabled="false"
+                        @click-event="forwardButtonAction" />
+
+                    <div v-if="showAmFamDisclaimer" v-html="amFamDisclaimerWidget"></div>
                 </div>
             </div>
         </div>
@@ -27,8 +32,9 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import { parentAccountNumbers } from "@/constants/insurance";
+import buttonMain from "@/ux-components/button-main/button-main";
 import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -46,8 +52,8 @@ export default {
     },
     components: {
         Form,
+        buttonMain,
         funnelHeader,
-        insuranceNavBar,
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -81,23 +87,23 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
+        ContinueButtonCopy() {
+            return this.getCmsContent("ContinueButtonWidget", "QuestionText");
+        },
+        amFamDisclaimerWidget() {
+            return this.getCmsContent("AmFamDisclaimerWidget", "Text");
+        },
+        showAmFamDisclaimer() {
+            return this.parentAccountNumberFromStore() === this.parentAccountNumbers.CONNECT;
+        },
+        parentAccountNumbers() {
+            return parentAccountNumbers;
+        },
     },
 
     methods: {
-        cancelButtonAction() {
+        forwardButtonAction() {
             this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
-                this.pageName
-            );
-        },
-        backButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
-        },
-        async forwardButtonAction() {
-            this.$router.navigateWithSaving(
                 this.navigationScenarios.CLICKED_FORWARD,
                 this.pageName
             );

From 601a01887d37d13b2cf73ac1aa2148ab41177d6b Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sat, 6 Jun 2026 06:58:48 -0400
Subject: [PATCH 05/23] CASH-940 fix disclaimer

CASH-940 fix disclaimer
---
 .../policy-info-submitted.vue                 | 22 ++++++++++++++-----
 src/layouts/policy-vehicle/policy-vehicle.vue | 20 ++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index e79cb30a2..84c89673b 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -23,7 +23,10 @@
                         :isDisabled="false"
                         @click-event="forwardButtonAction" />
 
-                    <div v-if="showAmFamDisclaimer" v-html="amFamDisclaimerWidget"></div>
+                    <span
+                        v-if="displayDisclaimerText"
+                        class="d-block mb-5 disclaimer-text"
+                        v-html="disclaimerText"></span>
                 </div>
             </div>
         </div>
@@ -90,11 +93,11 @@ export default {
         ContinueButtonCopy() {
             return this.getCmsContent("ContinueButtonWidget", "QuestionText");
         },
-        amFamDisclaimerWidget() {
-            return this.getCmsContent("AmFamDisclaimerWidget", "Text");
+        disclaimerText() {
+            return this.clientConfig?.DisclaimerWidget?.Text;
         },
-        showAmFamDisclaimer() {
-            return this.parentAccountNumberFromStore() === this.parentAccountNumbers.CONNECT;
+        displayDisclaimerText() {
+            return this.disclaimerText !== null && this.disclaimerText !== "";
         },
         parentAccountNumbers() {
             return parentAccountNumbers;
@@ -114,3 +117,12 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.disclaimer-text {
+    font-size: 12px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
+</style>
\ No newline at end of file
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index d92d45b50..8963d444a 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -25,7 +25,10 @@
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
 
-                    <div v-if="showAmFamDisclaimer" v-html="amFamDisclaimerWidget"></div>
+                    <span
+                        v-if="displayDisclaimerText"
+                        class="d-block mb-5 disclaimer-text"
+                        v-html="disclaimerText"></span>
                 </div>
             </div>
         </div>
@@ -95,11 +98,11 @@ export default {
         vehicleNotListedQuestionText() {
             return this.getCmsContent("VehicleNotListedWidget", "Text");
         },
-        amFamDisclaimerWidget() {
-            return this.getCmsContent("AmFamDisclaimerWidget", "Text");
+        disclaimerText() {
+            return this.clientConfig?.DisclaimerWidget?.Text;
         },
-        showAmFamDisclaimer() {
-            return this.parentAccountNumberFromStore() === this.parentAccountNumbers.CONNECT;
+        displayDisclaimerText() {
+            return this.disclaimerText !== null && this.disclaimerText !== "";
         },
         parentAccountNumbers() {
             return parentAccountNumbers;
@@ -140,4 +143,11 @@ export default {
     background-color: $blue;
     color: $white;
 }
+
+.disclaimer-text {
+    font-size: 12px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
 </style>

From 743040bd1182da82e6b198be930621bf754e4ebd Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sat, 6 Jun 2026 07:04:20 -0400
Subject: [PATCH 06/23] oh prettier

---
 src/layouts/policy-info-submitted/policy-info-submitted.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index 84c89673b..901480407 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -12,7 +12,7 @@
                         cmsWidgetName="FunnelSubHeaderWidget"
                         class="siteSubHeader pb-4"
                         :alignLeft="true" />
-                        
+
                     <buttonMain
                         ref="buttonMain"
                         class="mb-3"
@@ -125,4 +125,4 @@ export default {
     color: $gray-600;
     line-height: 1.625;
 }
-</style>
\ No newline at end of file
+</style>

From 082eedfdea5fbb1a7bd37bd01df76556151dfeaf Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sat, 6 Jun 2026 09:18:14 -0400
Subject: [PATCH 07/23] CASH-940 tests

CASH-940 tests
---
 .../policy-info-submitted.spec.js               | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.spec.js b/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
index 4d80621ee..b528c8075 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
@@ -26,11 +26,6 @@ describe("policy-info-submitted.vue", () => {
             expect(wrapper.findComponent({ name: "funnelSubHeader" }).exists()).toBe(true);
         });
 
-        test("renders navbar component", () => {
-            const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
-        });
-
         test("renders Form component", () => {
             const { wrapper } = setupMocks();
             expect(wrapper.findComponent({ name: "Form" }).exists()).toBe(true);
@@ -55,13 +50,23 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn((widgetName, fieldName) => {
+                return mockCmsContent?.[widgetName]?.[fieldName] ?? "";
+            }),
+            setCmsContent: jest.fn(),
+        },
+    };
+
     const mountOptions = getMountOptions({
-        route: { name: "policy-vehicle", query: {}, params: {} },
+        route: { name: "endorsements", query: {}, params: {} },
         router: {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        mixins: [mockMixin],
     });
 
     const wrapper = shallowMount(policyInfoSubmitted, mountOptions);

From d3a21d10bd81e7aa9520d2e3b948becf164487fb Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 7 Jun 2026 08:44:42 -0400
Subject: [PATCH 08/23] CASH-939 policy driver page content

CASH-939 policy driver page content
---
 src/layouts/policy-driver/policy-driver.vue | 26 +++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index 0659ff658..64ae9a629 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -8,10 +8,20 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader mb-4"
+                        :alignLeft="true" />
+                    
+                    <buttonQuestion
+                        :questionText="driverSelectionText"
+                        :answers="driverSelectionAnswers"
+                        class="mb-4"
+                        groupName="driverQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        v-model="driverSelectionValue" />
+
                     <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -29,6 +39,7 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -49,6 +60,7 @@ export default {
         funnelHeader,
         insuranceNavBar,
         funnelSubHeader,
+        buttonQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -81,6 +93,12 @@ export default {
         clientLogoImageSrc() {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
+        driverSelectionText() {
+            return this.getCmsContent("DriverSelectionWidget", "QuestionText");
+        },
+        driverSelectionAnswers() {
+            return this.getCmsContent("DriverSelectionWidget", "Answers");
+        },
     },
 
     methods: {

From 5fc4e958f152bbaee9bbc0e9f2aa1cd6d2ec45fb Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 7 Jun 2026 08:48:56 -0400
Subject: [PATCH 09/23] prettier

---
 src/layouts/policy-driver/policy-driver.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index 64ae9a629..2d13c4799 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -12,7 +12,7 @@
                         cmsWidgetName="FunnelSubHeaderWidget"
                         class="siteSubHeader mb-4"
                         :alignLeft="true" />
-                    
+
                     <buttonQuestion
                         :questionText="driverSelectionText"
                         :answers="driverSelectionAnswers"

From f0abdc0344df4fa163ec3304f89448ad18ed13ae Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 7 Jun 2026 10:26:51 -0400
Subject: [PATCH 10/23] CASH-2467 recal info page content

CASH-2467 recal info page content
---
 .../policy-driver/policy-driver.spec.js       | 10 +++
 .../recalibration-info.spec.js                |  2 +-
 .../recalibration-info/recalibration-info.vue | 73 +++++++++++++++----
 3 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/layouts/policy-driver/policy-driver.spec.js b/src/layouts/policy-driver/policy-driver.spec.js
index 60ed331e6..f06904c1d 100644
--- a/src/layouts/policy-driver/policy-driver.spec.js
+++ b/src/layouts/policy-driver/policy-driver.spec.js
@@ -55,6 +55,15 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn((widgetName, fieldName) => {
+                return mockCmsContent?.[widgetName]?.[fieldName] ?? "";
+            }),
+            setCmsContent: jest.fn(),
+        },
+    };
+
     const mountOptions = getMountOptions({
         route: { name: "policy-driver", query: {}, params: {} },
         router: {
@@ -62,6 +71,7 @@ function setupMocks() {
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        mixins: [mockMixin],
     });
 
     const wrapper = shallowMount(policyDriver, mountOptions);
diff --git a/src/layouts/recalibration-info/recalibration-info.spec.js b/src/layouts/recalibration-info/recalibration-info.spec.js
index e564a2565..36fd934c6 100644
--- a/src/layouts/recalibration-info/recalibration-info.spec.js
+++ b/src/layouts/recalibration-info/recalibration-info.spec.js
@@ -28,7 +28,7 @@ describe("recalibration-info.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index e1fe2e0ed..8666db280 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -8,15 +8,34 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
-                    <insuranceNavBar
+                    <funnelSubHeader
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        class="siteSubHeader mb-4"
+                        :alignLeft="true" />
+
+                    <img
+                        :src="recalibrationInfoDesktopImage"
+                        alt=""
+                        class="recal-image recal-image--desktop mb-4" />
+                    <img
+                        :src="recalibrationInfoMobileImage"
+                        alt=""
+                        class="recal-image recal-image--mobile mb-4" />
+
+                    <div class="adas-body-text mb-7" v-html="adasBodyText"></div>
+
+                    <hr class="mb-5" />
+
+                    <saveProgressModalQuestion
+                        modalWidgetName="SaveProgressModalWidget"
+                        modalName="SaveProgressModal"
+                        v-if="showSaveProgressModal"
+                        pageName="recalibration-info" />
+
+                    <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
-                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -27,27 +46,34 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
+import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { debugLog } from "@/helpers/debug-log-helper";
+
 export default {
     name: "recalibration-info",
     mixins: [],
     data() {
         return {
             clientConfig: {},
+            recalibrationInfoDesktopImage: "",
+            recalibrationInfoMobileImage: "",
+            adasBodyText: "",
+            showSaveProgressModal: null,
         };
     },
     components: {
         Form,
         funnelHeader,
-        insuranceNavBar,
+        navbar,
         funnelSubHeader,
+        saveProgressModalQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -66,9 +92,15 @@ export default {
             },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
+        const emailFromStore = store.getters.order.customer.emailAddress;
+        const showSaveProgressModal = !(emailFromStore?.length > 0);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
+            vm.showSaveProgressModal = showSaveProgressModal;
+            vm.recalibrationInfoDesktopImage = vm.getCmsContent("AdasInfoDesktopWidget", "Image");
+            vm.recalibrationInfoMobileImage = vm.getCmsContent("AdasInfoMobileWidget", "Image");
+            vm.adasBodyText = vm.getCmsContent("AdasInfoDesktopWidget", "BodyText");
             debugLog(
                 `recalibration-info clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
@@ -83,12 +115,6 @@ export default {
     },
 
     methods: {
-        cancelButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
-                this.pageName
-            );
-        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
@@ -107,3 +133,22 @@ export default {
     },
 };
 </script>
+
+<style lang="scss" scoped>
+// Both images are rendered; CSS swaps them at the md breakpoint so no JS
+// resize listeners are needed.
+.recal-image--desktop {
+    display: none;
+}
+.recal-image--mobile {
+    display: block;
+}
+@include media-breakpoint-up(md) {
+    .recal-image--desktop {
+        display: block;
+    }
+    .recal-image--mobile {
+        display: none;
+    }
+}
+</style>

From e98fe1d099f9ac56f2a2d78c6ba380d3fb89ecf6 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Mon, 8 Jun 2026 08:37:48 -0400
Subject: [PATCH 11/23] CASH-940 added save progress modal

CASH-940 added save progress modal
---
 .../insurance-details/insurance-details.vue        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/layouts/insurance-details/insurance-details.vue b/src/layouts/insurance-details/insurance-details.vue
index a675e0871..11db04b1b 100644
--- a/src/layouts/insurance-details/insurance-details.vue
+++ b/src/layouts/insurance-details/insurance-details.vue
@@ -112,6 +112,14 @@
                         maxLength="5"
                         validationRules="zip-code-required|zip-code-format" />
 
+                    <hr class="mb-5" />
+
+                    <saveProgressModalQuestion
+                        modalWidgetName="SaveProgressModalWidget"
+                        modalName="SaveProgressModal"
+                        v-if="showSaveProgressModal"
+                        pageName="insurance-details" />                        
+
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -141,6 +149,7 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { stateOptions } from "@/constants/state-options";
 import { regex } from "@/helpers/validation-rules";
 import { NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS } from "@/constants/insurance";
+import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 
 // DEFINE VALIDATION RULES
 defineRule(
@@ -171,6 +180,7 @@ export default {
             policyState: this.getPolicyStateFromStore(),
             policyZip: this.getPolicyZipFromStore(),
             claimNumber: this.getClaimNumberFromStore(),
+            showSaveProgressModal: null,
         };
     },
     components: {
@@ -182,6 +192,7 @@ export default {
         datePickerPopup,
         dropdownQuestion,
         textBlock,
+        saveProgressModalQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -194,8 +205,11 @@ export default {
             },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
+        const emailFromStore = store.getters.order.customer.emailAddress;
+        const showSaveProgressModal = !(emailFromStore?.length > 0);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.showSaveProgressModal = showSaveProgressModal;
         });
     },
 

From 038dfe90db98df1f7ddca53f22220a359e2e38c9 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Mon, 8 Jun 2026 08:45:02 -0400
Subject: [PATCH 12/23] prettier

---
 src/layouts/insurance-details/insurance-details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/insurance-details/insurance-details.vue b/src/layouts/insurance-details/insurance-details.vue
index 11db04b1b..0f3f483f1 100644
--- a/src/layouts/insurance-details/insurance-details.vue
+++ b/src/layouts/insurance-details/insurance-details.vue
@@ -118,7 +118,7 @@
                         modalWidgetName="SaveProgressModalWidget"
                         modalName="SaveProgressModal"
                         v-if="showSaveProgressModal"
-                        pageName="insurance-details" />                        
+                        pageName="insurance-details" />
 
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"

From f6c7ca50b07ac28cf4e39c7be942ee6fab0a3306 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 9 Jun 2026 16:35:02 -0400
Subject: [PATCH 13/23] Change default variation for Cybersource/Adyen

---
 src/layouts/payment-method/payment-method.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index b0347f581..810414b96 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -567,14 +567,14 @@ export default {
 
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
 
-            const shouldUseAdyen = experimentMixin.methods.hasSettingEqualTo(
+            const shouldUseCybersource = experimentMixin.methods.hasSettingEqualTo(
                 experimentSettings.USE_ADYEN_PAYMENT,
-                "true"
+                "false"
             );
 
-            const scenarioName = shouldUseAdyen
-                ? this.navigationScenarios.CLICKED_PAY_NOW_ADYEN
-                : this.navigationScenarios.CLICKED_PAY_NOW;
+            const scenarioName = shouldUseCybersource
+                ? this.navigationScenarios.CLICKED_PAY_NOW
+                : this.navigationScenarios.CLICKED_PAY_NOW_ADYEN;
 
             this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },

From 212b51bace3aca9409ed8ac1adb08139f926909b Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 9 Jun 2026 20:43:56 -0400
Subject: [PATCH 14/23] CASH-2844 save fields need for work order submission

CASH-2844 save fields need for work order submission
---
 src/helpers/cms-content-helper.js             | 55 ++++++++-----
 .../coverage-statement/coverage-statement.vue |  4 +-
 .../duplicate-check/duplicate-check.vue       |  2 +-
 src/layouts/endorsements/endorsements.vue     |  2 +-
 .../insurance-details/insurance-details.vue   | 30 ++++---
 src/layouts/policy-driver/policy-driver.vue   |  2 +-
 .../policy-info-submitted.vue                 |  2 +-
 src/layouts/policy-info/policy-info.vue       |  2 +-
 src/layouts/policy-vehicle/policy-vehicle.vue |  2 +-
 .../recalibration-info/recalibration-info.vue |  2 +-
 src/layouts/verify-details/verify-details.vue |  2 +-
 src/mixins/analytics-mixin.js                 |  1 +
 src/store/index.js                            | 80 ++++++++++++-------
 13 files changed, 120 insertions(+), 66 deletions(-)

diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 450875d0f..e5e189908 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -3,29 +3,48 @@ import store from "@/store";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 
 export function fetchCmsContentForPage(fmgPage) {
-    return store.dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage }).then((response) => {
-        const pageDataFromCms = {};
+    return store
+        .dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage })
+        .then((response) => {
+            const pageDataFromCms = {};
 
-        response.data.Result.forEach((widget) => {
-            let widgetWithReplacements = findAndReplaceGlobalStateValues(widget.Model, widget.Name);
+            response.data.Result.forEach((widget) => {
+                let widgetWithReplacements = findAndReplaceGlobalStateValues(
+                    widget.Model,
+                    widget.Name
+                );
 
-            // If we already have this widget, push it on the collection
-            if (widgetWithReplacements.Name in pageDataFromCms) {
-                pageDataFromCms[widgetWithReplacements.Name].push(widgetWithReplacements.Model);
-                return;
+                // If we already have this widget, push it on the collection
+                if (widgetWithReplacements.Name in pageDataFromCms) {
+                    pageDataFromCms[widgetWithReplacements.Name].push(widgetWithReplacements.Model);
+                    return;
+                }
+
+                pageDataFromCms[widgetWithReplacements.Name] = [widgetWithReplacements.Model];
+            });
+
+            Object.keys(pageDataFromCms).forEach((key) => {
+                if (pageDataFromCms[key].length === 1) {
+                    pageDataFromCms[key] = pageDataFromCms[key][0];
+                }
+            });
+
+            return pageDataFromCms;
+        })
+        .catch((error) => {
+            // Client-specific config pages are optional. When one doesn't exist
+            // the CMS returns a 404 - treat that as "no overrides" instead of an
+            // error so callers receive an empty config object.
+            const isClientConfigPage = typeof fmgPage === "string" && fmgPage.startsWith("client_");
+            const status = error?.status ?? error?.response?.status;
+            const isNotFound = status == 404;
+
+            if (isClientConfigPage && isNotFound) {
+                return {};
             }
 
-            pageDataFromCms[widgetWithReplacements.Name] = [widgetWithReplacements.Model];
+            return Promise.reject(error);
         });
-
-        Object.keys(pageDataFromCms).forEach((key) => {
-            if (pageDataFromCms[key].length === 1) {
-                pageDataFromCms[key] = pageDataFromCms[key][0];
-            }
-        });
-
-        return pageDataFromCms;
-    });
 }
 
 // Function to convert a string, into a matching global state item.
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index acdab2f17..f3269bcd9 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -127,7 +127,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `coverage-statement clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
@@ -182,7 +182,7 @@ export default {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
         deductibleAmount() {
-            return this.$store.getters.order.policy.currentDeductible;
+            return Number(this.$store.getters.order.policy.currentDeductible);
         },
         cashPrice() {
             const lineItems = this.$store.getters.order.lineItems;
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 587babde5..40f0a8c0d 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -94,7 +94,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `duplicate-check clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index 0d6591544..7aa027dec 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -90,7 +90,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `endorsements clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/insurance-details/insurance-details.vue b/src/layouts/insurance-details/insurance-details.vue
index 0f3f483f1..d4a686fa1 100644
--- a/src/layouts/insurance-details/insurance-details.vue
+++ b/src/layouts/insurance-details/insurance-details.vue
@@ -80,8 +80,8 @@
                         isRequired
                         class="mb-4"
                         cmsWidgetName="ApartmentWidget"
-                        v-model="apartment"
-                        inputId="apartment" />
+                        v-model="streetAddress2"
+                        inputId="streetAddress2" />
 
                     <textboxQuestion
                         isRequired
@@ -148,7 +148,11 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { stateOptions } from "@/constants/state-options";
 import { regex } from "@/helpers/validation-rules";
-import { NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS } from "@/constants/insurance";
+import {
+    NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS,
+    coverageStatus,
+    coverageStatusEnum,
+} from "@/constants/insurance";
 import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 
 // DEFINE VALIDATION RULES
@@ -175,7 +179,7 @@ export default {
             dateOfLoss: this.getDateOfLossFromStore(),
             damageCause: this.getDamageCauseFromStore(),
             streetAddress: this.getStreetAddressFromStore(),
-            apartment: this.getApartmentFromStore(),
+            streetAddress2: this.getStreetAddress2FromStore(),
             city: this.getCityFromStore(),
             policyState: this.getPolicyStateFromStore(),
             policyZip: this.getPolicyZipFromStore(),
@@ -256,19 +260,19 @@ export default {
             return store.getters.order.damage.damageCause ?? "";
         },
         getStreetAddressFromStore() {
-            return store.getters.order.policy.streetAddress ?? "";
+            return store.getters.order.policy.policyAddress.streetAddress ?? "";
         },
-        getApartmentFromStore() {
-            return store.getters.order.policy.apartment ?? "";
+        getStreetAddress2FromStore() {
+            return store.getters.order.policy.policyAddress.streetAddress2 ?? "";
         },
         getCityFromStore() {
-            return store.getters.order.policy.city ?? "";
+            return store.getters.order.policy.policyAddress.city ?? "";
         },
         getPolicyStateFromStore() {
-            return store.getters.order.policy.state ?? "";
+            return store.getters.order.policy.policyAddress.state ?? "";
         },
         getPolicyZipFromStore() {
-            return store.getters.order.policy.zipCode ?? "";
+            return store.getters.order.policy.policyAddress.zipCode ?? "";
         },
         getClaimNumberFromStore() {
             return store.getters.order.policy.claimNumber ?? "";
@@ -285,11 +289,15 @@ export default {
                 {
                     policyNumber: this.policyNumber,
                     streetAddress: this.streetAddress,
-                    apartment: this.apartment,
+                    streetAddress2: this.streetAddress2,
                     city: this.city,
                     state: this.policyState,
                     zipCode: this.policyZip,
                     claimNumber: this.claimNumber,
+                    currentDeductible: 7777,
+                    originalDeductible: 7777,
+                    coverageStatus: coverageStatusEnum(coverageStatus.PENDING),
+                    coverageSubStatus: "",
                 },
                 false
             );
diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index 2d13c4799..ae2d9fb6c 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -81,7 +81,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `policy-driver clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index 901480407..5afec595d 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -78,7 +78,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `policy-info-submitted clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index f752c1611..300429a34 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -410,7 +410,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `policy-infoclientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index 8963d444a..d936fa954 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -83,7 +83,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `policy-vehicle clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index 8666db280..032348457 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -96,7 +96,7 @@ export default {
         const showSaveProgressModal = !(emailFromStore?.length > 0);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             vm.showSaveProgressModal = showSaveProgressModal;
             vm.recalibrationInfoDesktopImage = vm.getCmsContent("AdasInfoDesktopWidget", "Image");
             vm.recalibrationInfoMobileImage = vm.getCmsContent("AdasInfoMobileWidget", "Image");
diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index 9fcf1c375..5fcf78049 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -138,7 +138,7 @@ export default {
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.clientConfig = resultMap.clientConfig;
+            vm.clientConfig = resultMap.clientConfig ?? {};
             debugLog(
                 `verify-details clientConfig::${clientConfigPageName}`,
                 JSON.stringify(vm.clientConfig)
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index b33ede8ae..fa56795a7 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -264,6 +264,7 @@ export default {
             sessionData.coverageSubStatus = order?.payment?.insuranceCoverage?.coverageSubStatus;
             sessionData.isNoComp = order?.policy?.isNoComp;
             sessionData.isItac = order?.policy?.isItac;
+            sessionData.isClaimAndCoverage = order.payment.isClaimAndCoverage;
             sessionData.subTotalPrice = getSubTotal(order?.lineItems);
             sessionData.totalPrice = getAmountDue(order?.lineItems, true);
             sessionData.userAgent = navigator.userAgent;
diff --git a/src/store/index.js b/src/store/index.js
index 3f2cf5e0d..fda879140 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -178,11 +178,13 @@ const getDefaultState = () => {
                 insuranceCompanyName: null,
                 phoneNumber: null,
                 phoneExtension: null,
-                streetAddress: null,
-                apartment: null,
-                city: null,
-                state: null,
-                zipCode: null,
+                policyAddress: {
+                    streetAddress: null,
+                    streetAddress2: null,
+                    city: null,
+                    state: null,
+                    zipCode: null,
+                },
                 dateOfBirth: null,
                 lossTime: null,
                 lossLocation: null,
@@ -361,19 +363,19 @@ export const mutations = {
         state.order.policy.phoneExtension = phoneExtension;
     },
     updateStreetAddress(state, streetAddress) {
-        state.order.policy.streetAddress = streetAddress;
+        state.order.policy.policyAddress.streetAddress = streetAddress;
     },
-    updateApartment(state, apartment) {
-        state.order.policy.apartment = apartment;
+    updateStreetAddress2(state, streetAddress2) {
+        state.order.policy.policyAddress.streetAddress2 = streetAddress2;
     },
     updateCity(state, city) {
-        state.order.policy.city = city;
+        state.order.policy.policyAddress.city = city;
     },
     updateState(state, stateValue) {
-        state.order.policy.state = stateValue;
+        state.order.policy.policyAddress.state = stateValue;
     },
     updateZipCode(state, zipCode) {
-        state.order.policy.zipCode = zipCode;
+        state.order.policy.policyAddress.zipCode = zipCode;
     },
     updateClaimNumber(state, claimNumber) {
         state.order.policy.claimNumber = claimNumber;
@@ -405,11 +407,11 @@ export const mutations = {
         state.order.policy.policyNumber = null;
         state.order.policy.claimNumber = null;
         state.order.policy.insuranceCompanyName = null;
-        state.order.policy.streetAddress = null;
-        state.order.policy.apartment = null;
-        state.order.policy.city = null;
-        state.order.policy.state = null;
-        state.order.policy.zipCode = null;
+        state.order.policy.policyAddress.streetAddress = null;
+        state.order.policy.policyAddress.streetAddress2 = null;
+        state.order.policy.policyAddress.city = null;
+        state.order.policy.policyAddress.state = null;
+        state.order.policy.policyAddress.zipCode = null;
         state.order.damage.dateOfLoss = null;
         state.order.damage.damageCause = null;
     },
@@ -563,11 +565,11 @@ export const mutations = {
     updateInsuranceDetails(state, insuranceDetails) {
         if (insuranceDetails) {
             state.order.policy.policyNumber = insuranceDetails.policyNumber;
-            state.order.policy.streetAddress = insuranceDetails.streetAddress;
-            state.order.policy.apartment = insuranceDetails.apartment;
-            state.order.policy.city = insuranceDetails.city;
-            state.order.policy.state = insuranceDetails.state;
-            state.order.policy.zipCode = insuranceDetails.zipCode;
+            state.order.policy.policyAddress.streetAddress = insuranceDetails.streetAddress;
+            state.order.policy.policyAddress.streetAddress2 = insuranceDetails.streetAddress2;
+            state.order.policy.policyAddress.city = insuranceDetails.city;
+            state.order.policy.policyAddress.state = insuranceDetails.state;
+            state.order.policy.policyAddress.zipCode = insuranceDetails.zipCode;
             state.order.policy.claimNumber = insuranceDetails.claimNumber;
             state.order.policy.phoneNumber = insuranceDetails.phoneNumber;
             state.order.policy.phoneExtension = insuranceDetails.phoneExtension;
@@ -577,8 +579,15 @@ export const mutations = {
             state.order.policy.lastName = insuranceDetails.lastName;
             state.order.policy.lossLocation = insuranceDetails.lossLocation;
             state.order.policy.subrogation = insuranceDetails.subrogation;
-            state.order.policy.streetAddress = insuranceDetails.streetAddress;
+            state.order.policy.currentDeductible = insuranceDetails.currentDeductible;
+            state.order.policy.originalDeductible = insuranceDetails.originalDeductible;
+            state.order.payment.insuranceCoverage.coverageStatus = coverageStatusValue(
+                insuranceDetails.coverageStatus
+            );
+            state.order.payment.insuranceCoverage.coverageSubStatus =
+                insuranceDetails.coverageSubStatus;
         }
+        console.log("::::" + state.order.payment.insuranceCoverage.coverageStatus);
     },
     updateDamageDetails(state, damageDetails) {
         if (damageDetails) {
@@ -976,13 +985,17 @@ export const mutations = {
                 ? true
                 : false;
         state.order.policy.policyNumber = sessionInformation.order.policy?.policyNumber;
+        state.order.policy.claimNumber = sessionInformation.order.policy?.claimNumber;
         state.order.policy.insuranceCompanyName =
             sessionInformation.order.policy?.insuranceCompanyName;
-        //state.order.policy.streetAddress = sessionInformation.order.policy?.streetAddress;
-        //state.order.policy.apartment = sessionInformation.order.policy?.apartment;
-        //state.order.policy.city = sessionInformation.order.policy?.city;
-        //state.order.policy.state = sessionInformation.order.policy?.state;
-        //state.order.policy.zipCode = sessionInformation.order.policy?.zipCode;
+        state.order.policy.policyAddress.streetAddress =
+            sessionInformation.order.policy?.address?.streetAddress;
+        state.order.policy.address.streetAddress2 =
+            sessionInformation.order.policy?.address?.streetAddress2;
+        state.order.policy.policyAddress.city = sessionInformation.order.policy?.address?.city;
+        state.order.policy.policyAddress.state = sessionInformation.order.policy?.address?.state;
+        state.order.policy.policyAddress.zipCode =
+            sessionInformation.order.policy?.address?.zipCode;
         state.order.policy.isNoComp =
             coverageTypeValue(sessionInformation?.order.insuranceCoverage.coverageType) ===
             coverageType.NOCOMP
@@ -1818,6 +1831,7 @@ export const actions = {
             coverageSubStatus,
             isNoComp,
             isItac,
+            isClaimAndCoverage,
             subTotalPrice,
             totalPrice,
             userAgent,
@@ -1868,6 +1882,7 @@ export const actions = {
             deductible: deductible,
             isNoComp: isNoComp,
             isItac: isItac,
+            isClaimAndCoverage: isClaimAndCoverage,
             subTotalPrice: subTotalPrice,
             totalPrice: totalPrice,
             userAgent: userAgent,
@@ -2648,6 +2663,8 @@ export const actions = {
                         moldingQuestionAnswers: order.damage.moldingQuestionAnswers,
                         capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers,
                         installOemGlass: order.damage.installOemGlass,
+                        dateOfLoss: order.damage.dateOfLoss,
+                        damageCause: order.damage.damageCause,
                     },
                     lineItems: {
                         glassParts: lineItems.glassParts,
@@ -2699,6 +2716,15 @@ export const actions = {
                         isNoComp: order.policy?.isNoComp,
                         currentDeductible: order.policy?.currentDeductible,
                         originalDeductible: order.policy?.originalDeductible,
+                        policyAddress: {
+                            streetAddress: order.policy?.policyAddress?.streetAddress,
+                            streetAddress2: order.policy?.policyAddress?.streetAddress2,
+                            city: order.policy?.policyAddress?.city,
+                            state: order.policy?.policyAddress?.state,
+                            zipCode: order.policy?.policyAddress?.zipCode,
+                        },
+                        policyNumber: order.policy?.policyNumber,
+                        claimNumber: order.policy?.claimNumber,
                     },
                     serviceLocation: {
                         streetAddress: order.serviceLocation.address,

From f3b9c34656300202fcf2e73778a4fbb58f830f0f Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 10 Jun 2026 14:34:27 -0400
Subject: [PATCH 15/23] CASH-2856 - if VinRequired use Parts Api v2 endpoint
 for Parts-Or-Questions

---
 src/constants/endpoints.js | 4 ++++
 src/store/index.js         | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index efb32ffc6..d6b3e3431 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -56,6 +56,10 @@ const endpoints = {
         url: "/parts/api/v1/parts/parts-or-questions",
         method: "POST",
     },
+    GetPartsOrQuestionsV2: {
+        url: "/parts/api/v2/parts/parts-or-questions",
+        method: "POST",
+    },
     GetParts: {
         url: "/parts/api/v1/parts/parts",
         method: "POST",
diff --git a/src/store/index.js b/src/store/index.js
index 3f2cf5e0d..5e69005e9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1970,10 +1970,14 @@ export const actions = {
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
 
+        const partsOrQuestionsEndpoint = vehicle.vinRequired
+            ? endpoints.GetPartsOrQuestionsV2
+            : endpoints.GetPartsOrQuestions;
+
         const response = await globalMethods
             .callHttpClient({
-                method: endpoints.GetPartsOrQuestions.method,
-                endpoint: endpoints.GetPartsOrQuestions.url,
+                method: partsOrQuestionsEndpoint.method,
+                endpoint: partsOrQuestionsEndpoint.url,
                 payload: {
                     carId: carId,
                     glassPieces: glassArrayForPayload,

From efafef55e579637fd961c1052fc826cc098e8145 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Thu, 11 Jun 2026 13:23:00 -0400
Subject: [PATCH 16/23] CASH-2844 new fields

CASH-2844 new fields for logging
---
 src/mixins/analytics-mixin.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index fa56795a7..0a3b43f56 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -265,6 +265,8 @@ export default {
             sessionData.isNoComp = order?.policy?.isNoComp;
             sessionData.isItac = order?.policy?.isItac;
             sessionData.isClaimAndCoverage = order.payment.isClaimAndCoverage;
+            sessionData.vinRequired = order.vehicle.vinRequired ?? false;
+            sessionData.installOemGlass = order.damage?.installOemGlass ?? false;
             sessionData.subTotalPrice = getSubTotal(order?.lineItems);
             sessionData.totalPrice = getAmountDue(order?.lineItems, true);
             sessionData.userAgent = navigator.userAgent;

From d4f9c210415358bb5e0c6b28ccf15110c1bf27f3 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Thu, 11 Jun 2026 13:25:32 -0400
Subject: [PATCH 17/23] CASH-2844 new fields

CASH-2844 new fields for logging
---
 src/mixins/analytics-mixin.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index c07240498..1a9df51f7 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -264,6 +264,9 @@ export default {
             sessionData.coverageSubStatus = order?.payment?.insuranceCoverage?.coverageSubStatus;
             sessionData.isNoComp = order?.policy?.isNoComp;
             sessionData.isItac = order?.policy?.isItac;
+            sessionData.isClaimAndCoverage = order.payment.isClaimAndCoverage;
+            sessionData.vinRequired = order.vehicle.vinRequired ?? false;
+            sessionData.installOemGlass = order.damage?.installOemGlass ?? false;
             sessionData.subTotalPrice = getSubTotal(order?.lineItems);
             sessionData.totalPrice = getAmountDue(order?.lineItems, true);
             sessionData.userAgent = navigator.userAgent;

From 653045bcd52a87f306f1fa6f224054f76b99a8ae Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Thu, 11 Jun 2026 13:44:59 -0400
Subject: [PATCH 18/23] CASH-2856 - Pointed to v3 of Parts Service for
 parts-or-question endpoint for SL vehicles

---
 src/constants/endpoints.js | 4 ++--
 src/store/index.js         | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index d6b3e3431..76077db76 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -56,8 +56,8 @@ const endpoints = {
         url: "/parts/api/v1/parts/parts-or-questions",
         method: "POST",
     },
-    GetPartsOrQuestionsV2: {
-        url: "/parts/api/v2/parts/parts-or-questions",
+    GetPartsOrQuestionsV3: {
+        url: "/parts/api/v3/parts/parts-or-questions",
         method: "POST",
     },
     GetParts: {
diff --git a/src/store/index.js b/src/store/index.js
index 5e69005e9..503c2baef 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1971,7 +1971,7 @@ export const actions = {
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
 
         const partsOrQuestionsEndpoint = vehicle.vinRequired
-            ? endpoints.GetPartsOrQuestionsV2
+            ? endpoints.GetPartsOrQuestionsV3
             : endpoints.GetPartsOrQuestions;
 
         const response = await globalMethods
@@ -2020,6 +2020,7 @@ export const actions = {
         const vehicle = context.getters.vehicle;
         const damage = context.getters.damage;
         const order = context.state.order;
+        const payment = context.getters.payment;
 
         const carId = vehicle.carId;
         const glassArray = damage.glassToReplace;
@@ -2028,6 +2029,7 @@ export const actions = {
         const vin = vehicle.vin;
         const serviceType = order.serviceLocation?.appointmentType;
         const referralSeqNumber = order.referralSequenceNumber;
+        const parentAccountNumber = payment.parentAccountNumber;
 
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
@@ -2044,6 +2046,7 @@ export const actions = {
                 vin: vin,
                 serviceType: serviceType,
                 referralSeqNumber: referralSeqNumber,
+                parentAccountNumber: parentAccountNumber,
             },
             logApiCall: true,
             pageNameToLog: pageNameToLog,

From dfd805b3926a3b81017b61945d6f267f35c3725a Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Thu, 11 Jun 2026 14:01:08 -0400
Subject: [PATCH 19/23] track page name

track page name so it can logged to cloudwatch
---
 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 ed88393b5..4341d416b 100644
--- a/src/constants/header-keys.js
+++ b/src/constants/header-keys.js
@@ -6,4 +6,5 @@ export const headerKeys = {
     TRANSACTION_ID: "X-Transaction-Id",
     EON: "X-Enterprise-Order-Number",
     LOG_ENABLED: "log-enabled",
+    PAGE_NAME_TO_LOG: "X-Page-Name-To-Log",
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index f408230f8..584743b2d 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -69,6 +69,7 @@ export default {
                 [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME,
                 [headerKeys.SESSION_SEQUENCE_NUMBER]: getSessionKeyValue(),
                 [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
+                [headerKeys.PAGE_NAME_TO_LOG]: pageNameToLog,
                 [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
                 [headerKeys.EON]: order?.eon,
                 [headerKeys.LOG_ENABLED]: store.getters.applicationUser?.loggingOption ?? false,

From a53a507b7603ab5de6d3dac43eafb2a1fdb958d0 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 14 Jun 2026 04:02:54 -0400
Subject: [PATCH 20/23] CASH-2844 guard for null object

CASH-2844 guard for null object
---
 src/store/index.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index fda879140..18c7f3cbc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -988,14 +988,17 @@ export const mutations = {
         state.order.policy.claimNumber = sessionInformation.order.policy?.claimNumber;
         state.order.policy.insuranceCompanyName =
             sessionInformation.order.policy?.insuranceCompanyName;
-        state.order.policy.policyAddress.streetAddress =
-            sessionInformation.order.policy?.address?.streetAddress;
-        state.order.policy.address.streetAddress2 =
-            sessionInformation.order.policy?.address?.streetAddress2;
-        state.order.policy.policyAddress.city = sessionInformation.order.policy?.address?.city;
-        state.order.policy.policyAddress.state = sessionInformation.order.policy?.address?.state;
-        state.order.policy.policyAddress.zipCode =
-            sessionInformation.order.policy?.address?.zipCode;
+
+        if (!state.order.policy.policyAddress) {
+            state.order.policy.policyAddress = {};
+        }
+        const sessionPolicyAddress = sessionInformation.order.policy?.address;
+        state.order.policy.policyAddress.streetAddress = sessionPolicyAddress?.streetAddress;
+        state.order.policy.policyAddress.streetAddress2 = sessionPolicyAddress?.streetAddress2;
+        state.order.policy.policyAddress.city = sessionPolicyAddress?.city;
+        state.order.policy.policyAddress.state = sessionPolicyAddress?.state;
+        state.order.policy.policyAddress.zipCode = sessionPolicyAddress?.zipCode;
+
         state.order.policy.isNoComp =
             coverageTypeValue(sessionInformation?.order.insuranceCoverage.coverageType) ===
             coverageType.NOCOMP

From 72a3e6534bf8897e85de7b8f591e2956fc91dc59 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 14 Jun 2026 04:30:03 -0400
Subject: [PATCH 21/23] merge 6.18 to develop

merge 6.18 to develop
---
 src/styles/common-styles.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 155004719..ce1354f16 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -106,10 +106,4 @@ option,
 .page-gradient {
     height: 12px;
     background: linear-gradient(to bottom, rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0));
-
-    // Pull the page content up under the header gradient on insurance pages
-    // (every insurance page renders the container right after .page-gradient).
-    & + .container {
-        margin-top: -22px;
-    }
 }

From a0750f8c14fac49e2be25442365e6045469a85a1 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Sun, 14 Jun 2026 05:25:12 -0400
Subject: [PATCH 22/23] pass new snowflake fields

pass new snowflake fields
---
 src/store/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/store/index.js b/src/store/index.js
index 4ca5c7a25..a21c8653e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1818,6 +1818,9 @@ export const actions = {
             coverageSubStatus,
             isNoComp,
             isItac,
+            isClaimAndCoverage,
+            vinRequired,
+            installOemGlass,
             subTotalPrice,
             totalPrice,
             userAgent,
@@ -1868,6 +1871,9 @@ export const actions = {
             deductible: deductible,
             isNoComp: isNoComp,
             isItac: isItac,
+            isClaimAndCoverage: isClaimAndCoverage,
+            vinRequired: vinRequired,
+            installOemGlass: installOemGlass,
             subTotalPrice: subTotalPrice,
             totalPrice: totalPrice,
             userAgent: userAgent,

From 3ffc2192a7fc7cd595d6047e8738a4a4135fa847 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 15 Jun 2026 11:26:24 -0400
Subject: [PATCH 23/23] CASH-2872: Add QPD and Replace Fee to cart/products
 datalayer objects

---
 src/mixins/analytics-mixin.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 1a9df51f7..7ff1fcd51 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -605,8 +605,13 @@ export default {
                         [part],
                         false
                     );
+                    let isQuotePageDiscount = productType == partTypeStrings.QUOTE_PAGE_DISCOUNT;
 
-                    if (productSku == "DISCOUNT" || productType == "SERVICE PACKAGE DISCOUNT") {
+                    if (
+                        productSku == "DISCOUNT" ||
+                        productType == "SERVICE PACKAGE DISCOUNT" ||
+                        isQuotePageDiscount
+                    ) {
                         if (coupon) {
                             coupon += ",";
                         }
@@ -617,6 +622,7 @@ export default {
                         }
 
                         discount += productPrice * -1;
+                        subTotal += isQuotePageDiscount ? productPrice : 0;
                     } else {
                         products.push({
                             productType: productType,
@@ -666,6 +672,12 @@ export default {
                 var repairFee = supportingItems.filter(function (lineItem) {
                     return lineItem.partType.indexOf("REPAIR FEE") !== -1;
                 });
+                var replaceFee = supportingItems.filter(function (lineItem) {
+                    return lineItem.partType.indexOf("REPLACE FEE") !== -1;
+                });
+                var quotePageDiscount = supportingItems.filter(function (lineItem) {
+                    return lineItem.partType.indexOf(partTypeStrings.QUOTE_PAGE_DISCOUNT) !== -1;
+                });
 
                 var vaps =
                     submittedOrder.lineItems && submittedOrder.lineItems.vaps
@@ -704,6 +716,12 @@ export default {
                 if (rainRepel) {
                     combinedLineItems = combinedLineItems.concat(rainRepel);
                 }
+                if (replaceFee) {
+                    combinedLineItems = combinedLineItems.concat(replaceFee);
+                }
+                if (quotePageDiscount) {
+                    combinedLineItems = combinedLineItems.concat(quotePageDiscount);
+                }
 
                 //Remove child Parts if any
                 combinedLineItems.forEach((lineItem) => {