jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/csr-2147

Browse source
This commit is contained in:
Chloe Herd 2024-09-12 09:53:52 -04:00
commit 4075d685f4
37 changed files with 645 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/css/hop-styling.css
View file

@ -143,6 +143,7 @@ body .buttonContainer button {
@media (hover: hover) {
body .buttonContainer button {
background: linear-gradient(270deg, #1574a1 0%, #003d58 100%);
cursor: pointer;
}
}
body .buttonContainer button:focus {

1
public/scss/hop-styling.scss
View file

@ -151,6 +151,7 @@ body {
height: 48px;
@media (hover: hover) {
background: linear-gradient(270deg, #1574a1 0%, #003d58 100%);
cursor: pointer;
}
&:focus {
box-shadow: 0 0 0 3px, 0 0 0 5.5px #06577c;

2
src/constants/experiments.js
View file

@ -1,5 +1,6 @@
const experimentUniverses = {
CONCEPT_FUNNEL: "ConceptFunnel",
RECAL_PRICE_REMOVAL: "NextGen_RecalPriceRemoval",
};
const experimentSettings = {
@ -11,6 +12,7 @@ const experimentSettings = {
SUBMIT_ORDER_ENABLE_PIA: "SubmitOrder_Enable_PIA",
IS_EMAIL_OPTIONAL: "isEmailOptional",
SERVICE_PACKAGE_DISCOUNT: "OfferServicePackageDiscount",
RECAL_PRICE_REMOVE: "RecalPriceRemove",
};
const experimentTriggers = {

1
src/constants/query-strings.js
View file

@ -36,6 +36,7 @@ const queryStrings = {
VIN_SELECTION: "vinselection",
SERVICE_PACKAGE: "servicepackage",
NUMBER_OF_CHIPS: "numberofchips",
LOG: "log",
UTM_SOURCE: "_source",
UTM_MEDIUM: "_medium",
UTM_CAMPAIGN: "_campaign",

36
src/digital-components/base-input-button/base-input-button.spec.js
View file

@ -1123,42 +1123,6 @@ describe("baseInputButton.vue", () => {
});
});
describe("buttonId", () => {
test("groupName and value combo yield correct id for input button with string value", () => {
// Arrange/Act
const { wrapper } = setupMocks({
mockData: {
propsData: {
groupName: "my test-name",
value: "Aaa-BBB CcC",
},
},
});
// Assert
const inputElement = wrapper.find("input");
expect(wrapper.vm.buttonId).toBe("my-test-name-Aaa-BBB-CcC");
expect(inputElement.attributes().id).toBe("my-test-name-Aaa-BBB-CcC");
});
test("groupName and value combo yield correct id for input button with number value", () => {
// Arrange/Act
const { wrapper } = setupMocks({
mockData: {
propsData: {
groupName: "my test-name",
value: 2,
},
},
});
// Assert
const inputElement = wrapper.find("input");
expect(wrapper.vm.buttonId).toBe("my-test-name-2");
expect(inputElement.attributes().id).toBe("my-test-name-2");
});
});
describe("inputType", () => {
test("isMultiSelect is true => inputType is 'checkbox'", () => {
// Arrange/Act

7
src/digital-components/base-input-button/base-input-button.vue
View file

@ -34,6 +34,7 @@ import {
handleInputComponentBlur,
} from "@/helpers/button-question-focus-helper";
import { inputButtonProps } from "@/digital-components/base-input-button/button-functionality-props";
import { v4 as uuidv4 } from "uuid";
export default {
name: "base-input-button",
@ -45,6 +46,7 @@ export default {
data() {
return {
valueToEmit: null,
buttonId: uuidv4(),
};
},
mounted() {
@ -153,11 +155,6 @@ export default {
inputType() {
return this.isMultiSelect ? "checkbox" : "radio";
},
buttonId() {
return `${this.groupName?.replace(" ", "-")}-${this.value
?.toString()
?.replace(" ", "-")}`;
},
isValueSelectedOnClick() {
return this.isMultiSelect || this.selectingInitiatesLoad;
},

38
src/fmg-components/cart/cart.vue
View file

@ -1,10 +1,9 @@
<template>
<div class="cart">
<div class="px-0">
<!-- set class to 'expaned' on line 7 so cart is open on page load. This may be temporary -->
<div
class="row vin-toggle flex align-items-center pt-4"
:class="[isExpanded ? '' : 'expanded']"
:class="[isExpanded ? 'expanded' : '']"
@click="toggleIsExpanded()">
<a
aria-label="expand cart"
@ -188,10 +187,11 @@ export default {
insuranceDeductible: Number,
insuranceCompanyName: String,
showInsuranceCoverageAs: String,
shouldHideRecalibration: Boolean,
},
data() {
return {
isExpanded: false,
isExpanded: true, // set default to true so cart is open on page load. This may be temporary.
currencyFormatter: new Intl.NumberFormat("en-US", {
style: "currency",
currency: "USD",
@ -303,10 +303,11 @@ export default {
},
lineItemsWithoutRecal() {
if (!this.lineItems || this.lineItems.length < 1) return;
const lineItemsCopy = deepClone(this.lineItems);
lineItemsCopy.supportingItems = baseMixin.methods.filterOutRecalibration(
lineItemsCopy.supportingItems
);
lineItemsCopy.supportingItems = lineItemsCopy.supportingItems ? baseMixin.methods.filterOutRecalibration(
lineItemsCopy?.supportingItems
) : [];
return lineItemsCopy;
},
showCoverageAsPending() {
@ -437,14 +438,13 @@ export default {
packagePrice() {
let packagePrice = 0;
if (!this.isInsurance) {
// CASH ONLY
if (!this.isInsurance && this.shouldHideRecalibration) { // Update packagePrice if Cash only && is part of RemoveRecal experiment
packagePrice = baseMixin.methods.getTierOnePackagePrice(
baseMixin.methods.filterOutFees(
baseMixin.methods.filterOutRecalibration(this.availableLineItems)
baseMixin.methods.filterOutRecalibration(this.availableLineItems) // Strip out recal before filtering out fees
)
);
} else if (!this.showCoverageAsVerified && !this.showCoverageAsPending) {
} else if (!this.showCoverageAsVerified && !this.showCoverageAsPending) { // Update packagePrice if is verified insurance OR if Cash && not part of RemoveRecal experiment
packagePrice = baseMixin.methods.getTierOnePackagePrice(
baseMixin.methods.filterOutFees(this.availableLineItems)
);
@ -999,22 +999,22 @@ export default {
},
subTotal() {
if (!this.lineItems || this.lineItems.length < 1) return;
return this.isInsurance
? baseMixin.methods.getSubTotal(this.lineItems)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal);
return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal
},
salesTax() {
if (!this.lineItems || this.lineItems.length < 1) return;
return this.isInsurance
? baseMixin.methods.getSalesTax(this.lineItems)
: baseMixin.methods.getSalesTax(this.lineItemsWithoutRecal);
return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal
},
amountDue() {
if (!this.lineItems || this.lineItems.length < 1) return;
if (this.showAsPaid) return 0;
return this.isInsurance
? baseMixin.methods.getAmountDue(this.lineItems)
: baseMixin.methods.getAmountDue(this.lineItemsWithoutRecal);
return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal
},
amountPaid() {
if (!this.showAsPaid) {

10
src/helpers/date-helper.js
View file

@ -8,6 +8,10 @@ export function getDateDifferenceInDays(startDate, endDate) {
return Math.round(difference / (1000 * 3600 * 24));
}
export function get12HourTimeFormat(time) {
if (!time) {
return null;
}
// Check correct time format and split into components
time = time.toString().match(/^([01]\d|2[0-3])(:)([0-5]\d)?$/) || [time];
@ -20,8 +24,12 @@ export function get12HourTimeFormat(time) {
return time.join(""); // return adjusted time or original string
}
export function get12HourTimeMobileFormat(time) {
if (!time) {
return null;
}
// Check correct time format and split into components
time = time.toString().match(/^([01]\d|2[0-3])(:)([0-5]\d)?$/) || [time];
time = time?.toString().match(/^([01]\d|2[0-3])(:)([0-5]\d)?$/) || [time];
if (time.length > 1) {
// If time format correct

8
src/helpers/heritage-integration/navigation-helper.js
View file

@ -107,8 +107,12 @@ export async function getImplicitNavigation(toRoute) {
*/
export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) {
console.log(new Date() + " navigateToHeritageFunnel: " + JSON.stringify(applicationConfig));
console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
const log = getQuerystringParameter(queryStrings.LOG);
if (eval(log)) {
console.log(new Date() + " applicationConfig: " + JSON.stringify(applicationConfig));
console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
}
// Create the order (or save existing order) when navigating to Heritage Funnel.
if (shouldSaveSession) {
await saveSession({ pageNameToLog: pageNameToLog, shouldAwaitSaveSessionQueue: true });

2
src/layouts/address-lookup/address-lookup.vue
View file

@ -150,7 +150,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

2
src/layouts/capability-questions/capability-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

11
src/layouts/confirmation/add-to-calendar/add-to-calendar.vue
View file

@ -34,6 +34,8 @@ import {
import store from "@/store";
import { serviceType } from "@/constants/service-type";
import { applicationConfig } from "@/constants/application-config.js";
import baseMixin from "@/mixins/base-mixin.js";
export default {
name: "add-to-calendar",
components: {
@ -110,10 +112,10 @@ export default {
return this.getCmsContent(this.sameDayDropOffWidgetName, "BodyText");
},
UniqueId() {
return store.getters.submittedOrder.referralNumber?.toString();
return this.getSubmittedOrder()?.referralNumber?.toString();
},
ServiceType() {
const isRepair = store.getters.submittedOrder.damage.isRepair;
const isRepair = this.getSubmittedOrder()?.damage.isRepair;
const funnelHasRecalibrationPart = store.getters.isRecalibrationOnSubmittedOrder;
if (!isRepair) {
if (funnelHasRecalibrationPart) {
@ -125,7 +127,7 @@ export default {
return serviceType.REPAIR;
},
RouteCode() {
return store.getters.submittedOrder.schedule.routeCode;
return this.getSubmittedOrder()?.schedule.routeCode;
},
Appointment() {
var subject = "";
@ -206,6 +208,9 @@ export default {
},
methods: {
getSubmittedOrder() {
return baseMixin.methods.getSubmittedOrder();
},
setCalendarAppointment(calendarOption) {
if (
calendarOption.name == calendarOptions.ICAL ||

312
src/layouts/confirmation/confirmation.spec.js
View file

@ -19,67 +19,6 @@ beforeEach(() => {
jest.restoreAllMocks();
jest.clearAllMocks();
store.getters = {
submittedOrder: {
schedule: {
date: "2023-01-01",
startTime: "09:00",
endTime: "10:00",
routeCode: "000",
jobMaxMinutes: "120",
jobMinMinutes: "60",
},
lineItems: {
glassParts: [
{
partNumber: "ABC123",
},
],
supportingItems: [],
},
serviceLocation: {
address: "test",
address2: "123",
city: "test",
state: "AZ",
appointmentType: "Inshop",
zipCode: "12345",
zipCodeCtu: "01234",
provider: {
providerNumber: "123",
address: {
streetAddress: "test1",
city: "test",
state: "AZ",
zipCode: "12345",
zipCodeCtu: "01234",
},
},
},
damage: {
isRepair: false,
},
payment: {
isPia: true,
isInsurance: false,
insuranceCoverage: {
coverageStatus: "test",
},
},
policy: {
isNoComp: false,
currentDeductible: 1,
insuranceCompanyName: "test name",
},
referralNumber: "1234567",
vehicle: {
year: "2004",
make: "Ford",
model: "F Series F250",
},
customer: {
emailAddress: "test@test.com",
},
},
order: {
schedule: {
date: "2023-01-01",
@ -96,6 +35,7 @@ beforeEach(() => {
supportingItems: [],
},
serviceLocation: {
appointmentType: AppointmentTypeStrings.IN_SHOP,
address: "test",
address2: "123",
city: "test",
@ -180,6 +120,20 @@ describe("computed properties...", () => {
test("ScheduleDateFormatted should return date in expected format.", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
startTime: "09:00",
endTime: "11:00",
date: "2023-01-01",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ScheduleDateFormatted;
@ -189,11 +143,22 @@ describe("computed properties...", () => {
});
test("ScheduleTimeFormatted should return mobile time in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.MOBILE;
store.getters.submittedOrder.schedule.startTime = "09:00";
store.getters.submittedOrder.schedule.endTime = "11:00";
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
startTime: "09:00",
endTime: "11:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
// Act
const testValue = wrapper.vm.ScheduleTimeFormatted;
@ -203,11 +168,22 @@ describe("computed properties...", () => {
});
test("ScheduleTimeFormatted should return DROP_OFF time in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.DROP_OFF;
store.getters.submittedOrder.schedule.startTime = "09:00";
store.getters.submittedOrder.schedule.endTime = "11:00";
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
startTime: "09:00",
endTime: "11:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.DROP_OFF;
// Act
const testValue = wrapper.vm.ScheduleTimeFormatted;
@ -217,11 +193,22 @@ describe("computed properties...", () => {
});
test("ScheduleTimeFormatted should return Inshop time in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.IN_SHOP;
store.getters.submittedOrder.schedule.startTime = "09:00";
store.getters.submittedOrder.schedule.endTime = "11:00";
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
startTime: "09:00",
endTime: "11:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.IN_SHOP;
// Act
const testValue = wrapper.vm.ScheduleTimeFormatted;
@ -231,10 +218,21 @@ describe("computed properties...", () => {
});
test("AppointmentWordingText should return mobile text in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.MOBILE;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
endTime: "10:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
// Act
const testValue = wrapper.vm.AppointmentWordingText;
@ -243,10 +241,21 @@ describe("computed properties...", () => {
});
test("AppointmentWordingText should return DROP_OFF text in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.DROP_OFF;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
endTime: "10:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
wrapper.vm.submittedOrder.serviceLocation.appointmentType = AppointmentTypeStrings.DROP_OFF;
// Act
const testValue = wrapper.vm.AppointmentWordingText;
@ -256,10 +265,20 @@ describe("computed properties...", () => {
});
test("AppointmentWordingText should return IN_SHOP text in expected format.", () => {
//Arrange
store.getters.submittedOrder.serviceLocation.appointmentType =
AppointmentTypeStrings.IN_SHOP;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
endTime: "10:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.AppointmentWordingText;
@ -280,6 +299,19 @@ describe("computed properties...", () => {
test("ScheduleDate should return date in expected format.", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2023-01-01",
endTime: "10:00",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ScheduleDate;
@ -290,6 +322,19 @@ describe("computed properties...", () => {
test("ScheduleStartTime should return time in expected format.", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
startTime: "09:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ScheduleStartTime;
@ -300,6 +345,19 @@ describe("computed properties...", () => {
test("ScheduleEndTime should return time in expected format.", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
endTime: "10:00",
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ScheduleEndTime;
@ -344,6 +402,18 @@ describe("computed properties...", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ServiceLocationFullAddress;
@ -355,6 +425,18 @@ describe("computed properties...", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
serviceLocation: store.getters.order.serviceLocation,
};
// Act
const testValue = wrapper.vm.ProviderFullAddress;
@ -366,6 +448,17 @@ describe("computed properties...", () => {
//Arrange
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
};
// Act
const testValue = wrapper.vm.AppointmentDuration;
@ -375,9 +468,18 @@ describe("computed properties...", () => {
});
test("Appointment Duration should return with correct duration values in expected format for hours.", () => {
//Arrange
store.getters.submittedOrder.schedule.jobMaxMinutes = 120;
store.getters.submittedOrder.schedule.jobMinMinutes = 60;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 120,
jobMinMinutes: 60,
routeCode: "",
},
};
// Act
const testValue = wrapper.vm.AppointmentDuration;
@ -387,9 +489,18 @@ describe("computed properties...", () => {
});
test("Appointment Duration should return with correct duration values in expected format for minutes.", () => {
//Arrange
store.getters.submittedOrder.schedule.jobMaxMinutes = 45;
store.getters.submittedOrder.schedule.jobMinMinutes = 30;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 45,
jobMinMinutes: 30,
routeCode: "",
},
};
// Act
const testValue = wrapper.vm.AppointmentDuration;
@ -400,10 +511,18 @@ describe("computed properties...", () => {
test("Appointment Duration should return with All Day.", () => {
//Arrange
store.getters.submittedOrder.schedule.jobMaxMinutes = 45;
store.getters.submittedOrder.schedule.jobMinMinutes = 30;
store.getters.submittedOrder.schedule.routeCode = RouteCodeFlags.ALL_DAY_DROP_OFF;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 45,
jobMinMinutes: 30,
routeCode: RouteCodeFlags.ALL_DAY_DROP_OFF,
},
};
// Act
const testValue = wrapper.vm.AppointmentDuration;
@ -414,10 +533,18 @@ describe("computed properties...", () => {
test("Appointment Duration should return with Overnight.", () => {
//Arrange
store.getters.submittedOrder.schedule.jobMaxMinutes = 45;
store.getters.submittedOrder.schedule.jobMinMinutes = 30;
store.getters.submittedOrder.schedule.routeCode = RouteCodeFlags.OVERNIGHT_DROP_OFF;
const { wrapper } = setupMocks({});
wrapper.vm.submittedOrder = {
vehicle: {
imageUrl: "",
},
schedule: {
date: "2024-09-28",
jobMaxMinutes: 45,
jobMinMinutes: 30,
routeCode: RouteCodeFlags.OVERNIGHT_DROP_OFF,
},
};
// Act
const testValue = wrapper.vm.AppointmentDuration;
@ -438,6 +565,7 @@ function setupMocks({ customMountOptions }) {
getCmsContent: jest.fn().mockImplementation(() => {
return wordingText;
}),
getSettingValue: jest.fn(),
},
},
];

131
src/layouts/confirmation/confirmation.vue
View file

@ -62,7 +62,8 @@
servicePackageOptionsCmsName="ServicePackageTitle"
:insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName"
:showInsuranceCoverageAs="showInsuranceCoverageAs" />
:showInsuranceCoverageAs="showInsuranceCoverageAs"
:shouldHideRecalibration="shouldHideRecalibration" />
<hr class="mb-5" />
@ -105,20 +106,23 @@ import { Form } from "vee-validate";
import { get12HourTimeFormat, get12HourTimeMobileFormat } from "@/helpers/date-helper";
import { coverageStatus } from "@/constants/insurance";
import { getDisplayTextForDurationLength } from "@/helpers/duration-length-helper";
import { experimentSettings } from "@/constants/experiments";
import experimentMixin from "@/mixins/experiment-mixin.js";
export default {
name: "confirmation",
async beforeRouteEnter(to, from, next) {
await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
// Call APIs
const submittedOrder = baseMixin.methods.getSubmittedOrder();
const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
serviceZipCode: store.getters.submittedOrder.serviceLocation.zipCode,
carId: store.getters.submittedOrder.vehicle.carId,
serviceZipCode: submittedOrder.serviceLocation.zipCode,
carId: submittedOrder.vehicle.carId,
},
"confirmation"
);
@ -147,24 +151,31 @@ export default {
const resultMap = await settleAllPromises(promiseResultMap);
const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
const lineItemsFromSubmittedOrder = deepClone(store.getters.submittedOrder.lineItems);
const lineItemsFromSubmittedOrder = deepClone(submittedOrder.lineItems);
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
vm.lineItems = lineItemsFromSubmittedOrder;
vm.vaps = availableVaps;
vm.submittedOrder = submittedOrder;
});
},
data() {
return {
lineItems: [],
vaps: [],
submittedOrder: null,
};
},
computed: {
shouldHideRecalibration() {
return this.getSettingValue(
experimentSettings.RECAL_PRICE_REMOVE
);
},
ShowCart() {
if (this.isPia && store.getters.submittedOrder.settledTenderAmount == 0) {
if (this.isPia && this.submittedOrder?.settledTenderAmount == 0) {
// settleTenderAmount always shows 0 via localhost or dev.
// Temporarily set return true to see cart in localhost or dev environment
return false;
@ -179,62 +190,102 @@ export default {
return this.getCmsContent("ScheduleConfirmationWidget", "Image");
},
CustomerPortalLoginToken() {
return store.getters.submittedOrder.customerPortalLoginToken;
return this.submittedOrder?.customerPortalLoginToken;
},
ConfirmationEmailText() {
return this.getCmsContent("ConfirmationEmailWidget", "BodyText")
?.replaceAll(
"{custom:submittedOrder.customer.emailAddress}",
this.submittedOrder?.customer?.emailAddress
)
?.replaceAll("{custom:MY_ACCOUNT_URL}", applicationConfig.MY_ACCOUNT)
?.replaceAll("{custom:CUSTOMER_PORTAL_LOGIN_TOKEN}", this.CustomerPortalLoginToken)
?.replaceAll("&lt;", "<")
?.replaceAll("&gt;", ">");
},
ScheduleDate() {
return store.getters.submittedOrder.schedule.date;
return this.submittedOrder?.schedule?.date;
},
AppointmentType() {
return store.getters.submittedOrder.serviceLocation.appointmentType;
return this.submittedOrder?.serviceLocation?.appointmentType;
},
ScheduleStartTime() {
return store.getters.submittedOrder.schedule.startTime;
return this.submittedOrder?.schedule?.startTime;
},
ScheduleEndTime() {
return store.getters.submittedOrder.schedule.endTime;
return this.submittedOrder?.schedule?.endTime;
},
InShopWordingText() {
return this.getCmsContent("InShopWordingWidget", "BodyText");
return this.getCmsContent("InShopWordingWidget", "BodyText")
?.replaceAll(
"{custom:submittedOrder.vehicle.year}",
this.submittedOrder?.vehicle?.year
)
?.replaceAll(
"{custom:submittedOrder.vehicle.make}",
this.submittedOrder?.vehicle?.make
)
?.replaceAll(
"{custom:submittedOrder.vehicle.model}",
this.submittedOrder?.vehicle?.model
);
},
MobileWordingText() {
return this.getCmsContent("MobileWordingWidget", "BodyText");
return this.getCmsContent("MobileWordingWidget", "BodyText")
?.replaceAll(
"{custom:submittedOrder.vehicle.year}",
this.submittedOrder?.vehicle?.year
)
?.replaceAll(
"{custom:submittedOrder.vehicle.make}",
this.submittedOrder?.vehicle?.make
)
?.replaceAll(
"{custom:submittedOrder.vehicle.model}",
this.submittedOrder?.vehicle?.model
);
},
DropOffWordingText() {
return this.getCmsContent("DropOffWordingWidget", "BodyText");
return this.getCmsContent("DropOffWordingWidget", "BodyText")
?.replaceAll(
"{custom:submittedOrder.vehicle.year}",
this.submittedOrder?.vehicle?.year
)
?.replaceAll(
"{custom:submittedOrder.vehicle.make}",
this.submittedOrder?.vehicle?.make
)
?.replaceAll(
"{custom:submittedOrder.vehicle.model}",
this.submittedOrder?.vehicle?.model
);
},
ServiceLocationAddress() {
return store.getters.submittedOrder.serviceLocation.address;
return this.submittedOrder?.serviceLocation?.address;
},
ServiceLocationAddress2() {
return store.getters.submittedOrder.serviceLocation.address2;
return this.submittedOrder?.serviceLocation?.address2;
},
ServiceLocationCity() {
return store.getters.submittedOrder.serviceLocation.city;
return this.submittedOrder?.serviceLocation?.city;
},
ServiceLocationState() {
return store.getters.submittedOrder.serviceLocation.state;
return this.submittedOrder?.serviceLocation?.state;
},
ServiceLocationZipCode() {
return store.getters.submittedOrder.serviceLocation.zipCode;
return this.submittedOrder?.serviceLocation?.zipCode;
},
ProviderAddress() {
return store.getters.submittedOrder.serviceLocation.provider.address.streetAddress;
return this.submittedOrder?.serviceLocation?.provider?.address?.streetAddress;
},
ProviderCity() {
return store.getters.submittedOrder.serviceLocation.provider.address.city;
return this.submittedOrder?.serviceLocation?.provider?.address?.city;
},
ProviderState() {
return store.getters.submittedOrder.serviceLocation.provider.address.state;
return this.submittedOrder?.serviceLocation?.provider?.address?.state;
},
ProviderZipCode() {
return store.getters.submittedOrder.serviceLocation.provider.address.zipCode;
return this.submittedOrder?.serviceLocation?.provider?.address?.zipCode;
},
AppointmentWordingText() {
if (this.AppointmentType == AppointmentTypeStrings.MOBILE) {
@ -268,7 +319,7 @@ export default {
// This conversion ensures we don't get get GMT induced date changes
const dateObject = convertDateStringToDate(this.ScheduleDate);
// Ex: Tuesday, April 22
return dateObject.toLocaleDateString("en-us", {
return dateObject?.toLocaleDateString("en-us", {
weekday: "long",
month: "long",
day: "numeric",
@ -286,19 +337,19 @@ export default {
}
},
vehicleBannerImageUrl() {
return store.getters.submittedOrder?.vehicle.imageUrl;
return this.submittedOrder?.vehicle.imageUrl;
},
damageInfo() {
return store.getters.submittedOrder.damage;
return this.submittedOrder?.damage;
},
isInsurance() {
return store.getters.submittedOrder.payment.isInsurance;
return this.submittedOrder?.payment?.isInsurance;
},
isNoComp() {
return store.getters.submittedOrder.policy.isNoComp;
return this.submittedOrder?.policy?.isNoComp;
},
isItac() {
return store.getters.submittedOrder.policy.isItac;
return this.submittedOrder?.policy?.isItac;
},
hasVapsInCart() {
if (this.lineItems?.vaps?.length > 0) {
@ -311,32 +362,28 @@ export default {
if (this.isNoComp || this.isItac) {
return coverageStatus.NOCOMP;
} else {
return store.getters.submittedOrder.payment.insuranceCoverage.coverageStatus;
return this.submittedOrder?.payment?.insuranceCoverage?.coverageStatus;
}
},
currentDeductible() {
return store.getters.submittedOrder.policy.currentDeductible;
return this.submittedOrder?.policy?.currentDeductible;
},
insuranceCompanyName() {
return store.getters.submittedOrder.policy.insuranceCompanyName;
return this.submittedOrder?.policy?.insuranceCompanyName;
},
isPia() {
return store.getters.submittedOrder?.payment.isPia;
return this.submittedOrder?.payment?.isPia;
},
AppointmentDuration() {
const durationMaximum = store.getters.submittedOrder?.schedule?.jobMaxMinutes;
const durationMinimum = store.getters.submittedOrder?.schedule?.jobMinMinutes;
const durationMaximum = this.submittedOrder?.schedule?.jobMaxMinutes;
const durationMinimum = this.submittedOrder?.schedule?.jobMinMinutes;
const durationLengthString = "Duration: ";
if (
store.getters.submittedOrder?.schedule?.routeCode.includes(
RouteCodeFlags.ALL_DAY_DROP_OFF
)
this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)
) {
return durationLengthString.concat("All Day");
} else if (
store.getters.submittedOrder?.schedule?.routeCode.includes(
RouteCodeFlags.OVERNIGHT_DROP_OFF
)
this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)
) {
return durationLengthString.concat("Overnight");
} else {
@ -348,7 +395,7 @@ export default {
},
methods: {
arePagePrerequisitesValid() {
if (store.getters.hasSubmittedOrder) {
if (baseMixin.methods.hasSubmittedOrder()) {
return true;
}

2
src/layouts/estimate/estimate.spec.js
View file

@ -216,7 +216,7 @@ describe("estimate.vue", () => {
describe("estimate.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
store.getters = {
isExternalParameter: true,
externalParameterState: { isExternalParameter: true },
externalParameterEstimate: { vinSelection: "decline" },
};
// Set up the component

2
src/layouts/estimate/estimate.vue
View file

@ -146,7 +146,7 @@ export default {
}
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterEstimate.vinSelection) {
vm.selectedVinLookupMethod = vinPagesMixin.methods.getVinlookupMethod(
store.getters.externalParameterEstimate.vinSelection

2
src/layouts/insurance-company/insurance-company.vue
View file

@ -76,7 +76,7 @@ export default {
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
vm.originalList = resultMap.insuranceCompanyList;
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

2
src/layouts/license-plate-lookup/license-plate-lookup.vue
View file

@ -148,7 +148,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

2
src/layouts/molding-questions/molding-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

2
src/layouts/part-questions/part-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

45
src/layouts/payment-method/payment-method.vue
View file

@ -33,7 +33,8 @@
:isInsurance="isInsurance"
:insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName"
:showInsuranceCoverageAs="showInsuranceCoverageAs" />
:showInsuranceCoverageAs="showInsuranceCoverageAs"
:shouldHideRecalibration="shouldHideRecalibration" />
<hr class="my-5" />
@ -47,14 +48,14 @@
v-bind:isDismissible="false" />
</div>
<div v-if="hasRecal && !isInsurance" class="questions-about-service my-5">
<div v-if="!isInsurance" class="questions-about-service my-5">
<textBlock
cmsWidgetName="QuestionsAboutYourServiceWidget"
justifyText="left"
class="service-questions" />
<textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" />
<hr class="my-5" />
<div class="d-flex flex-row checkbox-group">
<div class="d-flex flex-row checkbox-group" v-if="isRecalibrationOnOrder && shouldHideRecalibration">
<checkboxQuestion
cmsWidgetName="RecalConfirmWidget"
class="mb-5"
@ -125,6 +126,7 @@ import {
} from "@/helpers/cms-content-helper";
import { paymentMethods } from "@/constants/payment-method-constants";
import { experimentSettings } from "@/constants/experiments";
import experimentMixin from "@/mixins/experiment-mixin.js";
import {
revalidatePromosAndValidateQueryStringPromo,
buildToastMessagesFromRevalidateOrValidatePromoResponse,
@ -148,6 +150,7 @@ import { AppointmentTypeStrings } from "@/constants/schedule-constants";
import { partTypeStrings } from "@/constants/part-type-strings";
import { mapTaxedLineItemsToStoreFormat } from "../../store";
import { coverageStatus } from "@/constants/insurance";
import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@ -572,22 +575,26 @@ export default {
);
},
hasSubmittedOrder() {
return this.$store.getters.hasSubmittedOrder;
return baseMixin.methods.hasSubmittedOrder();
},
getSubmittedOrder() {
return baseMixin.methods.getSubmittedOrder();
},
openModal(modalName) {
this.$refs[modalName].openModal();
},
},
computed: {
hasRecal() {
const recalLineItem = this.$store.getters.order.lineItems?.supportingItems?.find(
(lineItem) => lineItem.partType.indexOf(partTypeStrings.RECALIBRATION) !== -1
isRecalibrationOnOrder() {
return containsLineItemWithPartType(
partTypeStrings.RECALIBRATION,
this.$store.getters.order.lineItems?.supportingItems
);
},
shouldHideRecalibration() {
return this.getSettingValue(
experimentSettings.RECAL_PRICE_REMOVE
);
if (recalLineItem) {
return true;
}
return false;
},
showApplePay() {
return baseMixin.methods.showApplePay();
@ -597,17 +604,17 @@ export default {
},
isInsurance() {
return this.hasSubmittedOrder()
? this.$store.getters.submittedOrder.payment.isInsurance
? this.getSubmittedOrder()?.payment.isInsurance
: this.$store.getters.payment.isInsurance;
},
isNoComp() {
return this.hasSubmittedOrder()
? this.$store.getters.submittedOrder.policy.isNoComp
? this.getSubmittedOrder()?.policy.isNoComp
: this.$store.getters.policy.isNoComp;
},
isItac() {
return this.hasSubmittedOrder()
? this.$store.getters.submittedOrder.policy.isItac
? this.getSubmittedOrder()?.policy.isItac
: this.$store.getters.policy.isItac;
},
hasVapsInCart() {
@ -622,13 +629,13 @@ export default {
return coverageStatus.NOCOMP;
} else {
return this.hasSubmittedOrder()
? this.$store.getters.submittedOrder.payment.insuranceCoverage.coverageStatus
? this.getSubmittedOrder()?.payment.insuranceCoverage.coverageStatus
: this.$store.getters.payment.insuranceCoverage.coverageStatus;
}
},
currentDeductible() {
return this.hasSubmittedOrder()
? this.$store.getters.submittedOrder.policy.currentDeductible
? this.getSubmittedOrder()?.policy.currentDeductible
: this.$store.getters.policy.currentDeductible;
},
insuranceCompanyName() {
@ -659,7 +666,7 @@ export default {
return true;
}
} else {
if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.hasRecal) {
if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.isRecalibrationOnOrder) {
return true;
}
}
@ -765,7 +772,7 @@ export default {
}
.questions-about-service {
.service-questions {
font-weight: $font-weight-bold;
font-weight: 600;
}
}
.cart {

32
src/layouts/quote/quote.spec.js
View file

@ -238,6 +238,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -281,6 +284,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -322,6 +328,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -360,6 +369,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -399,6 +411,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -438,6 +453,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -478,6 +496,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -520,6 +541,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -561,6 +585,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -654,6 +681,9 @@ describe("quote.vue", () => {
lineItems: {
glassParts: ["item", "item2"],
},
applicationUser: {
experiments: [],
},
order: {
lineItems: {
glassParts: ["item", "item2"],
@ -671,7 +701,7 @@ describe("quote.vue", () => {
inactivePromos: [],
},
},
isExternalParameter: true,
externalParameterState: { isExternalParameter: true },
externalParameterQuote: {
isInsurance: true,
servicePackage: "glassonly",

55
src/layouts/quote/quote.vue
View file

@ -42,15 +42,17 @@
</div>
<div class="row justify-content-center">
<div class="col-md-6 col-xl-4">
<!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner -->
<afterpayModalBanner
v-if="!isInsuranceSelected && !isRecalibrationOnOrder"
v-if="showAfterpayBanner"
cmsWidgetName="AfterpayModalWidget"
:lineItems="lineItems" />
<!-- If vehicle requires recal AND we are hiding recal pricing info, then show recal disclaimer banner. -->
<recalDisclaimer
class="mb-0"
cmsWidgetName="RecalDisclaimerWidget"
v-if="isRecalibrationOnOrder"
v-if="showRecalDisclaimer"
v-on="{ textLinkClicked: openModalAction }"
alertClass="alert-info" />
@ -99,6 +101,8 @@ import contentGroupModal from "@/fmg-components/content-group-modal/content-grou
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
import afterpayModalBanner from "@/layouts/quote/afterpay-modal-banner/afterpay-modal-banner";
import recalDisclaimer from "@/layouts/quote/recal-disclaimer/recal-disclaimer.vue";
// Supporting files
import baseMixin from "@/mixins/base-mixin.js";
import experimentMixin from "@/mixins/experiment-mixin.js";
import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
@ -107,6 +111,8 @@ import { storeActions } from "@/constants/store-actions";
import { deepClone } from "@/helpers/object-helper";
import store from "@/store";
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
import { experimentUniverses, experimentSettings } from "@/constants/experiments";
import { getSessionKeyValue, getUserIdValue } from "@/helpers/heritage-integration/cookie-helper";
import { required } from "@/helpers/validation-rules";
import { errorMessages } from "@/constants/error-messages";
import { Form, defineRule } from "vee-validate";
@ -120,7 +126,6 @@ import {
import { queryStrings } from "@/constants/query-strings";
import { getQuerystringParameter } from "@/helpers/querystring-helper";
import promoModalQuestion from "@/fmg-components/promo-modal-question/promo-modal-question";
import { experimentSettings } from "@/constants/experiments";
import { partTypeStrings } from "@/constants/part-type-strings";
import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
import { nextTick } from "vue";
@ -133,6 +138,9 @@ export default {
async beforeRouteEnter(to, from, next) {
// Call APIs
const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
const experimentForLogging = store.getters.applicationUser.experiments.find(
(e) => e.universeName === experimentUniverses.RECAL_PRICE_REMOVAL
);
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
@ -200,6 +208,33 @@ export default {
...servicePackageDiscountPart,
];
// If the recal experiment is found then log the experiment exposure.
const isRecalibrationOnOrder = containsLineItemWithPartType(
partTypeStrings.RECALIBRATION,
availableLineItems
);
const canSafeliteRecalibrate = nullSafeGlassParts.some((glassPart) => {
return glassPart.partType === "WINDSHIELD" && glassPart.canSafeliteRecalibrate;
});
if (
experimentForLogging !== undefined &&
isRecalibrationOnOrder &&
canSafeliteRecalibrate
) {
// Log experiment exposure
baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.LOG_EXPERIMENT_EXPOSURE,
{
userId: getUserIdValue(),
sessionKey: getSessionKeyValue(),
pageName: to.query.fmgPage,
experiment: experimentForLogging,
},
"quote",
false
);
}
// When calling pricing from the quote page, always use the cash parent account
baseMixin.methods.dispatchStoreAction(
storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
@ -286,7 +321,7 @@ export default {
}
}
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterQuote.isInsurance == true) {
vm.isInsuranceSelected = true;
vm.servicePackage = store.getters.externalParameterQuote.servicePackage;
@ -324,6 +359,18 @@ export default {
this?.availableLineItems
);
},
shouldHideRecalibration() {
const recalSettingValue = experimentMixin.methods.getSettingValue(
experimentSettings.RECAL_PRICE_REMOVE
);
return recalSettingValue;
},
showAfterpayBanner() {
return !this.isInsuranceSelected && (!this.isRecalibrationOnOrder || !this.shouldHideRecalibration)
},
showRecalDisclaimer() {
return this.isRecalibrationOnOrder && this.shouldHideRecalibration
},
},
methods: {
openModalAction(modalName) {

5
src/layouts/service-zip/service-zip.spec.js
View file

@ -169,6 +169,7 @@ function resetMockStoreData() {
zipCode: null,
emailAddress: null,
},
externalParameterState: { isExternalParameter: false },
};
}
@ -412,7 +413,7 @@ describe("service-zip.vue", () => {
describe("service-zip.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
// Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true;
store.getters.externalParameterState = { isExternalParameter: true };
// Set up the component
const wrapper = setupMocks({});
@ -436,7 +437,7 @@ describe("service-zip.vue", () => {
});
test("should not call forwardButtonAction if isExternalParameter is true and form is invalid", async () => {
// Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true;
store.getters.externalParameterState = { isExternalParameter: true };
// Set up the component
const wrapper = setupMocks({});

6
src/layouts/service-zip/service-zip.vue
View file

@ -132,7 +132,7 @@ export default {
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) {
vm.forwardButtonAction();
@ -188,7 +188,7 @@ export default {
if (!zipCodeData.isValid) {
this.displayInvalidZipAlert = true;
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
return this.$refs.navbar.removeLoader();
@ -197,7 +197,7 @@ export default {
if (!zipCodeData.isServiceable) {
this.displayNonServiceableZipAlert = true;
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
return this.$refs.navbar.removeLoader();

4
src/layouts/vehicle-damage/vehicle-damage.spec.js
View file

@ -66,7 +66,7 @@ jest.mock("@/store", () => ({
glassToReplace: [],
},
},
isExternalParameter: false,
externalParameterState: { isExternalParameter: false },
externalParameterDamage: {
damageType: null,
isRepair: null,
@ -813,7 +813,7 @@ describe("vehicle-damage.vue", () => {
describe("vehicle-damage.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
// Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true;
store.getters.externalParameterState = { isExternalParameter: true };
store.getters.externalParameterDamage = {
damageType: "windshieldReplace",
isRepair: false,

124
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -1,5 +1,5 @@
<template>
<Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
<Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
<div class="container-fluid page-container-grouped-styles vehicle-damage">
<div class="row justify-content-center">
<div class="col-md-6">
@ -70,7 +70,7 @@
<div class="col-md-6 col-xl-4">
<navbar
cmsWidgetName="FunnelFooterWidget"
:isForwardActionDisabled="!meta.valid"
:isForwardActionDisabled="!isContinueEnabled"
:isBackButtonHidden="shouldHideBackButton"
@back-clicked="backButtonAction"
@ForwardClicked="forwardButtonAction" />
@ -151,7 +151,7 @@ export default {
vm.$refs.backGlassOptions.initializeComponent(
resultMap.damageOptions.backGlassOptions.availableReplacementOptions
);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
await nextTick();
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) {
@ -180,6 +180,36 @@ export default {
this.attachCustomEvents();
},
methods: {
clearChildEntries() {
if (!this.isSideDoorDamageLocation) {
this.sideDoorOptionsData = {
selectedDoorSides: [],
selectedDriverSideReplaceOptions: [],
selectedPassengerSideReplaceOptions: [],
};
} else {
if (!this.isDriverSideReplace) {
this.sideDoorOptionsData.selectedDriverSideReplaceOptions = [];
}
if (!this.isPassengerSideReplace) {
this.sideDoorOptionsData.selectedPassengerSideReplaceOptions = [];
}
}
if (!this.isRearWindowDamageLocation) {
this.selectedRearReplaceOptions = "";
}
if (!this.isWindshieldDamageLocation) {
this.selectedWindshieldOptions = {
selectedWindshieldDamageType: "",
selectedWindshieldChipCount: null,
selectedWindshieldReplaceOptions: [],
};
} else {
if (!this.isWindshieldRepair) {
this.selectedWindshieldOptions.selectedWindshieldChipCount = null;
}
}
},
arePagePrerequisitesValid() {
if (store.getters.vehicle.carId) {
return true;
@ -584,6 +614,94 @@ export default {
shouldHideBackButton() {
return this.$store.getters.requiresVerifiedRedirecting;
},
isContinueEnabled() {
return (
this.isAnyDamageSelected &&
this.isWindshieldValid &&
this.isRearGlassValid &&
this.isSideGlassValid
);
},
isAnyDamageSelected() {
return this.selectedDamageLocations != null && this.selectedDamageLocations.length != 0;
},
isSideGlassValid() {
if (this.isSideDoorDamageLocation) {
if (
this.sideDoorOptionsData.selectedDoorSides == null ||
this.sideDoorOptionsData.selectedDoorSides == 0
) {
// SideDoor is selected, but "which side" question is unanswered
return false;
} else {
if (this.isPassengerSideReplace) {
if (
this.sideDoorOptionsData.selectedPassengerSideReplaceOptions == null ||
this.sideDoorOptionsData.selectedPassengerSideReplaceOptions.length == 0
) {
// PassengerSide is selected, but no sub option is
return false;
}
}
if (this.isDriverSideReplace) {
if (
this.sideDoorOptionsData.selectedDriverSideReplaceOptions == null ||
this.sideDoorOptionsData.selectedDriverSideReplaceOptions.length == 0
) {
// DriverSide is selected, but no sub option is
return false;
}
}
}
}
return true;
},
isRearGlassValid() {
if (this.isRearWindowDamageLocation) {
if (!this.selectedRearReplaceOptions) {
// RearDoor is selected, but rear option question is unanswered
return false;
}
}
return true;
},
isWindshieldValid() {
if (this.isWindshieldDamageLocation) {
if (!this.selectedWindshieldOptions.selectedWindshieldDamageType) {
// Windshield is selected but no replace/repair option is selected
return false;
} else {
if (this.hasSplitSingleConflict) {
return false;
}
if (this.isWindshieldRepair) {
if (this.hasRepairReplaceConflict) {
return false;
}
if (!this.selectedWindshieldOptions.selectedWindshieldChipCount) {
// Repair selected but no chips selected
return false;
}
} else {
if (
this.selectedWindshieldOptions.selectedWindshieldReplaceOptions ==
null ||
this.selectedWindshieldOptions.selectedWindshieldReplaceOptions
.length == 0
) {
// Replace selected but follow-up split/single question not answered
return false;
}
}
}
}
return true;
},
},
watch: {
selectedDamageLocations() {
this.clearChildEntries();
},
},
components: {

2
src/layouts/vehicle-parts/vehicle-parts.vue
View file

@ -102,7 +102,7 @@ export default {
FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
})
);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

4
src/layouts/vehicle/vehicle.spec.js
View file

@ -28,7 +28,7 @@ jest.mock("@/store", () => ({
applicationUser: {
experiments: [{ universeName: "ConceptFunnel" }],
},
isExternalParameter: false,
externalParameterState: { isExternalParameter: false },
externalParameterVehicle: {
year: null,
make: null,
@ -94,7 +94,7 @@ describe("vehicle.vue", () => {
describe("vehicle.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
store.getters.isExternalParameter = true;
store.getters.externalParameterState.isExternalParameter = true;
// Create a shallow mount of MyComponent
const { wrapper } = setupMocks();
// Set displayNoServiceAlert to false

4
src/layouts/vehicle/vehicle.vue
View file

@ -221,7 +221,7 @@ export default {
let resultMap = await settleAllPromises(promiseResultMap);
//ExternalParameter widget have different case style value so need to parse with NextGen
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
if (
makeQuestionInitialDataPromise &&
modelQuestionInitialDataPromise &&
@ -269,7 +269,7 @@ export default {
resultMap.modelQuestionInitialData,
resultMap.styleQuestionInitialData
);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
await vm.getVehicleDetails();
if (!vm.displayNoServiceAlert) {
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);

2
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -192,7 +192,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});

9
src/mixins/analytics-mixin.js
View file

@ -37,9 +37,11 @@ export default {
const currentPageName = getPageNameByQueryString();
await this.validateSession();
const submittedOrder = baseMixin.methods.getSubmittedOrder();
const refSequenceNum =
store.getters.order.referralSequenceNumber ||
store.getters.submittedOrder?.referralSequenceNumber;
submittedOrder?.referralSequenceNumber;
var payload = {
userId: getUserIdValue(),
@ -125,8 +127,9 @@ export default {
const isDefined = (x) => x !== null && x !== undefined;
// Get correct order object
const hasSubmittedOrder = store.getters.hasSubmittedOrder;
const order = hasSubmittedOrder ? store.getters.submittedOrder : store.getters.order;
const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
const submittedOrder = baseMixin.methods.getSubmittedOrder();
const order = hasSubmittedOrder ? submittedOrder : store.getters.order;
// Begin assembling payload for data layer
const payload = {};

6
src/mixins/analytics-mixin.spec.js
View file

@ -21,6 +21,7 @@ import {
getSessionKeyValue,
getUserIdValue,
} from "@/helpers/heritage-integration/cookie-helper";
import baseMixin from "./base-mixin";
const parts = {
windshield: {
@ -470,8 +471,9 @@ describe("analyticsMixin.js", () => {
test("Pushes correct data when submitted order is present", () => {
// Arrange
window.dataLayer = [];
store.getters.hasSubmittedOrder = true;
store.getters.submittedOrder = store.getters.order;
baseMixin.methods.hasSubmittedOrder = jest.fn().mockReturnValue(true);
baseMixin.methods.getSubmittedOrder = jest.fn().mockReturnValue(store.getters.order);
store.getters.order = {
vehicle: {
year: null,

12
src/mixins/base-mixin.js
View file

@ -104,7 +104,7 @@ export default {
},
filterOutRecalibration(lineItems) {
const filteredLineItems = lineItems.filter((item) => {
return item.partType != partTypeStrings.RECALIBRATION;
return !item.partType.includes(partTypeStrings.RECALIBRATION);
});
return filteredLineItems;
},
@ -166,9 +166,7 @@ export default {
);
}
const order = store.getters.hasSubmittedOrder
? store.getters.submittedOrder
: store.getters.order;
const order = this.hasSubmittedOrder() ? this.getSubmittedOrder() : store.getters.order;
if (
order.payment.insuranceCoverage.isVerified &&
@ -224,6 +222,12 @@ export default {
return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || 0, 10)];
}
},
getSubmittedOrder() {
return JSON.parse(window.sessionStorage.getItem("submittedOrder"));
},
hasSubmittedOrder() {
return window.sessionStorage.getItem("submittedOrder") !== null;
},
},
computed: {
storeActions() {

13
src/mixins/base-mixin.spec.js
View file

@ -226,15 +226,16 @@ describe("baseMixin.js", () => {
const payment = { insuranceCoverage: { isVerified: true } };
const policy = { isNoComp: false, isItac: false, currentDeductible: 250 };
mixIn.methods.hasSubmittedOrder = jest.fn().mockReturnValue(true);
mixIn.methods.getSubmittedOrder = jest.fn().mockReturnValue({
payment: payment,
policy: policy,
});
store.getters = {
payment: {},
policy: {},
order: {},
submittedOrder: {
payment: payment,
policy: policy,
},
hasSubmittedOrder: true,
};
var amtDue = mixIn.methods.getAmountDue(lineItems);
@ -301,6 +302,8 @@ describe("baseMixin.js", () => {
const payment = { isInsurance: null, insuranceCoverage: { isVerified: null } };
const policy = { isNoComp: false, isItac: false, currentDeductible: 0 };
mixIn.methods.hasSubmittedOrder = jest.fn().mockReturnValue(false);
store.getters = {
payment: payment,
policy: policy,

11
src/router/index.js
View file

@ -64,7 +64,7 @@ const routes = [
}
// Intercept all navigation if a submitted order exists in storage
if (store.getters.hasSubmittedOrder) {
if (window.sessionStorage.getItem("submittedOrder") !== null) {
if (to.query.fmgPage !== funnelStartPageName) {
to.query.fmgPage = fmgPageValues.CONFIRMATION;
}
@ -245,7 +245,7 @@ router.beforeEach(async (to, from, next) => {
const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
const isInIframe = window !== window.top;
if (store.getters.isExternalParameter) {
if (store.getters.externalParameterState?.isExternalParameter) {
// Check if alert event is on the bus
const alertEvent = eventBus.readEventFromBus(
globalEvents.Categories.GLOBAL_ALERT,
@ -295,7 +295,7 @@ router.afterEach(async (to, from) => {
await saveSession({ pageNameToLog: to.query.fmgPage });
}
}
if (!store.getters.isExternalParameter) {
if (!store.getters.externalParameterState?.isExternalParameter) {
showFmgLoadingModal(false);
}
@ -409,6 +409,7 @@ async function navigate(
const zip = getQuerystringParameter(queryStrings.ZIP_CODE);
const promo = getQuerystringParameter(queryStrings.PROMO);
const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
const log = getQuerystringParameter(queryStrings.LOG);
if (
hasZip &&
@ -428,6 +429,10 @@ async function navigate(
queryStringsObject[queryStrings.PAGE_ERROR] = pageError;
}
if (log) {
queryStringsObject[queryStrings.LOG] = log;
}
router.push({
name: "root",
query: Object.assign(optionalQuery, queryStringsObject),

6
src/store/index.js
View file

@ -883,8 +883,6 @@ export const getters = {
.filter((x) => !!x.isActive)
.map((x) => x.settings)
.reduce((r, c) => Object.assign(r, c), {}) ?? {},
submittedOrder: (state) => JSON.parse(window.sessionStorage.getItem("submittedOrder")),
hasSubmittedOrder: (state) => window.sessionStorage.getItem("submittedOrder") !== null,
isVerifiedAndDeductibleZeroConfirmed: (state) => {
// used as a CMS variable on /payment-method, needed for FunnelSubHeaderWidget on cart pages
if (
@ -900,7 +898,7 @@ export const getters = {
requiresVerifiedRedirecting: (state) => {
return state.order?.referralNumber?.length === 6;
},
isExternalParameter: (state) => externalParameterState?.isExternalParameter,
externalParameterState: (state) => externalParameterState,
externalParameterVehicle: (state) => externalParameterState?.vehicle,
externalParameterDamage: (state) => externalParameterState?.vehicleDamage,
externalParameterQuote: (state) => externalParameterState?.quote,
@ -2798,7 +2796,7 @@ export const actions = {
},
createSubmittedOrder(context) {
if (context.getters.hasSubmittedOrder) {
if (window.sessionStorage.getItem("submittedOrder") !== null) {
return;
}