ztechno_core 0.0.125 → 0.0.127

package/lib/core/mail_service.js

@@ -88,6 +88,7 @@ class ZMailService {
     const mailDetails = {
       from: mailOpts.from || this.opt.mailSender,
       to: mailOpts.recipient,
+      cc: mailOpts.cc || undefined,
       subject: mailOpts.subject,
       text: mailOpts.body || undefined,
       html: mailOpts.html || undefined,

package/lib/core/types/mail_types.d.ts

@@ -50,6 +50,7 @@ export type MailOptionsBase = {
   recipient: string;
   subject: string;
   from?: string;
+  cc?: string | string[];
   priority?: 'high' | 'normal' | 'low';
   dkim?: SingleDKIMKeyOptions;
   attachments?: MailAttachment[];

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

@@ -0,0 +1,12 @@
+import { ZSQLService } from '../..';
+import { ZOrm } from '../../core/orm/orm';
+import { ZInvoiceItemTemplate } from '../types/mollie_types';
+export declare class InvoiceItemTemplatesOrm extends ZOrm {
+  constructor(opt: { sqlService: ZSQLService; alias?: string });
+  create(template: Omit<ZInvoiceItemTemplate, 'id' | 'created_at' | 'updated_at'>): Promise<ZInvoiceItemTemplate>;
+  findById(id: number): Promise<ZInvoiceItemTemplate>;
+  findAll(): Promise<ZInvoiceItemTemplate[]>;
+  update(id: number, template: Partial<Omit<ZInvoiceItemTemplate, 'id' | 'created_at' | 'updated_at'>>): Promise<void>;
+  delete(id: number): Promise<void>;
+  createTable(): Promise<void>;
+}

package/lib/mollie/orm/invoice_item_templates_orm.js

@@ -0,0 +1,86 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.InvoiceItemTemplatesOrm = void 0;
+const orm_1 = require('../../core/orm/orm');
+class InvoiceItemTemplatesOrm extends orm_1.ZOrm {
+  constructor(opt) {
+    super({ sqlService: opt.sqlService, alias: opt.alias ?? 'mollie_invoice_item_templates' });
+  }
+  async create(template) {
+    const res = await this.sqlService.query(
+      /*SQL*/ `
+      INSERT INTO \`${this.alias}\`
+        (name, item_type, description, quantity, unit_price, vat_rate, sort_order)
+      VALUES
+        (:name, :item_type, :description, :quantity, :unit_price, :vat_rate, :sort_order)
+    `,
+      {
+        name: template.name,
+        item_type: template.item_type ?? 'service',
+        description: template.description,
+        quantity: template.quantity,
+        unit_price: template.unit_price,
+        vat_rate: template.vat_rate,
+        sort_order: template.sort_order ?? 0,
+      },
+    );
+    const insertId = res.insertId;
+    return await this.findById(insertId);
+  }
+  async findById(id) {
+    const res = await this.sqlService.exec({
+      query: `SELECT * FROM \`${this.alias}\` WHERE id=:id LIMIT 1`,
+      params: { id },
+    });
+    return res[0];
+  }
+  async findAll() {
+    return await this.sqlService.exec({
+      query: `SELECT * FROM \`${this.alias}\` ORDER BY sort_order, name`,
+    });
+  }
+  async update(id, template) {
+    const sets = [];
+    const params = { id };
+    const fields = ['name', 'item_type', 'description', 'quantity', 'unit_price', 'vat_rate', 'sort_order'];
+    for (const field of fields) {
+      if (template[field] !== undefined) {
+        sets.push(`${field}=:${field}`);
+        params[field] = template[field];
+      }
+    }
+    if (sets.length === 0) return;
+    sets.push('updated_at=NOW()');
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\` SET ${sets.join(', ')} WHERE id=:id
+    `,
+      params,
+    );
+  }
+  async delete(id) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      DELETE FROM \`${this.alias}\` WHERE id=:id
+    `,
+      { id },
+    );
+  }
+  async createTable() {
+    await this.sqlService.query(/*SQL*/ `
+      CREATE TABLE IF NOT EXISTS \`${this.alias}\` (
+        id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+        name VARCHAR(100) NOT NULL,
+        item_type ENUM('service','subsidy') NOT NULL DEFAULT 'service',
+        description VARCHAR(255) NOT NULL,
+        quantity DECIMAL(10,2) NOT NULL DEFAULT 1,
+        unit_price DECIMAL(12,2) NOT NULL,
+        vat_rate DECIMAL(5,2) NOT NULL DEFAULT 0.00,
+        sort_order SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+        created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+    `);
+  }
+}
+exports.InvoiceItemTemplatesOrm = InvoiceItemTemplatesOrm;

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

@@ -37,5 +37,6 @@ export declare class InvoicesOrm extends ZOrm {
     },
   ): Promise<void>;
   finalizePayToken(id: number): Promise<void>;
+  incrementTimesSent(id: number): Promise<void>;
   createTable(): Promise<void>;
 }

package/lib/mollie/orm/invoices_orm.js

@@ -10,9 +10,9 @@ class InvoicesOrm extends orm_1.ZOrm {
     const res = await this.sqlService.query(
       /*SQL*/ `
       INSERT INTO \`${this.alias}\`
-        (invoice_number, customer_id, subscription_id, subscription_period_start, subscription_period_end, mollie_customer_id, mollie_payment_id, pay_token_hash, pay_token_expires_at, pay_token_finalized_at, status, amount_due, amount_paid, currency, description, payment_terms, due_date, issued_at, paid_at, checkout_url, metadata)
+        (invoice_number, customer_id, subscription_id, subscription_period_start, subscription_period_end, mollie_customer_id, mollie_payment_id, pay_token_hash, pay_token_expires_at, pay_token_finalized_at, status, amount_due, amount_paid, currency, description, payment_terms, due_date, issued_at, paid_at, checkout_url, times_sent, metadata)
       VALUES
-        (:invoice_number, :customer_id, :subscription_id, :subscription_period_start, :subscription_period_end, :mollie_customer_id, :mollie_payment_id, :pay_token_hash, :pay_token_expires_at, :pay_token_finalized_at, :status, :amount_due, :amount_paid, :currency, :description, :payment_terms, :due_date, :issued_at, :paid_at, :checkout_url, :metadata)
+        (:invoice_number, :customer_id, :subscription_id, :subscription_period_start, :subscription_period_end, :mollie_customer_id, :mollie_payment_id, :pay_token_hash, :pay_token_expires_at, :pay_token_finalized_at, :status, :amount_due, :amount_paid, :currency, :description, :payment_terms, :due_date, :issued_at, :paid_at, :checkout_url, :times_sent, :metadata)
       ON DUPLICATE KEY UPDATE
         subscription_id=VALUES(subscription_id),
         subscription_period_start=VALUES(subscription_period_start),
@@ -32,10 +32,11 @@ class InvoicesOrm extends orm_1.ZOrm {
         issued_at=VALUES(issued_at),
         paid_at=VALUES(paid_at),
         checkout_url=VALUES(checkout_url),
+        times_sent=VALUES(times_sent),
         metadata=VALUES(metadata),
         updated_at=NOW()
     `,
-      invoice,
+      { ...invoice, times_sent: invoice.times_sent ?? 0 },
     );
     return res;
   }
@@ -140,6 +141,16 @@ class InvoicesOrm extends orm_1.ZOrm {
       { id },
     );
   }
+  async incrementTimesSent(id) {
+    await this.sqlService.query(
+      /*SQL*/ `
+      UPDATE \`${this.alias}\`
+      SET times_sent = times_sent + 1, updated_at=NOW()
+      WHERE id=:id
+    `,
+      { id },
+    );
+  }
   async createTable() {
     await this.sqlService.query(/*SQL*/ `
       CREATE TABLE IF NOT EXISTS \`${this.alias}\` (
@@ -154,7 +165,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') NOT NULL DEFAULT 'draft',
+        status ENUM('draft','pending','paid','failed','canceled','expired','refunded','archived') 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',
@@ -164,6 +175,7 @@ class InvoicesOrm extends orm_1.ZOrm {
         issued_at DATETIME,
         paid_at DATETIME,
         checkout_url VARCHAR(512),
+        times_sent INT NOT NULL DEFAULT 0,
         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

@@ -11,12 +11,14 @@ import {
   CreateInvoiceOverrides,
   ZIssuedPayToken,
   ZPayResolveResult,
+  ZInvoiceItemTemplate,
 } from '../types/mollie_types';
 export declare class InvoiceService {
   private opt;
   private invoicesOrm;
   private itemsOrm;
   private paymentsOrm;
+  private templateOrm;
   private subscriptionsOrm;
   private subscriptionItemsOrm;
   private payTokenSecret;
@@ -40,6 +42,8 @@ export declare class InvoiceService {
   private ensurePayTokenSchema;
   private ensureSubscriptionInvoiceSchema;
   private ensureSubsidyItemTypeSchema;
+  private ensureSentCountSchema;
+  private ensureArchivedStatusSchema;
   private ensureInvoicePaymentSchema;
   private generateInvoiceNumber;
   private getWebhookUrl;
@@ -69,6 +73,24 @@ export declare class InvoiceService {
   listInvoices(): Promise<ZInvoice[]>;
   getInvoiceById(invoiceId: number): Promise<ZInvoice | undefined>;
   listPayments(invoice_id: number): Promise<ZInvoicePayment[]>;
+  archiveInvoice(invoiceId: number): Promise<ZInvoice>;
+  duplicateInvoice(
+    sourceInvoiceId: number,
+    customerId: number,
+  ): Promise<{
+    invoice: ZInvoice;
+    pay: ZIssuedPayToken;
+  }>;
+  createItemTemplate(
+    template: Omit<ZInvoiceItemTemplate, 'id' | 'created_at' | 'updated_at'>,
+  ): Promise<ZInvoiceItemTemplate>;
+  listItemTemplates(): Promise<ZInvoiceItemTemplate[]>;
+  getItemTemplate(id: number): Promise<ZInvoiceItemTemplate>;
+  updateItemTemplate(
+    id: number,
+    template: Partial<Omit<ZInvoiceItemTemplate, 'id' | 'created_at' | 'updated_at'>>,
+  ): Promise<ZInvoiceItemTemplate>;
+  deleteItemTemplate(id: number): Promise<void>;
   createInvoiceWithPayment(input: CreateInvoiceInput): Promise<{
     invoice: ZInvoice;
     checkoutUrl: string;
@@ -96,6 +118,7 @@ export declare class InvoiceService {
     recipient?: string,
     opt?: {
       mode?: 'invoice' | 'receipt';
+      ccOwner?: boolean;
     },
   ): Promise<{
     invoice_number: string;

package/lib/mollie/services/invoice_service.js

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require('path'));
 const fs_1 = __importDefault(require('fs'));
 const crypto_1 = __importDefault(require('crypto'));
 const invoice_items_orm_1 = require('../orm/invoice_items_orm');
+const invoice_item_templates_orm_1 = require('../orm/invoice_item_templates_orm');
 const invoice_payments_orm_1 = require('../orm/invoice_payments_orm');
 const invoices_orm_1 = require('../orm/invoices_orm');
 const subscription_items_orm_1 = require('../orm/subscription_items_orm');
@@ -31,6 +32,7 @@ class InvoiceService {
     this.invoicesOrm = new invoices_orm_1.InvoicesOrm({ sqlService: opt.sqlService });
     this.itemsOrm = new invoice_items_orm_1.InvoiceItemsOrm({ sqlService: opt.sqlService });
     this.paymentsOrm = new invoice_payments_orm_1.InvoicePaymentsOrm({ sqlService: opt.sqlService });
+    this.templateOrm = new invoice_item_templates_orm_1.InvoiceItemTemplatesOrm({ sqlService: opt.sqlService });
     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;
@@ -41,10 +43,13 @@ class InvoiceService {
     await this.invoicesOrm.ensureTableExists();
     await this.itemsOrm.ensureTableExists();
     await this.paymentsOrm.ensureTableExists();
+    await this.templateOrm.ensureTableExists();
     await this.ensurePayTokenSchema();
     await this.ensureSubscriptionInvoiceSchema();
     await this.ensureInvoicePaymentSchema();
     await this.ensureSubsidyItemTypeSchema();
+    await this.ensureSentCountSchema();
+    await this.ensureArchivedStatusSchema();
   }
   async ensurePayTokenSchema() {
     const table = this.invoicesOrm.alias;
@@ -104,6 +109,31 @@ class InvoiceService {
       );
     }
   }
+  async ensureSentCountSchema() {
+    const table = this.invoicesOrm.alias;
+    const rows = await this.opt.sqlService.exec({
+      query: `SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=:schema AND TABLE_NAME=:tableName AND COLUMN_NAME='times_sent' LIMIT 1`,
+      params: { schema: this.opt.sqlService.database, tableName: table },
+    });
+    if (!rows?.[0]) {
+      await this.opt.sqlService.query(
+        `ALTER TABLE \`${table}\` ADD COLUMN times_sent INT NOT NULL DEFAULT 0 AFTER checkout_url`,
+      );
+    }
+  }
+  async ensureArchivedStatusSchema() {
+    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`,
+      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'`,
+      );
+    }
+  }
   async ensureInvoicePaymentSchema() {
     const table = this.paymentsOrm.alias;
     const ensureColumn = async (column, sqlType) => {
@@ -389,6 +419,54 @@ class InvoiceService {
   async listPayments(invoice_id) {
     return await this.paymentsOrm.findByInvoice(invoice_id);
   }
+  // ==================== Archive ====================
+  async archiveInvoice(invoiceId) {
+    const invoice = await this.invoicesOrm.findById(invoiceId);
+    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 (invoice.status === 'archived') {
+      return invoice;
+    }
+    await this.invoicesOrm.updateStatus(invoiceId, 'archived');
+    return await this.invoicesOrm.findById(invoiceId);
+  }
+  // ==================== Duplicate ====================
+  async duplicateInvoice(sourceInvoiceId, customerId) {
+    const items = await this.itemsOrm.findByInvoice(sourceInvoiceId);
+    if (items.length === 0) {
+      throw new Error(`Source invoice ${sourceInvoiceId} has no items to duplicate`);
+    }
+    const mappedItems = items.map((it) => ({
+      description: it.description,
+      quantity: it.quantity,
+      unit_price: it.unit_price,
+      vat_rate: it.vat_rate,
+      item_type: it.item_type,
+      sort_order: it.sort_order,
+    }));
+    return await this.createInvoiceDraft({ customer_id: customerId, items: mappedItems });
+  }
+  // ==================== Item Templates ====================
+  async createItemTemplate(template) {
+    return await this.templateOrm.create(template);
+  }
+  async listItemTemplates() {
+    return await this.templateOrm.findAll();
+  }
+  async getItemTemplate(id) {
+    return await this.templateOrm.findById(id);
+  }
+  async updateItemTemplate(id, template) {
+    await this.templateOrm.update(id, template);
+    return await this.templateOrm.findById(id);
+  }
+  async deleteItemTemplate(id) {
+    await this.templateOrm.delete(id);
+  }
   async createInvoiceWithPayment(input) {
     const draft = await this.createInvoiceDraft(input);
     const payment = await this.createMolliePaymentForInvoice(draft.invoice);
@@ -571,8 +649,8 @@ class InvoiceService {
         subscription_period_end: (0, orm_1.formatDatetime)(periodEnd),
       });
     }
-    if (subscription && mappedStatus === 'paid' && (!hadInvoice || previousStatus !== 'paid')) {
-      await this.sendInvoiceEmail(invoice.id, undefined, { mode: 'receipt' });
+    if (mappedStatus === 'paid' && (!hadInvoice || previousStatus !== 'paid')) {
+      await this.sendInvoiceEmail(invoice.id, undefined, { mode: 'receipt', ccOwner: true });
     }
     if (
       subscription &&
@@ -874,9 +952,11 @@ class InvoiceService {
     const content = isReceipt
       ? `<br>Beste ${customer.name},<br><br>We hebben uw betaling ontvangen. De factuur vindt u in de bijlage.<br><br>Dank u wel, ${cfg.company.companyShort}<br>`
       : `<br>Beste ${customer.name},<br><br>U vindt uw factuur in de bijlage.<br><br><a href="${pay?.payUrl}" style="display:inline-block;padding:10px 16px;background:#0d6efd;color:#fff;text-decoration:none;border-radius:6px;">Betaal nu</a><br><br>Dank u wel, ${cfg.company.companyShort}<br>`;
+    const cc = isReceipt ? undefined : opt?.ccOwner ? cfg.contact.contactQuote : undefined;
     await this.mailService.sendAdvanced({
       from: `${cfg.company.company} <${cfg.contact.contact}>`,
       recipient: to,
+      cc,
       subject,
       template: 'template.html',
       inject: {
@@ -893,6 +973,7 @@ class InvoiceService {
         },
       ],
     });
+    await this.invoicesOrm.incrementTimesSent(invoiceId);
     return {
       invoice_number: invoice.invoice_number,
       recipient: to,

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

@@ -53,7 +53,7 @@ export type CreateInvoiceOverrides = {
   mollie_payment_id?: string | null;
   checkout_url?: string | null;
 };
-export type ZInvoiceStatus = 'draft' | 'pending' | 'paid' | 'failed' | 'canceled' | 'expired' | 'refunded';
+export type ZInvoiceStatus = 'draft' | 'pending' | 'paid' | 'failed' | 'canceled' | 'expired' | 'refunded' | 'archived';
 export type ZInvoice = {
   id?: number;
   invoice_number: string;
@@ -76,6 +76,7 @@ export type ZInvoice = {
   issued_at?: string | null;
   paid_at?: string | null;
   checkout_url?: string | null;
+  times_sent?: number;
   metadata?: any;
   created_at?: string | Date;
   updated_at?: string | Date;
@@ -145,6 +146,18 @@ export type ZSubscription = {
   created_at?: string | Date;
   updated_at?: string | Date;
 };
+export type ZInvoiceItemTemplate = {
+  id?: number;
+  name: string;
+  item_type?: ZInvoiceItemType;
+  description: string;
+  quantity: number;
+  unit_price: number;
+  vat_rate: number;
+  sort_order?: number;
+  created_at?: string | Date;
+  updated_at?: string | Date;
+};
 export type ZIssuedPayToken = {
   token: string;
   expiresAt: string;

package/package.json

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