@infuro/cms-core 1.0.36 → 1.0.39

package/dist/{chunk-COBORIJH.cjs → chunk-22FFHLTO.cjs}

@@ -3,7 +3,6 @@
 var chunkUCKN4BBY_cjs = require('./chunk-UCKN4BBY.cjs');
 var chunkXW5ATPRW_cjs = require('./chunk-XW5ATPRW.cjs');
 var chunkOOTLNH63_cjs = require('./chunk-OOTLNH63.cjs');
-var chunkSPQFNIYJ_cjs = require('./chunk-SPQFNIYJ.cjs');
 var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
 var clientSes = require('@aws-sdk/client-ses');
 var nodemailer = require('nodemailer');
@@ -440,9 +439,9 @@ var WhatsAppService = class {
     let body = opts.body?.trim() ?? "";
     const variables = opts.variables ?? {};
     if (opts.templateKey?.trim() && this.getMessageTemplateRow) {
-      const { resolveEventOrderTemplate: resolveEventOrderTemplate2, EVENT_ORDER_TEMPLATE_KEY } = await import('./event-order-defaults-EMWBIGL3.cjs');
+      const { resolveEventOrderTemplate, EVENT_ORDER_TEMPLATE_KEY } = await import('./event-order-defaults-EMWBIGL3.cjs');
       if (opts.templateKey.trim() === EVENT_ORDER_TEMPLATE_KEY) {
-        const resolved = await resolveEventOrderTemplate2("whatsapp", async (ch, key) => {
+        const resolved = await resolveEventOrderTemplate("whatsapp", async (ch, key) => {
           const row = await this.getMessageTemplateRow(ch, key);
           if (!row) return null;
           return {
@@ -2040,7 +2039,7 @@ function emailPlugin(config) {
 }
 chunkUSNT2KNT_cjs.__name(emailPlugin, "emailPlugin");
 
-// src/lib/whatsapp-trigger-dispatcher.ts
+// src/lib/order-notification-dispatcher.ts
 var initialized = false;
 function maskPhone3(raw) {
   const digits = String(raw ?? "").replace(/\D/g, "");
@@ -2094,48 +2093,52 @@ async function isTriggerCatalogEnabled(triggerKey, dataSource, entityMap) {
   }
 }
 chunkUSNT2KNT_cjs.__name(isTriggerCatalogEnabled, "isTriggerCatalogEnabled");
-async function loadBoundWhatsAppTemplate(triggerKey, dataSource, entityMap) {
-  if (!entityMap.whatsapp_trigger_bindings || !entityMap.message_templates) {
-    console.warn("[order-notifications] bindings or message_templates missing from entityMap");
+async function loadBoundTemplate(triggerKey, channel, dataSource, entityMap) {
+  if (!entityMap.order_notification_bindings || !entityMap.message_templates) {
+    console.warn("[order-notifications] order_notification_bindings or message_templates missing from entityMap");
     return null;
   }
-  const binding = await dataSource.getRepository(entityMap.whatsapp_trigger_bindings).findOne({
+  const binding = await dataSource.getRepository(entityMap.order_notification_bindings).findOne({
     where: {
       triggerKey,
+      channel,
       enabled: true
     }
   });
   if (!binding) {
-    console.warn("[order-notifications] no whatsapp_trigger_bindings row", {
-      triggerKey
+    console.warn("[order-notifications] no order_notification_bindings row", {
+      triggerKey,
+      channel
     });
     return null;
   }
   const templateId = binding.messageTemplateId;
   if (templateId == null) {
     console.warn("[order-notifications] binding exists but no template selected", {
-      triggerKey
+      triggerKey,
+      channel
     });
     return null;
   }
   const template = await dataSource.getRepository(entityMap.message_templates).findOne({
     where: {
       id: templateId,
-      channel: "whatsapp",
+      channel,
       deleted: false,
       enabled: true
     }
   });
   if (!template) {
-    console.warn("[order-notifications] bound WhatsApp template not found or disabled", {
+    console.warn("[order-notifications] bound template not found or disabled", {
       triggerKey,
+      channel,
       templateId
     });
     return null;
   }
   return template;
 }
-chunkUSNT2KNT_cjs.__name(loadBoundWhatsAppTemplate, "loadBoundWhatsAppTemplate");
+chunkUSNT2KNT_cjs.__name(loadBoundTemplate, "loadBoundTemplate");
 function mergeTriggerVariables(payload, rich) {
   const basic = {
     orderId: String(payload.orderId ?? ""),
@@ -2156,43 +2159,16 @@ function mergeTriggerVariables(payload, rich) {
   };
 }
 chunkUSNT2KNT_cjs.__name(mergeTriggerVariables, "mergeTriggerVariables");
-async function sendOrderPlacedEmail(orderId, dataSource, entityMap, getCms, variables, contactEmail) {
-  if (!entityMap.message_templates) return;
-  const templateRepo = dataSource.getRepository(entityMap.message_templates);
-  const getTemplateRow = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async (channel, templateKey) => {
-    const row = await templateRepo.findOne({
-      where: {
-        channel,
-        templateKey,
-        deleted: false
-      }
-    });
-    if (!row) return null;
-    const r = row;
-    return {
-      subject: r.subject,
-      body: r.body,
-      externalTemplateRef: r.externalTemplateRef,
-      name: r.name,
-      language: r.providerMeta?.language ?? null,
-      paramOrder: r.providerMeta?.paramOrder ?? null,
-      enabled: r.enabled
-    };
-  }, "getTemplateRow");
-  const resolved = await chunkSPQFNIYJ_cjs.resolveEventOrderTemplate("email", getTemplateRow, null);
-  if (!resolved?.enabled) {
-    console.warn("[order-notifications] email template disabled or missing for order_placed", {
-      orderId
-    });
-    return;
-  }
+async function sendEmailForTrigger(triggerKey, orderId, variables, contactEmail, dataSource, entityMap, getCms) {
+  const template = await loadBoundTemplate(triggerKey, "email", dataSource, entityMap);
+  if (!template) return;
   const [branding, emailSettings] = await Promise.all([
     getSettingsGroup(dataSource, entityMap, "branding"),
     getSettingsGroup(dataSource, entityMap, "email")
   ]);
   const companyDetails = mergeEmailLayoutCompanyDetails(branding, emailSettings);
-  const subject = chunkOOTLNH63_cjs.applyTemplateVars(resolved.subject ?? "Order confirmed", variables);
-  const bodyHtml = chunkOOTLNH63_cjs.applyTemplateVars(resolved.body, variables);
+  const subject = chunkOOTLNH63_cjs.applyTemplateVars(template.subject ?? "Order update", variables);
+  const bodyHtml = chunkOOTLNH63_cjs.applyTemplateVars(template.body, variables);
   const html = renderLayout({
     bodyHtml,
     companyDetails
@@ -2205,15 +2181,21 @@ async function sendOrderPlacedEmail(orderId, dataSource, entityMap, getCms, vari
     text: bodyHtml.replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim()
   });
   console.log("[order-notifications] email queued", {
+    triggerKey,
     orderId,
     to: contactEmail
   });
 }
-chunkUSNT2KNT_cjs.__name(sendOrderPlacedEmail, "sendOrderPlacedEmail");
+chunkUSNT2KNT_cjs.__name(sendEmailForTrigger, "sendEmailForTrigger");
 async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dataSource, entityMap, getCms) {
-  const template = await loadBoundWhatsAppTemplate(triggerKey, dataSource, entityMap);
+  const template = await loadBoundTemplate(triggerKey, "whatsapp", dataSource, entityMap);
   if (!template) return;
-  const paramOrder = template.providerMeta?.paramOrder?.length ? template.providerMeta.paramOrder : chunkSPQFNIYJ_cjs.EVENT_ORDER_WHATSAPP_PARAM_KEYS;
+  const paramOrder = template.providerMeta?.paramOrder ?? [];
+  if (paramOrder.length === 0) {
+    console.warn("[order-notifications] WhatsApp template has no paramOrder set \u2014 variables may send blank/wrong", {
+      triggerKey
+    });
+  }
   const cms = await getCms();
   const metaTemplateName = resolveMetaWhatsAppTemplateName({
     externalTemplateRef: template.externalTemplateRef,
@@ -2270,21 +2252,22 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
   const variables = mergeTriggerVariables(payload, context?.variables);
   const contactEmail = context?.contact.email?.trim() || "";
   const contactPhone = context?.contact.phone?.trim() || payload.customerPhone?.trim() || "";
-  if (triggerKey === "order_placed" && contactEmail) {
-    await sendOrderPlacedEmail(payload.orderId, dataSource, entityMap, getCms, variables, contactEmail);
-  } else if (triggerKey === "order_placed") {
+  if (contactEmail) {
+    await sendEmailForTrigger(triggerKey, payload.orderId, variables, contactEmail, dataSource, entityMap, getCms);
+  } else {
     console.warn("[order-notifications] skip email: no customer email", {
+      triggerKey,
       orderId: payload.orderId
     });
   }
-  if (!contactPhone) {
+  if (contactPhone) {
+    await sendWhatsAppForTrigger(triggerKey, payload.orderId, contactPhone, variables, dataSource, entityMap, getCms);
+  } else {
     console.warn("[order-notifications] skip WhatsApp: no customer phone", {
       triggerKey,
       orderId: payload.orderId
     });
-    return;
   }
-  await sendWhatsAppForTrigger(triggerKey, payload.orderId, contactPhone, variables, dataSource, entityMap, getCms);
 }
 chunkUSNT2KNT_cjs.__name(handleTrigger, "handleTrigger");
 function initWhatsappTriggerDispatcher(deps) {
@@ -2296,7 +2279,7 @@ function initWhatsappTriggerDispatcher(deps) {
       console.error("[order-notifications]", triggerKey, err);
     });
   });
-  console.log("[order-notifications] dispatcher initialized (email + WhatsApp)");
+  console.log("[order-notifications] dispatcher initialized (email + WhatsApp, unified via order_notification_bindings)");
 }
 chunkUSNT2KNT_cjs.__name(initWhatsappTriggerDispatcher, "initWhatsappTriggerDispatcher");
 async function resendOrderNotification(triggerKey, orderId, deps) {

package/dist/{chunk-X6H5VBQ2.cjs → chunk-E6WVP7BK.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkKPKFNLQQ_cjs = require('./chunk-KPKFNLQQ.cjs');
+var chunkWMXPKKXU_cjs = require('./chunk-WMXPKKXU.cjs');
 var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
 var jwt = require('next-auth/jwt');
 var _CredentialsProvider = require('next-auth/providers/credentials');
@@ -11,12 +11,12 @@ var _CredentialsProvider__default = /*#__PURE__*/_interopDefault(_CredentialsPro
 
 // src/auth/seed-permissions.ts
 async function seedAdministratorPermissions(dataSource, entityMap) {
-  const entities = chunkKPKFNLQQ_cjs.getPermissionableEntityKeys(entityMap);
+  const entities = chunkWMXPKKXU_cjs.getPermissionableEntityKeys(entityMap);
   const groupRepo = dataSource.getRepository(entityMap.user_groups);
   const permRepo = dataSource.getRepository(entityMap.permissions);
   const adminGroup = await groupRepo.findOne({
     where: {
-      name: chunkKPKFNLQQ_cjs.ADMIN_GROUP_NAME,
+      name: chunkWMXPKKXU_cjs.ADMIN_GROUP_NAME,
       deleted: false
     }
   });
@@ -298,18 +298,18 @@ async function checkMultiVendorEnabledViaSettingsApi() {
 chunkUSNT2KNT_cjs.__name(checkMultiVendorEnabledViaSettingsApi, "checkMultiVendorEnabledViaSettingsApi");
 function sessionUserFromNextAuthUser(user) {
   const g = user.group;
-  const isRBACAdmin = chunkKPKFNLQQ_cjs.isSuperAdmin({
+  const isRBACAdmin = chunkWMXPKKXU_cjs.isSuperAdmin({
     groupId: user.groupId ?? void 0,
     groupName: g?.name,
     isRBACAdmin: false
   });
-  const entityPerms = chunkKPKFNLQQ_cjs.permissionRowsToRecord(g?.permissions);
+  const entityPerms = chunkWMXPKKXU_cjs.permissionRowsToRecord(g?.permissions);
   const rawAdminAccess = user.adminAccess;
   const adminAccess = rawAdminAccess === true ? true : rawAdminAccess === false ? false : void 0;
   const vendorIds = user.vendorIds ?? [];
   const vendorRole = user.vendorRole ?? null;
   const isVendorRoleOwner = user.isVendorRoleOwner ?? false;
-  const { isVendorPortal, isVendorOwner: isVendorOwner2 } = chunkKPKFNLQQ_cjs.vendorPortalFlagsFromUser({
+  const { isVendorPortal, isVendorOwner: isVendorOwner2 } = chunkWMXPKKXU_cjs.vendorPortalFlagsFromUser({
     email: user.email,
     isRBACAdmin,
     groupName: g?.name,