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; diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index d5ef09542..cd50a8fda 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -16,8 +16,7 @@
- - {{ screenReaderPackagePriceText }} + {{ getFormattedAmount("", packagePrice) }}
@@ -64,40 +63,25 @@ {{ 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) }}
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: { 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`); } }); 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..e6cb2138e 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,31 @@ 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, {