diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 79e238d47..452484e48 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -16,6 +16,13 @@
v-model="parentAccountNumber"
:originalList="originalList" />
+
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 1bcc3d7a8..2c5f5a7c3 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -78,6 +78,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();
}
});
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index f905e86c7..d60ddbb70 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -79,6 +79,21 @@ export default {
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();
}
});
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index deca0d6d1..522bc4f2e 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -577,6 +577,56 @@ describe("quote.vue", () => {
//Assert
expect(wrapper.vm.isInsuranceSelected).toBe(false);
});
+ test("should default to cash if isCashSelected is true, despite all other checks pointing to insurance selection", async () => {
+ // Also needs no query parameter or previous selection in store to be present
+ //Arrange
+
+ store.getters = {
+ lineItems: {
+ glassParts: ["item", "item2"],
+ },
+ applicationUser: {
+ experiments: [],
+ },
+ order: {
+ lineItems: {
+ glassParts: ["item", "item2"],
+ },
+ payment: {
+ isInsurance: true,
+ },
+ customer: {
+ emailAddress: "test@test.com",
+ },
+ serviceLocation: {
+ state: null,
+ },
+ },
+ vehicle: {
+ cardId: "123",
+ },
+ experimentSettings: {
+ settingName: "SERVICE_PACKAGE_DISCOUNT",
+ },
+ };
+ mockTierOnePrice = 505;
+ const { wrapper } = setupMocks({});
+
+
+ //Act
+ await quote.beforeRouteEnter.call(
+ wrapper.vm,
+ { query: { fmgPage: "quote",
+ isInsuranceSelected: true,
+ isCashSelected: true,
+ } },
+ undefined,
+ (c) => c(wrapper.vm)
+ );
+
+ //Assert
+ expect(wrapper.vm.isInsuranceSelected).toBe(false);
+ });
test("should default to insurance if total economy package price is over $500", async () => {
// Also needs no query parameter or previous selection in store to be present
//Arrange
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 4428f6e40..20dc16304 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -328,6 +328,10 @@ export default {
}
const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => {
+ // query param checked here is set on insurance-selection "Pay on my own" link click
+ if (to.query?.isCashSelected || to.query?.iscashselected) {
+ return false;
+ }
const serviceLocationState = store.getters.order.serviceLocation.state;
// usually true when returning from heritage but can be false when returning from heritage on a save quote
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 717880553..ae7609da8 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -202,11 +202,18 @@ export default {
async forwardButtonAction() {
const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
- if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
- const phone = this.emailOrSms.replace(/[()]/g, "");
- await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
- } else {
- await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+ // if no value due to field being optional, blank both phone and email address
+ if (!this.emailOrSms) {
+ await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
+ await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
+ }
+ else {
+ if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
+ const phone = this.emailOrSms.replace(/[()]/g, "");
+ await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
+ } else {
+ await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+ }
}
await this.dispatchStoreAction(
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 6e9c4b198..46efb4728 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -152,6 +152,20 @@ export default {
if (isValid) {
vm.forwardButtonAction();
} else {
+ 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.externalParameterServiceZip.zipCode) {
await baseMixin.methods.dispatchStoreAction(
storeActions.SAVE_SERVICE_ZIP_CODE_INFO,