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

Merge pull request #2176 from Safelite/CSR-2435-adjust-banner-width

Browse source 
CSR-2435 make alert span full width.
This commit is contained in:
bmauger 2024-12-16 15:49:24 -05:00 committed by GitHub
commit ffcfe7a3da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/layouts/payment-method/payment-method.spec.js
View file

@ -45,7 +45,6 @@ describe("payment-method.vue", () => {
}); });
function setupMocks() { function setupMocks() {
store.getters = { store.getters = {
damage: {}, damage: {},
lineItems: { lineItems: {

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

@ -631,7 +631,7 @@ export default {
city: this.$store.getters.order.serviceLocation?.city, city: this.$store.getters.order.serviceLocation?.city,
state: this.$store.getters.order.serviceLocation?.state, state: this.$store.getters.order.serviceLocation?.state,
zipCode: this.$store.getters.order.serviceLocation?.zipCode, zipCode: this.$store.getters.order.serviceLocation?.zipCode,
} };
} else { } else {
return this.$store.getters.order.serviceLocation?.provider?.address; return this.$store.getters.order.serviceLocation?.provider?.address;
} }
@ -662,11 +662,10 @@ export default {
: this.ServiceLocationFullAddress.zipCode; : this.ServiceLocationFullAddress.zipCode;
}, },
AppointmentWordingText() { AppointmentWordingText() {
return this.getCmsContent("ApptDetailsSnapshotWidget", "BodyText") return this.getCmsContent("ApptDetailsSnapshotWidget", "BodyText")?.replaceAll(
?.replaceAll( "{custom:ADDRESS}",
"{custom:ADDRESS}", this.ServiceLocationFullAddressText
this.ServiceLocationFullAddressText );
);
}, },
isRecalibrationOnOrder() { isRecalibrationOnOrder() {
const order = baseMixin.methods.hasSubmittedOrder() const order = baseMixin.methods.hasSubmittedOrder()
@ -857,7 +856,7 @@ export default {
.appt-details-snapshot { .appt-details-snapshot {
:deep(p) { :deep(p) {
margin: 0.75rem 0 1rem 0; margin: 0.75rem 0 1rem 0;
font-size: .875rem; font-size: 0.875rem;
padding: 0; padding: 0;
text-transform: capitalize; text-transform: capitalize;
span { span {

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

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

10
src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
View file

@ -2,7 +2,7 @@
<div class="alert fade show my-2 py-2 border-0 alert-info" role="alert"> <div class="alert fade show my-2 py-2 border-0 alert-info" role="alert">
<component :is="'script'" src="https://js.afterpay.com/afterpay-1.x.js" async></component> <component :is="'script'" src="https://js.afterpay.com/afterpay-1.x.js" async></component>
<div class="mx-4 my-0 fw-bold alert-heading"> <div class="mx-4 my-0 fw-bold alert-heading text-center">
<span v-for="token in afterpayCopyTokens" :key="token"> <span v-for="token in afterpayCopyTokens" :key="token">
<span v-if="isAfterpayPriceToken(token)">{{ afterpayPrice }}</span> <span v-if="isAfterpayPriceToken(token)">{{ afterpayPrice }}</span>
<span v-else-if="isInlineImageToken(token)"> <span v-else-if="isInlineImageToken(token)">
@ -13,8 +13,7 @@
{{ token }} {{ token }}
</span> </span>
</span> </span>
</div> &nbsp;
<div class="mx-4 my-0 fw-bold alert-heading">
<a <a
id="afterpay-learnmore" id="afterpay-learnmore"
href="#" href="#"
@ -73,7 +72,7 @@ export default {
return splitCopyOnCMSPlaceHolder(this.getCmsContent(this.cmsWidgetName, "HeaderText")); return splitCopyOnCMSPlaceHolder(this.getCmsContent(this.cmsWidgetName, "HeaderText"));
}, },
modalCopy() { modalCopy() {
return this.getCmsContent(this.cmsWidgetName, "SubheaderText"); return this.getCmsContent(this.cmsWidgetName, "BodyText");
}, },
afterpayPrice() { afterpayPrice() {
let allLineItems = getArrayOfAllLineItemsAndChildParts(this.lineItems); let allLineItems = getArrayOfAllLineItemsAndChildParts(this.lineItems);
@ -127,5 +126,8 @@ export default {
& .alert-heading { & .alert-heading {
font-size: 0.875rem; font-size: 0.875rem;
} }
#afterpay-learnmore {
white-space: nowrap;
}
} }
</style> </style>

7
src/layouts/quote/quote.vue
View file

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-6 col-xl-4"> <div class="col-md-12 col-xl-8 p-md-0">
<!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner --> <!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner -->
<afterpayModalBanner <afterpayModalBanner
v-if="showAfterpayBanner" v-if="showAfterpayBanner"
@ -61,7 +61,10 @@
:taxPromos="false" :taxPromos="false"
:useDefaultCashParentAccount="true" :useDefaultCashParentAccount="true"
modalWidgetName="PromoModalWidget" /> modalWidgetName="PromoModalWidget" />
</div>
</div>
<div class="row justify-content-center">
<div class="col-md-6 col-xl-4">
<contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" /> <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
<contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" /> <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
<contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" /> <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />