From 53da1ac5ebb32e583ff4020b69f4b354f563a5f9 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 11 Feb 2025 04:27:52 -0500
Subject: [PATCH] CASH-240

CASH-240 make sure to save phone and sms optin before navigating
---
 src/layouts/service-zip/service-zip.vue | 52 ++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index b01f99c06..717880553 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -133,36 +133,36 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
 
             if (store.getters.externalParameterState?.isExternalParameter) {
+                if (store.getters.externalParameterServiceZip.zipCode) {
+                    await baseMixin.methods.dispatchStoreAction(
+                        storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
+                        {
+                            zipCode: store.getters.externalParameterServiceZip.zipCode,
+                            state: null,
+                            zipCodeCtu: null,
+                        },
+                        false
+                    );
+                }
+
+                if (store.getters.externalParameterCustomer?.phoneNumber) {
+                    await baseMixin.methods.dispatchStoreAction(
+                        storeActions.SAVE_PHONE_NUMBER,
+                        store.getters.externalParameterCustomer.phoneNumber,
+                        false
+                    );
+
+                    await baseMixin.methods.dispatchStoreAction(
+                        storeActions.SAVE_IS_SMS_OPT_IN,
+                        true,
+                        false
+                    );
+                }
+
                 const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
                 if (isValid) {
                     vm.forwardButtonAction();
                 } else {
-                    if (store.getters.externalParameterServiceZip.zipCode) {
-                        await baseMixin.methods.dispatchStoreAction(
-                            storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
-                            {
-                                zipCode: store.getters.externalParameterServiceZip.zipCode,
-                                state: null,
-                                zipCodeCtu: null,
-                            },
-                            false
-                        );
-                    }
-
-                    if (store.getters.externalParameterCustomer?.phoneNumber) {
-                        await baseMixin.methods.dispatchStoreAction(
-                            storeActions.SAVE_PHONE_NUMBER,
-                            store.getters.externalParameterCustomer.phoneNumber,
-                            false
-                        );
-
-                        await baseMixin.methods.dispatchStoreAction(
-                            storeActions.SAVE_IS_SMS_OPT_IN,
-                            true,
-                            false
-                        );
-                    }
-
                     baseMixin.methods.ResetExternalParamsAndHideModal();
                 }
             }