From 0337ed17a9f22541caa2d49076db667ab70c501b Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Tue, 1 Jul 2025 10:02:49 -0400 Subject: [PATCH 1/3] CASH-952: UI Updates --- .../quote/afterpay-modal-banner/afterpay-modal-banner.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue index 218ba03ba..e9f631972 100644 --- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue +++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue @@ -164,15 +164,13 @@ export default { > div:last-of-type { color: $gray-650; text-align: left; + @include media-breakpoint-down(md) { padding-top: 1rem; } @include media-breakpoint-up(md) { padding-left: 1rem; - - &#extended-pay-option { - max-width: 28rem; - } + max-width: 26rem; } } From 87013401f507b846fb5d92a68e38708c7bf744be Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 1 Jul 2025 13:44:13 -0400 Subject: [PATCH 2/3] CASH-816 CASH-816 fixed defect CASH-1121, didnt even need this if statement for anything so I removed it --- .../service-location/shop-question/shop-question-popup.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index c312ae1fb..1e7d7ec59 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -520,7 +520,6 @@ export default { const selectedProvider = this.shopProviders.find( (provider) => provider.providerNumber == this.selectedProviderNumber ); - if (selectedProvider.address.zipCode !== this.internalModel.zipCode) { this.resetAlerts(); const zipCodeData = await this.getZipCodeData( @@ -590,9 +589,6 @@ export default { this.closeModal(); } - } else { - this.closeModal(); - } }, }, watch: { From 9e6965b0abe6aa427917581c1b365fed80ff1061 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 1 Jul 2025 13:49:35 -0400 Subject: [PATCH 3/3] CASH-816 CASH-816 formatting --- .../shop-question/shop-question-popup.vue | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index 1e7d7ec59..b345d370d 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -520,75 +520,75 @@ export default { const selectedProvider = this.shopProviders.find( (provider) => provider.providerNumber == this.selectedProviderNumber ); - this.resetAlerts(); + this.resetAlerts(); - const zipCodeData = await this.getZipCodeData( - selectedProvider.address.zipCode, + const zipCodeData = await this.getZipCodeData( + selectedProvider.address.zipCode, + "service-location" + ); + + if (!zipCodeData.isValid) { + this.displayInvalidZipAlert = true; + this.focusOnZipInput(); + this.resetModalButtonStyle(); + } else { + if (this.isVehicleHeavyTruck) { + // check the location endpoint to verify this zip can service a heavy truck + const closestShops = await getClosestApplicableShops( + selectedProvider.address.zipCode, + this.carId, + "service-location" + ); + + if (!closestShops || closestShops.providers?.length === 0) { + this.displayNoServiceAlert = true; + this.focusOnZipInput(); + this.resetModalButtonStyle(); + return null; + } + } + + selectedProvider.address.state = zipCodeData.state; + selectedProvider.address.zipCodeCtu = zipCodeData.zipCodeCtu; + + // retrieve mobile fee part + const serviceZipCode = selectedProvider.address.zipCode; + const mobileFeePart = await getPricedMobileFeePart( + serviceZipCode, "service-location" ); - if (!zipCodeData.isValid) { - this.displayInvalidZipAlert = true; - this.focusOnZipInput(); - this.resetModalButtonStyle(); - } else { - if (this.isVehicleHeavyTruck) { - // check the location endpoint to verify this zip can service a heavy truck - const closestShops = await getClosestApplicableShops( - selectedProvider.address.zipCode, - this.carId, - "service-location" - ); + // retrieve recycle fee part + const recycleFeePart = await getPricedRecycleFeePart( + serviceZipCode, + "service-location" + ); - if (!closestShops || closestShops.providers?.length === 0) { - this.displayNoServiceAlert = true; - this.focusOnZipInput(); - this.resetModalButtonStyle(); - return null; - } - } + // retrieve serviceability details + const serviceabilityDetails = await getServiceabilityDetails( + serviceZipCode, + null, + "service-location" + ); - selectedProvider.address.state = zipCodeData.state; - selectedProvider.address.zipCodeCtu = zipCodeData.zipCodeCtu; + const billToAccountNumber = await getBillToAccountNumber( + selectedProvider.address.zipCodeCtu + ); - // retrieve mobile fee part - const serviceZipCode = selectedProvider.address.zipCode; - const mobileFeePart = await getPricedMobileFeePart( - serviceZipCode, - "service-location" - ); + // update content related to service zip code + this.$emit("updated-mobile-fee-part", mobileFeePart); + this.$emit("updated-recycle-fee-part", recycleFeePart); + this.$emit("updated-serviceability", serviceabilityDetails.data); + this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase); + this.$emit("updated-bill-to-account-number", billToAccountNumber); + this.$emit("updated-zipcode-ctu", selectedProvider.address.zipCodeCtu); - // retrieve recycle fee part - const recycleFeePart = await getPricedRecycleFeePart( - serviceZipCode, - "service-location" - ); + this.$emit("update:modelValue", this.selectedValue); + this.$emit("update-shop-provider-data", this.localShopProviderData); + this.$emit("shop-selected", selectedProvider); - // retrieve serviceability details - const serviceabilityDetails = await getServiceabilityDetails( - serviceZipCode, - null, - "service-location" - ); - - const billToAccountNumber = await getBillToAccountNumber( - selectedProvider.address.zipCodeCtu - ); - - // update content related to service zip code - this.$emit("updated-mobile-fee-part", mobileFeePart); - this.$emit("updated-recycle-fee-part", recycleFeePart); - this.$emit("updated-serviceability", serviceabilityDetails.data); - this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase); - this.$emit("updated-bill-to-account-number", billToAccountNumber); - this.$emit("updated-zipcode-ctu", selectedProvider.address.zipCodeCtu); - - this.$emit("update:modelValue", this.selectedValue); - this.$emit("update-shop-provider-data", this.localShopProviderData); - this.$emit("shop-selected", selectedProvider); - - this.closeModal(); - } + this.closeModal(); + } }, }, watch: {