From acfa099d641b4393f7c29429ee770f904ca5e82e Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 30 Apr 2024 09:50:00 -0400 Subject: [PATCH] CSR-1742: improve naming and update how pending status displays pricing --- src/fmg-components/cart/cart.vue | 35 +++++++++---------- src/layouts/confirmation/confirmation.vue | 4 +-- src/layouts/payment-method/payment-method.vue | 4 +-- src/layouts/payment/payment.vue | 4 +-- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index f969f04e8..a5df47da1 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -11,7 +11,7 @@ class="col d-flex justify-content-between py-0"> {{ amountDueText }} {{ - isCoverageTypeToDisplayPending + showCoverageAsPending ? verifyingCoverageText : getFormattedAmount("", amountDue) }} @@ -24,7 +24,7 @@ {{ - isCoverageTypeToDisplayPending + showCoverageAsPending ? verifyingCoverageText : getFormattedAmount("", deductibleLineItem.subTotal) }} @@ -97,8 +97,8 @@ {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }} @@ -108,7 +108,7 @@
{{ subtotalText }} {{ - isCoverageTypeToDisplayPending + showCoverageAsPending ? verifyingCoverageText : getFormattedAmount("", subTotal) }} @@ -124,17 +124,14 @@
{{ amountDueText }} {{ - isCoverageTypeToDisplayPending + showCoverageAsPending ? verifyingCoverageText : getFormattedAmount("", amountDue) }}
{{ insuranceCompanyName }}
@@ -195,7 +192,7 @@ export default { showAsPaid: Boolean, insuranceDeductible: Number, insuranceCompanyName: String, - insuranceCoverageTypeToDisplay: String, + showInsuranceCoverageAs: String, }, data() { return { @@ -298,11 +295,11 @@ export default { this.$emit("update:modelValue", newValue); }, }, - isCoverageTypeToDisplayPending() { - return this.insuranceCoverageTypeToDisplay === coverageStatus.PENDING; + showCoverageAsPending() { + return this.showInsuranceCoverageAs === coverageStatus.PENDING; }, - isCoverageTypeToDisplayVerified() { - return this.insuranceCoverageTypeToDisplay === coverageStatus.VERIFIED; + showCoverageAsVerified() { + return this.showInsuranceCoverageAs === coverageStatus.VERIFIED; }, currentDeductible() { const deductible = this.insuranceDeductible; @@ -422,7 +419,7 @@ export default { packagePrice() { let packagePrice = 0; - if (!this.isCoverageTypeToDisplayVerified) { + if (!this.showCoverageAsVerified && !this.showCoverageAsPending) { packagePrice = baseMixin.methods.getTierOnePackagePrice( baseMixin.methods.filterOutFees(this.availableLineItems) ); @@ -474,7 +471,7 @@ export default { deductibleLineItem() { let lineItem = null; - if (this.isCoverageTypeToDisplayVerified || this.isCoverageTypeToDisplayPending) { + if (this.showCoverageAsVerified || this.showCoverageAsPending) { lineItem = { name: this.deductibleLineItemName, subTotal: this.currentDeductible, @@ -907,7 +904,7 @@ export default { subTotal() { let subTotal = 0; - if (this.isCoverageTypeToDisplayVerified) { + if (this.showCoverageAsVerified || this.showCoverageAsPending) { // only include items NOT covered by insurance this.cartItems.forEach((cartItem) => { if (!cartItem.isCoveredByInsurance) { @@ -927,7 +924,7 @@ export default { salesTax() { let salesTax = 0; - if (this.isCoverageTypeToDisplayVerified) { + if (this.showCoverageAsVerified || this.showCoverageAsPending) { // only include items NOT covered by insurance this.cartItems.forEach((cartItem) => { if (!cartItem.isCoveredByInsurance) { diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index e1bc5bb34..1947bec22 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -56,7 +56,7 @@ servicePackageOptionsCmsName="ServicePackageTitle" :insuranceDeductible="currentDeductible" :insuranceCompanyName="insuranceCompanyName" - :insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> + :showInsuranceCoverageAs="showInsuranceCoverageAs" />
@@ -295,7 +295,7 @@ export default { } return false; }, - insuranceCoverageTypeToDisplay() { + showInsuranceCoverageAs() { if (!this.isInsurance) return null; if (this.isNoComp) { return coverageStatus.NOCOMP; diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index c4e98e114..07414ae7d 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -31,7 +31,7 @@ recyclingModalCmsWidgetName="RecycleModal" :insuranceDeductible="currentDeductible" :insuranceCompanyName="insuranceCompanyName" - :insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> + :showInsuranceCoverageAs="showInsuranceCoverageAs" />
@@ -526,7 +526,7 @@ export default { } return false; }, - insuranceCoverageTypeToDisplay() { + showInsuranceCoverageAs() { if (!this.isInsurance) return null; if (this.isNoComp) { return coverageStatus.NOCOMP; diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index af61fe6dd..90378efea 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -56,7 +56,7 @@ recyclingModalCmsWidgetName="RecycleModal" :insuranceDeductible="currentDeductible" :insuranceCompanyName="insuranceCompanyName" - :insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> + :showInsuranceCoverageAs="showInsuranceCoverageAs" />
@@ -440,7 +440,7 @@ export default { } return false; }, - insuranceCoverageTypeToDisplay() { + showInsuranceCoverageAs() { if (!this.isInsurance) return null; if (this.isNoComp) { return coverageStatus.NOCOMP;