{
if (shop.value.length > 5 && shop.value.startsWith("00")) {
return shop.value.substring(1);
@@ -179,7 +182,7 @@ export default {
this.pushEventToGA(
this.GaCategories.SERVICE_LOCATION,
gaAction,
- shops.join("/"),
+ shops.join(","),
true
);
}
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/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index a60eb4aff..25045af0a 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -132,11 +132,24 @@ export default {
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
+
if (store.getters.externalParameterState?.isExternalParameter) {
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
+ );
+ }
+
baseMixin.methods.ResetExternalParamsAndHideModal();
}
}
@@ -185,6 +198,7 @@ export default {
},
false
);
+ await this.getAndSaveBillToAccountNumber();
if (!zipCodeData.isValid) {
this.displayInvalidZipAlert = true;
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 62da598db..51da0cc1e 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -157,6 +157,17 @@ export default {
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
+ );
+ }
baseMixin.methods.ResetExternalParamsAndHideModal();
}
} else {
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 7f629db0a..30191e4fa 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -98,6 +98,9 @@ import store from "@/store";
import { storeActions } from "@/constants/store-actions.js";
import baseMixin from "@/mixins/base-mixin.js";
import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { applicationConfig } from "../../constants/application-config";
+import { queryStrings } from "@/constants/query-strings";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
//define validation rules
defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -127,6 +130,12 @@ export default {
},
async beforeRouteEnter(to, from, next) {
+ const log = getQuerystringParameter(queryStrings.LOG);
+ if (eval(log)) {
+ console.log("----------------- applicationConfig start -----------------");
+ console.log(new Date() + JSON.stringify(applicationConfig));
+ console.log("----------------- applicationConfig end -----------------");
+ }
// Call APIs
const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
const experimentForLogging = store.getters.applicationUser.experiments.find(
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index b63158680..6bac87c19 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -346,6 +346,7 @@ export default {
false
);
+ await this.getAndSaveBillToAccountNumber();
return await this.navigateForward();
}
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index b66ad59dc..ac2cdee89 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -446,6 +446,7 @@ export default {
}
}
pushToDataLayerIfDefined({
+ event: "productArray",
productArray: {
coupon: coupon,
discount: discount.toFixed(2),
@@ -544,7 +545,11 @@ export default {
);
}
pushToDataLayerIfDefined({
- eCommerceCart: { products: combinedLineItems, subTotal: parseInt(subtotal) },
+ event: "eCommerceCart",
+ eCommerceCart: {
+ products: combinedLineItems,
+ subTotal: parseInt(subtotal),
+ },
});
}
},
@@ -632,6 +637,7 @@ export default {
}
}
pushToDataLayerIfDefined({
+ event: "commissionJunctionGtmData",
commissionJunctionGtmData: {
cj_commission_junction_event: cjEvent,
cj_referral_sequence_number: refSequenceNum,
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index c1e60d16a..b6d3e0074 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -8,6 +8,7 @@ import { queryStrings } from "@/constants/query-strings";
import { dynamicStrings } from "@/constants/dynamic-strings";
import { partTypeStrings } from "../constants/part-type-strings";
import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
+import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
export default {
data() {
@@ -82,7 +83,7 @@ export default {
};
},
getTierOnePackagePrice(lineItems) {
- let lineItemsToPrice = lineItems.filter((lineItem) => {
+ let lineItemsToPrice = lineItems?.filter((lineItem) => {
return (
lineItem.partType != partTypeStrings.FRONT_WIPER &&
lineItem.partType != partTypeStrings.REAR_WIPER &&
@@ -94,23 +95,20 @@ export default {
return totalPrice;
},
filterOutFees(lineItems) {
- const filteredLineItems = lineItems.filter((item) => {
+ const filteredLineItems = lineItems?.filter((item) => {
return (
- (!item.partType.includes("FEE") && !item.partType.includes("EARLY BIRD")) ||
- (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR")
+ (!item?.partType?.includes("FEE") && !item?.partType?.includes("EARLY BIRD")) ||
+ (item?.partType === "REPAIR FEE" && item?.partNumber != "SUPPLIES-REPAIR")
);
});
return filteredLineItems;
},
filterOutRecalibration(lineItems) {
- const filteredLineItems = lineItems.filter((item) => {
- return !item.partType.includes(partTypeStrings.RECALIBRATION);
- });
- return filteredLineItems;
+ return getItemsWithoutRecalParts(lineItems);
},
getTotalPriceOfAllLineItemsAndChildParts(lineItems, includeTax) {
let totalPrice = 0;
- lineItems.forEach((lineItem) => {
+ lineItems?.forEach((lineItem) => {
totalPrice += this.getTotalLineItemPrice(lineItem, includeTax);
if (lineItem.childParts) {
totalPrice += this.getTotalPriceOfAllLineItemsAndChildParts(
@@ -141,41 +139,43 @@ export default {
},
getAmountDue(lineItems, includeTax = true) {
var amountDue = 0;
- if (lineItems.glassParts) {
+ if (lineItems?.glassParts) {
amountDue += this.getTotalPriceOfAllLineItemsAndChildParts(
lineItems.glassParts,
includeTax
);
}
- if (lineItems.supportingItems) {
+
+ if (lineItems?.supportingItems) {
amountDue += this.getTotalPriceOfAllLineItemsAndChildParts(
lineItems.supportingItems,
includeTax
);
}
- if (lineItems.vaps) {
+
+ const order = this.hasSubmittedOrder() ? this.getSubmittedOrder() : store.getters.order;
+ if (
+ store.getters.coverageIsVerified &&
+ !order.policy.isNoComp &&
+ !order.policy.isItac
+ ) {
+ amountDue = order.policy.currentDeductible;
+ }
+
+ if (lineItems?.vaps) {
amountDue += this.getTotalPriceOfAllLineItemsAndChildParts(
lineItems.vaps,
includeTax
);
}
- if (lineItems.promos) {
+
+ if (lineItems?.promos) {
amountDue += this.getTotalPriceOfAllLineItemsAndChildParts(
lineItems.promos,
includeTax
);
}
- const order = this.hasSubmittedOrder() ? this.getSubmittedOrder() : store.getters.order;
-
- if (
- order.payment.insuranceCoverage.isVerified &&
- !order.policy.isNoComp &&
- !order.policy.isItac
- ) {
- amountDue += order.policy.currentDeductible;
- }
-
return ((amountDue * 100) / 100).toFixed(2);
},
getSubTotal(lineItems) {
diff --git a/src/mixins/base-mixin.spec.js b/src/mixins/base-mixin.spec.js
index 9a062a831..a3493910e 100644
--- a/src/mixins/base-mixin.spec.js
+++ b/src/mixins/base-mixin.spec.js
@@ -175,7 +175,7 @@ describe("baseMixin.js", () => {
promos: [],
};
- const payment = { insuranceCoverage: { isVerified: true } };
+ const payment = { insuranceCoverage: { isVerified: false } };
const policy = { isNoComp: false, isItac: false, currentDeductible: 250 };
store.getters = {
@@ -190,7 +190,7 @@ describe("baseMixin.js", () => {
var amtDue = mixIn.methods.getAmountDue(lineItems);
- expect(amtDue).toEqual("303.00");
+ expect(amtDue).toEqual("53.00");
});
test("getAmountDue should function with a submitted order", () => {
@@ -223,7 +223,7 @@ describe("baseMixin.js", () => {
promos: [],
};
- const payment = { insuranceCoverage: { isVerified: true } };
+ const payment = { insuranceCoverage: { isVerified: false } };
const policy = { isNoComp: false, isItac: false, currentDeductible: 250 };
mixIn.methods.hasSubmittedOrder = jest.fn().mockReturnValue(true);
@@ -240,7 +240,7 @@ describe("baseMixin.js", () => {
var amtDue = mixIn.methods.getAmountDue(lineItems);
- expect(amtDue).toEqual("303.00");
+ expect(amtDue).toEqual("53.00");
});
test("getAmountDue for cash should sum lineitems", () => {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 2749d1933..517fc7c90 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -450,7 +450,17 @@ export default {
const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
// save to store lineItems.glassParts
- self.dispatchStoreAction(storeActions.SAVE_GLASS_PARTS, collectedGlassParts, false);
+ await self.dispatchStoreAction(
+ storeActions.SAVE_GLASS_PARTS,
+ collectedGlassParts,
+ false
+ );
+
+ await self.dispatchStoreActionWithLogging(
+ storeActions.GET_RECAL_PARTS_AND_SAVE_TO_LINE_ITEMS,
+ null,
+ currentPage
+ );
const payment = store.getters.payment;
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/router/index.js b/src/router/index.js
index 4c57921b7..a3584b442 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
+import { externalParameterStatus } from "@/constants/external-parameters";
// Heritage integration
import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
@@ -96,8 +97,6 @@ const routes = [
);
updateOrCreateFunnelCookie();
}
- //Update external parameter state
- updateExternalParameterState();
//Affiliate Cookies
const affiliateCookies = getAffiliateCookies();
@@ -114,6 +113,17 @@ const routes = [
to.query.fmgPage
);
+ //Update external parameter state
+ updateExternalParameterState();
+
+ // clear part related state because heritage selected a new vehicle
+ if (
+ to.query.fmgPage === fmgPageValues.VEHICLE &&
+ eval(getFunnelCookie()?.HasDelayedClaimRegistration)
+ ) {
+ 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.
@@ -264,7 +274,10 @@ router.beforeEach(async (to, from, next) => {
);
// If alert event is on the bus, then display the alert
if (alertEvent !== undefined || unknownAlertEvent !== undefined) {
- store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, false);
+ store.commit(
+ storeMutations.UPDATE_IS_EXTERNAL_PARAMETER,
+ externalParameterStatus.INACTIVE
+ );
}
}
// fromPaymentToConfirmation workaround for navigating from an iframe but
@@ -315,12 +328,12 @@ router.afterEach(async (to, from) => {
analyticsMixin.methods.pushOrderToDataLayer();
if (to.query.fmgPage == fmgPageValues.CONFIRMATION) {
- //Push Product Array to Data Layer
- analyticsMixin.methods.pushProductArrayToDataLayer();
-
//Push Ecommerce Cart to Data Layer
analyticsMixin.methods.pushECommerceCartToDataLayer();
+ //Push Product Array to Data Layer
+ analyticsMixin.methods.pushProductArrayToDataLayer();
+
//Push Commission Junction Gtm Data To Data Layer
analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
}
@@ -540,7 +553,7 @@ async function DisplayPageError() {
type: globalEventTypes.Danger,
}
);
- store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, false);
+ store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
@@ -621,6 +634,22 @@ function getRedirectedStartPage() {
}
function updateExternalParameterState() {
+ // if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
+ // are returning. clear out prior related things that need to be selected again like parts and damage type.
+ if (
+ store.getters.externalParameterState?.isExternalParameter ==
+ externalParameterStatus.INACTIVE
+ ) {
+ store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
+ store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
+ state: null,
+ zipCode: null,
+ zipCodeCtu: null,
+ });
+ store.dispatch(storeActions.SAVE_EMAIL, null);
+ store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+ }
+
const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
@@ -639,7 +668,7 @@ function updateExternalParameterState() {
externalParameterModel &&
externalParameterStyle
) {
- store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, true);
+ store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
@@ -662,8 +691,10 @@ function updateExternalParameterState() {
);
}
}
- if (externalParameterZipCode && externalParameterEmail) {
+ if (externalParameterZipCode) {
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+ }
+ if (externalParameterEmail) {
store.commit(
storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
externalParameterEmail
diff --git a/src/store/index.js b/src/store/index.js
index 89d0db2a3..ac69e4eb4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -36,9 +36,15 @@ import sharedMutations from "./vuex-shared-mutations/vuexSharedMutations";
import {
coverageStatus,
coverageStatusValue,
+ coverageStatusEnum,
coverageType,
coverageTypeValue,
+ coverageTypeEnum,
} from "@/constants/insurance";
+import { containsRecalParts, getTopLevelPartsWithRecal } from "@/helpers/recal-helper";
+import { externalParameterStatus } from "@/constants/external-parameters";
+import { experimentSettings } from "@/constants/experiments";
+import experimentMixin from "@/mixins/experiment-mixin.js";
// Export State
const getDefaultState = () => {
@@ -473,10 +479,6 @@ export const mutations = {
externalParameterState.quote.servicePackage = servicePackage;
saveExternalParameterState(externalParameterState);
},
- updateExternalParameterSource(state, source) {
- externalParameterState.source = source;
- saveExternalParameterState(externalParameterState);
- },
//RESET ExternalParameter MUTATIONS
resetExternalParameterVehicleState(state) {
externalParameterState.vehicle.year = null;
@@ -503,16 +505,11 @@ export const mutations = {
saveExternalParameterState(externalParameterState);
},
resetExternalParameterQuoteState(state) {
- externalParameterState.quote.isInsurance = null;
externalParameterState.quote.servicePackage = null;
saveExternalParameterState(externalParameterState);
},
- resetExternalParameterSourceState(state) {
- externalParameterState.source = null;
- saveExternalParameterState(externalParameterState);
- },
resetIsExternalParameter(state) {
- externalParameterState.isExternalParameter = null;
+ externalParameterState.isExternalParameter = externalParameterStatus.INACTIVE;
saveExternalParameterState(externalParameterState);
},
@@ -682,7 +679,17 @@ export const mutations = {
sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu;
state.order.serviceLocation.techNotes = sessionInformation.order.serviceLocation.techNotes;
- state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance;
+ // if we're loading a session and we do not have a provider number yet, then set isInsurance to null so that
+ // a service package is not selected by default on the quote page.
+ if (
+ !sessionInformation.order.payment.isInsurance &&
+ !sessionInformation.order.serviceLocation.provider?.providerNumber
+ ) {
+ state.order.payment.isInsurance = null;
+ } else {
+ state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance;
+ }
+
state.order.payment.insuranceCoverage.isVerified =
coverageStatusValue(sessionInformation?.order.insuranceCoverage.coverageStatus) ===
coverageStatus.VERIFIED
@@ -772,6 +779,24 @@ export const getters = {
);
return !!nonWindshieldItems?.length;
},
+ coverageIsVerified: (state) => {
+ let order;
+ if (window.sessionStorage.getItem("submittedOrder") !== null) {
+ order = JSON.parse(window.sessionStorage.getItem("submittedOrder"));
+ } else {
+ order = state.order;
+ }
+
+ if (
+ order.payment?.insuranceCoverage?.isVerified &&
+ order.policy?.currentDeductible != 9999 &&
+ order.policy?.currentDeductible != 7777
+ ) {
+ return true;
+ }
+
+ return false;
+ },
isMobileAppointment: (state) => {
return state.order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
},
@@ -793,6 +818,13 @@ export const getters = {
return false;
},
+ shouldHideRecalibration: (state) => {
+ return (
+ experimentMixin.methods
+ .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
+ ?.toLowerCase() === "true" && getters.isRecalibrationOnOrder
+ );
+ },
areRearWipersOnOrder: (state) => {
return !!state.order.lineItems.vaps?.some(
(vap) => vap.partType.toUpperCase() === partTypeStrings.REAR_WIPER.toUpperCase()
@@ -894,12 +926,12 @@ export const getters = {
.filter((x) => !!x.isActive)
.map((x) => x.settings)
.reduce((r, c) => Object.assign(r, c), {}) ?? {},
+
isVerifiedAndDeductibleZeroConfirmed: (state) => {
// used as a CMS variable on /payment-method, needed for FunnelSubHeaderWidget on cart pages
if (
- (state.order.policy.currentDeductible === 0 ||
- state.order.policy.currentDeductible > 0) &&
- state.order.payment.insuranceCoverage.coverageStatus === coverageStatus.VERIFIED &&
+ state.order.policy.currentDeductible === 0 &&
+ getters.coverageIsVerified(state) &&
!state.order.policy.isNoComp
) {
return true;
@@ -915,7 +947,7 @@ export const getters = {
externalParameterQuote: (state) => externalParameterState?.quote,
externalParameterServiceZip: (state) => externalParameterState?.serviceZip,
externalParameterEstimate: (state) => externalParameterState?.estimate,
- externalParameterSource: (state) => externalParameterState?.source,
+ isExternalParameter: (state) => externalParameterState?.isExternalParameter,
};
function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
@@ -1121,6 +1153,12 @@ export const actions = {
},
// Dependency Actions
+ resetVehicleStateAndDependencies(context) {
+ context.commit(storeMutations.RESET_VEHICLE_STATE);
+
+ context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+ },
+
resetDamageAndDependencies(context) {
context.commit(storeMutations.RESET_DAMAGE_STATE);
@@ -1531,15 +1569,38 @@ export const actions = {
},
getMobileFeePart(context, { pageNameToLog }) {
- const damageType = context.getters.damage.isRepair ? "Repair" : "Replace";
+ const serviceType = context.getters.damage.isRepair ? "Repair" : "Install";
+ const facilityType = "Mobile";
const parentAccountNumber = context.getters.payment.parentAccountNumber;
const billToAccountNumber = context.getters.payment.billToAccountNumber
? context.getters.payment.billToAccountNumber
: applicationConfig.CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER;
+ const order = context.getters.order;
+ const coverageStatus = coverageStatusEnum(order.payment?.insuranceCoverage?.coverageStatus);
+ const coverageType = coverageTypeEnum(order.payment?.insuranceCoverage?.coverageType);
+ const isItacOptimized = order.policy?.isItac ?? false;
+ const zipCode =
+ order.serviceLocation?.provider?.address?.zipCode ?? order.serviceLocation?.zipCode;
+
+ var providerNumber =
+ order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
+ if (providerNumber.startsWith("00") && providerNumber.length > 5) {
+ providerNumber = providerNumber.substring(1);
+ }
+
+ var endPoint = `${endpoints.GetMobileFeePart.url}/?serviceType=${serviceType}&facilityType=${facilityType}&parentAccountNumber=${parentAccountNumber}&billToAccountNumber=${billToAccountNumber}&providerNumber=${providerNumber}&isItacOptimized=${isItacOptimized}&zipCode=${zipCode}`;
+ if (coverageStatus) {
+ endPoint = `${endPoint}&coverageStatus=${coverageStatus}`;
+ }
+
+ if (coverageType) {
+ endPoint = `${endPoint}&coverageType=${coverageType}`;
+ }
+
return globalMethods.callHttpClient({
method: endpoints.GetMobileFeePart.method,
- endpoint: `${endpoints.GetMobileFeePart.url}/${damageType}/${parentAccountNumber}/${billToAccountNumber}`,
+ endpoint: endPoint,
logApiCall: true,
pageNameToLog: pageNameToLog,
});
@@ -1566,16 +1627,21 @@ export const actions = {
},
getServiceabilityDetails(context, { payload: { serviceZipCode }, pageNameToLog }) {
- const lineItemsWithOnlyPartNumbers = context.getters.order.lineItems.supportingItems?.map(
+ const escapeRecalibrationType = (rt) => rt.split("&").join("%26");
+
+ const partialLineItemsObjects = context.getters.order.lineItems.glassParts?.map(
(lineItem) => ({
partNumber: lineItem.partNumber,
+ recalibrationType: lineItem.recalibrationType
+ ? escapeRecalibrationType(lineItem.recalibrationType)
+ : undefined,
})
);
var lineItems = null;
- if (lineItemsWithOnlyPartNumbers) {
+ if (partialLineItemsObjects) {
lineItems = buildQueryStringParameterFromArrayOfComplexObjects(
- lineItemsWithOnlyPartNumbers,
+ partialLineItemsObjects,
"lineItems"
);
}
@@ -1590,7 +1656,12 @@ export const actions = {
"glassPieces"
);
- var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}`;
+ const parentAccountNumber =
+ context.getters.order.payment.parentAccountNumber ??
+ applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
+ const referralSequenceNumber = context.getters.order.referralSequenceNumber;
+
+ var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&referralSequenceNumber=${referralSequenceNumber}&applicationName=${applicationConfig.ANALYTICS_APPLICATION_NAME}`;
if (lineItems) {
endPoint += `&${lineItems}`;
}
@@ -1609,11 +1680,26 @@ export const actions = {
getProviders(context, { payload: { serviceZipCode }, pageNameToLog }) {
const damageType = context.getters.damage.isRepair ? "Repair" : "Replace";
+ const accountNumber =
+ context.getters.order.payment.parentAccountNumber ??
+ applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
+ const carId = context.getters.order.vehicle.carId;
+ const partsWithRecal = getTopLevelPartsWithRecal(
+ context.getters.order.lineItems.glassParts
+ );
+ const windshieldPartWithRecal = partsWithRecal?.length > 0 ? partsWithRecal[0] : null;
+
const shopRadiusInMiles = 100;
+ let url = `${endpoints.GetProviders.url}/${serviceZipCode}/${damageType}/${shopRadiusInMiles}/${accountNumber}/true/${carId}`;
+
+ if (windshieldPartWithRecal) {
+ url += `/${windshieldPartWithRecal.partNumber}`;
+ }
+
return globalMethods.callHttpClient({
method: endpoints.GetProviders.method,
- endpoint: `${endpoints.GetProviders.url}/${serviceZipCode}/${damageType}/${shopRadiusInMiles}`,
+ endpoint: url,
logApiCall: true,
pageNameToLog: pageNameToLog,
});
@@ -2579,9 +2665,10 @@ export const actions = {
carId: order.vehicle.carId,
correlationId: order.referralCorrelationId,
eon: order.eon,
+ isInsurance: order.payment.isInsurance,
isRepair: order.damage.isRepair,
glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
- lineItemsOnOrder: getArrayOfAllLineItems(lineItemsToUse),
+ lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),
parentAccountNumber: useDefaultCashParentAccount
? applicationConfig.CASH_PARENT_ACCOUNT_NUMBER
: order.payment.parentAccountNumber,
@@ -2651,9 +2738,10 @@ export const actions = {
carId: order.vehicle.carId,
correlationId: order.referralCorrelationId,
eon: order.eon,
+ isInsurance: order.payment.isInsurance,
isRepair: order.damage.isRepair,
glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
- lineItemsOnOrder: getArrayOfAllLineItems(lineItemsToUse),
+ lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),
parentAccountNumber: useDefaultCashParentAccount
? applicationConfig.CASH_PARENT_ACCOUNT_NUMBER
: order.payment.parentAccountNumber,
@@ -2721,10 +2809,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}` +
@@ -2885,7 +2971,6 @@ export const actions = {
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_ESTIMATE_STATE);
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SERVICEZIP_STATE);
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_QUOTE_STATE);
- context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SOURCE_STATE);
context.commit(storeMutations.RESET_IS_EXTERNAL_PARAMETER);
}
},
@@ -2903,6 +2988,49 @@ export const actions = {
externalParameterMMS.externalParameterStyle
);
},
+
+ async getRecalPartsAndSaveToLineItems(context, { pageNameToLog }) {
+ // identify each part that needs recal
+ const glassParts = context.state.order?.lineItems?.glassParts
+ ? deepClone(context.state.order.lineItems.glassParts)
+ : [];
+
+ for (let i = 0; i < glassParts.length; i++) {
+ // does this part need recal?
+ const needsRecal =
+ !!glassParts[i].requiresRecalibration && !!glassParts[i].recalibrationType;
+
+ if (needsRecal) {
+ const recalType = glassParts[i].recalibrationType;
+ const parentAccountNumber =
+ context.state.order.payment.parentAccountNumber ??
+ applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
+
+ // Get part from API
+ const urlExtension = `${context.state.order.vehicle.carId}/${glassParts[i].partNumber}/${recalType}/${parentAccountNumber}/${context.state.order.serviceLocation.zipCode}/${applicationConfig.ANALYTICS_APPLICATION_NAME}/${context.state.order.referralSequenceNumber}`;
+
+ const recalPartResponse = await globalMethods.callHttpClient({
+ method: endpoints.GetRecalPart.method,
+ endpoint: `${endpoints.GetRecalPart.url}/${urlExtension}`,
+ payload: {},
+ pageNameToLog: pageNameToLog,
+ });
+
+ // If any parts retrieved, add as children to the glass part.
+ if (
+ recalPartResponse.status === 200 &&
+ recalPartResponse.data.recalibrationParts?.length > 0
+ ) {
+ if (!glassParts[i].childParts) {
+ glassParts[i].childParts = [];
+ }
+
+ glassParts[i].childParts.push(...recalPartResponse.data.recalibrationParts);
+ context.dispatch(storeActions.SAVE_GLASS_PARTS, glassParts);
+ }
+ }
+ }
+ },
};
export default createStore({
@@ -2925,34 +3053,7 @@ export default createStore({
// Private Functions
function getHasRecalibrationPart(state) {
- var hasRequiresRecalibration =
- getNonFalseValuesOfPropertyInArrayOfObjects(
- state.order.lineItems.glassParts,
- "requiresRecalibration"
- )?.length > 0;
- var hasRecalibrationType =
- getNonFalseValuesOfPropertyInArrayOfObjects(
- state.order.lineItems.glassParts,
- "recalibrationType"
- )?.length > 0;
-
- if (hasRequiresRecalibration) {
- if (hasRecalibrationType) {
- // Has both 'requiresRecalibration' and 'recalibrationType' and 'recalibrationType'
- return (
- getNonFalseValuesOfPropertyInArrayOfObjects(
- state.order.lineItems.glassParts,
- "recalibrationType"
- )[0].toLowerCase() != "unknown"
- );
- } else {
- // Has 'requiresRecalibration' but no 'recalibrationType' at all
- return true;
- }
- } else {
- // Does not have 'requiresRecalibration'
- return false;
- }
+ return containsRecalParts(state.order.lineItems);
}
function sortArrayOfObjectsByPropertyValue(arrayOfObjects, propertyName) {
@@ -3120,32 +3221,46 @@ export function mapTaxedLineItemsToStoreFormat(availableLineItems, storeLineItem
return lineItems;
}
-export function getArrayOfAllLineItems(lineItems) {
+export function getArrayOfAllLineItemsAndChildParts(lineItems) {
let consolidatedLineItemsArray = [];
if (lineItems.glassParts != null)
- consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.glassParts];
+ consolidatedLineItemsArray = [
+ ...consolidatedLineItemsArray,
+ ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.glassParts),
+ ];
if (lineItems.supportingItems != null)
- consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.supportingItems];
+ consolidatedLineItemsArray = [
+ ...consolidatedLineItemsArray,
+ ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.supportingItems),
+ ];
if (lineItems.vaps != null)
- consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.vaps];
+ consolidatedLineItemsArray = [
+ ...consolidatedLineItemsArray,
+ ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.vaps),
+ ];
if (lineItems.promos != null)
- consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.promos];
+ consolidatedLineItemsArray = [
+ ...consolidatedLineItemsArray,
+ ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.promos),
+ ];
return consolidatedLineItemsArray;
}
-function getFlattenedArrayOfLineItemsWithChildParts(lineItems) {
+function getFlattenedArrayOfLineItemsWithChildParts(lineItems, childPartRecursiveCall = false) {
let flattenedArray = [];
lineItems?.forEach((lineItem) => {
+ // this assumes childparts will never be a glass part
+ lineItem.isChildPart = childPartRecursiveCall;
flattenedArray.push(lineItem);
if (lineItem.childParts) {
flattenedArray = [
...flattenedArray,
- ...getFlattenedArrayOfLineItemsWithChildParts(lineItem.childParts),
+ ...getFlattenedArrayOfLineItemsWithChildParts(lineItem.childParts, true),
];
}
});
@@ -3168,7 +3283,7 @@ function getFlattenedLineItemsWithGlassPartTag(lineItems) {
return {
partNumber: lineItem.partNumber,
partType: lineItem.partType,
- isGlassPart: true,
+ isGlassPart: lineItem.isChildPart ? false : true,
};
});
@@ -3212,6 +3327,9 @@ function addGuidToLineItemsIfNotAlreadyThere(lineItems) {
if (!lineItem.id) {
lineItem.id = crypto.randomUUID();
}
+ if (lineItem.childParts) {
+ addGuidToLineItemsIfNotAlreadyThere(lineItem.childParts);
+ }
});
}
@@ -3393,7 +3511,7 @@ async function resetScheduleIfUnavailable(context, order, pageNameToLog) {
function createExternalParameterDefaultState() {
// create default externalParameter state
const externalParameterDefaultState = {
- isExternalParameter: null,
+ isExternalParameter: externalParameterStatus.NOT_SET,
vehicle: {
year: null,
make: null,
@@ -3416,7 +3534,6 @@ function createExternalParameterDefaultState() {
isInsurance: null,
servicePackage: null,
},
- source: null,
};
// set to session storage
saveExternalParameterState(externalParameterDefaultState);
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index fb1c73f98..313e7e37f 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -5,7 +5,6 @@ import { storeActions } from "@/constants/store-actions";
import { experimentTriggers } from "@/constants/experiments";
import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
import { AppointmentTypeStrings } from "@/constants/schedule-constants";
-import { coverageStatus } from "../constants/insurance";
// Mock global method
globalMethods.callHttpClient = jest.fn();
@@ -2935,7 +2934,10 @@ describe("Actions", () => {
// Arrange
const context = state;
const promoCode = "testPromo";
- const lineItemsToUse = { vaps: [{ partNumber: 1 }], promos: [2] };
+ const lineItemsToUse = {
+ vaps: [{ partNumber: 1 }],
+ promos: [{ promoCode: "1wiper0" }],
+ };
const addableVaps = [{ partNumber: "addableVap" }];
context["getters"] = {
@@ -2999,7 +3001,7 @@ describe("Actions", () => {
{ partNumber: "SBB22", id: "GUID1" },
{ partNumber: "SBB22", id: "GUID2" },
],
- promos: [2],
+ promos: [{ promoCode: "1wiper0" }],
};
const addableVaps = [{ partNumber: "SBB22" }, { partNumber: "SBB22" }];
@@ -3059,7 +3061,10 @@ describe("Actions", () => {
// Arrange
const context = state;
const promoCode = "testPromo";
- const lineItemsToUse = { vaps: [{ partNumber: 1 }], promos: [2] };
+ const lineItemsToUse = {
+ vaps: [{ partNumber: 1 }],
+ promos: [{ promoCode: "1wiper0" }],
+ };
const addableVaps = [{ partNumber: "addableVap" }];
context["getters"] = {
@@ -3140,7 +3145,7 @@ describe("Actions", () => {
referralSequenceNumber: "test",
lineItems: {
vaps: [{ partNumber: 1 }],
- promos: [2],
+ promos: [{ promoCode: "1wiper0" }],
serverData: "test",
},
},
@@ -3152,7 +3157,10 @@ describe("Actions", () => {
crypto.randomUUID = jest.fn(() => "GUID");
- const expectedLineItemsOnOrder = [{ partNumber: 1, id: "GUID" }, 2];
+ const expectedLineItemsOnOrder = [
+ { partNumber: 1, isChildPart: false, id: "GUID" },
+ { promoCode: "1wiper0", isChildPart: false },
+ ];
// Act
actions.validateOrderPromoAndSaveServerData(context, {
@@ -3200,7 +3208,7 @@ describe("Actions", () => {
referralSequenceNumber: "test",
lineItems: {
vaps: [{ partNumber: 1 }],
- promos: [2],
+ promos: [{ promoCode: "1wiper0" }],
serverData: "test",
},
},
@@ -3258,7 +3266,7 @@ describe("Actions", () => {
referralSequenceNumber: "test",
lineItems: {
vaps: [{ partNumber: 1 }],
- promos: [2],
+ promos: [{ promoCode: "1wiper0" }],
serverData: "test",
},
},
@@ -3350,9 +3358,9 @@ describe("Actions", () => {
const context = state;
context.commit = jest.fn(() => {});
- const activePromosToUse = [{ promoCode: "providedPromo" }];
+ const activePromosToUse = [{ promoCode: "providedPromo", isChildPart: false }];
const inactivePromosToUse = ["providedInactivePromo"];
- const vapsProvided = [{ id: 123 }];
+ const vapsProvided = [{ id: 123, isChildPart: false }];
const lineItemsToUse = { vaps: vapsProvided };
context["getters"] = {
@@ -3440,8 +3448,8 @@ describe("Actions", () => {
referralSequenceNumber: "test",
lineItems: {
serverData: "test",
- promos: [{ promoCode: "test" }],
- vaps: [{ partNumber: "testVap", id: "providedId" }],
+ promos: [{ promoCode: "test", isChildPart: false }],
+ vaps: [{ partNumber: "testVap", isChildPart: false, id: "providedId" }],
},
},
};
@@ -3950,6 +3958,111 @@ describe("Getters", () => {
mutations.updateVaps(storeState, mockStateValues.funnelVaps);
mutations.updateGlassToReplace(storeState, mockStateValues.glassToReplace);
+ //Assert
+ expect(getters.experimentOrder(storeState)).toEqual({
+ funnelVehicleYear: mockStateValues.vehicleYear,
+ funnelVehicleMake: mockStateValues.vehicleMake,
+ funnelVehicleModel: mockStateValues.vehicleModel,
+ funnelVehicleStyle: mockStateValues.vehicleStyle,
+ funnelIsRepair: mockStateValues.isRepair,
+ funnelNumberOfChips: mockStateValues.numberOfChips,
+ funnelCarId: mockStateValues.carId,
+ funnelServiceCity: mockStateValues.serviceCity,
+ funnelServiceState: mockStateValues.serviceState,
+ funnelServiceZipCode: mockStateValues.serviceZipCode,
+ funnelParentAccountNumber: mockStateValues.parentAccountNumber,
+ funnelIsCoverageVerified: mockStateValues.isCoverageVerified,
+ funnelOrderPartNumbers: ["WINDSHIELDPARTNUMBER"],
+ funnelOrderPartTypes: ["ADAS, maybe"],
+ funnelHasRecalibrationPart: false,
+ funnelSelectedMultiGlass: false,
+ funnelSelectedWindshieldGlass: true,
+ funnelSelectedBackGlass: false,
+ funnelSelectedDriverSideGlass: false,
+ funnelSelectedPassengerSideGlass: false,
+ funnelProviderNumber: mockStateValues.funnelProviderNumber,
+ funnelReferralType: mockStateValues.funnelReferralType,
+ funnelServiceZipCodeCtu: mockStateValues.funnelServiceZipCodeCtu,
+ });
+ });
+
+ test("Single windshield with recalibration child part > return correct experimentOrder values", () => {
+ // Arrange
+ const storeState = state;
+ const mockStateValues = {
+ vehicleYear: 1000,
+ vehicleMake: "CarMake",
+ vehicleModel: "CarModel",
+ vehicleStyle: "SuperCoolStyle",
+ isRepair: false,
+ numberOfChips: 0,
+ carId: "Gibberish",
+ serviceCity: "Columbus",
+ serviceState: "OH-IO",
+ serviceZipCode: 43215,
+ parentAccountNumber: "999999",
+ isCoverageVerified: false,
+ glassParts: [
+ {
+ partNumber: "WINDSHIELDPARTNUMBER",
+ description: "This is a windshield",
+ recalibrationType: "ADAS, maybe",
+ requiresRecalibration: true,
+ requiresCapabilityQuestions: false,
+ childParts: [
+ {
+ partNumber: "THIRD RECAL",
+ description: "Additional Static Recal",
+ recalibrationType:
+ "DUAL & RECAL THIRD & HC FUNCTION TEST & RL SENSOR",
+ ribCode: "RL",
+ safelitePartNumber: "THIRD RECAL",
+ status: "ACTIVE",
+ partType: "ADAS RECALIBRATION",
+ childParts: [],
+ recalibrationFees: [],
+ salesTax: null,
+ },
+ ],
+ },
+ ],
+ otherParts: [],
+ glassToReplace: [
+ {
+ glassLocation: "Windshield",
+ glassName: "Single",
+ },
+ ],
+ funnelProviderNumber: "1",
+ funnelReferralType: "CASH QUOTE",
+ funnelServiceZipCodeCtu: "11111",
+ };
+
+ //Act
+ mutations.updateYear(storeState, mockStateValues.vehicleYear);
+ mutations.updateMake(storeState, mockStateValues.vehicleMake);
+ mutations.updateModel(storeState, mockStateValues.vehicleModel);
+ mutations.updateStyle(storeState, mockStateValues.vehicleStyle);
+ mutations.updateIsRepair(storeState, mockStateValues.isRepair);
+ mutations.updateNumberOfChips(storeState, mockStateValues.numberOfChips);
+ mutations.updateCarId(storeState, mockStateValues.carId);
+ mutations.updateServiceLocation(storeState, {
+ city: mockStateValues.serviceCity,
+ state: mockStateValues.serviceState,
+ zipCode: mockStateValues.serviceZipCode,
+ zipCodeCtu: mockStateValues.funnelServiceZipCodeCtu,
+ provider: {
+ providerNumber: mockStateValues.funnelProviderNumber,
+ },
+ });
+ mutations.updateParentAcctNumber(storeState, mockStateValues.parentAccountNumber);
+ mutations.updateInsuranceVerifiedStatus(storeState, mockStateValues.isCoverageVerified);
+ mutations.updateIsInsurance(storeState, false);
+ mutations.updateGlassParts(storeState, mockStateValues.glassParts);
+ mutations.updateSupportingItems(storeState, mockStateValues.funnelSupportingItems);
+ mutations.updateVaps(storeState, mockStateValues.funnelVaps);
+ mutations.updateGlassToReplace(storeState, mockStateValues.glassToReplace);
+
//Assert
expect(getters.experimentOrder(storeState)).toEqual({
funnelVehicleYear: mockStateValues.vehicleYear,
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 =