diff --git a/src/layouts/schedule/location-alerts/location-alerts.vue b/src/layouts/schedule/location-alerts/location-alerts.vue index 0f8c7b46d..66f26e263 100644 --- a/src/layouts/schedule/location-alerts/location-alerts.vue +++ b/src/layouts/schedule/location-alerts/location-alerts.vue @@ -36,8 +36,12 @@ export default { }, }, methods: { - loadInitialData(zipCodeCtu) { - return getAlertReasons(zipCodeCtu); + loadInitialData(serviceLocationCtu, providerCtu) { + let ctuToUse = serviceLocationCtu; + if (providerCtu) { + ctuToUse = providerCtu; + } + return getAlertReasons(ctuToUse); }, initializeComponent(initialData) { this.alertReasons = initialData; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 71383487a..8abd2ca5b 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -50,6 +50,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import { Form, defineRule } from "vee-validate"; +import { processIfStatements } from "@/helpers/cms-content-helper"; import datePicker from "@/digital-components/date-picker/date-picker"; import locationAlerts from "@/layouts/schedule/location-alerts/location-alerts"; import timeSlotModalQuestion from "./time-slot-modal-question/time-slot-modal-question"; @@ -146,7 +147,8 @@ export default { }); const alertReasonsPromise = locationAlerts.methods.loadInitialData( - store.getters.order.serviceLocation.zipCodeCtu + store.getters.order.serviceLocation.zipCodeCtu, + store.getters.order.serviceLocation.provider?.address?.zipCtu ); // Settle promises and get results const promiseResultMap = [ @@ -227,6 +229,7 @@ export default { splitCopyOnCMSPlaceHolder, getRouterLinkRouteFromCopy, getRouterLinkDisplayTextFromCopy, + processIfStatements, arePagePrerequisitesValid() { const serviceLocation = store.getters.order.serviceLocation; const serviceLocationPreReqs = diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 252eac529..8f63e5df7 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -138,7 +138,7 @@ export default { data() { return { streetAddress: this.getServiceAddressFromStore(), - apartmentNumberOrBusinessName: "", + apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(), city: this.getServiceCityFromStore(), state: this.getServiceStateFromStore(), zipCode: this.getServiceZipCodeFromStore(), @@ -339,6 +339,9 @@ export default { getServiceAddressFromStore() { return store.getters.order.serviceLocation.address; }, + getServiceAddress2FromStore() { + return store.getters.order.serviceLocation.address2; + }, getServiceCityFromStore() { return store.getters.order.serviceLocation.city; }, @@ -394,6 +397,7 @@ export default { city: this.selectedProvider?.address?.city, state: this.selectedProvider?.address?.state, zip: this.selectedProvider?.address?.zipCode, + zipCtu: this.selectedProvider?.address?.zipCodeCtu, }, }, }, diff --git a/src/store/index.js b/src/store/index.js index 38dd859be..6300c0ecf 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -264,6 +264,8 @@ export const mutations = { serviceLocationInfo.provider?.address?.state; state.order.serviceLocation.provider.address.zip = serviceLocationInfo.provider?.address?.zip; + state.order.serviceLocation.provider.address.zipCtu = + serviceLocationInfo.provider?.address?.zipCtu; } }, updateSchedule(state, scheduleInfo) { @@ -1356,6 +1358,7 @@ export const actions = { city: order.serviceLocation.provider?.address?.city, state: order.serviceLocation.provider?.address?.state, zip: order.serviceLocation.provider?.address?.zip, + zipCtu: order.serviceLocation.provider?.address?.zipCtu, }, }, }, @@ -1811,7 +1814,6 @@ export const actions = { `&${availableLineItemsFormattedForRequest}`; const lineItemServerData = context.getters.order.lineItems.serverData; - if (lineItemServerData) { queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`; }