diff --git a/server/job/job-costing.js b/server/job/job-costing.js index e0439903a..8f7053c91 100644 --- a/server/job/job-costing.js +++ b/server/job/job-costing.js @@ -77,6 +77,8 @@ async function JobCostingMulti(req, res) { totalLaborGppercentFormatted: null, totalPartsGppercent: null, totalPartsGppercentFormatted: null, + totalAdditionalGppercent: null, + totalAdditionalGppercentFormatted: null, }, }; @@ -178,6 +180,10 @@ async function JobCostingMulti(req, res) { multiSummary.summaryData.totalPartsGp.add( costingData.summaryData.totalPartsGp ); + multiSummary.summaryData.totalAdditionalGp = + multiSummary.summaryData.totalAdditionalGp.add( + costingData.summaryData.totalAdditionalGp + ); //Take the summary data & add it to total summary data. }); @@ -198,10 +204,21 @@ async function JobCostingMulti(req, res) { multiSummary.summaryData.totalPartsSales.getAmount()) * 100 ).toFixed(2); + multiSummary.summaryData.totalPartsGppercentFormatted = formatGpPercent( multiSummary.summaryData.totalPartsGppercent ); + multiSummary.summaryData.totalAdditionalGppercent = ( + (multiSummary.summaryData.totalAdditionalGp.getAmount() / + multiSummary.summaryData.totalAdditionalSales.getAmount()) * + 100 + ).toFixed(2); + + multiSummary.summaryData.totalAdditionalGppercentFormatted = formatGpPercent( + multiSummary.summaryData.totalAdditionalGppercent + ); + multiSummary.summaryData.gppercent = ( (multiSummary.summaryData.gpdollars.getAmount() / multiSummary.summaryData.totalSales.getAmount()) * @@ -579,6 +596,8 @@ function GenerateCostingData(job) { totalLaborGppercentFormatted: null, totalPartsGppercent: null, totalPartsGppercentFormatted: null, + totalAdditionalGppercent: null, + totalAdditionalGppercentFormatted: null, gppercent: null, gppercentFormatted: null, }; @@ -695,6 +714,17 @@ function GenerateCostingData(job) { summaryData.totalPartsGppercentFormatted = formatGpPercent( summaryData.totalPartsGppercent ); + summaryData.totalAdditionalGp = summaryData.totalAdditionalSales.subtract( + summaryData.totalAdditionalCost + ); + summaryData.totalAdditionalGppercent = ( + (summaryData.totalAdditionalGp.getAmount() / + summaryData.totalAdditionalSales.getAmount()) * + 100 + ).toFixed(2); + summaryData.totalAdditionalGppercentFormatted = formatGpPercent( + summaryData.totalAdditionalGppercent + ); summaryData.gpdollars = summaryData.totalSales.subtract( summaryData.totalCost