From e6fc6635c4c290cafc33a8c63da6a67a4a04f870 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:02:54 -0400 Subject: [PATCH 1/2] CSR-1392 do not pass null items to getTotalPrice logic --- src/fmg-components/cart/cart.vue | 4 ++-- src/mixins/base-mixin.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 3b454071c..67558c323 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -7,7 +7,7 @@ @click="toggleClass()">
Amount Due${{ amountDue }} + >{{ amountDue }}
@@ -123,7 +123,7 @@ export default { return price; }, getAmountDue() { - return baseMixin.methods.getAmountDue(this.storeLineItems); + return baseMixin.methods.getDisplayAmountDue(this.storeLineItems); }, removeItem(item) { this.$emit("cart-remove", item); diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 74b44c983..1755ee294 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -128,9 +128,11 @@ export default { const itemsClone = { ...lineItems }; delete itemsClone.serverData; for (var propertyName in itemsClone) { - amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( - itemsClone[propertyName] - ); + if (itemsClone[propertyName]){ + amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( + itemsClone[propertyName] + ); + } } return amountDue; }, From f74d4d5a3bd6c1cce25c7dc96c32f2ac5634140e Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:10:42 -0400 Subject: [PATCH 2/2] CSR-1392 prettier --- src/mixins/base-mixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 1755ee294..df03693ee 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -128,7 +128,7 @@ export default { const itemsClone = { ...lineItems }; delete itemsClone.serverData; for (var propertyName in itemsClone) { - if (itemsClone[propertyName]){ + if (itemsClone[propertyName]) { amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( itemsClone[propertyName] );