diff --git a/src/helpers/pricing-helper.js b/src/helpers/pricing-helper.js index b9262f95d..56f11336e 100644 --- a/src/helpers/pricing-helper.js +++ b/src/helpers/pricing-helper.js @@ -55,6 +55,7 @@ export function getSubTotal(lineItemsObject) { return getAmountDue(lineItemsObject, false); } +// prettier-ignore export function getSalesTax(lineItemsObject) { // this is amountDue minus subTotal return (((getAmountDue(lineItemsObject) - getSubTotal(lineItemsObject)) * 100) / 100).toFixed(2); diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 78bde1e1d..6fd6075ab 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -110,7 +110,10 @@ export default { }); return filteredLineItems; }, - filterOutCertainPartTypesOrNumbers(lineItemsArray, {partTypesToRemove = [], partNumbersToRemove = []}) { + filterOutCertainPartTypesOrNumbers( + lineItemsArray, + { partTypesToRemove = [], partNumbersToRemove = [] } + ) { // lineItems s/b an ARRAY here if (!Array.isArray(lineItemsArray)) return; @@ -153,14 +156,9 @@ export default { const laborAmount = lineItem.laborAmount ?? 0; const sellingPrice = lineItem.sellingPrice ?? 0; const salesTax = lineItem.salesTax ?? 0; - + if (includeTax) { - return ( - kitPrice + - laborAmount + - sellingPrice + - salesTax - ); + return kitPrice + laborAmount + sellingPrice + salesTax; } else { return kitPrice + laborAmount + sellingPrice; }