diff --git a/src/fmg-components/cart/cart.spec.js b/src/fmg-components/cart/cart.spec.js
index ae84083e6..bd0a2b096 100644
--- a/src/fmg-components/cart/cart.spec.js
+++ b/src/fmg-components/cart/cart.spec.js
@@ -37,13 +37,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
@@ -89,13 +89,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
@@ -132,13 +132,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
@@ -189,13 +189,13 @@ describe("cart.vue", () => {
// promos: [],
// };
- // const availableLineItems = [];
+ // const availableVaps = [];
// // Act
// const { wrapper } = setupMocks({
// props: {
// modelValue: lineItems,
- // availableLineItems: availableLineItems,
+ // availableVaps: availableVaps,
// },
// });
@@ -234,13 +234,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
@@ -277,13 +277,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
@@ -321,13 +321,13 @@ describe("cart.vue", () => {
promos: [],
};
- const availableLineItems = [];
+ const availableVaps = [];
// Act
const { wrapper } = setupMocks({
props: {
modelValue: lineItems,
- availableLineItems: availableLineItems,
+ availableVaps: availableVaps,
},
});
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index a5ab80faa..461c94a59 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -127,7 +127,7 @@ export default {
modelValue: Object,
damage: Object,
servicePackageOptionsCmsName: String,
- availableLineItems: Object,
+ availableVaps: Object,
allowItemRemoval: Boolean,
recyclingModalCmsWidgetName: String,
},
@@ -200,6 +200,16 @@ export default {
},
},
computed: {
+ availableLineItems() {
+ if (!this.lineItems || this.lineItems.length < 1) {
+ return [];
+ }
+ return [
+ ...this.lineItems.glassParts,
+ ...this.lineItems.supportingItems,
+ ...this.availableVaps,
+ ];
+ },
cartItems: {
get: function () {
let cartItems = [];
diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index b4fa7a3b0..c822fa318 100644
--- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -76,13 +76,12 @@ export default {
name: "add-vaps-modal-buttons",
props: {
vapsTilesCmsName: String,
- availableLineItems: Object,
+ availableVaps: Object,
modelValue: Object,
},
data() {
return {
addVapsButton: addVapsButton,
- wipersOffered: null,
isModalOpened: false,
selectedWipers: this.getSelectedWipers(),
};
@@ -206,7 +205,7 @@ export default {
return modelValue;
},
rainDefenseModal() {
- const lineItem = this.availableLineItems.find((item) => {
+ const lineItem = this.availableVaps.find((item) => {
return item.partType === partTypeStrings.RAIN_DEFENSE;
});
if (lineItem)
@@ -217,10 +216,10 @@ export default {
},
wipersModal() {
// create a single wiper item for modal
- const frontWiperLineItems = this.availableLineItems.filter((item) => {
+ const frontWiperLineItems = this.availableVaps.filter((item) => {
return item.partType.includes(partTypeStrings.FRONT_WIPER);
});
- const rearWiperLineItems = this.availableLineItems.filter((item) => {
+ const rearWiperLineItems = this.availableVaps.filter((item) => {
return item.partType.includes(partTypeStrings.REAR_WIPER);
});
let wipersModal;
@@ -249,20 +248,38 @@ export default {
answersCmsData() {
return this.getCmsContent(this.vapsTilesCmsName, "Answers");
},
+ rainDefenseInCart() {
+ return this.currentCartItems.vaps?.some((vap) => {
+ return vap?.partType === partTypeStrings.RAIN_DEFENSE;
+ });
+ },
+ frontWipersInCart() {
+ return this.currentCartItems.vaps?.some((vap) => {
+ return vap?.partType?.includes(partTypeStrings.FRONT_WIPER);
+ });
+ },
+ rearWipersInCart() {
+ return this.currentCartItems.vaps?.some((vap) => {
+ return vap?.partType?.includes(partTypeStrings.REAR_WIPER);
+ });
+ },
+ wipersOffered() {
+ let result;
+ if (!this.frontWipersInCart) {
+ if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+ result = wipersOfferedStrings.BOTH;
+ } else {
+ result = wipersOfferedStrings.FRONT;
+ }
+ } else if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+ result = wipersOfferedStrings.REAR;
+ }
+ return result;
+ },
buttonsToDisplay() {
const buttons = [];
if (!this.answersCmsData) return buttons;
- const rainDefenseInCart = this.currentCartItems.vaps?.some((vap) => {
- return vap?.partType === partTypeStrings.RAIN_DEFENSE;
- });
- const frontWipersInCart = this.currentCartItems.vaps?.some((vap) => {
- return vap?.partType?.includes(partTypeStrings.FRONT_WIPER);
- });
- const rearWipersInCart = this.currentCartItems.vaps?.some((vap) => {
- return vap?.partType?.includes(partTypeStrings.REAR_WIPER);
- });
-
const getAnswer = (name, answers) => {
const answerIndex = answers.findIndex((answer) => {
return answer.Name === name;
@@ -270,7 +287,7 @@ export default {
return answers[answerIndex];
};
- if (!rainDefenseInCart) {
+ if (!this.rainDefenseInCart) {
// NO RAIN DEFENSE IN CART; SHOW RAIN DEFENSE BUTTON
const modalData = getAnswer("RainDefenseModal", this.answersCmsData);
modalData.SubText = "+$" + this.rainDefenseModal?.listPrice;
@@ -278,27 +295,26 @@ export default {
}
const modalData = getAnswer("WipersModal", this.answersCmsData);
- if (!frontWipersInCart) {
- if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
- // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON
- const prices = [
- this.wipersModal?.totalFrontPrice,
- this.wipersModal?.totalRearPrice,
- ];
- prices.sort((a, b) => a - b);
- modalData.SubText = "+$" + prices[0] + " - $" + prices[prices.length - 1];
- this.updateWipersOffered(wipersOfferedStrings.BOTH);
- buttons.push(modalData);
- } else {
- // NO FRONT WIPERS IN CART; SHOW ONLY FRONT WIPERS BUTTON
- modalData.SubText = "+$" + this.wipersModal?.totalFrontPrice;
- this.updateWipersOffered(wipersOfferedStrings.FRONT);
- buttons.push(modalData);
- }
- } else if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+ if (this.wipersOffered === wipersOfferedStrings.BOTH) {
+ // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON
+ const prices = [
+ this.wipersModal?.totalFrontPrice,
+ this.wipersModal?.totalRearPrice,
+ ];
+ prices.sort((a, b) => a - b);
+ modalData.SubText = "+$" + prices[0] + " - $" + prices[prices.length - 1];
+ buttons.push(modalData);
+ }
+
+ if (this.wipersOffered === wipersOfferedStrings.FRONT) {
+ // NO FRONT WIPERS IN CART; SHOW ONLY FRONT WIPERS BUTTON
+ modalData.SubText = "+$" + this.wipersModal?.totalFrontPrice;
+ buttons.push(modalData);
+ }
+
+ if (this.wipersOffered === wipersOfferedStrings.REAR) {
// NO REAR WIPERS IN CART; SHOW ONLY REAR WIPERS BUTTON
modalData.SubText = "+$" + this.wipersModal?.totalRearPrice;
- this.updateWipersOffered(wipersOfferedStrings.REAR);
buttons.push(modalData);
}
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 6946b4168..8e5ad18d6 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -23,7 +23,7 @@
@@ -93,13 +93,14 @@ import {
} from "@/helpers/promotions-helper";
import { queryStrings } from "@/constants/query-strings";
import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { deepClone } from "@/helpers/object-helper";
import { Form } from "vee-validate";
import { defineRule } from "vee-validate";
import { required } from "@/helpers/validation-rules";
import { errorMessages } from "@/constants/error-messages";
import { AppointmentTypeStrings } from "@/constants/schedule-constants";
-import { mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
+import { mapTaxedLineItemsToStoreFormat } from "../../store";
defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -121,12 +122,6 @@ export default {
"payment-method"
);
- const supportingItemsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
- storeActions.GET_SUPPORTING_ITEMS,
- null,
- "payment-method"
- );
-
const promiseResultMap = [
{
resultKey: "cmsContent",
@@ -140,29 +135,25 @@ export default {
resultKey: "rainDefense",
promise: rainDefensePromise,
},
- {
- resultKey: "supportingItems",
- promise: supportingItemsPromise,
- },
];
const resultMap = await settleAllPromises(promiseResultMap);
+ const lineItemsFromStore = deepClone(store.getters.order.lineItems);
+ const glassParts = lineItemsFromStore.glassParts ?? [];
+ const supportingItems = lineItemsFromStore.supportingItems ?? [];
- const glassParts = store.getters.order.lineItems.glassParts ?? [];
-
- let availableLineItems = [
+ const lineItemsToTax = [
resultMap.rainDefense,
- ...resultMap.supportingItems,
+ ...supportingItems,
...resultMap.wipers,
...glassParts,
];
+ const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
- const lineItemsFromStore = store.getters.order.lineItems;
-
- await baseMixin.methods.dispatchStoreActionWithLogging(
+ const pricedLineItemsToTax = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
{
- availableLineItems: availableLineItems,
+ availableLineItems: lineItemsToTax,
},
"payment-method",
false
@@ -174,16 +165,16 @@ export default {
const { validatePromoResponse, revalidatePromoResponse } =
await revalidatePromosAndValidateNewPromo(
promoCodeFromQueryString,
- availableLineItems,
+ pricedLineItemsToTax,
"payment-method"
);
const newValidatedPromos = validatePromoResponse?.orderPromos ?? [];
- availableLineItems.push(...newValidatedPromos);
+ pricedLineItemsToTax.push(...newValidatedPromos);
// End of promo logic
- const taxedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
+ const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
{
billToAccountNumber: "87291",
@@ -192,24 +183,23 @@ export default {
serviceLocationCity: store.getters.order.serviceLocation.city,
serviceLocationState: store.getters.order.serviceLocation.state,
serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
- pricedAvailableLineItems: availableLineItems,
+ pricedLineItems: pricedLineItemsToTax,
},
"payment-method",
false
);
- // Match all available line items to the line items as they are in the store
+ // Match all line items to the line items as they are in the store
// and rebuild the original structure.
- const lineItems = mapTaxedAvailableLineItemsToStoreFormat(
- availableLineItems,
- lineItemsFromStore
- );
+ const lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, lineItemsFromStore);
+ const taxedVaps = mapTaxedLineItemsToStoreFormat(taxedLineItems, availableVaps);
+
// Add items that were not in the store yet but added via query string promo validation
lineItems.promos = lineItems.promos ?? [];
lineItems.promos.push(...newValidatedPromos);
const vapsToAddToCart = getVapsThatNeedToBeAddedToSatisfyPromos(
newValidatedPromos,
- availableLineItems,
+ taxedVaps,
lineItems
);
lineItems.vaps.push(...vapsToAddToCart);
@@ -217,16 +207,15 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
- vm.availableLineItems = taxedAvailableLineItems;
+ vm.availableVaps = taxedVaps;
vm.lineItems = lineItems;
-
vm.updateFooterButtonText(vm.customCtaCopy);
});
},
data() {
return {
lineItems: [],
- availableLineItems: [],
+ availableVaps: [],
paymentMethodInternalModel: this.getPaymentMethodFromStore(),
inactivePromos: this.getInactivePromosFromStore(),
};
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index ba396f952..fa8d91676 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -188,7 +188,7 @@ import { applicationConfig } from "@/constants/application-config";
import { paymentMethods } from "@/constants/payment-method-constants";
import { AppointmentTypeStrings } from "@/constants/schedule-constants";
import baseMixin from "@/mixins/base-mixin.js";
-import { mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
+import { mapTaxedLineItemsToStoreFormat } from "../../store";
import {
revalidatePromosAndValidateNewPromo,
getAddableVapsFromAvailableLineItems,
@@ -348,10 +348,7 @@ export default {
// Match all available line items to the line items as they are in the store
// and rebuild the original structure.
- const lineItems = mapTaxedAvailableLineItemsToStoreFormat(
- availableLineItems,
- lineItemsFromStore
- );
+ const lineItems = mapTaxedLineItemsToStoreFormat(availableLineItems, lineItemsFromStore);
// Call the "next" function to complete the transition to this page.
next(async (vm) => {
diff --git a/src/store/index.js b/src/store/index.js
index e2915a1af..5251950c1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2180,13 +2180,13 @@ export const actions = {
serviceLocationCity,
serviceLocationState,
serviceLocationZipCode,
- pricedAvailableLineItems,
+ pricedLineItems,
},
pageNameToLog,
}
) {
const flattenedLineItemsWithChildParts =
- getFlattenedArrayOfLineItemsWithChildParts(pricedAvailableLineItems);
+ getFlattenedArrayOfLineItemsWithChildParts(pricedLineItems);
const lineItemsWithOnlyPriceInfo = flattenedLineItemsWithChildParts.map((lineItem) => ({
partNumber: lineItem.partNumber,
@@ -2235,12 +2235,9 @@ export const actions = {
context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
- pricedAvailableLineItems = addTaxesToPricedLineItems(
- pricedAvailableLineItems,
- response.data.taxedLineItems
- );
+ pricedLineItems = addTaxesToPricedLineItems(pricedLineItems, response.data.taxedLineItems);
- return pricedAvailableLineItems;
+ return pricedLineItems;
},
// The parameter is an array of ALL available front wipers and rain defense
@@ -2610,7 +2607,7 @@ function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) {
return pricedLineItems;
}
-export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, storeLineItems) {
+export function mapTaxedLineItemsToStoreFormat(availableLineItems, storeLineItems) {
// clone the lineItems array because what we're passing in is referencing the store directly
const lineItems = deepClone(storeLineItems);