ztechno_core 0.0.134 → 0.0.136

package/lib/mollie/services/invoice_service.js

@@ -880,20 +880,18 @@ class InvoiceService {
     // === LINE ITEMS TABLE (Dutch law: description, quantity, unit price excl. VAT, VAT rate, total) ===
     const tableTop = doc.y;
     const col1 = 50; // Description
-    const col2 = 280; // Qty
-    const col3 = 330; // VAT %
+    const col2 = 280; // VAT %
+    const col3 = hideProductPrice ? 480 : 330; // Qty (wider spacing when price cols hidden)
     const col4 = 390; // Unit price (excl. VAT)
     const col5 = 480; // Total Ex. VAT
     doc.fontSize(9).font('Helvetica-Bold');
     doc.text('Product / Dienst', col1, tableTop);
-    if (!hideProductPrice) {
-      doc.text('Aantal', col2, tableTop);
-    }
-    doc.text('BTW %', col3, tableTop);
+    doc.text('BTW %', col2, tableTop);
+    doc.text('Aantal', col3, tableTop);
     if (!hideProductPrice) {
       doc.text('Prijs excl.', col4, tableTop);
+      doc.text('Totaal excl.', col5, tableTop);
     }
-    doc.text('Totaal excl.', col5, tableTop);
     doc.font('Helvetica');
     doc
       .moveTo(50, tableTop + 14)
@@ -956,14 +954,12 @@ class InvoiceService {
       vatByRate[vatRate].vat += lineTotal - lineSubtotal;
       P.size(9);
       doc.text(item.description, col1, P.y, { width: 225 });
-      if (!hideProductPrice) {
-        doc.text(String(item.quantity), col2, P.y);
-      }
-      doc.text(`${vatRate.toFixed(0)}%`, col3, P.y);
+      doc.text(`${vatRate.toFixed(0)}%`, col2, P.y);
+      doc.text(`X ${item.quantity}`, col3, P.y);
       if (!hideProductPrice) {
         doc.text(this.formatMoney(Number(item.unit_price), invoice.currency), col4, P.y);
+        doc.text(this.formatMoney(lineSubtotal, invoice.currency), col5, P.y);
       }
-      doc.text(this.formatMoney(lineSubtotal, invoice.currency), col5, P.y);
       P.skip(16);
     }
     P.rule().skip(10);

package/package.json

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