From cf693023d76ba0e62044aec4c76d80e6a09b017f Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Wed, 10 Jun 2026 16:47:56 -0400 Subject: [PATCH 1/5] INSR-9940: Improve logic for showing/hiding MSR related copy Includes text on contact-details page and showing/hiding the relevant line item in the cart. Also includes some fixes to clear some warning related to the cart dropdown component. --- src/constants/experiments.js | 3 +- .../cart-dropdown/cart-dropdown.vue | 39 ++++++++++++++++++- .../contact-details/contact-details.vue | 6 ++- .../order-confirmation/order-confirmation.vue | 2 - src/layouts/payment-method/payment-method.vue | 2 - .../payment-page-adyen/payment-page-adyen.vue | 4 +- src/layouts/payment-page/payment-page.vue | 4 +- src/store/index.js | 6 ++- 8 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/constants/experiments.js b/src/constants/experiments.js index 1c0edd15..41a51f84 100644 --- a/src/constants/experiments.js +++ b/src/constants/experiments.js @@ -16,7 +16,8 @@ const experimentSettings = Object.freeze({ ISS_MOBILE_FIRST_MAX_MOBILE_DAYS: 'MaxMobileDays', ISS_MOBILE_FIRST_MAX_PM_MOBILE_DAYS: 'MaxPmMobileDays', ISS_MOBILE_FIRST_SHOW_FIRST_MOBILE_APPOINTMENT: 'ShowMobileFirstAppointment', - ISS_ENABLE_ADYEN_V1: 'ISS_Enable_Adyen_V1' + ISS_ENABLE_ADYEN_V1: 'ISS_Enable_Adyen_V1', + MSR_SPLIT_PAY_ENABLED: 'EnableMSRSplitPay' }); const experimentTest = Object.freeze({ diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index 19a7fe71..e7e4d923 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -146,6 +146,7 @@ import { } from '@/helpers/cart-helper'; import { getPriceOfLineItem, getPriceOfLineItems, getTaxOfLineItems } from '@/helpers/price-calculator'; import { processIfStatements } from '@/helpers/cms-content-helper'; +import partNumberStrings from '@/constants/part-number-strings'; const VERIFYING_COVERAGE = 'Verifying coverage'; const ADVANCED_MOBILE_MODAL_REF_NAME = 'advancedMobileModal'; @@ -229,7 +230,8 @@ export default { servicePrice() { const price = getPriceOfLineItems(getServiceLineItems(this.cartOrder)) ?? 0; const recycleFee = this.recycleFeeLineItem ? getPriceOfLineItem(this.recycleFeeLineItem) : 0; - return price - this.recalibrationPrice - recycleFee; + const mobileFee = this.mobileFeeCartItem ? this.mobileFeeCartItem.subTotal : 0; + return price - this.recalibrationPrice - recycleFee - mobileFee; }, isUnverified() { return isOrderUnverified(this.cartOrder); @@ -242,6 +244,7 @@ export default { }, // TODO fix rounding subTotal() { + const subtotal = getSubtotal(this.cartOrder); return getSubtotal(this.cartOrder); }, salesTax() { @@ -291,7 +294,7 @@ export default { } }); items.push(...vapsCartItems.filter((item) => item != null)); - if (this.mobileFeeCartItem && !isMobileFeeHidden && !this.mobileFeeCartItem.isInsurable) { + if (this.includeMobileFeeInCart) { items.push(this.mobileFeeCartItem); } return items; @@ -380,6 +383,38 @@ export default { return { feeAmount: this.mobileFeeCartItem ? formatAmountInDollars(this.mobileFeeCartItem.subTotal) : '' } + }, + hasMSRPart() { + return this.cartOrder.lineItems?.feeItems?.some((item) => item.partNumber === partNumberStrings.RECAL_MOBILEDUAL || item.partNumber === partNumberStrings.RECAL_MOBILE) ?? false; + }, + includeMobileFeeInCart() { + if (!this.mobileFeeCartItem || this.mobileFeeCartItem.subTotal === 0) { + return false; + } + + const isMobileFeeHidden = this.getSettingValue(experimentSettings.ISS_FEATURE_TOGGLE_IS_MOBILE_FEE_HIDDEN) === 'true'; + if (isMobileFeeHidden) { + return false; + } + + if (this.isITAC || this.isNoComp) { + return true; + } + + if (!this.hasMSRPart) { + return false; + } + + const isSplitPayEnabled = this.getSettingValue(experimentSettings.MSR_SPLIT_PAY_ENABLED) === 'true'; + if (!isSplitPayEnabled) { + return false; + } + + if (!this.mobileFeeCartItem.isInsurable) { + return true; + } + + return false; } }, methods: { diff --git a/src/layouts/contact-details/contact-details.vue b/src/layouts/contact-details/contact-details.vue index 2af0960d..778c1daf 100644 --- a/src/layouts/contact-details/contact-details.vue +++ b/src/layouts/contact-details/contact-details.vue @@ -17,12 +17,11 @@ ref="siteSubHeader" class="subheader" :cmsWidgetName="widget.siteSubHeader" /> - + :cmsWidgetName="appointmentInformationWidget" /> diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 31b09b27..1f68e584 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -33,8 +33,6 @@ + :showAsPaid="false" /> diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue index d116b502..9f936bb8 100644 --- a/src/layouts/payment-page/payment-page.vue +++ b/src/layouts/payment-page/payment-page.vue @@ -45,9 +45,7 @@ ref="cart" class="cart-dropdown-component" :readOnly="true" - :showAsPaid="false" - recyclingModalCmsWidgetName="RecycleModal" - servicePackageTitleWidgetName="ServicePackageTitle" /> + :showAsPaid="false" />
Object.assign(r, c), {}) ?? {}, originalDeductible: (state) => (state.order.damage.isRepair ? state.order.originalDeductible.repair : state.order.originalDeductible.replace), currentDeductible: (state) => (state.order.damage.isRepair ? state.order.currentDeductible.repair : state.order.currentDeductible.replace), - accountNameForEvents: (state) => state.issConfig.clientName + accountNameForEvents: (state) => state.issConfig.clientName, + hasMSRPart: (state) => state.order.lineItems?.feeItems?.some((item) => item.partNumber === partNumberStrings.RECAL_MOBILEDUAL || item.partNumber === partNumberStrings.RECAL_MOBILE) ?? false }, actions: { @@ -572,7 +573,8 @@ export const useMainStore = defineStore({ policyNumber: policy.policyNumber, dateOfLoss: policy.dateOfLoss, zipCode: policy.policyZipCode, - referralCorrelationId: order.referralCorrelationId + referralCorrelationId: order.referralCorrelationId, + referralNumber: order.referralNumber }, bailoutOnError: false }); From eeff370d425da48649ae8de5c18a95e597b1761e Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Wed, 10 Jun 2026 16:55:05 -0400 Subject: [PATCH 2/5] INSR-9940: Remove unused variables --- src/iss-components/cart-dropdown/cart-dropdown.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index e7e4d923..f4b28f53 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -244,7 +244,6 @@ export default { }, // TODO fix rounding subTotal() { - const subtotal = getSubtotal(this.cartOrder); return getSubtotal(this.cartOrder); }, salesTax() { @@ -273,7 +272,6 @@ export default { cartItems() { const items = []; const isRecycleFeeHidden = this.getSettingValue(experimentSettings.ISS_FEATURE_TOGGLE_IS_RECYCLE_FEE_HIDDEN) === 'true'; - const isMobileFeeHidden = this.getSettingValue(experimentSettings.ISS_FEATURE_TOGGLE_IS_MOBILE_FEE_HIDDEN) === 'true'; if (this.isITAC || this.isNoComp) { items.push(this.warrantyCartItem); } From 19b870dc7ce751281f3b9761589522cf0605e52c Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Thu, 11 Jun 2026 09:25:46 -0400 Subject: [PATCH 3/5] INSR-9940: Add/fix tests for cart-dropdown --- .../cart-dropdown/cart-dropdown.spec.js | 160 +++++++++++++++++- .../cart-dropdown/cart-dropdown.vue | 4 - 2 files changed, 156 insertions(+), 8 deletions(-) diff --git a/src/iss-components/cart-dropdown/cart-dropdown.spec.js b/src/iss-components/cart-dropdown/cart-dropdown.spec.js index 16692604..1efd6907 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.spec.js +++ b/src/iss-components/cart-dropdown/cart-dropdown.spec.js @@ -13,6 +13,7 @@ import { getPriceOfLineItems } from '@/helpers/price-calculator.js'; import coverageStatuses from '@/constants/coverage-statuses'; import coverageType from '@/constants/coverage-type'; import * as cartHelper from '@/helpers/cart-helper'; +import { experimentSettings } from '@/constants/experiments'; const VERIFYING_COVERAGE = 'Verifying coverage'; @@ -30,7 +31,7 @@ jest.mock('@/helpers/service-package-helper', () => ({ getPackageContents: jest.fn() })); -function getMountedComponent(mainInitialState = {}, initialData = {}, propsData = {}) { +function getMountedComponent(mainInitialState = {}, initialData = {}, propsData = {}, experimentMockFunction = jest.fn(() => 'false')) { const mountOptions = getMountOptions({ router: { navigate: jest.fn() @@ -44,7 +45,7 @@ function getMountedComponent(mainInitialState = {}, initialData = {}, propsData }); useMainStore(testingPinia); - mountOptions.global.mixins[0].methods.getSettingValue = jest.fn(() => 'false'); + mountOptions.global.mixins[0].methods.getSettingValue = experimentMockFunction; mountOptions.global.plugins = [testingPinia]; mountOptions.data = () => (initialData); mountOptions.propsData = propsData; @@ -804,12 +805,16 @@ describe('cart-dropdown component', () => { partType: partTypeStrings.REPLACE_FEE })); }); - test('when mobileFee, includes mobile fee', () => { + test('when mobile fee should be included, includes mobile fee', () => { // Arrange const storeData = { order: { lineItems: { - feeItems: [{ partType: partTypeStrings.MOBILE_FEE }] + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, sellingPrice: 123}] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.NO_COMP } } }; @@ -977,6 +982,153 @@ describe('cart-dropdown component', () => { expect(result.name).toBe(expectedName); }); }); + describe('includeMobileFeeInCart', () => { + test('returns false with no mobile fee', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [] + } + } + }; + const { wrapper } = getMountedComponent(storeData); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(false); + }); + + test('returns false with a mobile fee with no price', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 0 }] + } + } + }; + const { wrapper } = getMountedComponent(storeData); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(false); + }); + + test('returns true for priced mobile fee for No Comp', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 100 }] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.NO_COMP + } + } + }; + const { wrapper } = getMountedComponent(storeData); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(true); + }); + + test('returns true for priced mobile fee for ITAC', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 100 }] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.ITAC + } + } + }; + const { wrapper } = getMountedComponent(storeData); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(true); + }); + + test('returns false for priced mobile fee for Deductible without Split Pay', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 100 }] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.Deductible + } + } + }; + const { wrapper } = getMountedComponent(storeData); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(false); + }); + + test('returns false for priced mobile fee for Deductible with Split Pay and isInsurable=true', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 100, isInsurable: true }] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.Deductible + } + } + }; + const { wrapper } = getMountedComponent(storeData, {}, {}, (settingName) => (settingName === experimentSettings.MSR_SPLIT_PAY_ENABLED).toString()); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(false); + }); + + test('returns true for priced mobile fee for Deductible with Split Pay and isInsurable=false', () => { + // Arrange + const storeData = { + order: { + lineItems: { + feeItems: [{ partType: partTypeStrings.MOBILE_FEE, price: 100, isInsurable: false }] + }, + insuranceCoverage: { + coverageStatus: coverageStatuses.VERIFIED, + coverageType: coverageType.Deductible + } + } + }; + const { wrapper } = getMountedComponent(storeData, {}, {}, (settingName) => (settingName === experimentSettings.MSR_SPLIT_PAY_ENABLED).toString()); + + // Act + const result = wrapper.vm.includeMobileFeeInCart; + + // Assert + expect(result).toBe(true); + }); + }); }); describe('method', () => { const dollarAmount = '$84.00'; diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index f4b28f53..2cd0fb94 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -399,10 +399,6 @@ export default { return true; } - if (!this.hasMSRPart) { - return false; - } - const isSplitPayEnabled = this.getSettingValue(experimentSettings.MSR_SPLIT_PAY_ENABLED) === 'true'; if (!isSplitPayEnabled) { return false; From ada9e54d098ffe2c1022d3d77a6106dfe8967787 Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Thu, 11 Jun 2026 12:08:00 -0400 Subject: [PATCH 4/5] INSR-9940: hasMSRPart as helper function instead of store getter --- src/helpers/recal-helper.js | 5 +++++ src/iss-components/cart-dropdown/cart-dropdown.vue | 3 ++- src/layouts/contact-details/contact-details.vue | 3 ++- src/store/index.js | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/helpers/recal-helper.js b/src/helpers/recal-helper.js index 029aee25..0bb650ff 100644 --- a/src/helpers/recal-helper.js +++ b/src/helpers/recal-helper.js @@ -1,3 +1,4 @@ +import partNumberStrings from '@/constants/part-number-strings'; import partTypeStrings from '@/constants/part-type-strings'; import { deepClone, getNonFalseValuesOfPropertyInArrayOfObjects } from '@/helpers/object-helper'; @@ -117,3 +118,7 @@ export function anyPartWithRequiresRecalFlag(lineItems) { return flattened.some((li) => li.requiresRecalibration === true); } + +export function hasMSRPart(lineItems) { + return lineItems?.feeItems?.some((item) => item.partNumber === partNumberStrings.RECAL_MOBILEDUAL || item.partNumber === partNumberStrings.RECAL_MOBILE) ?? false +} diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index 2cd0fb94..9572f9af 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -147,6 +147,7 @@ import { import { getPriceOfLineItem, getPriceOfLineItems, getTaxOfLineItems } from '@/helpers/price-calculator'; import { processIfStatements } from '@/helpers/cms-content-helper'; import partNumberStrings from '@/constants/part-number-strings'; +import { hasMSRPart } from '@/helpers/recal-helper'; const VERIFYING_COVERAGE = 'Verifying coverage'; const ADVANCED_MOBILE_MODAL_REF_NAME = 'advancedMobileModal'; @@ -383,7 +384,7 @@ export default { } }, hasMSRPart() { - return this.cartOrder.lineItems?.feeItems?.some((item) => item.partNumber === partNumberStrings.RECAL_MOBILEDUAL || item.partNumber === partNumberStrings.RECAL_MOBILE) ?? false; + return hasMSRPart(this.cartOrder.lineItems); }, includeMobileFeeInCart() { if (!this.mobileFeeCartItem || this.mobileFeeCartItem.subTotal === 0) { diff --git a/src/layouts/contact-details/contact-details.vue b/src/layouts/contact-details/contact-details.vue index 778c1daf..65c348d5 100644 --- a/src/layouts/contact-details/contact-details.vue +++ b/src/layouts/contact-details/contact-details.vue @@ -134,6 +134,7 @@ import widgetFields from '@/constants/cms-widget-fields'; import states from '@/constants/states'; import applicationConfig from '@/constants/application-config'; import { vehicleProtectedAnswers } from '@/constants/contact-details'; +import { hasMSRPart } from '@/helpers/recal-helper'; // DEFINE VALIDATION RULES defineRule('street-address-required', required(errorMessages.SERVICE_ADDRESS_REQUIRED)); @@ -228,7 +229,7 @@ export default { }, {}); }, appointmentInformationWidget() { - return this.mainStore.hasMSRPart ? this.widget.MSRAppointmentInformation : this.widget.appointmentInformation; + return hasMSRPart(this.mainStore.lineItems) ? this.widget.MSRAppointmentInformation : this.widget.appointmentInformation; } }, watch: { diff --git a/src/store/index.js b/src/store/index.js index 6e4b4d07..e43f60d3 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -454,8 +454,7 @@ export const useMainStore = defineStore({ .reduce((r, c) => Object.assign(r, c), {}) ?? {}, originalDeductible: (state) => (state.order.damage.isRepair ? state.order.originalDeductible.repair : state.order.originalDeductible.replace), currentDeductible: (state) => (state.order.damage.isRepair ? state.order.currentDeductible.repair : state.order.currentDeductible.replace), - accountNameForEvents: (state) => state.issConfig.clientName, - hasMSRPart: (state) => state.order.lineItems?.feeItems?.some((item) => item.partNumber === partNumberStrings.RECAL_MOBILEDUAL || item.partNumber === partNumberStrings.RECAL_MOBILE) ?? false + accountNameForEvents: (state) => state.issConfig.clientName }, actions: { From 6597f24a24332a5c05cc676acd80e360952bda23 Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Thu, 11 Jun 2026 13:24:37 -0400 Subject: [PATCH 5/5] INSR-9940: useMainStore instead of this.mainStore --- src/layouts/contact-details/contact-details.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/contact-details/contact-details.vue b/src/layouts/contact-details/contact-details.vue index 65c348d5..1f5c6304 100644 --- a/src/layouts/contact-details/contact-details.vue +++ b/src/layouts/contact-details/contact-details.vue @@ -229,7 +229,7 @@ export default { }, {}); }, appointmentInformationWidget() { - return hasMSRPart(this.mainStore.lineItems) ? this.widget.MSRAppointmentInformation : this.widget.appointmentInformation; + return hasMSRPart(useMainStore().lineItems) ? this.widget.MSRAppointmentInformation : this.widget.appointmentInformation; } }, watch: {