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

WIP

Browse source
This commit is contained in:
Leah Schumann 2023-10-20 11:11:57 -04:00
parent 93335d238d
commit 86fde0c034
4 changed files with 170 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/fmg-components/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
View file

@ -41,18 +41,18 @@ export default {
isDisplayed() { isDisplayed() {
return this.showAddRainDefense || this.showAddWipers; return this.showAddRainDefense || this.showAddWipers;
}, },
showAddRainDefense() { // showAddRainDefense() {
// if not found in the cart // // if not found in the cart
return !this.cartItems.some((vap) => { // return !this.cartItems.some((vap) => {
return vap.partType === "RAIN DEFENSE"; // return vap.partType === "RAIN DEFENSE";
}); // });
}, // },
showAddWipers() { // showAddWipers() {
// if not found in the cart // // if not found in the cart
return !this.cartItems.some((vap) => { // return !this.cartItems.some((vap) => {
return vap.partType.includes(" WIPER"); // return vap.partType.includes(" WIPER");
}); // });
}, // },
rainDefensePrice() { rainDefensePrice() {
// const lineItem = this.rainDefenseItem; // const lineItem = this.rainDefenseItem;
const lineItem = this.availableLineItems.find((item) => { const lineItem = this.availableLineItems.find((item) => {
@ -92,11 +92,11 @@ export default {
answers.push(answer); answers.push(answer);
} }
if (this.showAddRainDefense) { // if (this.showAddRainDefense) {
const answer = getAnswer("RainDefenseModal", this.answersCmsData); // const answer = getAnswer("RainDefenseModal", this.answersCmsData);
answer.SubText = "+$" + this.rainDefensePrice; // answer.SubText = "+$" + this.rainDefensePrice;
answers.push(answer); // answers.push(answer);
} // }
return answers; return answers;
}, },

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

@ -17,7 +17,7 @@
}}</span> }}</span>
</div> </div>
<div <div
v-for="(lineItem, i) in displayedPackageLineItems" v-for="(lineItem, i) in cartItems"
:key="i" :key="i"
:class="[this.displayedPackageLineItems ? 'vaps' : '']"> :class="[this.displayedPackageLineItems ? 'vaps' : '']">
<span>{{ lineItem.name }}</span> <span>{{ lineItem.name }}</span>
@ -71,7 +71,7 @@ import {
} from "@/helpers/service-package-helper"; } from "@/helpers/service-package-helper";
import textLink from "@/ux-components/text-link/text-link"; import textLink from "@/ux-components/text-link/text-link";
import textBlock from "@/digital-components/text-block/text-block"; import textBlock from "@/digital-components/text-block/text-block";
import { deepClone } from "@/helpers/object-helper"; import { LineItemUtilities } from "@/store";
export default { export default {
name: "modal", name: "modal",
@ -90,6 +90,7 @@ export default {
style: "currency", style: "currency",
currency: "USD", currency: "USD",
}), }),
lineItemUtilities: new LineItemUtilities(),
}; };
}, },
methods: { methods: {
@ -170,46 +171,116 @@ export default {
return packagePrice; return packagePrice;
}, },
// cartItems: { allLineItems() {
// get: function () { return this.lineItemUtilities.getArrayOfAllLineItems(this.lineItems);
// return this.answersToDisplay; },
// }, flattenedLineItems() {
// set: function (newValue) { return this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(this.allLineItems);
},
// }, frontWipersCartItem() {
// }, let cartItem = null;
displayedPackageLineItems() { let frontWipers = this.vaps.filter(vapsLineItem => vapsLineItem.partType == "FRONT WIPER");
const displayedPackageLineItems = []; if (frontWipers.length > 0) {
const packageLineItems = this.getVapsLineItemsForSelectedPackage(this.packageLevel); cartItem = {
name: "Front Wipers", // TODO: Get from CMS
// TODO Determine if we could get the same list from this.lineItems? partNumber: "Multiple",
packageLineItems?.forEach((item) => { partType: "Multiple", // TODO: Get from CMS
let price = item.sellingPrice + item.kitPrice + item.laborAmount; laborAmount: 0,
const packageLineItem = { sellingPrice: 0,
name: item.partType, kitPrice: 0,
price: "$" + parseFloat(price).toFixed(2), salesTax: 0,
partType: item.partType,
isRemovable: item.isRemovable,
}; };
displayedPackageLineItems.push(packageLineItem);
});
return displayedPackageLineItems; frontWipers.forEach((lineItem) => {
cartItem.kitPrice += lineItem.kitPrice ?? 0;
cartItem.laborAmount += lineItem.laborAmount ?? 0;
cartItem.sellingPrice += lineItem.sellingPrice ?? 0;
cartItem.salesTax += lineItem.salesTax ?? 0;
});
}
return cartItem;
},
rearWipersCartItem() {
let cartItem = null;
let rearWipers = this.vaps.filter(vapsLineItem => vapsLineItem.partType == "REAR WIPER");
if (rearWipers.length > 0) {
cartItem = {
name: "Rear Wipers", // TODO: Get from CMS
partNumber: "Multiple",
partType: "Multiple", // TODO: Get from CMS
laborAmount: 0,
sellingPrice: 0,
kitPrice: 0,
salesTax: 0,
};
rearWipers.forEach((lineItem) => {
cartItem.kitPrice += lineItem.kitPrice ?? 0;
cartItem.laborAmount += lineItem.laborAmount ?? 0;
cartItem.sellingPrice += lineItem.sellingPrice ?? 0;
cartItem.salesTax += lineItem.salesTax ?? 0;
});
}
return cartItem;
},
cartItems: {
get: function () {
const cartItems = [];
if (this.frontWipersCartItem) {
cartItems.push(this.frontWipersCartItem);
}
if (this.rearWipersCartItem) {
cartItems.push(this.rearWipersCartItem);
}
const otherVapsLineItems = this.vaps.filter(vapsLineItem => vapsLineItem.partType != "FRONT WIPER" && vapsLineItem.partType != "REAR WIPER");
otherVapsLineItems.forEach((lineItem) => {
const cartItem = lineItem;
cartItems.push(cartItem);
});
console.log(this.lineItems)
console.log(this.lineItems.glassParts)
const glassPartsLineItems = this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(this.lineItems.glassParts);
console.log(this.glassPartsLineItems)
glassPartsLineItems.forEach((lineItem) => {
const cartItem = lineItem;
cartItems.push(cartItem);
});
console.log(cartItems)
return cartItems;
},
set: function (newValue) {
},
},
packageLineItems() {
const packageLineItems = [];
return packageLineItems;
}, },
displayedNonPackageLineItems() { displayedNonPackageLineItems() {
const displayedNonPackageLineItems = []; const displayedNonPackageLineItems = [];
const possibleLineItems = [...this.vaps, ...this.supportingItems]; const possibleLineItems = [...this.vaps, ...this.supportingItems];
possibleLineItems?.forEach((item) => { possibleLineItems?.forEach((item) => {
let price = item.sellingPrice + item.kitPrice + item.laborAmount; let price = item.sellingPrice + item.kitPrice + item.laborAmount;
const isAllowed = this.allowableLineItems?.findIndex((lineItem) => { const isAllowed = this.allowableLineItems?.findIndex((lineItem) => {
return lineItem.partType === item.partType; return lineItem.partType === item.partType;
}); });
const indexFound = this.displayedPackageLineItems?.findIndex((packageLineItem) => { const indexFound = this.displayedPackageLineItems?.findIndex((packageLineItem) => {
return packageLineItem.partType === item.partType; return packageLineItem.partType === item.partType;
}); });
const isInPackage = this.displayedPackageLineItems?.findIndex((packageLineItem) => { const isInPackage = this.displayedPackageLineItems?.findIndex((packageLineItem) => {
return packageLineItem.partType === item.partType; return packageLineItem.partType === item.partType;
}); });
if (isInPackage === -1 && isAllowed > -1) { if (isInPackage === -1 && isAllowed > -1) {
const nonPackageLineItem = { const nonPackageLineItem = {
name: item.partType, name: item.partType,
@ -217,9 +288,11 @@ export default {
partType: item.partType, partType: item.partType,
isRemovable: item.isRemovable, isRemovable: item.isRemovable,
}; };
displayedNonPackageLineItems.push(nonPackageLineItem); displayedNonPackageLineItems.push(nonPackageLineItem);
} }
}); });
return displayedNonPackageLineItems; return displayedNonPackageLineItems;
}, },
glassToReplace() { glassToReplace() {
@ -233,7 +306,7 @@ export default {
return; return;
} }
return this.damage.isRepair; return this.damage.isRepair;
}, },
vaps() { vaps() {
const vaps = this.lineItems?.vaps; const vaps = this.lineItems?.vaps;
return vaps?.length > 0 ? vaps : []; return vaps?.length > 0 ? vaps : [];
@ -263,7 +336,7 @@ export default {
subTotal() { subTotal() {
let subTotal = 0; let subTotal = 0;
this.lineItems.forEach((lineItem) => { this.cartItems.forEach((lineItem) => {
subTotal += subTotal +=
(lineItem.kitPrice ?? 0) + (lineItem.kitPrice ?? 0) +
(lineItem.laborAmount ?? 0) + (lineItem.laborAmount ?? 0) +
@ -274,8 +347,8 @@ export default {
}, },
salesTax() { salesTax() {
let salesTax = 0; let salesTax = 0;
this.lineItems.forEach((lineItem) => { this.cartItems.forEach((lineItem) => {
salesTax += lineItem.salesTax; salesTax += lineItem.salesTax ?? 0;
}); });
return salesTax; return salesTax;

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

@ -144,12 +144,12 @@ export default {
const availableLineItems = [ const availableLineItems = [
resultMap.rainDefense, resultMap.rainDefense,
...resultMap.supportingItems, ... resultMap.supportingItems,
...resultMap.wipers, ... resultMap.wipers,
...glassParts, ... glassParts,
]; ];
const pricedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging( const pricingResults = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
{ {
availableLineItems: availableLineItems, availableLineItems: availableLineItems,
@ -158,11 +158,7 @@ export default {
false false
); );
const lineItems = store.getters.order.lineItems; const taxingResults = await baseMixin.methods.dispatchStoreActionWithLogging(
const combinedLineItems = [...glassParts, ...lineItems.supportingItems, ...lineItems.vaps];
const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA, storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
{ {
billToAccountNumber: "87291", billToAccountNumber: "87291",
@ -170,26 +166,21 @@ export default {
appointmentType: store.getters.order.serviceLocation.appointmentType, appointmentType: store.getters.order.serviceLocation.appointmentType,
serviceLocationState: store.getters.order.serviceLocation.state, serviceLocationState: store.getters.order.serviceLocation.state,
serviceLocationZipCode: store.getters.order.serviceLocation.zipCode, serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
pricedLineItems: combinedLineItems, pricedAvailableLineItems: pricingResults,
}, },
"payment-method", "payment-method",
false false
); );
const cartItems = [...glassParts, ...lineItems.supportingItems, ...lineItems.vaps]; // TOBEREMOVED BY AJC IN CSR-1384
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.cartItems = cartItems; // TOBEREMOVED BY AJC IN CSR-1384
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
vm.availableLineItems = pricedAvailableLineItems; vm.availableLineItems = taxingResults;
vm.lineItems = taxedLineItems; vm.lineItems = store.getters.order.lineItems;
}); });
}, },
data() { data() {
return { return {
cartItems: [], // TOBEREMOVED BY AJC IN CSR-1384
lineItems: [], lineItems: [],
availableLineItems: [], availableLineItems: [],
paymentMethodInternalModel: this.getPaymentMethodFromStore(), paymentMethodInternalModel: this.getPaymentMethodFromStore(),

66
src/store/index.js
View file

@ -2155,9 +2155,9 @@ export const actions = {
context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData); context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
const pricedLineItems = addPricesToLineItems(availableLineItems, response.data.lineItems); availableLineItems = addPricesToLineItems(availableLineItems, response.data.lineItems);
return pricedLineItems; return availableLineItems;
}, },
// Tax order actions // Tax order actions
@ -2170,14 +2170,15 @@ export const actions = {
appointmentType, appointmentType,
serviceLocationState, serviceLocationState,
serviceLocationZipCode, serviceLocationZipCode,
pricedLineItems, pricedAvailableLineItems,
}, },
pageNameToLog, pageNameToLog,
} }
) { ) {
// const flattenedLineItemsWithChildParts = // const flattenedLineItemsWithChildParts =
// getFlattenedArrayOfLineItemsWithChildParts(pricedLineItems); // getFlattenedArrayOfLineItemsWithChildParts(pricedLineItems);
const lineItemsWithOnlyPriceInfo = pricedLineItems.map((lineItem) => ({
const lineItemsWithOnlyPriceInfo = pricedAvailableLineItems.map((lineItem) => ({
partNumber: lineItem.partNumber, partNumber: lineItem.partNumber,
laborAmount: lineItem.laborAmount ?? 0, laborAmount: lineItem.laborAmount ?? 0,
kitPrice: lineItem.kitPrice ?? 0, kitPrice: lineItem.kitPrice ?? 0,
@ -2211,14 +2212,22 @@ export const actions = {
pageNameToLog: pageNameToLog, pageNameToLog: pageNameToLog,
}); });
context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData); //context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
const taxedLineItems = addTaxesToPricedLineItems( // pricedLineItems.forEach((pricedLineItem) => {
pricedLineItems, // for (const [key, value] of Object.entries(storeLineItems)) {
// storeLineItems[key] = pricedLineItem;
// }
// });
// console.log(pricedLineItems)
pricedAvailableLineItems = addTaxesToPricedLineItems(
pricedAvailableLineItems,
response.data.taxedLineItems response.data.taxedLineItems
); );
return taxedLineItems; return pricedAvailableLineItems;
}, },
async validateOrderPromoAndSaveServerData( async validateOrderPromoAndSaveServerData(
@ -2516,8 +2525,7 @@ function convertGlassPieceNamingFromApi(glassArray) {
} }
function addPricesToLineItems(lineItems, pricingLineItems) { function addPricesToLineItems(lineItems, pricingLineItems) {
const pricedLineItems = deepClone(lineItems); lineItems.forEach((lineItem) => {
pricedLineItems.forEach((lineItem) => {
let lineItemIndex = pricingLineItems.findIndex( let lineItemIndex = pricingLineItems.findIndex(
(pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber (pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber
); );
@ -2533,37 +2541,48 @@ function addPricesToLineItems(lineItems, pricingLineItems) {
lineItem.salesTax = pricedLineItem.salesTax; lineItem.salesTax = pricedLineItem.salesTax;
}); });
return pricedLineItems; return lineItems;
} }
function addTaxesToPricedLineItems(lineItems, taxingLineItems) { function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) {
const taxedLineItems = deepClone(lineItems); pricedLineItems.forEach((pricedLineItem) => {
taxedLineItems.forEach((lineItem) => {
let lineItemIndex = taxingLineItems.findIndex( let lineItemIndex = taxingLineItems.findIndex(
(taxingLineItem) => taxingLineItem.partNumber === lineItem.partNumber (taxingLineItem) => taxingLineItem.partNumber === pricedLineItem.partNumber
); );
if (lineItem.childParts) { if (pricedLineItem.childParts) {
addTaxesToPricedLineItems(lineItem.childParts, taxingLineItems); addTaxesToPricedLineItems(pricedLineItem.childParts, taxingLineItems);
} }
let taxedLineItem = taxingLineItems.splice(lineItemIndex, 1)[0]; let taxedLineItem = taxingLineItems.splice(lineItemIndex, 1)[0];
lineItem.salesTax = taxedLineItem.salesTax; pricedLineItem.salesTax = taxedLineItem?.salesTax ?? 0;
}); });
return taxedLineItems; return pricedLineItems;
}
export class LineItemUtilities {
constructor() {
this.getArrayOfAllLineItems = getArrayOfAllLineItems;
this.getFlattenedArrayOfLineItemsWithChildParts = getFlattenedArrayOfLineItemsWithChildParts;
}
} }
function getArrayOfAllLineItems(lineItems) { function getArrayOfAllLineItems(lineItems) {
let consolidatedLineItemsArray = []; let consolidatedLineItemsArray = [];
if (lineItems.glassParts != null) if (lineItems.glassParts != null)
consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.glassParts]; consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.glassParts];
if (lineItems.supportingItems != null) if (lineItems.supportingItems != null)
consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.supportingItems]; consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.supportingItems];
if (lineItems.vaps != null) if (lineItems.vaps != null)
consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.vaps]; consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.vaps];
if (lineItems.promos != null) if (lineItems.promos != null)
consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.promos]; consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.promos];
return consolidatedLineItemsArray; return consolidatedLineItemsArray;
} }
@ -2578,6 +2597,7 @@ function getFlattenedArrayOfLineItemsWithChildParts(lineItems) {
]; ];
} }
}); });
console.log(flattenedArray)
return flattenedArray; return flattenedArray;
} }