@infuro/cms-core 1.0.63 → 1.0.64

package/dist/{chunk-77YWLP4X.js → chunk-K6C3ZSBZ.js}

@@ -1,13 +1,13 @@
 import { normalizePhoneE164, generateNumericOtp, createOtpChallenge, queueSms, verifyAndConsumeOtpChallenge } from './chunk-OVTOP42W.js';
 import { JOB_RUNNER_QUEUE } from './chunk-GO7PPYNU.js';
 import { validateInventoryForConfirmedOrderLines, orderStatusHoldsStock, reconcileOrderInventoryBetweenSnapshots, orderInventorySnapshotFromRow, validateInventoryForOrderBecomingConfirmed } from './chunk-3K5AIEIZ.js';
-import { resolveChatEmailToolSettings, CHAT_EMAIL_LOG, detectChatLeadIntent, parseIntentRecipientEmails, sendChatLeadEmail, buildTranscriptForLeadEmail, buildChatbotSystemPromptWithEmailTool, validateFcmCredentials, sendFcmPushNotification, parseEmailRecipientsFromConfig, isWhatsAppPluginEnabled, WhatsAppService, emailPlugin, initWhatsappTriggerDispatcher } from './chunk-BWOITUNI.js';
+import { resolveChatEmailToolSettings, CHAT_EMAIL_LOG, detectChatLeadIntent, parseIntentRecipientEmails, sendChatLeadEmail, buildTranscriptForLeadEmail, buildChatbotSystemPromptWithEmailTool, validateFcmCredentials, sendFcmPushNotification, parseEmailRecipientsFromConfig, isWhatsAppPluginEnabled, WhatsAppService, emailPlugin, initWhatsappTriggerDispatcher } from './chunk-OJAYCNE5.js';
 import { registerWhatsAppQueueProcessor } from './chunk-GWDI752Q.js';
 import { inviteStatusForActivation } from './chunk-JXF23MPG.js';
-import { queueEmail, queueVendorOnboardEmails, registerEmailQueueProcessor } from './chunk-RXTUSF3R.js';
-import { unwrapErpReadData, mapErpPayloadToFulfillment, extractChildOrderRefsFromSalePayload, mapErpPayloadToInvoiceNumber, streamOrderInvoicePdf } from './chunk-MWEK7N3F.js';
+import { queueEmail, queueVendorOnboardEmails, registerEmailQueueProcessor } from './chunk-TU23GJPJ.js';
+import { unwrapErpReadData, mapErpPayloadToFulfillment, extractChildOrderRefsFromSalePayload, mapErpPayloadToInvoiceNumber, streamOrderInvoicePdf } from './chunk-OPJEV44S.js';
 import { isErpIntegrationEnabled } from './chunk-JC6DLWTE.js';
-import { mergeEmailLayoutCompanyDetails } from './chunk-3VZAAQUV.js';
+import { mergeEmailLayoutCompanyDetails } from './chunk-YRCKEGL2.js';
 import { getSmsTemplateDefault, SMS_MESSAGE_TEMPLATE_DEFAULTS } from './chunk-MQBT33IV.js';
 import { EVENT_ORDER_MESSAGE_TEMPLATE_DEFAULTS, EVENT_ORDER_TEMPLATE_KEY, EVENT_ORDER_TEMPLATE_VARIABLES } from './chunk-AYERBA7I.js';
 import { ensureCustomerRecord, linkUnclaimedContactToUser, ensureCustomerForUser, canManageRoles, sessionHasEntityAccess } from './chunk-NR44CK5E.js';
@@ -5229,7 +5229,7 @@ function createCrudHandler(dataSource, entityMap, options) {
           const orderIdForNotify = created.id;
           const finalCreatedStatus = String(created.status ?? createdStatus ?? "pending").toLowerCase();
           const initialPayStatus = String(persistBody.paymentStatus ?? body.paymentStatus ?? "unpaid").toLowerCase();
-          void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
             if (finalCreatedStatus === "pending") {
               if (initialPayStatus === "failed") {
                 fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
@@ -5885,6 +5885,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
       const repo = dataSource.getRepository(entity);
       const numericId = Number(id);
       let orderInvPrev = null;
+      let existingOrderRow = null;
       if (resource === "blogs" && rawBody && typeof rawBody === "object" && entityMap.categories && entityMap.seos && entityMap.tags) {
         const existing = await repo.findOne({
           where: {
@@ -6021,6 +6022,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           status: 404
         });
         if (resource === "orders") {
+          existingOrderRow = cur;
           orderInvPrev = orderInventorySnapshotFromRow(cur);
         }
       }
@@ -6052,16 +6054,13 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
             if (Number.isFinite(aId) && aId > 0) {
               scalarUpdate.assignedUserId = aId;
               scalarUpdate.assignedAt = /* @__PURE__ */ new Date();
-              if (!scalarUpdate.status && (orderInvPrev?.status === "confirmed" || orderInvPrev?.status === "pending")) {
-                scalarUpdate.status = "processing";
-              }
             } else {
               scalarUpdate.assignedUserId = null;
               scalarUpdate.assignedAt = null;
             }
           }
           if (scalarUpdate.status === "processing") {
-            const effectiveAssignee = scalarUpdate.assignedUserId !== void 0 ? scalarUpdate.assignedUserId : orderInvPrev?.assignedUserId;
+            const effectiveAssignee = scalarUpdate.assignedUserId !== void 0 ? scalarUpdate.assignedUserId : existingOrderRow?.assignedUserId ?? null;
             if (!effectiveAssignee) {
               return json({
                 error: "Cannot start processing without assigning a teammate. Please assign a teammate first."
@@ -6308,12 +6307,26 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           }
           const statusUpdated = Boolean(scalarUpdate.status || rawBody.status);
           const paymentUpdated = Boolean(rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null);
+          const assigneeUpdated = Boolean(rawBody && typeof rawBody === "object" && "assignedUserId" in rawBody && rawBody.assignedUserId !== void 0 && Number(rawBody.assignedUserId) > 0 && Number(rawBody.assignedUserId) !== Number(existingOrderRow?.assignedUserId));
+          if (assigneeUpdated) {
+            void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
+              fireOrderNotificationTrigger("order_assigned", updatedOrder.id, {
+                dataSource,
+                entityMap
+              });
+              fireOrderNotificationTrigger("order_assigned_assignee", updatedOrder.id, {
+                dataSource,
+                entityMap
+              });
+            }).catch(() => {
+            });
+          }
           if (statusUpdated || paymentUpdated) {
             const newStatus = scalarUpdate.status ? String(scalarUpdate.status).toLowerCase() : rawBody.status ? String(rawBody.status).toLowerCase() : String(updatedOrder.status || "pending").toLowerCase();
             const payments = Array.isArray(updatedOrder.payments) ? updatedOrder.payments : [];
             const bodyPayStatus = rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null ? String(rawBody.paymentStatus).toLowerCase() : null;
             const curPayStatus = bodyPayStatus || String(payments[0]?.status || "unpaid").toLowerCase();
-            void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+            void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
               if (newStatus === "pending") {
                 if (curPayStatus === "failed") {
                   fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
@@ -6868,16 +6881,13 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           if (Number.isFinite(aId) && aId > 0) {
             updatePayload.assignedUserId = aId;
             updatePayload.assignedAt = /* @__PURE__ */ new Date();
-            if (!updatePayload.status && (orderInvPrev.status === "confirmed" || orderInvPrev.status === "pending")) {
-              updatePayload.status = "processing";
-            }
           } else {
             updatePayload.assignedUserId = null;
             updatePayload.assignedAt = null;
           }
         }
         if (updatePayload.status === "processing") {
-          const effectiveAssignee = updatePayload.assignedUserId !== void 0 ? updatePayload.assignedUserId : orderInvPrev?.assignedUserId;
+          const effectiveAssignee = updatePayload.assignedUserId !== void 0 ? updatePayload.assignedUserId : existingOrderRow?.assignedUserId ?? null;
           if (!effectiveAssignee) {
             return json({
               error: "Cannot start processing without assigning a teammate. Please assign a teammate first."
@@ -6970,7 +6980,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
                     });
                   }
                   if (ordStatus === "pending" || ordStatus === "confirmed") {
-                    void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+                    void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
                       fireOrderNotificationTrigger("order_placed", pOrder, {
                         dataSource,
                         entityMap
@@ -6984,7 +6994,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
                   }
                 }
               } else if (newPayStatus === "failed") {
-                void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+                void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
                   fireOrderNotificationTrigger("payment_failed", pOrder, {
                     dataSource,
                     entityMap
@@ -6992,7 +7002,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
                 }).catch(() => {
                 });
               } else if (newPayStatus === "refunded") {
-                void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+                void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
                   fireOrderNotificationTrigger("payment_refund_initiated", pOrder, {
                     dataSource,
                     entityMap
@@ -7117,12 +7127,26 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         const ord = updated;
         const statusUpdated = Boolean(updatePayload.status);
         const paymentUpdated = Boolean(rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null);
+        const assigneeUpdated = Boolean(rawBody && typeof rawBody === "object" && "assignedUserId" in rawBody && rawBody.assignedUserId !== void 0 && Number(rawBody.assignedUserId) > 0 && Number(rawBody.assignedUserId) !== Number(existingOrderRow?.assignedUserId));
+        if (assigneeUpdated) {
+          void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
+            fireOrderNotificationTrigger("order_assigned", ord.id, {
+              dataSource,
+              entityMap
+            });
+            fireOrderNotificationTrigger("order_assigned_assignee", ord.id, {
+              dataSource,
+              entityMap
+            });
+          }).catch(() => {
+          });
+        }
         if (statusUpdated || paymentUpdated) {
           const newStatus = updatePayload.status ? String(updatePayload.status).toLowerCase() : String(ord.status || "pending").toLowerCase();
           const payments = Array.isArray(ord.payments) ? ord.payments : [];
           const bodyPayStatus = rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null ? String(rawBody.paymentStatus).toLowerCase() : null;
           const curPayStatus = bodyPayStatus || String(payments[0]?.status || "unpaid").toLowerCase();
-          void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
             if (newStatus === "pending") {
               if (curPayStatus === "failed") {
                 fireOrderNotificationTrigger("payment_failed", ord.id, {
@@ -11664,7 +11688,8 @@ function createChatHandlers(config) {
                 });
                 const emailSettings = await loadSettingsGroupMap(dataSource, entityMap, "email");
                 const brandingSettings = await loadSettingsGroupMap(dataSource, entityMap, "branding");
-                const companyDetails = mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings);
+                const storeSettings = await loadSettingsGroupMap(dataSource, entityMap, "store");
+                const companyDetails = mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings, storeSettings);
                 const leadResult = await sendChatLeadEmail(cms, emailSettings, brandingSettings, {
                   contactName: String(c.name ?? "").trim() || "Visitor",
                   contactEmail: String(c.email ?? "").trim(),
@@ -13994,13 +14019,14 @@ __name(getVendorEmails, "getVendorEmails");
 async function sendVendorOnboardEmails(input, deps) {
   let ownerEmailSent = false;
   try {
-    const [branding, emailSettings, superAdminEmails, vendorEmailSet] = await Promise.all([
+    const [branding, emailSettings, storeSettings, superAdminEmails, vendorEmailSet] = await Promise.all([
       getSettingsGroup(deps, "branding"),
       getSettingsGroup(deps, "email"),
+      getSettingsGroup(deps, "store"),
       getSuperAdminEmails(deps),
       getVendorEmails(deps)
     ]);
-    const companyDetails = mergeEmailLayoutCompanyDetails(branding, emailSettings);
+    const companyDetails = mergeEmailLayoutCompanyDetails(branding, emailSettings, storeSettings);
     const configuredNotify = parseEmailRecipientsFromConfig(emailSettings.salesTeamEmails ?? emailSettings.salesTeamEmail);
     const ownerEmail = input.ownerEmail?.trim() || "";
     const ownerEmailLower = ownerEmail.toLowerCase();
@@ -29005,7 +29031,7 @@ function createCmsApiHandler(config) {
         companyDetails
       };
       if (queue) {
-        const { queueEmail: queueEmail2 } = await import('./email-queue-YPRSVG56.js');
+        const { queueEmail: queueEmail2 } = await import('./email-queue-HGXB2FIS.js');
         await queueEmail2(cms, {
           to: opts.to,
           templateName: "passwordReset",
@@ -30305,7 +30331,7 @@ function createCmsApiHandler(config) {
         const pe = await requireEntityPermissionEffective(req, "orders", "read");
         if (pe) return pe;
         const cms = await getCms();
-        const { streamOrderInvoicePdf: streamOrderInvoicePdf2 } = await import('./erp-order-invoice-3UGWLICU.js');
+        const { streamOrderInvoicePdf: streamOrderInvoicePdf2 } = await import('./erp-order-invoice-H6HCJ7YS.js');
         const oid = Number(path2[1]);
         if (!Number.isFinite(oid)) return config.json({
           error: "Invalid id"
@@ -30687,7 +30713,7 @@ function createCmsApiHandler(config) {
             status: 400
           });
         }
-        const { resendOrderNotification } = await import('./order-notification-dispatcher-JKFQJYGG.js');
+        const { resendOrderNotification } = await import('./order-notification-dispatcher-ID2PDEXD.js');
         const result = await resendOrderNotification(triggerKey, orderId, {
           dataSource,
           entityMap,
@@ -30786,7 +30812,7 @@ function createCmsApiHandler(config) {
           status: "cancelled"
         });
         const fireOrderCancelledNotification = /* @__PURE__ */ __name((refundAmount) => {
-          void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
             fireOrderNotificationTrigger("order_cancelled", orderId, {
               dataSource,
               entityMap
@@ -31031,7 +31057,7 @@ function createCmsApiHandler(config) {
         }, {
           status: 400
         });
-        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-WGM7HWG4.js');
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-3W5I3LON.js');
         const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
         return handlers.getChannels(req, orderId);
       }
@@ -31046,7 +31072,7 @@ function createCmsApiHandler(config) {
         }, {
           status: 400
         });
-        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-WGM7HWG4.js');
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-3W5I3LON.js');
         const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
         return handlers.sendOtp(req, orderId);
       }
@@ -31061,7 +31087,7 @@ function createCmsApiHandler(config) {
         }, {
           status: 400
         });
-        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-WGM7HWG4.js');
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-3W5I3LON.js');
         const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
         return handlers.verifyOtp(req, orderId);
       }
@@ -31693,7 +31719,7 @@ function createStorefrontApiHandler(config) {
   const otpPepper = config.otpPepper;
   const defaultPhoneCc = config.defaultPhoneCountryCode;
   function fireOrderPlacedNotification(orderId, isPaid) {
-    void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+    void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
       fireOrderNotificationTrigger("order_placed", orderId, {
         dataSource,
         entityMap
@@ -34630,7 +34656,7 @@ function createStorefrontApiHandler(config) {
             } catch {
             }
             try {
-              void import('./emit-order-notification-trigger-XVG2B5ZF.js').then(({ fireOrderNotificationTrigger }) => {
+              void import('./emit-order-notification-trigger-MFCBAE7L.js').then(({ fireOrderNotificationTrigger }) => {
                 fireOrderNotificationTrigger("order_cancelled", orderId, {
                   dataSource,
                   entityMap

package/dist/{chunk-EWXG4E74.cjs → chunk-M25DGZ5J.cjs}

@@ -2,9 +2,9 @@
 
 var chunkH3IVLIPR_cjs = require('./chunk-H3IVLIPR.cjs');
 var chunkUEE4PTTB_cjs = require('./chunk-UEE4PTTB.cjs');
-var chunkYVP4NQII_cjs = require('./chunk-YVP4NQII.cjs');
-var chunkMXABMVF7_cjs = require('./chunk-MXABMVF7.cjs');
-var chunkJLDHK2QE_cjs = require('./chunk-JLDHK2QE.cjs');
+var chunkVM6OVUUM_cjs = require('./chunk-VM6OVUUM.cjs');
+var chunkXFDIIVZB_cjs = require('./chunk-XFDIIVZB.cjs');
+var chunkTZEMLHSP_cjs = require('./chunk-TZEMLHSP.cjs');
 var chunkOOTLNH63_cjs = require('./chunk-OOTLNH63.cjs');
 var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
 var crypto = require('crypto');
@@ -223,7 +223,10 @@ async function loadOrderNotificationContexts(orderId, deps) {
       deleted: false
     },
     relations: [
-      "contact"
+      "contact",
+      "assignedUser",
+      "shippingAddress",
+      "billingAddress"
     ]
   });
   if (!order) return null;
@@ -278,7 +281,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,
@@ -310,13 +313,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,
@@ -326,6 +358,16 @@ async function loadOrderNotificationContexts(orderId, deps) {
   };
 }
 chunkUSNT2KNT_cjs.__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"
+  });
+}
+chunkUSNT2KNT_cjs.__name(formatScheduleDate, "formatScheduleDate");
 
 // src/plugins/whatsapp/whatsapp-service.ts
 function norm(v) {
@@ -1010,14 +1052,14 @@ async function sendChatLeadEmail(cms, emailSettings, brandingSettings, input) {
     recipients,
     source: input.recipients?.length ? "intent_email_to" : "crm_or_smtp_fallback"
   });
-  const companyDetails = chunkJLDHK2QE_cjs.mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings);
+  const companyDetails = chunkTZEMLHSP_cjs.mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings);
   const ctx = {
     ...input,
     companyDetails: input.companyDetails ?? companyDetails
   };
   let anySent = false;
   for (const to of recipients) {
-    await chunkMXABMVF7_cjs.queueEmail(cms, {
+    await chunkXFDIIVZB_cjs.queueEmail(cms, {
       to,
       templateName: "chatLead",
       ctx
@@ -1092,7 +1134,7 @@ function emailPlugin(config) {
         context.logger.warn("Email plugin skipped: AWS SES requires AWS_SES_REGION or AWS_REGION");
         return void 0;
       }
-      if (type === "AWS" && merged.region && merged.user && merged.password && !chunkYVP4NQII_cjs.sesRegionSupportsSmtp(merged.region)) {
+      if (type === "AWS" && merged.region && merged.user && merged.password && !chunkVM6OVUUM_cjs.sesRegionSupportsSmtp(merged.region)) {
         context.logger.warn(`Email plugin: region ${merged.region} has no SES SMTP endpoint (ENOTFOUND). Set AWS_SES_REGION=ap-south-1 and create SMTP credentials in that SES region.`);
       }
       if (type === "AWS" && !(merged.user && merged.password || merged.accessKeyId && merged.secretAccessKey)) {
@@ -1107,13 +1149,13 @@ function emailPlugin(config) {
         context.logger.warn("Email plugin skipped: SMTP_TYPE=SMTP requires SMTP_HOST (or use SMTP_TYPE=AWS with AWS_REGION and SES SMTP credentials)");
         return void 0;
       }
-      const resolvedHost = type === "AWS" && merged.region ? merged.host || chunkYVP4NQII_cjs.sesSmtpHost(merged.region) : merged.host;
+      const resolvedHost = type === "AWS" && merged.region ? merged.host || chunkVM6OVUUM_cjs.sesSmtpHost(merged.region) : merged.host;
       context.logger.info("Email plugin initialized", {
         type,
         host: resolvedHost,
         region: merged.region
       });
-      return new chunkYVP4NQII_cjs.EmailService(merged);
+      return new chunkVM6OVUUM_cjs.EmailService(merged);
     }
   };
 }
@@ -1276,60 +1318,68 @@ chunkUSNT2KNT_cjs.__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: {
@@ -1338,6 +1388,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!",
@@ -1354,6 +1406,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.",
@@ -1784,7 +1838,7 @@ async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables,
     getSettingsGroup(dataSource, entityMap, "email"),
     getSettingsGroup(dataSource, entityMap, "store")
   ]);
-  const companyDetails = chunkJLDHK2QE_cjs.mergeEmailLayoutCompanyDetails(branding, emailSettings, storeSettings);
+  const companyDetails = chunkTZEMLHSP_cjs.mergeEmailLayoutCompanyDetails(branding, emailSettings, storeSettings);
   const templateContent = (template.body ?? "") + (template.subject ?? "");
   const shouldAttachInvoice = /\{\{\s*(invoiceAttachment|invoicePdf|invoice|attachInvoice)\s*\}\}/i.test(templateContent);
   const cleanVariables = {
@@ -1798,12 +1852,12 @@ async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables,
   const subject = chunkOOTLNH63_cjs.applyTemplateVars(template.subject ?? "Order update", cleanVariables);
   const rawBody = chunkOOTLNH63_cjs.applyTemplateVars(template.body, cleanVariables);
   const bodyHtml = formatBodyForEmailHtml(rawBody);
-  const html = chunkYVP4NQII_cjs.renderLayout({
+  const html = chunkVM6OVUUM_cjs.renderLayout({
     bodyHtml,
     companyDetails
   });
   const cms = await getCms();
-  await chunkMXABMVF7_cjs.queueEmail(cms, {
+  await chunkXFDIIVZB_cjs.queueEmail(cms, {
     to: contactEmail,
     subject,
     html,
@@ -1897,10 +1951,15 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
       isAudienceEmailEnabled(dataSource, entityMap, "vendor"),
       isAudienceEmailEnabled(dataSource, entityMap, "admin")
     ]);
-    if (customerEnabled && contactEmail) {
+    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 if (customerEnabled && contactEmail) {
       await sendEmailForTrigger(triggerKey, payload.orderId, "customers", variables, contactEmail, dataSource, entityMap, getCms);
     }
-    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);
@@ -1909,7 +1968,7 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
         }
       }
     }
-    if (adminEnabled) {
+    if (adminEnabled && triggerKey !== "order_assigned_assignee") {
       const adminEmails = await getAdminRecipientEmails(dataSource, entityMap);
       for (const aEmail of adminEmails) {
         await sendEmailForTrigger(triggerKey, payload.orderId, "admin", variables, aEmail, dataSource, entityMap, getCms);
@@ -1924,22 +1983,23 @@ 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;
+    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);
     }
-    if (pushVendorEnabled && payload.vendorId) {
+    if (pushVendorEnabled && payload.vendorId && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "vendors", String(payload.vendorId), variables, dataSource, entityMap);
     }
-    if (pushAdminEnabled) {
+    if (pushAdminEnabled && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "admin", "admin", variables, dataSource, entityMap);
     }
   }
   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", {
+      console.warn("[order-notifications] skip WhatsApp: no recipient phone", {
         triggerKey,
         orderId: payload.orderId
       });