From 88d34ee9e7752ab639ecbc20d3673581719c68e6 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 14 May 2024 09:37:47 -0400 Subject: [PATCH 1/2] CSR-1600 CSR-1600 hide mobile fee related data when it does not apply --- .../appointment-type-question.vue | 13 ++++++++++++- .../mobile-location-modal-questions.vue | 3 ++- src/layouts/service-location/service-location.vue | 11 +++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index ca452ac01..cedd9f609 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -32,6 +32,7 @@ export default { cmsWidgetName: String, isServiceableMobile: Boolean, isServiceableInshop: Boolean, + mobileFeeApplies: Boolean, }, computed: { questionText() { @@ -45,7 +46,8 @@ export default { const shouldShowInshop = this.isServiceableInshop; const shouldShowDropoff = this.isServiceableInshop && !this.$store.getters.damage.isRepair; - return this.answersFromCms + + var answers = this.answersFromCms ? this.answersFromCms.filter((answer) => { return ( (answer.Name == AppointmentTypeStrings.IN_SHOP && shouldShowInshop) || @@ -54,6 +56,15 @@ export default { ); }) : []; + + if (!this.mobileFeeApplies) { + answers.forEach((item) => { + if (item.Name.toLowerCase() === "mobile"){ + item.SubText = item.SubText.replace("*",""); + } + }) + } + return answers; }, selectedValue: { get: function () { diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue index debc25f89..80c79bb8c 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue @@ -24,7 +24,7 @@ {{ errorMessage }} - @@ -153,6 +153,7 @@ export default { alertInvalidZipWidgetName: String, customComponentId: String, validationRules: String, + mobileFeeApplies: Boolean, }, computed: { mobileLocationLinkPromptText() { diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 8b76a5e78..6d366d4e3 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -67,6 +67,7 @@ :isServiceableMobile="isServiceableMobile" :isServiceableInshop="isServiceableInshop" :isDisplayed="isAppointmentTypeDisplayed" + :mobileFeeApplies="mobileFeeApplies" ref="appointmentTypeQuestion" groupName="appointmentTypeQuestion" cmsWidgetName="AppointmentTypeQuestionWidget" @@ -80,6 +81,7 @@ v-if="selectedAppointmentType === 'Mobile'" v-model="mobileLocationQuestions" :mobileFeePart="mobileFeePart" + :mobileFeeApplies="mobileFeeApplies" @updated-mobile-fee-part="setMobileFeePart" @updated-serviceability="setServiceabilityDetails" @updated-contains-military-base="setContainsMilitaryBase" @@ -300,6 +302,15 @@ export default { return this.isGlassServiceableMobile; } }, + mobileFeeApplies() { + if (this.mobileFeePart) { + return true; + } + else + { + return false; + } + }, isServiceableInshop() { if (this.isRecalibrationServiceableInshop !== null) { return this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop; From 195a0ddb0f6355156c11d939e1facff693905051 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 14 May 2024 09:58:05 -0400 Subject: [PATCH 2/2] CSR-1600 prettier --- .../appointment-type-question/appointment-type-question.vue | 6 +++--- .../mobile-location-modal-questions.vue | 3 ++- src/layouts/service-location/service-location.vue | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index cedd9f609..64bf159ff 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -59,10 +59,10 @@ export default { if (!this.mobileFeeApplies) { answers.forEach((item) => { - if (item.Name.toLowerCase() === "mobile"){ - item.SubText = item.SubText.replace("*",""); + if (item.Name.toLowerCase() === "mobile") { + item.SubText = item.SubText.replace("*", ""); } - }) + }); } return answers; }, diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue index 80c79bb8c..4558c3294 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue @@ -24,7 +24,8 @@ {{ errorMessage }} - diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 6d366d4e3..b83db7ebc 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -305,9 +305,7 @@ export default { mobileFeeApplies() { if (this.mobileFeePart) { return true; - } - else - { + } else { return false; } },