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

Merge branch 'develop' into feature/csr-2147

Browse source
This commit is contained in:
Chloe Herd 2024-09-17 14:06:01 -04:00
commit 664e2a734a
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,15 +1008,15 @@ export default {
salesTax() { salesTax() {
if (!this.lineItems || this.lineItems.length < 1) return; if (!this.lineItems || this.lineItems.length < 1) return;
return this.isInsurance || !this.shouldHideRecalibration return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order) ? baseMixin.methods.getSalesTax(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal : baseMixin.methods.getSalesTax(this.lineItemsWithoutRecal); // calculated without recal
}, },
amountDue() { amountDue() {
if (!this.lineItems || this.lineItems.length < 1) return; if (!this.lineItems || this.lineItems.length < 1) return;
if (this.showAsPaid) return 0; if (this.showAsPaid) return 0;
return this.isInsurance || !this.shouldHideRecalibration return this.isInsurance || !this.shouldHideRecalibration
? baseMixin.methods.getSubTotal(this.lineItems) // calculate with recal (if on order) ? baseMixin.methods.getAmountDue(this.lineItems) // calculate with recal (if on order)
: baseMixin.methods.getSubTotal(this.lineItemsWithoutRecal); // calculated without recal : baseMixin.methods.getAmountDue(this.lineItemsWithoutRecal); // calculated without recal
}, },
amountPaid() { amountPaid() {
if (!this.showAsPaid) { if (!this.showAsPaid) {

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

@ -666,7 +666,7 @@ export default {
return true; return true;
} }
} else { } else {
if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.isRecalibrationOnOrder) { if (this.isPiaEnabled && this.totalAmountDue > 0 && !this.shouldHideRecalibration) {
return true; return true;
} }
} }

5
src/store/index.js
View file

@ -2423,9 +2423,8 @@ export const actions = {
const order = context.getters.order; const order = context.getters.order;
var providerNumber = var providerNumber = order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu; if (providerNumber.startsWith("00") && providerNumber.length > 5) {
if (providerNumber.startsWith("00")) {
providerNumber = providerNumber.substring(1); providerNumber = providerNumber.substring(1);
} }