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

CSR-2179: fixes from PR

Browse source
This commit is contained in:
Adam Caouette 2024-09-12 09:23:11 -04:00
parent 5c1e6b550a
commit 374b97bcb6
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -999,11 +999,6 @@ export default {
}, },
subTotal() { subTotal() {
if (!this.lineItems || this.lineItems.length < 1) return; if (!this.lineItems || this.lineItems.length < 1) return;
if (this.isInsurance || !this.shouldHideRecalibration) {
console.log(" first this.lineItems: ", this.lineItems)
} else {
console.log(" 2nd this.lineItemsWithoutRecal: ", this.lineItemsWithoutRecal)
}
return this.isInsurance || !this.shouldHideRecalibration return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order) ? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal : baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal

14
src/layouts/quote/quote.vue
View file

@ -44,9 +44,7 @@
<div class="col-md-6 col-xl-4"> <div class="col-md-6 col-xl-4">
<!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner --> <!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner -->
<afterpayModalBanner <afterpayModalBanner
v-if=" v-if="showAfterpayBanner"
!isInsuranceSelected && (!isRecalibrationOnOrder || !shouldHideRecalibration)
"
cmsWidgetName="AfterpayModalWidget" cmsWidgetName="AfterpayModalWidget"
:lineItems="lineItems" /> :lineItems="lineItems" />
@ -54,7 +52,7 @@
<recalDisclaimer <recalDisclaimer
class="mb-0" class="mb-0"
cmsWidgetName="RecalDisclaimerWidget" cmsWidgetName="RecalDisclaimerWidget"
v-if="isRecalibrationOnOrder && shouldHideRecalibration" v-if="showRecalDisclaimer"
v-on="{ textLinkClicked: openModalAction }" v-on="{ textLinkClicked: openModalAction }"
alertClass="alert-info" /> alertClass="alert-info" />
@ -232,7 +230,7 @@ export default {
pageName: to.query.fmgPage, pageName: to.query.fmgPage,
experiment: experimentForLogging, experiment: experimentForLogging,
}, },
"vehicle", "quote",
false false
); );
} }
@ -367,6 +365,12 @@ export default {
); );
return recalSettingValue; return recalSettingValue;
}, },
showAfterpayBanner() {
return !this.isInsuranceSelected && (!this.isRecalibrationOnOrder || !this.shouldHideRecalibration)
},
showRecalDisclaimer() {
return this.isRecalibrationOnOrder && this.shouldHideRecalibration
},
}, },
methods: { methods: {
openModalAction(modalName) { openModalAction(modalName) {