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

Merge branch 'develop' into feature/CSR-1144

Browse source
This commit is contained in:
CarlNation 2023-06-07 14:32:41 -04:00
commit 8b953b9ebc
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/layouts/schedule/location-alerts/location-alerts.vue
View file

@ -36,8 +36,12 @@ export default {
}, },
}, },
methods: { methods: {
loadInitialData(zipCodeCtu) { loadInitialData(serviceLocationCtu, providerCtu) {
return getAlertReasons(zipCodeCtu); let ctuToUse = serviceLocationCtu;
if (providerCtu) {
ctuToUse = providerCtu;
}
return getAlertReasons(ctuToUse);
}, },
initializeComponent(initialData) { initializeComponent(initialData) {
this.alertReasons = initialData; this.alertReasons = initialData;

5
src/layouts/schedule/schedule.vue
View file

@ -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 funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
import { Form, defineRule } from "vee-validate"; import { Form, defineRule } from "vee-validate";
import { processIfStatements } from "@/helpers/cms-content-helper";
import datePicker from "@/digital-components/date-picker/date-picker"; import datePicker from "@/digital-components/date-picker/date-picker";
import locationAlerts from "@/layouts/schedule/location-alerts/location-alerts"; import locationAlerts from "@/layouts/schedule/location-alerts/location-alerts";
import timeSlotModalQuestion from "./time-slot-modal-question/time-slot-modal-question"; import timeSlotModalQuestion from "./time-slot-modal-question/time-slot-modal-question";
@ -146,7 +147,8 @@ export default {
}); });
const alertReasonsPromise = locationAlerts.methods.loadInitialData( 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 // Settle promises and get results
const promiseResultMap = [ const promiseResultMap = [
@ -227,6 +229,7 @@ export default {
splitCopyOnCMSPlaceHolder, splitCopyOnCMSPlaceHolder,
getRouterLinkRouteFromCopy, getRouterLinkRouteFromCopy,
getRouterLinkDisplayTextFromCopy, getRouterLinkDisplayTextFromCopy,
processIfStatements,
arePagePrerequisitesValid() { arePagePrerequisitesValid() {
const serviceLocation = store.getters.order.serviceLocation; const serviceLocation = store.getters.order.serviceLocation;
const serviceLocationPreReqs = const serviceLocationPreReqs =

6
src/layouts/service-location/service-location.vue
View file

@ -138,7 +138,7 @@ export default {
data() { data() {
return { return {
streetAddress: this.getServiceAddressFromStore(), streetAddress: this.getServiceAddressFromStore(),
apartmentNumberOrBusinessName: "", apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
city: this.getServiceCityFromStore(), city: this.getServiceCityFromStore(),
state: this.getServiceStateFromStore(), state: this.getServiceStateFromStore(),
zipCode: this.getServiceZipCodeFromStore(), zipCode: this.getServiceZipCodeFromStore(),
@ -339,6 +339,9 @@ export default {
getServiceAddressFromStore() { getServiceAddressFromStore() {
return store.getters.order.serviceLocation.address; return store.getters.order.serviceLocation.address;
}, },
getServiceAddress2FromStore() {
return store.getters.order.serviceLocation.address2;
},
getServiceCityFromStore() { getServiceCityFromStore() {
return store.getters.order.serviceLocation.city; return store.getters.order.serviceLocation.city;
}, },
@ -394,6 +397,7 @@ export default {
city: this.selectedProvider?.address?.city, city: this.selectedProvider?.address?.city,
state: this.selectedProvider?.address?.state, state: this.selectedProvider?.address?.state,
zip: this.selectedProvider?.address?.zipCode, zip: this.selectedProvider?.address?.zipCode,
zipCtu: this.selectedProvider?.address?.zipCodeCtu,
}, },
}, },
}, },

4
src/store/index.js
View file

@ -264,6 +264,8 @@ export const mutations = {
serviceLocationInfo.provider?.address?.state; serviceLocationInfo.provider?.address?.state;
state.order.serviceLocation.provider.address.zip = state.order.serviceLocation.provider.address.zip =
serviceLocationInfo.provider?.address?.zip; serviceLocationInfo.provider?.address?.zip;
state.order.serviceLocation.provider.address.zipCtu =
serviceLocationInfo.provider?.address?.zipCtu;
} }
}, },
updateSchedule(state, scheduleInfo) { updateSchedule(state, scheduleInfo) {
@ -1356,6 +1358,7 @@ export const actions = {
city: order.serviceLocation.provider?.address?.city, city: order.serviceLocation.provider?.address?.city,
state: order.serviceLocation.provider?.address?.state, state: order.serviceLocation.provider?.address?.state,
zip: order.serviceLocation.provider?.address?.zip, zip: order.serviceLocation.provider?.address?.zip,
zipCtu: order.serviceLocation.provider?.address?.zipCtu,
}, },
}, },
}, },
@ -1811,7 +1814,6 @@ export const actions = {
`&${availableLineItemsFormattedForRequest}`; `&${availableLineItemsFormattedForRequest}`;
const lineItemServerData = context.getters.order.lineItems.serverData; const lineItemServerData = context.getters.order.lineItems.serverData;
if (lineItemServerData) { if (lineItemServerData) {
queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`; queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`;
} }