@consilioweb/payload-support 0.13.0 → 0.14.0

package/dist/index.js

@@ -1519,17 +1519,31 @@ function createSlaCheckEndpoint(slugs) {
 }
 
 // src/utils/emailTemplate.ts
+var COLORS = {
+  ink: "#1d2b4d",
+  inkSoft: "#3a486a",
+  teal: "#17807c",
+  amber: "#c2410c",
+  paper: "#faf8f5",
+  card: "#ffffff",
+  sand: "#f4f1ec",
+  line: "#e7e2d9",
+  text: "#2a3142",
+  muted: "#6b7280",
+  faint: "#9aa1ad"
+};
 var DEFAULT_CONFIG = {
   brandName: "Support",
-  brandColor: "#00E5FF",
-  secondaryColor: "#FFD600",
-  accentColor: "#FF8A00",
+  brandColor: COLORS.teal,
+  secondaryColor: COLORS.ink,
+  accentColor: COLORS.amber,
   logoUrl: "",
   supportEmail: process.env.SUPPORT_EMAIL || "",
   websiteUrl: process.env.NEXT_PUBLIC_SERVER_URL || "",
   phone: "",
   location: "",
-  brandInitials: ""
+  brandInitials: "",
+  preferencesUrl: ""
 };
 function resolveConfig(config) {
   return { ...DEFAULT_CONFIG, ...config };
@@ -1568,30 +1582,30 @@ function emailRichContent(html, config) {
   }
   let result = html.replace(/src="\/([^"]+)"/g, `src="${baseUrl}/$1"`);
   result = convertFencedCodeBlocks(result);
-  result = styleTag(result, "blockquote", `border-left: 4px solid ${c.brandColor}; margin: 16px 0; padding: 12px 20px; background: #f0f9fa; border-radius: 0 8px 8px 0;`);
+  result = styleTag(result, "blockquote", `border-left: 3px solid ${COLORS.teal}; margin: 16px 0; padding: 12px 20px; background: ${COLORS.sand}; border-radius: 0 8px 8px 0; color: ${COLORS.inkSoft};`);
   result = styleTag(result, "img", "max-width: 100%; height: auto; border-radius: 8px; margin: 12px 0; display: block;");
-  result = styleTag(result, "a", `color: ${c.brandColor}; text-decoration: underline; font-weight: 600;`);
+  result = styleTag(result, "a", `color: ${COLORS.teal}; text-decoration: underline; font-weight: 600;`);
   result = styleTag(result, "ul", "margin: 8px 0; padding-left: 24px;");
   result = styleTag(result, "ol", "margin: 8px 0; padding-left: 24px;");
-  result = styleTag(result, "li", "margin: 4px 0; line-height: 1.6;");
-  result = styleTag(result, "p", "margin: 0 0 12px 0; line-height: 1.75; font-size: 15px; color: #1f2937;");
-  result = result.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, "").replace(/<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>/gi, "").replace(/\bon\w+\s*=\s*"[^"]*"/gi, "").replace(/\bon\w+\s*=\s*'[^']*'/gi, "").replace(/javascript:/gi, "");
-  return `<div style="font-size: 15px; line-height: 1.75; color: #1f2937;">${result}</div>`;
+  result = styleTag(result, "li", `margin: 4px 0; line-height: 1.6; color: ${COLORS.text};`);
+  result = styleTag(result, "p", `margin: 0 0 12px 0; line-height: 1.75; font-size: 15px; color: ${COLORS.text};`);
+  result = result.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, "").replace(/<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>/gi, "").replace(/<iframe\b[^<]*(?:(?!<\/iframe>)<[^<]*)*<\/iframe>/gi, "").replace(/<iframe\b[^>]*\/?>/gi, "").replace(/<embed\b[^>]*\/?>/gi, "").replace(/<object\b[^<]*(?:(?!<\/object>)<[^<]*)*<\/object>/gi, "").replace(/\bon\w+\s*=\s*"[^"]*"/gi, "").replace(/\bon\w+\s*=\s*'[^']*'/gi, "").replace(/\bon\w+\s*=\s*[^\s>]+/gi, "").replace(/javascript:/gi, "");
+  return `<div style="font-size: 15px; line-height: 1.75; color: ${COLORS.text};">${result}</div>`;
 }
-function getButtonColors(config) {
+function getButtonColors(_config) {
   return {
-    primary: { bg: config.brandColor, text: "#000000", border: "#000000" },
-    secondary: { bg: config.secondaryColor, text: "#000000", border: "#000000" },
-    dark: { bg: "#000000", text: "#FFFFFF", border: "#000000" }
+    primary: { bg: COLORS.teal, text: "#ffffff", border: COLORS.teal },
+    secondary: { bg: COLORS.sand, text: COLORS.ink, border: COLORS.line },
+    dark: { bg: COLORS.ink, text: "#ffffff", border: COLORS.ink }
   };
 }
 function emailButton(text, url, color = "primary", config) {
-  const c = resolveConfig(config);
-  const colors = getButtonColors(c);
+  resolveConfig(config);
+  const colors = getButtonColors();
   const bc = colors[color];
   return `
     <div style="text-align: center; margin: 32px 0;">
-      <a href="${url}" style="display: inline-block; padding: 16px 40px; background: ${bc.bg}; color: ${bc.text}; font-weight: 800; font-size: 15px; text-decoration: none; border-radius: 10px; border: 2px solid ${bc.border}; letter-spacing: 0.02em;">
+      <a href="${url}" style="display: inline-block; padding: 14px 36px; background: ${bc.bg}; color: ${bc.text}; font-weight: 700; font-size: 15px; text-decoration: none; border-radius: 10px; border: 1px solid ${bc.border}; letter-spacing: 0.01em;">
         ${text}
       </a>
     </div>
@@ -1606,8 +1620,9 @@ function renderCodeBlockHtml(lang, code) {
   </div>`;
 }
 function emailQuote(content, borderColor, config) {
-  const c = resolveConfig(config);
-  const color = borderColor || c.brandColor;
+  resolveConfig(config);
+  const color = borderColor || COLORS.teal;
+  const panel = `margin: 24px 0; padding: 18px 22px; background: ${COLORS.sand}; border-left: 3px solid ${color}; border-radius: 0 8px 8px 0;`;
   if (content && content.includes("```")) {
     const parts = [];
     const regex = /```(\w*)\n?([\s\S]*?)```/g;
@@ -1616,62 +1631,77 @@ function emailQuote(content, borderColor, config) {
     while ((match = regex.exec(content)) !== null) {
       const textBefore = content.slice(lastIndex, match.index).trim();
       if (textBefore) {
-        parts.push(`<p style="margin: 0 0 12px 0; font-size: 15px; line-height: 1.75; color: #333333; white-space: pre-wrap;">${escapeHtml(textBefore)}</p>`);
+        parts.push(`<p style="margin: 0 0 12px 0; font-size: 15px; line-height: 1.75; color: ${COLORS.inkSoft}; white-space: pre-wrap;">${escapeHtml(textBefore)}</p>`);
       }
       parts.push(renderCodeBlockHtml(match[1] || "", match[2] || ""));
       lastIndex = match.index + match[0].length;
     }
     const textAfter = content.slice(lastIndex).trim();
     if (textAfter) {
-      parts.push(`<p style="margin: 12px 0 0 0; font-size: 15px; line-height: 1.75; color: #333333; white-space: pre-wrap;">${escapeHtml(textAfter)}</p>`);
+      parts.push(`<p style="margin: 12px 0 0 0; font-size: 15px; line-height: 1.75; color: ${COLORS.inkSoft}; white-space: pre-wrap;">${escapeHtml(textAfter)}</p>`);
     }
     return `
-      <div style="margin: 24px 0; padding: 20px 24px; background: #f8f9fa; border-left: 4px solid ${color}; border-radius: 0 8px 8px 0;">
+      <div style="${panel}">
         ${parts.join("")}
       </div>
     `;
   }
   return `
-    <div style="margin: 24px 0; padding: 20px 24px; background: #f8f9fa; border-left: 4px solid ${color}; border-radius: 0 8px 8px 0;">
-      <p style="margin: 0; font-size: 15px; line-height: 1.75; color: #333333; white-space: pre-wrap;">${escapeHtml(content)}</p>
+    <div style="${panel}">
+      <p style="margin: 0; font-size: 15px; line-height: 1.75; color: ${COLORS.inkSoft}; white-space: pre-wrap;">${escapeHtml(content)}</p>
     </div>
   `;
 }
 function emailParagraph(text) {
-  return `<p style="margin: 0 0 18px 0; font-size: 15px; line-height: 1.75; color: #1f2937;">${text}</p>`;
+  return `<p style="margin: 0 0 18px 0; font-size: 15px; line-height: 1.75; color: ${COLORS.text};">${text}</p>`;
+}
+function getKindStyle(kind) {
+  switch (kind) {
+    case "reply":
+      return { eyebrow: "R\xE9ponse de votre \xE9quipe", accent: COLORS.teal };
+    case "alert":
+      return { eyebrow: "Action requise", accent: COLORS.amber };
+    case "system":
+    default:
+      return { eyebrow: "Notification automatique", accent: COLORS.inkSoft };
+  }
 }
 function emailFooter(config) {
   const logoHtml = config.logoUrl ? `<a href="${config.websiteUrl}">
             <img src="${config.logoUrl}" alt="${escapeHtml(config.brandName)}" width="100" height="47" style="display: block; border: 0;" />
-          </a>` : `<a href="${config.websiteUrl}" style="font-size: 18px; font-weight: 900; color: #000000; text-decoration: none;">${escapeHtml(config.brandName)}</a>`;
+          </a>` : `<a href="${config.websiteUrl}" style="font-size: 16px; font-weight: 800; color: ${COLORS.ink}; text-decoration: none; letter-spacing: -0.01em;">${escapeHtml(config.brandName)}</a>`;
   const contactParts = [];
   if (config.supportEmail) {
-    contactParts.push(`<a href="mailto:${config.supportEmail}" style="color: #555555; text-decoration: none;">${config.supportEmail}</a>`);
+    contactParts.push(`<a href="mailto:${config.supportEmail}" style="color: ${COLORS.muted}; text-decoration: none;">${config.supportEmail}</a>`);
   }
   if (config.phone) {
-    contactParts.push(`<a href="tel:${config.phone.replace(/\s/g, "")}" style="color: #555555; text-decoration: none;">${config.phone}</a>`);
+    contactParts.push(`<a href="tel:${config.phone.replace(/\s/g, "")}" style="color: ${COLORS.muted}; text-decoration: none;">${config.phone}</a>`);
   }
   const locationParts = [];
   if (config.websiteUrl) {
     const displayUrl = config.websiteUrl.replace(/^https?:\/\//, "");
-    locationParts.push(`<a href="${config.websiteUrl}" style="color: ${config.brandColor}; text-decoration: none; font-weight: 600;">${displayUrl}</a>`);
+    locationParts.push(`<a href="${config.websiteUrl}" style="color: ${COLORS.teal}; text-decoration: none; font-weight: 600;">${displayUrl}</a>`);
   }
   if (config.location) {
     locationParts.push(config.location);
   }
-  const unsubscribeHtml = config.supportEmail ? `<p style="margin: 8px 0 0 0; font-size: 11px; color: #aaaaaa; line-height: 1.4;">
-            <a href="mailto:${config.supportEmail}?subject=Unsubscribe" style="color: #aaaaaa; text-decoration: underline;">Se d&eacute;sinscrire</a>
-          </p>` : "";
+  const manageUrl = config.preferencesUrl || (config.websiteUrl ? `${config.websiteUrl}/support/profile` : "") || (config.supportEmail ? `mailto:${config.supportEmail}?subject=Notifications` : "");
+  const preferencesLinks = [];
+  if (manageUrl) {
+    preferencesLinks.push(`<a href="${manageUrl}" style="color: ${COLORS.muted}; text-decoration: underline;">G\xE9rer mes notifications</a>`);
+  }
+  if (config.supportEmail) {
+    preferencesLinks.push(`<a href="mailto:${config.supportEmail}?subject=Unsubscribe" style="color: ${COLORS.faint}; text-decoration: underline;">Se d\xE9sinscrire</a>`);
+  }
+  const preferencesHtml = preferencesLinks.length > 0 ? `<p style="margin: 10px 0 0 0; font-size: 11px; color: ${COLORS.faint}; line-height: 1.5;">${preferencesLinks.join(" &nbsp;&middot;&nbsp; ")}</p>` : "";
   return `
     <!-- Spacer -->
-    <div style="height: 24px;"></div>
+    <div style="height: 28px;"></div>
 
-    <!-- Tricolor separator -->
-    <table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 24px;">
+    <!-- Hairline separator -->
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 22px;">
       <tr>
-        <td width="50%" height="3" bgcolor="${config.brandColor}" style="font-size:1px;line-height:1px;">&nbsp;</td>
-        <td width="25%" height="3" bgcolor="${config.secondaryColor}" style="font-size:1px;line-height:1px;">&nbsp;</td>
-        <td width="25%" height="3" bgcolor="${config.accentColor}" style="font-size:1px;line-height:1px;">&nbsp;</td>
+        <td height="1" bgcolor="${COLORS.line}" style="font-size:1px;line-height:1px;">&nbsp;</td>
       </tr>
     </table>
 
@@ -1682,10 +1712,10 @@ function emailFooter(config) {
           ${logoHtml}
         </td>
         <td valign="top">
-          <p style="margin: 0; font-size: 14px; font-weight: 800; color: #000000; letter-spacing: 0.01em;">${escapeHtml(config.brandName)}</p>
-          ${contactParts.length > 0 ? `<p style="margin: 4px 0 0 0; font-size: 13px; color: #555555; line-height: 1.5;">${contactParts.join(" &nbsp;&middot;&nbsp; ")}</p>` : ""}
-          ${locationParts.length > 0 ? `<p style="margin: 4px 0 0 0; font-size: 12px; color: #888888; line-height: 1.4;">${locationParts.join(" &nbsp;&middot;&nbsp; ")}</p>` : ""}
-          ${unsubscribeHtml}
+          <p style="margin: 0; font-size: 13px; font-weight: 700; color: ${COLORS.ink}; letter-spacing: 0.01em;">${escapeHtml(config.brandName)}</p>
+          ${contactParts.length > 0 ? `<p style="margin: 4px 0 0 0; font-size: 13px; color: ${COLORS.muted}; line-height: 1.5;">${contactParts.join(" &nbsp;&middot;&nbsp; ")}</p>` : ""}
+          ${locationParts.length > 0 ? `<p style="margin: 4px 0 0 0; font-size: 12px; color: ${COLORS.faint}; line-height: 1.4;">${locationParts.join(" &nbsp;&middot;&nbsp; ")}</p>` : ""}
+          ${preferencesHtml}
         </td>
       </tr>
     </table>
@@ -1693,11 +1723,13 @@ function emailFooter(config) {
 }
 function emailWrapper(title, body, options = {}, config) {
   const c = resolveConfig(config);
-  const { headerColor = "primary", preheader } = options;
-  const headerBg = headerColor === "secondary" ? c.secondaryColor : c.brandColor;
+  const { preheader, kind } = options;
+  const kindStyle = kind ? getKindStyle(kind) : null;
+  const accent = kindStyle?.accent || COLORS.teal;
+  const eyebrowHtml = kindStyle ? `<p style="margin: 0 0 6px 0; font-size: 11px; font-weight: 700; text-transform: uppercase; letter-spacing: 0.08em; color: ${kindStyle.accent};">${escapeHtml(kindStyle.eyebrow)}</p>` : "";
   const badgeHtml = c.brandInitials ? `<td width="48" align="right" valign="middle">
-                    <div style="width: 36px; height: 36px; border-radius: 8px; background: #000; display: inline-block; text-align: center; line-height: 36px;">
-                      <span style="color: #fff; font-weight: 900; font-size: 14px; letter-spacing: 0.05em;">${escapeHtml(c.brandInitials)}</span>
+                    <div style="width: 38px; height: 38px; border-radius: 10px; background: ${COLORS.ink}; display: inline-block; text-align: center; line-height: 38px;">
+                      <span style="color: #fff; font-weight: 800; font-size: 14px; letter-spacing: 0.04em;">${escapeHtml(c.brandInitials)}</span>
                     </div>
                   </td>` : "";
   return `<!DOCTYPE html>
@@ -1712,23 +1744,29 @@ function emailWrapper(title, body, options = {}, config) {
   </style>
   <![endif]-->
 </head>
-<body style="margin: 0; padding: 0; background: #f0f0f0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;">
-  ${preheader ? `<div style="display: none; max-height: 0; overflow: hidden; mso-hide: all;">${escapeHtml(preheader)}</div>` : ""}
+<body style="margin: 0; padding: 0; background: ${COLORS.paper}; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;">
+  ${preheader ? `<div style="display: none; max-height: 0; overflow: hidden; mso-hide: all; font-size: 1px; line-height: 1px; color: ${COLORS.paper};">${escapeHtml(preheader)}&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;</div>` : ""}
 
   <!-- Outer wrapper -->
-  <table cellpadding="0" cellspacing="0" border="0" width="100%" style="background: #f0f0f0; padding: 40px 16px;">
+  <table cellpadding="0" cellspacing="0" border="0" width="100%" style="background: ${COLORS.paper}; padding: 40px 16px;">
     <tr>
       <td align="center">
-        <!-- Main container \u2014 wider (660px) -->
-        <table cellpadding="0" cellspacing="0" border="0" width="660" style="max-width: 660px; width: 100%;">
+        <!-- Main container \u2014 640px -->
+        <table cellpadding="0" cellspacing="0" border="0" width="640" style="max-width: 640px; width: 100%;">
+
+          <!-- Accent rule -->
+          <tr>
+            <td style="height: 4px; background: ${accent}; border-radius: 12px 12px 0 0; font-size: 1px; line-height: 1px;">&nbsp;</td>
+          </tr>
 
           <!-- Header -->
           <tr>
-            <td style="background: ${headerBg}; padding: 32px 40px; border-radius: 12px 12px 0 0; border: 2px solid #000000; border-bottom: none;">
+            <td style="background: ${COLORS.card}; padding: 30px 40px 22px 40px; border: 1px solid ${COLORS.line}; border-top: none; border-bottom: none;">
               <table cellpadding="0" cellspacing="0" border="0" width="100%">
                 <tr>
-                  <td>
-                    <h1 style="margin: 0; color: #000000; font-size: 22px; font-weight: 800; line-height: 1.3; letter-spacing: -0.01em;">
+                  <td valign="middle">
+                    ${eyebrowHtml}
+                    <h1 style="margin: 0; color: ${COLORS.ink}; font-size: 21px; font-weight: 800; line-height: 1.3; letter-spacing: -0.01em;">
                       ${escapeHtml(title)}
                     </h1>
                   </td>
@@ -1740,7 +1778,7 @@ function emailWrapper(title, body, options = {}, config) {
 
           <!-- Body -->
           <tr>
-            <td style="background: #ffffff; padding: 40px; border: 2px solid #000000; border-top: none; border-radius: 0 0 12px 12px;">
+            <td style="background: ${COLORS.card}; padding: 8px 40px 40px 40px; border: 1px solid ${COLORS.line}; border-top: none; border-radius: 0 0 12px 12px;">
               ${body}
               ${emailFooter(c)}
             </td>
@@ -5919,8 +5957,12 @@ async function _sendToEndpoint(endpoint, body, payload, slugs) {
 var STATUS_LABELS = {
   open: "Ouvert",
   waiting_client: "En attente client",
-  resolved: "Resolu"
+  waiting_support: "En attente support",
+  resolved: "Resolu",
+  closed: "Ferme",
+  escalated: "Escalade"
 };
+var SILENT_STATUSES = /* @__PURE__ */ new Set(["waiting_client", "waiting_support", "resolved"]);
 async function resolveClient(doc, payload, clientSlug) {
   const client = doc.client;
   if (!client) return null;
@@ -5972,21 +6014,24 @@ function createTicketStatusEmail(slugs) {
             emailParagraph(`Nous avons bien recu votre demande de support. Voici les details :`),
             `<table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 20px;">
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">N&deg; Ticket</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;"><strong>${escapeHtml(String(ticketNumber))}</strong></td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">N&deg; Ticket</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;"><strong>${escapeHtml(String(ticketNumber))}</strong></td>
               </tr>
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">Sujet</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;">${escapeHtml(String(subject))}</td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">Sujet</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;">${escapeHtml(String(subject))}</td>
               </tr>
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">Statut</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;">${STATUS_LABELS[doc.status] || doc.status}</td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">Statut</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;">${escapeHtml(STATUS_LABELS[doc.status] || String(doc.status))}</td>
               </tr>
             </table>`,
             emailParagraph("Notre equipe vous repondra dans les meilleurs delais."),
             emailButton("Consulter le ticket", ticketUrl)
-          ].join(""))
+          ].join(""), {
+            kind: "system",
+            preheader: `Votre demande ${ticketNumber} est bien enregistree. Nous revenons vers vous rapidement.`
+          })
         });
         payload.logger.info(`[tickets] Creation notification sent to ${client.email} for ${ticketNumber}`);
       } catch (error) {
@@ -5995,7 +6040,7 @@ function createTicketStatusEmail(slugs) {
       return doc;
     }
     if (operation === "update" && previousDoc?.status !== doc.status) {
-      if (doc.status === "resolved") return doc;
+      if (SILENT_STATUSES.has(doc.status)) return doc;
       try {
         const client = await resolveClient(doc, payload, slugs.supportClients);
         if (!client?.email) return doc;
@@ -6005,12 +6050,6 @@ function createTicketStatusEmail(slugs) {
         const statusLabel = STATUS_LABELS[doc.status] || doc.status;
         const previousStatusLabel = STATUS_LABELS[previousDoc?.status] || previousDoc?.status || "N/A";
         const ticketUrl = `${baseUrl}/support/tickets/${doc.id}`;
-        let contextMessage = "";
-        if (doc.status === "waiting_client") {
-          contextMessage = emailParagraph(
-            "Nous avons besoin d'informations supplementaires de votre part pour continuer le traitement de votre demande. Merci de consulter le ticket et de nous repondre."
-          );
-        }
         await payload.sendEmail({
           to: client.email,
           ...supportEmail ? { replyTo: supportEmail } : {},
@@ -6020,25 +6059,27 @@ function createTicketStatusEmail(slugs) {
             emailParagraph(`Le statut de votre ticket a ete mis a jour :`),
             `<table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 20px;">
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">N&deg; Ticket</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;"><strong>${escapeHtml(String(ticketNumber))}</strong></td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">N&deg; Ticket</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;"><strong>${escapeHtml(String(ticketNumber))}</strong></td>
               </tr>
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">Sujet</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;">${escapeHtml(String(subject))}</td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">Sujet</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;">${escapeHtml(String(subject))}</td>
               </tr>
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">Ancien statut</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;">${escapeHtml(String(previousStatusLabel))}</td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">Ancien statut</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;">${escapeHtml(String(previousStatusLabel))}</td>
               </tr>
               <tr>
-                <td style="padding: 8px 0; font-size: 12px; font-weight: 700; color: #333333; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.03em;">Nouveau statut</td>
-                <td style="padding: 8px 0; font-size: 15px; color: #1f2937; line-height: 1.5;"><strong>${escapeHtml(String(statusLabel))}</strong></td>
+                <td style="padding: 8px 0; font-size: 11px; font-weight: 700; color: #6b7280; width: 150px; vertical-align: top; text-transform: uppercase; letter-spacing: 0.04em;">Nouveau statut</td>
+                <td style="padding: 8px 0; font-size: 15px; color: #2a3142; line-height: 1.5;"><strong>${escapeHtml(String(statusLabel))}</strong></td>
               </tr>
             </table>`,
-            contextMessage,
             emailButton("Consulter le ticket", ticketUrl)
-          ].join(""))
+          ].join(""), {
+            kind: "system",
+            preheader: `Ticket ${ticketNumber} \u2014 nouveau statut : ${statusLabel}`
+          })
         });
         payload.logger.info(`[tickets] Status change notification sent to ${client.email} for ${ticketNumber} (${previousDoc?.status} -> ${doc.status})`);
       } catch (error) {
@@ -6554,16 +6595,27 @@ function createNotifyClientOnResolve(slugs) {
         depth: 0,
         overrideAccess: true
       }) : null;
-      if (!clientData?.email || clientData.notifyOnStatusChange === false) return doc;
+      if (!clientData?.email) return doc;
+      if (clientData.notifyResolution === false || clientData.notifyOnStatusChange === false) return doc;
       const settings = await readSupportSettings(req.payload);
       const ticketNumber = doc.ticketNumber || "TK-????";
+      const subject = doc.subject || "Support";
       const baseUrl = process.env.NEXT_PUBLIC_SERVER_URL || "";
       const replyTo = settings.email.replyToAddress || process.env.SUPPORT_EMAIL || "";
+      const ticketUrl = `${baseUrl}/support/tickets/${doc.id}`;
       await req.payload.sendEmail({
         to: clientData.email,
         ...replyTo ? { replyTo } : {},
         subject: `[${ticketNumber}] Ticket resolu`,
-        html: `<p>Bonjour ${escapeHtml(clientData.firstName || "")},</p><p>Votre ticket <strong>${escapeHtml(ticketNumber)}</strong> a ete resolu.</p><p><a href="${baseUrl}/support/tickets/${doc.id}">Consulter le ticket</a></p>`
+        html: emailWrapper(`Votre ticket a ete resolu`, [
+          emailParagraph(`Bonjour <strong>${escapeHtml(clientData.firstName || "")}</strong>,`),
+          emailParagraph(`Votre ticket <strong>${escapeHtml(ticketNumber)}</strong> \u2014 <em>${escapeHtml(String(subject))}</em> \u2014 a ete resolu.`),
+          emailParagraph("Si le probleme persiste ou si vous avez une question, repondez simplement a cet email pour rouvrir le ticket."),
+          emailButton("Consulter le ticket", ticketUrl)
+        ].join(""), {
+          kind: "system",
+          preheader: `Votre ticket ${ticketNumber} a ete resolu.`
+        })
       });
     } catch (err) {
       console.error("[support] Failed to notify client on resolve:", err);
@@ -7160,10 +7212,13 @@ function createNotifyClient(slugs) {
       const baseUrl = process.env.NEXT_PUBLIC_SERVER_URL || "";
       const supportEmail = settings.email.replyToAddress || process.env.SUPPORT_EMAIL || "";
       const portalUrl = `${baseUrl}/support/tickets/${ticketId}`;
+      const internalBcc = process.env.SUPPORT_CLIENT_BCC || void 0;
       const rawContent = doc.bodyHtml ? emailRichContent(doc.bodyHtml) : emailQuote(doc.body?.length > 500 ? doc.body.slice(0, 500) + "..." : doc.body);
+      const replyPreview = (doc.body || "").replace(/\s+/g, " ").trim().slice(0, 90);
       await req.payload.sendEmail({
         to: client.email,
         ...supportEmail ? { replyTo: supportEmail } : {},
+        ...internalBcc ? { bcc: internalBcc } : {},
         subject: `Re: [${ticketNumber}] ${subject}`,
         html: emailWrapper(`Nouvelle reponse \u2014 ${ticketNumber}`, [
           emailParagraph(`Bonjour <strong>${escapeHtml(client.firstName || "")}</strong>,`),
@@ -7172,7 +7227,10 @@ function createNotifyClient(slugs) {
           emailButton("Consulter le ticket", portalUrl),
           emailParagraph('<span style="font-size: 13px; color: #6b7280;">Vous pouvez egalement repondre directement a cet email. Votre message sera automatiquement ajoute au ticket.</span>'),
           emailTrackingPixel(ticketId, doc.id)
-        ].join(""))
+        ].join(""), {
+          kind: "reply",
+          preheader: replyPreview ? `${replyPreview}\u2026` : `Nouvelle reponse a votre ticket ${ticketNumber}`
+        })
       });
       await req.payload.update({
         collection: slugs.ticketMessages,
@@ -7282,6 +7340,10 @@ function createNotifyAdminOnClientMessage(slugs, notificationSlug) {
       const headerTitle = isNewTicket ? `Nouveau ticket ${ticketNumber}` : `Nouveau message \u2014 ${ticketNumber}`;
       if (primaryEmail) {
         await payload.sendEmail({
+          // INTERNAL email (to the support team) — recipients are the contact
+          // inbox + assigned agent. The cc here is internal→internal and stays
+          // a cc on purpose. Do NOT confuse with the client reply email
+          // (createNotifyClient), where internal copies must be bcc.
           to: primaryEmail,
           ...ccEmail ? { cc: ccEmail } : {},
           ...clientEmail !== "inconnu" ? { replyTo: clientEmail } : supportEmail ? { replyTo: supportEmail } : {},
@@ -7289,9 +7351,9 @@ function createNotifyAdminOnClientMessage(slugs, notificationSlug) {
           html: emailWrapper(headerTitle, [
             emailParagraph(`<strong>${escapeHtml(clientName)}</strong> (${escapeHtml(clientEmail)}) a ${isNewTicket ? "ouvert un nouveau ticket" : "repondu au ticket"} <strong>${escapeHtml(ticketNumber)}</strong> :`),
             `<p style="margin: 0 0 4px 0; font-size: 14px; font-weight: 600; color: #374151;">Sujet : ${escapeHtml(subject)}</p>`,
-            emailQuote(preview, isNewTicket ? "#FFD600" : "#00E5FF"),
+            emailQuote(preview, isNewTicket ? "#1d2b4d" : "#17807c"),
             emailButton("Ouvrir dans l'admin", adminUrl, "dark")
-          ].join(""), { headerColor: isNewTicket ? "secondary" : "primary" })
+          ].join(""), { kind: "system" })
         });
       }
       console.log(`[support] Admin notified for ${ticketNumber} (${isNewTicket ? "new" : "reply"})`);
@@ -7550,6 +7612,79 @@ function createSupportClientsCollection(slugs) {
           }
         ]
       },
+      {
+        type: "row",
+        fields: [
+          {
+            name: "city",
+            type: "text",
+            label: "Ville",
+            admin: { width: "50%" }
+          },
+          {
+            name: "country",
+            type: "text",
+            label: "Pays",
+            admin: { width: "50%" }
+          }
+        ]
+      },
+      {
+        name: "additionalContacts",
+        type: "array",
+        label: "Contacts additionnels",
+        labels: {
+          singular: "Contact",
+          plural: "Contacts"
+        },
+        fields: [
+          {
+            type: "row",
+            fields: [
+              {
+                name: "email",
+                type: "email",
+                required: true,
+                label: "Email",
+                admin: { width: "50%" }
+              },
+              {
+                name: "name",
+                type: "text",
+                label: "Nom",
+                admin: { width: "50%" }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        name: "opportunities",
+        type: "textarea",
+        label: "Opportunites commerciales",
+        admin: {
+          description: "Notes commerciales (visible uniquement par les admins)"
+        }
+      },
+      {
+        name: "tier",
+        type: "select",
+        label: "Plan",
+        options: [
+          { label: "Free", value: "free" },
+          { label: "Basic", value: "basic" },
+          { label: "Pro", value: "pro" },
+          { label: "Enterprise", value: "enterprise" }
+        ],
+        admin: { position: "sidebar" }
+      },
+      {
+        name: "accountManager",
+        type: "relationship",
+        relationTo: slugs.users,
+        label: "Agent referent",
+        admin: { position: "sidebar" }
+      },
       {
         name: "twoFactorEnabled",
         type: "checkbox",
@@ -7590,6 +7725,48 @@ function createSupportClientsCollection(slugs) {
           position: "sidebar"
         }
       },
+      {
+        name: "notifyReminders",
+        type: "checkbox",
+        defaultValue: true,
+        label: "Notifications rappels",
+        admin: {
+          description: "Recevoir un email pour les rappels",
+          position: "sidebar"
+        }
+      },
+      {
+        name: "notifyResolution",
+        type: "checkbox",
+        defaultValue: true,
+        label: "Notifications resolution",
+        admin: {
+          description: "Recevoir un email a la resolution d'un ticket",
+          position: "sidebar"
+        }
+      },
+      {
+        name: "notifyNews",
+        type: "checkbox",
+        defaultValue: false,
+        label: "Notifications actualites",
+        admin: {
+          description: "Recevoir les actualites et nouveautes",
+          position: "sidebar"
+        }
+      },
+      {
+        name: "notificationFrequency",
+        type: "select",
+        defaultValue: "immediate",
+        label: "Frequence des notifications",
+        options: [
+          { label: "Immediate", value: "immediate" },
+          { label: "Quotidienne", value: "daily" },
+          { label: "Hebdomadaire", value: "weekly" }
+        ],
+        admin: { position: "sidebar" }
+      },
       {
         name: "notes",
         type: "textarea",
@@ -7702,6 +7879,18 @@ function createTimeEntriesCollection(slugs) {
         name: "description",
         type: "textarea",
         label: "Description du travail"
+      },
+      {
+        name: "billable",
+        type: "checkbox",
+        defaultValue: true,
+        label: "Facturable"
+      },
+      {
+        name: "agent",
+        type: "relationship",
+        relationTo: slugs.users,
+        label: "Agent"
       }
     ],
     hooks: {
@@ -8002,6 +8191,14 @@ function createKnowledgeBaseCollection(slugs) {
           { label: "G\xE9n\xE9ral", value: "general" }
         ]
       },
+      {
+        name: "excerpt",
+        type: "textarea",
+        label: "R\xE9sum\xE9",
+        admin: {
+          description: "Court r\xE9sum\xE9 affich\xE9 dans les listes"
+        }
+      },
       {
         name: "body",
         type: "richText",
@@ -8015,12 +8212,33 @@ function createKnowledgeBaseCollection(slugs) {
         label: "Publi\xE9",
         admin: { position: "sidebar" }
       },
+      {
+        name: "popular",
+        type: "checkbox",
+        defaultValue: false,
+        label: "Populaire",
+        admin: { position: "sidebar" }
+      },
       {
         name: "sortOrder",
         type: "number",
         defaultValue: 0,
         label: "Ordre",
         admin: { position: "sidebar" }
+      },
+      {
+        name: "helpfulYes",
+        type: "number",
+        defaultValue: 0,
+        label: "Votes utiles",
+        admin: { position: "sidebar", readOnly: true }
+      },
+      {
+        name: "helpfulNo",
+        type: "number",
+        defaultValue: 0,
+        label: "Votes non utiles",
+        admin: { position: "sidebar", readOnly: true }
       }
     ],
     hooks: {