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

Merge branch 'develop' into rlsmerge/2026.04.23-to-dev

Browse source
This commit is contained in:
Matt Sykes 2026-04-20 10:42:05 -04:00
commit 8a27cd3a26
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -970,8 +970,7 @@ export default {
const msrFeeLineItem = this.getMsrFeeLineItem; const msrFeeLineItem = this.getMsrFeeLineItem;
const shouldCreateMsrFeeCartItem = const shouldCreateMsrFeeCartItem =
this.isMSRFeeApplicable && this.isMSRFeeApplicable &&
this.isInsurance && (!this.isInsurance || !this.IsMSRFeeCoveredByInsurance) &&
!this.IsMSRFeeCoveredByInsurance &&
msrFeeLineItem && msrFeeLineItem &&
this.msrFeeAmount > 0; this.msrFeeAmount > 0;
@ -980,7 +979,7 @@ export default {
name: this.msrFeeCartItemName, name: this.msrFeeCartItemName,
category: cartItemCategories.SUPPORTING_ITEMS, category: cartItemCategories.SUPPORTING_ITEMS,
cartItemType: cartItemTypes.MOBILE_FEE, cartItemType: cartItemTypes.MOBILE_FEE,
isDisplayed: this.isInsurance, isDisplayed: true,
isRemovable: true, isRemovable: true,
subTotal: 0, subTotal: 0,
salesTax: 0, salesTax: 0,
@ -1007,8 +1006,10 @@ export default {
return this.getCmsContent("RecycleTextBlock", "Text"); return this.getCmsContent("RecycleTextBlock", "Text");
}, },
msrToolTipBodyText() { msrToolTipBodyText() {
let cmsContentText = this.getCmsContent("MSRModal", "BodyText"); let cmsContentText = this.isInsurance
if (cmsContentText) { ? this.getCmsContent("MSRModal", "BodyText")
: this.getCmsContent("MSRModal", "BodyText2");
if (this.isInsurance && cmsContentText) {
cmsContentText = cmsContentText.replaceAll( cmsContentText = cmsContentText.replaceAll(
"{custom:mobileFee}", "{custom:mobileFee}",
formatToUSDollar(this.msrFeeAmount) formatToUSDollar(this.msrFeeAmount)