diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 0d116fb10..84752cb1c 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -2,19 +2,20 @@
{{ amountDueText }}{{ currencyFormatter.format(amountDue) }} + >{{ getFormattedAmount("", amountDue) }}
- {{ - currencyFormatter.format(packagePrice) - }} + + + {{ getFormattedAmount("", packagePrice) }} +
@@ -52,36 +53,25 @@ :text="recycleFeeCartItem.name" href="#!" @click-event="openModal(recyclingModalCmsWidgetName)" /> - {{ - recycleFeeCartItem.name - }} - {{ - `${ - cartItem.category == "promos" - ? "(" + currencyFormatter.format(cartItem.subTotal * -1) + ")" - : currencyFormatter.format(cartItem.subTotal) - }` - }} - + {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}
{{ subtotalText }}{{ currencyFormatter.format(subTotal) }} + >{{ getFormattedAmount("", subTotal) }}
{{ salesTaxText }}{{ currencyFormatter.format(salesTax) }} + >{{ getFormattedAmount("", salesTax) }}
{{ amountPaidText }}{{ currencyFormatter.format(amountPaid) }} + >{{ getFormattedAmount("", amountPaid) }}
{{ amountDueText }}{{ currencyFormatter.format(amountDue) }} + >{{ getFormattedAmount("", amountDue) }}
@@ -180,6 +170,11 @@ export default { return vapsTypeName.Text; }, + getFormattedAmount(category, amount) { + 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 diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index b7235d5d1..ac111fcdb 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -19,7 +19,7 @@ {{ noPiaDisclaimer }}

-
+