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

Merge pull request #2507 from Safelite/feature/CASH-532v2

Browse source 
CASH-532
This commit is contained in:
Johnny Shultz 2025-05-13 17:01:30 -04:00 committed by GitHub
commit d848c8cf32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/layouts/vehicle-damage/vehicle-damage.spec.js
View file

@ -645,6 +645,9 @@ describe("vehicle-damage.vue", () => {
isRepair: null, isRepair: null,
numberOfChips: null, numberOfChips: null,
}, },
externalParameterState: {
isExternalParameter: false,
},
}; };
var windshieldSelections = wrapper.vm.getWindshieldOptionsFromStore(); var windshieldSelections = wrapper.vm.getWindshieldOptionsFromStore();

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

@ -149,6 +149,13 @@ export default {
if (store.getters.externalParameterState?.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
await nextTick(); await nextTick();
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (
store.getters.vehicle?.vehicleSubType === "MOTOR HOME" &&
store.getters.externalParameterDamage.damageType?.toUpperCase() ===
"WINDSHIELDREPLACE"
) {
return baseMixin.methods.ResetExternalParamsAndHideModal();
}
if (isValid) { if (isValid) {
vm.forwardButtonAction(); vm.forwardButtonAction();
} else { } else {
@ -177,6 +184,26 @@ export default {
false false
); );
} }
const selectedGlassToReplace =
resultMap.damageOptions.windshieldOptions.availableReplacementOptions;
if (selectedGlassToReplace == damageLocationsSelected.SINGLE) {
vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
damageLocationsSelected.SINGLE
);
return vm.forwardButtonAction();
} else if (
selectedGlassToReplace ==
`${damageLocationsSelected.DRIVER},${damageLocationsSelected.PASSENGER}`
) {
vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
damageLocationsSelected.DRIVER
);
vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
damageLocationsSelected.PASSENGER
);
}
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
} else { } else {
@ -320,9 +347,11 @@ export default {
) { ) {
windShieldOptions.selectedWindshieldDamageType = windShieldOptions.selectedWindshieldDamageType =
damageLocationsSelected.REPLACE; damageLocationsSelected.REPLACE;
windShieldOptions.selectedWindshieldReplaceOptions.push( if (!store.getters.externalParameterState.isExternalParameter) {
damageLocationsSelected.SINGLE windShieldOptions.selectedWindshieldReplaceOptions.push(
); damageLocationsSelected.SINGLE
);
}
} }
if ( if (

3
src/layouts/vehicle/vehicle.vue
View file

@ -532,6 +532,9 @@ export default {
if (!closestShops || closestShops.data?.providers?.length === 0) { if (!closestShops || closestShops.data?.providers?.length === 0) {
this.displayNoServiceAlert = true; this.displayNoServiceAlert = true;
if (store.getters.externalParameterState?.isExternalParameter) {
return baseMixin.methods.ResetExternalParamsAndHideModal();
}
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
} }
} }