diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js index 12fc8589..2c074a3a 100644 --- a/src/helpers/service-location-helper.js +++ b/src/helpers/service-location-helper.js @@ -73,7 +73,7 @@ export async function getZipCodeData(zipCode) { return await processZipCodeResults(useMainStore().validateZip({ zip: zipCode })); } -export function isServicableMobileWithData(isGlassServiceableMobile, isRecalibrationServiceableMobile) { +export function isServiceableMobileWithData(isGlassServiceableMobile, isRecalibrationServiceableMobile) { const isBigTruck = useMainStore().order.serviceLocation.isBigTruck; if (isBigTruck) { return false; diff --git a/src/layouts/schedule-page/schedule-page.vue b/src/layouts/schedule-page/schedule-page.vue index 8fb784ed..2e65643b 100644 --- a/src/layouts/schedule-page/schedule-page.vue +++ b/src/layouts/schedule-page/schedule-page.vue @@ -99,7 +99,7 @@ import { getPricedMobileFeePart, getMobileZipCodeData, getZipCodeData, - isServicableMobileWithData, + isServiceableMobileWithData, mapTimeSlot } from '@/helpers/service-location-helper'; import { Form } from 'vee-validate'; @@ -500,11 +500,11 @@ export default { const pmMobileDaysLimit = this.getSettingValue(experimentSettings.ISS_MOBILE_FIRST_MAX_PM_MOBILE_DAYS); const mobileDaysLimit = this.getSettingValue(experimentSettings.ISS_MOBILE_FIRST_MAX_MOBILE_DAYS); const hasSelectedDate = !!this.getSelectedDate(); - const isServicableMobile = isServicableMobileWithData( - mobileFirstObject.serviceabilityDetails?.isGlassServiceableMobile, - mobileFirstObject.serviceabilityDetails?.isRecalibrationServiceableMobile + const isServiceableMobile = isServiceableMobileWithData( + mobileFirstObject.serviceabilityDetails?.isGlassServiceableMobile ?? null, + mobileFirstObject.serviceabilityDetails?.isRecalibrationServiceableMobile ?? null ); - if (!hasSelectedDate && isServicableMobile && mobileFirstObject.mobileProviderNumber && mobileFirstObject.zipCode) { + if (!hasSelectedDate && isServiceableMobile && mobileFirstObject.mobileProviderNumber && mobileFirstObject.zipCode) { const todayDateObject = new Date(); const todayDateString = convertDateToDateString(todayDateObject); const calendarViewDirection = 'future'; diff --git a/src/mixins/experiment-mixin.js b/src/mixins/experiment-mixin.js index 6668722b..fab87d88 100644 --- a/src/mixins/experiment-mixin.js +++ b/src/mixins/experiment-mixin.js @@ -13,7 +13,8 @@ export default { return experiment ? experiment : null; }, getExperimentByTestName(testName) { - return useMainStore().applicationUser.experiments.find((experiment) => experiment.testName === testName); + const experiment = useMainStore().applicationUser.experiments.find((experiment) => experiment.testName === testName); + return experiment ? experiment : null; }, getExperimentVariationNameByTestName(testName) { const experimentByTestName = this.getExperimentByTestName(testName);