@infuro/cms-core 1.0.36 → 1.0.39

package/dist/{chunk-VMY2S32H.js → chunk-NNQBWDCI.js}

@@ -1,7 +1,6 @@
 import { notificationTriggerEmitter } from './chunk-HCIRL37O.js';
 import { queueEmail } from './chunk-5ELSW2UP.js';
 import { applyTemplateVars } from './chunk-CRFV5WJK.js';
-import { resolveEventOrderTemplate, EVENT_ORDER_WHATSAPP_PARAM_KEYS } from './chunk-KFFB6EMZ.js';
 import { __name } from './chunk-SHUYVCID.js';
 import { SESClient, SendEmailCommand } from '@aws-sdk/client-ses';
 import nodemailer from 'nodemailer';
@@ -434,9 +433,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-SDRNAZHC.js');
+      const { resolveEventOrderTemplate, EVENT_ORDER_TEMPLATE_KEY } = await import('./event-order-defaults-SDRNAZHC.js');
       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 {
@@ -2034,7 +2033,7 @@ function emailPlugin(config) {
 }
 __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, "");
@@ -2088,48 +2087,52 @@ async function isTriggerCatalogEnabled(triggerKey, dataSource, entityMap) {
   }
 }
 __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;
 }
-__name(loadBoundWhatsAppTemplate, "loadBoundWhatsAppTemplate");
+__name(loadBoundTemplate, "loadBoundTemplate");
 function mergeTriggerVariables(payload, rich) {
   const basic = {
     orderId: String(payload.orderId ?? ""),
@@ -2150,43 +2153,16 @@ function mergeTriggerVariables(payload, rich) {
   };
 }
 __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__ */ __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 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 = applyTemplateVars(resolved.subject ?? "Order confirmed", variables);
-  const bodyHtml = applyTemplateVars(resolved.body, variables);
+  const subject = applyTemplateVars(template.subject ?? "Order update", variables);
+  const bodyHtml = applyTemplateVars(template.body, variables);
   const html = renderLayout({
     bodyHtml,
     companyDetails
@@ -2199,15 +2175,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
   });
 }
-__name(sendOrderPlacedEmail, "sendOrderPlacedEmail");
+__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 : 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,
@@ -2264,21 +2246,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);
 }
 __name(handleTrigger, "handleTrigger");
 function initWhatsappTriggerDispatcher(deps) {
@@ -2290,7 +2273,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)");
 }
 __name(initWhatsappTriggerDispatcher, "initWhatsappTriggerDispatcher");
 async function resendOrderNotification(triggerKey, orderId, deps) {

package/dist/{chunk-WO2DW4AU.cjs → chunk-OIGCAGH7.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');
 
 // src/auth/helpers.ts
@@ -10,7 +10,7 @@ var RBAC_ADMIN_ONLY_ENTITIES = /* @__PURE__ */ new Set([
   "permissions"
 ]);
 function sessionHasEntityAccess(user, entity, action) {
-  return chunkKPKFNLQQ_cjs.explainSessionEntityAccess(user, entity, action).allowed;
+  return chunkWMXPKKXU_cjs.explainSessionEntityAccess(user, entity, action).allowed;
 }
 chunkUSNT2KNT_cjs.__name(sessionHasEntityAccess, "sessionHasEntityAccess");
 function canManageRoles(user) {
@@ -101,8 +101,8 @@ function createAuthHelpersFromGetSession(getSession, NextResponse) {
       }
       const u = session.user;
       const allowed = sessionHasEntityAccess(u, entity, action);
-      const { reason } = chunkKPKFNLQQ_cjs.explainSessionEntityAccess(u, entity, action);
-      chunkKPKFNLQQ_cjs.logRbac("authHelpers.requireEntityPermission", {
+      const { reason } = chunkWMXPKKXU_cjs.explainSessionEntityAccess(u, entity, action);
+      chunkWMXPKKXU_cjs.logRbac("authHelpers.requireEntityPermission", {
         entity,
         action,
         allowed,
@@ -134,10 +134,10 @@ function createAuthHelpersFromGetSession(getSession, NextResponse) {
       }
       const u = session.user;
       if (u.isRBACAdmin) return null;
-      if (chunkKPKFNLQQ_cjs.isVendorPortalUser(u)) return null;
+      if (chunkWMXPKKXU_cjs.isVendorPortalUser(u)) return null;
       if (u.adminAccess === true) return null;
       if (u.adminAccess === false) {
-        chunkKPKFNLQQ_cjs.logRbac("requireAdminAccess denied (adminAccess:false)", {
+        chunkWMXPKKXU_cjs.logRbac("requireAdminAccess denied (adminAccess:false)", {
           email: u.email,
           groupName: u.groupName,
           isVendorPortal: u.isVendorPortal
@@ -149,7 +149,7 @@ function createAuthHelpersFromGetSession(getSession, NextResponse) {
           status: 403
         });
       }
-      chunkKPKFNLQQ_cjs.logRbac("requireAdminAccess denied (no matching rule)", {
+      chunkWMXPKKXU_cjs.logRbac("requireAdminAccess denied (no matching rule)", {
         email: u.email,
         adminAccess: u.adminAccess,
         groupName: u.groupName,

package/dist/{chunk-UF3BYUXY.js → chunk-P7QCLE5W.js}

@@ -16,7 +16,7 @@ var PERMISSION_ENTITY_INTERNAL_EXCLUDE = /* @__PURE__ */ new Set([
   "wishlist_items",
   "message_templates",
   "order_notification_triggers",
-  "whatsapp_trigger_bindings",
+  "order_notification_bindings",
   "vendor_users",
   "vendor_roles",
   "vendor_role_permissions"
@@ -127,7 +127,8 @@ var VENDOR_SCOPED_STORE_ENTITIES = /* @__PURE__ */ new Set([
   "vendor_customers",
   "discounts",
   "events",
-  "refund_policies"
+  "refund_policies",
+  "combos"
 ]);
 var VENDOR_STORE_RBAC_ENTITIES = /* @__PURE__ */ new Set([
   ...VENDOR_SCOPED_STORE_ENTITIES,
@@ -592,7 +593,7 @@ async function logEntityAccessDecision(dataSource, context, user, entity, action
     const id = Number(user.id);
     if (Number.isFinite(id)) {
       try {
-        const { loadDbPermissionsForUser } = await import('./rbac-debug-db-QJH3AD34.js');
+        const { loadDbPermissionsForUser } = await import('./rbac-debug-db-QWHOENBR.js');
         dbPermissions = await loadDbPermissionsForUser(dataSource, id);
       } catch (e) {
         dbPermissions = {

package/dist/{chunk-FG6I64HP.js → chunk-SBRBR3VO.js}

@@ -1,4 +1,4 @@
-import { getPermissionableEntityKeys, ADMIN_GROUP_NAME, isSuperAdmin, permissionRowsToRecord, vendorPortalFlagsFromUser } from './chunk-UF3BYUXY.js';
+import { getPermissionableEntityKeys, ADMIN_GROUP_NAME, isSuperAdmin, permissionRowsToRecord, vendorPortalFlagsFromUser } from './chunk-P7QCLE5W.js';
 import { __name } from './chunk-SHUYVCID.js';
 import { getToken } from 'next-auth/jwt';
 import _CredentialsProvider from 'next-auth/providers/credentials';