Merge branch 'develop' into feature/kroell/service-packages-defects

src/layouts/schedule-page/schedule-page.vue

@@ -225,18 +225,24 @@ export default {
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
-        const storeServiceLocation = useMainStore().order.serviceLocation;
+        let storeServiceLocation = useMainStore().order.serviceLocation;
+        let storeSelectedProvider = storeServiceLocation?.provider;
+
+        const storeSelectedSchedule = useMainStore().order.schedule;
+        if (storeSelectedProvider?.providerNumber && !storeSelectedSchedule?.routeCode) {
+            useMainStore().resetServiceLocationProvider();
+            storeServiceLocation = useMainStore().order.serviceLocation;
+            storeSelectedProvider = storeServiceLocation?.provider;
+        }
         const storeSelectedAppointmentType = storeServiceLocation?.appointmentType;
         const isMobileAppointment = storeSelectedAppointmentType === AppointmentTypeStrings.MOBILE
                 || storeSelectedAppointmentType === AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP;
-        const storeSelectedProvider = storeServiceLocation?.provider;
         const serviceZipCode = storeServiceLocation?.zipCode || useMainStore().order.customer.address.zipCode;
         const zipCodeData = getZipCodeData(serviceZipCode);
         const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
         const serviceabilityDetailsPromise = useMainStore().getServiceabilityDetails(serviceZipCode);
         const getGlassFeesPromise = useMainStore().getGlassFees();
         const providersPromise = useMainStore().getSafeliteProviders(serviceZipCode, 150);
-
         const premiumFeePromise = useMainStore().getMobilePremiumFee();
         const premiumFeeWithPricePromise = premiumFeePromise.then((result) => {
             if (result.data) {
@@ -279,7 +285,7 @@ export default {
 
         // use resultMap to populate layout content.
         const resultMap = await settleAllPromises(promiseResultMap);
-        const providersUnderOneHundredMiles = resultMap.providers?.shopProviders?.filter((provider) => provider.distanceMiles <= 100);
+        const providersUnderOneHundredMiles = resultMap.providers?.shopProviders?.filter((provider) => provider.distanceInMiles <= 100);
         const serviceLocationData = {
             defaultMobileZipCode: isMobileAppointment
                 ? storeServiceLocation?.zipCode
@@ -296,9 +302,9 @@ export default {
         useMainStore().updateIsSafeliteProvider(true);
         next(async (vm) => {
             const foundProviderInFullList = resultMap.providers?.shopProviders
-                .find((provider) => provider.providerNumber === storeSelectedProvider?.providerNumber) || resultMap.providers?.shopProviders[0];
+                .find((provider) => provider.providerNumber === storeSelectedProvider?.providerNumber) || null;
             const foundProviderInHundredMiles = providersUnderOneHundredMiles
-                .find((provider) => provider.providerNumber === storeSelectedProvider?.providerNumber) || providersUnderOneHundredMiles[0];
+                .find((provider) => provider.providerNumber === storeSelectedProvider?.providerNumber) || null;
 
             if (!foundProviderInHundredMiles && !foundProviderInFullList) {
                 if (storeSelectedProvider?.providerNumber && resultMap.providers?.shopProviders) {
@@ -307,11 +313,12 @@ export default {
             } else if (!foundProviderInHundredMiles && foundProviderInFullList) {
                 serviceLocationData.providers?.shopProviders.push(foundProviderInFullList);
             }
+
             const initialServiceLocationObj = {
                 mobileProviderNumber: isMobileAppointment
                     ? storeSelectedProvider?.providerNumber
                     : null,
-                provider: isMobileAppointment ? null : foundProviderInFullList,
+                provider: isMobileAppointment ? null : foundProviderInFullList || resultMap.providers?.shopProviders[0] || null,
                 zipCode: useMainStore().order.serviceLocation.zipCode || useMainStore().order.customer.address.zipCode,
                 zipCodeCtu: resultMap.zipCodeData?.zipCodeCtu
             };
@@ -556,7 +563,6 @@ export default {
                 daysFromStart: endDateObject.daysFromStart || null
             }))
             .catch(() => {
-                console.warn('Error fetching initial available dates...');
                 return {
                     todayDate: todayDateString,
                     initialViewStartDate,

src/layouts/schedule-page/service-location/service-location.vue

@@ -1,11 +1,5 @@
 <template>
     <div class="service-location">
-        <alert
-            v-if="displayRecalibrationWarning"
-            ref="alertRecalNoMobile"
-            cmsWidgetName="AlertRecalNoMobileWidget"
-            alertClass="alert-warning"
-            @textLinkClicked="openModalAction" />
         <alert
             v-if="displayBigTruckNoShops"
             ref="alertBigTruckNoShops"
@@ -19,6 +13,12 @@
                 <span
                     v-if="!requiresInshopRecalibration">{{ appointmentQuestionText }}</span>
             </div>
+            <alert
+                v-if="displayRecalibrationWarning"
+                ref="alertRecalNoMobile"
+                cmsWidgetName="AlertRecalNoMobileWidget"
+                alertClass="alert-warning"
+                @textLinkClicked="openModalAction" />
             <alert
                 v-if="displayServiceableInshopOnly"
                 ref="alertInshopOnly"
@@ -619,7 +619,7 @@ $page-side-padding: 1.5rem;
         }
     }
     div.alert {
-        margin-top: 0.625rem;
+        margin-top: 1.25rem;
 
         &.widget-name-AlertLowAvailabilityInshopWidget {
             @include media-breakpoint-up(xs) {

src/store/index.js

@@ -1254,7 +1254,7 @@ export const useMainStore = defineStore({
         },
 
         async getCombinedQuote(availableLineItems) {
-            if (!availableLineItems || availableLineItems.length === 0) {
+            if (!availableLineItems || availableLineItems.length === 0 || !this.providerNumber) {
                 return [];
             }