From 4886e0be923bd25b30c3780fe1792f401775726f Mon Sep 17 00:00:00 2001 From: CarlNation Date: Sat, 8 Feb 2025 07:43:24 -0500 Subject: [PATCH 01/12] CASH-207 CASH-97 CASH-207 CASH-97 - updates for tech review on CASH-97 for moving the vuex phone number update out of the router. The also implemented CASH-207 to default the smsOptin to true when quick quote supplies a mobile number. --- src/constants/store-actions.js | 1 + src/constants/store-mutations.js | 1 + src/layouts/estimate/estimate.vue | 14 ++++++++++++++ src/layouts/service-zip/service-zip.vue | 14 ++++++++++++++ src/router/index.js | 1 - src/store/index.js | 18 +++++++++++++----- 6 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 9ad6d9890..4750f1641 100644 --- a/src/constants/store-actions.js +++ b/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", diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js index 1ebf39b8d..d9cfc703e 100644 --- a/src/constants/store-mutations.js +++ b/src/constants/store-mutations.js @@ -42,6 +42,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 diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index 6a85ae349..5ab1df2ae 100644 --- a/src/layouts/estimate/estimate.vue +++ b/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 diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index 18a8b3362..88d160077 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/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(); } } diff --git a/src/router/index.js b/src/router/index.js index 83004b38c..2230a652d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -898,7 +898,6 @@ function updateExternalParameterState() { storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER, externalParameterPhoneNumber ); - store.dispatch(storeActions.SAVE_PHONE_NUMBER, externalParameterPhoneNumber); } } diff --git a/src/store/index.js b/src/store/index.js index 095767380..bba99f230 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -346,6 +346,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; @@ -483,7 +486,7 @@ export const mutations = { saveExternalParameterState(externalParameterState); }, updateExternalParameterEmailAddress(state, emailAddress) { - externalParameterState.serviceZip.emailAddress = emailAddress; + externalParameterState.customer.emailAddress = emailAddress; saveExternalParameterState(externalParameterState); }, updateExternalParameterIsInsurance(state, isInsurance) { @@ -524,7 +527,6 @@ export const mutations = { }, resetExternalParameterServiceZipState(state) { externalParameterState.serviceZip.zipCode = null; - externalParameterState.serviceZip.emailAddress = null; saveExternalParameterState(externalParameterState); }, resetExternalParameterQuoteState(state) { @@ -536,6 +538,7 @@ export const mutations = { saveExternalParameterState(externalParameterState); }, resetExternalParameterCustomerState(state) { + externalParameterState.customer.emailAddress = null; externalParameterState.customer.phoneNumber = null; saveExternalParameterState(externalParameterState); }, @@ -1005,8 +1008,9 @@ export const getters = { emailOrSms: (state) => { const email = - externalParameterState.serviceZip.emailAddress ?? state.order.customer.emailAddress; - const phone = state.order.customer.phoneNumber; + externalParameterState.customer.emailAddress ?? state.order.customer.emailAddress; + const phone = + externalParameterState.customer.phoneNumber ?? state.order.customer.phoneNumber; if (!phone && !email) { return null; @@ -3088,6 +3092,10 @@ export const actions = { phoneNumber === "" ? null : phoneNumber ); }, + saveIsSmsOptIn(context, isSmsOptIn) { + debugger; // eslint-disable-line + context.commit(storeMutations.UPDATE_CUSTOMER_IS_SMS_OPT_IN, isSmsOptIn); + }, savePageData(context, emailOrSms) { context.commit(storeMutations.UPDATE_PAGE_DATA, emailOrSms); @@ -3752,7 +3760,6 @@ function createExternalParameterDefaultState() { vinSelection: null, }, serviceZip: { - emailAddress: null, zipCode: null, }, quote: { @@ -3760,6 +3767,7 @@ function createExternalParameterDefaultState() { servicePackage: null, }, customer: { + emailAddress: null, phoneNumber: null, }, }; From 1764db4739fdbaa3010caed1a928dc3fb31adbc4 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Sat, 8 Feb 2025 08:57:02 -0500 Subject: [PATCH 02/12] CASH-207 CASH-207 null check --- src/layouts/service-zip/service-zip.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index 88d160077..b01f99c06 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/src/layouts/service-zip/service-zip.vue @@ -149,7 +149,7 @@ export default { ); } - if (store.getters.externalParameterCustomer.phoneNumber) { + if (store.getters.externalParameterCustomer?.phoneNumber) { await baseMixin.methods.dispatchStoreAction( storeActions.SAVE_PHONE_NUMBER, store.getters.externalParameterCustomer.phoneNumber, From 3c55924140ece4d4d70036755a4effe4ee320e85 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Sat, 8 Feb 2025 09:17:04 -0500 Subject: [PATCH 03/12] CASH-207 CASH-207 another null check --- src/layouts/estimate/estimate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index 5ab1df2ae..b9fdf1958 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -145,7 +145,7 @@ export default { vm.setCmsContent(resultMap.cmsContent); if (store.getters.externalParameterState?.isExternalParameter) { - if (store.getters.externalParameterCustomer.phoneNumber) { + if (store.getters.externalParameterCustomer?.phoneNumber) { await baseMixin.methods.dispatchStoreAction( storeActions.SAVE_PHONE_NUMBER, store.getters.externalParameterCustomer.phoneNumber, From 398eac72a673c527a3a2a97405ba80a4703073ba Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 10 Feb 2025 06:10:44 -0500 Subject: [PATCH 04/12] CASH-207 CASH-207 missed debugger statement --- src/store/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index bba99f230..b8a11e928 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -3093,7 +3093,6 @@ export const actions = { ); }, saveIsSmsOptIn(context, isSmsOptIn) { - debugger; // eslint-disable-line context.commit(storeMutations.UPDATE_CUSTOMER_IS_SMS_OPT_IN, isSmsOptIn); }, From 5e661111e1e6ce778545facdcf2c8237da340a60 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Tue, 11 Feb 2025 13:51:03 +0530 Subject: [PATCH 05/12] CASH-170 creating async function as the computed property can not directly handle asynchronous operations or promises. --- .../mobile-location-modal-questions.spec.js | 21 ++++++++---- .../mobile-location-modal-questions.vue | 24 ++++++++++---- .../service-location/service-location.spec.js | 32 ++++++++++++++++--- .../service-location/service-location.vue | 12 +++++-- 4 files changed, 69 insertions(+), 20 deletions(-) diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js index 863a04c82..91f26b64d 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js @@ -203,7 +203,7 @@ describe("mobile-location-modal-questions.vue", () => { expect(wrapper.vm.$refs.MobileLocationModalWidget.openModal).toHaveBeenCalled(); }); - it("Should emit update:modelValue on setMobileLocation for a valid address and vehicle protection answer", async () => { + it("Should emit updated-mobile-location-questions on setMobileLocation for a valid address and vehicle protection answer", async () => { // Arrange const mobileLocationQuestions = { addressQuestions: { @@ -240,17 +240,26 @@ describe("mobile-location-modal-questions.vue", () => { }); wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn(); + // Mock the emitEvent function + wrapper.vm.emitEvent = jest.fn(async (eventName, payload) => { + return new Promise((resolve) => { + wrapper.vm.$emit(eventName, newMobileLocationQuestions, resolve); + resolve(newMobileLocationQuestions); + }); + }); // Act wrapper.vm.internalModel = newMobileLocationQuestions; + await wrapper.vm.setMobileLocation(); - let expectedEmit = [[newMobileLocationQuestions]]; - // Assert - expect(wrapper.emitted("update:modelValue")).toEqual(expectedEmit); + expect(wrapper.emitted()["updated-mobile-location-questions"]).toBeTruthy(); + expect(wrapper.emitted()["updated-mobile-location-questions"][0][0]).toBe( + newMobileLocationQuestions + ); }); - it("Should not emit update:modelValue on setMobileLocation for an invalid address zip code", async () => { + it("Should not emit updated-mobile-location-questions on setMobileLocation for an invalid address zip code", async () => { // Arrange const mobileLocationQuestions = { addressQuestions: { @@ -293,7 +302,7 @@ describe("mobile-location-modal-questions.vue", () => { await wrapper.vm.setMobileLocation(); // Assert - expect(wrapper.emitted("update:modelValue")).not.toBeTruthy(); + expect(wrapper.emitted("updated-mobile-location-questions")).not.toBeTruthy(); }); it("Should display invalid zip alert for invalid address zip inputs", async () => { diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue index d88bd53e2..dadbaff8b 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue @@ -98,6 +98,7 @@ export default { "updated-contains-military-base", "updated-bill-to-account-number", "mobileLocationSelected", + "updated-mobile-location-questions", ], data() { return { @@ -251,10 +252,15 @@ export default { if (!zipCodeData.isValid) { this.displayInvalidZipAlert = true; this.resetModalButtonStyle(); + return; } else if (zipCodeData.state != this.internalModel.addressQuestions.state) { this.displayMismatchStateAndZipAlert = true; this.resetModalButtonStyle(); - } else { + return; + } else if ( + this.internalModel.addressQuestions.zipCode !== + this.modelValue.addressQuestions.zipCode + ) { // retrieve mobile fee part const serviceZipCode = this.internalModel.addressQuestions.zipCode; const mobileFeePart = await getPricedMobileFeePart( @@ -279,13 +285,17 @@ export default { this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase); this.$emit("updated-mobile-ctu", zipCodeData.zipCodeCtu); this.$emit("updated-bill-to-account-number", billToAccountNumber); - - // update the page level model - this.$emit("update:modelValue", this.internalModel); - - //Page advance to Schedule page - this.$emit("mobileLocationSelected"); } + // update the page level model + await this.emitEvent("updated-mobile-location-questions", this.internalModel); + + this.$emit("mobileLocationSelected"); + }, + //creating emitEvent function to raise events with resolve callback to handle events sequencing + async emitEvent(eventName, payload) { + return new Promise((resolve) => { + this.$emit(eventName, payload, resolve); + }); }, }, watch: { diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js index 54f28a89c..b29ec604b 100644 --- a/src/layouts/service-location/service-location.spec.js +++ b/src/layouts/service-location/service-location.spec.js @@ -463,11 +463,23 @@ describe("service-location.vue", () => { }; // Act - mobileLocationQuestionsComponent.vm.$emit( - "update:modelValue", + + // Mock the emitEvent function + mobileLocationQuestionsComponent.vm.emitEvent = jest.fn(async (eventName, payload) => { + return new Promise((resolve) => { + mobileLocationQuestionsComponent.vm.$emit(eventName, payload, resolve); + }); + }); + + // Trigger the event + await mobileLocationQuestionsComponent.vm.emitEvent( + "updated-mobile-location-questions", newMobileLocationQuestions ); + await wrapper.vm.$nextTick(); // Wait for DOM updates + await new Promise((resolve) => setTimeout(resolve, 0)); // Wait for promise to resolve + // Assert expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions); }); @@ -532,11 +544,23 @@ describe("service-location.vue", () => { }; // Act - mobileLocationQuestionsComponent.vm.$emit( - "update:modelValue", + + // Mock the emitEvent function + mobileLocationQuestionsComponent.vm.emitEvent = jest.fn(async (eventName, payload) => { + return new Promise((resolve) => { + mobileLocationQuestionsComponent.vm.$emit(eventName, payload, resolve); + }); + }); + + // Trigger the event + await mobileLocationQuestionsComponent.vm.emitEvent( + "updated-mobile-location-questions", newMobileLocationQuestions ); + await wrapper.vm.$nextTick(); // Wait for DOM updates + await new Promise((resolve) => setTimeout(resolve, 0)); // Wait for promise to resolve + // Assert expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo); }); diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 9addea705..47cf5262e 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -93,6 +93,7 @@ @updated-serviceability="setServiceabilityDetails" @updated-contains-military-base="setContainsMilitaryBase" @updated-mobile-ctu="setCtuForMobile" + @updated-mobile-location-questions="setMobileLocationQuestions" validationRules="mobile-location-required" ref="mobileLocationQuestions" linkWidgetName="MobileLocationLinkWidget" @@ -296,17 +297,18 @@ export default { isVehicleProtected: this.isVehicleProtected, }; }, - set: function (newValue) { + async set(newValue) { if (newValue.addressQuestions.zipCode !== this.zipCode) { - getShopProviderData(newValue.addressQuestions.zipCode).then((result) => { + await getShopProviderData(newValue.addressQuestions.zipCode).then((result) => { this.shopProviderData = result.data; this.selectedProvider = new Provider( this.shopProviderData.mobileProviderNumber ); }); } - this.setMobileLocation(newValue); + //handle promise + newValue.resolve?.(); }, }, isServiceableMobile() { @@ -485,6 +487,10 @@ export default { setMobileFeePart(mobileFeePart) { this.mobileFeePart = mobileFeePart; }, + //creating async function as the computed property can not directly handle asynchronous operations or promises. + async setMobileLocationQuestions(newValue, resolve) { + this.mobileLocationQuestions = { ...newValue, resolve }; + }, getServiceAddressFromStore() { return store.getters.order.serviceLocation.address; }, From 53da1ac5ebb32e583ff4020b69f4b354f563a5f9 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 11 Feb 2025 04:27:52 -0500 Subject: [PATCH 06/12] 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(); } } From 80caabf5efdabba4ab37d51169c46666e99f9199 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Tue, 11 Feb 2025 09:10:00 -0500 Subject: [PATCH 07/12] CASH-201 | Add "Pay on my own" link Add the link to insurance-company Make cash auto selected on quote when this link is used --- .../insurance-company/insurance-company.vue | 16 +++++++++++++++- src/layouts/quote/quote.vue | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index 79e238d47..ddfffe177 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/quote/quote.vue b/src/layouts/quote/quote.vue index 4428f6e40..99b75c9a7 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -328,6 +328,10 @@ export default { } const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => { + // routeParam checked here is set on insurance-selection "Pay on my own" link click + if (from.params.forceCashSelection) { + 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 From 37cd5f01bfb92d5eaa07a4a50ac977a048e4a15b Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Tue, 11 Feb 2025 09:20:48 -0500 Subject: [PATCH 08/12] CASH-201 | Update unit test Fixed broken tests, haven't added new ones yet --- src/layouts/quote/quote.spec.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js index deca0d6d1..42e3aecd0 100644 --- a/src/layouts/quote/quote.spec.js +++ b/src/layouts/quote/quote.spec.js @@ -293,7 +293,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -345,7 +345,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); //Assert @@ -388,7 +388,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -432,7 +432,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote", isInsurance: false } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -478,7 +478,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -523,7 +523,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -570,7 +570,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -618,7 +618,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); @@ -662,7 +662,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, (c) => c(wrapper.vm) ); //Assert @@ -783,7 +783,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - undefined, + {params:{}}, nextFunction ); await nextTick(); From 738e6a108d025e812cda4f68986e9cfdd26f3aa5 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Tue, 11 Feb 2025 10:20:34 -0500 Subject: [PATCH 09/12] CASH-201 | Switch to query parameter --- .../insurance-company/insurance-company.vue | 9 ++++++--- src/layouts/quote/quote.spec.js | 20 +++++++++---------- src/layouts/quote/quote.vue | 4 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index ddfffe177..452484e48 100644 --- a/src/layouts/insurance-company/insurance-company.vue +++ b/src/layouts/insurance-company/insurance-company.vue @@ -101,7 +101,7 @@ export default { return !!this.parentAccountNumber; }, payWithCashButtonCopy() { - return "Pay on my own"; + return this.getCmsContent("PayWithCashWidget", "Text"); } }, methods: { @@ -122,8 +122,11 @@ export default { }, backButtonAction(forceCashSelectionOnQuote) { // Go back to Quote page - if (forceCashSelectionOnQuote) - this.$route.params['forceCashSelection'] = true; + if (forceCashSelectionOnQuote) { + this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route, {"isCashSelected": true}); + return; + } + this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route); }, async forwardButtonAction() { diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js index 42e3aecd0..deca0d6d1 100644 --- a/src/layouts/quote/quote.spec.js +++ b/src/layouts/quote/quote.spec.js @@ -293,7 +293,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -345,7 +345,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); //Assert @@ -388,7 +388,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -432,7 +432,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote", isInsurance: false } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -478,7 +478,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -523,7 +523,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -570,7 +570,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -618,7 +618,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); @@ -662,7 +662,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, (c) => c(wrapper.vm) ); //Assert @@ -783,7 +783,7 @@ describe("quote.vue", () => { await quote.beforeRouteEnter.call( wrapper.vm, { query: { fmgPage: "quote" } }, - {params:{}}, + undefined, nextFunction ); await nextTick(); diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 99b75c9a7..20dc16304 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -328,8 +328,8 @@ export default { } const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => { - // routeParam checked here is set on insurance-selection "Pay on my own" link click - if (from.params.forceCashSelection) { + // 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; From 8b2b22b86846854765f6a5943e3041cf03516243 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Tue, 11 Feb 2025 10:33:52 -0500 Subject: [PATCH 10/12] CASH-201 | Add unit test --- src/layouts/quote/quote.spec.js | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) 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 From 3e75513993a64cd893419c41a605b376dbed08a5 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 11 Feb 2025 15:01:59 -0500 Subject: [PATCH 11/12] CASH-240 CASH-240 save phone and sms optin when other damage type passed in on quickquote --- .../molding-questions/molding-questions.vue | 14 ++++++++++++++ src/layouts/part-questions/part-questions.vue | 15 +++++++++++++++ src/layouts/vehicle-damage/vehicle-damage.vue | 14 ++++++++++++++ 3 files changed, 43 insertions(+) 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/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, From 7caadb88808ae69c50ae12fbb04179d1615c3af3 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Wed, 12 Feb 2025 12:50:23 -0500 Subject: [PATCH 12/12] CASH-250 CASH-250 clear phone / email when user clears the field --- src/layouts/service-zip/service-zip.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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(