From f0e0c4a3e8ff3ac84533f35a882f39c8fe1ced57 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Thu, 9 Nov 2023 07:37:01 -0500 Subject: [PATCH] Fixed package price calculation that was including early bird fee, prettified --- src/constants/cart-item-types.js | 1 + src/fmg-components/cart/cart.vue | 4 ++-- src/mixins/base-mixin.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/constants/cart-item-types.js b/src/constants/cart-item-types.js index 7db2ac312..546a3b6e7 100644 --- a/src/constants/cart-item-types.js +++ b/src/constants/cart-item-types.js @@ -5,6 +5,7 @@ const cartItemTypes = { GLASS_PARTS: "GLASS PARTS", RAIN_DEFENSE: "RAIN DEFENSE", RECYCLE_FEE: "RECYCLE FEE", + REPLACE_FEE: "REPLACE FEE", MOBILE_FEE: "MOBILE FEE", PROMOS: "PROMOS", EARLY_BIRD: "EARLY BIRD", diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index ca44600c3..4cef60f56 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -233,7 +233,7 @@ export default { }; promoLineItem.cartItemType = cartItem.cartItemType; - cartItem.lineItems.push(lineItem); + cartItem.lineItems.push(promoLineItem); cartItems.push(cartItem); }); @@ -482,7 +482,7 @@ export default { const recycleFeeLineItem = this.supportingItems.find( (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE ); - console.log(recycleFeeLineItem); + if (recycleFeeLineItem) { cartItem = { name: this.recycleFeeCartItemName, diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 8c85cf815..38b0daefb 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -95,7 +95,7 @@ export default { filterOutFees(lineItems) { const filteredLineItems = lineItems.filter((item) => { return ( - !item.partType.includes("FEE") || + (!item.partType.includes("FEE") && !item.partType.includes("EARLY BIRD")) || (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR") ); });