@infuro/cms-core 1.0.63 → 1.0.65

package/dist/{chunk-BWOITUNI.js → chunk-ACBN6UWZ.js}

@@ -1,8 +1,8 @@
 import { queueWhatsApp } from './chunk-GWDI752Q.js';
-import { notificationTriggerEmitter } from './chunk-AYWDQFJZ.js';
-import { sesRegionSupportsSmtp, sesSmtpHost, EmailService, renderLayout } from './chunk-KAOHOHCA.js';
-import { queueEmail } from './chunk-RXTUSF3R.js';
-import { mergeEmailLayoutCompanyDetails } from './chunk-3VZAAQUV.js';
+import { notifyLog, maskNotifyToken, maskNotifyEmail, maskNotifyPhone, notificationTriggerEmitter } from './chunk-YEAXE4U2.js';
+import { sesRegionSupportsSmtp, sesSmtpHost, EmailService, renderLayout } from './chunk-6YOQ7G5O.js';
+import { queueEmail } from './chunk-TU23GJPJ.js';
+import { mergeEmailLayoutCompanyDetails } from './chunk-YRCKEGL2.js';
 import { applyTemplateVars } from './chunk-CRFV5WJK.js';
 import { __name } from './chunk-SHUYVCID.js';
 import * as crypto from 'crypto';
@@ -201,7 +201,10 @@ async function loadOrderNotificationContexts(orderId, deps) {
       deleted: false
     },
     relations: [
-      "contact"
+      "contact",
+      "assignedUser",
+      "shippingAddress",
+      "billingAddress"
     ]
   });
   if (!order) return null;
@@ -256,7 +259,7 @@ async function loadOrderNotificationContexts(orderId, deps) {
     }
   }
   const effectiveEvent = eventsEnabled ? event : void 0;
-  const variables = effectiveEvent ? buildEventOrderTemplateVariables({
+  const baseVariables = effectiveEvent ? buildEventOrderTemplateVariables({
     event: effectiveEvent,
     order: {
       orderNumber: o.orderNumber,
@@ -288,13 +291,42 @@ async function loadOrderNotificationContexts(orderId, deps) {
     orderLines,
     siteUrl
   });
+  const assignedUser = o.assignedUser ?? null;
+  const assigneeName = assignedUser?.name?.trim() || "";
+  const assigneePhone = assignedUser?.phone?.trim() || "";
+  const assigneeEmail = assignedUser?.email?.trim() || "";
+  const timeSlot = String(meta.timeSlot || meta.slot || meta.serviceSlot || "").trim();
+  const rawServiceDate = meta.bookingDate || meta.serviceDate || meta.orderDate || o.createdAt;
+  const serviceDate = rawServiceDate ? formatScheduleDate(rawServiceDate) : "";
+  const addr = o.shippingAddress || o.billingAddress;
+  const customerAddress = addr ? [
+    addr.line1,
+    addr.line2,
+    addr.city,
+    addr.state,
+    addr.postalCode,
+    addr.country
+  ].map((p) => String(p ?? "").trim()).filter(Boolean).join(", ") : "";
+  const taskDescription = productNames || (orderLines.length > 0 ? orderLines.map((l) => `${l.quantity}x ${l.name}`).join(", ") : "Order service");
+  const variables = {
+    ...baseVariables,
+    assigneeName,
+    assigneePhone,
+    assigneeEmail,
+    timeSlot,
+    serviceDate,
+    customerAddress,
+    taskDescription
+  };
   return {
     order: {
       id: o.id,
       orderNumber: String(o.orderNumber ?? ""),
       total: o.total,
       currency,
-      qrToken: o.qrToken
+      qrToken: o.qrToken,
+      assignedUserId: o.assignedUserId ?? null,
+      assignedUser
     },
     contact,
     orderLines,
@@ -304,6 +336,16 @@ async function loadOrderNotificationContexts(orderId, deps) {
   };
 }
 __name(loadOrderNotificationContexts, "loadOrderNotificationContexts");
+function formatScheduleDate(val) {
+  if (!val || typeof val !== "string" && !(val instanceof Date)) return "";
+  const str = String(val).trim();
+  if (!str) return "";
+  const d = new Date(str.includes("T") ? str : `${str}T00:00:00`);
+  return isNaN(d.getTime()) ? str : d.toLocaleDateString(void 0, {
+    dateStyle: "medium"
+  });
+}
+__name(formatScheduleDate, "formatScheduleDate");
 
 // src/plugins/whatsapp/whatsapp-service.ts
 function norm(v) {
@@ -1254,60 +1296,68 @@ __name(validateFcmCredentials, "validateFcmCredentials");
 var ORDER_NOTIFICATION_DEFAULTS = {
   email: {
     pending: {
-      subject: "Your Order #{{orderNumber}} is Pending",
-      body: "<p>Thank you for your order! It is currently pending.</p>"
+      subject: "Your order {{orderNumber}} is Pending",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is currently pending.\n\nOrder Details:\n{{orderDetails}}\n\nWe will update you as soon as your order status changes.\n\nThank you!"
     },
     order_pending: {
-      subject: "Your Order #{{orderNumber}} is Pending",
-      body: "<p>Thank you for your order! It is currently pending.</p>"
+      subject: "Your order {{orderNumber}} is Pending",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is currently pending.\n\nOrder Details:\n{{orderDetails}}\n\nWe will update you as soon as your order status changes.\n\nThank you!"
     },
     confirmed: {
-      subject: "Your Order #{{orderNumber}} is Confirmed",
-      body: "<p>Your order has been confirmed!</p>"
+      subject: "Your order {{orderNumber}} is confirmed",
+      body: "Hi {{customerName}},\n\nThank you for your order! Your order {{orderNumber}} for {{total}} {{currency}} has been confirmed.\n\nOrder Details:\n{{orderDetails}}\n\nYour Tax Invoice PDF is attached to this email for your records.\n\nThank you!"
     },
     order_confirmed: {
-      subject: "Your Order #{{orderNumber}} is Confirmed",
-      body: "<p>Your order has been confirmed!</p>"
+      subject: "Your order {{orderNumber}} is confirmed",
+      body: "Hi {{customerName}},\n\nThank you for your order! Your order {{orderNumber}} for {{total}} {{currency}} has been confirmed.\n\nOrder Details:\n{{orderDetails}}\n\nYour Tax Invoice PDF is attached to this email for your records.\n\nThank you!"
     },
     order_placed: {
-      subject: "Your Order #{{orderNumber}} is Placed",
-      body: "<p>Thank you for your order! Your order #{{orderNumber}} has been placed.</p>"
+      subject: "Your order {{orderNumber}} is confirmed",
+      body: "Hi {{customerName}},\n\nThank you for your order! Your order {{orderNumber}} for {{total}} {{currency}} has been confirmed.\n\nOrder Details:\n{{orderDetails}}\n\nYour Tax Invoice PDF is attached to this email for your records.\n\nThank you!"
     },
     processing: {
-      subject: "Your Order #{{orderNumber}} is Processing",
-      body: "<p>Your order is now being processed by our team.</p>"
+      subject: "Your order {{orderNumber}} is now Processing",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is currently being processed.\n\nOrder Details:\n{{orderDetails}}\n\nWe will notify you once it is completed.\n\nThank you!"
     },
     order_processing: {
-      subject: "Your Order #{{orderNumber}} is Processing",
-      body: "<p>Your order is now being processed by our team.</p>"
+      subject: "Your order {{orderNumber}} is now Processing",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is currently being processed.\n\nOrder Details:\n{{orderDetails}}\n\nWe will notify you once it is completed.\n\nThank you!"
     },
     completed: {
-      subject: "Your Order #{{orderNumber}} is Completed",
-      body: "<p>Your order has been completed. Thank you!</p>"
+      subject: "Your order {{orderNumber}} is Completed",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} has been completed.\n\nOrder Details:\n{{orderDetails}}\n\nThank you for choosing us!"
     },
     order_completed: {
-      subject: "Your Order #{{orderNumber}} is Completed",
-      body: "<p>Your order has been completed. Thank you!</p>"
+      subject: "Your order {{orderNumber}} is Completed",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} has been completed.\n\nOrder Details:\n{{orderDetails}}\n\nThank you for choosing us!"
     },
     cancelled: {
-      subject: "Your Order #{{orderNumber}} is Cancelled",
-      body: "<p>Your order has been cancelled.</p>"
+      subject: "Your order {{orderNumber}} has been cancelled",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} has been cancelled.\n\nIf a refund is due, you will receive {{refundAmount}} {{currency}} back to your original payment method.\n\nIf you have any questions, please contact us.\n\nThank you!"
     },
     order_cancelled: {
-      subject: "Your Order #{{orderNumber}} is Cancelled",
-      body: "<p>Your order has been cancelled.</p>"
+      subject: "Your order {{orderNumber}} has been cancelled",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} has been cancelled.\n\nIf a refund is due, you will receive {{refundAmount}} {{currency}} back to your original payment method.\n\nIf you have any questions, please contact us.\n\nThank you!"
     },
     payment_success: {
-      subject: "Payment Received for Order #{{orderNumber}}",
-      body: "<p>Payment of {{currency}} {{total}} has been successfully received for order #{{orderNumber}}.</p>"
+      subject: "Payment Successful for Order {{orderNumber}}",
+      body: "Hi {{customerName}},\n\nWe have received your payment for order {{orderNumber}} of {{total}} {{currency}}.\n\nOrder Details:\n{{orderDetails}}\n\nThank you!"
     },
     payment_failed: {
-      subject: "Payment Failed for Order #{{orderNumber}}",
-      body: "<p>Payment for order #{{orderNumber}} could not be completed.</p>"
+      subject: "Payment Failed for Order {{orderNumber}}",
+      body: "Hi {{customerName}},\n\nYour payment for order {{orderNumber}} of {{total}} {{currency}} could not be completed or remains unpaid.\n\nIf you were charged, please contact us with your order number {{orderNumber}}.\n\nThank you!"
     },
     payment_refund_initiated: {
-      subject: "Refund Initiated for Order #{{orderNumber}}",
-      body: "<p>A refund of {{currency}} {{refundAmount}} has been initiated for order #{{orderNumber}}.</p>"
+      subject: "Refund Initiated for Order {{orderNumber}}",
+      body: "Hi {{customerName}},\n\nYour order {{orderNumber}} has been cancelled and a refund of {{refundAmount}} {{currency}} has been initiated.\n\nThe amount will be credited back to your original payment method.\n\nThank you!"
+    },
+    order_assigned: {
+      subject: "Your service expert has been assigned for order {{orderNumber}}",
+      body: "Hi {{customerName}},\n\nA service expert has been assigned to your order {{orderNumber}}.\n\nAssignee Details:\n\u2022 Name: {{assigneeName}}\n\u2022 Phone: {{assigneePhone}}\n\nYour expert will reach you by your scheduled time slot:\n\u2022 Date: {{serviceDate}}\n\u2022 Slot: {{timeSlot}}\n\nOrder Details:\n{{orderDetails}}\n\nThank you!"
+    },
+    order_assigned_assignee: {
+      subject: "New task assigned: Order {{orderNumber}}",
+      body: "Hi {{assigneeName}},\n\nA new task has been assigned to you for order {{orderNumber}}.\n\nTask Details:\n{{taskDescription}}\n\nCustomer Details:\n\u2022 Name: {{customerName}}\n\u2022 Phone: {{customerPhone}}\n\u2022 Address: {{customerAddress}}\n\nSchedule:\n\u2022 Date: {{serviceDate}}\n\u2022 Slot: {{timeSlot}}\n\nPlease arrive promptly within the scheduled time slot."
     }
   },
   sms: {
@@ -1316,6 +1366,8 @@ var ORDER_NOTIFICATION_DEFAULTS = {
     confirmed: "Your Order #{{orderNumber}} is confirmed. Total: {{total}}.",
     order_confirmed: "Your Order #{{orderNumber}} is confirmed. Total: {{total}}.",
     order_placed: "Your Order #{{orderNumber}} is placed. Total: {{total}}.",
+    order_assigned: "Hi {{customerName}}, your service expert {{assigneeName}} ({{assigneePhone}}) has been assigned for order {{orderNumber}}. Arrival slot: {{timeSlot}}.",
+    order_assigned_assignee: "Hi {{assigneeName}}, new task assigned: Order {{orderNumber}}. Customer: {{customerName}}, Phone: {{customerPhone}}, Address: {{customerAddress}}, Slot: {{timeSlot}}.",
     processing: "Your Order #{{orderNumber}} is now processing.",
     order_processing: "Your Order #{{orderNumber}} is now processing.",
     completed: "Your Order #{{orderNumber}} has been completed. Thank you!",
@@ -1332,6 +1384,8 @@ var ORDER_NOTIFICATION_DEFAULTS = {
     confirmed: "Hi {{customerName}}, your Order #{{orderNumber}} is confirmed.",
     order_confirmed: "Hi {{customerName}}, your Order #{{orderNumber}} is confirmed.",
     order_placed: "Hi {{customerName}}, your Order #{{orderNumber}} is placed.",
+    order_assigned: "Hi {{customerName}}, expert {{assigneeName}} ({{assigneePhone}}) has been assigned to your order #{{orderNumber}}. Scheduled slot: {{timeSlot}} on {{serviceDate}}.",
+    order_assigned_assignee: "Hi {{assigneeName}}, you have been assigned to order #{{orderNumber}}. Customer: {{customerName}} ({{customerPhone}}), Address: {{customerAddress}}, Slot: {{timeSlot}} on {{serviceDate}}.",
     processing: "Hi {{customerName}}, your Order #{{orderNumber}} is now being processed.",
     order_processing: "Hi {{customerName}}, your Order #{{orderNumber}} is now being processed.",
     completed: "Hi {{customerName}}, your Order #{{orderNumber}} is completed.",
@@ -1346,12 +1400,6 @@ var ORDER_NOTIFICATION_DEFAULTS = {
 
 // src/lib/order-notification-dispatcher.ts
 var initialized = false;
-function maskPhone2(raw) {
-  const digits = String(raw ?? "").replace(/\D/g, "");
-  if (digits.length <= 4) return "(none)";
-  return `***${digits.slice(-4)}`;
-}
-__name(maskPhone2, "maskPhone");
 async function getSettingsGroup(dataSource, entityMap, group) {
   if (!entityMap.configs) return {};
   const rows = await dataSource.getRepository(entityMap.configs).find({
@@ -1561,11 +1609,26 @@ async function sendPushNotificationForTrigger(triggerKey, orderId, audienceType,
   if (!template) {
     template = await loadBoundTemplate(triggerKey, "push", audienceType, dataSource, entityMap);
   }
-  if (!template || !template.body) return;
+  if (!template || !template.body) {
+    notifyLog.skip("PUSH", "no mobile/push template or empty body", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId
+    });
+    return;
+  }
   const rawTitle = template.subject?.trim() || "Order Notification";
   const title = applyTemplateVars(rawTitle, variables);
   const body = applyTemplateVars(template.body, variables);
-  if (!entityMap.user_device_tokens) return;
+  if (!entityMap.user_device_tokens) {
+    notifyLog.skip("PUSH", "user_device_tokens entity not registered", {
+      triggerKey,
+      orderId,
+      audienceType
+    });
+    return;
+  }
   const tokenRepo = dataSource.getRepository(entityMap.user_device_tokens);
   let targetTokens = [];
   try {
@@ -1600,19 +1663,60 @@ async function sendPushNotificationForTrigger(triggerKey, orderId, audienceType,
       });
     }
   } catch (err) {
-    console.error("[order-notifications] Error querying device tokens for push", err);
+    notifyLog.error("PUSH", "device token query failed", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId,
+      error: err instanceof Error ? err.message : String(err)
+    });
     return;
   }
-  for (const t of targetTokens) {
-    if (t.token?.trim()) {
-      await sendFcmPushNotification(dataSource, entityMap, {
-        token: t.token.trim(),
-        title,
-        body,
-        data: {
-          orderId: String(orderId),
-          triggerKey
-        }
+  const tokens = targetTokens.map((t) => t.token?.trim()).filter(Boolean);
+  notifyLog.push("sending", {
+    triggerKey,
+    orderId,
+    audienceType,
+    targetId,
+    title,
+    tokenCount: tokens.length,
+    tokens: tokens.map((t) => maskNotifyToken(t))
+  });
+  if (tokens.length === 0) {
+    notifyLog.skip("PUSH", "no active FCM tokens for target", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId,
+      hint: "App must POST /api/user-device-tokens after login"
+    });
+    return;
+  }
+  for (const token of tokens) {
+    const res = await sendFcmPushNotification(dataSource, entityMap, {
+      token,
+      title,
+      body,
+      data: {
+        orderId: String(orderId),
+        triggerKey
+      }
+    });
+    if (res.success) {
+      notifyLog.push("FCM sent", {
+        triggerKey,
+        orderId,
+        audienceType,
+        token: maskNotifyToken(token),
+        messageId: res.messageId ?? null
+      });
+    } else {
+      notifyLog.error("PUSH", "FCM send failed", {
+        triggerKey,
+        orderId,
+        audienceType,
+        token: maskNotifyToken(token),
+        error: res.error ?? "unknown"
       });
     }
   }
@@ -1756,7 +1860,15 @@ function formatBodyForEmailHtml(body) {
 __name(formatBodyForEmailHtml, "formatBodyForEmailHtml");
 async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables, contactEmail, dataSource, entityMap, getCms) {
   const template = await loadBoundTemplate(triggerKey, "email", audienceType, dataSource, entityMap);
-  if (!template) return;
+  if (!template) {
+    notifyLog.skip("EMAIL", "no bound/default email template", {
+      triggerKey,
+      orderId,
+      audienceType,
+      to: maskNotifyEmail(contactEmail)
+    });
+    return;
+  }
   const [branding, emailSettings, storeSettings] = await Promise.all([
     getSettingsGroup(dataSource, entityMap, "branding"),
     getSettingsGroup(dataSource, entityMap, "email"),
@@ -1791,22 +1903,31 @@ async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables,
       attachInvoice: true
     } : {}
   });
-  console.log("[order-notifications] email queued", {
+  notifyLog.email("queued", {
     triggerKey,
     audienceType,
     orderId,
-    to: contactEmail,
+    to: maskNotifyEmail(contactEmail),
+    subject,
     attachInvoice: shouldAttachInvoice
   });
 }
 __name(sendEmailForTrigger, "sendEmailForTrigger");
 async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dataSource, entityMap, getCms) {
   const template = await loadBoundTemplate(triggerKey, "whatsapp", "customers", dataSource, entityMap);
-  if (!template) return;
+  if (!template) {
+    notifyLog.skip("WHATSAPP", "no bound/default WhatsApp template", {
+      triggerKey,
+      orderId,
+      phone: maskNotifyPhone(phone)
+    });
+    return;
+  }
   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
+    notifyLog.skip("WHATSAPP", "template has no paramOrder \u2014 variables may send blank/wrong", {
+      triggerKey,
+      orderId
     });
   }
   const cms = await getCms();
@@ -1815,8 +1936,10 @@ async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dat
     name: template.name
   });
   if (!metaTemplateName) {
-    console.warn("[order-notifications] bound WhatsApp template has no Meta template name", {
+    notifyLog.skip("WHATSAPP", "template has no Meta template name", {
       triggerKey,
+      orderId,
+      phone: maskNotifyPhone(phone),
       templateId: template.id
     });
     return;
@@ -1831,37 +1954,57 @@ async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dat
     templateParamOrder: paramOrder
   });
   if (!sent) {
-    console.warn("[order-notifications] WhatsApp send failed", {
+    notifyLog.error("WHATSAPP", "send failed / not queued", {
       triggerKey,
       orderId,
+      phone: maskNotifyPhone(phone),
       hint: "Register whatsappPlugin() + queuePlugin() in getCms(), or set WHATSAPP_ACCESS_TOKEN and WHATSAPP_PHONE_NUMBER_ID"
     });
   } else {
-    console.log("[order-notifications] WhatsApp queued/sent", {
+    notifyLog.whatsapp("queued/sent", {
       triggerKey,
       orderId,
-      phone: maskPhone2(phone)
+      phone: maskNotifyPhone(phone),
+      metaTemplateName
     });
   }
 }
 __name(sendWhatsAppForTrigger, "sendWhatsAppForTrigger");
 async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms) {
-  console.log("[order-notifications] received", {
+  notifyLog.trigger("dispatcher received", {
     triggerKey,
     orderId: payload.orderId,
-    phone: maskPhone2(payload.customerPhone)
+    orderNumber: payload.orderNumber,
+    phone: maskNotifyPhone(payload.customerPhone),
+    vendorId: payload.vendorId ?? null
   });
   const [emailChannelEnabled, whatsappChannelEnabled, pushChannelEnabled] = await Promise.all([
     isEmailNotificationsEnabled(dataSource, entityMap),
     isWhatsappNotificationsEnabled(dataSource, entityMap),
     isPushNotificationsEnabled(dataSource, entityMap)
   ]);
+  notifyLog.trigger("channel switches", {
+    triggerKey,
+    orderId: payload.orderId,
+    email: emailChannelEnabled,
+    whatsapp: whatsappChannelEnabled,
+    push: pushChannelEnabled
+  });
   if (!emailChannelEnabled && !whatsappChannelEnabled && !pushChannelEnabled) {
-    console.warn("[order-notifications] skip: Email, WhatsApp, and Mobile Push notifications are disabled");
+    notifyLog.skip("ALL", "Email, WhatsApp, and Mobile Push are disabled in event_notifications", {
+      triggerKey,
+      orderId: payload.orderId
+    });
     return;
   }
   const triggerEnabled = await isTriggerCatalogEnabled(triggerKey, dataSource, entityMap);
-  if (!triggerEnabled) return;
+  if (!triggerEnabled) {
+    notifyLog.skip("TRIGGER", "trigger catalog disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
+    return;
+  }
   const context = await loadOrderNotificationContexts(payload.orderId, {
     dataSource,
     entityMap
@@ -1869,32 +2012,86 @@ 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() || "";
+  notifyLog.trigger("recipients resolved", {
+    triggerKey,
+    orderId: payload.orderId,
+    contactEmail: maskNotifyEmail(contactEmail),
+    contactPhone: maskNotifyPhone(contactPhone)
+  });
   if (emailChannelEnabled) {
     const [customerEnabled, vendorEnabled, adminEnabled] = await Promise.all([
       isAudienceEmailEnabled(dataSource, entityMap, "customer"),
       isAudienceEmailEnabled(dataSource, entityMap, "vendor"),
       isAudienceEmailEnabled(dataSource, entityMap, "admin")
     ]);
-    if (customerEnabled && contactEmail) {
+    notifyLog.email("audience switches", {
+      triggerKey,
+      orderId: payload.orderId,
+      customer: customerEnabled,
+      vendor: vendorEnabled,
+      admin: adminEnabled
+    });
+    if (triggerKey === "order_assigned_assignee") {
+      const assigneeEmail = context?.order?.assignedUser?.email?.trim();
+      if (assigneeEmail) {
+        await sendEmailForTrigger(triggerKey, payload.orderId, "customers", variables, assigneeEmail, dataSource, entityMap, getCms);
+      } else {
+        notifyLog.skip("EMAIL", "order_assigned_assignee has no assignee email", {
+          triggerKey,
+          orderId: payload.orderId
+        });
+      }
+    } else if (customerEnabled && contactEmail) {
       await sendEmailForTrigger(triggerKey, payload.orderId, "customers", variables, contactEmail, dataSource, entityMap, getCms);
+    } else if (!customerEnabled) {
+      notifyLog.skip("EMAIL", "customer email audience disabled", {
+        triggerKey,
+        orderId: payload.orderId
+      });
+    } else {
+      notifyLog.skip("EMAIL", "no customer email on order contact", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
-    if (vendorEnabled) {
+    if (vendorEnabled && triggerKey !== "order_assigned_assignee") {
       const multiVendorSettings = await getSettingsGroup(dataSource, entityMap, "multi_vendor");
       if (multiVendorSettings.enabled !== "false" && multiVendorSettings.enabled !== "0") {
         const vendorEmails = await getOrderVendorEmails(payload.orderId, payload.vendorId, dataSource, entityMap);
+        if (vendorEmails.length === 0) {
+          notifyLog.skip("EMAIL", "no vendor emails for order", {
+            triggerKey,
+            orderId: payload.orderId,
+            vendorId: payload.vendorId ?? null
+          });
+        }
         for (const vEmail of vendorEmails) {
           await sendEmailForTrigger(triggerKey, payload.orderId, "vendors", variables, vEmail, dataSource, entityMap, getCms);
         }
+      } else {
+        notifyLog.skip("EMAIL", "multi-vendor off \u2014 skip vendor email", {
+          triggerKey,
+          orderId: payload.orderId
+        });
       }
     }
-    if (adminEnabled) {
+    if (adminEnabled && triggerKey !== "order_assigned_assignee") {
       const adminEmails = await getAdminRecipientEmails(dataSource, entityMap);
+      if (adminEmails.length === 0) {
+        notifyLog.skip("EMAIL", "no admin recipient emails", {
+          triggerKey,
+          orderId: payload.orderId
+        });
+      }
       for (const aEmail of adminEmails) {
         await sendEmailForTrigger(triggerKey, payload.orderId, "admin", variables, aEmail, dataSource, entityMap, getCms);
       }
     }
   } else {
-    console.log("[order-notifications] skip email: Email notifications channel is disabled");
+    notifyLog.skip("EMAIL", "email channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
   if (pushChannelEnabled) {
     const [pushCustomerEnabled, pushVendorEnabled, pushAdminEnabled] = await Promise.all([
@@ -1902,28 +2099,59 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
       isAudiencePushEnabled(dataSource, entityMap, "vendor"),
       isAudiencePushEnabled(dataSource, entityMap, "admin")
     ]);
-    const targetCustomerId = context?.order?.customerContactId || context?.order?.contactId || context?.order?.userId || context?.order?.id;
+    notifyLog.push("audience switches", {
+      triggerKey,
+      orderId: payload.orderId,
+      customer: pushCustomerEnabled,
+      vendor: pushVendorEnabled,
+      admin: pushAdminEnabled
+    });
+    const targetCustomerId = triggerKey === "order_assigned_assignee" ? context?.order?.assignedUser?.id : context?.order?.customerContactId || context?.order?.contactId || context?.order?.userId || context?.order?.id;
     if (pushCustomerEnabled && targetCustomerId) {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "customers", String(targetCustomerId), variables, dataSource, entityMap);
+    } else if (!pushCustomerEnabled) {
+      notifyLog.skip("PUSH", "customer push audience disabled", {
+        triggerKey,
+        orderId: payload.orderId
+      });
+    } else {
+      notifyLog.skip("PUSH", "no customer user/contact id for push", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
-    if (pushVendorEnabled && payload.vendorId) {
+    if (pushVendorEnabled && payload.vendorId && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "vendors", String(payload.vendorId), variables, dataSource, entityMap);
+    } else if (pushVendorEnabled && triggerKey !== "order_assigned_assignee" && !payload.vendorId) {
+      notifyLog.skip("PUSH", "no vendorId on order \u2014 skip vendor push", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
-    if (pushAdminEnabled) {
+    if (pushAdminEnabled && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "admin", "admin", variables, dataSource, entityMap);
     }
+  } else {
+    notifyLog.skip("PUSH", "push channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
   if (whatsappChannelEnabled) {
-    if (contactPhone) {
-      await sendWhatsAppForTrigger(triggerKey, payload.orderId, contactPhone, variables, dataSource, entityMap, getCms);
+    const targetPhone = triggerKey === "order_assigned_assignee" ? context?.order?.assignedUser?.phone?.trim() : contactPhone;
+    if (targetPhone) {
+      await sendWhatsAppForTrigger(triggerKey, payload.orderId, targetPhone, variables, dataSource, entityMap, getCms);
     } else {
-      console.warn("[order-notifications] skip WhatsApp: no customer phone", {
+      notifyLog.skip("WHATSAPP", "no recipient phone", {
         triggerKey,
         orderId: payload.orderId
       });
     }
   } else {
-    console.log("[order-notifications] skip WhatsApp: WhatsApp notifications channel is disabled");
+    notifyLog.skip("WHATSAPP", "WhatsApp channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
 }
 __name(handleTrigger, "handleTrigger");
@@ -1937,10 +2165,21 @@ function initWhatsappTriggerDispatcher(deps) {
   });
   notificationTriggerEmitter.onAnyTrigger((triggerKey, payload) => {
     void handleTrigger(triggerKey, payload, dataSource, entityMap, getCms).catch((err) => {
-      console.error("[order-notifications]", triggerKey, err);
+      notifyLog.error("TRIGGER", "dispatcher handleTrigger failed", {
+        triggerKey,
+        orderId: payload.orderId,
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : void 0
+      });
     });
   });
-  console.log("[order-notifications] dispatcher initialized (email + WhatsApp, unified via order_notification_bindings)");
+  notifyLog.trigger("dispatcher initialized", {
+    channels: [
+      "email",
+      "whatsapp",
+      "push"
+    ]
+  });
 }
 __name(initWhatsappTriggerDispatcher, "initWhatsappTriggerDispatcher");
 async function dispatchOrderNotificationDirectly(triggerKey, payload, dataSource, entityMap, getCms) {