From 45add3866bd0f7a4d31109b2308690c57d85a080 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:13:56 -0400 Subject: [PATCH] CSR-1392 testing lower paypal dollar amounts --- src/layouts/payment/payment.vue | 4 ++-- src/mixins/base-mixin.js | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index 098f2a521..1ceb2cf4a 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -326,11 +326,11 @@ export default { return itemsForPia; }, getAmountDue() { - return 350.0; + return 2; //return baseMixin.methods.getAmountDue(store.getters.order.lineItems); }, getDisplayAmountDue() { - return "$350.00"; + return "$2.00" //return baseMixin.methods.getDisplayAmountDue(store.getters.order.lineItems); }, isPaypal() { diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index c33715c2b..5a99a4960 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -124,16 +124,17 @@ export default { }, getAmountDue(lineItems) { // TODO: verify tax is included in lineitems - // Price everything in lineitems except the server data string var amountDue = 0; - const itemsClone = { ...lineItems }; - delete itemsClone.serverData; - for (var propertyName in itemsClone) { - if (itemsClone[propertyName]) { - amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( - itemsClone[propertyName] - ); - } + if (lineItems.glassParts) { + amountDue = this.getTotalPriceOfAllLineItemsAndChildParts(lineItems.glassParts); + } + if (lineItems.supportingItems) { + amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( + lineItems.supportingItems + ); + } + if (lineItems.supportingItems.vaps) { + amountDue += this.getTotalPriceOfAllLineItemsAndChildParts(lineItems.vaps); } return amountDue; },