Merge pull request #1474 from Safelite/feature/CSR-1392

Feature/csr 1392

src/constants/store-actions.js

@@ -73,7 +73,7 @@ const storeActions = {
     SAVE_VIN: "saveVin",
     SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
     SAVE_GLASS_PARTS: "saveGlassParts",
-    SAVE_GLASS_PART_PRICES: "saveGlassPartPrices",
+    SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING: "saveGlassPartsSuppressingStateResetting",
     SAVE_PART_QUESTION_ANSWERS: "savePartQuestionAnswers",
     RESET_MOLDING_AND_CAPABILITY_QUESTIONS_IF_NEEDED:
         "resetMoldingAndCapabilityQuestionAnswersIfNeeded",

src/layouts/payment-method/payment-method.vue

@@ -269,8 +269,19 @@ export default {
                 false
             );
 
-            await this.dispatchStoreAction(storeActions.SAVE_VAPS, this.lineItems.vaps, false);
+            // save lineitems as they now have salestax added
+            await this.dispatchStoreAction(
+                storeActions.SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING,
+                this.lineItems.glassParts,
+                false
+            );
 
+            await this.dispatchStoreAction(
+                storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                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) {

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") {

src/layouts/quote/quote.vue

@@ -258,7 +258,7 @@ export default {
 
             if (this.pricedGlassParts.length > 0) {
                 this.dispatchStoreAction(
-                    this.storeActions.SAVE_GLASS_PART_PRICES,
+                    this.storeActions.SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING,
                     this.pricedGlassParts,
                     false
                 );

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);

src/store/index.js

@@ -2388,7 +2388,7 @@ export const actions = {
         context.commit(storeMutations.UPDATE_GLASS_PARTS, parts);
     },
 
-    saveGlassPartPrices(context, parts) {
+    saveGlassPartsSuppressingStateResetting(context, parts) {
         context.commit(storeMutations.UPDATE_GLASS_PARTS, parts);
     },