@infuro/cms-core 1.0.63 → 1.0.64

package/dist/{chunk-BWOITUNI.js → chunk-OJAYCNE5.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 { 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.",
@@ -1875,10 +1929,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);
@@ -1887,7 +1946,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);
@@ -1902,22 +1961,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
       });

package/dist/{chunk-MWEK7N3F.js → chunk-OPJEV44S.js}

@@ -1,5 +1,5 @@
 import { isErpIntegrationEnabled } from './chunk-JC6DLWTE.js';
-import { mergeEmailLayoutCompanyDetails, getCompanyDetailsFromSettings } from './chunk-3VZAAQUV.js';
+import { mergeEmailLayoutCompanyDetails, getCompanyDetailsFromSettings } from './chunk-YRCKEGL2.js';
 import { __name } from './chunk-SHUYVCID.js';
 import { rgb, PDFDocument, StandardFonts } from 'pdf-lib';
 
@@ -664,7 +664,7 @@ async function buildLocalInvoicePdfForOrder(ds, entityMap, orderId) {
     loadSettingsGroup(ds, entityMap, "branding"),
     loadSettingsGroup(ds, entityMap, "email")
   ]);
-  const companyDetails = mergeEmailLayoutCompanyDetails(branding, email);
+  const companyDetails = mergeEmailLayoutCompanyDetails(branding, email, store);
   const fromBranding = getCompanyDetailsFromSettings(branding);
   const rawLogo = store.invoiceLogoUrl || store.companyLogo || store.logo || companyDetails.logoUrl || fromBranding.logoUrl || null;
   const logoUrl = resolveInvoiceAssetUrl(rawLogo);

package/dist/{chunk-RHYVNRYG.cjs → chunk-PX3BSCIG.cjs}

@@ -92,7 +92,7 @@ async function emitOrderNotificationTrigger(triggerKey, orderId, deps, extra) {
   };
   if (listenerCount === 0) {
     try {
-      const { dispatchOrderNotificationDirectly } = await import('./order-notification-dispatcher-5TUFCDU7.cjs');
+      const { dispatchOrderNotificationDirectly } = await import('./order-notification-dispatcher-RNEQB3V7.cjs');
       await dispatchOrderNotificationDirectly(triggerKey, triggerPayload, deps.dataSource, deps.entityMap);
     } catch (err) {
       console.error("[notification-triggers] direct dispatch failed", {

package/dist/{chunk-RXTUSF3R.js → chunk-TU23GJPJ.js}

@@ -1,4 +1,4 @@
-import { isOrderEligibleForInvoiceEmail, resolveOrderInvoicePdfBytes } from './chunk-MWEK7N3F.js';
+import { isOrderEligibleForInvoiceEmail, resolveOrderInvoicePdfBytes } from './chunk-OPJEV44S.js';
 import { __name } from './chunk-SHUYVCID.js';
 
 // src/plugins/email/email-queue.ts
@@ -131,7 +131,7 @@ async function queueEmail(cms, payload) {
   let email = cms && typeof cms.getPlugin === "function" ? cms.getPlugin("email") : void 0;
   if (!email) {
     try {
-      const { EmailService } = await import('./email-service-DPKVQOKP.js');
+      const { EmailService } = await import('./email-service-ADDF52PJ.js');
       const env = typeof process !== "undefined" && process.env ? process.env : {};
       const type = String(env.SMTP_TYPE || "SMTP").toUpperCase();
       const port = env.SMTP_PORT ? parseInt(env.SMTP_PORT, 10) : void 0;

package/dist/{chunk-JLDHK2QE.cjs → chunk-TZEMLHSP.cjs}

@@ -49,20 +49,25 @@ function absolutizeEmailAssetUrl(url) {
 chunkUSNT2KNT_cjs.__name(absolutizeEmailAssetUrl, "absolutizeEmailAssetUrl");
 function mergeEmailLayoutCompanyDetails(branding, emailSettings, storeSettings) {
   const fromBranding = getCompanyDetailsFromSettings(branding);
-  const pick = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((emailVal, fallback) => {
-    const t = emailVal?.trim();
-    return t || fallback?.trim() || void 0;
-  }, "pick");
-  const storeLogo = storeSettings?.invoiceLogoUrl || storeSettings?.companyLogo || storeSettings?.logo || "";
-  const storeName = storeSettings?.companyName || storeSettings?.storeName || "";
-  const storeEmail = storeSettings?.companyEmail || "";
-  const storePhone = storeSettings?.companyPhone || "";
-  const logoUrl = absolutizeEmailAssetUrl(pick(emailSettings.logoUrl ?? emailSettings.emailLogoUrl, fromBranding.logoUrl || storeLogo));
-  const companyName = pick(emailSettings.companyName ?? emailSettings.emailCompanyName, fromBranding.companyName || storeName);
-  const supportEmail = pick(emailSettings.supportEmail ?? emailSettings.emailSupportEmail, fromBranding.supportEmail || storeEmail);
-  const supportPhone = pick(emailSettings.supportPhone, storePhone || void 0);
-  const footerDisclaimer = pick(emailSettings.footerDisclaimer, void 0);
-  const followUsTitle = pick(emailSettings.followUsTitle, "Follow Us") || "Follow Us";
+  const first = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((...vals) => {
+    for (const v of vals) {
+      const t = v?.trim();
+      if (t) return t;
+    }
+    return void 0;
+  }, "first");
+  const storeLogo = first(storeSettings?.invoiceLogoUrl, storeSettings?.companyLogo, storeSettings?.logo);
+  const storeName = first(storeSettings?.companyName, storeSettings?.storeName);
+  const storeEmail = first(storeSettings?.companyEmail);
+  const storePhone = first(storeSettings?.companyPhone);
+  const storeAddress = first(storeSettings?.companyAddress);
+  const logoUrl = absolutizeEmailAssetUrl(first(storeLogo, emailSettings.logoUrl, emailSettings.emailLogoUrl, fromBranding.logoUrl));
+  const companyName = first(storeName, emailSettings.companyName, emailSettings.emailCompanyName, fromBranding.companyName);
+  const supportEmail = first(storeEmail, emailSettings.supportEmail, emailSettings.emailSupportEmail, fromBranding.supportEmail);
+  const supportPhone = first(storePhone, emailSettings.supportPhone);
+  const companyAddress = storeAddress;
+  const footerDisclaimer = first(emailSettings.footerDisclaimer);
+  const followUsTitle = first(emailSettings.followUsTitle, "Follow Us") || "Follow Us";
   const socialFromEmail = parseSocialLinksJson(emailSettings.socialLinks);
   const socialLinks = socialFromEmail?.length ? socialFromEmail : fromBranding.socialLinks;
   return {
@@ -70,6 +75,7 @@ function mergeEmailLayoutCompanyDetails(branding, emailSettings, storeSettings)
     companyName,
     supportEmail,
     supportPhone,
+    companyAddress,
     socialLinks,
     footerDisclaimer,
     followUsTitle

package/dist/{chunk-YVP4NQII.cjs → chunk-VM6OVUUM.cjs}

@@ -17,41 +17,65 @@ function escapeHtml(s) {
 chunkUSNT2KNT_cjs.__name(escapeHtml, "escapeHtml");
 function socialLinkInnerHtml(s) {
   if (s.iconUrl?.trim()) {
-    return `<img src="${escapeHtml(s.iconUrl.trim())}" alt="" width="20" height="20" style="display:inline-block;vertical-align:middle;border:0;" />`;
+    return `<img src="${escapeHtml(s.iconUrl.trim())}" alt="" width="22" height="22" style="display:block;border:0;border-radius:4px;" />`;
   }
-  const label = s.icon && s.icon.trim() || "\u{1F517}";
-  return escapeHtml(label);
+  const label = s.icon && s.icon.trim() || "\u2022";
+  return `<span style="display:inline-block;width:28px;height:28px;line-height:28px;text-align:center;border-radius:999px;background:#ffffff;color:#1e293b;font-size:14px;">${escapeHtml(label)}</span>`;
 }
 chunkUSNT2KNT_cjs.__name(socialLinkInnerHtml, "socialLinkInnerHtml");
-function supportLinesHtml(supportEmail, supportPhone) {
-  const parts = [];
-  if (supportEmail) {
-    parts.push(`<a href="mailto:${escapeHtml(supportEmail)}" style="color:#6b7280;text-decoration:none;font-size:13px;">${escapeHtml(supportEmail)}</a>`);
-  }
-  if (supportPhone) {
-    parts.push(`<span style="color:#6b7280;font-size:13px;">${escapeHtml(supportPhone)}</span>`);
-  }
-  return parts.join('<span style="color:#d1d5db;padding:0 8px;">\xB7</span>');
-}
-chunkUSNT2KNT_cjs.__name(supportLinesHtml, "supportLinesHtml");
 function renderLayout(options) {
   const { bodyHtml, companyDetails } = options;
-  const { logoUrl, companyName, supportEmail, supportPhone, socialLinks, footerDisclaimer, followUsTitle = "Follow Us" } = companyDetails;
+  const { logoUrl, companyName, supportEmail, supportPhone, companyAddress, socialLinks, footerDisclaimer, followUsTitle = "Follow Us" } = companyDetails;
   const brand = (companyName || "Store").trim();
+  const year = (/* @__PURE__ */ new Date()).getFullYear();
+  const slate = "#0f172a";
+  const slateSoft = "#1e293b";
   const accent = "#ea580c";
-  const logoHtml = logoUrl ? `<img src="${escapeHtml(logoUrl)}" alt="${escapeHtml(brand)}" width="160" style="max-height:56px;max-width:180px;height:auto;width:auto;display:block;border:0;margin:0 auto;" />` : `<div style="font-size:22px;font-weight:700;letter-spacing:-0.02em;color:#111827;">${escapeHtml(brand)}</div>`;
+  const accentSoft = "#ffedd5";
+  const pageBg = "#eef2f7";
+  const muted = "#64748b";
+  const border = "#e2e8f0";
+  const logoBlock = logoUrl ? `<table role="presentation" cellpadding="0" cellspacing="0" style="margin:0 auto;border-collapse:collapse;">
+         <tr>
+           <td align="center" style="background:#ffffff;border-radius:14px;padding:14px 22px;box-shadow:0 8px 24px rgba(15,23,42,0.18);">
+             <img src="${escapeHtml(logoUrl)}" alt="${escapeHtml(brand)}" width="148" style="max-height:52px;max-width:148px;height:auto;width:auto;display:block;border:0;margin:0 auto;" />
+           </td>
+         </tr>
+       </table>` : `<div style="font-family:Georgia,'Times New Roman',serif;font-size:26px;font-weight:700;letter-spacing:-0.02em;color:#ffffff;">${escapeHtml(brand)}</div>`;
   const hasSocial = Boolean(socialLinks?.length);
-  const socialRowHtml = hasSocial && socialLinks ? `<div style="margin-top:12px;text-align:center;font-size:0;line-height:0;">${socialLinks.map((s) => `<a href="${escapeHtml(s.url)}" style="display:inline-block;margin:0 8px;text-decoration:none;color:#374151;font-size:18px;line-height:1;vertical-align:middle;">${socialLinkInnerHtml(s)}</a>`).join("")}</div>` : "";
-  const followTitleHtml = hasSocial && followUsTitle ? `<div style="font-size:12px;font-weight:600;color:#9ca3af;text-transform:uppercase;letter-spacing:0.06em;margin:0 0 4px 0;">${escapeHtml(followUsTitle)}</div>` : "";
-  const supportHtml = supportLinesHtml(supportEmail, supportPhone);
-  const disclaimerBlock = footerDisclaimer ? `<div style="margin-top:16px;font-size:11px;line-height:1.5;color:#9ca3af;">${escapeHtml(footerDisclaimer).replace(/\n/g, "<br/>")}</div>` : "";
+  const socialRowHtml = hasSocial && socialLinks ? `<table role="presentation" cellpadding="0" cellspacing="0" style="margin:14px auto 0 auto;border-collapse:collapse;">
+           <tr>
+             ${socialLinks.map((s) => `<td style="padding:0 6px;">
+                      <a href="${escapeHtml(s.url)}" style="display:inline-block;text-decoration:none;border:1px solid ${border};border-radius:999px;padding:6px;background:#ffffff;">
+                        ${socialLinkInnerHtml(s)}
+                      </a>
+                    </td>`).join("")}
+           </tr>
+         </table>` : "";
+  const followTitleHtml = hasSocial && followUsTitle ? `<div style="font-size:11px;font-weight:700;color:${muted};text-transform:uppercase;letter-spacing:0.08em;margin:0;">${escapeHtml(followUsTitle)}</div>` : "";
+  const contactRows = [];
+  if (supportEmail) {
+    contactRows.push(`<a href="mailto:${escapeHtml(supportEmail)}" style="color:${slateSoft};text-decoration:none;font-size:13px;font-weight:500;">${escapeHtml(supportEmail)}</a>`);
+  }
+  if (supportPhone) {
+    contactRows.push(`<span style="color:${muted};font-size:13px;">${escapeHtml(supportPhone)}</span>`);
+  }
+  if (companyAddress?.trim()) {
+    contactRows.push(`<span style="color:${muted};font-size:12px;line-height:1.5;display:inline-block;max-width:360px;">${escapeHtml(companyAddress.trim()).replace(/\n/g, "<br/>")}</span>`);
+  }
+  const contactHtml = contactRows.length ? `<div style="margin-top:12px;line-height:1.7;">${contactRows.join("<br/>")}</div>` : "";
+  const disclaimerBlock = footerDisclaimer ? `<div style="margin-top:14px;font-size:11px;line-height:1.55;color:#94a3b8;max-width:420px;margin-left:auto;margin-right:auto;">${escapeHtml(footerDisclaimer).replace(/\n/g, "<br/>")}</div>` : "";
   const responsiveCss = `
 @media only screen and (max-width: 620px) {
-  .email-shell { padding: 16px 10px !important; }
-  .email-card { border-radius: 12px !important; }
-  .email-body { padding: 24px 18px !important; }
-  .email-header { padding: 20px 18px !important; }
-}
+  .email-shell { padding: 12px 8px !important; }
+  .email-header { padding: 28px 18px 24px 18px !important; }
+  .email-body { padding: 26px 18px 8px 18px !important; }
+  .email-footer { padding: 22px 18px 28px 18px !important; }
+  .email-accent-label { display: none !important; }
+}
+.email-body p { margin: 0 0 14px 0 !important; }
+.email-body h1, .email-body h2, .email-body h3 { margin: 0 0 12px 0 !important; color: ${slate} !important; }
+.email-body a { color: ${accent} !important; }
 `;
   return `<!DOCTYPE html>
 <html lang="en">
@@ -60,39 +84,56 @@ function renderLayout(options) {
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <title>${escapeHtml(brand)}</title>
+<!--[if mso]>
+<style type="text/css">
+  body, table, td { font-family: Arial, Helvetica, sans-serif !important; }
+</style>
+<![endif]-->
 <style type="text/css">${responsiveCss}</style>
 </head>
-<body style="margin:0;padding:0;background:#f3f4f6;-webkit-font-smoothing:antialiased;">
-  <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f3f4f6;border-collapse:collapse;">
+<body style="margin:0;padding:0;background:${pageBg};-webkit-font-smoothing:antialiased;">
+  <div style="display:none;max-height:0;overflow:hidden;opacity:0;color:transparent;mso-hide:all;">
+    Update from ${escapeHtml(brand)}
+  </div>
+  <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:${pageBg};border-collapse:collapse;">
     <tr>
-      <td class="email-shell" align="center" style="padding:32px 16px;">
-        <table role="presentation" class="email-card" width="100%" cellpadding="0" cellspacing="0" style="max-width:600px;background:#ffffff;border-radius:16px;overflow:hidden;border:1px solid #e5e7eb;border-collapse:collapse;">
-          <tr>
-            <td class="email-header" align="center" style="padding:28px 32px 20px 32px;background:#ffffff;">
-              ${logoHtml}
-              ${logoUrl && companyName ? `<div style="margin-top:10px;font-size:13px;color:#6b7280;">${escapeHtml(companyName)}</div>` : ""}
-            </td>
-          </tr>
-          <tr>
-            <td style="height:4px;line-height:4px;font-size:0;background:${accent};">&nbsp;</td>
-          </tr>
-          <tr>
-            <td class="email-body" style="padding:28px 32px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;font-size:15px;line-height:1.65;color:#1f2937;">
-              ${bodyHtml}
-            </td>
-          </tr>
+      <td class="email-shell" align="center" style="padding:40px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="max-width:600px;border-collapse:collapse;">
           <tr>
-            <td style="padding:0 32px;">
-              <div style="border-top:1px solid #e5e7eb;line-height:0;font-size:0;">&nbsp;</div>
+            <td style="background:#ffffff;border-radius:18px;overflow:hidden;border:1px solid ${border};box-shadow:0 12px 40px rgba(15,23,42,0.08);">
+              <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
+                <tr>
+                  <td class="email-header" align="center" style="padding:36px 32px 30px 32px;background:linear-gradient(165deg, ${slate} 0%, ${slateSoft} 100%);background-color:${slate};">
+                    <div class="email-accent-label" style="display:inline-block;margin:0 0 18px 0;padding:5px 12px;border-radius:999px;background:rgba(234,88,12,0.18);border:1px solid rgba(251,146,60,0.35);font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;font-size:11px;font-weight:600;letter-spacing:0.06em;text-transform:uppercase;color:${accentSoft};">
+                      ${escapeHtml(brand)}
+                    </div>
+                    ${logoBlock}
+                    ${logoUrl ? `<div style="margin-top:16px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;font-size:13px;color:#94a3b8;">${escapeHtml(brand)}</div>` : ""}
+                  </td>
+                </tr>
+                <tr>
+                  <td style="height:5px;line-height:5px;font-size:0;background:linear-gradient(90deg, ${accent} 0%, #f59e0b 55%, #fb923c 100%);background-color:${accent};">&nbsp;</td>
+                </tr>
+                <tr>
+                  <td class="email-body" style="padding:32px 36px 12px 36px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;font-size:15px;line-height:1.7;color:#334155;background:#ffffff;">
+                    ${bodyHtml}
+                  </td>
+                </tr>
+                <tr>
+                  <td class="email-footer" align="center" style="padding:24px 32px 32px 32px;background:#f8fafc;border-top:1px solid ${border};font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;">
+                    ${followTitleHtml}
+                    ${socialRowHtml}
+                    ${contactHtml}
+                    <div style="margin-top:18px;font-size:12px;color:#94a3b8;">\xA9 ${year} ${escapeHtml(brand)}. All rights reserved.</div>
+                    ${disclaimerBlock}
+                  </td>
+                </tr>
+              </table>
             </td>
           </tr>
           <tr>
-            <td align="center" style="padding:20px 32px 28px 32px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;">
-              ${followTitleHtml}
-              ${socialRowHtml}
-              ${supportHtml ? `<div style="margin-top:14px;">${supportHtml}</div>` : ""}
-              <div style="margin-top:12px;font-size:12px;color:#9ca3af;">\xA9 ${(/* @__PURE__ */ new Date()).getFullYear()} ${escapeHtml(brand)}</div>
-              ${disclaimerBlock}
+            <td align="center" style="padding:18px 8px 0 8px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;font-size:11px;line-height:1.5;color:#94a3b8;">
+              You\u2019re receiving this because of activity on your ${escapeHtml(brand)} account.
             </td>
           </tr>
         </table>
@@ -700,7 +741,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-YVP4NQII.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-VM6OVUUM.cjs', document.baseURI).href)));
 var MailComposer = require2("nodemailer/lib/mail-composer");
 var SES_REGIONS_WITHOUT_SMTP = /* @__PURE__ */ new Set([
   "af-south-1",

package/dist/{chunk-MXABMVF7.cjs → chunk-XFDIIVZB.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk7L556RGL_cjs = require('./chunk-7L556RGL.cjs');
+var chunkGLD263KW_cjs = require('./chunk-GLD263KW.cjs');
 var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
 
 // src/plugins/email/email-queue.ts
@@ -50,13 +50,13 @@ async function resolveInvoiceAttachmentForJob(cms, payload, options) {
       invoiceAttached: false
     };
     const o = order;
-    if (!chunk7L556RGL_cjs.isOrderEligibleForInvoiceEmail(o.status, o.orderKind)) {
+    if (!chunkGLD263KW_cjs.isOrderEligibleForInvoiceEmail(o.status, o.orderKind)) {
       return {
         attachments: payload.attachments,
         invoiceAttached: false
       };
     }
-    const resolved = await chunk7L556RGL_cjs.resolveOrderInvoicePdfBytes(cms, dataSource, entityMap, payload.orderId);
+    const resolved = await chunkGLD263KW_cjs.resolveOrderInvoicePdfBytes(cms, dataSource, entityMap, payload.orderId);
     if ("error" in resolved) {
       console.warn("[email] order invoice attach failed", {
         orderId: payload.orderId,
@@ -133,7 +133,7 @@ async function queueEmail(cms, payload) {
   let email = cms && typeof cms.getPlugin === "function" ? cms.getPlugin("email") : void 0;
   if (!email) {
     try {
-      const { EmailService } = await import('./email-service-ATCPJFWG.cjs');
+      const { EmailService } = await import('./email-service-5O24BSFR.cjs');
       const env = typeof process !== "undefined" && process.env ? process.env : {};
       const type = String(env.SMTP_TYPE || "SMTP").toUpperCase();
       const port = env.SMTP_PORT ? parseInt(env.SMTP_PORT, 10) : void 0;