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

IO-1738 PVRT Update

Browse Source
This commit is contained in:
Patrick Fic
2022-02-16 16:45:49 -08:00
parent 2c1c11828d
commit b842cee076
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,8 +442,8 @@ function CalculateAdditional(job) {
ret.total = ret.additionalCosts
.add(ret.adjustments) //IO-813 Adjustment takes care of GST & PST at labor rate.
.add(ret.towing)
.add(ret.storage)
.add(ret.pvrt);
.add(ret.storage);
//.add(ret.pvrt);
return ret;
}
@@ -452,8 +452,8 @@ function CalculateTaxesTotals(job, otherTotals) {
const subtotal = otherTotals.parts.parts.subtotal
.add(otherTotals.parts.sublets.subtotal)
.add(otherTotals.rates.subtotal) //No longer using just rates subtotal to include mapa/mash.
.add(otherTotals.additional.total)
.subtract(otherTotals.additional.pvrt);
.add(otherTotals.additional.total);
// .add(Dinero({ amount: (job.towing_payable || 0) * 100 }))
// .add(Dinero({ amount: (job.storage_payable || 0) * 100 }));
@@ -546,14 +546,15 @@ function CalculateTaxesTotals(job, otherTotals) {
.add(
otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100)
)
.add(additionalItemsTax)
.add(otherTotals.additional.pvrt),
.add(additionalItemsTax),
// .add(otherTotals.additional.pvrt),
local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100),
};
ret.total_repairs = ret.subtotal
.add(ret.federal_tax)
.add(ret.state_tax)
.add(ret.local_tax);
.add(ret.local_tax)
.add(otherTotals.additional.pvrt);
ret.custPayable = {
deductible: Dinero({ amount: Math.round((job.ded_amt || 0) * 100) }) || 0,