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

Merged in feature/IO-2293-Autohouse-Job-Cost-Dinero-Type-Cast (pull request #794)

Browse Source 
IO-2293 Autohouse & Job Costing Dinero Type Casting

Approved-by: Patrick Fic
This commit is contained in:
Allan Carr
2023-05-19 17:02:05 +00:00
committed by Patrick Fic
parent 5861d0e9b6 57d8ca5829
commit a18dbbb6c4
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/data/autohouse.js
View File

@@ -792,10 +792,11 @@ const CreateCosts = (job) => {
job.bodyshop.md_responsibility_centers.defaults.costs.MAPA job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mapa * 100) || job.bodyshop.jc_hourly_rates.mapa * 100) ||
0, 0
),
}).multiply(job.job_totals.rates.mapa.hours) }).multiply(job.job_totals.rates.mapa.hours)
); );
} }
@@ -806,10 +807,11 @@ const CreateCosts = (job) => {
job.bodyshop.md_responsibility_centers.defaults.costs.MAPA job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mapa * 100) || job.bodyshop.jc_hourly_rates.mapa * 100) ||
0, 0
),
}).multiply(job.job_totals.rates.mapa.hours) }).multiply(job.job_totals.rates.mapa.hours)
); );
} }
@@ -829,10 +831,11 @@ const CreateCosts = (job) => {
job.bodyshop.md_responsibility_centers.defaults.costs.MASH job.bodyshop.md_responsibility_centers.defaults.costs.MASH
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mash * 100) || job.bodyshop.jc_hourly_rates.mash * 100) ||
0, 0
),
}).multiply(job.job_totals.rates.mash.hours) }).multiply(job.job_totals.rates.mash.hours)
); );
} }

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

@@ -642,10 +642,11 @@ function GenerateCostingData(job) {
job.bodyshop.md_responsibility_centers.defaults.costs.MAPA job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mapa * 100) || job.bodyshop.jc_hourly_rates.mapa * 100) ||
0, 0
),
}).multiply(materialsHours.mapaHrs) }).multiply(materialsHours.mapaHrs)
); );
} }
@@ -656,10 +657,11 @@ function GenerateCostingData(job) {
job.bodyshop.md_responsibility_centers.defaults.costs.MAPA job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mapa * 100) || job.bodyshop.jc_hourly_rates.mapa * 100) ||
0, 0
),
}).multiply(materialsHours.mapaHrs) }).multiply(materialsHours.mapaHrs)
); );
} }
@@ -680,10 +682,11 @@ function GenerateCostingData(job) {
job.bodyshop.md_responsibility_centers.defaults.costs.MASH job.bodyshop.md_responsibility_centers.defaults.costs.MASH
].add( ].add(
Dinero({ Dinero({
amount: amount: Math.round(
(job.bodyshop.jc_hourly_rates && (job.bodyshop.jc_hourly_rates &&
job.bodyshop.jc_hourly_rates.mash * 100) || job.bodyshop.jc_hourly_rates.mash * 100) ||
0, 0
),
}).multiply(materialsHours.mashHrs) }).multiply(materialsHours.mashHrs)
); );
} }