From fa3ae5cca367155d239b458d88e885d8fc742cdb Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 10 Apr 2025 17:00:04 -0400 Subject: [PATCH 01/10] CASH-499 WIP calendar updates. --- .../date-picker-for-pricing-by-day.vue | 99 +++++++++---------- 1 file changed, 45 insertions(+), 54 deletions(-) diff --git a/src/experiment-components/date-picker-for-pricing-by-day.vue b/src/experiment-components/date-picker-for-pricing-by-day.vue index cad976cf7..5e50def6b 100644 --- a/src/experiment-components/date-picker-for-pricing-by-day.vue +++ b/src/experiment-components/date-picker-for-pricing-by-day.vue @@ -962,9 +962,7 @@ export default { &.selectable-day { label { - color: $blue; background-color: $blue-100; - border: 1px solid $blue; min-width: 2.5rem; width: 2.5rem; border-radius: 50%; @@ -972,12 +970,11 @@ export default { } &.unavailable-day { label { - color: $gray-500; - background-color: $gray-100; border: none; pointer-events: none; } } + //NEEDED? &.unavailable-day:not(&.sunday) { label { &::before { @@ -987,7 +984,6 @@ export default { left: -1rem; width: 1rem; height: 2.5rem; - background: $gray-100; } } } @@ -1094,11 +1090,10 @@ export default { } } } - + // pricing by day override styles &.pricing-by-day { - // pricing by day override styles .calendar-grid-container .grid-item { - margin: 0; + margin: 0 0 0.15rem 0; } .month-year { grid-area: 1 / 1 / 2 / 8; @@ -1109,9 +1104,8 @@ export default { .radio-wrapper { align-items: flex-start; width: 100%; - height: 3rem; - color: $gray-500; - background-color: $gray-100; + height: 2.5rem; + color: $black; input[type="radio"] { &:focus-visible + label { @@ -1122,42 +1116,35 @@ export default { &:checked:focus + label { box-shadow: none; background-color: $white; - color: $blue; + color: $black; } &:checked + label { background: $blue-100; border: 2px solid $blue; - border-radius: 4px; - color: $blue; + border-radius: .25rem; + color: $black; + span { + font-family: AvertaSemibold; + font-weight: 400; + } } } label { flex-direction: column; - height: 3rem; + height: 2.5rem; width: 100%; font-size: 0.75rem; line-height: 1.2; - justify-content: flex-start; + justify-content: center; padding: 0.25rem; - - span { - margin-top: 0.25rem; - } } &.selectable-day { - background-color: $white; label { - background-color: $white; - border: none; - min-width: 100%; - width: 100%; - height: -webkit-fill-available; - border-radius: 0; - cursor: pointer; - - span { - text-decoration: underline; - } + color: $black; + background-color: $blue-100; + min-width: 2.5rem; + width: 2.5rem; + border-radius: 0.25rem; } } &.current-day { @@ -1168,32 +1155,36 @@ export default { } } } - } + &.show-pricing-by-day { + .radio-wrapper { + &.selectable-day label span { + text-decoration: none; + color: $black; + font-weight: 400; + font-family: "AvertaSemibold"; - &.date-picker.show-pricing-by-day { - .radio-wrapper { - &.selectable-day label span { - text-decoration: none; - color: $gray-600; - font-weight: 400; - font-family: "AvertaSemibold"; - - &.price { - color: $green; + &.price { + font-family: "AvertaRegular"; + font-weight: 400; + } } - } - &.upch-day label span.price { - color: $gray-600; - font-weight: 400; - font-family: $font-family-sans-serif; - } - input[type="radio"] { - &:focus + label, - &:checked:focus + label { + &.upch-day label span.price { color: $gray-600; + font-weight: 400; + font-family: $font-family-sans-serif; } - &:checked + label { - color: $blue; + input[type="radio"] { + &:focus + label, + &:checked:focus + label { + color: $gray-600; + } + &:checked + label { + color: $blue; + span { + font-weight: 400; + font-family: "AvertaSemibold"; + } + } } } } From 28e5d40cf127d1c03431dced2f0dc2a18b2d859d Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 14 Apr 2025 15:30:51 -0400 Subject: [PATCH 02/10] CASH-510, CASH-511 QA Ui footer fixes. --- src/fmg-components/funnel-footer/funnel-footer.vue | 14 +++++++++----- src/layouts/customer-details/customer-details.vue | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue index 89db470f0..0cff25b0b 100644 --- a/src/fmg-components/funnel-footer/funnel-footer.vue +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -11,6 +11,7 @@
+

© 2025 Safelite Group

- - +
From b54754f82ce7b3f819af765335c100626ec76fcf Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 14 Apr 2025 15:42:59 -0400 Subject: [PATCH 03/10] Format code. --- src/layouts/customer-details/customer-details.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue index c849491cb..baa8636be 100644 --- a/src/layouts/customer-details/customer-details.vue +++ b/src/layouts/customer-details/customer-details.vue @@ -56,7 +56,10 @@ @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" /> - + From 9b2c97c2710e07a1a2ce2cef2f4414c6c8cc7088 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 15 Apr 2025 13:58:32 -0400 Subject: [PATCH 04/10] CASH-500 fix z-index issue for insurance page. --- src/layouts/insurance-company/insurance-company.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index 0f7bca7c7..e680a728d 100644 --- a/src/layouts/insurance-company/insurance-company.vue +++ b/src/layouts/insurance-company/insurance-company.vue @@ -203,3 +203,9 @@ export default { }, }; + + From 39cb860888e10877da789ba439c886e01d52e5c2 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 15 Apr 2025 14:06:41 -0400 Subject: [PATCH 05/10] Format code. --- src/layouts/insurance-company/insurance-company.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index e680a728d..c9409eb71 100644 --- a/src/layouts/insurance-company/insurance-company.vue +++ b/src/layouts/insurance-company/insurance-company.vue @@ -205,7 +205,7 @@ export default { From 3053e10db9b17219884ab07a9a191a9fdeb16721 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 15 Apr 2025 15:17:41 -0400 Subject: [PATCH 06/10] CASH-499 refactor to use date-picker instead of experiment file. Delete experiment file. --- .../date-picker/date-picker.vue | 172 ++- .../date-picker-for-pricing-by-day.vue | 1212 ----------------- src/layouts/schedule/schedule.vue | 8 +- src/store/index.js | 10 +- 4 files changed, 162 insertions(+), 1240 deletions(-) delete mode 100644 src/experiment-components/date-picker-for-pricing-by-day.vue diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 71c09bbbf..c869dc02c 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1,5 +1,7 @@ - Date: Tue, 15 Apr 2025 15:21:34 -0400 Subject: [PATCH 07/10] CASH-499 undo changes. --- src/store/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 5d604e5ea..2ee5e2ec0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1856,11 +1856,11 @@ export const actions = { const shopRadiusInMiles = 100; - let url = `${endpoints.GetProviders.url}/${serviceZipCode}/${damageType}/${shopRadiusInMiles}/${accountNumber}/true/${carId}/false`; + let url = `${endpoints.GetProviders.url}/${serviceZipCode}/${damageType}/${shopRadiusInMiles}/${accountNumber}/true/${carId}`; - // if (windshieldPartWithRecal) { - // url += `/${windshieldPartWithRecal.partNumber}`; - // } + if (windshieldPartWithRecal) { + url += `/${windshieldPartWithRecal.partNumber}`; + } return globalMethods.callHttpClient({ method: endpoints.GetProviders.method, From 4918364282991e598226ba556fc3ee769140fff9 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 15 Apr 2025 15:22:41 -0400 Subject: [PATCH 08/10] CASH-499 remove changes to store/index. --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 2ee5e2ec0..97a31068e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1474,7 +1474,7 @@ export const actions = { applicationName: applicationConfig.ANALYTICS_APPLICATION_NAME, category: category, action: action, - label: "x" + label, + label: label, value: value, shouldUseSessionId: shouldUseSessionId, experimentsForUser: experimentsForUser, From 35154ad3d1fde96426bcc903c876db8cfcf51609 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 15 Apr 2025 16:06:50 -0400 Subject: [PATCH 09/10] Format code. --- .../date-picker/date-picker.vue | 2 +- src/layouts/schedule/schedule.vue | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index c869dc02c..0d0ef066d 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1121,7 +1121,7 @@ export default { &:checked + label { background: $blue-100; border: 2px solid $blue; - border-radius: .25rem; + border-radius: 0.25rem; color: $black; span { font-family: AvertaSemibold; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index ab1af257d..b30fd88d8 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -298,14 +298,13 @@ export default { ); // While Pricing By Day Experiment is active, using the updated datePicker - const datePickerInitialDataPromise = - await datePicker.methods.loadInitialData({ - // setup config options for date-picker - selectableDatesSetting: "custom", - initialViewRowsToShow: 5, - customSelectableDatesCallback: getAvailableDates, - preSelectedDate: preSelectedDate, - }); + const datePickerInitialDataPromise = await datePicker.methods.loadInitialData({ + // setup config options for date-picker + selectableDatesSetting: "custom", + initialViewRowsToShow: 5, + customSelectableDatesCallback: getAvailableDates, + preSelectedDate: preSelectedDate, + }); // Get pricingByDayUpcharge needed for Pricing By Day const pricingByDayUpchargePartPromise = showPricingByDay From b84b9d41f77d28d4a6532b669576238c7a1fd397 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 15 Apr 2025 17:02:24 -0400 Subject: [PATCH 10/10] CASH-489 CASH-489 null check --- src/layouts/quote/quote.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 42ccfb09a..6ef3d4749 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -275,8 +275,8 @@ export default { const emailFromStore = store.getters.order.customer.emailAddress; const isEmailInStoreOnPageLoad = emailFromStore?.length > 0; const isPopupSkipped = - store.getters.pageData(fmgPageValues.QUOTE).saveProgressPopupSkipped === true; - const showSaveProgressPopup = isEmailInStoreOnPageLoad || isPopupSkipped ? false : true; + store.getters.pageData(fmgPageValues.QUOTE)?.saveProgressPopupSkipped === true; + const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped); const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true; const shouldSkipToInsurance = getBoolFromString(