From 2a73020aad17bde325a8fb12641d4d91bc65cd38 Mon Sep 17 00:00:00 2001
From: Kroell <Katie.Kroell@safelite.com>
Date: Fri, 21 Apr 2023 12:08:05 -0400
Subject: [PATCH] move getZipCodeData() from base-mixin to
 service-location-helper

---
 src/helpers/service-location-helper.js             | 14 ++++++++++++++
 src/layouts/service-location/service-location.vue  |  6 +++---
 .../service-zip-modal-question.vue                 |  5 +++--
 src/mixins/base-mixin.js                           | 13 -------------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
index da98fb33..019e7bae 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/helpers/service-location-helper.js
@@ -9,4 +9,18 @@ export async function getServiceabilityDetails(serviceZipCode, lineItems) {
         false
     );
     return Promise.resolve(serviceabilityDetails);
+}
+
+export async function getZipCodeData(zipCode) {
+    const serviceZipValidationResponse = await useMainStore().validateZip(
+      { zip: zipCode }
+    );
+
+    return {
+        containsMilitaryBase: serviceZipValidationResponse.data.containsMilitaryBase,
+        isValid: serviceZipValidationResponse.data.isValid,
+        isServiceable: serviceZipValidationResponse.data.isServiceable,
+        state: serviceZipValidationResponse.data.state,
+        zipCodeCtu: serviceZipValidationResponse.data.zipCodeCtu,
+    };
 }
\ No newline at end of file
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 50b61c13..afae6d68 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -55,7 +55,7 @@ import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import { useMainStore } from "@/store";
-import { getServiceabilityDetails } from "@/helpers/service-location-helper";
+import { getServiceabilityDetails, getZipCodeData } from "@/helpers/service-location-helper";
 
 // Import Component
 import baseFormMixin from "@/mixins/base-form-mixin";
@@ -76,7 +76,7 @@ export default {
         const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
 
         const serviceZipCode = useMainStore().order.customer.address.zipCode;
-        const getZipCodeData = baseMixin.methods.getZipCodeData(serviceZipCode);
+        const zipCodeData = getZipCodeData(serviceZipCode);
 
         const serviceabilityDetailsPromise = getServiceabilityDetails(serviceZipCode);
         
@@ -92,7 +92,7 @@ export default {
             },
             {
                 resultKey: "zipCodeData",
-                promise: getZipCodeData,
+                promise: zipCodeData,
             },
         ];
 
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 b63849ee..aef14fbf 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 serviceZipQuestion from "@/layouts/service-location/service-zip-modal-que
 import modal from "@/digital-components/modal/modal.vue"
 import alert from "@/ux-components/alert/alert";
 
-import { getServiceabilityDetails } from "@/helpers/service-location-helper";
+import { getServiceabilityDetails, getZipCodeData } from "@/helpers/service-location-helper";
 
 export default {
     name: "service-zip-modal-question",
@@ -94,7 +94,7 @@ export default {
         focusOnZipInput() {
             const input = document.getElementById(this.serviceZipCodeTextInputId);
             input?.focus();
-;       },
+        },
         copyModel(modelToCopy) {
             return {
                 state: modelToCopy.state,
@@ -150,6 +150,7 @@ export default {
                 this.closeModal();
             }
         },
+        getZipCodeData,
     },
     watch: {
         modelValue(newValue) {
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 628fa330..3b3abe33 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -27,19 +27,6 @@ export default {
     savePageDataToStore(page, data) {
       useMainStore().updatePageData({ page: page, data: data});
     },
-    async getZipCodeData(zipCode) {
-            const serviceZipValidationResponse = await useMainStore().validateZip(
-              { zip: zipCode }
-            );
-
-            return {
-                containsMilitaryBase: serviceZipValidationResponse.data.containsMilitaryBase,
-                isValid: serviceZipValidationResponse.data.isValid,
-                isServiceable: serviceZipValidationResponse.data.isServiceable,
-                state: serviceZipValidationResponse.data.state,
-                zipCodeCtu: serviceZipValidationResponse.data.zipCodeCtu,
-            };
-        },
   },
   computed: {
     // store will be accessible globally as its id + 'Store'