From 76e667f7cc3c8800baa758ba05c9281ab81e47be Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 31 Jul 2025 09:42:32 -0400 Subject: [PATCH 01/63] CASH-1182 CASH-1182 moved serviceZipModal under appointmentType question, left alignedheaders and stuff on the page --- .../date-picker/date-picker.vue | 2 +- src/layouts/schedule/schedule.vue | 40 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 72bdcb093..f8b5496fe 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1106,7 +1106,7 @@ export default { grid-area: 1 / 1 / 2 / 5; font-family: UrbanistBold; color: $black; - justify-content: center; + justify-content: left; margin-bottom: 0.5rem; } .legend { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 0e68cb458..f060debac 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -5,22 +5,6 @@
- -
-
+
+
+ + +
-
+
Date: Fri, 1 Aug 2025 09:36:51 -0400 Subject: [PATCH 02/63] CASH-1182 CASH-1182 updated cms, font stylings --- .../date-picker/date-picker.vue | 2 ++ src/layouts/schedule/schedule.vue | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index f8b5496fe..65870270c 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1026,6 +1026,8 @@ export default { flex-grow: 0; display: flex; flex-direction: column; + align-items: flex-start; + text-align: left; .date-picker-header { margin-bottom: 1.5rem; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index f060debac..4032e0de6 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -45,7 +45,8 @@
-
+
+
-
+
-
+
From 385b7e747f96178b14549b0bf4a91dd1cd5eb61a Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Aug 2025 10:31:04 -0400 Subject: [PATCH 03/63] CASH-1048 center modal on quote page. --- src/digital-components/modal/modal.vue | 3 ++- src/layouts/quote/quote.vue | 31 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index 16b259547..a96e25a5f 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -9,7 +9,8 @@ tabindex="-1" aria-labelledby="ModalComponentLabel" @keypress.enter="onEnter" - aria-hidden="true"> + aria-hidden="true" + @click.self="closeModal">
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index ff8bc0c61..ad754c815 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -922,6 +922,37 @@ export default { width: -moz-available; } } + //Save email modal ONLY centered on screen for quote page only + .save-progress-popup-question { + :deep(.modal-component) { + .modal-dialog { + max-width: 767px; + margin: 0 auto; + @include media-breakpoint-up(md) { + width: 50%; + max-width: 600px; + top: 0; + right: 0; + left: 0; + transform: none; + } + .modal-content { + @include media-breakpoint-up(md) { + box-shadow: none; + border-radius: 0; + margin: auto; + height: auto; + border-radius: 0.5rem; + } + } + } + .modal-footer { + button.btn.skip-button { + margin: 0 auto; + } + } + } + } } .quote-page.show-save-progress-popup .row.justify-content-center { display: none; From 7fce2e5b5eb6c5902308450cdb03e3c159aab738 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Aug 2025 10:32:50 -0400 Subject: [PATCH 04/63] CASH-1048 add comment. --- src/digital-components/modal/modal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index a96e25a5f..69015ae36 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -10,7 +10,7 @@ aria-labelledby="ModalComponentLabel" @keypress.enter="onEnter" aria-hidden="true" - @click.self="closeModal"> + @click.self="closeModal">
From 4029d9c089d72afd19b3e55d942521e6329d191e Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Aug 2025 10:45:51 -0400 Subject: [PATCH 05/63] CASH-1048 format code. --- src/digital-components/modal/modal.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index 69015ae36..823471715 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -10,7 +10,8 @@ aria-labelledby="ModalComponentLabel" @keypress.enter="onEnter" aria-hidden="true" - @click.self="closeModal"> + @click.self="closeModal"> +
From e6d602ec3da8b767c95d8e315ad2d487ba1aacfd Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:45:57 -0400 Subject: [PATCH 06/63] Tag automation tests to run in pipeline --- playwright-tests/tests/CashReplaceMultiGlassMobile.ts | 2 +- playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts | 2 +- playwright-tests/tests/CashReplaceVinMobile.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts index f67f44234..5db56fb85 100644 --- a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts +++ b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts @@ -95,7 +95,7 @@ const cashReplaceMultiGlassMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceMultiGlassMobile`, - tags: ['@E2E','@CashReplaceMultiGlassMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceMultiGlassMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceMultiGlassMobileData }; cashReplaceMultiGlassMobileTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts index 3729ff72b..7bbc671ee 100644 --- a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts +++ b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts @@ -77,7 +77,7 @@ const cashReplaceSafeliteCanNotRecalMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceSafeliteCanNotRecalMobile`, - tags: ['@E2E','@CashReplaceSafeliteCanNotRecalMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceSafeliteCanNotRecalMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceSafeliteCanNotRecalMobileData }; cashReplaceSafeliteCanNotRecalMobileTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceVinMobile.ts b/playwright-tests/tests/CashReplaceVinMobile.ts index d47ab608f..e81220cd0 100644 --- a/playwright-tests/tests/CashReplaceVinMobile.ts +++ b/playwright-tests/tests/CashReplaceVinMobile.ts @@ -66,7 +66,7 @@ const cashReplaceVinMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceVinMobile`, - tags: ['@E2E','@CashReplaceVinMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceVinMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceVinMobileData }; cashReplaceVinMobileTests.push(tc); From 0e2b29d803a6161268922649327ba189e3e57b16 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 1 Aug 2025 13:14:43 -0400 Subject: [PATCH 07/63] CASH-1182 CASH-1182 formatting and removed unused css --- src/layouts/schedule/schedule.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 4be8c59e9..241df49cd 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1798,13 +1798,8 @@ export default { background: $blue-100; box-shadow: 0 0 0 1px $primary; } -.schedule-header { - font-weight: 400; - font-size: 20px; - text-align: left; -} -.container .row .col-12 .alert-success .alert-heading{ +.container .row .col-12 .alert-success .alert-heading { color: $black; font-weight: 600; } From 92a6bc141add792e5bc1c9296e04368f02b8f5b1 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:34:35 -0400 Subject: [PATCH 08/63] Comment out progress bar validation function --- playwright-tests/pages/BasePage.ts | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index ec6c5d767..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -131,24 +131,24 @@ export class BasePage { } async validateProgressBar(progressPercentage: string, timeout: number = 60000) { + // This section has been commented out until progress bar work is completed for parity. - - await waitUntil(async () => { - let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); - return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); - }); + // await waitUntil(async () => { + // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); + // return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); + // }); - // Take a screenshot of the page before validating the progress bar - await this.page.screenshot({ path: `test-results\\ortoni-data\\progress-bar-${Date.now()}.png`, fullPage: true }); - // Wait until the progress bar element is attached and visible + // // Take a screenshot of the page before validating the progress bar + // await this.page.screenshot({ path: `test-results\\ortoni-data\\progress-bar-${Date.now()}.png`, fullPage: true }); + // // Wait until the progress bar element is attached and visible - const actualProgressPercentage = await this.progressBar.evaluate( - async (element) => { - await new Promise(resolve => setTimeout(resolve, 200)); - return element.style.width || "Not Found"; - } - ); - Soft.expect(actualProgressPercentage).toBe(progressPercentage); - console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`); + // const actualProgressPercentage = await this.progressBar.evaluate( + // async (element) => { + // await new Promise(resolve => setTimeout(resolve, 200)); + // return element.style.width || "Not Found"; + // } + // ); + // Soft.expect(actualProgressPercentage).toBe(progressPercentage); + // console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`); } } \ No newline at end of file From 1011e0ee448f460e07683ba7fc6515ae9dce6608 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:44:13 -0400 Subject: [PATCH 09/63] Add to comment --- playwright-tests/pages/BasePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 30df48447..bcaeab3ec 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,6 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. + // Uncomment when ready. // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From d217f9ee44c33f6f4dcd5637645c5798c8004aa6 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 13:52:08 -0400 Subject: [PATCH 10/63] Comments out progress bar validation. Comments out the progress bar validation code. This is done because the progress bar implementation is not yet complete. The validation will be re-enabled when the progress bar work is finished. --- playwright-tests/pages/BasePage.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index bcaeab3ec..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,7 +132,6 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // Uncomment when ready. // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From 08e51f5dde260d11b68b306aa2685f3a6c08943e Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:04:00 -0400 Subject: [PATCH 11/63] Test commit to trigger pipeline --- playwright-tests/pages/BasePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 30df48447..0c2779ba2 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,6 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. + // // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From b4fd2ed9703434bb937e66947305633e6518cfa5 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:14:55 -0400 Subject: [PATCH 12/63] test commit to trigger pipeline 2 Comments out the progress bar validation logic in the base page. This is a temporary measure until the progress bar implementation is completed. --- playwright-tests/pages/BasePage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 0c2779ba2..c5326504d 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,7 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // + // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From 94aaad64d3c706bdfe590623143a8b558b6aa4d2 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:25:04 -0400 Subject: [PATCH 13/63] test commit test commit --- playwright-tests/pages/BasePage.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index c5326504d..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -133,7 +133,6 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); // return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); From 9901b84bc68ccc82ac745f039750f18665acef53 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:37:00 -0400 Subject: [PATCH 14/63] Removes trailing whitespace from .env.dev Removes an unnecessary empty line at the end of the .env.dev file, improving code cleanliness. --- playwright-tests/.env.dev | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/.env.dev b/playwright-tests/.env.dev index 0f8e62d0c..00c66dc6c 100644 --- a/playwright-tests/.env.dev +++ b/playwright-tests/.env.dev @@ -27,4 +27,3 @@ ADMIN_SERVICE_API_URL="https://issadminapi.dev.sagaws.net/iss-admin/api/v1/" # API authentication (replace with actual value when running tests) CCIS_API_AUTH="undefined" - From 900704150bd8ea20e0f7b22493e9135916c04319 Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Fri, 1 Aug 2025 16:14:06 -0400 Subject: [PATCH 15/63] CASH-1183: Shop location and timeslot parity updates --- .../date-picker/date-picker.vue | 11 -- src/layouts/schedule/schedule.vue | 56 +++----- .../schedule/shop-location/shop-location.vue | 120 ++++++++++++++++++ .../time-slot-modal-list-button.vue | 2 +- src/styles/shared-input-button-styles.scss | 2 +- 5 files changed, 143 insertions(+), 48 deletions(-) create mode 100644 src/layouts/schedule/shop-location/shop-location.vue diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 8033f5b41..858ddb3e4 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1470,19 +1470,8 @@ export default { display: flex; max-width: 100%; flex-wrap: wrap; - gap: 0 0.5rem; & > div { - flex: 0 0 calc(50% - 0.25rem); - } - } - :deep(.button-question.is-mobile-appointment) { - .button-inner-wrapper > div { - flex: 0 0 100%; - } - } - :deep(.button-question.is-drop-off-appointment) { - .button-inner-wrapper > div { flex: 0 0 100%; } } diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 241df49cd..48dc66ad2 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -86,17 +86,19 @@ class="row your-shop-location" v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE">
- +
+ +
-
@@ -163,9 +157,8 @@ import alert from "@/ux-components/alert/alert"; import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question"; import appointmentTypeQuestion from "@/layouts/service-location/appointment-type-question/appointment-type-question"; import shopQuestion from "@/layouts/service-location/shop-question/shop-question"; -import shopQuestionPopup from "@/layouts/service-location/shop-question/shop-question-popup"; -import buttonQuestion from "@/digital-components/button-question/button-question.vue"; import shopListButton from "@/layouts/service-location/shop-question/shop-list-button/shop-list-button"; +import shopLocation from "@/layouts/schedule/shop-location/shop-location"; import funnelHeader from "@/fmg-components/funnel-header/funnel-header"; import navbar from "@/fmg-components/nav-bar/nav-bar"; @@ -774,21 +767,15 @@ export default { const zipCode = this.selectedProvider.address.zipCode; const distanceInMiles = provider ? Math.round(provider.distanceInMiles * 2) / 2 : 0; - return [ - { - buttonLabel: `${city}`, - buttonLabelSubCopy: `${distanceInMiles} mi`, - buttonBodyCopy: `${streetAddress}, ${city}, ${state} ${zipCode}`, - additionalButtonData: this.additionalButtonData, - value: this.selectedProvider.providerNumber, - }, - ]; + return { + city: `${city}`, + distance: `${distanceInMiles} mi`, + address1: `${streetAddress}`, + address2: `${city}, ${state} ${zipCode}`, + }; } return []; }, - questionText() { - return this.getCmsContent("YourSafeliteShopWidget", "QuestionText"); - }, appointmentTypeStrings() { return AppointmentTypeStrings; }, @@ -1745,8 +1732,7 @@ export default { serviceZipModalQuestion, appointmentTypeQuestion, contentGroupModal, - shopQuestionPopup, - buttonQuestion, + shopLocation, }, }; diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue new file mode 100644 index 000000000..f4277e43b --- /dev/null +++ b/src/layouts/schedule/shop-location/shop-location.vue @@ -0,0 +1,120 @@ + + + + + + diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue index 74286c550..5ee4768f8 100644 --- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue +++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue @@ -90,7 +90,7 @@ export default { position: relative; background: $white; transition: all 150ms linear; - border-radius: $border-radius-lg; + border-radius: $border-radius-pill; border: 1px solid $gray-500; width: 100%; outline: none; diff --git a/src/styles/shared-input-button-styles.scss b/src/styles/shared-input-button-styles.scss index f212fa072..e06feaf43 100644 --- a/src/styles/shared-input-button-styles.scss +++ b/src/styles/shared-input-button-styles.scss @@ -28,7 +28,7 @@ position: relative; z-index: 5; @include box-shadow-hover($blue-300); - border-radius: 0.5rem; + border-radius: $border-radius-pill; } } } From af9a07b6e2bacf0f047124b5a7398f6fa4e10ac3 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 4 Aug 2025 12:16:36 -0400 Subject: [PATCH 16/63] CASH-1326 UI bug fixes. --- .../funnel-header/funnel-header.vue | 32 +++++++++----- .../funnel-header/menu-modal/menu-modal.vue | 44 +++++++++++-------- src/layouts/vehicle/vehicle.vue | 3 +- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue index bad77ede5..8bc509c77 100644 --- a/src/fmg-components/funnel-header/funnel-header.vue +++ b/src/fmg-components/funnel-header/funnel-header.vue @@ -15,7 +15,7 @@ v-show="shouldShowWebchatButton" v-on:click="webchatClicked" type="button" - class="chat-button"> + class="chat-button">Chat Now
@@ -197,6 +197,7 @@ export default { diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index 469344d04..ce71c3591 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -7,7 +7,6 @@ :questionText="questionText" :answers="answersToDisplay" :groupName="groupName" - buttonTypeString="listCard" v-model="selectedValue" :suppressError="suppressError" :validationRules="validationRules" @@ -134,4 +133,11 @@ export default { width: auto; } } +div.appointment-type-question div.button-question div.col div.button-content{ + padding-left: 0.5rem; + padding-right: 0.5rem; +} +div.appointment-type-question div.button-question div.question-text span { + font-weight: 500; +} From 132d186ab104b5fb5962d4111cdabb799dddb25c Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 14:34:24 -0400 Subject: [PATCH 19/63] Tag in-shop Playwright tests --- playwright-tests/tests/CashReplaceGlassPromoInshop.ts | 2 +- playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts index c7922e144..d958c86e2 100644 --- a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts +++ b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts @@ -60,7 +60,7 @@ const cashReplaceGlassPromoInshopTests: ITestCase[] = []; const tc = { name: `CashReplaceGlassPromoInshop`, - tags: ['@E2E','@CashReplaceGlassPromoInshop', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceGlassPromoInshop', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceGlassPromoInshopData }; cashReplaceGlassPromoInshopTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts index 7237bb530..102c7b415 100644 --- a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts +++ b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts @@ -101,7 +101,7 @@ const cashReplaceMultiGlassPromoInshopTests: ITestCase[] = []; const tc = { name: `CashReplaceMultiGlassPromoInshop`, - tags: ['@E2E','@CashReplaceMultiGlassPromoInshop', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceMultiGlassPromoInshop', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceMultiGlassPromoInshopData }; cashReplaceMultiGlassPromoInshopTests.push(tc); From 8a26261c94c6b1ef1d82150b8fd2a9a69ab508f4 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Mon, 4 Aug 2025 14:47:08 -0400 Subject: [PATCH 20/63] CASH-1182 formatting --- src/digital-components/date-picker/date-picker.vue | 2 +- .../appointment-type-question/appointment-type-question.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index bb42d3ca9..b68d99dc2 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1112,7 +1112,7 @@ export default { color: $black; justify-content: left; margin-bottom: 0.5rem; - font-weight:500; + font-weight: 500; } .legend { grid-area: 1 / 5 / 2 / 8; diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index ce71c3591..680345dc5 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -133,7 +133,7 @@ export default { width: auto; } } -div.appointment-type-question div.button-question div.col div.button-content{ +div.appointment-type-question div.button-question div.col div.button-content { padding-left: 0.5rem; padding-right: 0.5rem; } From 2e0958391ab0877bbb8b78be96594804fa2c1101 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:56:16 -0400 Subject: [PATCH 21/63] Update locator and step for both inshop and mobile flow --- playwright-tests/pages/SchedulePage.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts index d4d00b6f0..2c3dc0a6f 100644 --- a/playwright-tests/pages/SchedulePage.ts +++ b/playwright-tests/pages/SchedulePage.ts @@ -17,7 +17,7 @@ export class SchedulePage extends BasePage { readonly militaryWarningMessage: Locator; readonly changeZipButton: Locator; readonly updateZipTextBox: Locator; - readonly saveZipButton: Locator; + readonly saveLocationButton: Locator; readonly changeShopLocationLink: Locator; readonly selectAShopOptions: Locator; readonly yourSafeliteShop: Locator; @@ -37,14 +37,14 @@ export class SchedulePage extends BasePage { super(page); this.page = page; - this.inShopButton = this.page.getByText(/In-shop/); - this.mobileButton = this.page.locator('label[buttonlabel="Mobile"]'); + this.inShopButton = this.page.locator('label[buttonlabel="You come to our store"]'); + this.mobileButton = this.page.locator('label[buttonlabel="Our mobile shop comes to you"]'); this.RecalWarningMessage1 = this.page.getByText(/We're not able to provide mobile service/); this.RecalWarningMessage2 = this.page.getByText(/advanced safety system recalibration needs to be done in our shop./); this.militaryWarningMessage = this.page.locator('[class*="widget-name-AlertMilitaryBaseZipWidget"]'); this.changeZipButton = this.page.locator('a:has(span.sr-only:has-text("edit zip code"))'); this.updateZipTextBox = this.page.locator('#serviceZipCode').filter({ visible: true }); - this.saveZipButton = this.page.getByText('Save ZIP code', { exact: true }); + this.saveLocationButton = this.page.getByText('Save location', { exact: true }); this.changeShopLocationLink = this.page.locator(".shop-question a").filter({ hasText: "Change shop location " }); this.selectAShopOptions = this.page.locator('[class="shop-question"]'); this.yourSafeliteShop = this.page.locator("fieldset:has(#chooseShop) label"); @@ -82,10 +82,10 @@ export class SchedulePage extends BasePage { if (zipCodeMatch) { const zipCode = zipCodeMatch[0]; // Enter the ZIP code into the updateZipTextBox - await this.changeZipButton.click(); + await this.changeShopLocationLink.click(); await this.page.waitForTimeout(500); await this.updateZipTextBox.fill(zipCode); - await this.saveZipButton.click(); + await this.saveLocationButton.click(); } await this.inShopButton.click(); From 70fa7a870a7cce8c058db9069dfa25929017fa47 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:13:35 -0400 Subject: [PATCH 22/63] Comment to rerun --- playwright-tests/pages/SchedulePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts index 2c3dc0a6f..368993d5f 100644 --- a/playwright-tests/pages/SchedulePage.ts +++ b/playwright-tests/pages/SchedulePage.ts @@ -85,6 +85,7 @@ export class SchedulePage extends BasePage { await this.changeShopLocationLink.click(); await this.page.waitForTimeout(500); await this.updateZipTextBox.fill(zipCode); + // Click the save location button await this.saveLocationButton.click(); } From 6219b847d920fcd0f8c416db256b5f3fe076e01d Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 5 Aug 2025 08:08:45 -0400 Subject: [PATCH 23/63] CASH-1327 quote page bug fixes. --- src/layouts/quote/quote.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index ad754c815..abd947e61 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -947,8 +947,19 @@ export default { } } .modal-footer { - button.btn.skip-button { - margin: 0 auto; + button { + &.btn { + border-radius: 50rem; + } + } + button { + &.btn { + &.skip-button { + margin: 0 auto 1rem; + color: $blue; + font-family: UrbanistSemibold, Arial, Helvetica, sans-serif; + } + } } } } From b9dfa47d9e7776cf1538531bf92497329b74c58d Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 5 Aug 2025 08:12:11 -0400 Subject: [PATCH 24/63] CASH-1327 adjust modal height on screen. --- src/layouts/quote/quote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index abd947e61..a07785aa7 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -931,7 +931,7 @@ export default { @include media-breakpoint-up(md) { width: 50%; max-width: 600px; - top: 0; + top: -10%; right: 0; left: 0; transform: none; From e8ca2fb3eed94260b2dfd81d073ccc60baa60d4f Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 5 Aug 2025 08:57:51 -0400 Subject: [PATCH 25/63] BRM fix undocumented border radius issue. --- src/layouts/vehicle-damage/vehicle-damage.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 2e520763f..9cf9f69fd 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -1,7 +1,7 @@