From bca068e3fb316d13e8091e9e620dfb63010adaf4 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Mon, 28 Oct 2024 12:21:08 -0400 Subject: [PATCH 01/11] Point local to dev for safelite hop --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index b111f079d..03c72c59b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,7 +6,7 @@ process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost"; process.env.VUE_APP_MY_ACCOUNT = "https://myaccountdev.safelite.com/"; //process.env.VUE_APP_SAFELITE_HOP = "http://localhost:60966/fmgCheckoutShared.aspx"; -process.env.VUE_APP_SAFELITE_HOP = "https://sv2-safelitehop-sys.safelite.com/fmgCheckoutShared.aspx"; +process.env.VUE_APP_SAFELITE_HOP = "https://sv2-safelitehop-dev.safelite.com/fmgCheckoutShared.aspx"; // GA & GTM process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = From 8baa213004a25daca7f17992a4746ad84a939302 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Mon, 28 Oct 2024 15:49:45 -0400 Subject: [PATCH 02/11] CSR-2266 | Get bill-to earlier in flow --- src/layouts/address-lookup/address-lookup.vue | 1 + .../license-plate-lookup/license-plate-lookup.vue | 1 + src/layouts/service-zip/service-zip.vue | 1 + src/layouts/vin-lookup/vin-lookup.vue | 3 ++- src/mixins/vin-pages-mixin.js | 14 ++++++++++++++ src/store/index.js | 6 ++---- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 403982a83..6ac7a3d9a 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -375,6 +375,7 @@ export default { }, false ); + await this.getAndSaveBillToAccountNumber(); return await this.navigateForward(carsFound); }, diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 308180d20..2f82691ce 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -323,6 +323,7 @@ export default { false ); + await this.getAndSaveBillToAccountNumber(); return await this.navigateForward(); }, lookupVin(plate, state) { diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index ddcc4edf0..25045af0a 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/src/layouts/service-zip/service-zip.vue @@ -198,6 +198,7 @@ export default { }, false ); + await this.getAndSaveBillToAccountNumber(); if (!zipCodeData.isValid) { this.displayInvalidZipAlert = true; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index b63158680..b8253c456 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -345,7 +345,8 @@ export default { }, false ); - + + await this.getAndSaveBillToAccountNumber(); return await this.navigateForward(); } diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js index 75054f776..7d15066c5 100644 --- a/src/mixins/vin-pages-mixin.js +++ b/src/mixins/vin-pages-mixin.js @@ -42,5 +42,19 @@ export default { }; return vinLookupMethods[vinSelection] || null; }, + async getAndSaveBillToAccountNumber() { + const pageName = this.$options?.name; + const billToAccountNumber = await this.dispatchStoreActionWithLogging( + storeActions.GET_BILL_TO_ACCOUNT_NUMBER, + {}, + pageName, + false + ); + await this.dispatchStoreAction( + this.storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER, + billToAccountNumber, + false + ); + }, }, }; diff --git a/src/store/index.js b/src/store/index.js index 14b9ff7f9..b132311c7 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2804,10 +2804,8 @@ export const actions = { pageNameToLog, } ) { - // Cash orders default to 87291 - update if/when more detailed - // billToAccountNumbers are needed for cash - if (parentAccountNumber == applicationConfig.CASH_PARENT_ACCOUNT_NUMBER) { - return applicationConfig.CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER; + if (!parentAccountNumber) { + parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER; } const queryString = `ParentAccountNumber=${parentAccountNumber}` + From 5c2876d6a40c9b457df28981aa3b36c5d7cb79ae Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Mon, 28 Oct 2024 15:56:45 -0400 Subject: [PATCH 03/11] CSR-2266 | Unit Tests & formatting --- src/layouts/service-zip/service-zip.spec.js | 1 + src/layouts/vin-lookup/vin-lookup.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js index 1a22bb03b..214fd96f0 100644 --- a/src/layouts/service-zip/service-zip.spec.js +++ b/src/layouts/service-zip/service-zip.spec.js @@ -485,6 +485,7 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse }), setCmsContent: jest.fn(), navigateForwardWithSingleCarMatch: jest.fn(), + getAndSaveBillToAccountNumber: jest.fn(), getZipCodeData: jest.fn().mockImplementation(() => { if (customZipDataResponse) { return customZipDataResponse; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index b8253c456..6bac87c19 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -345,7 +345,7 @@ export default { }, false ); - + await this.getAndSaveBillToAccountNumber(); return await this.navigateForward(); } From 248bca511317ddc954a1e9345b302bf755ebbe8a Mon Sep 17 00:00:00 2001 From: Sneha Date: Tue, 29 Oct 2024 18:47:29 +0530 Subject: [PATCH 04/11] Tech review changes --- src/helpers/service-package-helper.js | 9 +++++++++ .../service-package-question.vue | 12 ++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/helpers/service-package-helper.js b/src/helpers/service-package-helper.js index 310a87e0e..6ff937564 100644 --- a/src/helpers/service-package-helper.js +++ b/src/helpers/service-package-helper.js @@ -239,6 +239,15 @@ export function getPackageNameByType(packageType) { return package_names[packageType] || null; } +export function getDiscountPackageName(discountPackage) { + const package_names = { + ECON: packageNames.TIER_ONE, + STANDARD: packageNames.TIER_TWO, + PREMIUM: packageNames.TIER_THREE, + }; + return package_names[discountPackage] || null; +} + function maxTier(tierA, tierB) { if (tierA === packageNames.TIER_THREE || tierB === packageNames.TIER_THREE) { return packageNames.TIER_THREE; diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue index e475becd5..7df8dab5f 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -28,6 +28,7 @@ import { containsLineItemWithPartType, findLineItemsWithPartType, getPackageNameByType, + getDiscountPackageName, } from "@/helpers/service-package-helper"; import { getPromosThatMatchLineItemsOnOrder, @@ -161,16 +162,7 @@ export default { const discountServicePackage = experimentMixin.methods.getSettingValue( experimentSettings.PROMO_ON_PACKAGE ); - switch (discountServicePackage) { - case "ECON": - return packageNames.TIER_ONE; - case "STANDARD": - return packageNames.TIER_TWO; - case "PREMIUM": - return packageNames.TIER_THREE; - default: - return null; - } + return getDiscountPackageName(discountServicePackage); }, frontWipersApplicableForTierTwo() { return shouldFrontWipersBeAvailable( From c7dbfa74231b9e0acf195772816acb3e3fcb7015 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 29 Oct 2024 10:18:50 -0400 Subject: [PATCH 05/11] CSR-2288 set bill-to on insurance company page CSR-2288 set bill-to on insurance company page once the user -has selected the company --- .../insurance-company/insurance-company.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index bc5034c67..256e09f5c 100644 --- a/src/layouts/insurance-company/insurance-company.vue +++ b/src/layouts/insurance-company/insurance-company.vue @@ -130,6 +130,20 @@ export default { this.parentAccountNumber.toString(), false ); + + const billToAccountNumber = await baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_BILL_TO_ACCOUNT_NUMBER, + {}, + "insurance-company", + false + ); + + baseMixin.methods.dispatchStoreAction( + storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER, + billToAccountNumber, + false + ); + navigateToHeritageFunnel({ shouldSaveSession: true, pageNameToLog: "insurance-company", From 5fc18c1e6896266090ebfe0be09da8756d8a6ad3 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 29 Oct 2024 15:33:24 -0400 Subject: [PATCH 06/11] CSR-2293 fix city name word wrap. --- .../shop-question/shop-list-button/shop-list-button.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue index 13ae42095..01c8078ff 100644 --- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue +++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue @@ -8,15 +8,15 @@ :aria-label="buttonLabel" class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4">
- {{ + {{ buttonLabel }} - {{ + {{ buttonLabelSubCopy }}
Date: Tue, 29 Oct 2024 15:37:52 -0400 Subject: [PATCH 07/11] Remove unneeded class. --- .../shop-question/shop-list-button/shop-list-button.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue index 01c8078ff..381ff4607 100644 --- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue +++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue @@ -8,7 +8,7 @@ :aria-label="buttonLabel" class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4">
- {{ + {{ buttonLabel }} {{ From 90bc2e038348f9969606af6c469ae71961af69bf Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 29 Oct 2024 15:55:15 -0400 Subject: [PATCH 08/11] CSR-2290 - reset part state when vehicle changed CSR-2290 - reset part state when vehicle changed by heritage during insurance verification --- src/router/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 73605c543..72e28ed59 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,6 +115,12 @@ const routes = [ to.query.fmgPage ); + // clear part related state because heritage selected a new vehicle + if (to.query.fmgPage === fmgPageValues.VEHICLE && eval(getFunnelCookie()?.HasDelayedClaimRegistration)) { + console.log(new Date() + "Router: Policy Vehicle Changed"); + store.commit(storeMutations.RESET_GLASS_PARTS_STATE); + } + const pageToRedirectTo = await getPageToRouteExistingOrderTo(to); // This logic may determine that the user should be sent to heritage -- if so, do that here. From 4c832789df24db2a0b2afcadbccf34b13e747089 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 29 Oct 2024 15:56:52 -0400 Subject: [PATCH 09/11] Revert "CSR-2290 - reset part state when vehicle changed" This reverts commit 90bc2e038348f9969606af6c469ae71961af69bf. --- src/router/index.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 72e28ed59..73605c543 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,12 +115,6 @@ const routes = [ to.query.fmgPage ); - // clear part related state because heritage selected a new vehicle - if (to.query.fmgPage === fmgPageValues.VEHICLE && eval(getFunnelCookie()?.HasDelayedClaimRegistration)) { - console.log(new Date() + "Router: Policy Vehicle Changed"); - store.commit(storeMutations.RESET_GLASS_PARTS_STATE); - } - const pageToRedirectTo = await getPageToRouteExistingOrderTo(to); // This logic may determine that the user should be sent to heritage -- if so, do that here. From 9725665fac43dd1c9f849b6cb6fcb9074f3a0872 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 29 Oct 2024 15:55:15 -0400 Subject: [PATCH 10/11] CSR-2290 - reset part state when vehicle changed CSR-2290 - reset part state when vehicle changed by heritage during insurance verification --- src/router/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 73605c543..72e28ed59 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,6 +115,12 @@ const routes = [ to.query.fmgPage ); + // clear part related state because heritage selected a new vehicle + if (to.query.fmgPage === fmgPageValues.VEHICLE && eval(getFunnelCookie()?.HasDelayedClaimRegistration)) { + console.log(new Date() + "Router: Policy Vehicle Changed"); + store.commit(storeMutations.RESET_GLASS_PARTS_STATE); + } + const pageToRedirectTo = await getPageToRouteExistingOrderTo(to); // This logic may determine that the user should be sent to heritage -- if so, do that here. From 78ccdb82505294a32e0c738c05716dcc26eb00ae Mon Sep 17 00:00:00 2001 From: CarlNation Date: Wed, 30 Oct 2024 09:31:53 -0400 Subject: [PATCH 11/11] CSR-2294 $0 deductible do not show payment alert CSR-2294 $0 deductible do not show payment alert --- src/layouts/payment-method/payment-method.vue | 7 ++++++- src/router/index.js | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 194243d38..74a3c65c0 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -78,7 +78,7 @@ validationRules="payment-method-required" /> 0 + ); + }, totalAmountDue() { return baseMixin.methods.getAmountDue(this.lineItems); }, diff --git a/src/router/index.js b/src/router/index.js index 72e28ed59..218e32d35 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -116,7 +116,10 @@ const routes = [ ); // clear part related state because heritage selected a new vehicle - if (to.query.fmgPage === fmgPageValues.VEHICLE && eval(getFunnelCookie()?.HasDelayedClaimRegistration)) { + if ( + to.query.fmgPage === fmgPageValues.VEHICLE && + eval(getFunnelCookie()?.HasDelayedClaimRegistration) + ) { console.log(new Date() + "Router: Policy Vehicle Changed"); store.commit(storeMutations.RESET_GLASS_PARTS_STATE); }