@infuro/cms-core 1.0.50 → 1.0.52

package/dist/{chunk-UUWAUHUW.cjs → chunk-JN4AFHZ4.cjs}

@@ -83,6 +83,9 @@ function buildEventOrderTemplateVariables(input) {
     currency: String(order.currency ?? "INR"),
     lines: orderLines
   };
+  const qrToken = order.qrToken?.trim() || order.orderNumber?.trim() || "";
+  const fallbackQrUrl = qrToken ? `https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${encodeURIComponent(qrToken)}` : "";
+  const fallbackTicketQr = fallbackQrUrl ? `<img src="${fallbackQrUrl}" alt="Ticket QR Code" width="200" height="200" style="display:block;margin:12px 0;border:1px solid #e5e7eb;border-radius:8px;" />` : "";
   return {
     eventName: event.name ?? productNames ?? "",
     vendorName: vendorName.trim(),
@@ -99,6 +102,8 @@ function buildEventOrderTemplateVariables(input) {
     trackUrl,
     invoiceNumber,
     invoiceUrl,
+    ticketQr: fallbackTicketQr,
+    qrImageUrl: fallbackQrUrl,
     orderDetails: formatOrderDetailsText(orderDetailsPayload),
     orderDetailsHtml: formatOrderDetailsHtml(orderDetailsPayload)
   };
@@ -1326,7 +1331,7 @@ function renderEmail(templateName, ctx, options) {
 chunkUSNT2KNT_cjs.__name(renderEmail, "renderEmail");
 
 // src/plugins/email/email-service.ts
-var require2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-UUWAUHUW.cjs', document.baseURI).href)));
+var require2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-JN4AFHZ4.cjs', document.baseURI).href)));
 var MailComposer = require2("nodemailer/lib/mail-composer");
 var SES_REGIONS_WITHOUT_SMTP = /* @__PURE__ */ new Set([
   "af-south-1",
@@ -2125,72 +2130,27 @@ async function getGoogleAccessToken(clientEmail, privateKey) {
   return tokenData.access_token;
 }
 chunkUSNT2KNT_cjs.__name(getGoogleAccessToken, "getGoogleAccessToken");
-async function resolveFcmServiceAccount(dataSource, entityMap) {
-  const pushSettings = await getSettingsGroup(dataSource, entityMap, "push");
-  let projectId = pushSettings.firebase_project_id?.trim();
-  let clientEmail = pushSettings.firebase_client_email?.trim();
-  let privateKey = pushSettings.firebase_private_key?.trim();
-  if (pushSettings.firebase_service_account_json?.trim()) {
-    try {
-      const parsed = JSON.parse(pushSettings.firebase_service_account_json.trim());
-      if (parsed.project_id) projectId = parsed.project_id;
-      if (parsed.client_email) clientEmail = parsed.client_email;
-      if (parsed.private_key) privateKey = parsed.private_key;
-    } catch {
-    }
-  }
-  if (!projectId || !clientEmail || !privateKey) {
-    return {
-      ok: false,
-      error: "Firebase Service Account JSON / credentials are not configured"
-    };
-  }
-  return {
-    ok: true,
-    account: {
-      projectId,
-      clientEmail,
-      privateKey
-    }
-  };
-}
-chunkUSNT2KNT_cjs.__name(resolveFcmServiceAccount, "resolveFcmServiceAccount");
-async function validateFcmCredentials(dataSource, entityMap) {
-  try {
-    const resolved = await resolveFcmServiceAccount(dataSource, entityMap);
-    if (!resolved.ok) {
-      return {
-        success: false,
-        error: resolved.error
-      };
-    }
-    const { projectId, clientEmail, privateKey } = resolved.account;
-    await getGoogleAccessToken(clientEmail, privateKey);
-    return {
-      success: true,
-      projectId,
-      clientEmail
-    };
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : "Unknown credential validation error";
-    console.error("[fcm-push] Exception in validateFcmCredentials", errorMsg);
-    return {
-      success: false,
-      error: errorMsg
-    };
-  }
-}
-chunkUSNT2KNT_cjs.__name(validateFcmCredentials, "validateFcmCredentials");
 async function sendFcmPushNotification(dataSource, entityMap, msg) {
   try {
-    const resolved = await resolveFcmServiceAccount(dataSource, entityMap);
-    if (!resolved.ok) {
+    const pushSettings = await getSettingsGroup(dataSource, entityMap, "push");
+    let projectId = pushSettings.firebase_project_id?.trim();
+    let clientEmail = pushSettings.firebase_client_email?.trim();
+    let privateKey = pushSettings.firebase_private_key?.trim();
+    if (pushSettings.firebase_service_account_json?.trim()) {
+      try {
+        const parsed = JSON.parse(pushSettings.firebase_service_account_json.trim());
+        if (parsed.project_id) projectId = parsed.project_id;
+        if (parsed.client_email) clientEmail = parsed.client_email;
+        if (parsed.private_key) privateKey = parsed.private_key;
+      } catch {
+      }
+    }
+    if (!projectId || !clientEmail || !privateKey) {
       return {
         success: false,
-        error: resolved.error
+        error: "Firebase Service Account JSON / credentials are not configured"
       };
     }
-    const { projectId, clientEmail, privateKey } = resolved.account;
     const accessToken = await getGoogleAccessToken(clientEmail, privateKey);
     const fcmEndpoint = `https://fcm.googleapis.com/v1/projects/${projectId}/messages:send`;
     const fcmPayload = {
@@ -2301,59 +2261,69 @@ async function loadBoundTemplate(triggerKey, channel, audienceType = "customers"
     console.warn("[order-notifications] order_notification_bindings or message_templates missing from entityMap");
     return null;
   }
-  const bindingRepo = dataSource.getRepository(entityMap.order_notification_bindings);
-  let binding = await bindingRepo.findOne({
-    where: {
-      triggerKey,
-      channel,
-      type: audienceType,
-      enabled: true
-    }
-  });
-  if (!binding && audienceType === "customers") {
-    binding = await bindingRepo.findOne({
+  try {
+    const bindingRepo = dataSource.getRepository(entityMap.order_notification_bindings);
+    let binding = await bindingRepo.findOne({
       where: {
         triggerKey,
         channel,
+        type: audienceType,
         enabled: true
       }
-    });
-  }
-  if (!binding) {
-    console.warn("[order-notifications] no order_notification_bindings row", {
-      triggerKey,
-      channel,
-      audienceType
-    });
-    return null;
-  }
-  const templateId = binding.messageTemplateId;
-  if (templateId == null) {
-    console.warn("[order-notifications] binding exists but no template selected", {
-      triggerKey,
-      channel,
-      audienceType
-    });
-    return null;
-  }
-  const template = await dataSource.getRepository(entityMap.message_templates).findOne({
-    where: {
-      id: templateId,
-      channel,
-      deleted: false,
-      enabled: true
+    }).catch(() => null);
+    if (!binding && audienceType === "customers") {
+      binding = await bindingRepo.findOne({
+        where: {
+          triggerKey,
+          channel,
+          enabled: true
+        }
+      }).catch(() => null);
     }
-  });
-  if (!template) {
-    console.warn("[order-notifications] bound template not found or disabled", {
+    if (!binding) {
+      console.warn("[order-notifications] no order_notification_bindings row", {
+        triggerKey,
+        channel,
+        audienceType
+      });
+      return null;
+    }
+    const templateId = binding.messageTemplateId;
+    if (templateId == null) {
+      console.warn("[order-notifications] binding exists but no template selected", {
+        triggerKey,
+        channel,
+        audienceType
+      });
+      return null;
+    }
+    const template = await dataSource.getRepository(entityMap.message_templates).findOne({
+      where: {
+        id: templateId,
+        channel,
+        deleted: false,
+        enabled: true
+      }
+    }).catch(() => null);
+    if (!template) {
+      console.warn("[order-notifications] bound template not found or disabled", {
+        triggerKey,
+        channel,
+        audienceType,
+        templateId
+      });
+      return null;
+    }
+    return template;
+  } catch (err) {
+    console.warn("[order-notifications] loadBoundTemplate query failed", {
       triggerKey,
       channel,
       audienceType,
-      templateId
+      error: err instanceof Error ? err.message : String(err)
     });
     return null;
   }
-  return template;
 }
 chunkUSNT2KNT_cjs.__name(loadBoundTemplate, "loadBoundTemplate");
 function mergeTriggerVariables(payload, rich) {
@@ -2370,9 +2340,11 @@ function mergeTriggerVariables(payload, rich) {
       refundAmount: String(payload.refundAmount)
     } : {}
   };
+  const extraVars = payload.extraVariables ?? {};
   return {
     ...basic,
-    ...rich ?? {}
+    ...rich ?? {},
+    ...extraVars
   };
 }
 chunkUSNT2KNT_cjs.__name(mergeTriggerVariables, "mergeTriggerVariables");
@@ -2568,7 +2540,23 @@ async function getAdminRecipientEmails(dataSource, entityMap) {
     }
   } catch {
   }
-  return Array.from(emails);
+  const vendorEmails = /* @__PURE__ */ new Set();
+  try {
+    const vRows = await dataSource.query(`SELECT DISTINCT LOWER(TRIM(email)) AS email FROM vendors WHERE COALESCE(deleted, false) = false AND email IS NOT NULL AND TRIM(email) != ''`).catch(() => []);
+    for (const r of vRows) {
+      if (r.email) vendorEmails.add(r.email.toLowerCase());
+    }
+    const vuRows = await dataSource.query(`SELECT DISTINCT LOWER(TRIM(u.email)) AS email
+           FROM users u
+      LEFT JOIN user_groups g ON g.id = u."groupId"
+          WHERE COALESCE(u.deleted, false) = false
+            AND (LOWER(g.name) LIKE '%vendor%' OR u."groupId" = 5)`).catch(() => []);
+    for (const r of vuRows) {
+      if (r.email) vendorEmails.add(r.email.toLowerCase());
+    }
+  } catch {
+  }
+  return Array.from(emails).filter((e) => !vendorEmails.has(e.toLowerCase()));
 }
 chunkUSNT2KNT_cjs.__name(getAdminRecipientEmails, "getAdminRecipientEmails");
 function formatBodyForEmailHtml(body) {
@@ -2802,6 +2790,8 @@ function initWhatsappTriggerDispatcher(deps) {
   if (initialized) return;
   initialized = true;
   const { dataSource, entityMap, getCms } = deps;
+  void dataSource.query(`ALTER TYPE "order_notification_bindings_channel_enum" ADD VALUE IF NOT EXISTS 'mobile'`).catch(() => {
+  });
   chunkUCKN4BBY_cjs.notificationTriggerEmitter.onAnyTrigger((triggerKey, payload) => {
     void handleTrigger(triggerKey, payload, dataSource, entityMap, getCms).catch((err) => {
       console.error("[order-notifications]", triggerKey, err);
@@ -2886,5 +2876,4 @@ exports.resolveChatEmailToolSettings = resolveChatEmailToolSettings;
 exports.sendChatLeadEmail = sendChatLeadEmail;
 exports.sendFcmPushNotification = sendFcmPushNotification;
 exports.serializeEmailRecipients = serializeEmailRecipients;
-exports.validateFcmCredentials = validateFcmCredentials;
 exports.whatsAppConfigured = whatsAppConfigured;

package/dist/{chunk-JE22VP6S.js → chunk-MXIWUFBP.js}

@@ -59,7 +59,7 @@ async function emitOrderNotificationTrigger(triggerKey, orderId, deps, extra) {
     total: fo.total ?? 0,
     currency: String(fo.currency ?? "INR"),
     vendorId: fo.vendorId ?? null,
-    ...extra?.extraVariables ?? {},
+    extraVariables: extra?.extraVariables,
     ...extra?.refundAmount != null ? {
       refundAmount: extra.refundAmount
     } : {}