Merge branch 'develop' into feature/CSR-1392

This commit is contained in:
CarlNation 2023-10-24 11:09:42 -04:00
commit 0e08c99ad8
2 changed files with 10 additions and 6 deletions

View file

@ -265,7 +265,7 @@ export default {
} }
this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false); this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
this.dispatchStoreAction(this.storeActions.SAVE_PROMOS, this.newValidatedPromos, false); this.dispatchStoreAction(this.storeActions.SAVE_PROMOS, this.allActivePromos, false);
const payment = this.$store.getters.payment; const payment = this.$store.getters.payment;
if (payment.isInsurance) { if (payment.isInsurance) {

View file

@ -499,10 +499,12 @@ export const mutations = {
state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts; state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts;
state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems; state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps; state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps;
state.order.lineItems.promos = sessionInformation.order.lineItems.promos;
state.order.lineItems.serverData = sessionInformation.order.lineItems.serverData; state.order.lineItems.serverData = sessionInformation.order.lineItems.serverData;
state.order.payment.parentAccountNumber = state.order.payment.parentAccountNumber =
sessionInformation.order.payment.parentAccountNumber; sessionInformation.order.payment.parentAccountNumber;
state.order.payment.inactivePromos = sessionInformation.order.payment.inactivePromos;
state.order.serviceLocation.address = state.order.serviceLocation.address =
sessionInformation.order.serviceLocation.streetAddress; sessionInformation.order.serviceLocation.streetAddress;
@ -2241,6 +2243,7 @@ export const actions = {
addGuidToLineItemsIfNotAlreadyThere(addableVaps); addGuidToLineItemsIfNotAlreadyThere(addableVaps);
const requestObject = { const requestObject = {
promoCode: promoCode, promoCode: promoCode,
addableVaps: addableVaps,
order: { order: {
appointmentType: order.serviceLocation.appointmentType, appointmentType: order.serviceLocation.appointmentType,
carId: order.vehicle.carId, carId: order.vehicle.carId,
@ -2249,7 +2252,6 @@ export const actions = {
isRepair: order.damage.isRepair, isRepair: order.damage.isRepair,
glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace), glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
lineItemsOnOrder: getArrayOfAllLineItems(order.lineItems), lineItemsOnOrder: getArrayOfAllLineItems(order.lineItems),
addableVaps: addableVaps,
parentAccountNumber: order.payment.parentAccountNumber, parentAccountNumber: order.payment.parentAccountNumber,
referralSequenceNumber: order.referralSequenceNumber, referralSequenceNumber: order.referralSequenceNumber,
serviceState: order.serviceLocation.state, serviceState: order.serviceLocation.state,
@ -2270,10 +2272,12 @@ export const actions = {
pageNameToLog: pageNameToLog, pageNameToLog: pageNameToLog,
}); });
if (validateResponse?.data?.serverData) {
context.commit( context.commit(
storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA,
validateResponse.data.lineItemsServerData validateResponse.data.serverData
); );
}
return validateResponse; return validateResponse;
}, },