jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1524 from Safelite/feature/CSR-1388-tech-review-changes

Browse source 
Feature/csr 1388 tech review changes
This commit is contained in:
Leah Schumann 2023-11-14 10:45:29 -05:00 committed by GitHub
commit 3ee0000a71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/fmg-components/cart/cart.vue
View file

@ -2,19 +2,20 @@
<div class="cart"> <div class="cart">
<div class="px-0"> <div class="px-0">
<div <div
class="row vin-toggle flex align-items-center" class="row vin-toggle flex align-items-center py-4"
:class="[isExpanded ? 'expanded' : '']" :class="[isExpanded ? 'expanded' : '']"
@click="toggleIsExpanded()"> @click="toggleIsExpanded()">
<div class="col d-flex justify-content-between"> <div class="col d-flex justify-content-between">
<span class="label">{{ amountDueText }}</span <span class="label">{{ amountDueText }}</span
><span class="label amount-due">{{ currencyFormatter.format(amountDue) }}</span> ><span class="label amount-due">{{ getFormattedAmount("", amountDue) }}</span>
</div> </div>
</div> </div>
<div class="price-table"> <div class="price-table">
<div class="service-type"> <div class="service-type">
<textBlock :cmsWidgetName="servicePackageTitleWidget" /><span>{{ <textBlock :cmsWidgetName="servicePackageTitleWidget" />
currencyFormatter.format(packagePrice) <span>
}}</span> {{ getFormattedAmount("", packagePrice) }}
</span>
</div> </div>
<!-- Packaged Cart Items --> <!-- Packaged Cart Items -->
@ -52,36 +53,25 @@
:text="recycleFeeCartItem.name" :text="recycleFeeCartItem.name"
href="#!" href="#!"
@click-event="openModal(recyclingModalCmsWidgetName)" /> @click-event="openModal(recyclingModalCmsWidgetName)" />
<span v-else-if="cartItem == recycleFeeCartItem">{{ <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
recycleFeeCartItem.name
}}</span>
<span
>{{
`${
cartItem.category == "promos"
? "(" + currencyFormatter.format(cartItem.subTotal * -1) + ")"
: currencyFormatter.format(cartItem.subTotal)
}`
}}
</span>
</div> </div>
<!-- Sub total, sales tax, total columns --> <!-- Sub total, sales tax, total columns -->
<div class="sub-total"> <div class="sub-total">
<span>{{ subtotalText }}</span <span>{{ subtotalText }}</span
><span>{{ currencyFormatter.format(subTotal) }}</span> ><span>{{ getFormattedAmount("", subTotal) }}</span>
</div> </div>
<div class="sales-tax"> <div class="sales-tax">
<span>{{ salesTaxText }}</span <span>{{ salesTaxText }}</span
><span>{{ currencyFormatter.format(salesTax) }}</span> ><span>{{ getFormattedAmount("", salesTax) }}</span>
</div> </div>
<div v-if="showAsPaid" class="amount-paid"> <div v-if="showAsPaid" class="amount-paid">
<span>{{ amountPaidText }}</span <span>{{ amountPaidText }}</span
><span>{{ currencyFormatter.format(amountPaid) }}</span> ><span>{{ getFormattedAmount("", amountPaid) }}</span>
</div> </div>
<div class="amount-due"> <div class="amount-due">
<span>{{ amountDueText }}</span <span>{{ amountDueText }}</span
><span>{{ currencyFormatter.format(amountDue) }}</span> ><span>{{ getFormattedAmount("", amountDue) }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -180,6 +170,11 @@ export default {
return vapsTypeName.Text; return vapsTypeName.Text;
}, },
getFormattedAmount(category, amount) {
return category == "promos"
? "(" + this.currencyFormatter.format(amount * -1) + ")"
: this.currencyFormatter.format(amount);
},
removeItem(cartItemType, category) { removeItem(cartItemType, category) {
this.lineItems[category] = this.lineItems[category].filter( this.lineItems[category] = this.lineItems[category].filter(
(lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType (lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType

2
src/layouts/payment-method/payment-method.vue
View file

@ -19,7 +19,7 @@
<span>{{ noPiaDisclaimer }}</span> <span>{{ noPiaDisclaimer }}</span>
</p> </p>
<hr /> <hr class="my-0" />
<cart <cart
:damage="damageInfo" :damage="damageInfo"