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

Merged in release/2022-02-18 (pull request #402)

Browse Source 
release/2022-02-18

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-02-18 01:08:43 +00:00
parent 5a42cafe8a 65b505035a
commit 1286b72f2c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/utils/RenderTemplate.js
View File

@@ -30,7 +30,7 @@ export default async function RenderTemplate(
name: useShopSpecificTemplate name: useShopSpecificTemplate
? `/${bodyshop.imexshopid}/${templateObject.name}` ? `/${bodyshop.imexshopid}/${templateObject.name}`
: `/${templateObject.name}`, : `/${templateObject.name}`,
// ...(renderAsHtml && !renderAsExcel ? {} : { recipe: "chrome-pdf" }), ...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
...(renderAsExcel ? { recipe: "html-to-xlsx" } : {}), ...(renderAsExcel ? { recipe: "html-to-xlsx" } : {}),
}, },
data: { data: {
@@ -185,7 +185,7 @@ export const GenerateDocument = async (
}) })
); );
} else if (sendType === "x") { } else if (sendType === "x") {
console.log("excel") console.log("excel");
await RenderTemplate(template, bodyshop, false, true); await RenderTemplate(template, bodyshop, false, true);
} else { } else {
await RenderTemplate(template, bodyshop); await RenderTemplate(template, bodyshop);

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

@@ -720,8 +720,14 @@ function GenerateCostingData(job) {
const cost_sublet = const cost_sublet =
billTotalsByCostCenters.subletCosts[ccVal] || Dinero({ amount: 0 }); billTotalsByCostCenters.subletCosts[ccVal] || Dinero({ amount: 0 });
const costs = cost_labor.add(cost_parts).add(cost_additional); const costs = cost_labor
const totalSales = sale_labor.add(sale_parts).add(sale_additional); .add(cost_parts)
.add(cost_additional)
.add(cost_sublet);
const totalSales = sale_labor
.add(sale_parts)
.add(sale_additional)
.add(sale_sublet);
const gpdollars = totalSales.subtract(costs); const gpdollars = totalSales.subtract(costs);
const gppercent = ( const gppercent = (
(gpdollars.getAmount() / totalSales.getAmount()) * (gpdollars.getAmount() / totalSales.getAmount()) *