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

Merged in release/2024-08-02 (pull request #1556)

Browse Source 
Correct for Labor Adjustment being null
This commit is contained in:
Allan Carr
2024-08-01 21:40:13 +00:00
parent ec5b636c26 00f0952ab2
commit a5033e10cd
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/job/job-totals-USA.js
View File

@@ -357,23 +357,28 @@ async function CalculateRatesTotals({ job, client }) {
let adjp = 0; let adjp = 0;
if (property === "mapa" || property === "mash") { if (property === "mapa" || property === "mash") {
if (job.materials[property.toUpperCase()] && job.materials[property.toUpperCase()].mat_adjp) {
adjp = adjp =
Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1 Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1
? job.materials[property.toUpperCase()].mat_adjp ? job.materials[property.toUpperCase()].mat_adjp
: job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number : job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number
}
} else { } else {
if (property === "la1" || property === "la2" || property === "la3" || property === "la4") { if (property === "la1" || property === "la2" || property === "la3" || property === "la4") {
if (job.cieca_pfl["LAU"] && job.cieca_pfl["LAU"].lbr_adjp) {
adjp = adjp =
Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1 Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1
? job.cieca_pfl["LAU"].lbr_adjp ? job.cieca_pfl["LAU"].lbr_adjp
: job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
}
} else { } else {
if (job.cieca_pfl[property.toUpperCase()]) { if (job.cieca_pfl[property.toUpperCase()] && job.cieca_pfl[property.toUpperCase()].lbr_adjp) {
adjp = adjp =
Math.abs(job.cieca_pfl[property.toUpperCase()].lbr_adjp) > 1 Math.abs(job.cieca_pfl[property.toUpperCase()].lbr_adjp) > 1
? job.cieca_pfl[property.toUpperCase()].lbr_adjp ? job.cieca_pfl[property.toUpperCase()].lbr_adjp
: job.cieca_pfl[property.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number : job.cieca_pfl[property.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number
} else { } else {
if (job.cieca_pfl["LAB"].lbr_adjp) {
adjp = adjp =
Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1 Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
? job.cieca_pfl["LAB"].lbr_adjp ? job.cieca_pfl["LAB"].lbr_adjp
@@ -381,6 +386,7 @@ async function CalculateRatesTotals({ job, client }) {
} }
} }
} }
}
const adjustment = base.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1); const adjustment = base.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1);
const total = base.add(adjustment); const total = base.add(adjustment);