jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CSR-1742: improve naming and update how pending status displays pricing

Browse source
This commit is contained in:
Adam Caouette 2024-04-30 09:50:00 -04:00
parent fd5acc6946
commit acfa099d64
4 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/fmg-components/cart/cart.vue
View file

@ -11,7 +11,7 @@
class="col d-flex justify-content-between py-0"> class="col d-flex justify-content-between py-0">
<span class="label">{{ amountDueText }}</span> <span class="label">{{ amountDueText }}</span>
<span class="label amount-due">{{ <span class="label amount-due">{{
isCoverageTypeToDisplayPending showCoverageAsPending
? verifyingCoverageText ? verifyingCoverageText
: getFormattedAmount("", amountDue) : getFormattedAmount("", amountDue)
}}</span> }}</span>
@ -24,7 +24,7 @@
<textBlock cmsWidgetName="DeductibleTextWidget" /> <textBlock cmsWidgetName="DeductibleTextWidget" />
<span> <span>
{{ {{
isCoverageTypeToDisplayPending showCoverageAsPending
? verifyingCoverageText ? verifyingCoverageText
: getFormattedAmount("", deductibleLineItem.subTotal) : getFormattedAmount("", deductibleLineItem.subTotal)
}} }}
@ -97,8 +97,8 @@
</span> </span>
<span <span
v-if=" v-if="
!isCoverageTypeToDisplayVerified || !showCoverageAsVerified ||
(isCoverageTypeToDisplayVerified && !cartItem.isCoveredByInsurance) (showCoverageAsVerified && !cartItem.isCoveredByInsurance)
" "
>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span >{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span
> >
@ -108,7 +108,7 @@
<div class="sub-total"> <div class="sub-total">
<span>{{ subtotalText }}</span> <span>{{ subtotalText }}</span>
<span>{{ <span>{{
isCoverageTypeToDisplayPending showCoverageAsPending
? verifyingCoverageText ? verifyingCoverageText
: getFormattedAmount("", subTotal) : getFormattedAmount("", subTotal)
}}</span> }}</span>
@ -124,17 +124,14 @@
<div class="amount-due"> <div class="amount-due">
<span>{{ amountDueText }}</span> <span>{{ amountDueText }}</span>
<span>{{ <span>{{
isCoverageTypeToDisplayPending showCoverageAsPending
? verifyingCoverageText ? verifyingCoverageText
: getFormattedAmount("", amountDue) : getFormattedAmount("", amountDue)
}}</span> }}</span>
</div> </div>
</div> </div>
<div <div
v-if=" v-if="insuranceCompanyName && (showCoverageAsVerified || showCoverageAsPending)"
insuranceCompanyName &&
(isCoverageTypeToDisplayVerified || isCoverageTypeToDisplayPending)
"
class="insurance-company-name caption"> class="insurance-company-name caption">
{{ insuranceCompanyName }} {{ insuranceCompanyName }}
</div> </div>
@ -195,7 +192,7 @@ export default {
showAsPaid: Boolean, showAsPaid: Boolean,
insuranceDeductible: Number, insuranceDeductible: Number,
insuranceCompanyName: String, insuranceCompanyName: String,
insuranceCoverageTypeToDisplay: String, showInsuranceCoverageAs: String,
}, },
data() { data() {
return { return {
@ -298,11 +295,11 @@ export default {
this.$emit("update:modelValue", newValue); this.$emit("update:modelValue", newValue);
}, },
}, },
isCoverageTypeToDisplayPending() { showCoverageAsPending() {
return this.insuranceCoverageTypeToDisplay === coverageStatus.PENDING; return this.showInsuranceCoverageAs === coverageStatus.PENDING;
}, },
isCoverageTypeToDisplayVerified() { showCoverageAsVerified() {
return this.insuranceCoverageTypeToDisplay === coverageStatus.VERIFIED; return this.showInsuranceCoverageAs === coverageStatus.VERIFIED;
}, },
currentDeductible() { currentDeductible() {
const deductible = this.insuranceDeductible; const deductible = this.insuranceDeductible;
@ -422,7 +419,7 @@ export default {
packagePrice() { packagePrice() {
let packagePrice = 0; let packagePrice = 0;
if (!this.isCoverageTypeToDisplayVerified) { if (!this.showCoverageAsVerified && !this.showCoverageAsPending) {
packagePrice = baseMixin.methods.getTierOnePackagePrice( packagePrice = baseMixin.methods.getTierOnePackagePrice(
baseMixin.methods.filterOutFees(this.availableLineItems) baseMixin.methods.filterOutFees(this.availableLineItems)
); );
@ -474,7 +471,7 @@ export default {
deductibleLineItem() { deductibleLineItem() {
let lineItem = null; let lineItem = null;
if (this.isCoverageTypeToDisplayVerified || this.isCoverageTypeToDisplayPending) { if (this.showCoverageAsVerified || this.showCoverageAsPending) {
lineItem = { lineItem = {
name: this.deductibleLineItemName, name: this.deductibleLineItemName,
subTotal: this.currentDeductible, subTotal: this.currentDeductible,
@ -907,7 +904,7 @@ export default {
subTotal() { subTotal() {
let subTotal = 0; let subTotal = 0;
if (this.isCoverageTypeToDisplayVerified) { if (this.showCoverageAsVerified || this.showCoverageAsPending) {
// only include items NOT covered by insurance // only include items NOT covered by insurance
this.cartItems.forEach((cartItem) => { this.cartItems.forEach((cartItem) => {
if (!cartItem.isCoveredByInsurance) { if (!cartItem.isCoveredByInsurance) {
@ -927,7 +924,7 @@ export default {
salesTax() { salesTax() {
let salesTax = 0; let salesTax = 0;
if (this.isCoverageTypeToDisplayVerified) { if (this.showCoverageAsVerified || this.showCoverageAsPending) {
// only include items NOT covered by insurance // only include items NOT covered by insurance
this.cartItems.forEach((cartItem) => { this.cartItems.forEach((cartItem) => {
if (!cartItem.isCoveredByInsurance) { if (!cartItem.isCoveredByInsurance) {

4
src/layouts/confirmation/confirmation.vue
View file

@ -56,7 +56,7 @@
servicePackageOptionsCmsName="ServicePackageTitle" servicePackageOptionsCmsName="ServicePackageTitle"
:insuranceDeductible="currentDeductible" :insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName" :insuranceCompanyName="insuranceCompanyName"
:insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> :showInsuranceCoverageAs="showInsuranceCoverageAs" />
<hr class="mb-5" /> <hr class="mb-5" />
@ -295,7 +295,7 @@ export default {
} }
return false; return false;
}, },
insuranceCoverageTypeToDisplay() { showInsuranceCoverageAs() {
if (!this.isInsurance) return null; if (!this.isInsurance) return null;
if (this.isNoComp) { if (this.isNoComp) {
return coverageStatus.NOCOMP; return coverageStatus.NOCOMP;

4
src/layouts/payment-method/payment-method.vue
View file

@ -31,7 +31,7 @@
recyclingModalCmsWidgetName="RecycleModal" recyclingModalCmsWidgetName="RecycleModal"
:insuranceDeductible="currentDeductible" :insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName" :insuranceCompanyName="insuranceCompanyName"
:insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> :showInsuranceCoverageAs="showInsuranceCoverageAs" />
<hr class="my-5" /> <hr class="my-5" />
@ -526,7 +526,7 @@ export default {
} }
return false; return false;
}, },
insuranceCoverageTypeToDisplay() { showInsuranceCoverageAs() {
if (!this.isInsurance) return null; if (!this.isInsurance) return null;
if (this.isNoComp) { if (this.isNoComp) {
return coverageStatus.NOCOMP; return coverageStatus.NOCOMP;

4
src/layouts/payment/payment.vue
View file

@ -56,7 +56,7 @@
recyclingModalCmsWidgetName="RecycleModal" recyclingModalCmsWidgetName="RecycleModal"
:insuranceDeductible="currentDeductible" :insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName" :insuranceCompanyName="insuranceCompanyName"
:insuranceCoverageTypeToDisplay="insuranceCoverageTypeToDisplay" /> :showInsuranceCoverageAs="showInsuranceCoverageAs" />
<hr class="mb-5" /> <hr class="mb-5" />
@ -440,7 +440,7 @@ export default {
} }
return false; return false;
}, },
insuranceCoverageTypeToDisplay() { showInsuranceCoverageAs() {
if (!this.isInsurance) return null; if (!this.isInsurance) return null;
if (this.isNoComp) { if (this.isNoComp) {
return coverageStatus.NOCOMP; return coverageStatus.NOCOMP;