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

Merge pull request #1609 from Safelite/rlsmerge-for-csr-1819-accessibility

Browse source 
Merge 12.07 release branch into dev branch
This commit is contained in:
bmauger 2023-12-01 13:51:04 -05:00 committed by GitHub
commit be5a625df9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,8 +16,7 @@
<div class="price-table"> <div class="price-table">
<div class="service-type"> <div class="service-type">
<textBlock :cmsWidgetName="servicePackageTitleWidget" /> <textBlock :cmsWidgetName="servicePackageTitleWidget" />
<span tabindex="0"> <span>
<span class="sr-only"> {{ screenReaderPackagePriceText }} </span>
{{ getFormattedAmount("", packagePrice) }} {{ getFormattedAmount("", packagePrice) }}
</span> </span>
</div> </div>
@ -64,40 +63,25 @@
<span v-else-if="cartItem == recycleFeeCartItem"> <span v-else-if="cartItem == recycleFeeCartItem">
{{ recycleFeeCartItem.name }} {{ recycleFeeCartItem.name }}
</span> </span>
<span tabindex="0" <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
><span class="sr-only">{{ screenReaderRecycleFeeText }}</span
>{{ getFormattedAmount(cartItem.category, 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 tabindex="0" ><span>{{ getFormattedAmount("", subTotal) }}</span>
><span class="sr-only">{{ screenReaderSubTotalText }}</span
>{{ getFormattedAmount("", subTotal) }}</span
>
</div> </div>
<div class="sales-tax"> <div class="sales-tax">
<span>{{ salesTaxText }}</span <span>{{ salesTaxText }}</span
><span tabindex="0" ><span>{{ getFormattedAmount("", salesTax) }}</span>
><span class="sr-only">{{ screenReaderSalesTaxText }}</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 tabindex="0" ><span>{{ getFormattedAmount("", amountPaid) }}</span>
><span class="sr-only">{{ screenReaderAmountPaidText }}</span
>{{ getFormattedAmount("", amountPaid) }}</span
>
</div> </div>
<div class="amount-due"> <div class="amount-due">
<span>{{ amountDueText }}</span <span>{{ amountDueText }}</span
><span tabindex="0" ><span>{{ getFormattedAmount("", amountDue) }}</span>
><span class="sr-only">{{ screenReaderTotalAmountDueText }}</span
>{{ getFormattedAmount("", amountDue) }}</span
>
</div> </div>
</div> </div>
</div> </div>

2
src/layouts/confirmation/confirmation.vue
View file

@ -300,7 +300,7 @@ export default {
return serviceLocationReqs && scheduleReqs && customerReqs; return serviceLocationReqs && scheduleReqs && customerReqs;
}, },
forwardButtonAction() { forwardButtonAction() {
window.location.assign("//www.safelite.com/"); window.location.assign(location.protocol + "//" + location.host);
}, },
}, },
components: { components: {

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

@ -532,7 +532,7 @@ export default {
} }
cartItems.forEach((item) => { cartItems.forEach((item) => {
if (item.name !== null) { if (item.name !== null && item.category != "promos") {
lineItems.push(`${item.name}|${(item.salesTax + item.subTotal).toFixed(2)}|1`); lineItems.push(`${item.name}|${(item.salesTax + item.subTotal).toFixed(2)}|1`);
} }
}); });