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

Merge branch 'release/2025.05.22' into feature/Digital/CASH-712

Browse source
This commit is contained in:
hiteshkumar87 2025-05-19 22:04:42 +05:30 committed by GitHub
commit fb5818ba75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -192,7 +192,12 @@ export default {
vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push( vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
damageLocationsSelected.SINGLE damageLocationsSelected.SINGLE
); );
return vm.forwardButtonAction(); if (
store.getters.externalParameterState.isExternalParameter &&
store.getters.externalParameterDamage.damageType !== "other"
) {
return vm.forwardButtonAction();
}
} }
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }

18
src/store/index.js
View file

@ -3621,25 +3621,25 @@ export function mapTaxedLineItemsToStoreFormat(availableLineItems, storeLineItem
export function getArrayOfAllLineItemsAndChildParts(lineItems) { export function getArrayOfAllLineItemsAndChildParts(lineItems) {
let consolidatedLineItemsArray = []; let consolidatedLineItemsArray = [];
if (lineItems.glassParts != null) if (lineItems?.glassParts != null)
consolidatedLineItemsArray = [ consolidatedLineItemsArray = [
...consolidatedLineItemsArray, ...consolidatedLineItemsArray,
...getFlattenedArrayOfLineItemsWithChildParts(lineItems.glassParts), ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.glassParts),
]; ];
if (lineItems.supportingItems != null) if (lineItems?.supportingItems != null)
consolidatedLineItemsArray = [ consolidatedLineItemsArray = [
...consolidatedLineItemsArray, ...consolidatedLineItemsArray,
...getFlattenedArrayOfLineItemsWithChildParts(lineItems.supportingItems), ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.supportingItems),
]; ];
if (lineItems.vaps != null) if (lineItems?.vaps != null)
consolidatedLineItemsArray = [ consolidatedLineItemsArray = [
...consolidatedLineItemsArray, ...consolidatedLineItemsArray,
...getFlattenedArrayOfLineItemsWithChildParts(lineItems.vaps), ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.vaps),
]; ];
if (lineItems.promos != null) if (lineItems?.promos != null)
consolidatedLineItemsArray = [ consolidatedLineItemsArray = [
...consolidatedLineItemsArray, ...consolidatedLineItemsArray,
...getFlattenedArrayOfLineItemsWithChildParts(lineItems.promos), ...getFlattenedArrayOfLineItemsWithChildParts(lineItems.promos),
@ -3789,7 +3789,15 @@ function supportingItemsEqual(supportingItemsA, supportingItemsB) {
// if so, make sure it's not in the past. if in the past, clear schedule info in store. // if so, make sure it's not in the past. if in the past, clear schedule info in store.
// if date not in past, then call schedule service to verify appointment is still available. // if date not in past, then call schedule service to verify appointment is still available.
async function resetScheduleIfUnavailable(context, order, pageNameToLog) { async function resetScheduleIfUnavailable(context, order, pageNameToLog) {
if (!order.schedule?.date) { // lineItems empty can happen when a customer goes all the way through scheduling as cash but then
// switches to insurance AND also switches vehicles during policy lookup. If you call shop-time-slots
// without parts, you get 500 errors so skip the call.
const lineItems = getArrayOfAllLineItemsAndChildParts(order.lineItems);
if (!order.schedule?.date || lineItems.length === 0) {
console.log(new Date() + " no schedule date or lineItems. skip resetSchedule logic.");
console.log(new Date() + " schedule.schedule.date" + JSON.stringify(order.schedule));
console.log(new Date() + " lineItems" + JSON.stringify(order.lineItems));
return; return;
} }