From cdeed7226e33a1cb9823e3790e5607b927e6661f Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 28 Feb 2023 11:44:02 -0500
Subject: [PATCH 1/5] formatting

---
 src/helpers/service-location-helper.js            | 4 ++--
 src/helpers/service-location-helper.spec.js       | 2 +-
 src/layouts/service-location/service-location.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
index 1f4a12f51..8f34de930 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/helpers/service-location-helper.js
@@ -7,14 +7,14 @@ export async function getMobileFee(serviceZipCode) {
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
-    
+
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
         null,
         false
     );
-    
+
     // Get the Mobile Fee Part Price
     const pricingResults = await baseMixin.methods.dispatchStoreAction(
         storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
index 66012402c..3d0843e10 100644
--- a/src/helpers/service-location-helper.spec.js
+++ b/src/helpers/service-location-helper.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-location.vue b/src/layouts/service-location/service-location.vue
index f2339b218..6baac0029 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -104,7 +104,7 @@ export default {
         },
         setData(mobileFee) {
             if (mobileFee) {
-                this.mobileLocationQuestions.mobileFee = mobileFee
+                this.mobileLocationQuestions.mobileFee = mobileFee;
             }
         },
         getRegistrationAddressFromStore() {

From 4c4101a9df6f82a5b9a00bbef5c0025f58deeedc Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 28 Feb 2023 13:57:05 -0500
Subject: [PATCH 2/5] CSR-1012 | add back page prereqs for service-location and
 moved consts

---
 src/layouts/service-location/service-location.vue | 11 +++++------
 .../service-zip-modal-question.vue                | 15 +++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6baac0029..396906a25 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -95,12 +95,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // (
-            //     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(mobileFee) {
             if (mobileFee) {
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 aabab3be3..56af14db3 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
@@ -60,13 +60,16 @@ export default {
         linkWidgetName: String,
         modalWidgetName: String,
     },
+    setup() {
+        const textboxQuestionWidgetName = "ServiceZipQuestionWidget";
+        const alertInvalidZipWidgetName = "AlertInvalidZipWidget";
+
+        return {
+            textboxQuestionWidgetName,
+            alertInvalidZipWidgetName,
+        };
+    },
     computed: {
-        textboxQuestionWidgetName() {
-            return "ServiceZipQuestionWidget";
-        },
-        alertInvalidZipWidgetName() {
-            return "AlertInvalidZipWidget";
-        },
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {
                 return this.modelValue.state + ", " + this.modelValue.zipCode;

From 50ae697faa9a4e07cabd6c15548ec9d2586681d9 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 1 Mar 2023 09:23:19 -0500
Subject: [PATCH 3/5] CSR-1012 removed only from test

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

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 8f3505cdc..170de3d2f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -121,7 +121,7 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toBe(newZip);
         });
 
-        test.only("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
+        test("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             const newServiceZipCodeQuestion = {

From 7f528ae029b443db9991bc96547a05933cbe004f Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 2 Mar 2023 14:56:55 -0500
Subject: [PATCH 4/5] CSR-1012 zip textbox in modal has rounded-pill corners

---
 .../service-zip-question/service-zip-question.vue                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
index 979094523..9841c5b16 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
@@ -5,6 +5,7 @@
         v-model="value"
         inputId="serviceZipCode"
         questionAlignment="center"
+        cornerStyle="rounded"
         mask="#####"
         :displayQuestionText="false"
         isRequired

From 586be19eb4d6e901d4b3e49528b546fef5d47d6e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 07:57:49 -0500
Subject: [PATCH 5/5] Relocated mobileLocationLinkPromptId to page level so
 that service-zip and mobile-location are the same

---
 .../mobile-location-modal-questions.vue       | 28 -------------
 .../service-location/service-location.vue     | 42 ++++++++++++++++---
 2 files changed, 36 insertions(+), 34 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 ecd1345f0..7523e6c83 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
@@ -1,10 +1,5 @@
 <template>
     <div class="text-center">
-        <label
-            for="mobileLocationLinkPromptId"
-            :aria-label="mobileLocationLinkPromptText"
-            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-            v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
                 ref="mobileLocationLink"
@@ -15,10 +10,6 @@
                 @click-event="openModal"
                 aria-label="Modal window" />
         </div>
-        <textBlock
-            :customText="mobileFeeText"
-            cmsWidgetName="MobileFeeDisclaimerWidget"
-            typeStyle="caption" />
     </div>
     <modal
         :ref="modalName"
@@ -90,9 +81,6 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
-        mobileLocationLinkPromptText() {
-            return this.getCmsContent(this.linkWidgetName, "HeaderText");
-        },
         mobileLocationLinkText() {
             if (
                 this.addressModel.streetAddress !== null &&
@@ -111,23 +99,9 @@ export default {
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
-        mobileFeeText() {
-            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
-        },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-        mobileFee() {
-            if (!this.modelValue.mobileFeePart) {
-                return 0;
-            }
-            return (
-                this.modelValue.mobileFeePart.laborAmount +
-                this.modelValue.mobileFeePart.sellingPrice +
-                this.modelValue.mobileFeePart.kitPrice
-            );
-        },
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
@@ -150,7 +124,6 @@ export default {
             // Reinitialize the Address Auto Complete
             this.$refs.addressQuestions.setupAddressLookup();
         },
-
         resetModel() {
             // Address
             this.internalModel.addressQuestions.streetAddress = "";
@@ -160,7 +133,6 @@ export default {
             // Is Vehicle Protected
             this.internalModel.isVehicleProtected = null;
         },
-
         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 1be600ed8..9397dd180 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,11 +10,21 @@
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
+            <div class="text-center">
+                <label
+                    for="mobileLocationLinkPromptId"
+                    :aria-label="mobileLocationLinkPromptText"
+                    class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+                    v-html="mobileLocationLinkPromptText"></label>
+            </div>
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
+            <div class="text-center">
+                <textBlock :customText="mobileFeeDisclaimerText" typeStyle="caption" />
+            </div>
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -39,6 +49,7 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
 import store from "@/store";
+import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "service-location",
@@ -112,19 +123,37 @@ export default {
                         zipCode: this.zipCode,
                     },
                     isVehicleProtected: this.isVehicleProtected,
-                    mobileFeePart: this.mobileFeePart
+                    mobileFeePart: this.mobileFeePart,
                 };
             },
             set: function (newValue) {
                 this.streetAddress = newValue.addressQuestions.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName,
+                this.apartmentNumberOrBusinessName =
+                    newValue.addressQuestions.apartmentNumberOrBusinessName;
                 this.city = newValue.addressQuestions.city;
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
-                this.isVehicleProtected = newValue.isVehicleProtected,
+                this.isVehicleProtected = newValue.isVehicleProtected;
                 this.mobileFeePart = newValue.mobileFeePart;
             },
         },
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent("MobileLocationLinkWidget", "HeaderText");
+        },
+        mobileFeeDisclaimerText() {
+            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
+        },
+        mobileFee() {
+            if (!this.mobileFeePart) {
+                return 0;
+            }
+            return (
+                this.mobileFeePart.laborAmount +
+                this.mobileFeePart.sellingPrice +
+                this.mobileFeePart.kitPrice
+            );
+        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -157,13 +186,13 @@ export default {
         },
         resetMobileFeePart(serviceZipCode) {
             getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
-                this.mobileLocationQuestions.mobileFeePart = pricedMobileFeePart;
+                this.mobileFeePart = pricedMobileFeePart;
             });
         },
         resetMobileLocation(updatedServiceZipCode) {
             this.streetAddress = "";
-            this.apartmentNumberOrBusinessName = "",
-            this.city = "",
+            this.apartmentNumberOrBusinessName = "";
+            this.city = "";
             this.isVehicleProtected = null;
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
@@ -185,6 +214,7 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
+        textBlock,
     },
 };
 </script>