From aa44f1798b175999903af910b0424179a58de79b Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Thu, 16 Nov 2023 09:11:12 -0500 Subject: [PATCH] Fixed calculation issue related to excluding fees from other supporting items cart item --- src/fmg-components/cart/cart.vue | 5 +++-- src/store/index.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 84752cb1c..76269bbf2 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -543,8 +543,9 @@ export default { otherSupportingItemsCartItem() { let cartItem = null; - const otherSupportingItemsLineItems = this.supportingItems.filter( - (lineItem) => lineItem.partType != partTypeStrings.EARLY_BIRD + // Don't include fees they are part of the package total + let otherSupportingItemsLineItems = baseMixin.methods.filterOutFees( + this.supportingItems ); if (otherSupportingItemsLineItems.length > 0) { diff --git a/src/store/index.js b/src/store/index.js index 941b65aca..a6e462c2c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2642,7 +2642,7 @@ function addPricesToLineItems(lineItems, pricingLineItems) { function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) { pricedLineItems.forEach((pricedLineItem) => { - let lineItemIndex = taxingLineItems.findIndex( + const lineItemIndex = taxingLineItems.findIndex( (taxingLineItem) => taxingLineItem.partNumber === pricedLineItem.partNumber ); @@ -2650,7 +2650,7 @@ function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) { addTaxesToPricedLineItems(pricedLineItem.childParts, taxingLineItems); } - let taxedLineItem = taxingLineItems.splice(lineItemIndex, 1)[0]; + const taxedLineItem = taxingLineItems.splice(lineItemIndex, 1)[0]; pricedLineItem.salesTax = taxedLineItem?.salesTax ?? 0; });