From f2fc50cd3e8fffb83af27682562839433f69d162 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:20:43 -0400
Subject: [PATCH] CSR-1392

set amount due for PIA
---
 src/fmg-components/cart/cart.vue              | 11 -----------
 src/layouts/payment-method/payment-method.vue | 12 +++++++++++-
 src/layouts/payment/payment.vue               |  6 ++----
 src/mixins/base-mixin.js                      |  5 +++--
 src/store/index.js                            |  1 -
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index c48f48582..c38506f1c 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -129,8 +129,6 @@ export default {
 
             let vapsCartItemsForSelectedPackage = [];
 
-            console.log(this.cartItems);
-            console.log(packageContentTypes);
             this.cartItems.forEach((cartItem) => {
                 packageContentTypes.forEach((vapType) => {
                     if (vapType == cartItem.cartItemType) {
@@ -153,17 +151,10 @@ export default {
             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);
         },
     },
@@ -269,8 +260,6 @@ export default {
         nonpackageCartItems() {
             const nonpackageCartItems = [];
 
-            console.log("packageCartItems");
-
             this.cartItems.forEach((cartItem) => {
                 if (cartItem == this.recycleFeeCartItem || cartItem == this.mobileFeeCartItem) {
                     return;
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 59e17d92d..b7237d2b0 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -272,8 +272,18 @@ export default {
                 false
             );
 
+            // save lineitems as they now have salestax added
+            await this.dispatchStoreAction(
+                storeActions.SAVE_GLASS_PARTS,
+                this.lineItems.glassParts,
+                false
+            );
+            await this.dispatchStoreAction(
+                storeActions.SAVE_SUPPORTING_ITEMS,
+                this.lineItems.supportingItems,
+                false
+            );
             await this.dispatchStoreAction(storeActions.SAVE_VAPS, this.lineItems.vaps, false);
-
             await this.dispatchStoreAction(storeActions.SAVE_PROMOS, this.lineItems.promos, false);
 
             if (this.paymentMethod == paymentMethods.LATER) {
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 437fbe743..2b4121c98 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -419,12 +419,10 @@ export default {
             return itemsForPia;
         },
         getAmountDue() {
-            return 1600;
-            //return baseMixin.methods.getAmountDue(store.getters.order.lineItems);
+            return baseMixin.methods.getAmountDue(store.getters.order.lineItems);
         },
         getDisplayAmountDue() {
-            return "$1600.00";
-            //return baseMixin.methods.getDisplayAmountDue(store.getters.order.lineItems);
+            return baseMixin.methods.getDisplayAmountDue(store.getters.order.lineItems);
         },
         isPaypal() {
             if (this.getPaymentType() == "pp") {
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 5a99a4960..1266d125b 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -114,7 +114,9 @@ export default {
             return totalPrice;
         },
         getTotalLineItemPrice(lineItem) {
-            return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice;
+            return (
+                lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice + lineItem.salesTax
+            );
         },
         getDisplayAmountDue(lineItems) {
             return this.getAmountDue(lineItems).toLocaleString("en-US", {
@@ -123,7 +125,6 @@ export default {
             });
         },
         getAmountDue(lineItems) {
-            // TODO: verify tax is included in lineitems
             var amountDue = 0;
             if (lineItems.glassParts) {
                 amountDue = this.getTotalPriceOfAllLineItemsAndChildParts(lineItems.glassParts);
diff --git a/src/store/index.js b/src/store/index.js
index 6a9be935e..fa8add4bb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1291,7 +1291,6 @@ export const actions = {
             });
 
         syncLineItemIds(response.data, context.getters.order.lineItems.vaps);
-        console.log(response.data);
         return response;
     },