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

Fixing the commits to the wrong branch

Browse source
This commit is contained in:
Leah Schumann 2023-10-30 07:15:56 -04:00
parent d39870f2ca
commit acc533e42c
4 changed files with 142 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/constants/cart-categories.js → src/constants/cart-item-categories.js
View file

@ -1,8 +1,8 @@
const cartCategories = { const cartItemCategories = {
VAPS: "vaps", VAPS: "vaps",
GLASS_PARTS: "glassParts", GLASS_PARTS: "glassParts",
SUPPORTING_ITEMS: "supportingItems", SUPPORTING_ITEMS: "supportingItems",
PROMOS: "promos", PROMOS: "promos",
}; };
export { cartCategories }; export { cartItemCategories };

2
src/constants/part-type-strings.js
View file

@ -3,6 +3,8 @@ const partTypeStrings = {
REAR_WIPER: "REAR WIPER", REAR_WIPER: "REAR WIPER",
RAIN_DEFENSE: "RAIN DEFENSE", RAIN_DEFENSE: "RAIN DEFENSE",
RECALIBRATION: "RECALIBRATION", RECALIBRATION: "RECALIBRATION",
RECYCLE_FEE: "RECYCLE FEE",
MOBILE_FEE: "MOBILE FEE",
}; };
export { partTypeStrings }; export { partTypeStrings };

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

@ -1,6 +1,6 @@
<template> <template>
<div class="cart"> <div class="cart">
<div class="container-fluid px-0"> <div class="px-0">
<div <div
class="row vin-toggle flex align-items-center" class="row vin-toggle flex align-items-center"
:class="[isActive ? 'active' : '']" :class="[isActive ? 'active' : '']"
@ -28,7 +28,7 @@
linkType="text" linkType="text"
:text="removeLinkText" :text="removeLinkText"
href="#!" href="#!"
@click-event="removeItem(cartItem)" /> @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
</div> </div>
<!-- Nonpackaged Cart Items --> <!-- Nonpackaged Cart Items -->
@ -40,7 +40,7 @@
linkType="text" linkType="text"
:text="removeLinkText" :text="removeLinkText"
href="#!" href="#!"
@click-event="removeItem(cartItem)" /> @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
<span>{{ currencyFormatter.format(cartItem.subTotal) }}</span> <span>{{ currencyFormatter.format(cartItem.subTotal) }}</span>
</div> </div>
@ -79,7 +79,10 @@ import { getHighestFullySatisfiedTier, getPackageContents } from "@/helpers/serv
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 { LineItemUtilities } from "@/store"; import { LineItemUtilities } from "@/store";
import { deepClone } from "@/helpers/object-helper";
import { partTypeStrings } from "@/constants/part-type-strings";
import { cartItemCategories } from "@/constants/cart-item-categories";
import { cartItemTypes } from "@/constants/cart-item-types";
export default { export default {
name: "cart", name: "cart",
@ -97,6 +100,7 @@ export default {
style: "currency", style: "currency",
currency: "USD", currency: "USD",
}), }),
lineItems: deepClone(this.modelValue),
lineItemUtilities: new LineItemUtilities(), lineItemUtilities: new LineItemUtilities(),
}; };
}, },
@ -115,15 +119,6 @@ export default {
return subTotal; return subTotal;
}, },
removeItem(cartItem) {
cartItem.lineItemIds.forEach((lineItemIdToDelete) => {
this.lineItems[cartItem.category] = this.lineItems[cartItem.category].filter(
(lineItem) => lineItem.partType != cartItem.cartItemType
);
});
this.$emit("update:modelValue", this.lineItems);
},
getVapsCartItemsForSelectedPackage(packageName) { getVapsCartItemsForSelectedPackage(packageName) {
const packageContentTypes = getPackageContents( const packageContentTypes = getPackageContents(
this.glassToReplace, this.glassToReplace,
@ -134,6 +129,8 @@ export default {
let vapsCartItemsForSelectedPackage = []; let vapsCartItemsForSelectedPackage = [];
console.log(this.cartItems);
console.log(packageContentTypes);
this.cartItems.forEach((cartItem) => { this.cartItems.forEach((cartItem) => {
packageContentTypes.forEach((vapType) => { packageContentTypes.forEach((vapType) => {
if (vapType == cartItem.cartItemType) { if (vapType == cartItem.cartItemType) {
@ -155,11 +152,22 @@ export default {
return vapsTypeName.Text; return vapsTypeName.Text;
}, },
removeItem(cartItemType, category) {
console.log(
this.lineItems[category].filter(
(lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType
)
);
this.lineItems[category] = this.lineItems[category].filter(
(lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType
);
//console.log(`lineItemToDelete: ${lineItemIdToDelete}`)
this.$emit("update:modelValue", this.lineItems);
},
}, },
computed: { computed: {
lineItems() {
return this.modelValue;
},
cartItems: { cartItems: {
get: function () { get: function () {
let cartItems = []; let cartItems = [];
@ -194,7 +202,6 @@ export default {
return cartItems; return cartItems;
}, },
set: function (newValue) {},
}, },
servicePackageTitleWidget() { servicePackageTitleWidget() {
const servicePackageNames = this.getCmsContent( const servicePackageNames = this.getCmsContent(
@ -233,51 +240,75 @@ export default {
return packagePrice; return packagePrice;
}, },
isRepair() {
if (!this.damage) {
return;
}
return this.damage.isRepair;
},
glassToReplace() {
if (!this.damage) {
return;
}
return this.damage.glassToReplace;
},
vaps() { vaps() {
const vaps = this.lineItems?.vaps; const vaps = this.lineItems?.vaps;
return vaps?.length > 0 ? vaps : []; return vaps?.length > 0 ? vaps : [];
}, },
supportingItems() {
const supportingItems = this.lineItems?.supportingItems;
return supportingItems?.length > 0 ? supportingItems : [];
},
// Cart Items // Cart Items
packageCartItems() { packageCartItems() {
if (this.packageLevel == "TierThree") { return this.getVapsCartItemsForSelectedPackage(this.packageLevel);
return this.cartItems.filter((cartItem) => cartItem.category == "vaps");
} else if (this.packageLevel == "TierTwo") {
return this.cartItems.filter(
(cartItem) =>
cartItem.cartItemType == "FRONT WIPER" ||
cartItem.cartItemType == "REAR WIPER"
);
}
return [];
}, },
nonpackageCartItems() { nonpackageCartItems() {
const nonpackageCartItems = []; const nonpackageCartItems = [];
if (this.rainDefenseCartItem && this.packageLevel == "TierOne") {
nonpackageCartItems.push(this.rainDefenseCartItem); console.log("packageCartItems");
}
this.cartItems.forEach((cartItem) => {
if (cartItem == this.recycleFeeCartItem || cartItem == this.mobileFeeCartItem) {
return;
}
if (!this.packageCartItems.find((packageCartItem) => packageCartItem == cartItem)) {
if (cartItem.isDisplayed) {
nonpackageCartItems.push(cartItem);
}
}
});
return nonpackageCartItems; return nonpackageCartItems;
}, },
frontWiperCartItemName() {
return this.getCmsContentForVapsType(partTypeStrings.FRONT_WIPER);
},
frontWipersCartItem() { frontWipersCartItem() {
let cartItem = null; let cartItem = null;
const frontWiperLineItems = this.vaps.filter( const frontWiperLineItems = this.vaps.filter(
(vapsLineItem) => vapsLineItem.partType == "FRONT WIPER" (vapsLineItem) => vapsLineItem.partType == partTypeStrings.FRONT_WIPER
); );
if (frontWiperLineItems.length > 0) { if (frontWiperLineItems.length > 0) {
cartItem = { cartItem = {
name: this.getCmsContentForVapsType("FRONT WIPER"), //"Front Wipers", // TODO: Get from CMS name: this.frontWiperCartItemName,
category: "vaps-front-wiper", category: cartItemCategories.VAPS,
cartItemType: "FRONT WIPER", cartItemType: cartItemTypes.FRONT_WIPER,
isDisplayed: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
frontWiperLineItems.forEach((lineItem) => { frontWiperLineItems.forEach((lineItem) => {
cartItem.lineItemIds.push(lineItem.id); lineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(lineItem);
cartItem.subTotal += cartItem.subTotal +=
(lineItem.kitPrice ?? 0) + (lineItem.kitPrice ?? 0) +
@ -290,25 +321,30 @@ export default {
return cartItem; return cartItem;
}, },
rearWiperCartItemName() {
return this.getCmsContentForVapsType(partTypeStrings.REAR_WIPER);
},
rearWipersCartItem() { rearWipersCartItem() {
let cartItem = null; let cartItem = null;
const rearWiperLineItems = this.vaps.filter( const rearWiperLineItems = this.vaps.filter(
(vapsLineItem) => vapsLineItem.partType == "REAR WIPER" (vapsLineItem) => vapsLineItem.partType == partTypeStrings.REAR_WIPER
); );
if (rearWiperLineItems.length > 0) { if (rearWiperLineItems.length > 0) {
cartItem = { cartItem = {
name: this.getCmsContentForVapsType("REAR WIPER"), // TODO: Get from CMS name: this.rearWiperCartItemName,
category: "vaps-rear-wiper", category: cartItemCategories.VAPS,
cartItemType: "REAR WIPER", cartItemType: cartItemTypes.REAR_WIPER,
isDisplayed: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
rearWiperLineItems.forEach((lineItem) => { rearWiperLineItems.forEach((lineItem) => {
cartItem.lineItemIds.push(lineItem.id); lineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(lineItem);
cartItem.subTotal += cartItem.subTotal +=
(lineItem.kitPrice ?? 0) + (lineItem.kitPrice ?? 0) +
@ -321,24 +357,29 @@ export default {
return cartItem; return cartItem;
}, },
rainDefenseCartItemName() {
return this.getCmsContentForVapsType(partTypeStrings.RAIN_DEFENSE);
},
rainDefenseCartItem() { rainDefenseCartItem() {
let cartItem = null; let cartItem = null;
const rainDefenseLineItem = this.vaps.find( const rainDefenseLineItem = this.vaps.find(
(vapsLineItem) => vapsLineItem.partType == "RAIN DEFENSE" (vapsLineItem) => vapsLineItem.partType == partTypeStrings.RAIN_DEFENSE
); );
if (rainDefenseLineItem) { if (rainDefenseLineItem) {
cartItem = { cartItem = {
name: this.getCmsContentForVapsType("RAIN DEFENSE"), // TODO: Get from CMS name: this.getCmsContentForVapsType(partTypeStrings.RAIN_DEFENSE),
category: "vaps", category: cartItemCategories.VAPS,
cartItemType: "RAIN DEFENSE", cartItemType: cartItemTypes.RAIN_DEFENSE,
isDisplayed: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
cartItem.lineItemIds.push(rainDefenseLineItem.id); rainDefenseLineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(rainDefenseLineItem);
cartItem.subTotal += cartItem.subTotal +=
(rainDefenseLineItem.kitPrice ?? 0) + (rainDefenseLineItem.kitPrice ?? 0) +
@ -360,16 +401,18 @@ export default {
if (flattenedGlassPartsLineItems.length > 0) { if (flattenedGlassPartsLineItems.length > 0) {
cartItem = { cartItem = {
name: "Glass Parts", // TODO: Get from CMS name: null,
category: "glassParts", category: cartItemCategories.GLASS_PARTS,
cartItemType: "GLASS PARTS", cartItemType: cartItemTypes.GLASS_PARTS,
isDisplayed: false,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
flattenedGlassPartsLineItems.forEach((lineItem) => { flattenedGlassPartsLineItems.forEach((lineItem) => {
cartItem.lineItemIds.push(lineItem.id); lineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(lineItem);
cartItem.subTotal += cartItem.subTotal +=
(lineItem.kitPrice ?? 0) + (lineItem.kitPrice ?? 0) +
@ -387,16 +430,18 @@ export default {
if (this.supportingItems.length > 0) { if (this.supportingItems.length > 0) {
cartItem = { cartItem = {
name: "Supporting Items", // TODO: Get from CMS name: null,
category: "supportingItems", category: cartItemCategories.SUPPORTING_ITEMS,
cartItemType: "SUPPORTING ITEMS", cartItemType: cartItemTypes.SUPPORTING_ITEMS,
isDisplayed: false,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
this.supportingItems.forEach((lineItem) => { this.supportingItems.forEach((lineItem) => {
cartItem.lineItemIds.push(lineItem.id); lineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(lineItem);
cartItem.subTotal += cartItem.subTotal +=
(lineItem.kitPrice ?? 0) + (lineItem.kitPrice ?? 0) +
@ -409,24 +454,29 @@ export default {
return cartItem; return cartItem;
}, },
recycleFeeCartItemName() {
return this.getCmsContent("RecycleFeeTextWidget", "Text");
},
recycleFeeCartItem() { recycleFeeCartItem() {
let cartItem = null; let cartItem = null;
const recycleFeeLineItem = this.supportingItems.find((lineItem) => const recycleFeeLineItem = this.supportingItems.find(
lineItem.partNumber.includes("RECYCLE FEE") (supportingItem) => supportingItem.partNumber == partTypeStrings.RECYCLE_FEE
); );
if (recycleFeeLineItem) { if (recycleFeeLineItem) {
cartItem = { cartItem = {
name: this.getCmsContent("RecycleFeeTextWidget", "Text"), // TODO: Get from CMS name: this.recycleFeeCartItemName,
category: "supportingItems", category: cartItemCategories.SUPPORTING_ITEMS,
cartItemType: "SUPPORTING ITEMS", cartItemType: cartItemTypes.RECYCLE_FEE,
isDisplayed: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
cartItem.lineItemIds.push(recycleFeeLineItem.id); recycleFeeLineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(recycleFeeLineItem);
cartItem.subTotal += cartItem.subTotal +=
(recycleFeeLineItem.kitPrice ?? 0) + (recycleFeeLineItem.kitPrice ?? 0) +
@ -438,24 +488,29 @@ export default {
return cartItem; return cartItem;
}, },
mobileFeeCartItemName() {
return this.getCmsContent("MobileServiceTextWidget", "Text");
},
mobileFeeCartItem() { mobileFeeCartItem() {
let cartItem = null; let cartItem = null;
const mobileFeeLineItem = this.supportingItems.find((lineItem) => const mobileFeeLineItem = this.supportingItems.find(
lineItem.partNumber.includes("MOBILE FEE") (lineItem) => lineItem.partNumber == partTypeStrings.MOBILE_FEE
); );
if (mobileFeeLineItem) { if (mobileFeeLineItem) {
cartItem = { cartItem = {
name: this.getCmsContent("MobileServiceTextWidget", "Text"), // TODO: Get from CMS name: this.mobileFeeCartItemName,
category: "supportingItems", category: cartItemCategories.SUPPORTING_ITEMS,
cartItemType: "SUPPORTING ITEMS", cartItemType: cartItemTypes.MOBILE_FEE,
isDisplayed: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
lineItemIds: [], lineItems: [],
}; };
cartItem.lineItemIds.push(mobileFeeLineItem.id); mobileFeeLineItem.cartItemType = cartItem.cartItemType;
cartItem.lineItems.push(mobileFeeLineItem);
cartItem.subTotal += cartItem.subTotal +=
(mobileFeeLineItem.kitPrice ?? 0) + (mobileFeeLineItem.kitPrice ?? 0) +
@ -467,24 +522,6 @@ export default {
return cartItem; return cartItem;
}, },
glassToReplace() {
if (!this.damage) {
return;
}
return this.damage.glassToReplace;
},
isRepair() {
if (!this.damage) {
return;
}
return this.damage.isRepair;
},
supportingItems() {
const supportingItems = this.lineItems?.supportingItems;
return supportingItems?.length > 0 ? supportingItems : [];
},
removeLinkText() { removeLinkText() {
return this.getCmsContent("RemoveCartItemTextWidget", "Text"); return this.getCmsContent("RemoveCartItemTextWidget", "Text");
}, },
@ -521,6 +558,14 @@ export default {
return this.subTotal + this.salesTax; return this.subTotal + this.salesTax;
}, },
}, },
watch: {
modelValue: {
handler(newValue) {
this.lineItems = deepClone(newValue);
},
deep: true,
},
},
components: { components: {
textBlock, textBlock,
textLink, textLink,

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

@ -27,7 +27,7 @@
<cart <cart
:damage="damageInfo" :damage="damageInfo"
:availableLineItems="availableLineItems" :availableLineItems="availableLineItems"
v-model="cartLineItems" v-model="lineItems"
servicePackageOptionsCmsName="ServicePackageTitle" servicePackageOptionsCmsName="ServicePackageTitle"
@cart-remove="cartRemove" /> @cart-remove="cartRemove" />
@ -42,7 +42,7 @@
</div> </div>
<add-vaps-modal-buttons <add-vaps-modal-buttons
v-model="cartLineItems" v-model="lineItems"
:availableLineItems="availableLineItems" :availableLineItems="availableLineItems"
vapsTilesCmsName="VapsProductTiles" /> vapsTilesCmsName="VapsProductTiles" />