admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CC Conversion Corrections IO-463

Browse Source
This commit is contained in:
Patrick Fic
2021-02-02 09:32:49 -08:00
parent 95c06ea25a
commit 8fcb488b3b
8 changed files with 123 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/job/job-totals.js
View File

@@ -131,7 +131,9 @@ function CalculatePartsTotals(jobLines) {
sublets: {
...acc.sublets,
subtotal: acc.sublets.subtotal.add(
Dinero({ amount: Math.round(value.act_price * 100) })
Dinero({
amount: Math.round(value.act_price * 100),
}).multiply(value.part_qty || 0)
),
},
};
@@ -151,19 +153,19 @@ function CalculatePartsTotals(jobLines) {
total: acc.parts.list[value.part_type].total.add(
Dinero({
amount: Math.round((value.act_price || 0) * 100),
}).multiply(value.part_qty || 1)
}).multiply(value.part_qty || 0)
),
}
: {
total: Dinero({
amount: Math.round((value.act_price || 0) * 100),
}).multiply(value.part_qty || 1),
}).multiply(value.part_qty || 0),
},
},
subtotal: acc.parts.subtotal.add(
Dinero({
amount: Math.round(value.act_price * 100),
}).multiply(value.part_qty)
}).multiply(value.part_qty || 0)
),
},
};
@@ -233,7 +235,7 @@ function CalculateTaxesTotals(job, otherTotals) {
if (!!!val.tax_part || !!!val.part_type || IsAdditionalCost(val)) {
additionalItemsTax = additionalItemsTax.add(
Dinero({ amount: Math.round((val.act_price || 0) * 100) })
.multiply(val.part_qty || 1)
.multiply(val.value.part_qty || 0)
.percentage(
(job.parts_tax_rates &&
job.parts_tax_rates["PAN"] &&
@@ -243,7 +245,7 @@ function CalculateTaxesTotals(job, otherTotals) {
} else {
statePartsTax = statePartsTax.add(
Dinero({ amount: Math.round((val.act_price || 0) * 100) })
.multiply(val.part_qty || 1)
.multiply(val.part_qty || 0)
.percentage(
(job.parts_tax_rates &&
job.parts_tax_rates[val.part_type] &&