From 44644c9ed301ff967ef00ee1935a824533079492 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 13:18:12 -0500
Subject: [PATCH 01/78] Added initial stub for service-type-question

---
 .../service-type-question.spec.js             |  1 +
 .../service-type-question.vue                 | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/layouts/service-location/service-type-question/service-type-question.spec.js
 create mode 100644 src/layouts/service-location/service-type-question/service-type-question.vue

diff --git a/src/layouts/service-location/service-type-question/service-type-question.spec.js b/src/layouts/service-location/service-type-question/service-type-question.spec.js
new file mode 100644
index 000000000..66012402c
--- /dev/null
+++ b/src/layouts/service-location/service-type-question/service-type-question.spec.js
@@ -0,0 +1 @@
+test.todo("some test to be written in the future");
\ No newline at end of file
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
new file mode 100644
index 000000000..2a3cdfe22
--- /dev/null
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -0,0 +1,50 @@
+<template>
+    <transition name="fade" mode="out-in">
+        <div class="service-type-question" v-if="isAvailable" aria-live="polite">
+            <buttonQuestion
+                :questionText="questionText"
+                :answers="answersFromCms"
+                :groupName="groupName"
+                buttonTypeString="listCard"
+                v-model="selectedValues"
+                :suppressError="suppressError"
+                :validationRules="validationRules"
+                isRequired />
+        </div>
+    </transition>
+</template>
+
+<script>
+import buttonQuestion from "@/digital-components/button-question/button-question";
+
+export default {
+    name: "windshieldDamageTypeQuestion",
+    props: {
+        modelValue: String,
+        groupName: String,
+        isAvailable: Boolean,
+        suppressError: Boolean,
+        validationRules: String,
+        cmsWidgetName: String,
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "QuestionText");
+        },
+        answersFromCms() {
+            return this.getCmsContent(this.cmsWidgetName, "Answers");
+        },
+        selectedValues: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    components: {
+        buttonQuestion,
+    },
+};
+</script>

From eea249d3c27436e7d8fb91877cfd612162293c16 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 7 Mar 2023 14:04:28 -0500
Subject: [PATCH 02/78] Created service-type-question component

---
 .../service-type-question.spec.js                 |  2 +-
 .../service-type-question.vue                     | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/layouts/service-location/service-type-question/service-type-question.spec.js b/src/layouts/service-location/service-type-question/service-type-question.spec.js
index 66012402c..3d0843e10 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.spec.js
+++ b/src/layouts/service-location/service-type-question/service-type-question.spec.js
@@ -1 +1 @@
-test.todo("some test to be written in the future");
\ No newline at end of file
+test.todo("some test to be written in the future");
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index 2a3cdfe22..359e44547 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div class="service-type-question" v-if="isAvailable" aria-live="polite">
+        <div class="service-type-question" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
@@ -18,7 +18,7 @@
 import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
-    name: "windshieldDamageTypeQuestion",
+    name: "service-type-question",
     props: {
         modelValue: String,
         groupName: String,
@@ -26,6 +26,10 @@ export default {
         suppressError: Boolean,
         validationRules: String,
         cmsWidgetName: String,
+        isGlassServiceableMobile: Boolean,
+        isGlassServiceableInShop: Boolean,
+        isRecalibrationServiceableInShop: Boolean,
+        isRecalibrationServiceableMobile: Boolean
     },
     computed: {
         questionText() {
@@ -48,3 +52,10 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.list-card img {
+    height: auto;
+    width: 3.417rem;
+}
+</style>
\ No newline at end of file

From 663682c7a423cec23cbcbfb99b16911a2336731e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 7 Mar 2023 14:05:15 -0500
Subject: [PATCH 03/78] Added service-type-location component to page

---
 .../service-location/service-location.vue     | 70 +++++++++++++------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 777cbde74..e274c120b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,23 +4,32 @@
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion
-                v-model="serviceZipCodeQuestion"
-                @updated-service-zip-code="resetMobileLocation"
-                ref="serviceZipCodeQuestion"
-                linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget" />
-            <mobileLocationModalQuestions
-                v-model="mobileLocationQuestions"
-                ref="mobileLocationModalQuestions"
-                linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" />
-            <funnel-footer
-                cmsWidgetName="FunnelFooterWidget"
-                ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid"
-                @back-clicked="backButtonAction"
-                @ForwardClicked="forwardButtonAction" />
+            <div class="fade-on-route-transition sub-container make-tall">
+                <serviceZipModalQuestion
+                    v-model="serviceZipCodeQuestion"
+                    @updated-service-zip-code="resetMobileLocation"
+                    ref="serviceZipCodeQuestion"
+                    linkWidgetName="ServiceZipLinkWidget"
+                    modalWidgetName="ServiceZipModalWidget" />
+                <serviceTypeQuestion
+                    v-model="selectedServiceType"
+                    ref="serviceType"
+                    groupName="ServiceTypeQuestion"
+                    cmsWidgetName="ServiceTypeQuestionWidget"/>
+                <mobileLocationModalQuestions 
+                    v-if="selectedServiceType === 'Mobile'"
+                    v-model="mobileLocationQuestions"
+                    ref="mobileLocationModalQuestions"
+                    linkWidgetName="MobileLocationLinkWidget"
+                    modalWidgetName="MobileLocationModalWidget" />
+                <funnel-footer
+                    cmsWidgetName="FunnelFooterWidget"
+                    ref="funnelFooter"
+                    :isForwardActionDisabled="!meta.valid"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction" />
+            </div>
+
         </div>
     </Form>
 </template>
@@ -29,11 +38,15 @@
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
 import mobileLocationModalQuestions from "@/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions";
+import serviceTypeQuestion from "@/layouts/service-location/service-type-question/service-type-question";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form } from "vee-validate";
+import { Form, defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
@@ -53,6 +66,7 @@ export default {
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
+            selectedServiceType: null
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -129,11 +143,12 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return (
-                store.getters.lineItems.supportingItems !== null &&
-                store.getters.order.serviceLocation.zipCode !== null &&
-                store.getters.payment.isInsurance !== null
-            );
+            return true;
+            // return (
+            //     store.getters.lineItems.supportingItems !== null &&
+            //     store.getters.order.serviceLocation.zipCode !== null &&
+            //     store.getters.payment.isInsurance !== null
+            // );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
@@ -179,6 +194,7 @@ export default {
     },
     components: {
         serviceZipModalQuestion,
+        serviceTypeQuestion,
         mobileLocationModalQuestions,
         funnelHeader,
         funnelFooter,
@@ -188,3 +204,11 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.question-text {
+    & > span {
+        text-align: center;
+    }
+}   
+</style>
\ No newline at end of file

From 732672c105822a234525c0aa80ccbdab1372bf89 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 7 Mar 2023 14:13:09 -0500
Subject: [PATCH 04/78] Updated styling on vehicle-protected-question to ensure
 proper alignment

---
 .../vehicle-protected-question.vue                  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index f5754ea06..c1484500b 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -51,14 +51,11 @@ export default {
 </script>
 
 <style lang="scss">
-.question-text {
-    margin-top: 1.5rem;
-    margin-bottom: 1rem;
-    font-size: 1rem;
-    line-height: 1.625rem;
-
-    & > span {
-        text-align: left;
+.modal-dialog {
+    .question-text {
+        & > span {
+            text-align: left;
+        }
     }
 }
 </style>

From 04efdfcd0f031667f272c04816d4643f40ed8265 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Mar 2023 10:11:48 -0500
Subject: [PATCH 05/78] temp chkin

---
 .../mobile-location-modal-questions.vue       |  1 -
 .../service-location/service-location.vue     | 24 +++++++++++--------
 .../service-type-question.vue                 | 13 ++++++++--
 3 files changed, 25 insertions(+), 13 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 0aa64594d..598af5438 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
@@ -130,7 +130,6 @@ export default {
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e274c120b..37a79d9c8 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -13,10 +13,11 @@
                     modalWidgetName="ServiceZipModalWidget" />
                 <serviceTypeQuestion
                     v-model="selectedServiceType"
-                    ref="serviceType"
+                    ref="serviceTypeQuestion"
                     groupName="ServiceTypeQuestion"
-                    cmsWidgetName="ServiceTypeQuestionWidget"/>
-                <mobileLocationModalQuestions 
+                    cmsWidgetName="ServiceTypeQuestionWidget"
+                    validationRules="option-required" />
+                <mobileLocationModalQuestions
                     v-if="selectedServiceType === 'Mobile'"
                     v-model="mobileLocationQuestions"
                     ref="mobileLocationModalQuestions"
@@ -29,7 +30,6 @@
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
-
         </div>
     </Form>
 </template>
@@ -43,9 +43,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form, defineRule } from "vee-validate";
-import { required, regex } from "@/helpers/validation-rules";
-import { errorMessages } from "@/constants/error-messages";
+import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -66,7 +64,7 @@ export default {
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
-            selectedServiceType: null
+            selectedServiceType: null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -113,6 +111,8 @@ export default {
                 this.state = newValue.state;
                 this.zipCode = newValue.zipCode;
                 this.isServiceable = newValue.isServiceable;
+
+                console.log(this);
             },
         },
         mobileLocationQuestions: {
@@ -176,6 +176,10 @@ export default {
             });
         },
         resetMobileLocation(updatedServiceZipCode) {
+            if (!this.$refs.mobileLocationModalQuestions) {
+                return;
+            }
+
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";
             this.city = "";
@@ -210,5 +214,5 @@ export default {
     & > span {
         text-align: center;
     }
-}   
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index 359e44547..528f7487b 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -17,6 +17,8 @@
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 
+import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
+
 export default {
     name: "service-type-question",
     props: {
@@ -29,7 +31,14 @@ export default {
         isGlassServiceableMobile: Boolean,
         isGlassServiceableInShop: Boolean,
         isRecalibrationServiceableInShop: Boolean,
-        isRecalibrationServiceableMobile: Boolean
+        isRecalibrationServiceableMobile: Boolean,
+    },
+    setup() {
+        const form = useForm();
+
+        return {
+            form
+        };
     },
     computed: {
         questionText() {
@@ -58,4 +67,4 @@ export default {
     height: auto;
     width: 3.417rem;
 }
-</style>
\ No newline at end of file
+</style>

From 59a307bafc47fc7fe93bc0897029ee482fb59c95 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 15:26:30 -0400
Subject: [PATCH 06/78] Prettified

---
 src/layouts/service-location/service-location.vue           | 6 +++---
 .../service-type-question/service-type-question.vue         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 555d1b196..84bdd31c9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -7,7 +7,7 @@
             <div class="fade-on-route-transition sub-container make-tall">
                 <serviceZipModalQuestion
                     v-model="serviceZipCodeQuestion"
-                        ref="serviceZipCodeQuestion"
+                    ref="serviceZipCodeQuestion"
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
                 <serviceTypeQuestion
@@ -20,7 +20,7 @@
                     v-if="selectedServiceType === 'Mobile'"
                     v-model="mobileLocationQuestions"
                     :mobileFeePart="mobileFeePart"
-                ref="mobileLocationModalQuestions"
+                    ref="mobileLocationModalQuestions"
                     linkWidgetName="MobileLocationLinkWidget"
                     modalWidgetName="MobileLocationModalWidget" />
                 <funnel-footer
@@ -184,7 +184,7 @@ export default {
                 this.mobileFeePart = pricedMobileFeePart;
             });
         },
-        resetMobileLocation(updatedServiceZipCode) {
+        resetMobileLocation(updatedServiceZipCodeInfo) {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";
             this.city = "";
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index 528f7487b..cf27645c7 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -37,7 +37,7 @@ export default {
         const form = useForm();
 
         return {
-            form
+            form,
         };
     },
     computed: {

From 328a1d422a42e264258a1ed0d58f1938aa33ad08 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 16:16:28 -0400
Subject: [PATCH 07/78] Moved alert to above service type question

---
 .../service-location/service-location.vue     | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 105b8cdc1..64bf3d5f4 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -12,17 +12,17 @@
                     @set-mobile-fee-part="setMobileFeePart"
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
+                <alert
+                    class="my-4"
+                    cmsWidgetName="AlertMilitaryBaseZipWidget"
+                    v-if="zipContainsMilitaryBase"
+                    alertClass="alert-warning" />    
                 <serviceTypeQuestion
                     v-model="selectedServiceType"
                     ref="serviceTypeQuestion"
                     groupName="ServiceTypeQuestion"
                     cmsWidgetName="ServiceTypeQuestionWidget"
                     validationRules="option-required" />
-                <alert
-                    class="my-4"
-                    cmsWidgetName="AlertMilitaryBaseZipWidget"
-                    v-if="zipContainsMilitaryBase"
-                    alertClass="alert-warning" />
                 <mobileLocationModalQuestions
                     v-if="selectedServiceType === 'Mobile'"
                     v-model="mobileLocationQuestions"
@@ -87,6 +87,7 @@ export default {
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
         const billToAccountNumber = 1;
+        const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
         const mobileFeePartPromise = getPricedMobileFeePart(
             serviceZipCode,
@@ -107,7 +108,7 @@ export default {
             },
             {
                 resultKey: "zipCodeData",
-                promise: baseMixin.methods.getZipCodeData(serviceZipCode),
+                promise: getZipCodeData,
             },
         ];
 
@@ -117,8 +118,6 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.setData(resultMap.mobileFeePart);
-            vm.zipContainsMilitaryBase = resultMap.zipCodeData.containsMilitaryBase;
-            vm.zipCode = serviceZipCode;
         });
     },
     computed: {
@@ -167,17 +166,20 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // return (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
-        setData(mobileFeePart) {
+        setData(zipCodeData, mobileFeePart) {
             if (mobileFeePart) {
                 this.mobileFeePart = mobileFeePart;
             }
+
+            if (zipCodeData) {
+                this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
+            }
         },
         getServiceAddressFromStore() {
             return store.getters.order.serviceLocation.address;

From 678f0b96a3bf74cb26c93f03548f1caff9dd09fe Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 7 Feb 2023 13:50:24 -0500
Subject: [PATCH 08/78] CSR-1077 supporting items changes

This was required to get repair orders to load when the customer didn't progress past the parts page to quote.  the load wouldn't have any parts and no chips to indicate repair.
---
 src/layouts/estimate/estimate.vue             | 19 +++++++++++++
 .../service-package-question.vue              | 28 ++++++++++---------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index cfec5923d..15a9749e7 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -252,6 +252,25 @@ export default {
                 } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
+                    const supportingItemsPromise = await this.dispatchStoreAction(
+                        storeActions.GET_SUPPORTING_ITEMS
+                    );
+
+                    const promiseResultMap = [
+                        {
+                            resultKey: "supportingItems",
+                            promise: supportingItemsPromise,
+                        },
+                    ];
+
+                    const resultMap = await settleAllPromises(promiseResultMap);
+
+                    this.dispatchStoreAction(
+                        this.storeActions.SAVE_SUPPORTING_ITEMS,
+                        resultMap.supportingItems,
+                        false
+                    );
+
                     // call saveSession here - navigateWithSaving saves too late in the flow
                     await saveSession({});
                     return this.$router.navigateWithoutSaving(
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 1d9235374..eede868a5 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -42,7 +42,7 @@ export default {
     },
     watch: {
         availableLineItems() {
-            if (this.$store.getters.lineItems.supportingItems) {
+            if (this.$store.getters.lineItems.vaps) {
                 this.selectDefaultPackage();
             }
         },
@@ -212,18 +212,20 @@ export default {
         selectDefaultPackage() {
             const vapsFromStore = this.$store.getters.lineItems.vaps;
             let lowestTierForPackage = packageNames.TIER_ONE;
-            vapsFromStore.every((vapsItem) => {
-                let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem);
-                if (lowestTierForThisItem === packageNames.TIER_THREE) {
-                    lowestTierForPackage = packageNames.TIER_THREE;
-                    return false;
-                } else if (lowestTierForThisItem === packageNames.TIER_TWO) {
-                    lowestTierForPackage = packageNames.TIER_TWO;
-                    return true;
-                } else {
-                    return true;
-                }
-            });
+            if (vapsFromStore.length > 0) {
+                vapsFromStore.every((vapsItem) => {
+                    let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem);
+                    if (lowestTierForThisItem === packageNames.TIER_THREE) {
+                        lowestTierForPackage = packageNames.TIER_THREE;
+                        return false;
+                    } else if (lowestTierForThisItem === packageNames.TIER_TWO) {
+                        lowestTierForPackage = packageNames.TIER_TWO;
+                        return true;
+                    } else {
+                        return true;
+                    }
+                });
+            }
             this.selectedPackageName = lowestTierForPackage;
         },
         getLowestTierForThisItem(vapsItem) {

From 1e1204fcfabb4da669c2d1c00379e16984971ef9 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 14 Mar 2023 16:52:44 -0400
Subject: [PATCH 09/78] Merge pull request #973 from Safelite/defect/CSR-1168

CSR-1168 | Default service package selection changes
---
 src/layouts/quote/quote.vue                   |  15 +-
 .../service-package-question.spec.js          | 207 ++++++++++++++++++
 .../service-package-question.vue              |  28 ++-
 3 files changed, 246 insertions(+), 4 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index dfada2db0..ad9321846 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -107,12 +107,14 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        const glassParts = store.getters.order.lineItems.glassParts ?? [];
+        const clonedGlassParts = store.getters.order.lineItems.glassParts
+            ? JSON.parse(JSON.stringify(store.getters.order.lineItems.glassParts))
+            : [];
         const availableLineItems = [
             resultMap.rainDefense,
             ...resultMap.supportingItems,
             ...resultMap.wipers,
-            ...glassParts,
+            ...clonedGlassParts,
         ];
 
         const pricingResults = await baseMixin.methods.dispatchStoreAction(
@@ -124,6 +126,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.pricedGlassParts = clonedGlassParts;
             vm.supportingItems = resultMap.supportingItems;
             vm.availableLineItems = pricingResults;
             vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue(vm.availableLineItems);
@@ -135,6 +138,7 @@ export default {
             selectedVaps: null,
             availableLineItems: null,
             supportingItems: null,
+            pricedGlassParts: null,
         };
     },
     methods: {
@@ -187,6 +191,13 @@ export default {
             if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
+            if (this.pricedGlassParts.length > 0) {
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_GLASS_PARTS,
+                    this.pricedGlassParts,
+                    false
+                );
+            }
             this.dispatchStoreAction(
                 this.storeActions.SAVE_SUPPORTING_ITEMS,
                 this.supportingItems,
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
index cd10b893f..af04ff36a 100644
--- a/src/layouts/quote/service-package-question/service-package-question.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -135,6 +135,213 @@ describe("service-package-question.vue", () => {
             expectedModifiedAnswers[packageNameKey].tierThree
         );
     });
+    it("should not select a default package if ANY glass part or supporting item has no prices", async () => {
+        // Note, only the first WSREPAIR item has a 0 for laborAmount, this is enough to not try and select a default package
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe(null);
+    });
+    it("should select a default package if ALL glass parts and supporting items have prices", async () => {
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe("TierOne");
+    });
+    it("should select TierThree default package if Rain Defense is on order", async () => {
+        // This tests the business intent that when returning to the page, the selected package is the lowest package that contains all VAPs on the order.
+        // In this case Rain Defense is only in Premium so Tier Three should be defaulted to
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            vaps: [
+                                {
+                                    partNumber: "RAIN DEFENSE",
+                                    partType: "RAIN DEFENSE",
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe("TierThree");
+    });
 });
 describe("service-package-question.vue, matching business rules for package display", () => {
     // mock scenarios in figma:
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index eede868a5..e66871830 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -42,7 +42,7 @@ export default {
     },
     watch: {
         availableLineItems() {
-            if (this.$store.getters.lineItems.vaps) {
+            if (this.allGlassPartsAndSupportingItemsHavePrices(this.$store.getters.lineItems)) {
                 this.selectDefaultPackage();
             }
         },
@@ -212,7 +212,7 @@ export default {
         selectDefaultPackage() {
             const vapsFromStore = this.$store.getters.lineItems.vaps;
             let lowestTierForPackage = packageNames.TIER_ONE;
-            if (vapsFromStore.length > 0) {
+            if (vapsFromStore?.length > 0) {
                 vapsFromStore.every((vapsItem) => {
                     let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem);
                     if (lowestTierForThisItem === packageNames.TIER_THREE) {
@@ -228,6 +228,30 @@ export default {
             }
             this.selectedPackageName = lowestTierForPackage;
         },
+        allGlassPartsAndSupportingItemsHavePrices(lineItems) {
+            if (lineItems?.glassParts) {
+                for (let i = 0; i < lineItems.glassParts.length; i++) {
+                    if (this.priceIsNullOrZero(lineItems.glassParts[i])) {
+                        return false;
+                    }
+                }
+            }
+            if (lineItems?.supportingItems) {
+                for (let i = 0; i < lineItems.supportingItems.length; i++) {
+                    if (this.priceIsNullOrZero(lineItems.supportingItems[i])) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        },
+        priceIsNullOrZero(lineItem) {
+            return (
+                (lineItem.kitPrice == null || lineItem.kitPrice == 0) &&
+                (lineItem.laborAmount == null || lineItem.laborAmount == 0) &&
+                (lineItem.sellingPrice == null || lineItem.sellingPrice == 0)
+            );
+        },
         getLowestTierForThisItem(vapsItem) {
             let lowestTierForThisItem = null;
             switch (vapsItem.partType) {

From 977785a069563c3122fb7688a7ba9e70d3625da5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 08:08:23 -0400
Subject: [PATCH 10/78] WIP

---
 src/layouts/service-location/service-location.vue  | 10 ++++++----
 .../service-type-question.vue                      | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 64bf3d5f4..5c6f9cbb1 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -16,7 +16,7 @@
                     class="my-4"
                     cmsWidgetName="AlertMilitaryBaseZipWidget"
                     v-if="zipContainsMilitaryBase"
-                    alertClass="alert-warning" />    
+                    alertClass="alert-warning" />
                 <serviceTypeQuestion
                     v-model="selectedServiceType"
                     ref="serviceTypeQuestion"
@@ -72,9 +72,11 @@ export default {
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
-            isVehicleProtected: null,
-            isZipServiceableMobile: null,
-            isZipServiceableInShop: null,
+            isVehicleProtected: null,       
+            isGlassServiceableInShop: null,
+            isRecalibrationServiceableInShop: null,
+            isGlassServiceableMobile: null,
+            isRecalibrationServiceableMobile: null,
             mobileFeePart: null,
             zipContainsMilitaryBase: false,
             selectedServiceType: null,
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index cf27645c7..5dda61d71 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -3,7 +3,7 @@
         <div class="service-type-question" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
-                :answers="answersFromCms"
+                :answers="answersToDisplay"
                 :groupName="groupName"
                 buttonTypeString="listCard"
                 v-model="selectedValues"
@@ -47,6 +47,18 @@ export default {
         answersFromCms() {
             return this.getCmsContent(this.cmsWidgetName, "Answers");
         },
+        answersToDisplay() {
+            let filteredAnswers;
+            if (this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile && this.isGlassServiceableInShop && this.isRecalibrationServiceableInShop) {
+                filteredAnswers = this.answersFromCms;
+            } else if (this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile && !this.isGlassServiceableInShop && !this.isRecalibrationServiceableInShop) {
+                filteredAnswers = this.answersFromCms.filter(answer => answer.Name == "InShop" || answer.Name == "DropOff");
+            } else if (this.isGlassServiceableInShop && this.isRecalibrationServiceableInShop && !this.isGlassServiceableMobile && !this.isRecalibrationServiceableMobile) {
+                filteredAnswers = this.answersFromCms.filter(answer => answer.Name == "Mobile");
+            }
+
+            return filteredAnswers;
+        },
         selectedValues: {
             get: function () {
                 return this.modelValue;

From f8dc7f12f8873b5fff6c7ab0f5b0b5858bcb173e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 08:18:20 -0400
Subject: [PATCH 11/78] WIP

---
 .../service-location/service-location.vue     | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 5c6f9cbb1..d5967f8c0 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -85,11 +85,19 @@ export default {
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+     
+        const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
+
+        const lineItems = store.getters.order.lineItems;
+        const serviceabilityDetailsPromise = getServiceabilityDetails({
+            serviceZipCode: serviceZipCode,
+            lineItems: lineItems,
+        });
+
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
         const billToAccountNumber = 1;
-        const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
         const mobileFeePartPromise = getPricedMobileFeePart(
             serviceZipCode,
@@ -108,6 +116,10 @@ export default {
                 resultKey: "mobileFeePart",
                 promise: mobileFeePartPromise,
             },
+            {
+                resultKey: "serviceabilityDetails",
+                promise: serviceabilityDetailsPromise,
+            },
             {
                 resultKey: "zipCodeData",
                 promise: getZipCodeData,
@@ -119,7 +131,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.setData(resultMap.mobileFeePart);
+            vm.setData(resultMap.zipCodeData, resultMap.serviceabilityDetails, resultMap.mobileFeePart);
         });
     },
     computed: {
@@ -175,13 +187,20 @@ export default {
             );
         },
         setData(zipCodeData, mobileFeePart) {
-            if (mobileFeePart) {
-                this.mobileFeePart = mobileFeePart;
-            }
-
             if (zipCodeData) {
                 this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
             }
+
+            if (serviceabilityDetails) {
+                this.isGlassServiceableInShop = serviceabilityDetails.isGlassServiceableInShop;
+                this.isRecalibrationServiceableInShop = serviceabilityDetails.isRecalibrationServiceableInShop;
+                this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
+                this.isRecalibrationServiceableMobile = serviceabilityDetails.isRecalibrationServiceableMobile;
+            }
+
+            if (mobileFeePart) {
+                this.mobileFeePart = mobileFeePart;
+            }
         },
         getServiceAddressFromStore() {
             return store.getters.order.serviceLocation.address;

From 1a1cfc426a140c357f3df9d6107c207b64cc23aa Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 08:27:37 -0400
Subject: [PATCH 12/78] WIP

---
 .../service-location/service-location.vue     | 20 +++++++----
 .../service-type-question.vue                 | 34 ++++++++++++++++---
 src/store/index.js                            | 10 ++++++
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d5967f8c0..5120685bc 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -60,7 +60,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import { getPricedMobileFeePart, getServiceabilityDetails } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -72,7 +72,7 @@ export default {
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
-            isVehicleProtected: null,       
+            isVehicleProtected: null,
             isGlassServiceableInShop: null,
             isRecalibrationServiceableInShop: null,
             isGlassServiceableMobile: null,
@@ -85,7 +85,7 @@ export default {
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-     
+
         const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
         const lineItems = store.getters.order.lineItems;
@@ -131,7 +131,11 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.setData(resultMap.zipCodeData, resultMap.serviceabilityDetails, resultMap.mobileFeePart);
+            vm.setData(
+                resultMap.zipCodeData,
+                resultMap.serviceabilityDetails,
+                resultMap.mobileFeePart
+            );
         });
     },
     computed: {
@@ -186,16 +190,18 @@ export default {
                 store.getters.payment.isInsurance !== null
             );
         },
-        setData(zipCodeData, mobileFeePart) {
+        setData(zipCodeData, serviceabilityDetails, mobileFeePart) {
             if (zipCodeData) {
                 this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
             }
 
             if (serviceabilityDetails) {
                 this.isGlassServiceableInShop = serviceabilityDetails.isGlassServiceableInShop;
-                this.isRecalibrationServiceableInShop = serviceabilityDetails.isRecalibrationServiceableInShop;
+                this.isRecalibrationServiceableInShop =
+                    serviceabilityDetails.isRecalibrationServiceableInShop;
                 this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
-                this.isRecalibrationServiceableMobile = serviceabilityDetails.isRecalibrationServiceableMobile;
+                this.isRecalibrationServiceableMobile =
+                    serviceabilityDetails.isRecalibrationServiceableMobile;
             }
 
             if (mobileFeePart) {
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index 5dda61d71..f3f73415e 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -49,12 +49,36 @@ export default {
         },
         answersToDisplay() {
             let filteredAnswers;
-            if (this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile && this.isGlassServiceableInShop && this.isRecalibrationServiceableInShop) {
+            if (
+                this.isGlassServiceableMobile &&
+                this.isRecalibrationServiceableMobile &&
+                this.isGlassServiceableInShop &&
+                this.isRecalibrationServiceableInShop
+            ) {
                 filteredAnswers = this.answersFromCms;
-            } else if (this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile && !this.isGlassServiceableInShop && !this.isRecalibrationServiceableInShop) {
-                filteredAnswers = this.answersFromCms.filter(answer => answer.Name == "InShop" || answer.Name == "DropOff");
-            } else if (this.isGlassServiceableInShop && this.isRecalibrationServiceableInShop && !this.isGlassServiceableMobile && !this.isRecalibrationServiceableMobile) {
-                filteredAnswers = this.answersFromCms.filter(answer => answer.Name == "Mobile");
+            } else if (
+                this.isGlassServiceableMobile &&
+                this.isRecalibrationServiceableMobile &&
+                !this.isGlassServiceableInShop &&
+                !this.isRecalibrationServiceableInShop
+            ) {
+                filteredAnswers = this.answersFromCms.filter(
+                    (answer) => answer.Name == "InShop" || answer.Name == "DropOff"
+                );
+            } else if (
+                this.isGlassServiceableInShop &&
+                this.isRecalibrationServiceableInShop &&
+                !this.isGlassServiceableMobile &&
+                !this.isRecalibrationServiceableMobile
+            ) {
+                filteredAnswers = this.answersFromCms.filter((answer) => answer.Name == "Mobile");
+            } else if (
+                !this.isGlassServiceableInShop &&
+                !this.isRecalibrationServiceableInShop &&
+                !this.isGlassServiceableMobile &&
+                !this.isRecalibrationServiceableMobile
+            ) {
+                filteredAnswers = [];
             }
 
             return filteredAnswers;
diff --git a/src/store/index.js b/src/store/index.js
index 9458b993d..1cdd77e80 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -926,6 +926,16 @@ export const actions = {
         });
     },
 
+    getServiceabilityDetails(context, { serviceZipCode, lineItems }) {
+        return globalMethods.callMockHttpClient({
+            method: endpoints.GetServiceabilityDetails.method,
+            //TODO: Remove Mocky Endpoints
+            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847" // ForcedInShop
+            //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
+        });
+    },
+
     getSupportingItems(context) {
         const glassPartsArray = context.getters.lineItems.glassParts ?? [];
         const carId = context.getters.vehicle.carId;

From 82e6d7c305eb69aa364787552c7224e9d242315a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 08:45:31 -0400
Subject: [PATCH 13/78] WIP

---
 src/constants/store-actions.js                    |  1 +
 .../service-location-helper.js                    | 15 +++++++++++++++
 src/layouts/service-location/service-location.vue |  9 ++++++---
 src/store/index.js                                |  4 ++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 2b7033e10..3fc664413 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -29,6 +29,7 @@ const storeActions = {
     GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer",
     GET_MOLDING_QUESTIONS: "getMoldingQuestions",
     GET_MOBILE_FEE_PART: "getMobileFeePart",
+    GET_SERVICEABILITY_DETAILS: "getServiceabilityDetails",
     SAVE_SESSION: "saveSession",
     LOAD_SESSION: "loadSession",
     UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse",
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index ba81a973f..444147b72 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -28,3 +28,18 @@ export async function getPricedMobileFeePart(serviceZipCode) {
 
     return Promise.resolve(pricingResults[0]);
 }
+
+export async function getServiceabilityDetails(serviceZipCode, lineItems) {
+    
+    // Get the Mobile Fee Part
+    const serviceabilityDetails = await baseMixin.methods.dispatchStoreAction(
+        storeActions.GET_SERVICEABILITY_DETAILS,
+        {
+            serviceZipCode: serviceZipCode,
+            lineItems: lineItems,
+        },
+        false
+    );
+        const temp = Promise.resolve(serviceabilityDetails)
+    return Promise.resolve(serviceabilityDetails);
+}
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 5120685bc..0fe9e54af 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -60,7 +60,10 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getPricedMobileFeePart, getServiceabilityDetails } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import {
+    getPricedMobileFeePart,
+    getServiceabilityDetails,
+} from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -86,6 +89,7 @@ export default {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
+        const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
         const lineItems = store.getters.order.lineItems;
@@ -94,10 +98,9 @@ export default {
             lineItems: lineItems,
         });
 
-        const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
-        const billToAccountNumber = 1;
+        const billToAccountNumber = 87291;
 
         const mobileFeePartPromise = getPricedMobileFeePart(
             serviceZipCode,
diff --git a/src/store/index.js b/src/store/index.js
index 1cdd77e80..b7f3fcf03 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -930,8 +930,8 @@ export const actions = {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
-            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
-            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847" // ForcedInShop
+            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInShop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
         });
     },

From 4d8dc49f97935effdfc70094ca885c3de1e1d7e1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 09:47:20 -0400
Subject: [PATCH 14/78] WIP

---
 src/constants/endpoints.js                    |  4 +
 .../service-location-helper.js                |  3 +-
 .../mobile-location-modal-questions.vue       |  2 +-
 .../service-location/service-location.vue     | 43 +++++++---
 .../service-type-question.vue                 | 83 ++++++++++++-------
 src/store/index.js                            |  3 +-
 6 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 0a67c8c96..fc94132d9 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -78,6 +78,10 @@ const endpoints = {
         url: "/parts/api/v1/parts/mobile-fee",
         method: "GET",
     },
+    GetServiceabilityDetails: {
+        url: "/location/serviceability-details",
+        method: "GET",
+    },
     GetSupportingItems: {
         url: "/parts/api/v1/parts/supporting-items",
         method: "POST",
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 444147b72..157c28f2b 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -30,7 +30,6 @@ export async function getPricedMobileFeePart(serviceZipCode) {
 }
 
 export async function getServiceabilityDetails(serviceZipCode, lineItems) {
-    
     // Get the Mobile Fee Part
     const serviceabilityDetails = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_SERVICEABILITY_DETAILS,
@@ -40,6 +39,6 @@ export async function getServiceabilityDetails(serviceZipCode, lineItems) {
         },
         false
     );
-        const temp = Promise.resolve(serviceabilityDetails)
+
     return Promise.resolve(serviceabilityDetails);
 }
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 ac1be453d..531f17acf 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
@@ -90,7 +90,7 @@ export default {
             default: () => ({}),
         },
         isZipServiceableMobile: Boolean,
-        isZipServiceableInShop: Boolean,
+        isZipServiceableInshop: Boolean,
         linkWidgetName: String,
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 0fe9e54af..889094264 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -19,6 +19,10 @@
                     alertClass="alert-warning" />
                 <serviceTypeQuestion
                     v-model="selectedServiceType"
+                    :isGlassServiceableInshop="isGlassServiceableInshop"
+                    :isRecalibrationServiceableInshop="isRecalibrationServiceableInshop"
+                    :isGlassServiceableMobile="isGlassServiceableMobile"
+                    :isRecalibrationServiceableMobile="isRecalibrationServiceableMobile"
                     ref="serviceTypeQuestion"
                     groupName="ServiceTypeQuestion"
                     cmsWidgetName="ServiceTypeQuestionWidget"
@@ -76,8 +80,8 @@ export default {
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
             isVehicleProtected: null,
-            isGlassServiceableInShop: null,
-            isRecalibrationServiceableInShop: null,
+            isGlassServiceableInshop: null,
+            isRecalibrationServiceableInshop: null,
             isGlassServiceableMobile: null,
             isRecalibrationServiceableMobile: null,
             mobileFeePart: null,
@@ -199,12 +203,7 @@ export default {
             }
 
             if (serviceabilityDetails) {
-                this.isGlassServiceableInShop = serviceabilityDetails.isGlassServiceableInShop;
-                this.isRecalibrationServiceableInShop =
-                    serviceabilityDetails.isRecalibrationServiceableInShop;
-                this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
-                this.isRecalibrationServiceableMobile =
-                    serviceabilityDetails.isRecalibrationServiceableMobile;
+                this.setServiceabilityDetails(serviceabilityDetails);
             }
 
             if (mobileFeePart) {
@@ -233,6 +232,14 @@ export default {
 
             this.isVehicleProtected = null;
         },
+        setServiceabilityDetails(serviceabilityDetails) {
+            this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
+            this.isRecalibrationServiceableInshop =
+                serviceabilityDetails.isRecalibrationServiceableInshop;
+            this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
+            this.isRecalibrationServiceableMobile =
+                serviceabilityDetails.isRecalibrationServiceableMobile;
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
@@ -241,13 +248,23 @@ export default {
         },
     },
     watch: {
-        zipCode(current, previous) {
-            if (current !== previous) {
-                baseMixin.methods.getZipCodeData(current).then((r) => {
-                    this.zipContainsMilitaryBase = r.containsMilitaryBase;
+        zipCode: {
+            async handler(newValue, oldValue) {
+                if (newValue !== oldValue) {
+                    baseMixin.methods.getZipCodeData(newValue).then((r) => {
+                        this.zipContainsMilitaryBase = r.containsMilitaryBase;
+                    });
+                }
+
+                const lineItems = store.getters.order.lineItems;
+                const serviceabilityDetails = await getServiceabilityDetails({
+                    serviceZipCode: newValue,
+                    lineItems: lineItems,
                 });
+
+                this.setServiceabilityDetails(serviceabilityDetails.data);
             }
-        },
+        }
     },
     components: {
         alert,
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index f3f73415e..f75ce94cf 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -29,8 +29,8 @@ export default {
         validationRules: String,
         cmsWidgetName: String,
         isGlassServiceableMobile: Boolean,
-        isGlassServiceableInShop: Boolean,
-        isRecalibrationServiceableInShop: Boolean,
+        isGlassServiceableInshop: Boolean,
+        isRecalibrationServiceableInshop: Boolean,
         isRecalibrationServiceableMobile: Boolean,
     },
     setup() {
@@ -49,40 +49,54 @@ export default {
         },
         answersToDisplay() {
             let filteredAnswers;
-            if (
-                this.isGlassServiceableMobile &&
-                this.isRecalibrationServiceableMobile &&
-                this.isGlassServiceableInShop &&
-                this.isRecalibrationServiceableInShop
-            ) {
+            if (this.serviceability == "All") {
                 filteredAnswers = this.answersFromCms;
-            } else if (
-                this.isGlassServiceableMobile &&
-                this.isRecalibrationServiceableMobile &&
-                !this.isGlassServiceableInShop &&
-                !this.isRecalibrationServiceableInShop
-            ) {
-                filteredAnswers = this.answersFromCms.filter(
-                    (answer) => answer.Name == "InShop" || answer.Name == "DropOff"
-                );
-            } else if (
-                this.isGlassServiceableInShop &&
-                this.isRecalibrationServiceableInShop &&
-                !this.isGlassServiceableMobile &&
-                !this.isRecalibrationServiceableMobile
-            ) {
+            } else if (this.serviceability == "MobileOnly") {
                 filteredAnswers = this.answersFromCms.filter((answer) => answer.Name == "Mobile");
-            } else if (
-                !this.isGlassServiceableInShop &&
-                !this.isRecalibrationServiceableInShop &&
-                !this.isGlassServiceableMobile &&
-                !this.isRecalibrationServiceableMobile
-            ) {
+            } else if (this.serviceability == "InshopOnly") {
+                filteredAnswers = this.answersFromCms.filter(
+                    (answer) => answer.Name == "Inshop" || answer.Name == "DropOff"
+                );
+            } else if (this.serviceability == "None") {
                 filteredAnswers = [];
             }
 
             return filteredAnswers;
         },
+        serviceability() {
+            let result;
+            if (
+                this.isGlassServiceableMobile &&
+                this.isRecalibrationServiceableMobile &&
+                this.isGlassServiceableInshop &&
+                this.isRecalibrationServiceableInshop
+            ) {
+                result = "All";
+            } else if (
+                !this.isGlassServiceableInshop &&
+                !this.isRecalibrationServiceableInshop &&
+                this.isGlassServiceableMobile &&
+                this.isRecalibrationServiceableMobile                
+            ) {
+                result = "MobileOnly"
+            } else if (
+                this.isGlassServiceableInshop &&
+                this.isRecalibrationServiceableInshop &&
+                !this.isGlassServiceableMobile &&
+                !this.isRecalibrationServiceableMobile
+            ) {
+                result = "InshopOnly"
+            } else if (
+                !this.isGlassServiceableInshop &&
+                !this.isRecalibrationServiceableInshop &&
+                !this.isGlassServiceableMobile &&
+                !this.isRecalibrationServiceableMobile
+            ) {
+                result = "None"
+            }
+
+            return result;
+        },
         selectedValues: {
             get: function () {
                 return this.modelValue;
@@ -92,6 +106,17 @@ export default {
             },
         },
     },
+    watch: {
+        serviceability: {
+            handler(newValue, oldValue) {
+                if (newValue == "MobileOnly") {
+                    this.selectedValues = "Mobile";
+                } else {
+                    this.selectedValues = null;
+                }
+            }
+        }
+    },
     components: {
         buttonQuestion,
     },
diff --git a/src/store/index.js b/src/store/index.js
index b7f3fcf03..5a0e86846 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -931,8 +931,9 @@ export const actions = {
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
             //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
-            endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInShop
+            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
+            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });
     },
 

From d704eee8e8e6b7b113e7db3b2d7f0733398f8d88 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 10:17:11 -0400
Subject: [PATCH 15/78] WIP

---
 .../service-location/service-location.vue     |  4 ++--
 .../service-type-question.vue                 | 21 ++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 889094264..3e8f506d5 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -263,8 +263,8 @@ export default {
                 });
 
                 this.setServiceabilityDetails(serviceabilityDetails.data);
-            }
-        }
+            },
+        },
     },
     components: {
         alert,
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index f75ce94cf..b8f82d35c 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -17,8 +17,6 @@
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 
-import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
-
 export default {
     name: "service-type-question",
     props: {
@@ -33,13 +31,6 @@ export default {
         isRecalibrationServiceableInshop: Boolean,
         isRecalibrationServiceableMobile: Boolean,
     },
-    setup() {
-        const form = useForm();
-
-        return {
-            form,
-        };
-    },
     computed: {
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "QuestionText");
@@ -76,23 +67,23 @@ export default {
                 !this.isGlassServiceableInshop &&
                 !this.isRecalibrationServiceableInshop &&
                 this.isGlassServiceableMobile &&
-                this.isRecalibrationServiceableMobile                
+                this.isRecalibrationServiceableMobile
             ) {
-                result = "MobileOnly"
+                result = "MobileOnly";
             } else if (
                 this.isGlassServiceableInshop &&
                 this.isRecalibrationServiceableInshop &&
                 !this.isGlassServiceableMobile &&
                 !this.isRecalibrationServiceableMobile
             ) {
-                result = "InshopOnly"
+                result = "InshopOnly";
             } else if (
                 !this.isGlassServiceableInshop &&
                 !this.isRecalibrationServiceableInshop &&
                 !this.isGlassServiceableMobile &&
                 !this.isRecalibrationServiceableMobile
             ) {
-                result = "None"
+                result = "None";
             }
 
             return result;
@@ -114,8 +105,8 @@ export default {
                 } else {
                     this.selectedValues = null;
                 }
-            }
-        }
+            },
+        },
     },
     components: {
         buttonQuestion,

From 45208ccf1fdfc8d7aa7d8a58af6dbe706cfd5aff Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Wed, 15 Mar 2023 11:40:50 -0400
Subject: [PATCH 16/78] CSR-1229 | Repairs save after pricing, move
 getSupporting to Veh-Damage

---
 src/layouts/estimate/estimate.vue             | 21 +------------------
 src/layouts/vehicle-damage/vehicle-damage.vue | 11 ++++++++++
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 15a9749e7..239bb0f26 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -252,28 +252,9 @@ export default {
                 } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
-                    const supportingItemsPromise = await this.dispatchStoreAction(
-                        storeActions.GET_SUPPORTING_ITEMS
-                    );
-
-                    const promiseResultMap = [
-                        {
-                            resultKey: "supportingItems",
-                            promise: supportingItemsPromise,
-                        },
-                    ];
-
-                    const resultMap = await settleAllPromises(promiseResultMap);
-
-                    this.dispatchStoreAction(
-                        this.storeActions.SAVE_SUPPORTING_ITEMS,
-                        resultMap.supportingItems,
-                        false
-                    );
-
                     // call saveSession here - navigateWithSaving saves too late in the flow
                     await saveSession({});
-                    return this.$router.navigateWithoutSaving(
+                    return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                         this.$route
                     );
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7446d4cd0..349c10fb2 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -324,6 +324,17 @@ export default {
                 false
             );
 
+            if (this.isWindshieldRepair) {
+                const supportingItems = await this.dispatchStoreAction(
+                    storeActions.GET_SUPPORTING_ITEMS
+                );
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_SUPPORTING_ITEMS,
+                    supportingItems.data,
+                    false
+                );
+            }
+            
             return this.navigateForward();
         },
 

From 324257ac960701f3c1bfa4bc6326833ca8c8a530 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Wed, 15 Mar 2023 11:54:33 -0400
Subject: [PATCH 17/78] CSR-1229 | Fix formatting

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

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 349c10fb2..dc1393be8 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -334,7 +334,7 @@ export default {
                     false
                 );
             }
-            
+
             return this.navigateForward();
         },
 

From 0186e25db469275c6d5bdd94feaa656880467012 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 13:06:32 -0400
Subject: [PATCH 18/78] Just a few more tech review tweaks

---
 .../mobile-location-modal-questions.vue            |  4 +---
 src/layouts/service-location/service-location.vue  | 14 +++-----------
 .../service-zip-modal-question.vue                 |  2 +-
 3 files changed, 5 insertions(+), 15 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 b4da4ddfa..31eb359b2 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
@@ -89,8 +89,6 @@ export default {
             type: Object,
             default: () => ({}),
         },
-        isZipServiceableMobile: Boolean,
-        isZipServiceableInShop: Boolean,
         linkWidgetName: String,
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
@@ -184,7 +182,7 @@ export default {
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
                 // emit it to parent
-                this.$emit("set-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e458b112b..58f440708 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -8,7 +8,7 @@
                 v-model="serviceZipCodeQuestion"
                 ref="serviceZipCodeQuestion"
                 :mobileFeePart="mobileFeePart"
-                @set-mobile-fee-part="setMobileFeePart"
+                @updated-mobile-fee-part="setMobileFeePart"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
             <alert
@@ -19,7 +19,7 @@
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
-                @set-mobile-fee-part="setMobileFeePart"
+                @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
@@ -72,16 +72,8 @@ export default {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
-        const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-        const parentAccountNumber = store.getters.payment.parentAccountNumber;
-        const billToAccountNumber = 1;
 
-        const mobileFeePartPromise = getPricedMobileFeePart(
-            serviceZipCode,
-            serviceType,
-            parentAccountNumber,
-            billToAccountNumber
-        );
+        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 2c1e0e588..6594061cd 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -156,7 +156,7 @@ export default {
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
                 // emit it to parent
-                this.$emit("set-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);

From b1713d9a36323d262a883101865c992b67d57769 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Mar 2023 13:25:08 -0400
Subject: [PATCH 19/78] Quick change to logic for displaying the Mobile
 Location address

---
 .../mobile-location-modal-questions.vue                      | 5 +++--
 .../service-zip-modal-question.vue                           | 2 +-
 2 files changed, 4 insertions(+), 3 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 31eb359b2..586e1c6de 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
@@ -64,7 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue", "set-mobile-fee-part"],
+    emits: ["update:modelValue", "updated-mobile-fee-part"],
     data() {
         return {
             internalModel: deepClone(this.modelValue),
@@ -107,7 +107,8 @@ export default {
                 this.addressModel.state &&
                 this.addressModel.state !== "" &&
                 this.addressModel.zipCode &&
-                this.addressModel.zipCode !== ""
+                this.addressModel.zipCode !== "" &&
+                this.internalModel.isVehicleProtected !== null
             ) {
                 return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;
             }
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 6594061cd..0d2c35000 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -43,7 +43,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "service-zip-modal-question",
-    emits: ["update:modelValue", "set-mobile-fee-part"],
+    emits: ["update:modelValue", "updated-mobile-fee-part"],
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),

From d4a938f3c3f540c3ef6b81671d0ca799bdb42fd3 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 17 Mar 2023 14:42:28 -0400
Subject: [PATCH 20/78] WIP

---
 src/constants/error-messages.js               |  1 +
 .../mobile-location-modal-questions.vue       | 40 +++++++++++++++++
 .../service-location/service-location.vue     | 45 ++++++++++++++++---
 3 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 5631b44c7..739698861 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,6 +18,7 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
+    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",
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 586e1c6de..46cb51d13 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
@@ -22,6 +22,9 @@
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
             </div>
+            <div v-show="errorMessage" class="row my-1 form-test-error">
+                <span class="small mt-0" role="alert">{{ errorMessage }}</span>
+            </div>
             <modal
                 :ref="modalName"
                 :headerText="modalHeaderText"
@@ -57,6 +60,7 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import store from "@/store";
+import { useField } from "vee-validate";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -71,6 +75,36 @@ export default {
             displayInvalidZipAlert: false,
         };
     },
+    setup(props) {
+        const inputId = `component-${crypto.randomUUID()}`;
+
+        const propsClone = Object.assign({}, props);
+        const modelValue = propsClone.modelValue;
+
+        const initialValue = modelValue;
+
+        const fieldOptions = {
+            type: "object",
+            value: modelValue,
+            initialValue: initialValue,
+        };
+
+        const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
+            inputId,
+            props.validationRules,
+            fieldOptions
+        );
+
+        return {
+            inputId,
+            errorMessage,
+            handleBlur,
+            handleChange,
+            validate,
+            meta,
+            errors,
+        };
+    },    
     props: {
         modelValue: {
             type: Object,
@@ -93,6 +127,7 @@ export default {
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
+        validationRules: String
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -158,6 +193,8 @@ export default {
             // on the service-zip-modal-question component
             this.$refs[this.modalName].form.resetForm({
                 values: {
+                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
+                    city: updatedServiceZipCodeInfo.city,
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
                     isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
@@ -197,10 +234,13 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
+                    streetAddress: newValue.addressQuestions.streetAddress,
+                    city: newValue.addressQuestions.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,
                 });
+                
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 58f440708..d0711cd1b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -22,11 +22,12 @@
                 @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" />
+                modalWidgetName="MobileLocationModalWidget" 
+                validationRules="service-address-required"/>   
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
+                :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -42,7 +43,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form } from "vee-validate";
+import { Form, defineRule } from "vee-validate";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -50,8 +51,24 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import { errorMessages } from "@/constants/error-messages";
 import store from "@/store";
 
+defineRule("service-address-required", (value) => {
+    const isValid = 
+        value.addressQuestions.streetAddress !== "" && 
+        value.addressQuestions.city !== "" && 
+        value.addressQuestions.state !== "" && 
+        value.addressQuestions.zipCode !== "" &&
+        value.isVehicleProtected !== null;
+
+    if (!isValid) {
+        return errorMessages.SERVICE_ADDRESS_REQUIRED;
+    }  
+
+    return isValid;
+});
+
 export default {
     name: "service-location",
     data() {
@@ -139,6 +156,12 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
+
+                // setErrors({
+                //     mobileLocationQuestions: ""
+                // });
+
+                //this.$refs.theForm.setTouched({});
             },
         },
         shouldDisableForwardAction() {
@@ -147,6 +170,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
+            
             return (
                 store.getters.lineItems.supportingItems !== null &&
                 store.getters.order.serviceLocation.zipCode !== null &&
@@ -188,9 +212,9 @@ export default {
         },
     },
     watch: {
-        zipCode(current, previous) {
-            if (current !== previous) {
-                baseMixin.methods.getZipCodeData(current).then((r) => {
+        zipCode(newValue, oldValue) {
+            if (newValue !== oldValue) {
+                baseMixin.methods.getZipCodeData(newValue).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;
                 });
             }
@@ -208,3 +232,12 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.form-test-error {
+    text-align: center;
+}
+
+
+
+</style>

From 6039bacf0da8765f0223d20b8f078bf42262397c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:34:31 -0400
Subject: [PATCH 21/78] Added SERVCE_ADDRESS_REQUIRED Error Msg

---
 src/constants/error-messages.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 739698861..5631b44c7 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,7 +18,6 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
-    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",

From 0a78965a3772642813a105f543d16ec54f4e0c9f Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:34:31 -0400
Subject: [PATCH 22/78] Revert "Added SERVCE_ADDRESS_REQUIRED Error Msg"

This reverts commit 6039bacf0da8765f0223d20b8f078bf42262397c.
---
 src/constants/error-messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 5631b44c7..739698861 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,6 +18,7 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
+    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",

From 80d5f9597077f64afba637883283b1fcf37e1092 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:50:05 -0400
Subject: [PATCH 23/78] Clean up

---
 .../mobile-location-modal-questions.vue       | 40 -----------------
 .../service-location/service-location.vue     | 45 +++----------------
 2 files changed, 6 insertions(+), 79 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 46cb51d13..586e1c6de 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
@@ -22,9 +22,6 @@
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
             </div>
-            <div v-show="errorMessage" class="row my-1 form-test-error">
-                <span class="small mt-0" role="alert">{{ errorMessage }}</span>
-            </div>
             <modal
                 :ref="modalName"
                 :headerText="modalHeaderText"
@@ -60,7 +57,6 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import store from "@/store";
-import { useField } from "vee-validate";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -75,36 +71,6 @@ export default {
             displayInvalidZipAlert: false,
         };
     },
-    setup(props) {
-        const inputId = `component-${crypto.randomUUID()}`;
-
-        const propsClone = Object.assign({}, props);
-        const modelValue = propsClone.modelValue;
-
-        const initialValue = modelValue;
-
-        const fieldOptions = {
-            type: "object",
-            value: modelValue,
-            initialValue: initialValue,
-        };
-
-        const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
-            inputId,
-            props.validationRules,
-            fieldOptions
-        );
-
-        return {
-            inputId,
-            errorMessage,
-            handleBlur,
-            handleChange,
-            validate,
-            meta,
-            errors,
-        };
-    },    
     props: {
         modelValue: {
             type: Object,
@@ -127,7 +93,6 @@ export default {
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
-        validationRules: String
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -193,8 +158,6 @@ export default {
             // on the service-zip-modal-question component
             this.$refs[this.modalName].form.resetForm({
                 values: {
-                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
-                    city: updatedServiceZipCodeInfo.city,
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
                     isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
@@ -234,13 +197,10 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
-                    streetAddress: newValue.addressQuestions.streetAddress,
-                    city: newValue.addressQuestions.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,
                 });
-                
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d0711cd1b..58f440708 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -22,12 +22,11 @@
                 @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" 
-                validationRules="service-address-required"/>   
+                modalWidgetName="MobileLocationModalWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid"
+                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -43,7 +42,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form, defineRule } from "vee-validate";
+import { Form } from "vee-validate";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -51,24 +50,8 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
-import { errorMessages } from "@/constants/error-messages";
 import store from "@/store";
 
-defineRule("service-address-required", (value) => {
-    const isValid = 
-        value.addressQuestions.streetAddress !== "" && 
-        value.addressQuestions.city !== "" && 
-        value.addressQuestions.state !== "" && 
-        value.addressQuestions.zipCode !== "" &&
-        value.isVehicleProtected !== null;
-
-    if (!isValid) {
-        return errorMessages.SERVICE_ADDRESS_REQUIRED;
-    }  
-
-    return isValid;
-});
-
 export default {
     name: "service-location",
     data() {
@@ -156,12 +139,6 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
-
-                // setErrors({
-                //     mobileLocationQuestions: ""
-                // });
-
-                //this.$refs.theForm.setTouched({});
             },
         },
         shouldDisableForwardAction() {
@@ -170,7 +147,6 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            
             return (
                 store.getters.lineItems.supportingItems !== null &&
                 store.getters.order.serviceLocation.zipCode !== null &&
@@ -212,9 +188,9 @@ export default {
         },
     },
     watch: {
-        zipCode(newValue, oldValue) {
-            if (newValue !== oldValue) {
-                baseMixin.methods.getZipCodeData(newValue).then((r) => {
+        zipCode(current, previous) {
+            if (current !== previous) {
+                baseMixin.methods.getZipCodeData(current).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;
                 });
             }
@@ -232,12 +208,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.form-test-error {
-    text-align: center;
-}
-
-
-
-</style>

From 1bc00e31e713cfef5f0e928c269713237aeacab1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:50:05 -0400
Subject: [PATCH 24/78] Revert "Clean up"

This reverts commit 80d5f9597077f64afba637883283b1fcf37e1092.
---
 .../mobile-location-modal-questions.vue       | 40 +++++++++++++++++
 .../service-location/service-location.vue     | 45 ++++++++++++++++---
 2 files changed, 79 insertions(+), 6 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 586e1c6de..46cb51d13 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
@@ -22,6 +22,9 @@
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
             </div>
+            <div v-show="errorMessage" class="row my-1 form-test-error">
+                <span class="small mt-0" role="alert">{{ errorMessage }}</span>
+            </div>
             <modal
                 :ref="modalName"
                 :headerText="modalHeaderText"
@@ -57,6 +60,7 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import store from "@/store";
+import { useField } from "vee-validate";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -71,6 +75,36 @@ export default {
             displayInvalidZipAlert: false,
         };
     },
+    setup(props) {
+        const inputId = `component-${crypto.randomUUID()}`;
+
+        const propsClone = Object.assign({}, props);
+        const modelValue = propsClone.modelValue;
+
+        const initialValue = modelValue;
+
+        const fieldOptions = {
+            type: "object",
+            value: modelValue,
+            initialValue: initialValue,
+        };
+
+        const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
+            inputId,
+            props.validationRules,
+            fieldOptions
+        );
+
+        return {
+            inputId,
+            errorMessage,
+            handleBlur,
+            handleChange,
+            validate,
+            meta,
+            errors,
+        };
+    },    
     props: {
         modelValue: {
             type: Object,
@@ -93,6 +127,7 @@ export default {
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
+        validationRules: String
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -158,6 +193,8 @@ export default {
             // on the service-zip-modal-question component
             this.$refs[this.modalName].form.resetForm({
                 values: {
+                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
+                    city: updatedServiceZipCodeInfo.city,
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
                     isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
@@ -197,10 +234,13 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
+                    streetAddress: newValue.addressQuestions.streetAddress,
+                    city: newValue.addressQuestions.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,
                 });
+                
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 58f440708..d0711cd1b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -22,11 +22,12 @@
                 @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" />
+                modalWidgetName="MobileLocationModalWidget" 
+                validationRules="service-address-required"/>   
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
+                :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -42,7 +43,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form } from "vee-validate";
+import { Form, defineRule } from "vee-validate";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -50,8 +51,24 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import { errorMessages } from "@/constants/error-messages";
 import store from "@/store";
 
+defineRule("service-address-required", (value) => {
+    const isValid = 
+        value.addressQuestions.streetAddress !== "" && 
+        value.addressQuestions.city !== "" && 
+        value.addressQuestions.state !== "" && 
+        value.addressQuestions.zipCode !== "" &&
+        value.isVehicleProtected !== null;
+
+    if (!isValid) {
+        return errorMessages.SERVICE_ADDRESS_REQUIRED;
+    }  
+
+    return isValid;
+});
+
 export default {
     name: "service-location",
     data() {
@@ -139,6 +156,12 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
+
+                // setErrors({
+                //     mobileLocationQuestions: ""
+                // });
+
+                //this.$refs.theForm.setTouched({});
             },
         },
         shouldDisableForwardAction() {
@@ -147,6 +170,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
+            
             return (
                 store.getters.lineItems.supportingItems !== null &&
                 store.getters.order.serviceLocation.zipCode !== null &&
@@ -188,9 +212,9 @@ export default {
         },
     },
     watch: {
-        zipCode(current, previous) {
-            if (current !== previous) {
-                baseMixin.methods.getZipCodeData(current).then((r) => {
+        zipCode(newValue, oldValue) {
+            if (newValue !== oldValue) {
+                baseMixin.methods.getZipCodeData(newValue).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;
                 });
             }
@@ -208,3 +232,12 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.form-test-error {
+    text-align: center;
+}
+
+
+
+</style>

From be31530bfa9990cae45781afa51714f775742936 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:50:05 -0400
Subject: [PATCH 25/78] Revert "Revert "Clean up""

This reverts commit 1bc00e31e713cfef5f0e928c269713237aeacab1.
---
 .../mobile-location-modal-questions.vue       | 40 -----------------
 .../service-location/service-location.vue     | 45 +++----------------
 2 files changed, 6 insertions(+), 79 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 46cb51d13..586e1c6de 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
@@ -22,9 +22,6 @@
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
             </div>
-            <div v-show="errorMessage" class="row my-1 form-test-error">
-                <span class="small mt-0" role="alert">{{ errorMessage }}</span>
-            </div>
             <modal
                 :ref="modalName"
                 :headerText="modalHeaderText"
@@ -60,7 +57,6 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import store from "@/store";
-import { useField } from "vee-validate";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -75,36 +71,6 @@ export default {
             displayInvalidZipAlert: false,
         };
     },
-    setup(props) {
-        const inputId = `component-${crypto.randomUUID()}`;
-
-        const propsClone = Object.assign({}, props);
-        const modelValue = propsClone.modelValue;
-
-        const initialValue = modelValue;
-
-        const fieldOptions = {
-            type: "object",
-            value: modelValue,
-            initialValue: initialValue,
-        };
-
-        const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
-            inputId,
-            props.validationRules,
-            fieldOptions
-        );
-
-        return {
-            inputId,
-            errorMessage,
-            handleBlur,
-            handleChange,
-            validate,
-            meta,
-            errors,
-        };
-    },    
     props: {
         modelValue: {
             type: Object,
@@ -127,7 +93,6 @@ export default {
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
-        validationRules: String
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -193,8 +158,6 @@ export default {
             // on the service-zip-modal-question component
             this.$refs[this.modalName].form.resetForm({
                 values: {
-                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
-                    city: updatedServiceZipCodeInfo.city,
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
                     isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
@@ -234,13 +197,10 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
-                    streetAddress: newValue.addressQuestions.streetAddress,
-                    city: newValue.addressQuestions.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,
                 });
-                
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d0711cd1b..58f440708 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -22,12 +22,11 @@
                 @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" 
-                validationRules="service-address-required"/>   
+                modalWidgetName="MobileLocationModalWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid"
+                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -43,7 +42,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form, defineRule } from "vee-validate";
+import { Form } from "vee-validate";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -51,24 +50,8 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
-import { errorMessages } from "@/constants/error-messages";
 import store from "@/store";
 
-defineRule("service-address-required", (value) => {
-    const isValid = 
-        value.addressQuestions.streetAddress !== "" && 
-        value.addressQuestions.city !== "" && 
-        value.addressQuestions.state !== "" && 
-        value.addressQuestions.zipCode !== "" &&
-        value.isVehicleProtected !== null;
-
-    if (!isValid) {
-        return errorMessages.SERVICE_ADDRESS_REQUIRED;
-    }  
-
-    return isValid;
-});
-
 export default {
     name: "service-location",
     data() {
@@ -156,12 +139,6 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
-
-                // setErrors({
-                //     mobileLocationQuestions: ""
-                // });
-
-                //this.$refs.theForm.setTouched({});
             },
         },
         shouldDisableForwardAction() {
@@ -170,7 +147,6 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            
             return (
                 store.getters.lineItems.supportingItems !== null &&
                 store.getters.order.serviceLocation.zipCode !== null &&
@@ -212,9 +188,9 @@ export default {
         },
     },
     watch: {
-        zipCode(newValue, oldValue) {
-            if (newValue !== oldValue) {
-                baseMixin.methods.getZipCodeData(newValue).then((r) => {
+        zipCode(current, previous) {
+            if (current !== previous) {
+                baseMixin.methods.getZipCodeData(current).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;
                 });
             }
@@ -232,12 +208,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.form-test-error {
-    text-align: center;
-}
-
-
-
-</style>

From 521937c388c2805f05a1539a4c45a89f03c9da5e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:34:31 -0400
Subject: [PATCH 26/78] Revert "Revert "Added SERVCE_ADDRESS_REQUIRED Error
 Msg""

This reverts commit 0a78965a3772642813a105f543d16ec54f4e0c9f.
---
 src/constants/error-messages.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 739698861..5631b44c7 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,7 +18,6 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
-    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",

From 2e7de50c967ca5c457ddac2081fa5417f2e1b8c5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 09:34:31 -0400
Subject: [PATCH 27/78] Revert "Added SERVCE_ADDRESS_REQUIRED Error Msg"

This reverts commit 6039bacf0da8765f0223d20b8f078bf42262397c.
---
 src/constants/error-messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 5631b44c7..739698861 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,6 +18,7 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
+    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",

From a0ab81acaad470453cd77a618029a22123c16a09 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 17 Mar 2023 14:42:28 -0400
Subject: [PATCH 28/78] Revert "WIP"

This reverts commit d4a938f3c3f540c3ef6b81671d0ca799bdb42fd3.
---
 src/constants/error-messages.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 739698861..5631b44c7 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -18,7 +18,6 @@ const errorMessages = {
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
     EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
-    SERVICE_ADDRESS_REQUIRED: "Please enter your service address",
     SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
     SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
     VIN_REQUIRED: "Please enter your VIN",

From 4c60dc054f40b8e241a16ac26762460a34d25df4 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 10:30:36 -0400
Subject: [PATCH 29/78] Added autocomplete and city reset for validation

---
 .../mobile-location-modal-questions.vue                       | 4 ++++
 1 file changed, 4 insertions(+)

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 586e1c6de..9ba81f14a 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
@@ -158,6 +158,8 @@ export default {
             // on the service-zip-modal-question component
             this.$refs[this.modalName].form.resetForm({
                 values: {
+                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
+                    city: updatedServiceZipCodeInfo.city,
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
                     isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
@@ -197,6 +199,8 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
+                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
+                    city: updatedServiceZipCodeInfo.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,

From 14541d110c0ddcd0216eb76e4ea6ba4a61dfcdbf Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 16 Mar 2023 16:00:08 -0400
Subject: [PATCH 30/78] Updates for emitting contains military zip

---
 .../service-location/service-location.spec.js | 12 ++++++----
 .../service-location/service-location.vue     | 22 +++++++------------
 .../service-zip-modal-question.vue            |  3 +++
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 0653e91f0..b48fa2f06 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -319,11 +319,15 @@ describe("service-location.vue", () => {
                 state: "OH",
             };
 
-            // Assert
-            wrapper.setData({ zipCode: newServiceZipCodeQuestion.zipCode });
-            wrapper.vm.$nextTick(() => {
-                expect(wrapper.vm.zipContainsMilitaryBase).toBe(true);
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
             });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("updated-contains-military-base", true);
+
+            // Assert
+            expect(wrapper.vm.zipContainsMilitaryBase).toBe(true);
         });
     });
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 58f440708..732b0f0b1 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,7 +10,8 @@
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
                 linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget" />
+                modalWidgetName="ServiceZipModalWidget" 
+                @updated-contains-military-base="setContainsMilitaryBase" />
             <alert
                 class="my-4"
                 cmsWidgetName="AlertMilitaryBaseZipWidget"
@@ -26,7 +27,7 @@
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
+                :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -141,9 +142,6 @@ export default {
                 this.isVehicleProtected = newValue.isVehicleProtected;
             },
         },
-        shouldDisableForwardAction() {
-            return this.zipContainsMilitaryBase;
-        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -158,6 +156,11 @@ export default {
                 this.mobileFeePart = mobileFeePart;
             }
         },
+        setContainsMilitaryBase(val) {
+            if (this.zipContainsMilitaryBase !== val) {
+                this.zipContainsMilitaryBase = val;
+            }
+        },
         getServiceAddressFromStore() {
             return store.getters.order.serviceLocation.address;
         },
@@ -187,15 +190,6 @@ export default {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
     },
-    watch: {
-        zipCode(current, previous) {
-            if (current !== previous) {
-                baseMixin.methods.getZipCodeData(current).then((r) => {
-                    this.zipContainsMilitaryBase = r.containsMilitaryBase;
-                });
-            }
-        },
-    },
     components: {
         alert,
         serviceZipModalQuestion,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0d2c35000..1b665b5d5 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -44,6 +44,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 export default {
     name: "service-zip-modal-question",
     emits: ["update:modelValue", "updated-mobile-fee-part"],
+    emits: ["updated-contains-military-base"],
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
@@ -160,6 +161,8 @@ export default {
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
+                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
+
                 this.closeModal();
             }
         },

From 12c5d684d800df90f87a9e4aabb6c64160413573 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 10:46:02 -0400
Subject: [PATCH 31/78] Minor correction to previous commit

---
 .../mobile-location-modal-questions.vue                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9ba81f14a..2974254b3 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
@@ -199,7 +199,7 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
-                    autocomplete: updatedServiceZipCodeInfo.streetAddress,
+                    streetAddress: updatedServiceZipCodeInfo.streetAddress,
                     city: updatedServiceZipCodeInfo.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,

From c4f0624f10783aef909cd85a9b557229460b106d Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 16 Mar 2023 16:49:14 -0400
Subject: [PATCH 32/78] Contains Military zip emit on Location questions modal

---
 .../mobile-location-modal-questions.vue             |  2 ++
 src/layouts/service-location/service-location.vue   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 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 586e1c6de..78d1cc672 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
@@ -65,6 +65,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue", "updated-mobile-fee-part"],
+    emits: ["update:modelValue", "updated-zip-code", "updated-contains-military-base"], // The component emits an event
     data() {
         return {
             internalModel: deepClone(this.modelValue),
@@ -187,6 +188,7 @@ export default {
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
+                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
                 this.closeModal();
             }
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 732b0f0b1..5969ac216 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,12 +10,12 @@
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
                 linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget" 
+                modalWidgetName="ServiceZipModalWidget"
                 @updated-contains-military-base="setContainsMilitaryBase" />
             <alert
                 class="my-4"
                 cmsWidgetName="AlertMilitaryBaseZipWidget"
-                v-if="zipContainsMilitaryBase"
+                v-if="showMilitaryZipAlert"
                 alertClass="alert-warning" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
@@ -23,7 +23,8 @@
                 @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget" />
+                modalWidgetName="MobileLocationModalWidget"
+                @updated-contains-military-base="setContainsMilitaryBase" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -142,6 +143,12 @@ export default {
                 this.isVehicleProtected = newValue.isVehicleProtected;
             },
         },
+        showMilitaryZipAlert() {
+            return (
+                this.zipContainsMilitaryBase &&
+                (this.isZipServiceableMobile == null || this.isZipServiceableMobile === true)
+            );
+        },
     },
     methods: {
         arePagePrerequisitesValid() {

From 44a6629d36e22aea39d33fc0aad6b2d112b823e9 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 20 Mar 2023 10:49:12 -0400
Subject: [PATCH 33/78] Updates after merge

---
 .../mobile-location-modal-questions.vue                        | 3 +--
 .../service-zip-modal-question/service-zip-modal-question.vue  | 3 +--
 2 files changed, 2 insertions(+), 4 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 78d1cc672..8773b5daf 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
@@ -64,8 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue", "updated-mobile-fee-part"],
-    emits: ["update:modelValue", "updated-zip-code", "updated-contains-military-base"], // The component emits an event
+    emits: ["update:modelValue", "updated-mobile-fee-part", "updated-contains-military-base"], // The component emits an event
     data() {
         return {
             internalModel: deepClone(this.modelValue),
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1b665b5d5..174b74523 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -43,8 +43,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "service-zip-modal-question",
-    emits: ["update:modelValue", "updated-mobile-fee-part"],
-    emits: ["updated-contains-military-base"],
+    emits: ["update:modelValue", "updated-mobile-fee-part", "updated-contains-military-base"],
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),

From 9fd6a08dd8ea1f71bfae6aa3f3821c20312e1629 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 20 Mar 2023 11:00:31 -0400
Subject: [PATCH 34/78] remove comment that was removed previously

---
 .../mobile-location-modal-questions.vue                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8773b5daf..85726aebd 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
@@ -64,7 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue", "updated-mobile-fee-part", "updated-contains-military-base"], // The component emits an event
+    emits: ["update:modelValue", "updated-mobile-fee-part", "updated-contains-military-base"],
     data() {
         return {
             internalModel: deepClone(this.modelValue),

From e0a57916750417890b95240d22e107b8fff7f156 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Mar 2023 14:15:51 -0400
Subject: [PATCH 35/78] Another correction for previous commit

---
 .../mobile-location-modal-questions.vue                       | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2974254b3..5261d81e0 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
@@ -199,8 +199,8 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
-                    streetAddress: updatedServiceZipCodeInfo.streetAddress,
-                    city: updatedServiceZipCodeInfo.city,
+                    streetAddress: newValue.addressQuestions.streetAddress,
+                    city: newValue.addressQuestions.city,
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
                     isVehicleProtected: newValue.isVehicleProtected,

From c37487042e483f9d1e763ad01efe8fe5652d4810 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Fri, 24 Mar 2023 12:50:38 -0400
Subject: [PATCH 36/78] Only process zipcode on change.

---
 .../service-zip-modal-question.vue            | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 174b74523..5d9631442 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -140,28 +140,34 @@ export default {
         },
 
         async setZipCode() {
-            this.resetAlerts();
+            if (this.internalModel.zipCode !== this.modelValue.zipCode)
+            {
+                this.resetAlerts();
 
-            const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
+                const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
 
-            if (!zipCodeData.isValid) {
-                this.displayInvalidZipAlert = true;
-                this.focusOnZipInput();
-                this.resetModalButtonStyle();
-            } else {
-                this.internalModel.state = zipCodeData.state;
+                if (!zipCodeData.isValid) {
+                    this.displayInvalidZipAlert = true;
+                    this.focusOnZipInput();
+                    this.resetModalButtonStyle();
+                } else {
+                    this.internalModel.state = zipCodeData.state;
 
-                // retrieve mobile fee part
-                const serviceZipCode = this.internalModel.zipCode;
-                const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
+                    // retrieve mobile fee part
+                    const serviceZipCode = this.internalModel.zipCode;
+                    const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
-                // emit it to parent
-                this.$emit("updated-mobile-fee-part", mobileFeePart);
+                    // emit it to parent
+                    this.$emit("updated-mobile-fee-part", mobileFeePart);
 
-                // Update the page level model
-                this.$emit("update:modelValue", this.internalModel);
-                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
+                    // Update the page level model
+                    this.$emit("update:modelValue", this.internalModel);
+                    this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
 
+                    this.closeModal();
+                }
+            }
+            else {
                 this.closeModal();
             }
         },

From cfeed1ff28a2733009d5b250f5c109ba3861194a Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Fri, 24 Mar 2023 13:37:59 -0400
Subject: [PATCH 37/78] formatting

---
 .../service-zip-modal-question.vue                          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 5d9631442..3861ff01d 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -140,8 +140,7 @@ export default {
         },
 
         async setZipCode() {
-            if (this.internalModel.zipCode !== this.modelValue.zipCode)
-            {
+            if (this.internalModel.zipCode !== this.modelValue.zipCode) {
                 this.resetAlerts();
 
                 const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
@@ -166,8 +165,7 @@ export default {
 
                     this.closeModal();
                 }
-            }
-            else {
+            } else {
                 this.closeModal();
             }
         },

From df2665a2ce0a9a1a8dbf34b902daa69e1d48bbc5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Mar 2023 13:44:31 -0400
Subject: [PATCH 38/78] Technical review changes

---
 src/constants/error-messages.js               |  1 +
 src/digital-components/modal/modal.vue        | 15 +++++----
 .../textbox-question/textbox-question.vue     | 28 +++++++++++++++--
 .../mobile-location-modal-questions.vue       | 13 +++++++-
 .../service-location/service-location.vue     | 31 ++++++++++++++++---
 .../service-zip-modal-question.vue            |  2 +-
 6 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 5631b44c7..3c3f776c1 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -25,6 +25,7 @@ const errorMessages = {
         "Invalid VIN. Please make sure that you entered the correct 17-digit, alpha-numeric number. VINs do not contain the letters I, O, or Q",
     OPTION_REQUIRED: "Please select an option",
     VEHICLE_REQUIRED: "Please select a vehicle",
+    MOBILE_LOCATION_REQUIRED: "Please enter your service address",
 };
 
 export { errorMessages };
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a18881796..e10f437d3 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -60,14 +60,17 @@ export default {
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
 
-        const form = useForm();
+        const { meta, validate, resetForm } = useForm();
+
         const isFormTouched = useIsFormTouched();
         const isFormDirty = useIsFormDirty();
         const isFormValid = useIsFormValid();
 
         return {
             modalId,
-            form,
+            meta,
+            validate,
+            resetForm,
             isFormTouched,
             isFormDirty,
             isFormValid,
@@ -75,7 +78,7 @@ export default {
     },
     methods: {
         async validateAndEmit() {
-            const validationResult = await this.form.validate();
+            const validationResult = await this.validate();
             if (validationResult.valid) {
                 this.$emit("footer-button-event");
             } else {
@@ -103,10 +106,10 @@ export default {
     },
     computed: {
         isFooterButtonDisabled() {
-            if (!this.isFormTouched) {
-                return !this.isFormValid;
+            if (!this.meta.touched) {
+                return !this.meta.valid;
             }
-            return !this.isFormDirty || !this.isFormValid;
+            return !this.meta.dirty || !this.meta.valid;
         },
     },
     components: {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 2766e2cd9..335c47a60 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -1,11 +1,19 @@
 <template>
-    <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
+    <div
+        class="textbox-question"
+        :class="[
+            (errors && errors.length) || hasError ? 'has-error' : '',
+            hideInput ? 'hide-input' : '',
+        ]">
         <label
             v-if="displayQuestionText"
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
-            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            :class="[
+                questionAlignment === 'center' ? 'text-center w-100 mb-5' : '',
+                hideInput ? 'hide-input' : '',
+            ]"
             v-html="questionText"></label>
         <div class="input-wrapper" :class="[includeSearchIcon ? 'has-search-icon' : '']">
             <input
@@ -25,6 +33,7 @@
                     hasIcon ? 'has-icon' : '',
                     iconRight ? 'icon-right' : '',
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
+                    hideInput ? 'hide-input' : '',
                 ]"
                 :validationRules="validationRules"
                 @change="handleChange"
@@ -34,7 +43,12 @@
             <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
         </div>
         <div v-show="errorMessage" class="row my-1 form-test-error">
-            <span class="d-inline-flex small mt-0" role="alert">{{ errorMessage }}</span>
+            <span
+                class="d-inline-flex small mt-0"
+                role="alert"
+                :class="[centerErrorMessage ? 'center-error-message' : '']"
+                >{{ errorMessage }}</span
+            >
         </div>
     </div>
 </template>
@@ -74,6 +88,8 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        hideInput: Boolean,
+        centerErrorMessage: Boolean,
     },
     setup(props) {
         const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
@@ -142,6 +158,12 @@ export default {
 
 <style lang="scss">
 .textbox-question {
+    .hide-input {
+        display: none;
+    }
+    .center-error-message {
+        justify-content: center !important;
+    }
     label {
         color: $black;
         font-weight: 500;
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 5261d81e0..3872635e2 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
@@ -26,6 +26,8 @@
                 :ref="modalName"
                 :headerText="modalHeaderText"
                 :footerButtonText="modalFooterText"
+                :onModalOpenedCallback="onModalOpened"
+                :onModalClosedCallback="onModalClosed"
                 @footer-button-event="setMobileLocation">
                 <addressQuestions
                     ref="addressQuestions"
@@ -152,11 +154,20 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
+
+        onModalOpened() {
+            this.internalModel = deepClone(this.modelValue);
+        },
+
+        onModalClosed() {
+            this.internalModel = deepClone(this.modelValue);
+        },
+
         resetComponent(updatedServiceZipCodeInfo) {
             // Reset the validation form, setting the initial values
             // for the state and zipCode to those that were entered
             // on the service-zip-modal-question component
-            this.$refs[this.modalName].form.resetForm({
+            this.$refs[this.modalName].resetForm({
                 values: {
                     autocomplete: updatedServiceZipCodeInfo.streetAddress,
                     city: updatedServiceZipCodeInfo.city,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 58f440708..04e8a7359 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -23,10 +23,16 @@
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
+            <textboxQuestion
+                ref="mobileLocationQuestionsError"
+                v-model="mobileLocationValidationField"
+                validationRules="mobile-location-required"
+                hideInput
+                centerErrorMessage />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
+                :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -42,7 +48,8 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import { Form } from "vee-validate";
+import { Form, defineRule } from "vee-validate";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -51,6 +58,10 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
+import { errorMessages } from "@/constants/error-messages";
+import { required } from "@/helpers/validation-rules";
+
+defineRule("mobile-location-required", required(errorMessages.MOBILE_LOCATION_REQUIRED));
 
 export default {
     name: "service-location",
@@ -66,6 +77,7 @@ export default {
             isZipServiceableInShop: null,
             mobileFeePart: null,
             zipContainsMilitaryBase: false,
+            mobileLocationValidationField: null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -139,6 +151,8 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
+
+                this.mobileLocationValidationField = "isValid";
             },
         },
         shouldDisableForwardAction() {
@@ -180,6 +194,12 @@ export default {
 
             this.isVehicleProtected = null;
         },
+        setServiceZipCodeModalMeta(meta) {
+            this.serviceZipCodeMeta = meta;
+        },
+        setMobileLocationModalMeta(meta) {
+            this.mobileLocationMeta = meta;
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
@@ -188,9 +208,9 @@ export default {
         },
     },
     watch: {
-        zipCode(current, previous) {
-            if (current !== previous) {
-                baseMixin.methods.getZipCodeData(current).then((r) => {
+        zipCode(newValue, oldValue) {
+            if (newValue !== oldValue) {
+                baseMixin.methods.getZipCodeData(newValue).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;
                 });
             }
@@ -205,6 +225,7 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
+        textboxQuestion,
     },
 };
 </script>
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0d2c35000..55f849b53 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -38,7 +38,7 @@ import textLink from "@/ux-components/text-link/text-link";
 import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
-import store from "@/store";
+
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 export default {

From 0e1be70c231c6d8e7a0389aa74f6220781bff3ce Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Mar 2023 14:06:01 -0400
Subject: [PATCH 39/78] Minor formating changes

---
 src/digital-components/modal/modal.vue                 |  9 +--------
 .../mobile-location-modal-questions.vue                | 10 +++-------
 .../service-zip-modal-question.vue                     | 10 ----------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 890351d8d..56b6c74d6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -43,7 +43,7 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
-import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
+import { useForm } from "vee-validate";
 
 export default {
     name: "modal",
@@ -62,18 +62,11 @@ export default {
 
         const { meta, validate, resetForm } = useForm();
 
-        const isFormTouched = useIsFormTouched();
-        const isFormDirty = useIsFormDirty();
-        const isFormValid = useIsFormValid();
-
         return {
             modalId,
             meta,
             validate,
             resetForm,
-            isFormTouched,
-            isFormDirty,
-            isFormValid,
         };
     },
     methods: {
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 afc81261f..153521ea4 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
@@ -58,7 +58,6 @@ import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
-import store from "@/store";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -140,7 +139,6 @@ export default {
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
@@ -154,15 +152,12 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-
         onModalOpened() {
             this.internalModel = deepClone(this.modelValue);
         },
-
         onModalClosed() {
             this.internalModel = deepClone(this.modelValue);
         },
-
         resetComponent(updatedServiceZipCodeInfo) {
             // Reset the validation form, setting the initial values
             // for the state and zipCode to those that were entered
@@ -195,12 +190,13 @@ export default {
 
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
-                // emit it to parent
+                // emit additional data to parent
                 this.$emit("updated-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
-                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
+
                 this.closeModal();
             }
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 88ed17d21..e94388e06 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -96,49 +96,39 @@ export default {
         resetAlerts() {
             this.displayInvalidZipAlert = false;
         },
-
         resetsOnZipInput() {
             this.resetAlerts();
         },
-
         focusOnZipInput() {
             const input = document.getElementById(this.serviceZipCodeTextInputId);
             input?.focus();
         },
-
         copyModel(modelToCopy) {
             return {
                 state: modelToCopy.state,
                 zipCode: modelToCopy.zipCode,
             };
         },
-
         openModal() {
             this.$refs[this.modalName].openModal();
         },
-
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-
         resetModalButtonStyle() {
             this.$refs[this.modalName].resetButtonStyle();
         },
-
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
         },
-
         onModalOpened() {
             this.internalModel.zipCode = this.modelValue.zipCode;
             this.focusOnZipInput();
         },
-
         onModalClosed() {
             this.internalModel.zipCode = this.modelValue.zipCode;
             this.resetsOnZipInput();
         },
-
         async setZipCode() {
             if (this.internalModel.zipCode !== this.modelValue.zipCode) {
                 this.resetAlerts();

From 3606e7a1c77dcc4510fa233fca0d8414101d6f57 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Mar 2023 14:31:34 -0400
Subject: [PATCH 40/78] Updated unit tests

---
 src/digital-components/modal/modal.spec.js | 104 ++++++++++++++++-----
 1 file changed, 80 insertions(+), 24 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index b738ac6ae..4f8da5c86 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,16 +1,14 @@
 jest.mock("vee-validate", () => ({
     useForm: jest.fn(),
-    useIsFormTouched: jest.fn(),
-    useIsFormDirty: jest.fn(),
-    useIsFormValid: jest.fn(),
 }));
 
 const mockValidate = (returnValue) => jest.fn(async () => Promise.resolve({ valid: returnValue }));
+const mockMeta = (returnValue) => jest.fn(async () => Promise.resolve(returnValue));
 
 import { shallowMount } from "@vue/test-utils";
 import modal from "./modal";
 import crypto from "crypto";
-import { useForm, useIsFormDirty, useIsFormTouched, useIsFormValid } from "vee-validate";
+import { useForm } from "vee-validate";
 import { Modal } from "bootstrap";
 
 const footerButtonText = "Sample footer text here.";
@@ -21,6 +19,18 @@ global.crypto = crypto;
 describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
         // Arrange / Act
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
+
+        useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
+        });
+        
         const wrapper = shallowMount(modal, {
             props: {
                 headerText: headerText,
@@ -35,6 +45,17 @@ describe("modal.vue", () => {
 
     it("Should display footer button text when footerButtonText is defined", async () => {
         // Arrange / Act
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
+
+        useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
+        });
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText: footerButtonText,
@@ -48,7 +69,15 @@ describe("modal.vue", () => {
 
     it("Should emit 'footer-button-event' if the form is valid", async () => {
         // Arrange
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
+
         useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
             validate: mockValidate(true),
         });
 
@@ -72,7 +101,15 @@ describe("modal.vue", () => {
 
     it("Should not emit 'footer-button-event' if the form is invalid", async () => {
         // Arrange
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: false,
+            validated: true,
+        }
+
         useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
             validate: mockValidate(false),
         });
 
@@ -96,11 +133,17 @@ describe("modal.vue", () => {
 
     it("Should have a disabled footer button when the form has not been touched", async () => {
         // Arrange / Act
-        useForm.mockReturnValue({
-            validate: mockValidate(false),
-        });
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
 
-        useIsFormTouched.mockReturnValue(false);
+        useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
+        });
 
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
@@ -118,13 +161,17 @@ describe("modal.vue", () => {
 
     it("Should have a disabled footer button when the form is invalid", async () => {
         // Arrange / Act
-        useForm.mockReturnValue({
-            validate: mockValidate(false),
-        });
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
 
-        useIsFormTouched.mockReturnValue(true);
-        useIsFormDirty.mockReturnValue(true);
-        useIsFormValid.mockReturnValue(false);
+        useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
+        });
 
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
@@ -142,12 +189,17 @@ describe("modal.vue", () => {
 
     it("Should call bootstrap Modal method 'show' when calling 'openModal'", async () => {
         // Arrange
-        useForm.mockReturnValue({
-            validate: mockValidate(false),
-        });
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
 
-        useIsFormDirty.mockReturnValue(true);
-        useIsFormValid.mockReturnValue(true);
+        useForm.mockReturnValue({
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
+        });
 
         const showMock = jest.spyOn(Modal.prototype, "show");
 
@@ -170,13 +222,17 @@ describe("modal.vue", () => {
 
     it("Should call bootstrap Modal method 'hide' when calling 'closeModal'", async () => {
         // Arrange
+        const fakeMeta = {
+            touched: true,
+            dirty: true,
+            valid: true,
+            validated: true,
+        }
+
         useForm.mockReturnValue({
-            validate: mockValidate(false),
+            meta: mockMeta(fakeMeta),
+            validate: mockValidate(true),
         });
-
-        useIsFormDirty.mockReturnValue(true);
-        useIsFormValid.mockReturnValue(true);
-
         const hideMock = jest.spyOn(Modal.prototype, "hide");
 
         const resetButtonStyle = jest.fn();

From 519233cad50bff955a3d179cbf95280745fd8483 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Mar 2023 15:06:47 -0400
Subject: [PATCH 41/78] Prettified

---
 src/digital-components/modal/modal.spec.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 4f8da5c86..a948fe99a 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -24,13 +24,13 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
             validate: mockValidate(true),
         });
-        
+
         const wrapper = shallowMount(modal, {
             props: {
                 headerText: headerText,
@@ -50,7 +50,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -74,7 +74,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -106,7 +106,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: false,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -138,7 +138,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -166,7 +166,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -194,7 +194,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),
@@ -227,7 +227,7 @@ describe("modal.vue", () => {
             dirty: true,
             valid: true,
             validated: true,
-        }
+        };
 
         useForm.mockReturnValue({
             meta: mockMeta(fakeMeta),

From 2fd0ce5f211698226b88b2c3a03cf0c26408c727 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 27 Mar 2023 09:47:30 -0400
Subject: [PATCH 42/78] Before merging from develop

---
 src/constants/endpoints.js                    |   2 +-
 src/digital-components/modal/modal.vue        |  14 +-
 .../service-location/service-location.vue     |  15 +-
 .../service-type-question.vue                 |  39 +---
 .../service-zip-modal-question.vue            |   2 +
 src/store/index.js                            |  22 ++-
 .../modal-button-main.spec.js                 | 187 ++++++++++++++++++
 .../modal-button-main/modal-button-main.vue   | 153 ++++++++++++++
 8 files changed, 379 insertions(+), 55 deletions(-)
 create mode 100644 src/ux-components/modal-button-main/modal-button-main.spec.js
 create mode 100644 src/ux-components/modal-button-main/modal-button-main.vue

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index fc94132d9..aaf221bd2 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -79,7 +79,7 @@ const endpoints = {
         method: "GET",
     },
     GetServiceabilityDetails: {
-        url: "/location/serviceability-details",
+        url: "/location/api/v1/location/serviceability-details",
         method: "GET",
     },
     GetSupportingItems: {
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a18881796..7217e7478 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -26,7 +26,7 @@
                     <slot></slot>
                 </div>
                 <div class="modal-footer px-5 py-4">
-                    <buttonMain
+                    <modalButtonMain
                         isPrimary
                         class="w-100"
                         ref="buttonMain"
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import buttonMain from "@/ux-components/button-main/button-main";
+import modalButtonMain from "@/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
 
@@ -60,14 +60,14 @@ export default {
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
 
-        const form = useForm();
+        const { validate } = useForm();
         const isFormTouched = useIsFormTouched();
         const isFormDirty = useIsFormDirty();
         const isFormValid = useIsFormValid();
 
         return {
             modalId,
-            form,
+            validate,
             isFormTouched,
             isFormDirty,
             isFormValid,
@@ -75,9 +75,9 @@ export default {
     },
     methods: {
         async validateAndEmit() {
-            const validationResult = await this.form.validate();
+            const validationResult = await this.validate();
             if (validationResult.valid) {
-                this.$emit("footer-button-event");
+               this.$emit("footer-button-event");
             } else {
                 this.resetButtonStyle();
             }
@@ -110,7 +110,7 @@ export default {
         },
     },
     components: {
-        buttonMain,
+        modalButtonMain,
     },
 };
 </script>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3e8f506d5..cb22c5844 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -24,7 +24,7 @@
                     :isGlassServiceableMobile="isGlassServiceableMobile"
                     :isRecalibrationServiceableMobile="isRecalibrationServiceableMobile"
                     ref="serviceTypeQuestion"
-                    groupName="ServiceTypeQuestion"
+                    groupName="serviceTypeQuestion"
                     cmsWidgetName="ServiceTypeQuestionWidget"
                     validationRules="option-required" />
                 <mobileLocationModalQuestions
@@ -96,11 +96,7 @@ export default {
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
 
-        const lineItems = store.getters.order.lineItems;
-        const serviceabilityDetailsPromise = getServiceabilityDetails({
-            serviceZipCode: serviceZipCode,
-            lineItems: lineItems,
-        });
+        const serviceabilityDetailsPromise = getServiceabilityDetails(serviceZipCode);
 
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
@@ -256,11 +252,8 @@ export default {
                     });
                 }
 
-                const lineItems = store.getters.order.lineItems;
-                const serviceabilityDetails = await getServiceabilityDetails({
-                    serviceZipCode: newValue,
-                    lineItems: lineItems,
-                });
+                const serviceZipCode = store.getters.order.serviceLocation.zipCode;
+                const serviceabilityDetails = await getServiceabilityDetails(serviceZipCode);
 
                 this.setServiceabilityDetails(serviceabilityDetails.data);
             },
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index b8f82d35c..8f55b4b8a 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -55,37 +55,20 @@ export default {
             return filteredAnswers;
         },
         serviceability() {
+            const mobileAvailable = this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            const inshopAvailable = this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
+
             let result;
-            if (
-                this.isGlassServiceableMobile &&
-                this.isRecalibrationServiceableMobile &&
-                this.isGlassServiceableInshop &&
-                this.isRecalibrationServiceableInshop
-            ) {
+            if (inshopAvailable && mobileAvailable) {
                 result = "All";
-            } else if (
-                !this.isGlassServiceableInshop &&
-                !this.isRecalibrationServiceableInshop &&
-                this.isGlassServiceableMobile &&
-                this.isRecalibrationServiceableMobile
-            ) {
-                result = "MobileOnly";
-            } else if (
-                this.isGlassServiceableInshop &&
-                this.isRecalibrationServiceableInshop &&
-                !this.isGlassServiceableMobile &&
-                !this.isRecalibrationServiceableMobile
-            ) {
+            } else if (inshopAvailable && !mobileAvailable) {
                 result = "InshopOnly";
-            } else if (
-                !this.isGlassServiceableInshop &&
-                !this.isRecalibrationServiceableInshop &&
-                !this.isGlassServiceableMobile &&
-                !this.isRecalibrationServiceableMobile
-            ) {
+            } else if (!inshopAvailable && mobileAvailable) {
+                result = "MobileOnly";
+            } else if (!inshopAvailable && !mobileAvailable) {
                 result = "None";
             }
-
+            
             return result;
         },
         selectedValues: {
@@ -99,11 +82,9 @@ export default {
     },
     watch: {
         serviceability: {
-            handler(newValue, oldValue) {
+            handler(newValue) {
                 if (newValue == "MobileOnly") {
                     this.selectedValues = "Mobile";
-                } else {
-                    this.selectedValues = null;
                 }
             },
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 2c1e0e588..a53bec1dc 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
         @footer-button-event="setZipCode">
         <serviceZipQuestion
             ref="serviceZipQuestion"
+            customInputId="serviceZipCode"
             v-model="internalModel.zipCode"
             v-on="{ 'textboxQuestionEvent.inputIdAssigned': onInputIdAssigned }"
             :cmsWidgetName="textboxQuestionWidgetName" />
@@ -49,6 +50,7 @@ export default {
             internalModel: this.copyModel(this.modelValue),
             serviceZipCodeTextInputId: "",
             displayInvalidZipAlert: false,
+
         };
     },
     props: {
diff --git a/src/store/index.js b/src/store/index.js
index 5a0e86846..a64c279b6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -926,14 +926,13 @@ export const actions = {
         });
     },
 
-    getServiceabilityDetails(context, { serviceZipCode, lineItems }) {
-        return globalMethods.callMockHttpClient({
+    getServiceabilityDetails(context, { serviceZipCode }) {
+        const lineItems = context.getters.order.lineItems;
+        const lineItemsToSend = [...lineItems.supportingItems];
+        const encodedLineItems = encodeURIComponent(JSON.stringify(lineItemsToSend))
+        return globalMethods.callHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
-            //TODO: Remove Mocky Endpoints
-            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
-            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
-            //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
-            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
+            endpoint: `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&lineItems=${encodedLineItems}`,
         });
     },
 
@@ -1664,3 +1663,12 @@ function getLineItemQueryStringForPricing(lineItems) {
         })
         .join("");
 }
+
+function getLineItemQueryStringForServiceability(lineItems) {
+    return lineItems
+        .map((lineItem) => {
+            let queryStringSnippet = `&lineItems=${lineItem.partNumber}`;
+            return queryStringSnippet;
+        })
+        .join("");
+}
diff --git a/src/ux-components/modal-button-main/modal-button-main.spec.js b/src/ux-components/modal-button-main/modal-button-main.spec.js
new file mode 100644
index 000000000..41e244a72
--- /dev/null
+++ b/src/ux-components/modal-button-main/modal-button-main.spec.js
@@ -0,0 +1,187 @@
+import { shallowMount } from "@vue/test-utils";
+import buttonMain from "./button-main";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { nextTick } from "vue";
+
+describe("buttonMain.vue", () => {
+    it("Should return btn-primary class", () => {
+        // Arrange/Act
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    isPrimary: true,
+                },
+            })
+        );
+        const button = wrapper.find("button");
+
+        // Assert
+        expect(button.attributes("class")).toContain("btn-primary");
+    });
+
+    it("Should return aria-disabled state", () => {
+        // Arrange/Act
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    isDisabled: true,
+                },
+            })
+        );
+        const button = wrapper.find("button");
+
+        // Assert
+        expect(button.attributes()["aria-disabled"]).toEqual("true");
+    });
+
+    it("Should return loader color", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderColor: "blue",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        // Act
+        wrapper.vm.clicked();
+        await nextTick();
+
+        // Assert
+        const loader = wrapper.find("loader-stub");
+        expect(loader.attributes("class")).toContain("blue");
+    });
+
+    it("Should return loader position", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        // Act
+        wrapper.vm.clicked();
+        await nextTick();
+
+        // Assert
+        const loader = wrapper.find("loader-stub");
+        expect(loader.attributes("class")).toContain("right");
+    });
+
+    it("Should set 'isLoaderDisplayed' to false when calling 'removeLoader'", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        wrapper.setData({
+            isLoaderDisplayed: true,
+        });
+
+        // Act
+        wrapper.vm.removeLoader();
+        await nextTick();
+
+        // Assert
+        const loader = wrapper.find("loader-stub");
+        expect(wrapper.vm.isLoaderDisplayed).toBe(false);
+    });
+
+    it("Should set 'isLoaderDisplayed' to false when calling 'resetButtonStyle'", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        wrapper.setData({
+            isLoaderDisplayed: true,
+        });
+
+        // Act
+        wrapper.vm.resetButtonStyle();
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.isLoaderDisplayed).toBe(false);
+    });
+
+    it("Should emit 'click-event' event when clicking if the button is enabled", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                    isDisabled: false,
+                },
+            })
+        );
+
+        const buttonElement = wrapper.find("button");
+
+        // Act
+        buttonElement.trigger("click");
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.emitted("click-event")).toBeTruthy();
+    });
+
+    it("Should not emit 'click-event' event when clicking if the button is disabled", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                    isDisabled: true,
+                },
+            })
+        );
+
+        const buttonElement = wrapper.find("button");
+
+        // Act
+        buttonElement.trigger("click");
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.emitted("click-event")).toBeFalsy();
+    });
+});
+
+function setupMocks(mountOptionsMockData = {}) {
+    const defaultMountOptions = { route: { query: { fmgPage: "page-name" } } };
+    const baseMountOptions = getMountOptions(
+        Object.assign(defaultMountOptions, mountOptionsMockData)
+    );
+    const allMountOptions = Object.assign(defaultMountOptions, baseMountOptions);
+
+    return allMountOptions;
+}
diff --git a/src/ux-components/modal-button-main/modal-button-main.vue b/src/ux-components/modal-button-main/modal-button-main.vue
new file mode 100644
index 000000000..eaffdf2d0
--- /dev/null
+++ b/src/ux-components/modal-button-main/modal-button-main.vue
@@ -0,0 +1,153 @@
+<template>
+    <button
+        type="button"
+        :aria-disabled="isDisabled"
+        class="btn d-flex align-items-center justify-content-center py-3 px-4 delay"
+        :class="[
+            isPrimary ? 'btn-primary' : 'btn-secondary',
+            isFloat ? 'float-end' : '',
+            isLoaderDisplayed ? 'has-loader' : '',
+        ]"
+        @click="clicked">
+        <span class="m-0">{{ this.buttonText }}</span>
+        <loader
+            class="ms-2"
+            v-if="isLoaderDisplayed && !suppressLoader"
+            v-bind:class="[this.loaderColor, this.loaderPosition]" />
+    </button>
+</template>
+
+<script>
+import loader from "@/ux-components/loader/loader";
+
+export default {
+    name: "modalButtonMain",
+    props: {
+        isPrimary: Boolean,
+        buttonText: String,
+        isDisabled: Boolean,
+        loaderColor: String,
+        loaderPosition: String,
+        isFloat: Boolean,
+        suppressLoader: Boolean,
+    },
+    data() {
+        return {
+            isLoaderDisplayed: false,
+        };
+    },
+    methods: {
+        removeLoader() {
+            this.isLoaderDisplayed = false;
+        },
+        clicked() {
+            this.pushEventToGA(
+                this.$route.query[this.queryStrings.FMG_PAGE],
+                this.GaActions.CLICKED,
+                this.buttonText,
+                true
+            );
+            if (!this.isDisabled) {
+                this.isLoaderDisplayed = true;
+                this.$emit("click-event");
+            }
+        },
+        resetButtonStyle() {
+            this.isLoaderDisplayed = false;
+        },
+    },
+    components: {
+        loader,
+    },
+};
+</script>
+
+<style lang="scss">
+.btn {
+    &.btn-primary {
+        position: relative;
+        background: linear-gradient(270deg, $blue 0%, $blue-800 100%);
+        border: none;
+        border-radius: $border-radius-lg;
+        color: $white;
+        justify-content: center;
+        font-weight: 500;
+        @media (hover: hover) {
+            background: linear-gradient(270deg, $blue 0%, $blue-800 100%);
+        }
+        &:focus {
+            box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700;
+        }
+        &:focus, // Mouse, touch, stylus focus
+    &:focus-visible {
+            // Keyboard focus for accessibility
+            outline: none;
+            box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700;
+            color: $white;
+            background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%);
+        }
+        &:disabled {
+            background: $gray-200 !important;
+            background: linear-gradient(270deg, $gray-200 0%, $gray-200 100%) !important;
+            color: $gray-600 !important;
+            font-weight: 400;
+            height: 48px;
+            border: none;
+            border-radius: $border-radius-lg;
+            cursor: pointer;
+            pointer-events: all;
+        }
+        &.has-loader {
+            color: $white;
+            background: $blue-700;
+            box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700;
+            pointer-events: none;
+        }
+        &.delay {
+            // fixes flicker while transitioning between states
+            transition: background 0s 0s ease-in-out;
+        }
+    }
+    &.btn-secondary {
+        position: relative;
+        background: transparent;
+        border: 1px solid $blue;
+        border-radius: $border-radius-lg;
+        color: $blue;
+        font-weight: 500;
+        transition: all 150ms linear;
+        height: 3rem;
+        &:hover {
+            color: $white;
+            @include blue-gradient;
+        }
+        &:focus, // Mouse, touch, stylus focus
+    &:focus-visible {
+            // Keyboard focus for accessibility
+            outline: none;
+            box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue-700;
+            color: $white;
+            @include blue-gradient;
+        }
+        &:disabled {
+            background: transparent;
+            color: $gray-550 !important;
+            font-weight: 400;
+            height: 48px;
+            border: 1px solid $gray-550;
+            border-radius: $border-radius-lg;
+            cursor: pointer;
+            pointer-events: all;
+        }
+        &.has-loader {
+            color: $white;
+            @include blue-gradient;
+            pointer-events: none;
+        }
+        &.delay {
+            // fixes flicker while transitioning between states
+            transition: background 0s 0s ease-in-out;
+        }
+    }
+}
+</style>

From 25d03a1c0ac2178bda18d6312f2b137b7d4551fe Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 27 Mar 2023 10:31:54 -0400
Subject: [PATCH 43/78] Removed unused watch statement

---
 src/layouts/service-location/service-location.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 8b3042678..261e84521 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -216,15 +216,6 @@ export default {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
     },
-    watch: {
-        zipCode(newValue, oldValue) {
-            if (newValue !== oldValue) {
-                baseMixin.methods.getZipCodeData(newValue).then((r) => {
-                    this.zipContainsMilitaryBase = r.containsMilitaryBase;
-                });
-            }
-        },
-    },
     components: {
         alert,
         serviceZipModalQuestion,

From 6b25e8ea47601f60edb7981e30695fa89b90f09d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 27 Mar 2023 13:22:32 -0400
Subject: [PATCH 44/78] Merge outstanding changes

---
 .../mobile-location-modal-questions.vue            | 14 ++++++++++----
 src/layouts/service-location/service-location.vue  |  1 +
 2 files changed, 11 insertions(+), 4 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 a319a85b9..d0128bcd3 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
@@ -61,7 +61,11 @@ import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
-import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+
+import {
+    getPricedMobileFeePart,
+    getServiceabilityDetails,
+} from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -187,13 +191,15 @@ export default {
             } else {
                 // retrieve mobile fee part
                 const serviceZipCode = this.internalModel.addressQuestions.zipCode;
-
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
-                
+
+                // retrieve serviceability details
+                const serviceabilityDetails = await getServiceabilityDetails(serviceZipCode);
+
                 // 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-contains-military-base", zipCodeData.containsMilitaryBase);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index b049bb0cb..4eaad2cbb 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -37,6 +37,7 @@
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
             <textboxQuestion
+                v-if="selectedServiceType === 'Mobile'"
                 ref="mobileLocationQuestionsError"
                 v-model="mobileLocationValidationField"
                 validationRules="mobile-location-required"

From 07c90341abf947d4872a30bc975f1a9fb4ad2419 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 27 Mar 2023 13:31:26 -0400
Subject: [PATCH 45/78] Patched in missing Military code

---
 src/layouts/service-location/service-location.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4eaad2cbb..6b059079f 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,6 +10,7 @@
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
                 @updated-serviceability="setServiceabilityDetails"
+                @updated-contains-military-base="setContainsMilitaryBase"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
             <alert
@@ -33,6 +34,7 @@
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
                 @updated-serviceability="setServiceabilityDetails"
+                @updated-contains-military-base="setContainsMilitaryBase"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />

From 31355e1e735888a3b3283a099614b735592a14e1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 27 Mar 2023 13:37:30 -0400
Subject: [PATCH 46/78] added comment

---
 .../service-zip-modal-question/service-zip-modal-question.vue   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index ed4a3ea69..0698fc340 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -149,6 +149,8 @@ export default {
                     // retrieve mobile fee part
                     const serviceZipCode = this.internalModel.zipCode;
                     const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
+
+                    // retrieve serviceability details
                     const serviceabilityDetails = await getServiceabilityDetails(serviceZipCode);
 
                     // update content related to service zip code

From 902cd698582cb44c5fb93bd609faf81336b55df2 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Mar 2023 08:28:55 -0400
Subject: [PATCH 47/78] WIP

---
 src/layouts/service-location/service-location.vue     |  8 ++++----
 .../service-type-question/service-type-question.vue   | 11 +++++++++--
 src/store/index.js                                    |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6b059079f..e6613cda8 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -190,10 +190,10 @@ export default {
             },
         },
         showMilitaryZipAlert() {
-            return (
-                this.zipContainsMilitaryBase &&
-                (this.isZipServiceableMobile == null || this.isZipServiceableMobile === true)
-            );
+            const isZipServiceableMobile =
+                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+
+            return this.zipContainsMilitaryBase && isZipServiceableMobile;
         },
     },
     methods: {
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index b74ad989f..d8ba9e864 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -55,8 +55,13 @@ export default {
             return filteredAnswers;
         },
         serviceability() {
-            const mobileAvailable =
-                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            let mobileAvailable;
+            if (this.IsRecalibrationServiceableMobile == null) {
+                mobileAvailable = this.isGlassServiceableMobile;
+            } else {
+                mobileAvailable = this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            }
+
             const inshopAvailable =
                 this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
 
@@ -87,6 +92,8 @@ export default {
             handler(newValue) {
                 if (newValue == "MobileOnly") {
                     this.selectedValues = "Mobile";
+                } else {
+                    this.selectedValues = null;
                 }
             },
         },
diff --git a/src/store/index.js b/src/store/index.js
index 413d2f8b0..24d9e5b84 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -43,6 +43,7 @@ const getDefaultState = () => {
                 state: null,
                 zipCode: null,
                 zipCodeCtu: null,
+                serviceType: null,
             },
             customer: {
                 emailAddress: null,

From 04854a455cf3fbe1d1d589fe2a1a60f271ce7fc7 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Mar 2023 08:39:54 -0400
Subject: [PATCH 48/78] WIP

---
 .../service-type-question/service-type-question.vue            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index d8ba9e864..4f1a36ac7 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -59,7 +59,8 @@ export default {
             if (this.IsRecalibrationServiceableMobile == null) {
                 mobileAvailable = this.isGlassServiceableMobile;
             } else {
-                mobileAvailable = this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+                mobileAvailable =
+                    this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
             }
 
             const inshopAvailable =

From 0bde42e0d2cda395b5be2aad279d20cf1763107c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Mar 2023 13:20:12 -0400
Subject: [PATCH 49/78] WIP

---
 src/digital-components/modal/modal.vue                        | 4 ++--
 .../mobile-location-modal-questions.vue                       | 4 ++++
 src/layouts/service-location/service-location.vue             | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 32a00ad15..ba7e60eb6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -29,7 +29,7 @@
                     <modalButtonMain
                         isPrimary
                         class="w-100"
-                        ref="buttonMain"
+                        ref="modalButtonMain"
                         loaderColor="white"
                         :buttonText="footerButtonText"
                         @click-event="validateAndEmit"
@@ -79,7 +79,7 @@ export default {
             }
         },
         resetButtonStyle() {
-            this.$refs.buttonMain.resetButtonStyle();
+            this.$refs.modalButtonMain.resetButtonStyle();
         },
         onModalOpened() {
             this.onModalOpenedCallback?.();
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 d0128bcd3..bbed9923d 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
@@ -161,6 +161,7 @@ export default {
         },
         onModalClosed() {
             this.internalModel = deepClone(this.modelValue);
+            this.resetAlerts();
         },
         resetComponent(updatedServiceZipCodeInfo) {
             // Reset the validation form, setting the initial values
@@ -179,6 +180,9 @@ export default {
         resetModalButtonStyle() {
             this.$refs[this.modalName].resetButtonStyle();
         },
+        resetAlerts() {
+            this.$refs.addressQuestions.displayVerificationWarning = false;
+        },
         async setMobileLocation() {
             // Validate the Zip Code
             const zipCodeData = await this.getZipCodeData(
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e6613cda8..d8167ad57 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -29,7 +29,7 @@
                 cmsWidgetName="ServiceTypeQuestionWidget"
                 validationRules="option-required" />
             <mobileLocationModalQuestions
-                v-if="selectedServiceType === 'Mobile'"
+                v-show="selectedServiceType === 'Mobile'"
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
@@ -39,7 +39,7 @@
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
             <textboxQuestion
-                v-if="selectedServiceType === 'Mobile'"
+                v-show="selectedServiceType === 'Mobile'"
                 ref="mobileLocationQuestionsError"
                 v-model="mobileLocationValidationField"
                 validationRules="mobile-location-required"

From 314193eb43a8fa102caaf4791729c6261333a956 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Mar 2023 13:47:09 -0400
Subject: [PATCH 50/78] Updated existing unit tests

---
 src/digital-components/modal/modal.spec.js    |  4 +-
 .../mobile-location-modal-questions.spec.js   | 14 +++++++
 .../service-location/service-location.spec.js | 14 +++++++
 .../service-zip-modal-question.spec.js        | 14 +++++++
 .../modal-button-main.spec.js                 | 38 +++++++++----------
 5 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index a948fe99a..e4d8692d4 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -92,7 +92,7 @@ describe("modal.vue", () => {
         wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
-        const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
+        const buttonMain = wrapper.findComponent({ ref: "modalButtonMain" });
         await buttonMain.trigger("click-event");
 
         // Assert
@@ -124,7 +124,7 @@ describe("modal.vue", () => {
         wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
-        const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
+        const buttonMain = wrapper.findComponent({ ref: "modalButtonMain" });
         await buttonMain.trigger("click-event");
 
         // Assert
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index fbea693b9..66bd93799 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -110,12 +110,26 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
+const mockGetServiceabilityDetails = (mockServiceZipCode) => {
+    const serviceabilityDetails = {
+        isGlassServiceableInshop: true,
+        isRecalibrationServiceableInshop: true,
+        isGlassServiceableMobile: true,
+        isRecalibrationServiceableMobile: true,
+    };
+
+    return Promise.resolve(serviceabilityDetails);
+};
+
 jest.mock(
     "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
     () => ({
         getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
             return mockGetPricedMobileFeePart(mockServiceZipCode);
         }),
+        getServiceabilityDetails: jest.fn((mockServiceZipCode) => {
+            return mockGetServiceabilityDetails(mockServiceZipCode);
+        }),
     })
 );
 
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index b48fa2f06..2a056c4d1 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -32,12 +32,26 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
+const mockGetServiceabilityDetails = (mockServiceZipCode) => {
+    const serviceabilityDetails = {
+        isGlassServiceableInshop: true,
+        isRecalibrationServiceableInshop: true,
+        isGlassServiceableMobile: true,
+        isRecalibrationServiceableMobile: true,
+    };
+
+    return Promise.resolve(serviceabilityDetails);
+};
+
 jest.mock(
     "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
     () => ({
         getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
             return mockGetPricedMobileFeePart(mockServiceZipCode);
         }),
+        getServiceabilityDetails: jest.fn((mockServiceZipCode) => {
+            return mockGetServiceabilityDetails(mockServiceZipCode);
+        }),
     })
 );
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 407e129cf..6c9cf42f5 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -33,12 +33,26 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
+const mockGetServiceabilityDetails = (mockServiceZipCode) => {
+    const serviceabilityDetails = {
+        isGlassServiceableInshop: true,
+        isRecalibrationServiceableInshop: true,
+        isGlassServiceableMobile: true,
+        isRecalibrationServiceableMobile: true,
+    };
+
+    return Promise.resolve(serviceabilityDetails);
+};
+
 jest.mock(
     "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
     () => ({
         getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
             return mockGetPricedMobileFeePart(mockServiceZipCode);
         }),
+        getServiceabilityDetails: jest.fn((mockServiceZipCode) => {
+            return mockGetServiceabilityDetails(mockServiceZipCode);
+        }),
     })
 );
 
diff --git a/src/ux-components/modal-button-main/modal-button-main.spec.js b/src/ux-components/modal-button-main/modal-button-main.spec.js
index 41e244a72..bd3587f22 100644
--- a/src/ux-components/modal-button-main/modal-button-main.spec.js
+++ b/src/ux-components/modal-button-main/modal-button-main.spec.js
@@ -1,21 +1,21 @@
 import { shallowMount } from "@vue/test-utils";
-import buttonMain from "./button-main";
+import modalButtonMain from "./modal-button-main";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 
-describe("buttonMain.vue", () => {
+describe("modal-button-main.vue", () => {
     it("Should return btn-primary class", () => {
         // Arrange/Act
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     isPrimary: true,
                 },
             })
         );
         const button = wrapper.find("button");
-
+        
         // Assert
         expect(button.attributes("class")).toContain("btn-primary");
     });
@@ -23,9 +23,9 @@ describe("buttonMain.vue", () => {
     it("Should return aria-disabled state", () => {
         // Arrange/Act
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     isDisabled: true,
                 },
             })
@@ -39,9 +39,9 @@ describe("buttonMain.vue", () => {
     it("Should return loader color", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderColor: "blue",
                     loaderEnabled: true,
                 },
@@ -60,9 +60,9 @@ describe("buttonMain.vue", () => {
     it("Should return loader position", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderPosition: "right",
                     loaderEnabled: true,
                 },
@@ -81,9 +81,9 @@ describe("buttonMain.vue", () => {
     it("Should set 'isLoaderDisplayed' to false when calling 'removeLoader'", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderPosition: "right",
                     loaderEnabled: true,
                 },
@@ -106,9 +106,9 @@ describe("buttonMain.vue", () => {
     it("Should set 'isLoaderDisplayed' to false when calling 'resetButtonStyle'", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderPosition: "right",
                     loaderEnabled: true,
                 },
@@ -130,9 +130,9 @@ describe("buttonMain.vue", () => {
     it("Should emit 'click-event' event when clicking if the button is enabled", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderPosition: "right",
                     loaderEnabled: true,
                     isDisabled: false,
@@ -154,9 +154,9 @@ describe("buttonMain.vue", () => {
     it("Should not emit 'click-event' event when clicking if the button is disabled", async () => {
         // Arrange
         const wrapper = shallowMount(
-            buttonMain,
+            modalButtonMain,
             setupMocks({
-                props: {
+                propsData: {
                     loaderPosition: "right",
                     loaderEnabled: true,
                     isDisabled: true,

From 1639045d748524cf8ce9f0b7add773d8cae741a0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 29 Mar 2023 07:46:42 -0400
Subject: [PATCH 51/78] Unit tests completed

---
 .../service-type-question.spec.js             | 186 +++++++++++++++++-
 .../modal-button-main.spec.js                 |   2 +-
 2 files changed, 186 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-type-question/service-type-question.spec.js b/src/layouts/service-location/service-type-question/service-type-question.spec.js
index 3d0843e10..13b727c54 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.spec.js
+++ b/src/layouts/service-location/service-type-question/service-type-question.spec.js
@@ -1 +1,185 @@
-test.todo("some test to be written in the future");
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import serviceTypeQuestion from "./service-type-question";
+
+const mockCmsContent = {
+    QuestionText: "Choose a service option:",
+    Answers: [
+        {
+            AnswerImageUrl: "",
+            Name: "Mobile",
+            SubText: "",
+            SubWidgetName: "",
+            Text: "Mobile",
+        },
+        {
+            AnswerImageUrl: "",
+            Name: "Inshop",
+            SubText: "",
+            SubWidgetName: "",
+            Text: "In-shop",
+        },
+        {
+            AnswerImageUrl: "",
+            Name: "DropOff",
+            SubText: "",
+            SubWidgetName: "",
+            Text: "Drop-off",
+        },
+    ],
+};
+
+const cmsWidgetName = "ServiceTypeQuestionWidget";
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            if (widgetName === cmsWidgetName) {
+                return mockCmsContent[cmsFieldName];
+            }
+
+            return null;
+        }),
+    },
+};
+
+describe("service-type-question.vue", () => {
+    it("Should display all options if both in-shop and mobile are available", async () => {
+        // Arrange/Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: cmsWidgetName,
+                isGlassServiceableInshop: true,
+                isRecalibrationServiceableInshop: true,
+                isGlassServiceableMobile: true,
+                isRecalibrationServiceableMobile: true,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        // Assert
+        expect(wrapper.vm.answersToDisplay).toEqual([
+            {
+                AnswerImageUrl: "",
+                Name: "Mobile",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "Mobile",
+            },
+            {
+                AnswerImageUrl: "",
+                Name: "Inshop",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "In-shop",
+            },
+            {
+                AnswerImageUrl: "",
+                Name: "DropOff",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "Drop-off",
+            },
+        ]);
+    });
+
+    it("Should display only the In-Shop and Drop-Off answers when only in-shop service is available", async () => {
+        // Arrange/Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: cmsWidgetName,
+                isGlassServiceableInshop: true,
+                isRecalibrationServiceableInshop: true,
+                isGlassServiceableMobile: false,
+                isRecalibrationServiceableMobile: false,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        // Assert
+        expect(wrapper.vm.answersToDisplay).toEqual([
+            {
+                AnswerImageUrl: "",
+                Name: "Inshop",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "In-shop",
+            },
+            {
+                AnswerImageUrl: "",
+                Name: "DropOff",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "Drop-off",
+            },
+        ]);
+    });
+
+    it("Should display only the Mobile answer when only mobile service is available", async () => {
+        // Arrange/Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: cmsWidgetName,
+                isGlassServiceableInshop: false,
+                isRecalibrationServiceableInshop: false,
+                isGlassServiceableMobile: true,
+                isRecalibrationServiceableMobile: true,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        // Assert
+        expect(wrapper.vm.answersToDisplay).toEqual([
+            {
+                AnswerImageUrl: "",
+                Name: "Mobile",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "Mobile",
+            },
+        ]);
+    });
+
+    it("Should display no answers if neither in-shop nor mobile service are available", async () => {
+        // Arrange/Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: cmsWidgetName,
+                isGlassServiceableInshop: false,
+                isRecalibrationServiceableInshop: false,
+                isGlassServiceableMobile: false,
+                isRecalibrationServiceableMobile: false,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        // Assert
+        expect(wrapper.vm.answersToDisplay).toEqual([]);
+    });
+});
+
+function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {
+    const resultingMountOptions = getMountOptions({
+        ...mountOptions,
+        mixins,
+    });
+
+    if (props) resultingMountOptions.propsData = props;
+
+    const wrapper = isShallowMount
+        ? shallowMount(serviceTypeQuestion, resultingMountOptions)
+        : mount(serviceTypeQuestion, resultingMountOptions);
+
+    return { wrapper };
+}
diff --git a/src/ux-components/modal-button-main/modal-button-main.spec.js b/src/ux-components/modal-button-main/modal-button-main.spec.js
index bd3587f22..f212d8ec3 100644
--- a/src/ux-components/modal-button-main/modal-button-main.spec.js
+++ b/src/ux-components/modal-button-main/modal-button-main.spec.js
@@ -15,7 +15,7 @@ describe("modal-button-main.vue", () => {
             })
         );
         const button = wrapper.find("button");
-        
+
         // Assert
         expect(button.attributes("class")).toContain("btn-primary");
     });

From 67154e9192c1e5c4704eb23cdfa9afe622078351 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 29 Mar 2023 09:21:02 -0400
Subject: [PATCH 52/78] WIP

---
 .../service-location/service-location.vue     | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d8167ad57..d4f632374 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -16,7 +16,12 @@
             <alert
                 class="my-4"
                 cmsWidgetName="AlertMilitaryBaseZipWidget"
-                v-if="showMilitaryZipAlert"
+                v-if="displayMilitaryZipAlert"
+                alertClass="alert-warning" />
+            <alert
+                class="my-4"
+                cmsWidgetName="AlertNoServiceWarningWidget"
+                v-if="displayNoServiceWarningAlert"
                 alertClass="alert-warning" />
             <serviceTypeQuestion
                 v-model="selectedServiceType"
@@ -189,12 +194,26 @@ export default {
                 this.mobileLocationValidationField = "isValid";
             },
         },
-        showMilitaryZipAlert() {
+        displayMilitaryZipAlert() {
             const isZipServiceableMobile =
                 this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
 
             return this.zipContainsMilitaryBase && isZipServiceableMobile;
         },
+        displayNoServiceWarningAlert() {
+            let mobileAvailable;
+            if (this.IsRecalibrationServiceableMobile == null) {
+                mobileAvailable = this.isGlassServiceableMobile;
+            } else {
+                mobileAvailable =
+                    this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            }
+
+            const inshopAvailable =
+                this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
+
+            return inshopAvailable && !mobileAvailable;
+        },
     },
     methods: {
         arePagePrerequisitesValid() {

From c62f4b49e93fe76da28475220ee566827477e08b Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 29 Mar 2023 13:05:38 -0400
Subject: [PATCH 53/78] Restored Mocky endpoints while we're waiting for
 CSR-1104 to be 100% completed

---
 src/store/index.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 24d9e5b84..7b6b64283 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -928,13 +928,23 @@ export const actions = {
     },
 
     getServiceabilityDetails(context, { serviceZipCode }) {
-        const lineItems = context.getters.order.lineItems;
-        const lineItemsToSend = [...lineItems.supportingItems];
-        const encodedLineItems = encodeURIComponent(JSON.stringify(lineItemsToSend));
-        return globalMethods.callHttpClient({
+        return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
-            endpoint: `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&lineItems=${encodedLineItems}`,
+            //TODO: Remove Mocky Endpoints
+            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
+            //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
+            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });
+
+        // TODO: Restore this when CSR-1104 is 100% complete
+        // const lineItems = context.getters.order.lineItems;
+        // const lineItemsToSend = [...lineItems.supportingItems];
+        // const encodedLineItems = encodeURIComponent(JSON.stringify(lineItemsToSend));
+        // return globalMethods.callHttpClient({
+        //     method: endpoints.GetServiceabilityDetails.method,
+        //     endpoint: `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&lineItems=${encodedLineItems}`,
+        // });
     },
 
     getSupportingItems(context) {

From 23d433931d792184a984a2b9029d6818ed364021 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 29 Mar 2023 15:34:52 -0400
Subject: [PATCH 54/78] Pull serviceability logic up to service-location page.

---
 .../service-location/service-location.vue     | 28 +++++++----
 .../service-type-question.vue                 | 46 +++++--------------
 2 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d8167ad57..2b166e830 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -20,10 +20,8 @@
                 alertClass="alert-warning" />
             <serviceTypeQuestion
                 v-model="selectedServiceType"
-                :isGlassServiceableInshop="isGlassServiceableInshop"
-                :isRecalibrationServiceableInshop="isRecalibrationServiceableInshop"
-                :isGlassServiceableMobile="isGlassServiceableMobile"
-                :isRecalibrationServiceableMobile="isRecalibrationServiceableMobile"
+                :isServiceableMobile="isServiceableMobile"
+                :isServiceableInshop="isServiceableInshop"
                 ref="serviceTypeQuestion"
                 groupName="serviceTypeQuestion"
                 cmsWidgetName="ServiceTypeQuestionWidget"
@@ -190,10 +188,24 @@ export default {
             },
         },
         showMilitaryZipAlert() {
-            const isZipServiceableMobile =
-                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
-
-            return this.zipContainsMilitaryBase && isZipServiceableMobile;
+            return this.zipContainsMilitaryBase && this.isServiceableMobile;
+        },
+        isServiceableMobile() {
+            if (this.isRecalibrationServiceableMobile !== null) {
+                return this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            } else {
+                return this.isGlassServiceableMobile;
+            }
+        },
+        isServiceableInshop() {
+            if (this.isRecalibrationServiceableInshop !== null) {
+                return this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
+            } else {
+                return this.isGlassServiceableInshop;
+            }
+        },
+        isServiceableMobileOnly() {
+            return this.isServiceableMobile && !this.isServiceableInshop;
         },
     },
     methods: {
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index 4f1a36ac7..11c0ff4fe 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -26,10 +26,8 @@ export default {
         suppressError: Boolean,
         validationRules: String,
         cmsWidgetName: String,
-        isGlassServiceableMobile: Boolean,
-        isGlassServiceableInshop: Boolean,
-        isRecalibrationServiceableInshop: Boolean,
-        isRecalibrationServiceableMobile: Boolean,
+        isServiceableMobile: Boolean,
+        isServiceableInshop: Boolean,
     },
     computed: {
         questionText() {
@@ -40,45 +38,20 @@ export default {
         },
         answersToDisplay() {
             let filteredAnswers;
-            if (this.serviceability == "All") {
+            if (this.isServiceableMobile && this.isServiceableInshop) {
                 filteredAnswers = this.answersFromCms;
-            } else if (this.serviceability == "MobileOnly") {
+            } else if (this.isServiceableMobile) {
                 filteredAnswers = this.answersFromCms.filter((answer) => answer.Name == "Mobile");
-            } else if (this.serviceability == "InshopOnly") {
+            } else if (this.isServiceableInshop) {
                 filteredAnswers = this.answersFromCms.filter(
                     (answer) => answer.Name == "Inshop" || answer.Name == "DropOff"
                 );
-            } else if (this.serviceability == "None") {
+            } else {
                 filteredAnswers = [];
             }
 
             return filteredAnswers;
         },
-        serviceability() {
-            let mobileAvailable;
-            if (this.IsRecalibrationServiceableMobile == null) {
-                mobileAvailable = this.isGlassServiceableMobile;
-            } else {
-                mobileAvailable =
-                    this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
-            }
-
-            const inshopAvailable =
-                this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
-
-            let result;
-            if (inshopAvailable && mobileAvailable) {
-                result = "All";
-            } else if (inshopAvailable && !mobileAvailable) {
-                result = "InshopOnly";
-            } else if (!inshopAvailable && mobileAvailable) {
-                result = "MobileOnly";
-            } else if (!inshopAvailable && !mobileAvailable) {
-                result = "None";
-            }
-
-            return result;
-        },
         selectedValues: {
             get: function () {
                 return this.modelValue;
@@ -87,11 +60,14 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        isMobileOnly() {
+            return this.isServiceableMobile && !this.isServiceableInshop;
+        },
     },
     watch: {
-        serviceability: {
+        isMobileOnly: {
             handler(newValue) {
-                if (newValue == "MobileOnly") {
+                if (newValue) {
                     this.selectedValues = "Mobile";
                 } else {
                     this.selectedValues = null;

From e244e264199f82431ea407f7dce591ad4b6e550b Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 29 Mar 2023 15:43:56 -0400
Subject: [PATCH 55/78] Added non-cms version of the alert

---
 src/layouts/service-location/service-location.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2b166e830..256ce6bc1 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -18,6 +18,12 @@
                 cmsWidgetName="AlertMilitaryBaseZipWidget"
                 v-if="showMilitaryZipAlert"
                 alertClass="alert-warning" />
+            <alert
+                class="my-4"
+                manualHeadline="Mobile service required"
+                manualCopy="We're not able to offer in-shop service in your area, but we can bring our MobileGlassShop directly to you!"
+                v-if="isServiceableMobileOnly"
+                alertClass="alert-warning" />
             <serviceTypeQuestion
                 v-model="selectedServiceType"
                 :isServiceableMobile="isServiceableMobile"

From c9384edc1e6729195c1b861228f9b83c3e0b2115 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 29 Mar 2023 15:53:16 -0400
Subject: [PATCH 56/78] Update to proper cms widget.

---
 src/layouts/service-location/service-location.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 256ce6bc1..774aafd87 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -20,8 +20,7 @@
                 alertClass="alert-warning" />
             <alert
                 class="my-4"
-                manualHeadline="Mobile service required"
-                manualCopy="We're not able to offer in-shop service in your area, but we can bring our MobileGlassShop directly to you!"
+                cmsWidgetName="AlertMobileOnlyWidget"
                 v-if="isServiceableMobileOnly"
                 alertClass="alert-warning" />
             <serviceTypeQuestion

From 24db66bdb5afcd66c573acf73d57393e337a6f1d Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 29 Mar 2023 16:50:46 -0400
Subject: [PATCH 57/78] Update tests based on changes to logic.

---
 .../service-type-question.spec.js             | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/layouts/service-location/service-type-question/service-type-question.spec.js b/src/layouts/service-location/service-type-question/service-type-question.spec.js
index 13b727c54..f4f48a77d 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.spec.js
+++ b/src/layouts/service-location/service-type-question/service-type-question.spec.js
@@ -49,10 +49,8 @@ describe("service-type-question.vue", () => {
             mixins: [mockMixin],
             props: {
                 cmsWidgetName: cmsWidgetName,
-                isGlassServiceableInshop: true,
-                isRecalibrationServiceableInshop: true,
-                isGlassServiceableMobile: true,
-                isRecalibrationServiceableMobile: true,
+                isServiceableInshop: true,
+                isServiceableMobile: true,
             },
             mountOptions: {
                 attachTo: document.body,
@@ -91,10 +89,8 @@ describe("service-type-question.vue", () => {
             mixins: [mockMixin],
             props: {
                 cmsWidgetName: cmsWidgetName,
-                isGlassServiceableInshop: true,
-                isRecalibrationServiceableInshop: true,
-                isGlassServiceableMobile: false,
-                isRecalibrationServiceableMobile: false,
+                isServiceableInshop: true,
+                isServiceableMobile: false,
             },
             mountOptions: {
                 attachTo: document.body,
@@ -126,10 +122,8 @@ describe("service-type-question.vue", () => {
             mixins: [mockMixin],
             props: {
                 cmsWidgetName: cmsWidgetName,
-                isGlassServiceableInshop: false,
-                isRecalibrationServiceableInshop: false,
-                isGlassServiceableMobile: true,
-                isRecalibrationServiceableMobile: true,
+                isServiceableInshop: false,
+                isServiceableMobile: true,
             },
             mountOptions: {
                 attachTo: document.body,
@@ -154,10 +148,8 @@ describe("service-type-question.vue", () => {
             mixins: [mockMixin],
             props: {
                 cmsWidgetName: cmsWidgetName,
-                isGlassServiceableInshop: false,
-                isRecalibrationServiceableInshop: false,
-                isGlassServiceableMobile: false,
-                isRecalibrationServiceableMobile: false,
+                isServiceableInshop: false,
+                isServiceableMobile: false,
             },
             mountOptions: {
                 attachTo: document.body,

From 67e67a1ff945f713a392be4742ec33efdc37e6ee Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 08:04:39 -0400
Subject: [PATCH 58/78] Tech review changes

---
 src/digital-components/modal/modal.vue        |  2 +-
 .../modal-button-main.spec.js                 |  0
 .../modal-button-main/modal-button-main.vue   |  0
 .../address-questions/address-questions.vue   |  3 ++
 .../appointment-type-question.spec.js}        | 10 +++----
 .../appointment-type-question.vue}            |  4 +--
 .../mobile-location-modal-questions.vue       |  2 +-
 .../service-location/service-location.vue     | 30 +++++++++++--------
 src/store/index.js                            |  9 ------
 9 files changed, 30 insertions(+), 30 deletions(-)
 rename src/{ => digital-components/modal}/ux-components/modal-button-main/modal-button-main.spec.js (100%)
 rename src/{ => digital-components/modal}/ux-components/modal-button-main/modal-button-main.vue (100%)
 rename src/layouts/service-location/{service-type-question/service-type-question.spec.js => appointment-type-question/appointment-type-question.spec.js} (94%)
 rename src/layouts/service-location/{service-type-question/service-type-question.vue => appointment-type-question/appointment-type-question.vue} (97%)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index ba7e60eb6..3bd0721f2 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import modalButtonMain from "@/ux-components/modal-button-main/modal-button-main";
+import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
 
diff --git a/src/ux-components/modal-button-main/modal-button-main.spec.js b/src/digital-components/modal/ux-components/modal-button-main/modal-button-main.spec.js
similarity index 100%
rename from src/ux-components/modal-button-main/modal-button-main.spec.js
rename to src/digital-components/modal/ux-components/modal-button-main/modal-button-main.spec.js
diff --git a/src/ux-components/modal-button-main/modal-button-main.vue b/src/digital-components/modal/ux-components/modal-button-main/modal-button-main.vue
similarity index 100%
rename from src/ux-components/modal-button-main/modal-button-main.vue
rename to src/digital-components/modal/ux-components/modal-button-main/modal-button-main.vue
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index a119f1d81..9dc35f3d3 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -369,6 +369,9 @@ export default {
                     console.log("Unable to load Google Places API script");
                 });
         },
+        resetAlerts() {
+            this.displayVerificationWarning = false;
+        },
     },
     mounted() {
         this.setupAddressLookup();
diff --git a/src/layouts/service-location/service-type-question/service-type-question.spec.js b/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
similarity index 94%
rename from src/layouts/service-location/service-type-question/service-type-question.spec.js
rename to src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
index 13b727c54..b6487715e 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.spec.js
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import serviceTypeQuestion from "./service-type-question";
+import appointmentTypeQuestion from "./appointment-type-question";
 
 const mockCmsContent = {
     QuestionText: "Choose a service option:",
@@ -29,7 +29,7 @@ const mockCmsContent = {
     ],
 };
 
-const cmsWidgetName = "ServiceTypeQuestionWidget";
+const cmsWidgetName = "AppointmentTypeQuestionWidget";
 const mockMixin = {
     methods: {
         getCmsContent: jest.fn((widgetName, cmsFieldName) => {
@@ -42,7 +42,7 @@ const mockMixin = {
     },
 };
 
-describe("service-type-question.vue", () => {
+describe("appointment-type-question.vue", () => {
     it("Should display all options if both in-shop and mobile are available", async () => {
         // Arrange/Act
         const { wrapper } = setupMocks({
@@ -178,8 +178,8 @@ function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {
     if (props) resultingMountOptions.propsData = props;
 
     const wrapper = isShallowMount
-        ? shallowMount(serviceTypeQuestion, resultingMountOptions)
-        : mount(serviceTypeQuestion, resultingMountOptions);
+        ? shallowMount(appointmentTypeQuestion, resultingMountOptions)
+        : mount(appointmentTypeQuestion, resultingMountOptions);
 
     return { wrapper };
 }
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
similarity index 97%
rename from src/layouts/service-location/service-type-question/service-type-question.vue
rename to src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 4f1a36ac7..8985f12e7 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div class="service-type-question" aria-live="polite">
+        <div class="appointment-type-question" aria-live="polite">
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersToDisplay"
@@ -18,7 +18,7 @@
 import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
-    name: "service-type-question",
+    name: "appointment-type-question",
     props: {
         modelValue: String,
         groupName: String,
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 bbed9923d..acc0c9787 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
@@ -181,7 +181,7 @@ export default {
             this.$refs[this.modalName].resetButtonStyle();
         },
         resetAlerts() {
-            this.$refs.addressQuestions.displayVerificationWarning = false;
+            this.$refs.addressQuestions.resetAlerts();
         },
         async setMobileLocation() {
             // Validate the Zip Code
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d8167ad57..cfd5a47cf 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -16,20 +16,25 @@
             <alert
                 class="my-4"
                 cmsWidgetName="AlertMilitaryBaseZipWidget"
-                v-if="showMilitaryZipAlert"
+                v-if="displayMilitaryZipAlert"
                 alertClass="alert-warning" />
-            <serviceTypeQuestion
-                v-model="selectedServiceType"
+            <alert
+                class="my-4"
+                cmsWidgetName="AlertNoServiceWarningWidget"
+                v-if="displayNoServiceWarningAlert"
+                alertClass="alert-warning" />
+            <appointmentTypeQuestion
+                v-model="selectedAppointmentType"
                 :isGlassServiceableInshop="isGlassServiceableInshop"
                 :isRecalibrationServiceableInshop="isRecalibrationServiceableInshop"
                 :isGlassServiceableMobile="isGlassServiceableMobile"
                 :isRecalibrationServiceableMobile="isRecalibrationServiceableMobile"
-                ref="serviceTypeQuestion"
-                groupName="serviceTypeQuestion"
-                cmsWidgetName="ServiceTypeQuestionWidget"
+                ref="appointmentTypeQuestion"
+                groupName="appointmentTypeQuestion"
+                cmsWidgetName="AppointmentTypeQuestionWidget"
                 validationRules="option-required" />
             <mobileLocationModalQuestions
-                v-show="selectedServiceType === 'Mobile'"
+                v-show="selectedAppointmentType === 'Mobile'"
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
                 @updated-mobile-fee-part="setMobileFeePart"
@@ -39,7 +44,7 @@
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
             <textboxQuestion
-                v-show="selectedServiceType === 'Mobile'"
+                v-show="selectedAppointmentType === 'Mobile'"
                 ref="mobileLocationQuestionsError"
                 v-model="mobileLocationValidationField"
                 validationRules="mobile-location-required"
@@ -60,7 +65,7 @@
 import alert from "@/ux-components/alert/alert";
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
 import mobileLocationModalQuestions from "@/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions";
-import serviceTypeQuestion from "@/layouts/service-location/service-type-question/service-type-question";
+import appointmentTypeQuestion from "@/layouts/service-location/appointment-type-question/appointment-type-question";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
@@ -100,7 +105,7 @@ export default {
             isRecalibrationServiceableMobile: null,
             mobileFeePart: null,
             zipContainsMilitaryBase: false,
-            selectedServiceType: null,
+            selectedAppointmentType: null,
             mobileLocationValidationField: null,
         };
     },
@@ -140,6 +145,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            console.log(resultMap.serviceabilityDetails);
             vm.setData(
                 resultMap.zipCodeData,
                 resultMap.serviceabilityDetails,
@@ -189,7 +195,7 @@ export default {
                 this.mobileLocationValidationField = "isValid";
             },
         },
-        showMilitaryZipAlert() {
+        displayMilitaryZipAlert() {
             const isZipServiceableMobile =
                 this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
 
@@ -262,7 +268,7 @@ export default {
     components: {
         alert,
         serviceZipModalQuestion,
-        serviceTypeQuestion,
+        appointmentTypeQuestion,
         mobileLocationModalQuestions,
         funnelHeader,
         funnelFooter,
diff --git a/src/store/index.js b/src/store/index.js
index 7b6b64283..77289926b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1674,12 +1674,3 @@ function getLineItemQueryStringForPricing(lineItems) {
         })
         .join("");
 }
-
-function getLineItemQueryStringForServiceability(lineItems) {
-    return lineItems
-        .map((lineItem) => {
-            let queryStringSnippet = `&lineItems=${lineItem.partNumber}`;
-            return queryStringSnippet;
-        })
-        .join("");
-}

From c94137f795bc6dbceef4da44ac214fbb5a662059 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 30 Mar 2023 09:01:14 -0400
Subject: [PATCH 59/78] Add tests.

---
 .../service-location/service-location.spec.js | 381 ++++++++++++++++++
 .../service-location/service-location.vue     |   3 +-
 2 files changed, 383 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 2a056c4d1..4757c6a78 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 { getServiceabilityDetails } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 // Define Mocks
 jest.mock("@/helpers/cms-content-helper", () => ({
@@ -437,6 +438,386 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
         });
     });
+
+    describe("serviceability logic", () => {
+        describe("should be logical AND when recalibration is defined.", () => {
+            test("T & T => T", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+            });
+
+            test("T & F => F", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+            });
+
+            test("F & T => F", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+            });
+
+            test("F & F => F", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+            });
+
+            test("isServiceableMobileOnly should be true if mobile is true and inshop is false.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(true);
+            });
+
+            test("isServiceableMobileOnly should be false if mobile is false.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(false);
+            });
+
+            test("isServiceableMobileOnly should be false if inShop is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(false);
+            });
+        });
+
+        describe("should be based only on glass serviceability if recalibration is not defined.", () => {
+            test("Should return true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: null,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: null,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+            });
+
+            test("Should return false", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: null,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: null,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+            });
+
+            test("isServiceableMobileOnly should be true if mobile is true and inshop is false.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: null,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: null,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(true);
+            });
+
+            test("isServiceableMobileOnly should be false if mobile is false", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: null,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: null,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(false);
+            });
+
+            test("isServiceableMobileOnly should be false if inShop is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: null,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: null,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.isServiceableMobileOnly).toEqual(false);
+            });
+        });
+
+        describe("should properly display alerts.", () => {
+            test("Should show mobile-only error if only mobile is available.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent('[data-test="mobileOnlyAlert"]');
+
+                // Assert
+                expect(alertComponent.exists()).toBe(true);
+            });
+
+            test("Should not show mobile-only error if not mobile-only.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent('[data-test="mobileOnlyAlert"]');
+
+                // Assert
+                expect(alertComponent.exists()).toBe(false);
+            });
+        });
+    });
 });
 
 function setupMocks({ mountOptionsMockData = {} }) {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 774aafd87..4d591edcc 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -22,7 +22,8 @@
                 class="my-4"
                 cmsWidgetName="AlertMobileOnlyWidget"
                 v-if="isServiceableMobileOnly"
-                alertClass="alert-warning" />
+                alertClass="alert-warning"
+                data-test="mobileOnlyAlert" />
             <serviceTypeQuestion
                 v-model="selectedServiceType"
                 :isServiceableMobile="isServiceableMobile"

From 5bf1a416a57eec857dbe8899935c3d0388b0cb50 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 09:37:30 -0400
Subject: [PATCH 60/78] Ready for unit tests

---
 src/layouts/service-location/service-location.vue | 9 ++++-----
 src/store/index.js                                | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3a38ab2b4..e0a736a43 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -20,8 +20,8 @@
                 alertClass="alert-warning" />
             <alert
                 class="my-4"
-                cmsWidgetName="AlertNoServiceWarningWidget"
-                v-if="displayNoServiceWarningAlert"
+                cmsWidgetName="AlertNoShopsWidget"
+                v-if="displayNoShopsAlert"
                 alertClass="alert-warning" />
             <appointmentTypeQuestion
                 v-model="selectedAppointmentType"
@@ -145,7 +145,6 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            console.log(resultMap.serviceabilityDetails);
             vm.setData(
                 resultMap.zipCodeData,
                 resultMap.serviceabilityDetails,
@@ -201,7 +200,7 @@ export default {
 
             return this.zipContainsMilitaryBase && isZipServiceableMobile;
         },
-        displayNoServiceWarningAlert() {
+        displayNoShopsAlert() {
             let mobileAvailable;
             if (this.IsRecalibrationServiceableMobile == null) {
                 mobileAvailable = this.isGlassServiceableMobile;
@@ -213,7 +212,7 @@ export default {
             const inshopAvailable =
                 this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
 
-            return inshopAvailable && !mobileAvailable;
+            return !inshopAvailable && !mobileAvailable;
         },
     },
     methods: {
diff --git a/src/store/index.js b/src/store/index.js
index 77289926b..b9d43e2f4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -931,10 +931,10 @@ export const actions = {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
-            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
             //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
-            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
+            //endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });
 
         // TODO: Restore this when CSR-1104 is 100% complete

From 322c52c9759c7cbc6a95335ad1c5707eb104d9a3 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 11:01:49 -0400
Subject: [PATCH 61/78] Completed unit tests

---
 .../service-location/service-location.spec.js | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 27f431884..b0a06b16f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -625,6 +625,114 @@ describe("service-location.vue", () => {
                 expect(wrapper.vm.isServiceableInshop).toEqual(true);
                 expect(wrapper.vm.displayServiceableMobileOnly).toEqual(false);
             });
+
+            test("displayNoShopsAlert should be true if inShop is false and mobile is false", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.displayNoShopsAlert).toEqual(true);
+            });
+
+            test("displayNoShopsAlert should be false if inShop is true and mobile is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.displayNoShopsAlert).toEqual(false);
+            });
+
+            test("displayNoShopsAlert should be false if inShop is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.displayNoShopsAlert).toEqual(false);
+            });
+
+            test("displayNoShopsAlert should be false if mobile is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.displayNoShopsAlert).toEqual(false);
+            });
         });
 
         describe("should be based only on glass serviceability if recalibration is not defined.", () => {
@@ -816,6 +924,60 @@ describe("service-location.vue", () => {
                 // Assert
                 expect(alertComponent.exists()).toBe(false);
             });
+
+            test("Should show no-shop error if no shops are available.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent({ ref: "alertNoShops" });
+
+                // Assert
+                expect(alertComponent.exists()).toBe(true);
+            });
+
+            test("Should not show no-shop error if shops are available.", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent({ ref: "alertNoShops" });
+
+                // Assert
+                expect(alertComponent.exists()).toBe(false);
+            });
         });
     });
 });

From 26256cfd50e95177ea1d83f5793a2410a1568373 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 11:12:25 -0400
Subject: [PATCH 62/78] Changed serviceType under serviceLocation to
 appointmentType

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

diff --git a/src/store/index.js b/src/store/index.js
index b9d43e2f4..2dbc7b2cc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -43,7 +43,7 @@ const getDefaultState = () => {
                 state: null,
                 zipCode: null,
                 zipCodeCtu: null,
-                serviceType: null,
+                appointmentType: null,
             },
             customer: {
                 emailAddress: null,

From 61cc1d7862b94922dab2466d66f50a6c848e2b62 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 13:24:06 -0400
Subject: [PATCH 63/78] Quick suggested change from Chloe

---
 src/layouts/service-location/service-location.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 7f8430f04..2fb08adef 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -221,18 +221,7 @@ export default {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
         displayNoShopsAlert() {
-            let mobileAvailable;
-            if (this.IsRecalibrationServiceableMobile == null) {
-                mobileAvailable = this.isGlassServiceableMobile;
-            } else {
-                mobileAvailable =
-                    this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
-            }
-
-            const inshopAvailable =
-                this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
-
-            return !inshopAvailable && !mobileAvailable;
+            return !inshoisServiceableInshoppAvailable && !isServiceableMobile;
         },
     },
     methods: {

From b5970c645aa4b1d14593124fbafb016944c58ef9 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 13:32:09 -0400
Subject: [PATCH 64/78] Quick suggested change from Chloe 2

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

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2fb08adef..6f004e1de 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -221,7 +221,7 @@ export default {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
         displayNoShopsAlert() {
-            return !inshoisServiceableInshoppAvailable && !isServiceableMobile;
+            return !isServiceableInshop && !isServiceableMobile;
         },
     },
     methods: {

From 23088294287edbe687bb46643f2a278198ea9af4 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 13:33:25 -0400
Subject: [PATCH 65/78] Quick suggested change from Chloe 3

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

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6f004e1de..69b4f4926 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -221,7 +221,7 @@ export default {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
         displayNoShopsAlert() {
-            return !isServiceableInshop && !isServiceableMobile;
+            return !this.isServiceableInshop && !this.isServiceableMobile;
         },
     },
     methods: {

From 1519315cf18059060f6a3276e34905d93c729dbc Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 13:56:11 -0400
Subject: [PATCH 66/78] Now set to toggle the modal in code rather than markup.

---
 .../funnel-header/menu-modal/menu-modal.vue   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index cc06b2710..65d0d1902 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -4,8 +4,7 @@
             class="menu-button"
             type="button"
             :class="[isActive ? 'active' : '']"
-            data-bs-toggle="modal"
-            data-bs-target="#footerModal"
+            @click="toggleModal"
             aria-label="Hamburger Menu (modal window)">
             <div class="bar1"></div>
             <div class="bar2"></div>
@@ -22,19 +21,6 @@
         aria-hidden="true"
         v-on="{ 'show.bs.modal': show, 'hide.bs.modal': hide }"
         :style="`height: calc(100% - ${currentFooterAndHeaderHeight}px);`">
-        <div class="menu-modal-container">
-            <button
-                class="menu-button"
-                type="button"
-                :class="[isActive ? 'active' : '']"
-                data-bs-toggle="modal"
-                data-bs-target="#footerModal"
-                aria-label="Hamburger Menu (modal window)">
-                <div class="bar1"></div>
-                <div class="bar2"></div>
-                <div class="bar3"></div>
-            </button>
-        </div>
         <div class="modal-dialog modal-fullscreen">
             <div class="modal-content">
                 <div class="modal-header visually-hidden">
@@ -79,6 +65,8 @@
 
 <script>
 import textLink from "@/ux-components/text-link/text-link";
+import { Modal } from "bootstrap";
+
 export default {
     name: "menuModal",
     data() {
@@ -88,6 +76,19 @@ export default {
         };
     },
     methods: {
+        toggleModal() {
+            if (this.isActive) {
+                this.closeModal();
+            }
+
+            this.openModal();
+        },
+        openModal() {
+            Modal.getOrCreateInstance(document.getElementById("footerModal")).show();
+        },
+        closeModal() {
+            Modal.getInstance(document.getElementById("footerModal")).hide();
+        },
         show() {
             this.currentFooterAndHeaderHeight = this.getFooterInfoBoxHeight() + 72;
             this.isActive = true;

From 635c4a28558289c94ae23988b45cf601873a90fb Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 30 Mar 2023 14:05:10 -0400
Subject: [PATCH 67/78] Fix in toggleModal

---
 src/fmg-components/funnel-header/menu-modal/menu-modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index 65d0d1902..ccf2c38e0 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -79,9 +79,9 @@ export default {
         toggleModal() {
             if (this.isActive) {
                 this.closeModal();
+            } else {
+                this.openModal();
             }
-
-            this.openModal();
         },
         openModal() {
             Modal.getOrCreateInstance(document.getElementById("footerModal")).show();

From f18032d92ef7a7c9c65d105998f8e70c3dc11eac Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 30 Mar 2023 16:37:56 -0400
Subject: [PATCH 68/78] Initial iteration - added modals and some of the logic.

---
 .../service-location/service-location.vue     | 26 +++++++++++++++++++
 src/store/index.js                            |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 69b4f4926..6c8ef58d1 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -25,6 +25,18 @@
                 cmsWidgetName="AlertMobileOnlyWidget"
                 v-if="displayServiceableMobileOnly"
                 alertClass="alert-warning" />
+            <alert
+                ref="alertRecalNoMobile"
+                class="my-4"
+                cmsWidgetName="AlertRecalNoMobileWidget"
+                v-if="displayRecalibrationWarning"
+                alertClass="alert-warning" />
+            <alert
+                ref="alertInshopOnly"
+                class="my-4"
+                cmsWidgetName="AlertInshopOnlyWidget"
+                v-if="displayServiceableInshopOnly"
+                alertClass="alert-warning" />
             <alert
                 ref="alertNoShops"
                 class="my-4"
@@ -56,6 +68,7 @@
                 validationRules="mobile-location-required"
                 hideInput
                 centerErrorMessage />
+            <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -78,6 +91,7 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form, defineRule } from "vee-validate";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -217,6 +231,17 @@ export default {
                 return this.isGlassServiceableInshop;
             }
         },
+        displayRecalibrationWarning() {
+            //TODO: Check lineItems for static or dual recalibration.
+            return false;
+        },
+        displayServiceableInshopOnly() {
+            return (
+                !this.displayRecalibrationWarning &&
+                this.isServiceableInshop &&
+                !this.isServiceableMobile
+            );
+        },
         displayServiceableMobileOnly() {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
@@ -298,6 +323,7 @@ export default {
         Form,
         loadingModal,
         textboxQuestion,
+        contentGroupModal,
     },
 };
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 2dbc7b2cc..abcf231f0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -931,8 +931,8 @@ export const actions = {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
-            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
-            //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
+            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
             //endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });

From 40bc9b9a75321b32f81b805b6abad5e9f5bb551d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 31 Mar 2023 10:31:25 -0400
Subject: [PATCH 69/78] Completed unit tests

---
 .../service-location/service-location.spec.js | 79 +++++++++++++++++++
 .../service-location/service-location.vue     | 11 ++-
 src/store/index.js                            |  4 +-
 3 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index b0a06b16f..1cea19cb9 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -323,6 +323,30 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
         });
 
+        test("resets appointment type selection when service zip code is updated by service zip modal", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Inshop";
+
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
+        });        
+
         test("displays military zip message when zip is updated", () => {
             // Arrange
             const { wrapper } = setupMocks({});
@@ -437,6 +461,61 @@ describe("service-location.vue", () => {
             // Assert
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
         });
+  
+        test("resets appointment type selection when service zip code is updated by mobile location modal when Mobile is not selected", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Dropoff";
+
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
+        });
+        
+        test("does not reset appointment type selection when service zip code is updated by mobile location modal when Mobile is selected", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            const appointmentTypeMobile = "Mobile";
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const mobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "555 Some Street",
+                    apartmentNumberOrBusinessName: "",
+                    city: "Westerville",
+                    state: "OH",
+                    zipCode: "43081",
+                },
+                isVehicleProtected: "YesAnswer",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Mobile";
+
+            const mobileLocationComponent = wrapper.findComponent({
+                ref: "mobileLocationModalQuestions",
+            });
+
+            // Act
+            mobileLocationComponent.vm.$emit("update:modelValue", mobileLocationQuestions);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(appointmentTypeMobile);
+        }); 
     });
 
     describe("serviceability logic", () => {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 69b4f4926..49572dbda 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -169,6 +169,7 @@ export default {
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
                     this.resetMobileLocation();
+                    this.selectedAppointmentType = null;
                 }
 
                 this.state = newValue.state;
@@ -198,11 +199,12 @@ export default {
                 this.isVehicleProtected = newValue.isVehicleProtected;
 
                 this.mobileLocationValidationField = "isValid";
+
+                if ((newValue.zipCode !== this.zipCode) && !this.selectedAppointmentType == "Mobile") {
+                    this.selectedAppointmentType = null;
+                }
             },
         },
-        displayMilitaryZipAlert() {
-            return this.zipContainsMilitaryBase && this.isServiceableMobile;
-        },
         isServiceableMobile() {
             if (this.isRecalibrationServiceableMobile !== null) {
                 return this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
@@ -217,6 +219,9 @@ export default {
                 return this.isGlassServiceableInshop;
             }
         },
+        displayMilitaryZipAlert() {
+            return this.zipContainsMilitaryBase && this.isServiceableMobile;
+        },
         displayServiceableMobileOnly() {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
diff --git a/src/store/index.js b/src/store/index.js
index 2dbc7b2cc..6da7550a2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -931,10 +931,10 @@ export const actions = {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
-            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
             //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
-            //endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
+            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });
 
         // TODO: Restore this when CSR-1104 is 100% complete

From b06ee56d27661752574d5c4f6ba6405e2cfc19bf Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 31 Mar 2023 13:41:46 -0400
Subject: [PATCH 70/78] Prettified

---
 src/layouts/service-location/service-location.spec.js | 8 ++++----
 src/layouts/service-location/service-location.vue     | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 1cea19cb9..28a8ca473 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -345,7 +345,7 @@ describe("service-location.vue", () => {
 
             // Assert
             expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
-        });        
+        });
 
         test("displays military zip message when zip is updated", () => {
             // Arrange
@@ -461,7 +461,7 @@ describe("service-location.vue", () => {
             // Assert
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
         });
-  
+
         test("resets appointment type selection when service zip code is updated by mobile location modal when Mobile is not selected", () => {
             // Arrange
             const { wrapper } = setupMocks({});
@@ -485,7 +485,7 @@ describe("service-location.vue", () => {
             // Assert
             expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
         });
-        
+
         test("does not reset appointment type selection when service zip code is updated by mobile location modal when Mobile is selected", () => {
             // Arrange
             const { wrapper } = setupMocks({});
@@ -515,7 +515,7 @@ describe("service-location.vue", () => {
 
             // Assert
             expect(wrapper.vm.selectedAppointmentType).toStrictEqual(appointmentTypeMobile);
-        }); 
+        });
     });
 
     describe("serviceability logic", () => {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 49572dbda..ac1334fcb 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -200,7 +200,10 @@ export default {
 
                 this.mobileLocationValidationField = "isValid";
 
-                if ((newValue.zipCode !== this.zipCode) && !this.selectedAppointmentType == "Mobile") {
+                if (
+                    newValue.zipCode !== this.zipCode &&
+                    !this.selectedAppointmentType == "Mobile"
+                ) {
                     this.selectedAppointmentType = null;
                 }
             },

From 8daa078c299967c324a0dac4fc2abfd1185b600a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 4 Apr 2023 15:11:38 -0400
Subject: [PATCH 71/78] Add text link rendering to alert + hook into opening
 modal.

---
 .../service-location/service-location.vue     |  6 ++++-
 src/ux-components/alert/alert.vue             | 23 ++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6c8ef58d1..846a1731e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -30,6 +30,7 @@
                 class="my-4"
                 cmsWidgetName="AlertRecalNoMobileWidget"
                 v-if="displayRecalibrationWarning"
+                @text-link-clicked="openModalAction"
                 alertClass="alert-warning" />
             <alert
                 ref="alertInshopOnly"
@@ -233,7 +234,7 @@ export default {
         },
         displayRecalibrationWarning() {
             //TODO: Check lineItems for static or dual recalibration.
-            return false;
+            return true;
         },
         displayServiceableInshopOnly() {
             return (
@@ -311,6 +312,9 @@ export default {
         forwardButtonAction() {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
+        openModalAction(modalName) {
+            this.$refs[modalName].openModal();
+        },
     },
     components: {
         alert,
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index cecbad90c..62c4b4d99 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -11,12 +11,11 @@
         <template v-for="paragraph in splitAlertCopyForParagraphTag" :key="paragraph">
             <p
                 class="m-0 text-body small"
-                v-if="!doesCopyContainRouterLink(paragraph)"
+                v-if="!doesCopyContainRouterLink(paragraph) && !doesCopyContainTextLink(paragraph)"
                 v-html="paragraph"></p>
             <p class="m-0 text-body small" v-else>
                 <template v-for="copy in splitCopyOnCMSPlaceHolder(paragraph)" :key="copy">
-                    <span v-if="!doesCopyContainRouterLink(copy)" v-html="copy"></span>
-                    <span v-else>
+                    <span v-if="doesCopyContainRouterLink(copy)">
                         <router-link
                             :to="{
                                 query: { [pageQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
@@ -25,6 +24,18 @@
                             >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
                         >
                     </span>
+                    <span v-else-if="doesCopyContainTextLink(copy)">
+                        <textLink
+                            linkType="text"
+                            :text="getRouterLinkDisplayTextFromCopy(copy)"
+                            href="#!"
+                            @click-event="
+                                $emit('textLinkClicked', getRouterLinkRouteFromCopy(copy))
+                            "
+                            :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
+                            aria-label="Modal window" />
+                    </span>
+                    <span v-else v-html="copy"></span>
                 </template>
             </p>
         </template>
@@ -40,11 +51,13 @@
 <script>
 import {
     doesCopyContainRouterLink,
+    doesCopyContainTextLink,
     splitCopyOnCMSPlaceHolder,
     getRouterLinkRouteFromCopy,
     getRouterLinkDisplayTextFromCopy,
     splitCMSCopyOnParagraphTag,
 } from "@/helpers/cms-content-helper";
+import textLink from "@/ux-components/text-link/text-link";
 import { applicationConfig } from "@/constants/application-config";
 
 export default {
@@ -96,6 +109,7 @@ export default {
     methods: {
         doesCopyContainRouterLink,
         splitCopyOnCMSPlaceHolder,
+        doesCopyContainTextLink,
         getRouterLinkRouteFromCopy,
         getRouterLinkDisplayTextFromCopy,
         ensureAlertIsInViewPort() {
@@ -120,6 +134,9 @@ export default {
     mounted() {
         this.ensureAlertIsInViewPort();
     },
+    components: {
+        textLink,
+    },
 };
 </script>
 

From f87a64380bd85d3ca58ecbb849dcaa6e7d3b720c Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 4 Apr 2023 16:38:49 -0400
Subject: [PATCH 72/78] Add recalibration-checking logic.

---
 src/layouts/service-location/service-location.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 846a1731e..577120c85 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -232,9 +232,13 @@ export default {
                 return this.isGlassServiceableInshop;
             }
         },
+        isDualOrStaticRecalibration() {
+            const supportingItems = store.getters.lineItems.supportingItems;
+            
+            return supportingItems.some((item) => item.partNumber === "RECAL STATIC" || item.partNumber === "RECAL DUAL");
+        },
         displayRecalibrationWarning() {
-            //TODO: Check lineItems for static or dual recalibration.
-            return true;
+            return this.isDualOrStaticRecalibration;
         },
         displayServiceableInshopOnly() {
             return (

From 572831254d60ee1e3a0bb7c245971f1fade06409 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 5 Apr 2023 08:57:01 -0400
Subject: [PATCH 73/78] Formatting

---
 src/layouts/service-location/service-location.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 577120c85..800f7ee52 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -234,8 +234,10 @@ export default {
         },
         isDualOrStaticRecalibration() {
             const supportingItems = store.getters.lineItems.supportingItems;
-            
-            return supportingItems.some((item) => item.partNumber === "RECAL STATIC" || item.partNumber === "RECAL DUAL");
+
+            return supportingItems.some(
+                (item) => item.partNumber === "RECAL STATIC" || item.partNumber === "RECAL DUAL"
+            );
         },
         displayRecalibrationWarning() {
             return this.isDualOrStaticRecalibration;

From fb0280fa1820e25a3c651a4f4e09dda54036073a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 5 Apr 2023 10:56:34 -0400
Subject: [PATCH 74/78] CSR-1129: create schedule page, put date picker on it

---
 jest.config.js                                |   3 +-
 src/constants/error-messages.js               |   1 +
 .../date-picker/date-picker.vue               | 473 +++++++++---------
 src/router/index.js                           |   1 -
 src/router/router-constants/fmgPage-values.js |   1 +
 .../router-constants/navigation-scenarios.js  |   3 +
 src/router/router-constants/routing-table.js  |  13 +
 7 files changed, 260 insertions(+), 235 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index ceeb6f781..3186939df 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -15,9 +15,10 @@ module.exports = {
     "!src/layouts/vehicle-damage/windshield-options/windshield-options.vue",
     "!src/layouts/reveal/**/*.vue",
     "!src/ux-components/text-link/**/*.vue",
-    "!src/common-components/date-picker/**/*.vue", // Temp until unit tests completed
+    "!src/common-components/date-picker/**/*.vue", // git statuTemp until unit tests completed
     "!src/layouts/vin-lookup/**/*.vue", //Temporary for Quote page testing
     "!src/common-components/funnel-header/menu-modal/**/*.vue",
+    "!src/layouts/schedule/*.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/constants/error-messages.js b/src/constants/error-messages.js
index 3c3f776c1..810929d20 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -26,6 +26,7 @@ const errorMessages = {
     OPTION_REQUIRED: "Please select an option",
     VEHICLE_REQUIRED: "Please select a vehicle",
     MOBILE_LOCATION_REQUIRED: "Please enter your service address",
+    DATE_REQUIRED: "Please select a date",
 };
 
 export { errorMessages };
diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index e3b5ff5d1..813708b66 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="date-picker" :class="calendarViewDirection">
+    <div class="date-picker text-center" :class="calendarViewDirection">
         <fieldset v-if="months">
             <legend class="sr-only">Date Picker</legend>
             <div
@@ -51,7 +51,7 @@
         <button
             v-if="calendarViewDirection === 'future'"
             type="button"
-            class="btn-link"
+            class="btn btn-link"
             @click="goForward">
             View more dates
         </button>
@@ -371,92 +371,106 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.calendar-grid-container {
-    margin: 0 auto;
-    max-width: 414px;
-    display: grid;
-    grid-template-columns: repeat(7, 1fr);
-    justify-content: center;
-    align-items: center;
-    padding: 4px;
-
-    .grid-item {
-        text-align: center;
-        margin: 10%;
-
-        &.first-day-,
-        &.first-day-0 {
-            grid-column-start: 1;
-        }
-        &.first-day-1 {
-            grid-column-start: 2;
-        }
-        &.first-day-2 {
-            grid-column-start: 3;
-        }
-        &.first-day-3 {
-            grid-column-start: 4;
-        }
-        &.first-day-4 {
-            grid-column-start: 5;
-        }
-        &.first-day-5 {
-            grid-column-start: 6;
-        }
-        &.first-day-6 {
-            grid-column-start: 7;
-        }
-    }
-
-    .month-year {
-        grid-area: 1 / 1 / 2 / 5;
-        text-transform: uppercase;
-        font-weight: 300;
-        letter-spacing: 0.75px;
-    }
-    .legend {
-        grid-area: 1 / 5 / 2 / 8;
-        .legend-circle {
-            border-radius: 50%;
-            width: 16px;
-            height: 16px;
-            background-color: $blue-100;
-            border: 1px solid $blue;
-        }
-    }
-    .nav-back,
-    .nav-forward {
-        display: none;
-    }
-
-    .radio-wrapper {
-        position: relative;
-        display: flex;
+.date-picker {
+    .calendar-grid-container {
+        margin: 0 auto;
+        max-width: 414px;
+        display: grid;
+        grid-template-columns: repeat(7, 1fr);
         justify-content: center;
         align-items: center;
-        outline: none;
+        padding: 4px;
 
-        input[type="radio"] {
-            position: absolute; //override bootstrap
-            height: 0;
-            opacity: 0;
+        .grid-item {
+            text-align: center;
+            margin: 10%;
 
-            &:focus-visible + label {
-                box-shadow: 0 0 0 2.5px $blue;
+            &.first-day-,
+            &.first-day-0 {
+                grid-column-start: 1;
             }
+            &.first-day-1 {
+                grid-column-start: 2;
+            }
+            &.first-day-2 {
+                grid-column-start: 3;
+            }
+            &.first-day-3 {
+                grid-column-start: 4;
+            }
+            &.first-day-4 {
+                grid-column-start: 5;
+            }
+            &.first-day-5 {
+                grid-column-start: 6;
+            }
+            &.first-day-6 {
+                grid-column-start: 7;
+            }
+        }
 
-            &:focus + label,
-            &:checked:focus + label {
-                box-shadow: 0 0 0 3px #fff, 0 0 0 5.5px #1574a1;
-                background-color: $blue;
-                color: $white;
-                &.past-day {
-                    box-shadow: none;
-                    background-color: transparent;
-                    color: $gray-500;
-                    font-weight: normal;
+        .month-year {
+            grid-area: 1 / 1 / 2 / 5;
+            text-transform: uppercase;
+            font-weight: 300;
+            letter-spacing: 0.75px;
+        }
+        .legend {
+            grid-area: 1 / 5 / 2 / 8;
+            .legend-circle {
+                border-radius: 50%;
+                width: 16px;
+                height: 16px;
+                background-color: $blue-100;
+                border: 1px solid $blue;
+            }
+        }
+        .nav-back,
+        .nav-forward {
+            display: none;
+        }
+
+        .radio-wrapper {
+            position: relative;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            outline: none;
+
+            input[type="radio"] {
+                position: absolute; //override bootstrap
+                height: 0;
+                opacity: 0;
+
+                &:focus-visible + label {
+                    box-shadow: 0 0 0 2.5px $blue;
                 }
-                &.current-day {
+
+                &:focus + label,
+                &:checked:focus + label {
+                    box-shadow: 0 0 0 3px #fff, 0 0 0 5.5px #1574a1;
+                    background-color: $blue;
+                    color: $white;
+                    &.past-day {
+                        box-shadow: none;
+                        background-color: transparent;
+                        color: $gray-500;
+                        font-weight: normal;
+                    }
+                    &.current-day {
+                        &:after {
+                            background-color: $white;
+                        }
+                        .first-day {
+                            color: $white;
+                        }
+                    }
+                }
+
+                &:checked + label {
+                    color: $white;
+                    background: $blue;
+                    box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue;
                     &:after {
                         background-color: $white;
                     }
@@ -466,169 +480,162 @@ export default {
                 }
             }
 
-            &:checked + label {
-                color: $white;
-                background: $blue;
-                box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue;
-                &:after {
-                    background-color: $white;
-                }
-                .first-day {
-                    color: $white;
-                }
-            }
-        }
-
-        .first-day {
-            position: absolute;
-            font-size: 9px;
-            font-weight: 500;
-            color: $gray-600;
-            top: 0;
-            z-index: 1;
-        }
-
-        label {
-            position: relative;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            width: 40px;
-            height: 40px;
-            min-width: 40px;
-            border-radius: 50%;
-
-            span {
-                &.small {
-                    font-size: 0.75rem;
-                    color: $gray-550;
-                }
+            .first-day {
+                position: absolute;
+                font-size: 9px;
+                font-weight: 500;
+                color: $gray-600;
+                top: 0;
+                z-index: 1;
             }
 
-            &:hover,
-            &:checked {
-                @include media-breakpoint-up(sm) {
-                    box-shadow: 0 0 0 4px transparent;
-                    background-color: $blue;
-                    color: $white;
-                    &:after {
-                        background-color: $white;
-                    }
-                }
-                cursor: pointer;
-                &.current-day {
-                    + .first-day {
-                        color: $white;
-                    }
-                }
-                .first-day {
-                    color: $white;
-                }
-            }
-            + p {
-                display: none;
-            }
-        }
-
-        &.selectable-day {
             label {
-                color: $blue;
-                background-color: $blue-100;
-                border: 1px solid $blue;
-            }
-        }
-        &.past-day,
-        &.future-day,
-        &.unavailable-day {
-            label {
-                color: $gray-500;
-                background-color: transparent;
-                border: 1px solid transparent;
-                pointer-events: none;
-            }
-        }
-        &.current-day {
-            label {
-                &:after {
-                    content: "";
-                    width: 0.25rem;
-                    height: 0.25rem;
-                    border-radius: 50%;
-                    background-color: $blue;
-                    position: absolute;
-                    top: 28px;
-                }
-                .first-day {
-                    color: $blue;
-                }
-            }
-        }
-    }
-
-    &.initial-view {
-        &.month-hidden {
-            display: none;
-        }
-        .day-hidden {
-            display: none;
-        }
-    }
-}
-.past {
-    .calendar-grid-container {
-        .month-year {
-            grid-area: 1 / 1 / 2 / 6;
-        }
-        .nav-forward {
-            grid-area: 1 / 7 / 2 / 8;
-            display: flex;
-            justify-content: flex-end;
-            button {
-                &:after {
-                    content: "";
-                    position: absolute;
-                    width: 7px;
-                    height: 12px;
-                    background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.66831 5.99879C6.66955 6.17554 6.60074 6.34558 6.47695 6.47168L1.15501 11.8017C1.02812 11.9287 0.85603 12 0.676587 12C0.497145 12 0.325053 11.9287 0.198168 11.8017C0.0712831 11.6748 7.268e-09 11.5026 8.07183e-09 11.3231C8.87567e-09 11.1436 0.0712831 10.9714 0.198168 10.8445L5.05126 5.99879L0.198168 1.14736C0.0725521 1.02042 0.00248585 0.848755 0.00338306 0.670131C0.00428028 0.491506 0.0760674 0.320554 0.202952 0.194881C0.329837 0.0692091 0.501426 -0.000888818 0.679971 9.54485e-06C0.858515 0.000906955 1.02939 0.0727263 1.15501 0.199668L6.47312 5.52399C6.59843 5.65017 6.66862 5.82092 6.66831 5.99879Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
-                }
-            }
-        }
-        .nav-back {
-            grid-area: 1 / 6 / 2 / 7;
-            display: flex;
-            justify-content: flex-end;
-            button {
-                &:after {
-                    content: "";
-                    position: absolute;
-                    width: 7px;
-                    height: 12px;
-                    background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0.331685 6.00121C0.330445 5.82446 0.399256 5.65442 0.523053 5.52832L5.84499 0.198256C5.97188 0.0713149 6.14397 -8.63821e-08 6.32341 -6.72174e-08C6.50285 -4.80527e-08 6.67495 0.071315 6.80183 0.198256C6.92872 0.325198 7 0.497368 7 0.67689C7 0.856412 6.92872 1.02858 6.80183 1.15552L1.94874 6.00121L6.80183 10.8526C6.92745 10.9796 6.99751 11.1512 6.99662 11.3299C6.99572 11.5085 6.92393 11.6794 6.79705 11.8051C6.67016 11.9308 6.49857 12.0009 6.32003 12C6.14148 11.9991 5.97061 11.9273 5.84499 11.8003L0.526881 6.47601C0.401568 6.34983 0.331375 6.17908 0.331685 6.00121Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
-                }
-            }
-        }
-        .nav-back,
-        .nav-forward {
-            button {
                 position: relative;
-                border-radius: 50%;
-                width: 28px;
-                height: 28px;
-                background-color: $blue-100;
-                border: 1px solid $blue;
+                cursor: pointer;
                 display: flex;
                 justify-content: center;
                 align-items: center;
-                &:focus,
-                &:focus-visible {
-                    border: 2.5px solid $blue;
-                    box-shadow: none;
+                width: 40px;
+                height: 40px;
+                min-width: 40px;
+                border-radius: 50%;
+
+                span {
+                    &.small {
+                        font-size: 0.75rem;
+                        color: $gray-550;
+                    }
+                }
+
+                &:hover,
+                &:checked {
+                    @include media-breakpoint-up(sm) {
+                        box-shadow: 0 0 0 4px transparent;
+                        background-color: $blue;
+                        color: $white;
+                        &:after {
+                            background-color: $white;
+                        }
+                    }
+                    cursor: pointer;
+                    &.current-day {
+                        + .first-day {
+                            color: $white;
+                        }
+                    }
+                    .first-day {
+                        color: $white;
+                    }
+                }
+                + p {
+                    display: none;
+                }
+            }
+
+            &.selectable-day {
+                label {
+                    color: $blue;
                     background-color: $blue-100;
-                    color: $white;
+                    border: 1px solid $blue;
+                }
+            }
+            &.past-day,
+            &.future-day,
+            &.unavailable-day {
+                label {
+                    color: $gray-500;
+                    background-color: transparent;
+                    border: 1px solid transparent;
+                    pointer-events: none;
+                }
+            }
+            &.current-day {
+                label {
+                    &:after {
+                        content: "";
+                        width: 0.25rem;
+                        height: 0.25rem;
+                        border-radius: 50%;
+                        background-color: $blue;
+                        position: absolute;
+                        top: 28px;
+                    }
+                    .first-day {
+                        color: $blue;
+                    }
+                }
+            }
+        }
+
+        &.initial-view {
+            &.month-hidden {
+                display: none;
+            }
+            .day-hidden {
+                display: none;
+            }
+        }
+    }
+    .btn-link {
+        font-weight: 500;
+        text-underline-offset: 4px;
+    }
+    .past {
+        .calendar-grid-container {
+            .month-year {
+                grid-area: 1 / 1 / 2 / 6;
+            }
+            .nav-forward {
+                grid-area: 1 / 7 / 2 / 8;
+                display: flex;
+                justify-content: flex-end;
+                button {
+                    &:after {
+                        content: "";
+                        position: absolute;
+                        width: 7px;
+                        height: 12px;
+                        background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.66831 5.99879C6.66955 6.17554 6.60074 6.34558 6.47695 6.47168L1.15501 11.8017C1.02812 11.9287 0.85603 12 0.676587 12C0.497145 12 0.325053 11.9287 0.198168 11.8017C0.0712831 11.6748 7.268e-09 11.5026 8.07183e-09 11.3231C8.87567e-09 11.1436 0.0712831 10.9714 0.198168 10.8445L5.05126 5.99879L0.198168 1.14736C0.0725521 1.02042 0.00248585 0.848755 0.00338306 0.670131C0.00428028 0.491506 0.0760674 0.320554 0.202952 0.194881C0.329837 0.0692091 0.501426 -0.000888818 0.679971 9.54485e-06C0.858515 0.000906955 1.02939 0.0727263 1.15501 0.199668L6.47312 5.52399C6.59843 5.65017 6.66862 5.82092 6.66831 5.99879Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+                    }
+                }
+            }
+            .nav-back {
+                grid-area: 1 / 6 / 2 / 7;
+                display: flex;
+                justify-content: flex-end;
+                button {
+                    &:after {
+                        content: "";
+                        position: absolute;
+                        width: 7px;
+                        height: 12px;
+                        background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0.331685 6.00121C0.330445 5.82446 0.399256 5.65442 0.523053 5.52832L5.84499 0.198256C5.97188 0.0713149 6.14397 -8.63821e-08 6.32341 -6.72174e-08C6.50285 -4.80527e-08 6.67495 0.071315 6.80183 0.198256C6.92872 0.325198 7 0.497368 7 0.67689C7 0.856412 6.92872 1.02858 6.80183 1.15552L1.94874 6.00121L6.80183 10.8526C6.92745 10.9796 6.99751 11.1512 6.99662 11.3299C6.99572 11.5085 6.92393 11.6794 6.79705 11.8051C6.67016 11.9308 6.49857 12.0009 6.32003 12C6.14148 11.9991 5.97061 11.9273 5.84499 11.8003L0.526881 6.47601C0.401568 6.34983 0.331375 6.17908 0.331685 6.00121Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+                    }
+                }
+            }
+            .nav-back,
+            .nav-forward {
+                button {
+                    position: relative;
+                    border-radius: 50%;
+                    width: 28px;
+                    height: 28px;
+                    background-color: $blue-100;
+                    border: 1px solid $blue;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    &:focus,
+                    &:focus-visible {
+                        border: 2.5px solid $blue;
+                        box-shadow: none;
+                        background-color: $blue-100;
+                        color: $white;
+                    }
                 }
             }
         }
     }
 }
+
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index ffd5122e6..7f0a20b80 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,7 +29,6 @@ import { experimentTriggers } from "../constants/experiments";
 import { applicationConfig } from "../constants/application-config";
 
 // Components
-import quote from "@/layouts/quote/quote.vue";
 import datePicker from "@/digital-components/date-picker/date-picker.vue";
 import demoDatePicker from "@/layouts/demo-date-picker/demo-date-picker.vue";
 
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index c83b4e4bb..283c68ef1 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -16,6 +16,7 @@ const fmgPageValues = {
     QUOTE: "quote",
     SERVICE_LOCATION: "service-location",
     HERITAGE: "heritage",
+    SCHEDULE: "schedule",
 };
 
 export { fmgPageValues };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index b302320ba..88b5c92a8 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -45,6 +45,9 @@ const navigationScenarios = {
     CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
     CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
     CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
+
+    // Scheduling
+    SELECTED_LOCATION: "SELECTED_LOCATION",
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 7d780df1a..32c6e4ba5 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -420,6 +420,19 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_BACK,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.SELECTED_LOCATION,
+                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SCHEDULE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
             ],
         },
     ];

From faf9d1e4200b74c9cbd11ed87ac607bf44a662b4 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 5 Apr 2023 11:49:09 -0400
Subject: [PATCH 75/78] CSR-1129: formatting changes

---
 .../date-picker/date-picker.vue               |   1 -
 src/layouts/schedule/schedule.vue             | 136 ++++++++++++++++++
 .../service-location/service-location.vue     |   5 +-
 3 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 src/layouts/schedule/schedule.vue

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 813708b66..008fae9fa 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -637,5 +637,4 @@ export default {
         }
     }
 }
-
 </style>
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
new file mode 100644
index 000000000..02361128c
--- /dev/null
+++ b/src/layouts/schedule/schedule.vue
@@ -0,0 +1,136 @@
+<template>
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+        <div class="page-container-grouped-styles">
+            <loadingModal ref="loadingModal" />
+            <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
+            <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-5" />
+            <div class="text-center mt-1 mb-3" v-if="ChangeShopLink.length">
+                <span v-for="copy in ChangeShopLink" :key="copy">
+                    <span v-if="doesCopyContainRouterLink(copy)" class="text-body">
+                        <router-link
+                            :to="{
+                                query: { fmgPage: `${getRouterLinkRouteFromCopy(copy)}` },
+                                name: 'root',
+                            }"
+                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
+                        >
+                    </span>
+                    <span v-else class="m-0 text-body" v-html="copy"></span>
+                </span>
+            </div>
+            <date-picker
+                selectableDates="custom"
+                v-model="selectedDate"
+                :customSelectableDatesCallback="getAvailableDates" />
+            <funnel-footer
+                cmsWidgetName="FunnelFooterWidget"
+                ref="funnelFooter"
+                :isForwardActionDisabled="!meta.valid"
+                @back-clicked="backButtonAction"
+                @ForwardClicked="forwardButtonAction" />
+        </div>
+    </Form>
+</template>
+
+<script>
+// Components
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
+import { Form, defineRule } from "vee-validate";
+import datePicker from "@/digital-components/date-picker/date-picker";
+
+// Supporting files
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import {
+    doesCopyContainRouterLink,
+    splitCopyOnCMSPlaceHolder,
+    getRouterLinkRouteFromCopy,
+    getRouterLinkDisplayTextFromCopy,
+} from "@/helpers/cms-content-helper";
+import { errorMessages } from "@/constants/error-messages";
+import { required } from "@/helpers/validation-rules";
+
+defineRule("date-required", required(errorMessages.DATE_REQUIRED));
+
+export default {
+    name: "schedule",
+    data() {
+        return {
+            selectedDate: null,
+            mockSelectableDatesData: [
+                { year: 2023, month: 4, date: 13 },
+                { year: 2023, month: 4, date: 14 },
+                { year: 2023, month: 4, date: 26 },
+                { year: 2023, month: 5, date: 4 },
+                { year: 2023, month: 5, date: 5 },
+                { year: 2023, month: 5, date: 14 },
+                { year: 2023, month: 5, date: 21 },
+                { year: 2023, month: 5, date: 23 },
+                { year: 2023, month: 5, date: 25 },
+                { year: 2023, month: 6, date: 11 },
+            ],
+        };
+    },
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+
+        // Settle promises and get results
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+        ];
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+
+        // Call the "next" function to complete the transition to this page.
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+    computed: {
+        ChangeShopLinkText() {
+            return this.getCmsContent("ChangeShopLink", "Text");
+        },
+        ChangeShopLink() {
+            // Splits content when brackets are found in text so that text can be looped through and router-link can be injected when needed
+            return this.splitCopyOnCMSPlaceHolder(this.ChangeShopLinkText);
+        },
+    },
+    methods: {
+        doesCopyContainRouterLink,
+        splitCopyOnCMSPlaceHolder,
+        getRouterLinkRouteFromCopy,
+        getRouterLinkDisplayTextFromCopy,
+        arePagePrerequisitesValid() {
+            return true;
+            // NEED TODO - WHAT ARE PAGE REQ'S FOR THIS PAGE?
+        },
+        getAvailableDates(startDate, endDate) {
+            return this.mockSelectableDatesData;
+        },
+        backButtonAction() {
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+        },
+        forwardButtonAction() {
+            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+        },
+    },
+    components: {
+        funnelHeader,
+        funnelFooter,
+        funnelSubHeader,
+        Form,
+        loadingModal,
+        datePicker,
+    },
+};
+</script>
+
+<style lang="scss"></style>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 69b4f4926..119632a2d 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -284,7 +284,10 @@ export default {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         forwardButtonAction() {
-            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.SELECTED_LOCATION,
+                this.$route
+            );
         },
     },
     components: {

From 93c5763b26f0cf8ef51a0743aead563c04597a96 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 5 Apr 2023 11:50:34 -0400
Subject: [PATCH 76/78] CSR-1129: comment fix

---
 jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 3186939df..f6178df61 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -15,7 +15,7 @@ module.exports = {
     "!src/layouts/vehicle-damage/windshield-options/windshield-options.vue",
     "!src/layouts/reveal/**/*.vue",
     "!src/ux-components/text-link/**/*.vue",
-    "!src/common-components/date-picker/**/*.vue", // git statuTemp until unit tests completed
+    "!src/common-components/date-picker/**/*.vue", // Temp until unit tests completed
     "!src/layouts/vin-lookup/**/*.vue", //Temporary for Quote page testing
     "!src/common-components/funnel-header/menu-modal/**/*.vue",
     "!src/layouts/schedule/*.vue", // Temp test exclusion while in development

From 031453f4275e5dafe829507a64110c4fc8a6afa7 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 6 Apr 2023 10:55:32 -0400
Subject: [PATCH 77/78] Added new tests.

---
 .../service-location/service-location.spec.js | 362 ++++++++++++++++++
 1 file changed, 362 insertions(+)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index b0a06b16f..1062a6f34 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -8,6 +8,7 @@ import { getMountOptions } from "@/helpers/unit-test-helper";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { getServiceabilityDetails } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import { TRUE } from "sass";
 
 // Define Mocks
 jest.mock("@/helpers/cms-content-helper", () => ({
@@ -733,6 +734,87 @@ describe("service-location.vue", () => {
                 expect(wrapper.vm.isServiceableInshop).toEqual(false);
                 expect(wrapper.vm.displayNoShopsAlert).toEqual(false);
             });
+
+            test("displayServiceableInshopOnly should be true if inshop is true and mobile is false", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.displayServiceableInshopOnly).toEqual(true);
+            });
+
+            test("displayServiceableInshopOnly should be false if inshop is false", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(false);
+                expect(wrapper.vm.isServiceableInshop).toEqual(false);
+                expect(wrapper.vm.displayServiceableInshopOnly).toEqual(false);
+            });
+
+            test("displayServiceableInshopOnly should be false if mobile is true", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: true,
+                        isRecalibrationServiceableMobile: true,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isServiceableMobile).toEqual(true);
+                expect(wrapper.vm.isServiceableInshop).toEqual(true);
+                expect(wrapper.vm.displayServiceableInshopOnly).toEqual(false);
+            });
         });
 
         describe("should be based only on glass serviceability if recalibration is not defined.", () => {
@@ -870,6 +952,142 @@ describe("service-location.vue", () => {
             });
         });
 
+        describe("should check for dual or static recalibration", () => {
+            test("isDualOrStaticRecalibration should be true if dual recalibration is present", async () => {
+                // Arrange
+                store.getters = {
+                    lineItems: {
+                        supportingItems: [
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "SUPPLIES-REPAIR",
+                                partType: "REPAIR FEE",
+                                sellingPrice: 7.99,
+                            },
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "RECAL DUAL",
+                                partType: "RECALIBRATION",
+                                sellingPrice: 0,
+                            },
+                        ],
+                    },
+                    order: {
+                        serviceLocation: {
+                            zipCode: "43235",
+                            state: "OH",
+                        },
+                    },
+                    damage: {
+                        isRepair: false,
+                    },
+                    payment: {
+                        isInsurance: false,
+                    },
+                    vehicle: {
+                        registration: {
+                            address: "5555 Sulgrave Dr",
+                            city: "New Albany",
+                            state: "OH",
+                            zipCode: "43054",
+                        },
+                    },
+                };
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isDualOrStaticRecalibration).toBe(true);
+            });
+
+            test("isDualOrStaticRecalibration should be true if static recalibration is present", async () => {
+                // Arrange
+                store.getters = {
+                    lineItems: {
+                        supportingItems: [
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "SUPPLIES-REPAIR",
+                                partType: "REPAIR FEE",
+                                sellingPrice: 7.99,
+                            },
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "RECAL STATIC",
+                                partType: "RECALIBRATION",
+                                sellingPrice: 0,
+                            },
+                        ],
+                    },
+                    order: {
+                        serviceLocation: {
+                            zipCode: "43235",
+                            state: "OH",
+                        },
+                    },
+                    damage: {
+                        isRepair: false,
+                    },
+                    payment: {
+                        isInsurance: false,
+                    },
+                    vehicle: {
+                        registration: {
+                            address: "5555 Sulgrave Dr",
+                            city: "New Albany",
+                            state: "OH",
+                            zipCode: "43054",
+                        },
+                    },
+                };
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isDualOrStaticRecalibration).toBe(true);
+            });
+
+            test("isDualOrStaticRecalibration should be false if neither are present.", async () => {
+                // Arrange
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                // Assert
+                expect(wrapper.vm.isDualOrStaticRecalibration).toBe(false);
+            });
+        });
+
         describe("should properly display alerts.", () => {
             test("Should show mobile-only error if only mobile is available.", async () => {
                 // Arrange
@@ -978,6 +1196,150 @@ describe("service-location.vue", () => {
                 // Assert
                 expect(alertComponent.exists()).toBe(false);
             });
+
+            test("Should show inshop-only error if only inshop is available", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: true,
+                        isRecalibrationServiceableInshop: true,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent({ ref: "alertInshopOnly" });
+
+                // Assert
+                expect(alertComponent.exists()).toBe(true);
+            });
+
+            test("Should not show inshop-only error if not inshop-only", async () => {
+                // Arrange
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent({ ref: "alertInshopOnly" });
+
+                // Assert
+                expect(alertComponent.exists()).toBe(false);
+            });
+
+            test("Should not show inshop-only error if dual or static recalibration, but should show that error instead.", async () => {
+                // Arrange
+                store.getters = {
+                    lineItems: {
+                        supportingItems: [
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "SUPPLIES-REPAIR",
+                                partType: "REPAIR FEE",
+                                sellingPrice: 7.99,
+                            },
+                            {
+                                description: null,
+                                kitPrice: 0,
+                                laborAmount: 0,
+                                partNumber: "RECAL STATIC",
+                                partType: "RECALIBRATION",
+                                sellingPrice: 0,
+                            },
+                        ],
+                    },
+                    order: {
+                        serviceLocation: {
+                            zipCode: "43235",
+                            state: "OH",
+                        },
+                    },
+                    damage: {
+                        isRepair: false,
+                    },
+                    payment: {
+                        isInsurance: false,
+                    },
+                    vehicle: {
+                        registration: {
+                            address: "5555 Sulgrave Dr",
+                            city: "New Albany",
+                            state: "OH",
+                            zipCode: "43054",
+                        },
+                    },
+                };
+
+                getServiceabilityDetails.mockImplementation(() =>
+                    Promise.resolve({
+                        isGlassServiceableInshop: false,
+                        isRecalibrationServiceableInshop: false,
+                        isGlassServiceableMobile: false,
+                        isRecalibrationServiceableMobile: false,
+                    })
+                );
+
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertInshopComponent = wrapper.findComponent({ ref: "alertInshopOnly" });
+                const alertRecalComponent = wrapper.findComponent({ ref: "alertRecalNoMobile" });
+
+                // Assert
+                expect(alertInshopComponent.exists()).toBe(false);
+                expect(alertRecalComponent.exists()).toBe(true);
+            });
+
+            test("Should not show dual/static recalibration error if not those recalibration types", async () => {
+                // Arrange
+                const { wrapper } = setupMocks({});
+
+                // Act
+                await serviceLocation.beforeRouteEnter.call(
+                    wrapper.vm,
+                    { query: { fmgPage: "serviceLocation" } },
+                    undefined,
+                    (c) => c(wrapper.vm)
+                );
+
+                const alertComponent = wrapper.findComponent({ ref: "alertRecalNoMobile" });
+
+                // Assert
+                expect(alertComponent.exists()).toBe(false);
+            });
         });
     });
 });

From bb14d11a15b0560d7230a8da27ed0c3eff05790e Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 6 Apr 2023 13:38:52 -0400
Subject: [PATCH 78/78] Remove accidentally auto-added import.

---
 src/layouts/service-location/service-location.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 5f5ae90b4..3589596df 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -8,7 +8,6 @@ import { getMountOptions } from "@/helpers/unit-test-helper";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { getServiceabilityDetails } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
-import { TRUE } from "sass";
 
 // Define Mocks
 jest.mock("@/helpers/cms-content-helper", () => ({