diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index 4870e463b..a0cd0bc91 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -1509,6 +1509,7 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) { est_ct_fn shopid est_ct_ln + ciecaid cieca_pfl cieca_pft cieca_pfo diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js index 7f9abb0a2..6d5c7c8b4 100644 --- a/server/job/job-totals-USA.js +++ b/server/job/job-totals-USA.js @@ -948,6 +948,12 @@ function CalculateTaxesTotals(job, otherTotals) { amount: Math.round(stlTowing.t_amt * 100) }) ); + if (!stlTowing && !job.ciecaid && job.towing_payable) + taxableAmounts.TOW = taxableAmounts.TOW.add( + Dinero({ + amount: Math.round((job.towing_payable || 0) * 100) + }) + ); if (stlStorage) taxableAmounts.STOR = taxableAmounts.STOR.add( @@ -956,6 +962,13 @@ function CalculateTaxesTotals(job, otherTotals) { })) ); + if (!stlStorage && !job.ciecaid && job.storage_payable) + taxableAmounts.STOR = taxableAmounts.STOR.add( + Dinero({ + amount: Math.round((job.storage_payable || 0) * 100) + }) + ); + const pfp = job.parts_tax_rates; //For any profile level markups/discounts, add them in now as well.