From f943a3648d594e6c4f57e11a977e053d7de8e454 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 3 May 2024 07:45:58 -0400
Subject: [PATCH 1/2] CSR-1742: refactoring logic out of markup

---
 src/fmg-components/cart/cart.vue | 41 ++++++++++++++------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index d231862fa..8e15728db 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -11,9 +11,7 @@
                     class="col d-flex justify-content-between py-0">
                     <span class="label">{{ amountDueText }}</span>
                     <span class="label amount-due">{{
-                        showCoverageAsPending
-                            ? verifyingCoverageText
-                            : getFormattedAmount("", amountDue)
+                        getLineItemAmount("", amountDue, showCoverageAsPending)
                     }}</span>
                 </a>
             </div>
@@ -24,9 +22,11 @@
                         <textBlock cmsWidgetName="DeductibleTextWidget" />
                         <span>
                             {{
-                                showCoverageAsPending
-                                    ? verifyingCoverageText
-                                    : getFormattedAmount("", deductibleLineItem.subTotal)
+                                getLineItemAmount(
+                                    "",
+                                    deductibleLineItem.subTotal,
+                                    showCoverageAsPending
+                                )
                             }}
                         </span>
                     </div>
@@ -35,12 +35,12 @@
                     <div class="service-type">
                         <textBlock :cmsWidgetName="servicePackageTitleWidget" />
                         <span>
-                            {{ getFormattedAmount("", packagePrice) }}
+                            {{ getLineItemAmount("", packagePrice) }}
                         </span>
                         <span
                             v-if="packagePriceWithoutDiscount > packagePrice"
                             class="struck-out-price">
-                            {{ getFormattedAmount("", packagePriceWithoutDiscount) }}
+                            {{ getLineItemAmount("", packagePriceWithoutDiscount) }}
                         </span>
                     </div>
 
@@ -100,34 +100,26 @@
                                 !showCoverageAsVerified ||
                                 (showCoverageAsVerified && !cartItem.isCoveredByInsurance)
                             "
-                            >{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span
+                            >{{ getLineItemAmount(cartItem.category, cartItem.subTotal) }}</span
                         >
                     </div>
 
                     <!-- Sub total, sales tax, total columns -->
                     <div class="sub-total">
                         <span>{{ subtotalText }}</span>
-                        <span>{{
-                            showCoverageAsPending
-                                ? verifyingCoverageText
-                                : getFormattedAmount("", subTotal)
-                        }}</span>
+                        <span>{{ getLineItemAmount("", subTotal, showCoverageAsPending) }}</span>
                     </div>
                     <div class="sales-tax">
                         <span>{{ salesTaxText }}</span>
-                        <span>{{ getFormattedAmount("", salesTax) }}</span>
+                        <span>{{ getLineItemAmount("", salesTax) }}</span>
                     </div>
                     <div v-if="showAsPaid" class="amount-paid">
-                        <span>{{ amountPaidText }}</span
-                        ><span>{{ getFormattedAmount("", amountPaid) }}</span>
+                        <span>{{ amountPaidText }}</span>
+                        <span>{{ getLineItemAmount("", amountPaid) }}</span>
                     </div>
                     <div class="amount-due">
                         <span>{{ amountDueText }}</span>
-                        <span>{{
-                            showCoverageAsPending
-                                ? verifyingCoverageText
-                                : getFormattedAmount("", amountDue)
-                        }}</span>
+                        <span>{{ getLineItemAmount("", amountDue, showCoverageAsPending) }}</span>
                     </div>
                 </div>
                 <div
@@ -269,11 +261,14 @@ export default {
 
             return vapsTypeName.Text;
         },
-        getFormattedAmount(category, amount) {
+
+        getLineItemAmount(category, amount, useVerifyingText) {
+            if (useVerifyingText) return this.verifyingCoverageText;
             return category == "promos"
                 ? "(" + this.currencyFormatter.format(amount * -1) + ")"
                 : this.currencyFormatter.format(amount);
         },
+
         removeItem(cartItemType, category) {
             this.lineItems[category] = this.lineItems[category].filter(
                 (lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType

From 7d67941493fb97b77705e07cba62f39df5a71e0a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 3 May 2024 10:15:09 -0400
Subject: [PATCH 2/2] CSR-1742: refactoring logic out of markup, part 2

---
 src/fmg-components/cart/cart.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 8e15728db..1ba5ea562 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -11,7 +11,7 @@
                     class="col d-flex justify-content-between py-0">
                     <span class="label">{{ amountDueText }}</span>
                     <span class="label amount-due">{{
-                        getLineItemAmount("", amountDue, showCoverageAsPending)
+                        getLineItemAmount(amountDue, showCoverageAsPending)
                     }}</span>
                 </a>
             </div>
@@ -23,7 +23,6 @@
                         <span>
                             {{
                                 getLineItemAmount(
-                                    "",
                                     deductibleLineItem.subTotal,
                                     showCoverageAsPending
                                 )
@@ -35,12 +34,12 @@
                     <div class="service-type">
                         <textBlock :cmsWidgetName="servicePackageTitleWidget" />
                         <span>
-                            {{ getLineItemAmount("", packagePrice) }}
+                            {{ getLineItemAmount(packagePrice) }}
                         </span>
                         <span
                             v-if="packagePriceWithoutDiscount > packagePrice"
                             class="struck-out-price">
-                            {{ getLineItemAmount("", packagePriceWithoutDiscount) }}
+                            {{ getLineItemAmount(packagePriceWithoutDiscount) }}
                         </span>
                     </div>
 
@@ -100,26 +99,28 @@
                                 !showCoverageAsVerified ||
                                 (showCoverageAsVerified && !cartItem.isCoveredByInsurance)
                             "
-                            >{{ getLineItemAmount(cartItem.category, cartItem.subTotal) }}</span
+                            >{{
+                                getLineItemAmount(cartItem.subTotal, null, cartItem.category)
+                            }}</span
                         >
                     </div>
 
                     <!-- Sub total, sales tax, total columns -->
                     <div class="sub-total">
                         <span>{{ subtotalText }}</span>
-                        <span>{{ getLineItemAmount("", subTotal, showCoverageAsPending) }}</span>
+                        <span>{{ getLineItemAmount(subTotal, showCoverageAsPending) }}</span>
                     </div>
                     <div class="sales-tax">
                         <span>{{ salesTaxText }}</span>
-                        <span>{{ getLineItemAmount("", salesTax) }}</span>
+                        <span>{{ getLineItemAmount(salesTax) }}</span>
                     </div>
                     <div v-if="showAsPaid" class="amount-paid">
                         <span>{{ amountPaidText }}</span>
-                        <span>{{ getLineItemAmount("", amountPaid) }}</span>
+                        <span>{{ getLineItemAmount(amountPaid) }}</span>
                     </div>
                     <div class="amount-due">
                         <span>{{ amountDueText }}</span>
-                        <span>{{ getLineItemAmount("", amountDue, showCoverageAsPending) }}</span>
+                        <span>{{ getLineItemAmount(amountDue, showCoverageAsPending) }}</span>
                     </div>
                 </div>
                 <div
@@ -262,7 +263,7 @@ export default {
             return vapsTypeName.Text;
         },
 
-        getLineItemAmount(category, amount, useVerifyingText) {
+        getLineItemAmount(amount, useVerifyingText, category) {
             if (useVerifyingText) return this.verifyingCoverageText;
             return category == "promos"
                 ? "(" + this.currencyFormatter.format(amount * -1) + ")"