From 5264ba45cdc72150d98341d818b388d50b55aa5d Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 13 May 2025 14:12:04 -0400 Subject: [PATCH 1/4] CASH-532 CASH-532 leadgen stopped loader spinning on vehicle, handled edge case for split windshield on vehicle damage, sent motor homes to error on vehicle damage --- src/layouts/vehicle-damage/vehicle-damage.vue | 32 +++++++++++++++++-- src/layouts/vehicle/vehicle.vue | 3 ++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 1106f7324..7a41b2d5b 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -148,6 +148,10 @@ export default { if (store.getters.externalParameterState?.isExternalParameter) { await nextTick(); 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) { vm.forwardButtonAction(); } else { @@ -176,6 +180,26 @@ export default { 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(); } } else { @@ -322,9 +346,11 @@ export default { ) { windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE; - windShieldOptions.selectedWindshieldReplaceOptions.push( - damageLocationsSelected.SINGLE - ); + if (!store.getters.externalParameterState.isExternalParameter) { + windShieldOptions.selectedWindshieldReplaceOptions.push( + damageLocationsSelected.SINGLE + ); + } } if ( diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index 131073f90..8a6e13500 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -532,6 +532,9 @@ export default { if (!closestShops || closestShops.data?.providers?.length === 0) { this.displayNoServiceAlert = true; + if (store.getters.externalParameterState?.isExternalParameter) { + return baseMixin.methods.ResetExternalParamsAndHideModal(); + } return this.$refs.navbar.removeLoader(); } } From 0034c12a7562201326584a0c914111ad8e38a0ec Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 13 May 2025 14:20:52 -0400 Subject: [PATCH 2/4] CASH-532 CASH-532 formatting --- src/layouts/vehicle-damage/vehicle-damage.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 7a41b2d5b..920063853 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -148,9 +148,12 @@ export default { if (store.getters.externalParameterState?.isExternalParameter) { await nextTick(); 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 ( + store.getters.vehicle?.vehicleSubType === "MOTOR HOME" && + store.getters.externalParameterDamage.damageType?.toUpperCase() === + "WINDSHIELDREPLACE" + ) { + return baseMixin.methods.ResetExternalParamsAndHideModal(); } if (isValid) { vm.forwardButtonAction(); From 887999ce8625c415a876ec6c10219ceae1298e29 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 13 May 2025 16:44:19 -0400 Subject: [PATCH 3/4] CASH-532 CASH-532 fixed unit tests --- src/layouts/vehicle-damage/vehicle-damage.spec.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index f6202337c..3194c73fd 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -646,6 +646,9 @@ describe("vehicle-damage.vue", () => { isRepair: null, numberOfChips: null, }, + externalParameterState: { + isExternalParameter: false, + } }; var windshieldSelections = wrapper.vm.getWindshieldOptionsFromStore(); From fbeafdacb4386ed85fbd9fad5a51ee13a42121d0 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Tue, 13 May 2025 16:49:30 -0400 Subject: [PATCH 4/4] CASH-532 CASH-532 more formatting --- src/layouts/vehicle-damage/vehicle-damage.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index 3194c73fd..7ea899fda 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -648,7 +648,7 @@ describe("vehicle-damage.vue", () => { }, externalParameterState: { isExternalParameter: false, - } + }, }; var windshieldSelections = wrapper.vm.getWindshieldOptionsFromStore();