Merge pull request #2291 from Safelite/rlsmerge/2025.02.13-to-develop

Rlsmerge/2025.02.13 to develop

src/constants/store-actions.js

@@ -78,6 +78,7 @@ const storeActions = {
     SAVE_SCHEDULE: "saveSchedule",
     SAVE_EMAIL: "saveEmail",
     SAVE_PHONE_NUMBER: "savePhoneNumber",
+    SAVE_IS_SMS_OPT_IN: "saveIsSmsOptIn",
     SAVE_REGISTRATION_LICENSE_PLATE_LOOKUP: "saveRegistrationLicensePlateLookup",
     SAVE_VIN: "saveVin",
     SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",

src/constants/store-mutations.js

@@ -40,6 +40,7 @@ const storeMutations = {
     // CUSTOMER MUTATIONS
     UPDATE_CUSTOMER_EMAIL_ADDRESS: "updateCustomerEmailAddress",
     UPDATE_CUSTOMER_PHONE_NUMBER: "updateCustomerPhoneNumber",
+    UPDATE_CUSTOMER_IS_SMS_OPT_IN: "updateCustomerIsSmsOptin",
     UPDATE_CUSTOMER_DETAILS: "updateCustomerDetails",
 
     // ORDER MUTATIONS

src/layouts/estimate/estimate.vue

@@ -145,6 +145,20 @@ export default {
 
             vm.setCmsContent(resultMap.cmsContent);
             if (store.getters.externalParameterState?.isExternalParameter) {
+                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
+                    );
+                }
+
                 if (store.getters.externalParameterEstimate.vinSelection) {
                     vm.selectedVinLookupMethod = vinPagesMixin.methods.getVinlookupMethod(
                         store.getters.externalParameterEstimate.vinSelection

src/layouts/service-zip/service-zip.vue

@@ -149,6 +149,20 @@ export default {
                         );
                     }
 
+                    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();
                 }
             }

src/router/index.js

@@ -898,7 +898,6 @@ function updateExternalParameterState() {
             storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
             externalParameterPhoneNumber
         );
-        store.dispatch(storeActions.SAVE_PHONE_NUMBER, externalParameterPhoneNumber);
     }
 }
 

src/store/index.js

@@ -341,6 +341,9 @@ export const mutations = {
     updateCustomerPhoneNumber(state, phoneNumber) {
         state.order.customer.phoneNumber = phoneNumber;
     },
+    updateCustomerIsSmsOptin(state, isSmsOptIn) {
+        state.order.customer.isSmsOptIn = isSmsOptIn;
+    },
     updateVehicle(state, vehicleInfo) {
         state.order.vehicle.year = vehicleInfo.year;
         state.order.vehicle.make = vehicleInfo.make;
@@ -476,7 +479,7 @@ export const mutations = {
         saveExternalParameterState(externalParameterState);
     },
     updateExternalParameterEmailAddress(state, emailAddress) {
-        externalParameterState.serviceZip.emailAddress = emailAddress;
+        externalParameterState.customer.emailAddress = emailAddress;
         saveExternalParameterState(externalParameterState);
     },
     updateExternalParameterIsInsurance(state, isInsurance) {
@@ -517,7 +520,6 @@ export const mutations = {
     },
     resetExternalParameterServiceZipState(state) {
         externalParameterState.serviceZip.zipCode = null;
-        externalParameterState.serviceZip.emailAddress = null;
         saveExternalParameterState(externalParameterState);
     },
     resetExternalParameterQuoteState(state) {
@@ -529,6 +531,7 @@ export const mutations = {
         saveExternalParameterState(externalParameterState);
     },
     resetExternalParameterCustomerState(state) {
+        externalParameterState.customer.emailAddress = null;
         externalParameterState.customer.phoneNumber = null;
         saveExternalParameterState(externalParameterState);
     },
@@ -997,8 +1000,9 @@ export const getters = {
 
     emailOrSms: (state) => {
         const email =
-            externalParameterState.serviceZip.emailAddress ?? state.order.customer.emailAddress;
+            externalParameterState.customer.emailAddress ?? state.order.customer.emailAddress;
-        const phone = state.order.customer.phoneNumber;
+        const phone =
+            externalParameterState.customer.phoneNumber ?? state.order.customer.phoneNumber;
 
         if (!phone && !email) {
             return null;
@@ -3061,6 +3065,9 @@ export const actions = {
             phoneNumber === "" ? null : phoneNumber
         );
     },
+    saveIsSmsOptIn(context, isSmsOptIn) {
+        context.commit(storeMutations.UPDATE_CUSTOMER_IS_SMS_OPT_IN, isSmsOptIn);
+    },
 
     savePageData(context, emailOrSms) {
         context.commit(storeMutations.UPDATE_PAGE_DATA, emailOrSms);
@@ -3725,7 +3732,6 @@ function createExternalParameterDefaultState() {
             vinSelection: null,
         },
         serviceZip: {
-            emailAddress: null,
             zipCode: null,
         },
         quote: {
@@ -3733,6 +3739,7 @@ function createExternalParameterDefaultState() {
             servicePackage: null,
         },
         customer: {
+            emailAddress: null,
             phoneNumber: null,
         },
     };