From 7c0db7c526c895b9384f4ae17bb087d586b723c3 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Thu, 28 Aug 2025 17:22:48 -0400 Subject: [PATCH 1/6] CASH-1410: updates to cta text for Heritage parity --- src/layouts/payment-method/payment-method.vue | 10 +++++----- src/layouts/schedule/schedule.vue | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 439293dae..c28e53291 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -751,15 +751,15 @@ export default { customCtaCopy() { switch (this.paymentMethod) { case paymentMethods.PAY_NOW: - return "Continue to checkout"; + return "Continue"; // Before Heritage Parity it was "Continue to checkout" case paymentMethods.INSURANCE: - return "Continue to insurance"; + return "Continue"; // Before Heritage Parity it was "Continue to insurance" case paymentMethods.CREDIT_CARD: - return "Continue to checkout"; + return "Continue"; // Before Heritage Parity it was "Continue to checkout" case paymentMethods.PAYPAL: - return "Continue to Paypal"; + return "Continue"; // Before Heritage Parity it was "Continue to Paypal" case paymentMethods.AFTERPAY: - return "Continue to Afterpay"; + return "Continue"; // Before Heritage Parity it was "Continue to Afterpay" default: return null; } diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 62178994a..192273f49 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1238,7 +1238,9 @@ export default { return store.getters.lineItems.supportingItems; }, updateFooterButtonText(timeSlotInfo) { - let navbarButtonText; + let navbarButtonText = "Continue"; + // Archiving the following in case we revert back from Heritage parity + /* if (!timeSlotInfo || !timeSlotInfo.timeSlot.date) { navbarButtonText = "Continue"; } else { @@ -1273,6 +1275,7 @@ export default { )}`; } } + */ this.$refs.navbar.updateButtonText(navbarButtonText); }, convertSelectedDateToShortMonthAndDay(selectedDate) { From 3d3df3356cc5c2b28d3e66121f9dbf87e3f5f270 Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Fri, 29 Aug 2025 10:00:01 -0400 Subject: [PATCH 2/6] CASH-1403: Parity - increase height for error messages --- src/layouts/payment/payment.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index a95cef929..c5d3a4735 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -921,7 +921,10 @@ export default { border: 0 none; @include media-breakpoint-down(lg) { - min-height: 1688px; + min-height: 1750px; + } + @include media-breakpoint-down(md) { + min-height: 1890px; } } #pageLoadingModal { From 2daa33736668c486c5e044f590d43fad7a5202ed Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Fri, 29 Aug 2025 10:25:12 -0400 Subject: [PATCH 3/6] CASH-1464: margin adjustment --- src/layouts/customer-details/customer-details.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue index 89c3e73bb..f5a7e1ac7 100644 --- a/src/layouts/customer-details/customer-details.vue +++ b/src/layouts/customer-details/customer-details.vue @@ -218,3 +218,8 @@ export default { }, }; + From ef935107b70787a1b9e2eccbca7b8c4346334c30 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 29 Aug 2025 12:46:30 -0400 Subject: [PATCH 4/6] CASH-1445 CASH-1445 fixed boldness issues, updated font-weights to match figma on payment-method --- src/fmg-components/funnel-sub-header/funnel-sub-header.vue | 3 +++ .../payment-method-question/payment-method-question.vue | 1 + src/layouts/payment-method/payment-method.vue | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue index 3146bf558..4002b28fb 100644 --- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue +++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue @@ -68,6 +68,9 @@ export default { diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index c28e53291..f68f384ae 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -945,4 +945,11 @@ export default { } } } +:deep(span.label) { + font-weight: 600; +} +:deep(div.service-questions span){ + color: $black; + font-family: UrbanistSemibold; +} From 0d71b52cb56777a7c5480ddf3622e2be263026c3 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 29 Aug 2025 12:53:38 -0400 Subject: [PATCH 5/6] CASH-1445 prettier --- src/layouts/payment-method/payment-method.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index f68f384ae..07b40c80f 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -948,7 +948,7 @@ export default { :deep(span.label) { font-weight: 600; } -:deep(div.service-questions span){ +:deep(div.service-questions span) { color: $black; font-family: UrbanistSemibold; } From 25bb9e273a55ded40f9155ed28d8b64de3e41911 Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Fri, 29 Aug 2025 14:00:20 -0400 Subject: [PATCH 6/6] CASH-1403: iframe height improvement --- src/layouts/payment/payment.vue | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index c5d3a4735..c051c0bb7 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -919,13 +919,6 @@ export default { width: 100%; min-height: 650px; border: 0 none; - - @include media-breakpoint-down(lg) { - min-height: 1750px; - } - @include media-breakpoint-down(md) { - min-height: 1890px; - } } #pageLoadingModal { background-color: red; @@ -945,11 +938,11 @@ export default { @include media-breakpoint-down(lg) { flex-direction: column; & > iframe { - flex-basis: 100%; + flex-basis: auto; margin-right: 0; } & > #cart-container { - flex-basis: 100%; + flex-basis: auto; margin: 0 0.5rem; & > button#submit-payment {