+
${sName ? `
${h(sName)}
` : ""}
${sAddr.map(a=>`
${h(a)}
`).join("")}
${sCntry ? `
${h(sCntry)}
` : ""}
${sPh ? `
${h(td("sender-phone"))}: ${h(sPh)}
` : ""}
${sEm ? `
${h(td("sender-email"))}: ${h(sEm)}
` : ""}
-
+
+
${h(td("payment"))}
+ ${pTerm > 0 ? `
${h(td("payment-terms"))}: ${pTerm} ${h(td("payment-days"))}${pPayBy ? ` — ${h(td("pay-by"))}: ${h(pPayBy)}` : ""}
` : ""}
+ ${showBank ? `
+ ${pAcct ? `${h(td("account-holder"))}${h(pAcct)}` : ""}
+ ${pIban ? `${h(td("account-no"))}${h(pIban)}` : ""}
+ ${pBic ? `${h(td("bank-bic"))}${h(pBic)}` : ""}
+ ${pBadr1 || pBadr2 ? `${h(td("bank-address"))}${[pBadr1,pBadr2].filter(Boolean).map(l=>h(l)).join("
")}` : ""}
+
+ ${pRef ? `
${h(td("payment-ref"))}: ${h(pRef)}
` : ""}` : ""}
+
+
+
${h(td("charge-to"))}
+ ${ctName ? `
${h(ctName)}
` : ""}
+ ${ctAddr.map(a=>`
${h(a)}
`).join("")}
+ ${ctCntry ? `
${h(ctCntry)}
` : ""}
+
+ ${ctPh ? `${h(td("charge-to-phone"))}: ${h(ctPh)}` : ""}
+ ${ctEm ? `${h(td("charge-to-email"))}: ${h(ctEm)}` : ""}
+ ${ctVat ? `${h(td("vat-id"))}: ${h(ctVat)}` : ""}
+ ${ctReg ? `${h(td("registration-no"))}: ${h(ctReg)}` : ""}
+
+
+
- ${ctName ? `
-
-
${h(td("charge-to"))}
-
${h(ctName)}
- ${ctAddr.map(a=>`
${h(a)}
`).join("")}
- ${ctCntry ? `
${h(ctCntry)}
` : ""}
-
- ${ctPh ? `${h(td("charge-to-phone"))}: ${h(ctPh)}` : ""}
- ${ctEm ? `${h(td("charge-to-email"))}: ${h(ctEm)}` : ""}
- ${ctVat ? `${h(td("vat-id"))}: ${h(ctVat)}` : ""}
- ${ctReg ? `${h(td("registration-no"))}: ${h(ctReg)}` : ""}
-
-
` : ""}
| ${h(td("qty"))} |
@@ -1233,18 +1199,7 @@ function buildPreviewHTML() {
${fmt(toPay)} |
- ${(pTerm > 0 || hasBank) ? `
-
-
${h(td("payment"))}
- ${pTerm > 0 ? `
${h(td("payment-terms"))}: ${pTerm} ${h(td("payment-days"))}${pPayBy ? ` — ${h(td("pay-by"))}: ${h(pPayBy)}` : ""}
` : ""}
- ${hasBank ? `
- ${pAcct ? `${h(td("account-holder"))}${h(pAcct)}` : ""}
- ${pIban ? `${h(td("account-no"))}${h(pIban)}` : ""}
- ${pBic ? `${h(td("bank-bic"))}${h(pBic)}` : ""}
- ${pBadr1 || pBadr2 ? `${h(td("bank-address"))}${[pBadr1,pBadr2].filter(Boolean).map(l=>h(l)).join("
")}` : ""}
-
- ${pRef ? `
${h(td("payment-ref"))}: ${h(pRef)}
` : ""}` : ""}
-
` : ""}`;
+`;
}
// ── Build PDF with jsPDF + Helvetica ─────────────────────────────────────────
@@ -1274,81 +1229,99 @@ function buildPDF() {
const { dl, td, sName, sAddr, sCntry, sPh, sEm, iDate, pCode, iNo, iCur,
ctName, ctAddr, ctCntry, ctPh, ctEm, ctVat, ctReg,
- pTerm, pPayBy, pAcct, pIban, pBic, pBadr1, pBadr2, pRef, hasPayment,
+ pTerm, pPayBy, pAcct, pIban, pBic, pBadr1, pBadr2, pRef, hasBank, hidePaymentOut,
rows, sub, taxes, paid, toPay } = gatherData();
- // ── HEADER ────────────────────────────────────────────────────────────────
- let y = MT;
- let sy = y; // sender column bottom tracker
- let ry = y; // right column bottom tracker
+ const showBank = hasBank && !hidePaymentOut;
- // Sender name
- if (sName) {
- fb(13); tc(30,45,69);
- tL(sName, ML, sy); sy += 6;
- }
- // Sender address
+ // ── 2×2 HEADER ───────────────────────────────────────────────────────────
+ const GAP = 8;
+ const LW = (CW - GAP) / 2; // ~86mm each column
+ const XM_L = ML + LW + GAP; // left edge of right column
+
+ let y = MT;
+ let ly = y, ry = y; // row-1 bottom trackers (left / right)
+
+ // ── Row 1 left: Sender ──
+ if (sName) { fb(13); tc(30,45,69); tL(sName, ML, ly); ly += 6; }
fn(8.5); tc(75,85,99);
- [...sAddr, sCntry].filter(Boolean).forEach(line => { tL(line, ML, sy); sy += 4.5; });
- // Sender contact
+ [...sAddr, sCntry].filter(Boolean).forEach(l => { tL(l, ML, ly); ly += 4.5; });
if (sPh || sEm) {
const parts = [];
if (sPh) parts.push(`${td("sender-phone")}: ${sPh}`);
if (sEm) parts.push(`${td("sender-email")}: ${sEm}`);
- fn(8); tc(107,114,128);
- tL(parts.join(" "), ML, sy); sy += 5;
+ fn(8); tc(107,114,128); tL(parts.join(" "), ML, ly); ly += 5;
}
- // INVOICE title (right)
- fb(26); tc(30,45,69);
- tR(td("invoice"), XR, ry); ry += 11;
+ // ── Row 1 right: Payment ──
+ if (pTerm > 0 || showBank) {
+ fb(7); tc(107,114,128); tL(td("payment").toUpperCase(), XM_L, ry); ry += 5;
+ if (pTerm > 0) {
+ const ts = `${td("payment-terms")}: ${pTerm} ${td("payment-days")}${pPayBy ? ` ${td("pay-by")}: ${pPayBy}` : ""}`;
+ fn(8.5); tc(17,24,39); tL(ts, XM_L, ry); ry += 5;
+ }
+ if (showBank) {
+ const LLBL = 46;
+ const payRows = [
+ pAcct ? [td("account-holder"), pAcct] : null,
+ pIban ? [td("account-no"), pIban] : null,
+ pBic ? [td("bank-bic"), pBic] : null,
+ (pBadr1||pBadr2) ? [td("bank-address"), [pBadr1,pBadr2].filter(Boolean).join(", ")] : null,
+ ].filter(Boolean);
+ payRows.forEach(([lbl, val]) => {
+ fn(8); tc(107,114,128); tL(lbl + ":", XM_L, ry);
+ fn(8.5); tc(17,24,39);
+ const wrapped = sp(val, LW - LLBL - 2);
+ wrapped.forEach((line, i) => tL(line, XM_L + LLBL, ry + i * 4));
+ ry += Math.max(4.5, wrapped.length * 4);
+ });
+ if (pRef) {
+ fn(8); tc(107,114,128); tL(td("payment-ref") + ":", XM_L, ry);
+ fb(8.5); tc(17,24,39); tL(pRef, XM_L + LLBL, ry); ry += 5;
+ }
+ }
+ }
- // Meta table (right-aligned)
- const metaRows = [
- iNo ? [td("invoice-no"), iNo] : null,
- iDate ? [td("invoice-date"), fmtDate(iDate)]: null,
- pCode ? [td("project-code"), pCode] : null,
- iCur ? [td("invoice-currency"), iCur] : null,
- ].filter(Boolean);
+ // Row 1 divider
+ const row1Y = Math.max(ly, ry) + 4;
+ dc(209,213,219); doc.setLineWidth(0.3);
+ doc.line(ML, row1Y, XR, row1Y);
- metaRows.forEach(([lbl, val]) => {
- fn(8.5); tc(107,114,128); tR(lbl + ":", XR - 45, ry);
- fb(8.5); tc(17,24,39); tR(val, XR, ry);
- ry += 5;
- });
-
- y = Math.max(sy, ry) + 5;
-
- // Navy rule
- dc(30,45,69); doc.setLineWidth(0.6);
- doc.line(ML, y, XR, y); y += 6;
-
- // ── BILL-TO ──────────────────────────────────────────────────────────────
+ // ── Row 2 left: Charge-to ──
+ let ly2 = row1Y + 5, ry2 = row1Y + 5;
+ fb(7); tc(107,114,128); tL(td("charge-to").toUpperCase(), ML, ly2); ly2 += 5;
if (ctName) {
- const bLines = [...ctAddr, ctCntry].filter(Boolean);
+ fb(10); tc(30,45,69); tL(ctName, ML, ly2); ly2 += 5.5;
+ fn(8.5); tc(17,24,39);
+ [...ctAddr, ctCntry].filter(Boolean).forEach(l => { tL(l, ML, ly2); ly2 += 4.5; });
const ctParts = [];
if (ctPh) ctParts.push(`${td("charge-to-phone")}: ${ctPh}`);
if (ctEm) ctParts.push(`${td("charge-to-email")}: ${ctEm}`);
if (ctVat) ctParts.push(`${td("vat-id")}: ${ctVat}`);
if (ctReg) ctParts.push(`${td("registration-no")}: ${ctReg}`);
- const ctContact = ctParts.join(" ");
-
- const boxH = 4.5 + 5 + 5.5 + bLines.length * 4.5 + (ctContact ? 4.5 : 0) + 4;
- fc(248,249,250); dc(255,255,255); doc.setLineWidth(0);
- doc.rect(ML, y, CW, boxH, "F");
- fc(30,45,69);
- doc.rect(ML, y, 1.5, boxH, "F");
-
- let by = y + 4.5;
- fb(7); tc(107,114,128); tL(td("charge-to").toUpperCase(), ML+4, by); by += 5;
- fb(10.5); tc(30,45,69); tL(ctName, ML+4, by); by += 5.5;
- fn(8.5); tc(17,24,39);
- bLines.forEach(line => { tL(line, ML+4, by); by += 4.5; });
- if (ctContact) { fn(8); tc(107,114,128); tL(ctContact, ML+4, by); }
-
- y += boxH + 6;
+ if (ctParts.length) { fn(8); tc(107,114,128); tL(ctParts.join(" "), ML, ly2); ly2 += 5; }
}
+ // ── Row 2 right: INVOICE + meta ──
+ fb(24); tc(30,45,69); tR(td("invoice"), XR, ry2); ry2 += 10;
+ const metaRows = [
+ iNo ? [td("invoice-no"), iNo] : null,
+ iDate ? [td("invoice-date"), fmtDate(iDate)] : null,
+ pCode ? [td("project-code"), pCode] : null,
+ iCur ? [td("invoice-currency"), iCur] : null,
+ ].filter(Boolean);
+ metaRows.forEach(([lbl, val]) => {
+ fn(8.5); tc(107,114,128); tR(lbl + ":", XR - 42, ry2);
+ fb(8.5); tc(17,24,39); tR(val, XR, ry2);
+ ry2 += 5;
+ });
+
+ y = Math.max(ly2, ry2) + 5;
+
+ // Navy rule
+ dc(30,45,69); doc.setLineWidth(0.6);
+ doc.line(ML, y, XR, y); y += 6;
+
// ── LINE ITEMS TABLE ──────────────────────────────────────────────────────
// Column widths: QTY=18, UOM=18, DESC=flex, PRICE=28, TOTAL=34
const CQ=18, CU=18, CP=28, CT=34;
@@ -1455,45 +1428,6 @@ function buildPDF() {
fb(11); tc(255,255,255); tR(fmt(toPay), XR-2, y+5.8);
y += 9;
- // ── PAYMENT DETAILS ───────────────────────────────────────────────────────
- if (pTerm > 0 || hasBank) {
- y += 8;
- if (y + 8 > PH - 15) { doc.addPage(); y = MT; }
- dc(209,213,219); doc.setLineWidth(0.4);
- doc.line(ML, y, XR, y); y += 5;
-
- fb(7); tc(107,114,128); tL(td("payment").toUpperCase(), ML, y); y += 5;
-
- if (pTerm > 0) {
- const termsStr = `${td("payment-terms")}: ${pTerm} ${td("payment-days")}${pPayBy ? ` ${td("pay-by")}: ${pPayBy}` : ""}`;
- fn(8.5); tc(17,24,39); tL(termsStr, ML, y); y += 5;
- }
-
- if (hasBank) {
- const LBL = 50;
- const payRows = [
- pAcct ? [td("account-holder"), pAcct] : null,
- pIban ? [td("account-no"), pIban] : null,
- pBic ? [td("bank-bic"), pBic] : null,
- (pBadr1 || pBadr2) ? [td("bank-address"), [pBadr1,pBadr2].filter(Boolean).join(", ")] : null,
- ].filter(Boolean);
-
- payRows.forEach(([lbl, val]) => {
- if (y + 5 > PH - 10) { doc.addPage(); y = MT; }
- fn(8); tc(107,114,128); tL(lbl + ":", ML, y);
- fn(8.5); tc(17,24,39); tL(val, ML + LBL, y);
- y += 4.5;
- });
-
- if (pRef) {
- y += 1;
- if (y + 6 > PH - 10) { doc.addPage(); y = MT; }
- fn(8); tc(107,114,128); tL(td("payment-ref") + ":", ML, y);
- fb(9); tc(17,24,39); tL(pRef, ML + LBL, y);
- }
- }
- }
-
// ── Save ──────────────────────────────────────────────────────────────────
doc.save(iNo ? `invoice-${iNo}.pdf` : "invoice.pdf");
}