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

Merge work.

Browse Source
This commit is contained in:
Patrick Fic
2020-09-25 13:45:34 -07:00
parent a463887fa4 765df769b4
commit a7051c0f86
10 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ function CalculateTaxesTotals(job, otherTotals) {
const statePartsTax = job.joblines
.filter((jl) => !jl.removed)
.reduce((acc, val) => {
if (!!!val.tax_part) return acc;
if (!!!val.tax_part || !!!val.part_type) return acc;
// if (!!job.parts_tax_rates[val.part_type]) {
// console.log("val.line_desc", val.line_desc);
@@ -273,7 +273,6 @@ function CalculatePartsTotals(jobLines) {
subtotal: acc.sublets.subtotal.add(
Dinero({ amount: Math.round(value.act_price * 100) })
),
//TODO Add Adjustments in
},
};
@@ -306,7 +305,6 @@ function CalculatePartsTotals(jobLines) {
amount: Math.round(value.act_price * 100),
}).multiply(value.part_qty)
),
//TODO Add Adjustments in
},
};
// default:
@@ -317,12 +315,10 @@ function CalculatePartsTotals(jobLines) {
parts: {
list: {},
subtotal: Dinero({ amount: 0 }),
adjustments: Dinero({ amount: 0 }),
total: Dinero({ amount: 0 }),
},
sublets: {
subtotal: Dinero({ amount: 0 }),
adjustments: Dinero({ amount: 0 }),
total: Dinero({ amount: 0 }),
},
}
@@ -331,11 +327,11 @@ function CalculatePartsTotals(jobLines) {
return {
parts: {
...ret.parts,
total: ret.parts.subtotal, //+ ret.parts.adjustments
total: ret.parts.subtotal,
},
sublets: {
...ret.sublets,
total: ret.sublets.subtotal, // + ret.sublets.adjustments,
total: ret.sublets.subtotal,
},
};
}