ztechno_core 0.0.113 → 0.0.115

package/lib/mollie/orm/invoices_orm.d.ts

@@ -8,6 +8,7 @@ export declare class InvoicesOrm extends ZOrm {
     affectedRows: number;
   }>;
   findById(id: number): Promise<ZInvoice>;
+  updateInvoiceNumber(id: number, invoice_number: string): Promise<void>;
   findByInvoiceNumber(invoice_number: string): Promise<ZInvoice>;
   findByPayTokenHash(pay_token_hash: string): Promise<ZInvoice>;
   findAll(): Promise<ZInvoice[]>;

package/lib/mollie/orm/invoices_orm.js

@@ -46,6 +46,14 @@ class InvoicesOrm extends orm_1.ZOrm {
     });
     return res[0];
   }
+  async updateInvoiceNumber(id, invoice_number) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\` SET invoice_number=:invoice_number, updated_at=NOW() WHERE id=:id
+    `,
+      { id, invoice_number },
+    );
+  }
   async findByInvoiceNumber(invoice_number) {
     const res = await this.sqlService.exec({
       query: `SELECT * FROM \`${this.alias}\` WHERE invoice_number=:invoice_number LIMIT 1`,

package/lib/mollie/services/invoice_service.d.ts

@@ -22,6 +22,8 @@ export declare class InvoiceService {
   private payTokenSecret;
   private payTokenLifetimeMs;
   private mailService;
+  private invoiceNumberMode;
+  private invoiceNumberFormat;
   private get config();
   private get baseUrl();
   constructor(opt: {
@@ -31,6 +33,8 @@ export declare class InvoiceService {
     mailService: ZMailService;
     siteConfig: Omit<RenderData, 'context'>;
     payTokenSecret: string;
+    invoiceNumberMode?: 'sequence' | 'id';
+    invoiceNumberFormat?: (id: number) => string;
   });
   autoInit(): Promise<void>;
   private ensurePayTokenSchema;

package/lib/mollie/services/invoice_service.js

@@ -34,6 +34,8 @@ class InvoiceService {
     this.subscriptionsOrm = new subscriptions_orm_1.SubscriptionsOrm({ sqlService: opt.sqlService });
     this.subscriptionItemsOrm = new subscription_items_orm_1.SubscriptionItemsOrm({ sqlService: opt.sqlService });
     this.mailService = opt.mailService;
+    this.invoiceNumberMode = opt.invoiceNumberMode ?? 'sequence';
+    this.invoiceNumberFormat = opt.invoiceNumberFormat ?? ((id) => `INV-${id.toString().padStart(6, '0')}`);
   }
   async autoInit() {
     await this.invoicesOrm.ensureTableExists();
@@ -407,7 +409,8 @@ class InvoiceService {
       throw new Error(`Customer ${customer.id} missing mollie_customer_id`);
     }
     const { items, amount_due } = this.calcTotals(input.items);
-    const invoice_number = await this.generateInvoiceNumber();
+    const useIdMode = this.invoiceNumberMode === 'id';
+    const invoice_number = useIdMode ? `PENDING-${crypto_1.default.randomUUID()}` : await this.generateInvoiceNumber();
     const status = overrides?.status ?? 'pending';
     const issuedAt = (0, orm_1.formatDatetime)(new Date());
     const paidAt = overrides?.paid_at ?? (status === 'paid' ? issuedAt : null);
@@ -435,8 +438,17 @@ class InvoiceService {
       checkout_url: overrides?.checkout_url ?? null,
       metadata: input.metadata ?? null,
     };
-    await this.invoicesOrm.create(invoicePayload);
-    const savedInvoice = await this.invoicesOrm.findByInvoiceNumber(invoice_number);
+    const createResult = await this.invoicesOrm.create(invoicePayload);
+    let savedInvoice;
+    if (useIdMode) {
+      const insertId = createResult.insertId;
+      if (!insertId) throw new Error('Failed to get insertId for id-based invoice numbering');
+      const finalNumber = this.invoiceNumberFormat(insertId);
+      await this.invoicesOrm.updateInvoiceNumber(insertId, finalNumber);
+      savedInvoice = await this.invoicesOrm.findById(insertId);
+    } else {
+      savedInvoice = await this.invoicesOrm.findByInvoiceNumber(invoice_number);
+    }
     if (!savedInvoice) {
       throw new Error('Failed to persist invoice');
     }
@@ -715,8 +727,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) {

package/package.json

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