From 95e6d02b748b5b34c18c3d62bce58d87c6551338 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 27 Mar 2024 20:53:01 +0530 Subject: [PATCH 1/4] CSR-2039 removing from estimate page --- src/layouts/estimate/estimate.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index f1318e205..4931b9c61 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -264,7 +264,6 @@ export default { navigateToHeritageFunnel({ shouldSaveSession: true, pageNameToLog: "estimate", - loadingModal: this.$refs.loadingModal, }); } else if (this.$store.getters.order.referralNumber?.length === 6) { await this.navigateForwardWithSingleCarMatch(); From 4553fbf0224d5954c23b90f769c987aa69a3d7d3 Mon Sep 17 00:00:00 2001 From: Sneha Date: Thu, 28 Mar 2024 15:47:34 +0530 Subject: [PATCH 2/4] CSR-2021 --- .../promo-modal-question.vue | 18 ++++++++++-- src/helpers/promotions-helper.js | 5 ++-- src/layouts/quote/quote.vue | 4 ++- src/store/index.js | 28 ++++++++++++++++--- 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/fmg-components/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue index 59e4fccf4..cf5e52f21 100644 --- a/src/fmg-components/promo-modal-question/promo-modal-question.vue +++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue @@ -108,6 +108,11 @@ export default { required: false, default: true, }, + useDefaultCashParentAccount: { + type: Boolean, + required: false, + default: false, + }, }, computed: { promoLinkText() { @@ -188,7 +193,13 @@ export default { resetModalButtonStyle() { this.modal.resetButtonStyle(); }, - async getPromoCodeData(promoCode, lineItems, addableVaps, pageNameToLog = null) { + async getPromoCodeData( + promoCode, + lineItems, + addableVaps, + useDefaultCashParentAccount, + pageNameToLog = null + ) { const pageName = pageNameToLog ?? this.$options?.name; const promoValidationResponse = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.VALIDATE_ORDER_PROMO_AND_SAVE_SERVER_DATA, @@ -196,6 +207,7 @@ export default { promoCode: promoCode, lineItemsToUse: lineItems, addableVaps: addableVaps, + useDefaultCashParentAccount: useDefaultCashParentAccount, }, pageName, false @@ -261,6 +273,7 @@ export default { this.promoCode, this.lineItems, this.addableVaps, + this.useDefaultCashParentAccount, this.pageName ); if (promoCodeData.isValid) { @@ -271,7 +284,8 @@ export default { await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA, { - billToAccountNumber: "87291", + billToAccountNumber: + store.getters.order.payment.billToAccountNumber, providerNumber: store.getters.order.serviceLocation.provider.providerNumber, appointmentType: diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js index e8d5f4e8f..9155c2f61 100644 --- a/src/helpers/promotions-helper.js +++ b/src/helpers/promotions-helper.js @@ -98,7 +98,8 @@ export function removeVapsPromosFromPromoArray(promoArray) { export async function revalidatePromosAndValidateQueryStringPromo( newPromo, pricedLineItems, - pageNameToLog + pageNameToLog, + useDefaultCashParentAccount = false ) { const hasActivePromos = store.getters.order.lineItems.promos; const hasInactivePromos = store.getters.payment.inactivePromos; @@ -114,7 +115,7 @@ export async function revalidatePromosAndValidateQueryStringPromo( ) { revalidatePromoResponse = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.REVALIDATE_ORDER_PROMOS_AND_SAVE_SERVER_DATA, - {}, + { useDefaultCashParentAccount }, pageNameToLog, false ); diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 002c679f5..065d44e82 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -47,6 +47,7 @@ :addableVaps="addableVaps" pageName="quote" :taxPromos="false" + :useDefaultCashParentAccount="true" modalWidgetName="PromoModalWidget" /> is an optional parameter if the lineItems in the store may not be up to date async validateOrderPromoAndSaveServerData( context, - { payload: { promoCode, lineItemsToUse, addableVaps }, pageNameToLog } + { + payload: { + promoCode, + lineItemsToUse, + addableVaps, + useDefaultCashParentAccount = false, + }, + pageNameToLog, + } ) { const order = context.getters.order; lineItemsToUse = lineItemsToUse ?? order.lineItems; @@ -2376,7 +2384,9 @@ export const actions = { isRepair: order.damage.isRepair, glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace), lineItemsOnOrder: getArrayOfAllLineItems(lineItemsToUse), - parentAccountNumber: order.payment.parentAccountNumber, + parentAccountNumber: useDefaultCashParentAccount + ? applicationConfig.CASH_PARENT_ACCOUNT_NUMBER + : order.payment.parentAccountNumber, referralSequenceNumber: order.referralSequenceNumber, serviceState: order.serviceLocation.state, serverData: order.lineItems.serverData, @@ -2413,7 +2423,15 @@ export const actions = { // All payload parameters are optional - will use store data if not provided async revalidateOrderPromosAndSaveServerData( context, - { payload: { activePromosToUse, inactivePromosToUse, lineItemsToUse }, pageNameToLog } + { + payload: { + activePromosToUse, + inactivePromosToUse, + lineItemsToUse, + useDefaultCashParentAccount = false, + }, + pageNameToLog, + } ) { const order = context.getters.order; @@ -2438,7 +2456,9 @@ export const actions = { isRepair: order.damage.isRepair, glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace), lineItemsOnOrder: getArrayOfAllLineItems(lineItemsToUse), - parentAccountNumber: order.payment.parentAccountNumber, + parentAccountNumber: useDefaultCashParentAccount + ? applicationConfig.CASH_PARENT_ACCOUNT_NUMBER + : order.payment.parentAccountNumber, referralSequenceNumber: order.referralSequenceNumber, serviceState: order.serviceLocation.state, serverData: order.lineItems.serverData, From 72c52f457bb7a28b4c5b31b7245d8538742a0843 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Mon, 1 Apr 2024 17:29:14 +0530 Subject: [PATCH 3/4] CSR-2039 code cleanup - remove loader parameter --- src/helpers/heritage-integration/navigation-helper.js | 6 +----- src/helpers/heritage-integration/navigation-helper.spec.js | 2 +- src/layouts/address-lookup/address-lookup.spec.js | 1 - src/layouts/schedule/schedule.vue | 1 - src/mixins/vehicle-questions-mixin.js | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 22bc3d814..cb3844bfc 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -105,16 +105,12 @@ export async function getImplicitNavigation(toRoute) { Used to navigate to the heritage funnel with the correct query string and url. */ -export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, loadingModal }) { +export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) { // Create the order (or save existing order) when navigating to Heritage Funnel. if (shouldSaveSession) { await saveSession({ pageNameToLog: pageNameToLog, shouldAwaitSaveSessionQueue: true }); } - if (loadingModal && loadingModal.showModal) { - loadingModal.showModal(); - } - var heritageParms = { corid: store.getters.order.referralCorrelationId, src: "concept-funnel", diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js index eedf8edf1..963a6434c 100644 --- a/src/helpers/heritage-integration/navigation-helper.spec.js +++ b/src/helpers/heritage-integration/navigation-helper.spec.js @@ -554,7 +554,7 @@ describe("navigateToHeritageFunnel", () => { router.navigateToExternalUrl = jest.fn(); // Act - await navigateToHeritageFunnel({ loadingModal: null, shouldSaveSession: true }); + await navigateToHeritageFunnel({ shouldSaveSession: true }); // Assert expect(saveSessionFunction).toHaveBeenCalled(); diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js index 731e664dc..677c14069 100644 --- a/src/layouts/address-lookup/address-lookup.spec.js +++ b/src/layouts/address-lookup/address-lookup.spec.js @@ -9,7 +9,6 @@ import { storeActions } from "@/constants/store-actions"; import { storeMutations } from "@/constants/store-mutations"; import { navigationScenarios } from "@/router/router-constants/navigation-scenarios"; import store from "@/store"; -import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { experimentSettings } from "@/constants/experiments"; jest.mock("@/helpers/damage-helper", () => ({ diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 05f439472..1eb80015e 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -79,7 +79,6 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import baseMixin from "@/mixins/base-mixin.js"; import { storeActions } from "@/constants/store-actions"; import { settleAllPromises } from "@/helpers/layout-helper"; -import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper"; import { calcDaysBetweenDates, diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index d0fd9dd1b..e6587746e 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -458,13 +458,11 @@ export default { navigateToHeritageFunnel({ shouldSaveSession: true, pageNameToLog: currentPage, - loadingModal: self.$refs.loadingModal, }); } else if (payment.isInsurance && payment.insuranceCoverage.isVerified) { navigateToHeritageFunnel({ shouldSaveSession: true, pageNameToLog: currentPage, - loadingModal: self.$refs.loadingModal, }); } else { self.$router.navigateWithSaving( From 70aa94654ac30b139ae8a62de89b2e35780561ad Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 4 Apr 2024 09:25:46 -0400 Subject: [PATCH 4/4] CSR-2048 fix styling on drop-off-alert. --- src/ux-components/alert/alert.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue index 637ba3e1d..08f78b279 100644 --- a/src/ux-components/alert/alert.vue +++ b/src/ux-components/alert/alert.vue @@ -156,6 +156,11 @@ export default { height: 0.75rem; padding: 0; } + &.drop-off-alert { + p { + margin: 0; + } + } &.alert-dismissible { button { display: flex;