From 5ea8c3901e49128ac6fda857e275f6018ae8d1cb Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 30 Nov 2023 16:32:57 -0500 Subject: [PATCH 1/8] CSR-1860 fix font size and color for payment page. --- public/css/hop-styling.css | 5 ++++- public/scss/hop-styling.scss | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index 1c0b155a0..cd94e3024 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -5,7 +5,7 @@ body { font-family: Roboto; font-weight: 400; - color: #4D5151; + color: #000; margin: 0; background-color: white; padding: 8px; @@ -33,6 +33,7 @@ body .headerlinecontainer .headerline1 { line-height: 32px; font-weight: 400; margin: 24px 0; + text-align: center; } body input, body select { @@ -42,6 +43,8 @@ body input { border-radius: 8px; border: 1px solid #8E9292; padding: 16px; + font-size: 16px; + color: #000; } body input:focus, body input:focus-visible { box-shadow: 0 0 0 2.5px #1574a1; diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index badab0912..5f21c46dd 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -5,7 +5,7 @@ body { font-family: Roboto; font-weight: 400; - color: #4D5151; + color: #000; margin: 0; background-color: white; padding: 8px; @@ -39,6 +39,7 @@ body { line-height: 32px; font-weight: 400; margin: 24px 0; + text-align: center; } } @@ -51,6 +52,8 @@ body { border-radius: 8px; border: 1px solid #8E9292; padding: 16px; + font-size: 16px; + color: #000; &:focus, &:focus-visible { box-shadow: 0 0 0 2.5px #1574a1; From c6a50eb67ddaf4f13120d72ba93c99d005bd6ede Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 1 Dec 2023 19:07:27 +0530 Subject: [PATCH 2/8] Update confirmation.vue Back to Safelite button redirecting to environment content site. --- src/layouts/confirmation/confirmation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 51546a97e..32c36c161 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -300,7 +300,7 @@ export default { return serviceLocationReqs && scheduleReqs && customerReqs; }, forwardButtonAction() { - window.location.assign("//www.safelite.com/"); + window.location.assign(location.protocol + "//" + location.host); }, }, components: { From b4792236d8de27f0ae82329e0909afa603c8b216 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 1 Dec 2023 08:46:50 -0500 Subject: [PATCH 3/8] CSR-1857 | Exclude promos from lineItems sent to safelite-hop --- src/layouts/payment/payment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index 6de58dc3c..559a44ee2 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -532,7 +532,7 @@ export default { } 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`); } }); From ad5014ac6f4fc1f2c6431bc4cf844288506bbb7e Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 10:29:51 -0500 Subject: [PATCH 4/8] CSR-1819 remove unneeded accessibility spans. --- src/fmg-components/cart/cart.vue | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index d5ef09542..4e6aeb1da 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -16,8 +16,7 @@
- - {{ screenReaderPackagePriceText }} + {{ getFormattedAmount("", packagePrice) }}
@@ -64,39 +63,29 @@ {{ recycleFeeCartItem.name }} - {{ screenReaderRecycleFeeText }}{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}
{{ subtotalText }}{{ screenReaderSubTotalText }}{{ getFormattedAmount("", subTotal) }}{{ getFormattedAmount("", subTotal) }}
{{ salesTaxText }}{{ screenReaderSalesTaxText }}{{ getFormattedAmount("", salesTax) }}{{ getFormattedAmount("", salesTax) }}
{{ amountPaidText }}{{ screenReaderAmountPaidText }}{{ getFormattedAmount("", amountPaid) }}{{ getFormattedAmount("", amountPaid) }}
{{ amountDueText }}{{ screenReaderTotalAmountDueText }}{{ getFormattedAmount("", amountDue) }}{{ getFormattedAmount("", amountDue) }}
@@ -136,6 +125,7 @@ export default { allowItemRemoval: Boolean, recyclingModalCmsWidgetName: String, showAsPaid: Boolean, + cmsWidgetName: String, }, data() { return { From 088060a354d5217bb83f9fc6d622760066c3d131 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 10:31:30 -0500 Subject: [PATCH 5/8] Remove unneeded prop. --- src/fmg-components/cart/cart.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 4e6aeb1da..29ce7aca8 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -125,7 +125,6 @@ export default { allowItemRemoval: Boolean, recyclingModalCmsWidgetName: String, showAsPaid: Boolean, - cmsWidgetName: String, }, data() { return { From 2106738f5d9a7e3f3c9898bb7fbbb2bed0138f73 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 13:30:32 -0500 Subject: [PATCH 6/8] Format code. --- src/fmg-components/cart/cart.vue | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 29ce7aca8..cd50a8fda 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -63,30 +63,25 @@ {{ recycleFeeCartItem.name }} - {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }} + {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}
{{ subtotalText }}{{ getFormattedAmount("", subTotal) }} + >{{ getFormattedAmount("", subTotal) }}
{{ salesTaxText }}{{ getFormattedAmount("", salesTax) }} + >{{ getFormattedAmount("", salesTax) }}
{{ amountPaidText }}{{ getFormattedAmount("", amountPaid) }} + >{{ getFormattedAmount("", amountPaid) }}
{{ amountDueText }}{{ getFormattedAmount("", amountDue) }} + >{{ getFormattedAmount("", amountDue) }}
From 3cd95431ff9caf77c186bab110cc6f339b465318 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:39:21 -0500 Subject: [PATCH 7/8] CSR-1858 ctu corrections --- .../mobile-location-modal-questions.vue | 1 + .../service-location/service-location.vue | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue index 8bac8dbb4..762af0d72 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue @@ -252,6 +252,7 @@ export default { this.$emit("updated-mobile-fee-part", mobileFeePart); this.$emit("updated-serviceability", serviceabilityDetails.data); this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase); + this.$emit("updated-mobile-ctu", zipCodeData.zipCodeCtu); // update the page level model this.$emit("update:modelValue", this.internalModel); diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 0a74ab21e..1c25b8f40 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -83,6 +83,7 @@ @updated-mobile-fee-part="setMobileFeePart" @updated-serviceability="setServiceabilityDetails" @updated-contains-military-base="setContainsMilitaryBase" + @updated-mobile-ctu="setCtuForMobile" validationRules="mobile-location-required" ref="mobileLocationQuestions" linkWidgetName="MobileLocationLinkWidget" @@ -128,6 +129,7 @@ import contentGroupModal from "@/fmg-components/content-group-modal/content-grou // Supporting files import baseMixin from "@/mixins/base-mixin.js"; +import { AppointmentTypeStrings } from "@/constants/schedule-constants"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { settleAllPromises } from "@/helpers/layout-helper"; @@ -374,6 +376,9 @@ export default { this.zipContainsMilitaryBase = val; } }, + setCtuForMobile(val) { + this.zipCodeCtu = val; + }, setMobileFeePart(mobileFeePart) { this.mobileFeePart = mobileFeePart; }, @@ -472,6 +477,28 @@ export default { } }, async forwardButtonAction() { + // clear items not needed for appointmentType + if (this.selectedAppointmentType == AppointmentTypeStrings.IN_SHOP) { + // if we have a provider.zipCodeCtu that's different than the servicelocation.zipCodeCtu then they + // may have selected a shop in a different ctu. change the servicelocation zip/ctu if different + if (this.zipCodeCtu != this.selectedProvider.address.zipCodeCtu) { + this.zipCodeCtu = this.selectedProvider.address.zipCodeCtu; + this.zipCode = this.selectedProvider.address.zipCode; + } + + this.city = null; + this.streetAddress = null; + } + + if (this.selectedAppointmentType == AppointmentTypeStrings.MOBILE && + this.selectedProvider && this.selectedProvider.address) { + this.selectedProvider.address.streetAddress = null; + this.selectedProvider.address.city = null; + this.selectedProvider.address.state = null; + this.selectedProvider.address.zipCode = null; + this.selectedProvider.address.zipCodeCtu = null; + } + await this.dispatchStoreAction( this.storeActions.SAVE_SERVICE_LOCATION, { From 7783d233d2909f0f618b417d89c41a71779cec44 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 1 Dec 2023 14:43:03 -0500 Subject: [PATCH 8/8] csr-1853 prettier --- src/layouts/service-location/service-location.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 1c25b8f40..e6cb2138e 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -479,7 +479,7 @@ export default { async forwardButtonAction() { // clear items not needed for appointmentType if (this.selectedAppointmentType == AppointmentTypeStrings.IN_SHOP) { - // if we have a provider.zipCodeCtu that's different than the servicelocation.zipCodeCtu then they + // if we have a provider.zipCodeCtu that's different than the servicelocation.zipCodeCtu then they // may have selected a shop in a different ctu. change the servicelocation zip/ctu if different if (this.zipCodeCtu != this.selectedProvider.address.zipCodeCtu) { this.zipCodeCtu = this.selectedProvider.address.zipCodeCtu; @@ -490,8 +490,11 @@ export default { this.streetAddress = null; } - if (this.selectedAppointmentType == AppointmentTypeStrings.MOBILE && - this.selectedProvider && this.selectedProvider.address) { + if ( + this.selectedAppointmentType == AppointmentTypeStrings.MOBILE && + this.selectedProvider && + this.selectedProvider.address + ) { this.selectedProvider.address.streetAddress = null; this.selectedProvider.address.city = null; this.selectedProvider.address.state = null;