jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/2025.07.10' into feature/CASH-845

Browse source
This commit is contained in:
AdamCaouetteSafelite 2025-07-02 14:31:42 -04:00
commit 6ede4b3a0c
2 changed files with 60 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
View file

@ -164,15 +164,13 @@ export default {
> div:last-of-type { > div:last-of-type {
color: $gray-650; color: $gray-650;
text-align: left; text-align: left;
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
padding-top: 1rem; padding-top: 1rem;
} }
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
padding-left: 1rem; padding-left: 1rem;
max-width: 26rem;
&#extended-pay-option {
max-width: 28rem;
}
} }
} }

120
src/layouts/service-location/shop-question/shop-question-popup.vue
View file

@ -520,77 +520,73 @@ export default {
const selectedProvider = this.shopProviders.find( const selectedProvider = this.shopProviders.find(
(provider) => provider.providerNumber == this.selectedProviderNumber (provider) => provider.providerNumber == this.selectedProviderNumber
); );
if (selectedProvider.address.zipCode !== this.internalModel.zipCode) { this.resetAlerts();
this.resetAlerts();
const zipCodeData = await this.getZipCodeData( const zipCodeData = await this.getZipCodeData(
selectedProvider.address.zipCode, 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" "service-location"
); );
if (!zipCodeData.isValid) { // retrieve recycle fee part
this.displayInvalidZipAlert = true; const recycleFeePart = await getPricedRecycleFeePart(
this.focusOnZipInput(); serviceZipCode,
this.resetModalButtonStyle(); "service-location"
} 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) { // retrieve serviceability details
this.displayNoServiceAlert = true; const serviceabilityDetails = await getServiceabilityDetails(
this.focusOnZipInput(); serviceZipCode,
this.resetModalButtonStyle(); null,
return null; "service-location"
} );
}
selectedProvider.address.state = zipCodeData.state; const billToAccountNumber = await getBillToAccountNumber(
selectedProvider.address.zipCodeCtu = zipCodeData.zipCodeCtu; selectedProvider.address.zipCodeCtu
);
// retrieve mobile fee part // update content related to service zip code
const serviceZipCode = selectedProvider.address.zipCode; this.$emit("updated-mobile-fee-part", mobileFeePart);
const mobileFeePart = await getPricedMobileFeePart( this.$emit("updated-recycle-fee-part", recycleFeePart);
serviceZipCode, this.$emit("updated-serviceability", serviceabilityDetails.data);
"service-location" 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 this.$emit("update:modelValue", this.selectedValue);
const recycleFeePart = await getPricedRecycleFeePart( this.$emit("update-shop-provider-data", this.localShopProviderData);
serviceZipCode, this.$emit("shop-selected", selectedProvider);
"service-location"
);
// 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();
}
} else {
this.closeModal(); this.closeModal();
} }
}, },