@flowselections/actie-mail-kwekers-erp-mathot 1.0.20 → 1.0.21

package/dist-lib/lib/campaigns.functions.js

@@ -214,18 +214,18 @@ export const sendCampaign = createServerFn({ method: "POST" })
         const stickerLine = p.sticker_cost && Number(p.sticker_cost) > 0
             ? `<div style="margin-top:12px;background:#eff6ff;border-left:4px solid #3b82f6;padding:10px 12px;border-radius:4px;font-size:14px;color:#1e3a8a;">📋 <strong>Eigen sticker opdrukken:</strong> ${fmtEuro(Number(p.sticker_cost))} per stuk</div>`
             : "";
-        return `<table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="border:1px solid #e5e7eb;border-radius:8px;margin:0 0 16px 0;background:#fff;">
-  <tr>
-    <td style="padding:14px;vertical-align:top;width:112px;">${imageCell}</td>
-    <td style="padding:14px 14px 14px 0;vertical-align:top;">
-      <div style="font-size:16px;font-weight:700;color:#111;line-height:1.3;">${escapeHtml(p.product_name)}</div>
-      ${p.plants_per_crate ? `<div style="font-size:13px;color:#6b7280;margin-top:2px;">${p.plants_per_crate} planten per fust</div>` : ""}
-      ${p.barcode ? `<div style="font-size:13px;color:#6b7280;margin-top:2px;">Barcode: ${escapeHtml(String(p.barcode))}</div>` : ""}
-      ${normal > 0 ? `<div style="font-size:13px;color:#9ca3af;text-decoration:line-through;margin-top:6px;">Origineel: ${fmtEuro(normal)}</div>` : ""}
-      <div style="margin-top:6px;">${tierChips}</div>
-    </td>
-  </tr>
-  ${stickerLine ? `<tr><td colspan="2" style="padding:0 14px 14px 14px;">${stickerLine}</td></tr>` : ""}
+        return `<table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="border:1px solid #e5e7eb;border-radius:8px;margin:0 0 16px 0;background:#fff;">
+  <tr>
+    <td style="padding:14px;vertical-align:top;width:112px;">${imageCell}</td>
+    <td style="padding:14px 14px 14px 0;vertical-align:top;">
+      <div style="font-size:16px;font-weight:700;color:#111;line-height:1.3;">${escapeHtml(p.product_name)}</div>
+      ${p.plants_per_crate ? `<div style="font-size:13px;color:#6b7280;margin-top:2px;">${p.plants_per_crate} planten per fust</div>` : ""}
+      ${p.barcode ? `<div style="font-size:13px;color:#6b7280;margin-top:2px;">Barcode: ${escapeHtml(String(p.barcode))}</div>` : ""}
+      ${normal > 0 ? `<div style="font-size:13px;color:#9ca3af;text-decoration:line-through;margin-top:6px;">Origineel: ${fmtEuro(normal)}</div>` : ""}
+      <div style="margin-top:6px;">${tierChips}</div>
+    </td>
+  </tr>
+  ${stickerLine ? `<tr><td colspan="2" style="padding:0 14px 14px 14px;">${stickerLine}</td></tr>` : ""}
 </table>`;
     };
     const productsHtml = (products ?? []).map(renderProduct).join("");
@@ -234,43 +234,43 @@ export const sendCampaign = createServerFn({ method: "POST" })
     const failed = [];
     for (const r of recipients ?? []) {
         const actionUrl = `${origin}/actie/${r.link_code}`;
-        const html = `<!doctype html><html><body style="margin:0;padding:0;font-family:Arial,Helvetica,sans-serif;background:#f3f4f6;">
-  <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="background:#f3f4f6;padding:24px 0;">
-    <tr><td align="center">
-      <table role="presentation" cellpadding="0" cellspacing="0" width="600" style="max-width:600px;width:100%;background:#ffffff;border-radius:12px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,0.06);">
-        <tr>
-          <td bgcolor="${brand.primary}" style="background-color:${brand.primary};background-image:linear-gradient(135deg,${brand.primary},${brand.primaryDark});padding:28px 24px;text-align:center;">
-            ${brand.logoUrl ? `<div style="margin:0 0 12px 0;"><img src="${escapeHtml(brand.logoUrl)}" alt="${escapeHtml(brand.brandName ?? "")}" height="40" style="display:inline-block;height:40px;max-width:220px;width:auto;border:0;" /></div>` : ""}
-            <div style="font-size:24px;font-weight:800;color:#ffffff;letter-spacing:-0.01em;">${escapeHtml(campaign.subject)}</div>
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:24px;background:#f9fafb;">
-            <p style="margin:0 0 12px 0;color:#111;font-size:15px;">Beste ${escapeHtml(r.recipient_name)},</p>
-            ${campaign.intro_message ? `<p style="margin:0 0 20px 0;color:#374151;font-size:15px;white-space:pre-line;line-height:1.5;">${escapeHtml(campaign.intro_message)}</p>` : `<p style="margin:0 0 20px 0;color:#374151;font-size:15px;">Wij hebben een mooie aanbieding voor u!</p>`}
-
-            ${productsHtml ? `<h2 style="margin:24px 0 8px 0;color:${brand.primaryText};font-size:22px;border-bottom:2px solid ${brand.primary};padding-bottom:6px;">Aanbiedingen</h2>${productsHtml}` : ""}
-
-            <div style="margin:16px 0;background:#fef3c7;border-left:4px solid #f59e0b;padding:12px 14px;border-radius:4px;color:#92400e;font-size:14px;">
-              ⏰ <strong>Actie geldig zolang de voorraad strekt!</strong>
-            </div>
-
-            <p style="margin:28px 0;text-align:center;">
-              <a href="${actionUrl}" style="background:${brand.button};color:${brand.buttonText};padding:14px 28px;border-radius:8px;text-decoration:none;display:inline-block;font-weight:700;font-size:16px;">🛒 Direct Bestellen</a>
-            </p>
-
-            <p style="color:#6b7280;font-size:12px;text-align:center;margin:16px 0 0 0;">Of <a href="${actionUrl}" style="color:${brand.primaryText};text-decoration:underline;">open deze link</a>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:18px 24px;background:#ffffff;border-top:1px solid #e5e7eb;color:#6b7280;font-size:12px;text-align:center;">
-            Met vriendelijke groet,<br/><strong>${escapeHtml(campaign.from_name ?? brand.brandName ?? "")}</strong>
-          </td>
-        </tr>
-      </table>
-    </td></tr>
-  </table>
-  ${trackingEnabled ? `<img src="${origin}/api/public/pixel/${r.link_code}.gif" width="1" height="1" alt="" style="display:block;border:0;width:1px;height:1px;" />` : ""}
+        const html = `<!doctype html><html><body style="margin:0;padding:0;font-family:Arial,Helvetica,sans-serif;background:#f3f4f6;">
+  <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="background:#f3f4f6;padding:24px 0;">
+    <tr><td align="center">
+      <table role="presentation" cellpadding="0" cellspacing="0" width="600" style="max-width:600px;width:100%;background:#ffffff;border-radius:12px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,0.06);">
+        <tr>
+          <td bgcolor="${brand.primary}" style="background-color:${brand.primary};background-image:linear-gradient(135deg,${brand.primary},${brand.primaryDark});padding:28px 24px;text-align:center;">
+            ${brand.logoUrl ? `<div style="margin:0 0 12px 0;"><img src="${escapeHtml(brand.logoUrl)}" alt="${escapeHtml(brand.brandName ?? "")}" height="40" style="display:inline-block;height:40px;max-width:220px;width:auto;border:0;" /></div>` : ""}
+            <div style="font-size:24px;font-weight:800;color:#ffffff;letter-spacing:-0.01em;">${escapeHtml(campaign.subject)}</div>
+          </td>
+        </tr>
+        <tr>
+          <td style="padding:24px;background:#f9fafb;">
+            <p style="margin:0 0 12px 0;color:#111;font-size:15px;">Beste ${escapeHtml(r.recipient_name)},</p>
+            ${campaign.intro_message ? `<p style="margin:0 0 20px 0;color:#374151;font-size:15px;white-space:pre-line;line-height:1.5;">${escapeHtml(campaign.intro_message)}</p>` : `<p style="margin:0 0 20px 0;color:#374151;font-size:15px;">Wij hebben een mooie aanbieding voor u!</p>`}
+
+            ${productsHtml ? `<h2 style="margin:24px 0 8px 0;color:${brand.primaryText};font-size:22px;border-bottom:2px solid ${brand.primary};padding-bottom:6px;">Aanbiedingen</h2>${productsHtml}` : ""}
+
+            <div style="margin:16px 0;background:#fef3c7;border-left:4px solid #f59e0b;padding:12px 14px;border-radius:4px;color:#92400e;font-size:14px;">
+              ⏰ <strong>Actie geldig zolang de voorraad strekt!</strong>
+            </div>
+
+            <p style="margin:28px 0;text-align:center;">
+              <a href="${actionUrl}" style="background:${brand.button};color:${brand.buttonText};padding:14px 28px;border-radius:8px;text-decoration:none;display:inline-block;font-weight:700;font-size:16px;">🛒 Direct Bestellen</a>
+            </p>
+
+            <p style="color:#6b7280;font-size:12px;text-align:center;margin:16px 0 0 0;">Of <a href="${actionUrl}" style="color:${brand.primaryText};text-decoration:underline;">open deze link</a>.</p>
+          </td>
+        </tr>
+        <tr>
+          <td style="padding:18px 24px;background:#ffffff;border-top:1px solid #e5e7eb;color:#6b7280;font-size:12px;text-align:center;">
+            Met vriendelijke groet,<br/><strong>${escapeHtml(campaign.from_name ?? brand.brandName ?? "")}</strong>
+          </td>
+        </tr>
+      </table>
+    </td></tr>
+  </table>
+  ${trackingEnabled ? `<img src="${origin}/api/public/pixel/${r.link_code}.gif" width="1" height="1" alt="" style="display:block;border:0;width:1px;height:1px;" />` : ""}
 </body></html>`;
         try {
             const { error: insErr } = await supabase
@@ -320,25 +320,35 @@ export const sendCampaign = createServerFn({ method: "POST" })
             .update({ status: "sent", sent_at: now })
             .eq("id", data.campaignId);
     }
-    // Trigger de outbox-dispatcher onmiddellijk, zodat we niet hoeven te wachten
-    // tot de cron (elke minuut) draait. Fire-and-forget: fouten hier zijn niet
-    // fataal — de cron pikt de mails alsnog op als vangnet.
+    // Trigger de outbox-dispatcher van de EIGEN shell onmiddellijk, zodat we niet
+    // hoeven te wachten tot de cron (elke minuut) draait. De cron blijft het vangnet:
+    // faalt deze aanroep, dan worden de mails alsnog verstuurd — maar nooit stil,
+    // een mislukking wordt altijd gelogd.
     if (sentIds.length > 0) {
-        try {
-            const anonKey = process.env.SUPABASE_ANON_KEY ??
-                process.env.SUPABASE_PUBLISHABLE_KEY ??
-                process.env.VITE_SUPABASE_PUBLISHABLE_KEY ??
-                "";
-            void fetch("https://e-mail-authenticatie-module.lovable.app/api/public/email-auth/outbox-process", {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    apikey: anonKey,
-                },
-                body: "{}",
-            }).catch(() => { });
+        const dispatchBase = (process.env.PUBLIC_BASE_URL ?? origin ?? "").replace(/\/$/, "");
+        if (!dispatchBase) {
+            console.warn("[aanbiedingsmailtje] Outbox-dispatcher overgeslagen: geen basis-URL bekend " +
+                "(stel PUBLIC_BASE_URL in). De cron verwerkt de wachtrij binnen een minuut.");
+        }
+        else {
+            const dispatchUrl = `${dispatchBase}/api/public/email-auth/outbox-process`;
+            try {
+                const res = await fetch(dispatchUrl, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: "{}",
+                });
+                if (!res.ok) {
+                    const detail = await res.text().catch(() => "");
+                    console.warn(`[aanbiedingsmailtje] Outbox-dispatcher gaf ${res.status} ${res.statusText} ` +
+                        `voor ${dispatchUrl}: ${detail.slice(0, 300)}. De cron verwerkt de wachtrij als vangnet.`);
+                }
+            }
+            catch (e) {
+                console.warn(`[aanbiedingsmailtje] Outbox-dispatcher onbereikbaar op ${dispatchUrl}: ` +
+                    `${String(e?.message ?? e)}. De cron verwerkt de wachtrij als vangnet.`);
+            }
         }
-        catch { /* noop */ }
     }
     return { sent: sentIds.length, failed: failed.length, errors: failed.slice(0, 5) };
 });