-
- Description: <%= description %>
-- Due Date: <%= new Date(dueDate).toLocaleDateString() %> -
- - <% if(!additionalCostOverride) { %> - -| Title | -Qty | -Unit Cost | -Subtotal | -Item Cost | -
|---|---|---|---|---|
| <%= item.title %> | -<%= item.timeQty || '-' %> hours | -$<%= item.resource.costPerTime || 0 %> / hour | -$<%= timeCost.toFixed(2) %> | -$<%= totalItemCost.toFixed(2) %> | -
| <%= item.processingTimeQty || '-' %> units | -$<%= item.resource.costPerProcessingTime || 0 %> | -$<%= processingCost.toFixed(2) %> | -||
| <%= item.unitQty || '-' %> runs | -$<%= item.resource.costPerUnit || 0 %> / unit | -$<%= unitCost.toFixed(2) %> | -||
| - <%= item.materialQty || '-' %> <%= item.material.unitDescriptor %> - | -- $<%= item.material.costPerUnit %> / <%= item.material.unitDescriptor - %> - | -$<%= materialCost.toFixed(2) %> | -||
| - <%= item.secondaryMaterialQty || '-' %> <%= item.secondaryMaterial.unitDescriptor %> - | -- $<%= item.secondaryMaterial.costPerUnit %> / <%= item.secondaryMaterial.unitDescriptor - %> - | -$<%= secondaryMaterialCost.toFixed(2) %> | -
| Description | -Cost | -
|---|---|
| Additional Cost #<%= i + 1 %> | -$<%= cost.amount.toFixed(2) %> | -
| Legacy Additional Cost #<%= i + 1 %> | -$<%= totalCost.toFixed(2) %> | -
$<%= calculateTotalCostOfJob(data).toFixed(2) %>
- - diff --git a/api/util/docgen/invoice.js b/api/util/docgen/invoice.js index 6c0a4091..a2a6ff39 100644 --- a/api/util/docgen/invoice.js +++ b/api/util/docgen/invoice.js @@ -1,8 +1,7 @@ -import ejs from "ejs"; -import { utapi } from "../../config/uploadthing.js"; import { prisma } from "#prisma"; import { LogType } from "#prisma-client"; -import { htmlToPdf } from "../htmlToPdf.js"; +import { uploadFile } from "#upload"; +import PDFDocument from "pdfkit"; export const calculateTotalCostOfJobByJobId = async (jobId) => { const data = await prisma.job.findFirst({ @@ -32,6 +31,21 @@ export const calculateTotalCostOfJobByJobId = async (jobId) => { return calculateTotalCostOfJob(data); }; +const formatCurrency = (value) => `$${(Number(value) || 0).toFixed(2)}`; + +const formatDate = (value) => + new Date(value).toLocaleDateString("en-US", { + year: "numeric", + month: "short", + day: "numeric", + }); + +const formatQuantity = (value) => { + if (typeof value !== "number" || Number.isNaN(value)) return "0"; + if (Number.isInteger(value)) return `${value}`; + return value.toFixed(2).replace(/\.?0+$/, ""); +}; + export const calculateTotalCostOfJob = (data) => { let totalCost = 0; @@ -55,8 +69,9 @@ export const calculateTotalCostOfJob = (data) => { (cost.processingTimeQty || 0) * (cost.resource.costPerProcessingTime || 0); totalCost += (cost.materialQty || 0) * (cost.material.costPerUnit || 0); - totalCost += (cost.secondaryMaterialQty || 0) * - (cost.secondaryMaterial.costPerUnit || 0); + totalCost += + (cost.secondaryMaterialQty || 0) * + (cost.secondaryMaterial.costPerUnit || 0); }); // if additionalCostOverride is true, return totalCost @@ -81,7 +96,7 @@ export const calculateTotalCostOfJob = (data) => { localTotalCost += (item.materialQty || 0) * (item.material.costPerUnit || 0); localTotalCost += - (item.secondaryMaterialQty || 0) * + (item.secondaryMaterialQty || 0) * (item.secondaryMaterial.costPerUnit || 0); totalCost += localTotalCost * (item.qty ?? 1); @@ -90,63 +105,326 @@ export const calculateTotalCostOfJob = (data) => { return totalCost; }; -export const generateInvoice = async (data, userId, shopId) => { - const shop = await prisma.shop.findFirst({ +const calculateJobItemLinePrice = (item) => { + if (item.resourceType?.costingMode === "RAW_VALUE_ENTRY") { + return item.rawValue || 0; + } + + if (!item.resource || !item.material || !item.secondaryMaterial) return 0; + + let linePrice = 0; + linePrice += (item.timeQty || 0) * (item.resource.costPerTime || 0); + linePrice += + (item.processingTimeQty || 0) * (item.resource.costPerProcessingTime || 0); + linePrice += (item.unitQty || 0) * (item.resource.costPerUnit || 0); + linePrice += (item.materialQty || 0) * (item.material.costPerUnit || 0); + linePrice += + (item.secondaryMaterialQty || 0) * + (item.secondaryMaterial.costPerUnit || 0); + + return linePrice; +}; + +const calculateAdditionalCostLinePrice = (cost) => { + if (cost.resourceType?.costingMode === "RAW_VALUE_ENTRY") { + return cost.rawValue || 0; + } + + if (typeof cost.amount === "number") { + return cost.amount; + } + + if (!cost.resource || !cost.material || !cost.secondaryMaterial) return 0; + + let linePrice = 0; + linePrice += (cost.unitQty || 0) * (cost.resource.costPerUnit || 0); + linePrice += (cost.timeQty || 0) * (cost.resource.costPerTime || 0); + linePrice += + (cost.processingTimeQty || 0) * (cost.resource.costPerProcessingTime || 0); + linePrice += (cost.materialQty || 0) * (cost.material.costPerUnit || 0); + linePrice += + (cost.secondaryMaterialQty || 0) * + (cost.secondaryMaterial.costPerUnit || 0); + + return linePrice; +}; + +const buildInvoiceRows = (job) => { + const rows = []; + + const jobItems = (job.items || []).filter((item) => item.active !== false); + const additionalCosts = (job.additionalCosts || []).filter( + (cost) => cost.active !== false + ); + + if (!job.additionalCostOverride) { + jobItems.forEach((item) => { + const qty = + typeof item.qty === "number" && Number.isFinite(item.qty) && item.qty > 0 + ? item.qty + : 1; + const lineItemPrice = calculateJobItemLinePrice(item); + + rows.push({ + label: item.title || "Untitled job item", + qty, + lineItemPrice, + subtotal: lineItemPrice * qty, + }); + }); + } + + additionalCosts.forEach((cost, index) => { + const lineItemPrice = calculateAdditionalCostLinePrice(cost); + rows.push({ + label: `Additional Cost #${index + 1}`, + qty: 1, + lineItemPrice, + subtotal: lineItemPrice, + }); + }); + + return rows; +}; + +const drawInvoicePdf = async ({ job, shop, customer, rows, total, draft }) => + new Promise((resolve, reject) => { + const doc = new PDFDocument({ margin: 50, size: "LETTER" }); + const chunks = []; + + doc.on("data", (chunk) => chunks.push(chunk)); + doc.on("end", () => resolve(Buffer.concat(chunks))); + doc.on("error", reject); + + const pageWidth = + doc.page.width - doc.page.margins.left - doc.page.margins.right; + const left = doc.page.margins.left; + const right = left + pageWidth; + + const itemWidth = 255; + const qtyWidth = 60; + const priceWidth = 95; + const subtotalWidth = pageWidth - itemWidth - qtyWidth - priceWidth; + + const colItem = left; + const colQty = colItem + itemWidth; + const colPrice = colQty + qtyWidth; + const colSubtotal = colPrice + priceWidth; + + if (draft) { + doc + .fillColor("red") + .font("Helvetica-Bold") + .fontSize(12) + .text("DRAFT INVOICE", left, doc.y, { + width: pageWidth, + align: "center", + }); + doc.moveDown(0.3); + doc.fillColor("black"); + } + + doc.fontSize(20).font("Helvetica-Bold").text("INVOICE"); + doc.moveDown(0.5); + + doc.fontSize(11).font("Helvetica"); + doc.text(`Inv created at: ${formatDate(new Date())}`); + doc.text(`Job name: ${job.title || "Untitled job"}`); + + doc.moveDown(); + doc.font("Helvetica-Bold").text("Shop"); + doc.font("Helvetica").text(shop.name || "Shop"); + if (shop.email) doc.text(shop.email); + if (shop.phone) doc.text(shop.phone); + + doc.moveDown(); + doc.font("Helvetica-Bold").text("Customer"); + doc.font("Helvetica").text(customer.name || "Customer"); + if (customer.email) doc.text(customer.email); + + doc.moveDown(1.5); + let y = doc.y; + + const drawTableHeader = () => { + doc.moveTo(left, y - 4).lineTo(right, y - 4).stroke(); + doc.font("Helvetica-Bold").fontSize(11); + doc.text("Item", colItem, y, { width: itemWidth }); + doc.text("Qty", colQty, y, { width: qtyWidth }); + doc.text("Line Item Price", colPrice, y, { width: priceWidth }); + doc.text("Subtotal", colSubtotal, y, { width: subtotalWidth }); + y += 18; + doc.moveTo(left, y).lineTo(right, y).stroke(); + y += 8; + doc.font("Helvetica").fontSize(11); + }; + + const ensureRowFits = (rowHeight) => { + const bottomLimit = doc.page.height - doc.page.margins.bottom; + if (y + rowHeight + 25 <= bottomLimit) return; + doc.addPage(); + y = doc.page.margins.top; + drawTableHeader(); + }; + + drawTableHeader(); + + if (rows.length === 0) { + const rowHeight = 16; + ensureRowFits(rowHeight); + doc.text("No billable items", colItem, y, { width: itemWidth }); + y += rowHeight; + doc.moveTo(left, y + 2).lineTo(right, y + 2).stroke(); + y += 16; + } else { + rows.forEach((row) => { + const itemHeight = doc.heightOfString(row.label, { width: itemWidth }); + const rowHeight = Math.max(itemHeight, 16); + ensureRowFits(rowHeight); + + doc.text(row.label, colItem, y, { width: itemWidth }); + doc.text(formatQuantity(row.qty), colQty, y, { width: qtyWidth }); + doc.text(formatCurrency(row.lineItemPrice), colPrice, y, { + width: priceWidth, + }); + doc.text(formatCurrency(row.subtotal), colSubtotal, y, { + width: subtotalWidth, + }); + + y += rowHeight + 6; + }); + + doc.moveTo(left, y).lineTo(right, y).stroke(); + y += 16; + } + + const totalLineHeight = 18; + ensureRowFits(totalLineHeight); + doc.font("Helvetica-Bold").fontSize(12); + doc.text(`Total: ${formatCurrency(total)}`, left, y, { + width: pageWidth, + align: "right", + }); + + doc.end(); + }); + +export const generateInvoice = async ( + data, + userId, + shopId, + { draft = false } = {} +) => { + const job = await prisma.job.findFirst({ where: { - id: shopId, + id: data.id, + shopId, + }, + include: { + additionalCosts: { + where: { + active: true, + }, + include: { + material: true, + secondaryMaterial: true, + resource: true, + resourceType: true, + }, + }, + items: { + where: { + active: true, + }, + include: { + material: true, + secondaryMaterial: true, + resource: true, + resourceType: true, + }, + }, }, }); - const user = await prisma.user.findFirst({ - where: { - id: userId, + + if (!job) { + throw new Error("Job not found while generating invoice"); + } + + const [shop, customer] = await Promise.all([ + prisma.shop.findFirst({ + where: { + id: shopId, + }, + select: { + name: true, + email: true, + phone: true, + }, + }), + prisma.user.findFirst({ + where: { + id: job.userId, + }, + select: { + firstName: true, + lastName: true, + email: true, + }, + }), + ]); + + if (!shop) { + throw new Error("Shop not found while generating invoice"); + } + + const rows = buildInvoiceRows(job); + const total = calculateTotalCostOfJob(job); + + const pdf = await drawInvoicePdf({ + job, + shop, + customer: { + name: customer + ? `${customer.firstName} ${customer.lastName}`.trim() + : "Customer", + email: customer?.email || "", }, + rows, + total, + draft, }); - console.log("Data loaded"); - - return new Promise((resolve, reject) => { - ejs.renderFile( - "./util/docgen/invoice.ejs", - { ...data, data, calculateTotalCostOfJob, shop, user }, - async (err, html) => { - if (err) console.error(err); - if (err) reject(err); - console.log("Rendered HTML"); - - const pdf = await htmlToPdf(html); - - console.log("Generated PDF"); - const ut = await utapi.uploadFiles([ - new File([pdf], "invoice.pdf", { type: "application/pdf" }), - ]); - if (!ut || !ut[0] || !ut[0].data) { - console.error(ut); - reject("Upload failed"); - } - - const log = await prisma.logs.create({ - data: { - type: LogType.JOB_INVOICE_GENERATED, - jobId: data.id, - userId, - to: JSON.stringify({ - url: ut[0].data.url, - key: ut[0].data.key, - value: calculateTotalCostOfJob(data), - }), - }, - }); - console.log("Generated Invoice", ut[0].data.url); + const uploaded = await uploadFile({ + body: pdf, + originalname: `invoice-${job.id}.pdf`, + mimetype: "application/pdf", + contentType: "application/pdf", + userId, + metadata: { + type: "invoice", + jobId: job.id, + shopId, + }, + }); - resolve({ - url: ut[0].data.url, - key: ut[0].data.key, - value: calculateTotalCostOfJob(data), - log, - }); - } - ); + const log = await prisma.logs.create({ + data: { + type: LogType.JOB_INVOICE_GENERATED, + jobId: job.id, + userId, + to: JSON.stringify({ + url: uploaded.location, + key: uploaded.key, + value: total, + }), + }, }); + + return { + url: uploaded.location, + key: uploaded.key, + value: total, + log, + }; }; /* diff --git a/api/util/htmlToPdf.js b/api/util/htmlToPdf.js deleted file mode 100644 index 0c32cbfb..00000000 --- a/api/util/htmlToPdf.js +++ /dev/null @@ -1,33 +0,0 @@ -import puppeteer from "puppeteer"; -const logging = false; - -const browser = await puppeteer.launch({ - executablePath: - process.env.NODE_ENV === "production" - ? process.env.PUPPETEER_EXECUTABLE_PATH || "/usr/bin/chromium-browser" - : undefined, - - args: ["--no-sandbox", "--disable-setuid-sandbox"], -}); -logging && console.log("Launched Puppeteer"); - -let page = null; - -export const htmlToPdf = async (html) => { - const startTime = Date.now(); - if (!page) { - page = await browser.newPage(); - logging && console.log("Created Page"); - } else { - logging && console.log("Inherited Page"); - } - - await page.setContent(html, { waitUntil: "networkidle0" }); - - const pdf = await page.pdf({ format: "letter", printBackground: true }); - - const endTime = Date.now(); - logging && console.log(`PDF generated in ${endTime - startTime}ms`); - - return pdf; -}; diff --git a/api/util/tests/_htmlToPdf.test.js b/api/util/tests/_htmlToPdf.test.js deleted file mode 100644 index 7f73b2ce..00000000 --- a/api/util/tests/_htmlToPdf.test.js +++ /dev/null @@ -1,13 +0,0 @@ -import { describe, it, expect } from "vitest"; -import { htmlToPdf } from "api/util/htmlToPdf.js"; - -describe("htmlToPdf", () => { - it("generates a PDF from HTML content", async () => { - const htmlContent = "This is a test PDF.
"; - - const pdf = await htmlToPdf(htmlContent); - - expect(pdf).toBeInstanceOf(Buffer); - expect(pdf.length).toBeGreaterThan(0); - }); -}); diff --git a/app/src/components/jobitem/JobItem.jsx b/app/src/components/jobitem/JobItem.jsx index 3baf831d..cf4fb512 100644 --- a/app/src/components/jobitem/JobItem.jsx +++ b/app/src/components/jobitem/JobItem.jsx @@ -26,8 +26,15 @@ import * as Sentry from "@sentry/react"; import ErrorBoundaries from "../ErrorBoundaries/ErrorBoundaries"; export function downloadFile(url, filename) { + if (!url) return; + fetch(url) - .then((response) => response.blob()) + .then((response) => { + if (!response.ok) { + throw new Error(`Failed to download: ${response.status}`); + } + return response.blob(); + }) .then((blob) => { const link = document.createElement("a"); link.href = URL.createObjectURL(blob); @@ -35,6 +42,15 @@ export function downloadFile(url, filename) { link.click(); URL.revokeObjectURL(link.href); // Clean up }) + .catch(() => { + // Fallback for cross-origin URLs (ex: S3) when fetch is blocked by CORS. + const link = document.createElement("a"); + link.href = url; + link.target = "_blank"; + link.rel = "noopener noreferrer"; + link.download = filename; + link.click(); + }) .catch((error) => { console.error("Error downloading file:", error); }); diff --git a/app/src/components/jobitem/ProjectWideEditCosting.jsx b/app/src/components/jobitem/ProjectWideEditCosting.jsx index 052d6206..9721d4fb 100644 --- a/app/src/components/jobitem/ProjectWideEditCosting.jsx +++ b/app/src/components/jobitem/ProjectWideEditCosting.jsx @@ -139,19 +139,19 @@ const CostCard = ({ const { loading: materialLoading, material } = useMaterial( shopId, localLineItem?.resourceTypeId, - localLineItem?.materialId + localLineItem?.materialId, ); const { loading: secondaryMaterialLoading, material: secondaryMaterial } = useMaterial( shopId, localLineItem?.resourceTypeId, - localLineItem?.secondaryMaterialId + localLineItem?.secondaryMaterialId, ); const { loading: resourceLoading, resource } = useResource( shopId, - localLineItem?.resourceId + localLineItem?.resourceId, ); const changed = JSON.stringify(localLineItem) !== JSON.stringify(lineItem); @@ -236,12 +236,7 @@ const CostCard = ({ {localLineItem.resourceTypeId ? ( isRawMode ? ( - -