ztechno_core 0.0.108 → 0.0.110

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

@@ -1,8 +1,7 @@
 export type Coordinates = [number, number];
 export type CompanyInfo = {
-  baseUrl: string;
-  website: string;
   company: string;
+  companyShort: string;
   copyright: string;
   kvk: string;
   kvkUrl: string;
@@ -38,6 +37,7 @@ export type RenderContext = {
   projectsHtml: string;
 };
 export type RenderData = {
+  baseUrl: string;
   company: CompanyInfo;
   address: Address;
   contact: ContactInfo;

package/lib/mollie/services/invoice_service.js

@@ -22,7 +22,7 @@ class InvoiceService {
     return this.opt.siteConfig;
   }
   get baseUrl() {
-    return this.opt.siteConfig.company.website;
+    return this.opt.siteConfig.baseUrl;
   }
   constructor(opt) {
     this.opt = opt;
@@ -637,7 +637,7 @@ class InvoiceService {
     // === COMPANY LOGO (left-aligned) ===
     const logoPath = path_1.default.join(process.cwd(), '../zwebsite/public/img/invoice/invoice-logo.png');
     if (fs_1.default.existsSync(logoPath)) {
-      doc.image(logoPath, 50, 50, { width: 200 }); // Left side of A4 page
+      doc.image(logoPath, 50, 50, { width: 150 }); // Left side of A4 page
     }
     const cfg = this.opt.siteConfig;
     // === SUPPLIER INFORMATION (right-aligned, Dutch law: name, address, BTW, KVK) ===
@@ -693,7 +693,7 @@ class InvoiceService {
     const col4 = 390; // Unit price (excl. VAT)
     const col5 = 480; // Total Ex. VAT
     doc.fontSize(9).font('Helvetica-Bold');
-    doc.text('Omschrijving', col1, tableTop);
+    doc.text('Product / Dienst', col1, tableTop);
     doc.text('Aantal', col2, tableTop);
     doc.text('BTW %', col3, tableTop);
     doc.text('Prijs excl.', col4, tableTop);
@@ -834,18 +834,18 @@ class InvoiceService {
     const subject = isReceipt ? `Betalingsbevestiging ${invoice.invoice_number}` : `Factuur ${invoice.invoice_number}`;
     const title = isReceipt ? `Betaling ontvangen ${invoice.invoice_number}` : `Factuur ${invoice.invoice_number}`;
     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.website}<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.website}<br>`;
+      ? `<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>`;
     await this.mailService.sendAdvanced({
-      from: `${cfg.company.website} <${cfg.contact.contact}>`,
+      from: `${cfg.company.company} <${cfg.contact.contact}>`,
       recipient: to,
       subject,
       template: 'template.html',
       inject: {
         title,
         content,
-        logoSrc: `${cfg.company.website}/img/logo-small.png`,
-        baseUrl: cfg.company.website,
+        logoSrc: `${cfg.baseUrl}/img/logo-small.png`,
+        baseUrl: cfg.baseUrl,
       },
       attachments: [
         {

package/package.json

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