ztechno_core 0.0.129 → 0.0.131

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

@@ -14,6 +14,8 @@ export declare class InvoicesOrm extends ZOrm {
   findAll(): Promise<ZInvoice[]>;
   findLastByYear(year: number): Promise<ZInvoice | undefined>;
   updateStatus(id: number, status: ZInvoiceStatus, amount_paid?: number, paid_at?: string | null): Promise<void>;
+  /** Transitions status only if the current DB status matches `fromStatus`. Safe against concurrent updates. */
+  updateStatusConditional(id: number, status: ZInvoiceStatus, fromStatus: ZInvoiceStatus): Promise<void>;
   updatePaymentRef(
     id: number,
     payload: {

package/lib/mollie/orm/invoices_orm.js

@@ -89,6 +89,17 @@ class InvoicesOrm extends orm_1.ZOrm {
       { id, status, amount_paid: amount_paid ?? null, paid_at: paid_at ?? null },
     );
   }
+  /** Transitions status only if the current DB status matches `fromStatus`. Safe against concurrent updates. */
+  async updateStatusConditional(id, status, fromStatus) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\`
+      SET status=:status, updated_at=NOW()
+      WHERE id=:id AND status=:fromStatus
+    `,
+      { id, status, fromStatus },
+    );
+  }
   async updatePaymentRef(id, payload) {
     await this.sqlService.query(
       /*SQL*/ `

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

@@ -99,12 +99,6 @@ export declare class InvoiceService {
     template: Partial<Omit<ZInvoiceItemTemplate, 'id' | 'created_at' | 'updated_at'>>,
   ): Promise<ZInvoiceItemTemplate>;
   deleteItemTemplate(id: number): Promise<void>;
-  createInvoiceWithPayment(input: CreateInvoiceInput): Promise<{
-    invoice: ZInvoice;
-    checkoutUrl: string;
-    payment: import('@mollie/api-client/dist/types/data/payments/Payment').default;
-    payUrl: string;
-  }>;
   createInvoiceFromItems(
     input: CreateInvoiceInput,
     overrides?: CreateInvoiceOverrides,

package/lib/mollie/services/invoice_service.js

@@ -502,6 +502,7 @@ class InvoiceService {
   async deleteItemTemplate(id) {
     await this.templateOrm.delete(id);
   }
+  /** @internal */
   async createInvoiceWithPayment(input) {
     const draft = await this.createInvoiceDraft(input);
     const payment = await this.createMolliePaymentForInvoice(draft.invoice);
@@ -524,7 +525,7 @@ class InvoiceService {
     const { items, amount_due } = this.calcTotals(input.items);
     const useIdMode = this.invoiceNumberMode === 'id';
     const invoice_number = useIdMode ? `PENDING-${crypto_1.default.randomUUID()}` : await this.generateInvoiceNumber();
-    const status = overrides?.status ?? 'pending';
+    const status = overrides?.status ?? 'draft';
     const issuedAt = (0, orm_1.formatDatetime)(new Date());
     const paidAt = overrides?.paid_at ?? (status === 'paid' ? issuedAt : null);
     const amount_paid = overrides?.amount_paid ?? (status === 'paid' ? amount_due : 0);
@@ -1009,6 +1010,9 @@ class InvoiceService {
       ],
     });
     await this.invoicesOrm.incrementTimesSent(invoiceId);
+    if (!isReceipt) {
+      await this.invoicesOrm.updateStatusConditional(invoiceId, 'pending', 'draft');
+    }
     return {
       invoice_number: invoice.invoice_number,
       recipient: to,

package/lib/mollie/types/mollie_types.d.ts

@@ -18,6 +18,7 @@ export type ZCustomer = {
   updated_at?: string | Date;
 };
 export type ZInvoiceItemType = 'service' | 'subsidy';
+export type ZInvoiceStatus = 'draft' | 'pending' | 'paid' | 'failed' | 'canceled' | 'expired' | 'refunded' | 'archived';
 export type ZInvoiceItem = {
   id?: number;
   invoice_id: number;
@@ -53,7 +54,6 @@ export type CreateInvoiceOverrides = {
   mollie_payment_id?: string | null;
   checkout_url?: string | null;
 };
-export type ZInvoiceStatus = 'draft' | 'pending' | 'paid' | 'failed' | 'canceled' | 'expired' | 'refunded' | 'archived';
 export type ZInvoice = {
   id?: number;
   invoice_number: string;

package/package.json

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