From f81b21b9334cb2151a7d3ce9ba819675442ee367 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 25 Jun 2024 13:26:56 -0700 Subject: [PATCH] IO-2829 Multiple Towing Lines Signed-off-by: Allan Carr --- server/job/job-totals-USA.js | 6 +++--- server/job/job-totals.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js index ed9441d9d..747c9e51a 100644 --- a/server/job/job-totals-USA.js +++ b/server/job/job-totals-USA.js @@ -643,7 +643,7 @@ function CalculateAdditional(job) { additionalCosts: null, additionalCostItems: [], adjustments: null, - towing: null, + towing: Dinero(), shipping: Dinero(), storage: null, pvrt: null, @@ -668,7 +668,7 @@ function CalculateAdditional(job) { } if (val.line_desc.toLowerCase().includes("towing")) { - ret.towing = lineValue; + ret.towing = ret.towing.add(lineValue); return acc; } else { ret.additionalCostItems.push({ key: val.line_desc, total: lineValue }); @@ -919,7 +919,7 @@ function CalculateTaxesTotals(job, otherTotals) { Object.keys(taxableAmountsByTier).forEach((taxTierKey) => { taxable_adjustment = taxableAmountsByTier[taxTierKey].multiply(percent_of_adjustment); - console.log("🚀 ~ taxableAmountsByTier ~ taxable_adjustment:", taxable_adjustment) + console.log("🚀 ~ taxableAmountsByTier ~ taxable_adjustment:", taxable_adjustment); if (job.adjustment_bottom_line > 0) { taxableAmountsByTier[taxTierKey] = taxableAmountsByTier[taxTierKey].add(taxable_adjustment); } else { diff --git a/server/job/job-totals.js b/server/job/job-totals.js index 0da291120..079f54cba 100644 --- a/server/job/job-totals.js +++ b/server/job/job-totals.js @@ -489,7 +489,7 @@ function CalculateAdditional(job) { additionalCosts: null, additionalCostItems: [], adjustments: null, - towing: null, + towing: Dinero(), shipping: Dinero(), storage: null, pvrt: null, @@ -512,7 +512,7 @@ function CalculateAdditional(job) { } if (val.line_desc.toLowerCase().includes("towing")) { - ret.towing = lineValue; + ret.towing = ret.towing.add(lineValue); return acc; } else { ret.additionalCostItems.push({ key: val.line_desc, total: lineValue });