ztechno_core 0.0.132 → 0.0.133

package/lib/mollie/orm/invoice_status_log_orm.js

@@ -36,8 +36,8 @@ class InvoiceStatusLogOrm extends orm_1.ZOrm {
       CREATE TABLE IF NOT EXISTS \`${this.alias}\` (
         id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
         invoice_id BIGINT UNSIGNED NOT NULL,
-        from_status ENUM('draft','pending','paid','failed','canceled','expired','refunded','archived') NULL,
-        to_status ENUM('draft','pending','paid','failed','canceled','expired','refunded','archived') NOT NULL,
+        from_status ENUM('draft','pending','paid','failed','canceled','expired','refunded') NULL,
+        to_status ENUM('draft','pending','paid','failed','canceled','expired','refunded') NOT NULL,
         actor_type ENUM('webhook','system','admin') NOT NULL,
         mollie_payment_id VARCHAR(64) NULL,
         note VARCHAR(512) NULL,

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

@@ -54,6 +54,9 @@ export declare class InvoicesOrm extends ZOrm {
   ): Promise<void>;
   finalizePayToken(id: number): Promise<void>;
   incrementTimesSent(id: number): Promise<void>;
+  setArchivedAt(id: number): Promise<void>;
+  clearArchivedAt(id: number): Promise<void>;
+  isArchived(invoice: ZInvoice): boolean;
   updateMutableFields(
     id: number,
     fields: {

package/lib/mollie/orm/invoices_orm.js

@@ -190,6 +190,29 @@ class InvoicesOrm extends orm_1.ZOrm {
       { id },
     );
   }
+  async setArchivedAt(id) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\`
+      SET archived_at=NOW(), updated_at=NOW()
+      WHERE id=:id
+    `,
+      { id },
+    );
+  }
+  async clearArchivedAt(id) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\`
+      SET archived_at=NULL, updated_at=NOW()
+      WHERE id=:id
+    `,
+      { id },
+    );
+  }
+  isArchived(invoice) {
+    return invoice.archived_at != null;
+  }
   async updateMutableFields(id, fields) {
     const sets = [];
     const params = { id };
@@ -235,7 +258,7 @@ class InvoicesOrm extends orm_1.ZOrm {
         pay_token_hash CHAR(64),
         pay_token_expires_at DATETIME,
         pay_token_finalized_at DATETIME,
-        status ENUM('draft','pending','paid','failed','canceled','expired','refunded','archived') NOT NULL DEFAULT 'draft',
+        status ENUM('draft','pending','paid','failed','canceled','expired','refunded') NOT NULL DEFAULT 'draft',
         amount_due DECIMAL(12,2) NOT NULL,
         amount_paid DECIMAL(12,2) NOT NULL DEFAULT 0,
         currency CHAR(3) NOT NULL DEFAULT 'EUR',
@@ -246,6 +269,7 @@ class InvoicesOrm extends orm_1.ZOrm {
         paid_at DATETIME,
         checkout_url VARCHAR(512),
         times_sent INT NOT NULL DEFAULT 0,
+        archived_at DATETIME NULL,
         metadata JSON NULL,
         created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
         updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

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

@@ -50,7 +50,7 @@ export declare class InvoiceService {
   private ensureSubscriptionInvoiceSchema;
   private ensureSubsidyItemTypeSchema;
   private ensureSentCountSchema;
-  private ensureArchivedStatusSchema;
+  private ensureArchivedAtSchema;
   private ensureInvoicePaymentSchema;
   private generateInvoiceNumber;
   private getWebhookUrl;
@@ -88,6 +88,7 @@ export declare class InvoiceService {
     },
   ): Promise<ZInvoice>;
   archiveInvoice(invoiceId: number): Promise<ZInvoice>;
+  unarchiveInvoice(invoiceId: number): Promise<ZInvoice>;
   duplicateInvoice(
     sourceInvoiceId: number,
     customerId: number,

package/lib/mollie/services/invoice_service.js

@@ -70,7 +70,7 @@ class InvoiceService {
     await this.ensureInvoicePaymentSchema();
     await this.ensureSubsidyItemTypeSchema();
     await this.ensureSentCountSchema();
-    await this.ensureArchivedStatusSchema();
+    await this.ensureArchivedAtSchema();
   }
   async ensurePayTokenSchema() {
     const table = this.invoicesOrm.alias;
@@ -142,17 +142,14 @@ class InvoiceService {
       );
     }
   }
-  async ensureArchivedStatusSchema() {
+  async ensureArchivedAtSchema() {
     const table = this.invoicesOrm.alias;
     const rows = await this.opt.sqlService.exec({
-      query: `SELECT COLUMN_TYPE FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=:schema AND TABLE_NAME=:tableName AND COLUMN_NAME='status' LIMIT 1`,
+      query: `SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=:schema AND TABLE_NAME=:tableName AND COLUMN_NAME='archived_at' LIMIT 1`,
       params: { schema: this.opt.sqlService.database, tableName: table },
     });
-    const colType = rows?.[0]?.COLUMN_TYPE ?? '';
-    if (colType && !colType.includes('archived')) {
-      await this.opt.sqlService.query(
-        `ALTER TABLE \`${table}\` MODIFY COLUMN status ENUM('draft','pending','paid','failed','canceled','expired','refunded','archived') NOT NULL DEFAULT 'draft'`,
-      );
+    if (!rows?.[0]) {
+      await this.opt.sqlService.query(`ALTER TABLE \`${table}\` ADD COLUMN archived_at DATETIME NULL AFTER times_sent`);
     }
   }
   async ensureInvoicePaymentSchema() {
@@ -451,6 +448,8 @@ class InvoiceService {
     if (!invoice) throw new Error(`Invoice ${invoiceId} not found`);
     if (invoice.status !== 'draft')
       throw new Error(`Invoice ${invoice.invoice_number} cannot be edited (status: ${invoice.status})`);
+    if (this.invoicesOrm.isArchived(invoice))
+      throw new Error(`Invoice ${invoice.invoice_number} cannot be edited (archived)`);
     if ((invoice.times_sent ?? 0) > 0)
       throw new Error(
         `Invoice ${invoice.invoice_number} cannot be edited (already sent ${invoice.times_sent} time(s))`,
@@ -484,16 +483,36 @@ class InvoiceService {
     if (!invoice) {
       throw new Error(`Invoice ${invoiceId} not found`);
     }
-    if (invoice.status === 'paid') {
-      throw new Error(`Cannot archive a paid invoice (${invoice.invoice_number})`);
+    if (this.invoicesOrm.isArchived(invoice)) {
+      return invoice;
     }
-    if (invoice.status === 'archived') {
+    await this.invoicesOrm.setArchivedAt(invoiceId);
+    // Audit log: record archive event
+    await this.invoiceStatusLogOrm.insert({
+      invoice_id: invoiceId,
+      from_status: invoice.status,
+      to_status: invoice.status,
+      actor_type: 'admin',
+      note: 'Invoice archived (archived_at set)',
+    });
+    return await this.invoicesOrm.findById(invoiceId);
+  }
+  async unarchiveInvoice(invoiceId) {
+    const invoice = await this.invoicesOrm.findById(invoiceId);
+    if (!invoice) {
+      throw new Error(`Invoice ${invoiceId} not found`);
+    }
+    if (!this.invoicesOrm.isArchived(invoice)) {
       return invoice;
     }
-    await this.invoicesOrm.updateStatus(invoiceId, 'archived', undefined, undefined, {
-      fromStatus: invoice.status,
-      actorType: 'admin',
-      note: 'Invoice archived',
+    await this.invoicesOrm.clearArchivedAt(invoiceId);
+    // Audit log: record unarchive event
+    await this.invoiceStatusLogOrm.insert({
+      invoice_id: invoiceId,
+      from_status: invoice.status,
+      to_status: invoice.status,
+      actor_type: 'admin',
+      note: 'Invoice unarchived (archived_at cleared)',
     });
     return await this.invoicesOrm.findById(invoiceId);
   }

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

@@ -18,7 +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 ZInvoiceStatus = 'draft' | 'pending' | 'paid' | 'failed' | 'canceled' | 'expired' | 'refunded';
 export type ZInvoiceItem = {
   id?: number;
   invoice_id: number;
@@ -77,6 +77,7 @@ export type ZInvoice = {
   paid_at?: string | null;
   checkout_url?: string | null;
   times_sent?: number;
+  archived_at?: string | null;
   metadata?: any;
   created_at?: string | Date;
   updated_at?: string | Date;

package/package.json

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