ztechno_core 0.0.123 → 0.0.126

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/invoices_orm.js

@@ -144,7 +144,7 @@ class InvoicesOrm extends orm_1.ZOrm {
     await this.sqlService.query(/*SQL*/ `
       CREATE TABLE IF NOT EXISTS \`${this.alias}\` (
         id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
-        invoice_number VARCHAR(32) NOT NULL,
+        invoice_number VARCHAR(44) NOT NULL,
         customer_id BIGINT UNSIGNED NOT NULL,
         subscription_id BIGINT UNSIGNED NULL,
         subscription_period_start DATETIME,

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

@@ -96,6 +96,7 @@ export declare class InvoiceService {
     recipient?: string,
     opt?: {
       mode?: 'invoice' | 'receipt';
+      ccOwner?: boolean;
     },
   ): Promise<{
     invoice_number: string;

package/lib/mollie/services/invoice_service.js

@@ -571,8 +571,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 &&
@@ -782,20 +782,20 @@ class InvoiceService {
     P.rule().skip(10);
     // === TOTALS (Dutch law: subtotal, VAT breakdown per rate, subtotal incl. VAT) ===
     P.size(10);
-    P.row('Subtotaal excl. BTW:', 370, this.formatMoney(subtotal, invoice.currency), col5);
+    P.row('Subtotaal excl. BTW:', 290, this.formatMoney(subtotal, invoice.currency), col5);
     let totalVat = 0;
     for (const [rate, { vat }] of Object.entries(vatByRate)) {
       totalVat += vat;
-      P.row(`BTW ${rate}%`, 370, this.formatMoney(vat, invoice.currency), col5);
+      P.row(`BTW ${rate}%`, 290, this.formatMoney(vat, invoice.currency), col5);
     }
     const serviceTotalIncVat = subtotal + totalVat;
     // === SUBSIDY SECTION (shown before grand total when subsidies are present) ===
     let subsidyTotal = 0;
     if (subsidyItems.length > 0) {
       P.bold().size(10);
-      P.row('Totaal incl. BTW:', 370, this.formatMoney(serviceTotalIncVat, invoice.currency), col5)
+      P.row('Totaal incl. BTW:', 290, this.formatMoney(serviceTotalIncVat, invoice.currency), col5)
         .skip(4)
-        .dashedRule(370, 560)
+        .dashedRule(290, 560)
         .skip(8);
       P.bold().size(9);
       P.text('Geschatte Subsidie', 50, { width: 300 }, 12);
@@ -807,7 +807,7 @@ class InvoiceService {
         doc.text(`- ${this.formatMoney(Math.abs(subsidyAmount), invoice.currency)}`, col5, P.y);
         P.skip(14);
       }
-      P.dashedRule(370, 560).skip(8);
+      P.dashedRule(290, 560).skip(8);
     }
     const grandTotal = serviceTotalIncVat + subsidyTotal; // subsidyTotal is negative
     P.size(10);
@@ -816,7 +816,7 @@ class InvoiceService {
       P.row('Uw Totale Investering incl. Subsidie:', 290, this.formatMoney(grandTotal, invoice.currency), col5, 20);
     } else {
       P.bold();
-      P.row('Totaal incl. BTW:', 370, this.formatMoney(grandTotal, invoice.currency), col5, 20);
+      P.row('Totaal incl. BTW:', 290, this.formatMoney(grandTotal, invoice.currency), col5, 20);
       P.normal();
     }
     // === TWO-COLUMN FOOTER: Description & Terms (left) | Bank details (right) ===
@@ -874,9 +874,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: {

package/package.json

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