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

Merge branch 'develop' into feature/CSR-2109

Browse source
This commit is contained in:
Chloe Herd 2024-06-19 15:17:32 -04:00
commit e5c8378197
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -985,7 +985,10 @@ export default {
if (!this.showAsPaid) { if (!this.showAsPaid) {
return 0; return 0;
} }
return this.subTotal + this.salesTax;
// unary plus operator to convert string amount to numeric so we can add them together
var amtPaid = +this.subTotal + +this.salesTax;
return amtPaid;
}, },
}, },
components: { components: {

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

@ -170,8 +170,9 @@ export default {
null, null,
"quote" "quote"
); );
if (servicePackageDiscountPartResponse.data) if (servicePackageDiscountPartResponse.data) {
servicePackageDiscountPart.push(servicePackageDiscountPartResponse.data); servicePackageDiscountPart.push(servicePackageDiscountPartResponse.data);
}
} }
const availableLineItems = [ const availableLineItems = [
resultMap.rainDefense, resultMap.rainDefense,