diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index ede86dff5..493c5ef17 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -459,23 +459,31 @@ export default { }, // Can't use `this` because navigateForward is also called from quote navigateBack(vm) { - const self = vm ?? this; - const partsOrQuestions = ( - self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ?? - self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ?? - self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? - self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) - )?.partsOrQuestions; - const hasPartQuestions = this.hasPartQuestions(partsOrQuestions); - const hasGlassLocationWithMultipleParts = - this.hasGlassLocationWithMultipleParts(partsOrQuestions); - const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions); - const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions); - let backNavigationScenario = self.$store.getters.vehicle.vin - ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS - : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS; + const self = vm ?? this; const currentPage = self.$route.query.fmgPage; + + const pageDataCapabilityQuestions = self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS); + const pageDataMoldingQuestions = self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS); + const pageDataVehicleParts = self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS); + const pageDataPartQuestions = self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS); + + const currentPartsOrQuestions = ( + (currentPage !== fmgPageValues.CAPABILITY_QUESTIONS ? pageDataCapabilityQuestions : null) ?? + (currentPage !== fmgPageValues.MOLDING_QUESTIONS ? pageDataMoldingQuestions : null) ?? + (currentPage !== fmgPageValues.VEHICLE_PARTS ? pageDataVehicleParts : null) ?? + (currentPage !== fmgPageValues.PARTS_QUESTIONS ? pageDataPartQuestions : null) + )?.partsOrQuestions; + + const hasPartQuestions = this.hasPartQuestions(currentPartsOrQuestions); + const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(currentPartsOrQuestions); + const hasChildPartQuestions = this.hasChildPartQuestions(currentPartsOrQuestions); + const hasCapabilityQuestions = this.hasCapabilityQuestions(currentPartsOrQuestions); + + let backNavigationScenario = self.$store.getters.vehicle.vin + ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS + : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS; + if ( hasCapabilityQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)