From 1fcd36b2a9a3671ff3b40248c0dce5da6b90795f Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Mon, 8 Jul 2024 08:02:05 -0500
Subject: [PATCH 1/3] SSR-1410 Fix zipCodeCtu missing causing errors on
 coverage-statement

---
 .../coverage-statement/coverage-statement.vue | 30 +++++++++++++------
 src/store/index.js                            |  1 +
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 72586138..9c96a700 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -119,7 +119,6 @@ import vehicleQuestionsMixin from '@/mixins/vehicle-questions-mixin.js';
 import globalRules from '@/constants/global-rules.js';
 import baseFormMixin from '@/mixins/base-form-mixin.js';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios.js';
-import issPageValues from '@/router/router-constants/issPage-values';
 import bailoutMessage from '@/constants/bailoutMessage';
 import widgetFields from '@/constants/cms-widget-fields.js';
 import { formatAmountInDollars } from '@/helpers/text-helper.js';
@@ -145,9 +144,11 @@ export default {
     },
     mixins: [baseFormMixin, vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
+        const store = useMainStore();
+
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to?.query?.issPage);
-        const supportingItemsPromise = await useMainStore().getSupportingItems();
+        const supportingItemsPromise = store.getSupportingItems();
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -161,15 +162,26 @@ export default {
             }
         ];
 
-        const resultMap = await settleAllPromises(promiseResultMap);
-
-        const { vehicle, isPolicyLookupSuccessful, isITAC, isDeductible } = useMainStore();
-        if (isPolicyLookupSuccessful && vehicle.policyVehicleId >= 0) {
-            if (isITAC || isDeductible) {
-                await useMainStore().getFinalDeductible();
-            }
+        const { vehicle, isPolicyLookupSuccessful, isITAC, isDeductible, isUnverified, serviceLocation } = store;
+        if (!isUnverified
+            && (isITAC || isDeductible)
+            && isPolicyLookupSuccessful
+            && vehicle.policyVehicleId >= 0) {
+            promiseResultMap.push({
+                resultKey: 'getFinalDeductible',
+                promise: store.getFinalDeductible()
+            });
         }
 
+        if (!serviceLocation.zipCodeCtu) {
+            promiseResultMap.push({
+                resultKey: 'validateZip',
+                promise: store.validateZip({ zip: store.order.policy.policyZipCode })
+            });
+        }
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+
         next(async (vm) => {
             showIssLoadingModal(true);
             vm.setCmsContent(resultMap.cmsContent);
diff --git a/src/store/index.js b/src/store/index.js
index 321d9285..c36f5887 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -263,6 +263,7 @@ export const useMainStore = defineStore({
         lineItems: (state) => state.order.lineItems,
         payment: (state) => state.order.payment,
         policy: (state) => state.order.policy,
+        serviceLocation: (state) => state.order.serviceLocation,
         hasExactlyOneChip: () => state.order.damage.numberOfChips === 1,
         isPolicyVehicle: () => state.order.vehicle.policyVehicleId != null,
         hasWindshieldReplacement: (s) => {

From be5ae6985fe4120a3056c5e4943c72e51ad68952 Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Mon, 8 Jul 2024 08:34:52 -0500
Subject: [PATCH 2/3] SSR-1410 Remove redundant check

---
 src/layouts/coverage-statement/coverage-statement.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 9c96a700..5fa5ec36 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -162,9 +162,8 @@ export default {
             }
         ];
 
-        const { vehicle, isPolicyLookupSuccessful, isITAC, isDeductible, isUnverified, serviceLocation } = store;
-        if (!isUnverified
-            && (isITAC || isDeductible)
+        const { vehicle, isPolicyLookupSuccessful, isITAC, isDeductible, serviceLocation } = store;
+        if ((isITAC || isDeductible)
             && isPolicyLookupSuccessful
             && vehicle.policyVehicleId >= 0) {
             promiseResultMap.push({

From c2bae5ced30bc824eab11d4d003423d7df7adc56 Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Mon, 8 Jul 2024 09:06:37 -0500
Subject: [PATCH 3/3] SSR-1410 Remove unnecessary check

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

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 5fa5ec36..a38ffa88 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -162,9 +162,8 @@ export default {
             }
         ];
 
-        const { vehicle, isPolicyLookupSuccessful, isITAC, isDeductible, serviceLocation } = store;
+        const { vehicle, isITAC, isDeductible, serviceLocation } = store;
         if ((isITAC || isDeductible)
-            && isPolicyLookupSuccessful
             && vehicle.policyVehicleId >= 0) {
             promiseResultMap.push({
                 resultKey: 'getFinalDeductible',