Merge branch 'develop' into feature/CSR-2109

src/fmg-components/cart/cart.vue

@@ -985,7 +985,10 @@ export default {
             if (!this.showAsPaid) {
                 return 0;
             }
-            return this.subTotal + this.salesTax;
+
+            // unary plus operator to convert string amount to numeric so we can add them together
+            var amtPaid = +this.subTotal + +this.salesTax;
+            return amtPaid;
         },
     },
     components: {

src/layouts/quote/quote.vue

@@ -170,8 +170,9 @@ export default {
                     null,
                     "quote"
                 );
-            if (servicePackageDiscountPartResponse.data)
+            if (servicePackageDiscountPartResponse.data) {
                 servicePackageDiscountPart.push(servicePackageDiscountPartResponse.data);
+            }
         }
         const availableLineItems = [
             resultMap.rainDefense,