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

Merge branch 'release/2025.02.13' into feature/CASH-176

Browse source
This commit is contained in:
CarlNation 2025-02-05 09:06:03 -05:00
commit a30f1151b1
1 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/store/index.js
View file

@ -678,34 +678,38 @@ export const mutations = {
sessionInformation.order.payment.billToAccountNumber; sessionInformation.order.payment.billToAccountNumber;
state.order.payment.inactivePromos = sessionInformation.order.payment.inactivePromos; state.order.payment.inactivePromos = sessionInformation.order.payment.inactivePromos;
state.order.serviceLocation.address = //Do not assign default service type once user make service type selection
sessionInformation.order.serviceLocation.streetAddress; if (state.order.serviceLocation.appointmentType == null) {
state.order.serviceLocation.address2 = state.order.serviceLocation.address =
sessionInformation.order.serviceLocation.streetAddress2; sessionInformation.order.serviceLocation.streetAddress;
state.order.serviceLocation.city = sessionInformation.order.serviceLocation.city; state.order.serviceLocation.address2 =
state.order.serviceLocation.state = sessionInformation.order.serviceLocation.state; sessionInformation.order.serviceLocation.streetAddress2;
state.order.serviceLocation.zipCode = sessionInformation.order.serviceLocation.zipCode; state.order.serviceLocation.city = sessionInformation.order.serviceLocation.city;
state.order.serviceLocation.zipCodeCtu = state.order.serviceLocation.state = sessionInformation.order.serviceLocation.state;
sessionInformation.order.serviceLocation.zipCodeCtu; state.order.serviceLocation.zipCode = sessionInformation.order.serviceLocation.zipCode;
state.order.serviceLocation.zipCodeCtu =
sessionInformation.order.serviceLocation.zipCodeCtu;
state.order.serviceLocation.appointmentType = state.order.serviceLocation.appointmentType =
sessionInformation.order.serviceLocation.appointmentType; sessionInformation.order.serviceLocation.appointmentType;
state.order.serviceLocation.isVehicleProtected = state.order.serviceLocation.isVehicleProtected =
sessionInformation.order.serviceLocation.isVehicleProtected; sessionInformation.order.serviceLocation.isVehicleProtected;
state.order.serviceLocation.provider.providerNumber = state.order.serviceLocation.provider.providerNumber =
sessionInformation.order.serviceLocation.provider?.providerNumber; sessionInformation.order.serviceLocation.provider?.providerNumber;
state.order.serviceLocation.provider.address.streetAddress = state.order.serviceLocation.provider.address.streetAddress =
sessionInformation.order.serviceLocation.provider?.address?.streetAddress; sessionInformation.order.serviceLocation.provider?.address?.streetAddress;
state.order.serviceLocation.provider.address.city = state.order.serviceLocation.provider.address.city =
sessionInformation.order.serviceLocation.provider?.address?.city; sessionInformation.order.serviceLocation.provider?.address?.city;
state.order.serviceLocation.provider.address.state = state.order.serviceLocation.provider.address.state =
sessionInformation.order.serviceLocation.provider?.address?.state; sessionInformation.order.serviceLocation.provider?.address?.state;
state.order.serviceLocation.provider.address.zipCode = state.order.serviceLocation.provider.address.zipCode =
sessionInformation.order.serviceLocation.provider?.address?.zipCode; sessionInformation.order.serviceLocation.provider?.address?.zipCode;
state.order.serviceLocation.provider.address.zipCodeCtu = state.order.serviceLocation.provider.address.zipCodeCtu =
sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu; sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu;
state.order.serviceLocation.techNotes = sessionInformation.order.serviceLocation.techNotes; state.order.serviceLocation.techNotes =
sessionInformation.order.serviceLocation.techNotes;
}
// if we're loading a session and we do not have a provider number yet, then set isInsurance to null so that // if we're loading a session and we do not have a provider number yet, then set isInsurance to null so that
// a service package is not selected by default on the quote page. // a service package is not selected by default on the quote page.
@ -749,14 +753,15 @@ export const mutations = {
state.applicationUser.savedSessionId = state.applicationUser.savedSessionId =
sessionInformation.applicationUser.savedSessionId; sessionInformation.applicationUser.savedSessionId;
} }
//Do not assign default schedule details once user make schedule selection
state.order.schedule.date = sessionInformation.order.schedule?.date; if (state.order.schedule.date == null) {
state.order.schedule.startTime = sessionInformation.order.schedule?.startTime; state.order.schedule.date = sessionInformation.order.schedule?.date;
state.order.schedule.endTime = sessionInformation.order.schedule?.endTime; state.order.schedule.startTime = sessionInformation.order.schedule?.startTime;
state.order.schedule.routeCode = sessionInformation.order.schedule?.routeCode; state.order.schedule.endTime = sessionInformation.order.schedule?.endTime;
state.order.schedule.jobMaxMinutes = sessionInformation.order.schedule?.jobMaxMinutes; state.order.schedule.routeCode = sessionInformation.order.schedule?.routeCode;
state.order.schedule.jobMinMinutes = sessionInformation.order.schedule?.jobMinMinutes; state.order.schedule.jobMaxMinutes = sessionInformation.order.schedule?.jobMaxMinutes;
state.order.schedule.jobMinMinutes = sessionInformation.order.schedule?.jobMinMinutes;
}
state.order.policy.currentDeductible = sessionInformation.order.policy?.currentDeductible; state.order.policy.currentDeductible = sessionInformation.order.policy?.currentDeductible;
state.order.policy.originalDeductible = sessionInformation.order.policy?.originalDeductible; state.order.policy.originalDeductible = sessionInformation.order.policy?.originalDeductible;
state.order.policy.additionalAuthFlag = sessionInformation.order.policy?.additionalAuthFlag; state.order.policy.additionalAuthFlag = sessionInformation.order.policy?.additionalAuthFlag;
@ -2274,7 +2279,7 @@ export const actions = {
response.data response.data
); );
await resetScheduleIfUnavailable(context, response.data.order, pageNameToLog); await resetScheduleIfUnavailable(context, context.state.order, pageNameToLog);
return response; return response;
}, },
(error) => { (error) => {