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

Merge branch 'develop' into nation/CASH-2466

Browse source
This commit is contained in:
CarlNation 2026-04-21 11:38:27 -04:00
commit 8d314a40b3
9 changed files with 17 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/constants/endpoints.js
View file

@ -61,7 +61,7 @@ const endpoints = {
method: "POST",
},
GetWipers: {
url: "/parts/api/v1/parts/wipers",
url: "/parts/api/v2/parts/wipers",
method: "GET",
},
GetRainRepel: {

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

@ -970,8 +970,7 @@ export default {
const msrFeeLineItem = this.getMsrFeeLineItem;
const shouldCreateMsrFeeCartItem =
this.isMSRFeeApplicable &&
this.isInsurance &&
!this.IsMSRFeeCoveredByInsurance &&
(!this.isInsurance || !this.IsMSRFeeCoveredByInsurance) &&
msrFeeLineItem &&
this.msrFeeAmount > 0;
@ -980,7 +979,7 @@ export default {
name: this.msrFeeCartItemName,
category: cartItemCategories.SUPPORTING_ITEMS,
cartItemType: cartItemTypes.MOBILE_FEE,
isDisplayed: this.isInsurance,
isDisplayed: true,
isRemovable: true,
subTotal: 0,
salesTax: 0,
@ -1007,8 +1006,10 @@ export default {
return this.getCmsContent("RecycleTextBlock", "Text");
},
msrToolTipBodyText() {
let cmsContentText = this.getCmsContent("MSRModal", "BodyText");
if (cmsContentText) {
let cmsContentText = this.isInsurance
? this.getCmsContent("MSRModal", "BodyText")
: this.getCmsContent("MSRModal", "BodyText2");
if (this.isInsurance && cmsContentText) {
cmsContentText = cmsContentText.replaceAll(
"{custom:mobileFee}",
formatToUSDollar(this.msrFeeAmount)

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

@ -169,8 +169,8 @@ export default {
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
serviceZipCode: submittedOrder.serviceLocation.zipCode,
carId: submittedOrder.vehicle.carId,
accountNumber: submittedOrder.payment?.parentAccountNumber,
},
"confirmation"
);

112
src/layouts/payment-adyen/payment-adyen.spec.js
View file

@ -187,118 +187,6 @@ describe("payment-adyen.vue", () => {
expect(result).toBe(true);
});
});
describe("splitStreetAddress", () => {
const setInShopStreet = (streetAddress) => {
store.getters.order.serviceLocation.appointmentType = AppointmentTypeStrings.IN_SHOP;
store.getters.order.serviceLocation.provider.address.streetAddress = streetAddress;
};
test("splits typical address into first token as number and remainder as street", () => {
setInShopStreet("123 West Elm St");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123",
street: "West Elm St",
});
});
test("two tokens: number and single-word street", () => {
setInShopStreet("456 Oak");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "456",
street: "Oak",
});
});
test("single token with no spaces: full string in number, empty street", () => {
setInShopStreet("123OakStreet");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123OakStreet",
street: "",
});
});
test("collapses multiple spaces between words", () => {
setInShopStreet("123 West Elm St");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123",
street: "West Elm St",
});
});
test("trims leading and trailing whitespace on full address", () => {
setInShopStreet(" 99 Maple Ave ");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "99",
street: "Maple Ave",
});
});
test("empty string yields empty number and street", () => {
setInShopStreet("");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("whitespace-only address yields empty number and street", () => {
setInShopStreet(" \t ");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("null address yields empty number and street", () => {
setInShopStreet(null);
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("uses mobile service address when appointment is mobile", () => {
store.getters.order.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
store.getters.order.serviceLocation.address = "700 Broadway Blvd";
store.getters.order.serviceLocation.city = "Columbus";
store.getters.order.serviceLocation.state = "OH";
store.getters.order.serviceLocation.zipCode = "43235";
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "700",
street: "Broadway Blvd",
});
});
test("splits on tabs and other whitespace runs", () => {
setInShopStreet("10\tPine\tLane");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "10",
street: "Pine Lane",
});
});
});
});
function setupMocks({ customMountOptions } = {}) {

16
src/layouts/payment-adyen/payment-adyen.vue
View file

@ -455,8 +455,8 @@ export default {
zipCodeCtu: this.locationInfo.zipCodeCtu,
amount: this.adyenPriceTotal,
city: this.locationInfo.city,
houseNumberOrName: this.splitStreetAddress.number,
street: this.splitStreetAddress.street,
street: this.locationInfo.address ?? "",
houseNumberOrName: this.locationInfo.address2 ?? "",
zipCode: this.locationInfo.zipCode,
stateOrProvince: this.locationInfo.state,
returnUrl: applicationConfig.PIA_ADYEN_RETURN_URL,
@ -515,18 +515,6 @@ export default {
}
},
splitStreetAddress() {
const address = (this.locationInfo?.address ?? "").trim();
const tokens = address.length ? address.split(/\s+/) : [""];
const number = tokens[0] ?? "";
const street = tokens.length > 1 ? tokens.slice(1).join(" ") : "";
return {
number,
street,
};
},
sourceSystem() {
return "FMG-2.0";
},

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

@ -226,8 +226,8 @@ export default {
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
serviceZipCode: store.getters.order.serviceLocation.zipCode,
carId: store.getters.vehicle.carId,
accountNumber: store.getters.order.payment?.parentAccountNumber,
},
"payment-method"
);

2
src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.vue
View file

@ -35,8 +35,8 @@ export default {
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
serviceZipCode: store.getters.order.serviceLocation.zipCode,
carId: store.getters.vehicle.carId,
accountNumber: store.getters.order.payment?.parentAccountNumber,
},
"review"
);

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

@ -217,8 +217,10 @@ export default {
const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_WIPERS,
{
serviceZipCode: store.getters.order.serviceLocation.zipCode,
carId: store.getters.vehicle.carId,
accountNumber:
store.getters.order.payment?.parentAccountNumber ??
applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
},
"quote"
);

4
src/store/index.js
View file

@ -1977,12 +1977,12 @@ export const actions = {
async getWipers(context, { payload, pageNameToLog }) {
const carId = payload.carId;
const serviceZipCode = payload.serviceZipCode;
const accountNumber = payload.accountNumber;
const response = await globalMethods
.callHttpClient({
method: endpoints.GetWipers.method,
endpoint: `${endpoints.GetWipers.url}/${carId}/${serviceZipCode}`,
endpoint: `${endpoints.GetWipers.url}/${carId}/${accountNumber}`,
logApiCall: true,
pageNameToLog: pageNameToLog,
})