ztechno_core 0.0.112 → 0.0.114

package/lib/mollie/services/invoice_service.js

@@ -636,6 +636,7 @@ class InvoiceService {
     });
     // === COMPANY LOGO (left-aligned) ===
     const logoPath = path_1.default.join(process.cwd(), '../zwebsite/public/img/invoice/invoice-logo.png');
+    const certPath = path_1.default.join(process.cwd(), '../zwebsite/public/img/invoice/invoice-certificates.png');
     if (fs_1.default.existsSync(logoPath)) {
       doc.image(logoPath, 50, 50, { width: 150 }); // Left side of A4 page
     }
@@ -714,8 +715,10 @@ class InvoiceService {
         return this;
       },
       text(text, x, opts, gap = 12) {
-        doc.text(text, x, this.y, opts ?? {});
-        this.y += gap;
+        const o = opts ?? {};
+        const h = doc.heightOfString(text, o);
+        doc.text(text, x, this.y, o);
+        this.y += Math.max(h, gap);
         return this;
       },
       row(label, labelX, value, valueX, gap = 14) {
@@ -798,28 +801,44 @@ class InvoiceService {
     P.bold();
     P.row('Totaal incl. BTW:', 370, this.formatMoney(grandTotal, invoice.currency), col5, 20);
     P.normal();
-    // === DESCRIPTION ===
+    // === TWO-COLUMN FOOTER: Description & Terms (left) | Bank details (right) ===
+    const footerStartY = P.y + 10;
+    // LEFT COLUMN: Description + Payment terms
+    P.y = footerStartY;
     if (invoice.description) {
       P.size(10).bold();
-      P.skip(10).text('Omschrijving:', 50, {}, 12);
+      P.text('Omschrijving:', 50, {}, 12);
       P.normal();
-      P.text(invoice.description, 50, {}, 12);
+      P.text(invoice.description, 50, { width: 260 }, 12);
+      P.skip(4);
     }
-    // === PAYMENT TERMS (Dutch law recommended) ===
     if (invoice.payment_terms) {
       P.size(10).bold();
-      P.skip(10).text('Betalingsvoorwaarden:', 50, {}, 12);
+      P.text('Betalingsvoorwaarden:', 50, {}, 12);
       P.normal();
-      P.text(invoice.payment_terms, 50, {}, 12);
+      P.text(invoice.payment_terms, 50, { width: 260 }, 12);
     }
-    // === BANK DETAILS FOR PAYMENT ===
+    const leftColEndY = P.y;
+    // RIGHT COLUMN: Bank details
+    P.y = footerStartY;
+    const bankCol = 340;
     P.size(10).bold();
-    P.skip(10).text('Betalingsgegevens:', 50, {}, 14);
+    P.text('Betalingsgegevens:', bankCol, { width: 220 }, 14);
     P.normal();
-    P.text(`IBAN: ${cfg.company.iban}`, 50);
-    if (cfg.company.bankName) P.text(`Bank: ${cfg.company.bankName}`, 50);
-    P.text(`T.n.v.: ${cfg.company.company}`, 50);
-    P.text(`O.v.v.: ${invoice.invoice_number}`, 50);
+    P.text(`IBAN: ${cfg.company.iban}`, bankCol, { width: 220 });
+    if (cfg.company.bankName) P.text(`Bank: ${cfg.company.bankName}`, bankCol, { width: 220 });
+    P.text(`T.n.v.: ${cfg.company.company}`, bankCol, { width: 220 });
+    P.text(`O.v.v.: ${invoice.invoice_number}`, bankCol, { width: 220 });
+    const rightColEndY = P.y;
+    P.y = Math.max(leftColEndY, rightColEndY);
+    // === CERTIFICATES (bottom of page) ===
+    if (fs_1.default.existsSync(certPath)) {
+      const certWidth = 180; // scaled from 360x100 original
+      const certHeight = certWidth * (100 / 360);
+      P.skip(20);
+      doc.image(certPath, 50, P.y, { width: certWidth, height: certHeight });
+      P.skip(certHeight);
+    }
     doc.end();
     return await done;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",