diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue index 7203a040..88f32a79 100644 --- a/src/layouts/duplicate-check/duplicate-check.vue +++ b/src/layouts/duplicate-check/duplicate-check.vue @@ -54,7 +54,7 @@ import siteFooter from '@/iss-components/site-footer/site-footer.vue'; import siteSubHeader from '@/iss-components/site-sub-header/site-sub-header.vue'; import buttonQuestion from '@/digital-components/button-question/button-question.vue'; import buttonMain from '@/ux-components/button-main/button-main.vue'; -import buttonVariants from '@/constants/button-variants'; +import { buttonVariants } from '@/constants/component-variants'; // Supporting files import { fetchCmsContentForPage } from '@/helpers/cms-content-helper.js'; diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index ab684447..42fe3d5c 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -55,6 +55,12 @@
+ +
- 0 && !foundMatch) { this.selectedProvider = providers.shopProviders[0]; } - else { + else if(providers.shopProviders.length === 0) { this.selectedProvider = null; } } @@ -525,7 +533,6 @@ export default { } else if (!zipCodeData.isServiceable) { this.mobileZipError = errorMessages.NO_SERVICE_IN_AREA(toTitleCase(zipCodeData.city)); } else { - console.log('zipCodeData:', zipCodeData); this.city = zipCodeData.city; this.zipCode = this.mobileZipCode; this.setCtuForMobile(zipCodeData.zipCodeCtu); @@ -557,7 +564,6 @@ export default { async handleInShopZipUpdated(newZip) { this.zipCode = newZip; const zipCodeData = await getZipCodeData(this.zipCode); - console.log('zipCodeData:', zipCodeData); this.city = zipCodeData.city; this.setCtuForMobile(zipCodeData.zipCodeCtu); this.setContainsMilitaryBase(zipCodeData.containsMilitaryBase); @@ -579,6 +585,21 @@ export default { }, selectedAppointmentType() { this.mobileZipCode = ''; + if(this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP && this.selectedProvider) { + const startDate = new Date(); + const endDate = new Date(); + endDate.setDate(startDate.getDate() + 6); + const formattedStartDate = startDate.toISOString().split('T')[0]; + const formattedEndDate = endDate.toISOString().split('T')[0]; + getAvailabilityRating( + formattedStartDate, + formattedEndDate, + AppointmentTypeStrings.IN_SHOP, + this.selectedProvider ? this.selectedProvider.providerNumber : null + ).then((rating) => { + this.availabilityRating = rating; + }); + } } } }; diff --git a/src/layouts/service-location/service-zip-question/service-zip-question.vue b/src/layouts/service-location/service-zip-question/service-zip-question.vue index ce5b1be4..c020b538 100644 --- a/src/layouts/service-location/service-zip-question/service-zip-question.vue +++ b/src/layouts/service-location/service-zip-question/service-zip-question.vue @@ -9,7 +9,7 @@ isRequired :hasError="hasError" @clickEvent="updateModelValue" - validationRules="zip-required|zip-format" /> + :validationRules="`zip-required|${cmsWidgetName}-zip-format`" /> diff --git a/src/layouts/service-location/shop-address/shop-address.vue b/src/layouts/service-location/shop-address/shop-address.vue index 6b4d7402..8c146aa1 100644 --- a/src/layouts/service-location/shop-address/shop-address.vue +++ b/src/layouts/service-location/shop-address/shop-address.vue @@ -236,6 +236,7 @@ export default { async internalZipcode() { const shopsUpdated = await this.updateShops(); if (shopsUpdated) { + await this.$nextTick(); this.$refs[SERVICE_ZIP_QUESTION_REF_NAME].internalZipcode = ''; } }, @@ -263,6 +264,7 @@ export default { } this.nearbyShops = result; this.searchRadiusInMiles = this.searchRadiusArray[currentSearchIndex].Name; + return true; } }, openModal() {