From 0186e25db469275c6d5bdd94feaa656880467012 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Wed, 15 Mar 2023 13:06:32 -0400 Subject: [PATCH 1/2] Just a few more tech review tweaks --- .../mobile-location-modal-questions.vue | 4 +--- src/layouts/service-location/service-location.vue | 14 +++----------- .../service-zip-modal-question.vue | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) 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 b4da4ddfa..31eb359b2 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 @@ -89,8 +89,6 @@ export default { type: Object, default: () => ({}), }, - isZipServiceableMobile: Boolean, - isZipServiceableInShop: Boolean, linkWidgetName: String, modalWidgetName: String, alertNonServiceableZipWidgetName: String, @@ -184,7 +182,7 @@ export default { const mobileFeePart = await getPricedMobileFeePart(serviceZipCode); // emit it to parent - this.$emit("set-mobile-fee-part", mobileFeePart); + this.$emit("updated-mobile-fee-part", mobileFeePart); // Update the page level model this.$emit("update:modelValue", this.internalModel); diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index e458b112b..58f440708 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -8,7 +8,7 @@ v-model="serviceZipCodeQuestion" ref="serviceZipCodeQuestion" :mobileFeePart="mobileFeePart" - @set-mobile-fee-part="setMobileFeePart" + @updated-mobile-fee-part="setMobileFeePart" linkWidgetName="ServiceZipLinkWidget" modalWidgetName="ServiceZipModalWidget" /> @@ -72,16 +72,8 @@ export default { // Call APIs const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); const serviceZipCode = store.getters.order.serviceLocation.zipCode; - const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace"; - const parentAccountNumber = store.getters.payment.parentAccountNumber; - const billToAccountNumber = 1; - const mobileFeePartPromise = getPricedMobileFeePart( - serviceZipCode, - serviceType, - parentAccountNumber, - billToAccountNumber - ); + const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode); // Settle promises and get results const promiseResultMap = [ diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue index 2c1e0e588..6594061cd 100644 --- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue +++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue @@ -156,7 +156,7 @@ export default { const mobileFeePart = await getPricedMobileFeePart(serviceZipCode); // emit it to parent - this.$emit("set-mobile-fee-part", mobileFeePart); + this.$emit("updated-mobile-fee-part", mobileFeePart); // Update the page level model this.$emit("update:modelValue", this.internalModel); From b1713d9a36323d262a883101865c992b67d57769 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Wed, 15 Mar 2023 13:25:08 -0400 Subject: [PATCH 2/2] Quick change to logic for displaying the Mobile Location address --- .../mobile-location-modal-questions.vue | 5 +++-- .../service-zip-modal-question.vue | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 31eb359b2..586e1c6de 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 @@ -64,7 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi export default { name: "mobile-location-modal-questions", - emits: ["update:modelValue", "set-mobile-fee-part"], + emits: ["update:modelValue", "updated-mobile-fee-part"], data() { return { internalModel: deepClone(this.modelValue), @@ -107,7 +107,8 @@ export default { this.addressModel.state && this.addressModel.state !== "" && this.addressModel.zipCode && - this.addressModel.zipCode !== "" + this.addressModel.zipCode !== "" && + this.internalModel.isVehicleProtected !== null ) { return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`; } diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue index 6594061cd..0d2c35000 100644 --- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue +++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue @@ -43,7 +43,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi export default { name: "service-zip-modal-question", - emits: ["update:modelValue", "set-mobile-fee-part"], + emits: ["update:modelValue", "updated-mobile-fee-part"], data() { return { internalModel: this.copyModel(this.modelValue),