@flowselections/floriday-afhandeling-module 1.0.13 → 1.0.15

package/dist-lib/lib/carrierPlanning.d.ts

@@ -0,0 +1,25 @@
+import { type PickupMoment } from "./planning";
+export interface CarrierPlanningInfo {
+    id: string;
+    name: string;
+    is_default?: boolean | null;
+    sort_order?: number | null;
+    service_countries?: string[] | null;
+    service_provinces?: string[] | null;
+    service_cities?: string[] | null;
+    pickup_moments?: PickupMoment[] | unknown;
+    pickup_weekdays?: number[] | null;
+    delivery_weekdays?: number[] | null;
+}
+export interface CarrierOrderTarget {
+    carrierId?: string | null;
+    country?: string | null;
+    province?: string | null;
+    city?: string | null;
+}
+export declare function sanitizeWeekdays(input: unknown): number[];
+export declare function normalizePickupMoments(raw: unknown): PickupMoment[];
+export declare function carrierLeadDaysFromMoments(raw: unknown): number;
+export declare function normalizePlanningCarriers<T extends CarrierPlanningInfo>(carriers: T[]): T[];
+export declare function selectCarrierForTarget<T extends CarrierPlanningInfo>(carriers: T[], target: CarrierOrderTarget): T | null;
+//# sourceMappingURL=carrierPlanning.d.ts.map

package/dist-lib/lib/carrierPlanning.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"carrierPlanning.d.ts","sourceRoot":"","sources":["../../src/lib/carrierPlanning.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAItE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC1C,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAUzD;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,EAAE,CAanE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAK/D;AAED,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,mBAAmB,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAU3F;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EAClE,QAAQ,EAAE,CAAC,EAAE,EACb,MAAM,EAAE,kBAAkB,GACzB,CAAC,GAAG,IAAI,CAiCV"}

package/dist-lib/lib/carrierPlanning.js

@@ -0,0 +1,65 @@
+import { matchesServiceArea } from "./geo/euServiceAreas";
+import { countryCode } from "./countries";
+import { DEFAULT_PICKUP_MOMENT } from "./planning";
+const DEFAULT_WEEKDAYS = [1, 2, 3, 4, 5];
+export function sanitizeWeekdays(input) {
+    if (!Array.isArray(input))
+        return DEFAULT_WEEKDAYS;
+    const clean = Array.from(new Set(input
+        .map((n) => Math.floor(Number(n)))
+        .filter((n) => Number.isFinite(n) && n >= 1 && n <= 7))).sort((a, b) => a - b);
+    return clean.length > 0 ? clean : DEFAULT_WEEKDAYS;
+}
+export function normalizePickupMoments(raw) {
+    if (!Array.isArray(raw) || raw.length === 0)
+        return [DEFAULT_PICKUP_MOMENT];
+    return raw.map((m) => {
+        const r = (m ?? {});
+        return {
+            signup_days: Math.max(0, Math.floor(Number(r.signup_days ?? DEFAULT_PICKUP_MOMENT.signup_days) || 0)),
+            signup_time: String(r.signup_time ?? DEFAULT_PICKUP_MOMENT.signup_time),
+            pickup_days: Math.max(0, Math.floor(Number(r.pickup_days ?? DEFAULT_PICKUP_MOMENT.pickup_days) || 0)),
+            pickup_time: String(r.pickup_time ?? DEFAULT_PICKUP_MOMENT.pickup_time),
+            delivery_days: Math.max(0, Math.floor(Number(r.delivery_days ?? DEFAULT_PICKUP_MOMENT.delivery_days) || 0)),
+            delivery_time: String(r.delivery_time ?? DEFAULT_PICKUP_MOMENT.delivery_time),
+        };
+    });
+}
+export function carrierLeadDaysFromMoments(raw) {
+    return normalizePickupMoments(raw).reduce((max, moment) => Math.max(max, moment.signup_days, moment.pickup_days, moment.delivery_days), 0);
+}
+export function normalizePlanningCarriers(carriers) {
+    return carriers.map((carrier) => ({
+        ...carrier,
+        service_countries: carrier.service_countries ?? [],
+        service_provinces: carrier.service_provinces ?? [],
+        service_cities: carrier.service_cities ?? [],
+        pickup_moments: normalizePickupMoments(carrier.pickup_moments),
+        pickup_weekdays: sanitizeWeekdays(carrier.pickup_weekdays),
+        delivery_weekdays: sanitizeWeekdays(carrier.delivery_weekdays),
+    }));
+}
+export function selectCarrierForTarget(carriers, target) {
+    const normalized = normalizePlanningCarriers(carriers);
+    const sorted = [...normalized].sort((a, b) => (a.sort_order ?? 9999) - (b.sort_order ?? 9999));
+    if (target.carrierId) {
+        const explicit = sorted.find((carrier) => carrier.id === target.carrierId);
+        if (explicit)
+            return explicit;
+    }
+    const matchTarget = {
+        country: countryCode(target.country) ?? target.country ?? null,
+        province: target.province ?? null,
+        city: target.city ?? null,
+    };
+    for (const carrier of sorted) {
+        if (matchesServiceArea({
+            countries: carrier.service_countries ?? [],
+            provinces: carrier.service_provinces ?? [],
+            cities: carrier.service_cities ?? [],
+        }, matchTarget)) {
+            return carrier;
+        }
+    }
+    return sorted.find((carrier) => carrier.is_default) ?? sorted[0] ?? null;
+}

package/dist-lib/lib/carrierSignupMail.server.d.ts

@@ -37,7 +37,6 @@ export interface SignupMailOrderRow {
     customerName: string;
     deliveryType: string;
     cartCount: number | null;
-    plantCount: number | null;
 }
 export interface SignupMailInput {
     carrierName: string;
@@ -51,6 +50,5 @@ export declare function buildCarrierSignupMail(input: SignupMailInput): {
     html: string;
     text: string;
     totalCarts: number;
-    totalPlants: number;
 };
 //# sourceMappingURL=carrierSignupMail.server.d.ts.map

package/dist-lib/lib/carrierSignupMail.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carrierSignupMail.server.d.ts","sourceRoot":"","sources":["../../src/lib/carrierSignupMail.server.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC/B;AAGD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,IAAI,CAAC;IACrB,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC;AAgJD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,GAAG;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAoGA"}
+{"version":3,"file":"carrierSignupMail.server.d.ts","sourceRoot":"","sources":["../../src/lib/carrierSignupMail.server.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC/B;AAGD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,IAAI,CAAC;IACrB,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC;AAyBD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,GAAG;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAuDA"}

package/dist-lib/lib/carrierSignupMail.server.js

@@ -1,229 +1,66 @@
 // Server-only HTML/text builder for carrier signup digest e-mails.
-function fmtDate(d) {
-    return d.toLocaleDateString("nl-NL", {
-        weekday: "long",
-        day: "2-digit",
-        month: "long",
-        year: "numeric",
-    });
-}
-function fmtDateTime(d) {
-    return d.toLocaleString("nl-NL", {
-        weekday: "short",
-        day: "2-digit",
-        month: "short",
-        hour: "2-digit",
-        minute: "2-digit",
-    });
-}
-function fmtIsoDate(s) {
-    if (!s)
-        return "Onbekend";
-    const d = new Date(s);
-    if (Number.isNaN(d.getTime()))
-        return s;
-    return d.toLocaleDateString("nl-NL", { day: "2-digit", month: "long", year: "numeric" });
+function escape(s) {
+    return String(s)
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;");
 }
-function val(s) {
-    const v = (s ?? "").trim();
-    return v === "" ? "Onbekend" : escape(v);
+function fmtDdMmYyyy(d) {
+    const dd = String(d.getDate()).padStart(2, "0");
+    const mm = String(d.getMonth() + 1).padStart(2, "0");
+    const yy = d.getFullYear();
+    return `${dd}-${mm}-${yy}`;
 }
-function renderAddress(a) {
+function formatFullAddress(a) {
     if (!a)
-        return `<div style="color:#6b7280;">Onbekend</div>`;
-    const streetLine = [a.street, a.houseNumber].filter(Boolean).join(" ").trim();
-    const cityLine = [a.postalCode, a.city].filter(Boolean).join("  ").trim();
-    const lines = [];
-    if (a.name && a.name.trim())
-        lines.push(`<strong>${escape(a.name)}</strong>`);
-    if (streetLine)
-        lines.push(escape(streetLine));
-    if (cityLine)
-        lines.push(escape(cityLine));
-    if (a.province && a.province.trim())
-        lines.push(escape(a.province));
-    if (a.country && a.country.trim())
-        lines.push(escape(a.country));
-    if (lines.length === 0)
-        return `<div style="color:#6b7280;">Onbekend</div>`;
-    return lines.map((l) => `<div>${l}</div>`).join("");
-}
-function renderDefinitionList(rows) {
-    return `<table style="border-collapse:collapse;font-size:13px;width:100%;">${rows
-        .map((r) => `
-      <tr>
-        <td style="padding:2px 12px 2px 0;color:#6b7280;width:140px;vertical-align:top;">${escape(r.label)}</td>
-        <td style="padding:2px 0;vertical-align:top;">${r.value}</td>
-      </tr>`)
-        .join("")}</table>`;
-}
-function renderItemsTable(items) {
-    if (!items || items.length === 0) {
-        return `<div style="color:#6b7280;font-size:13px;">Geen artikelen geregistreerd.</div>`;
-    }
-    const rows = items
-        .map((it) => `
-      <tr>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;">${escape(it.name)}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;text-align:right;">${it.quantity ?? "—"}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;">${escape(it.unit ?? "")}</td>
-      </tr>`)
-        .join("");
-    return `<table style="border-collapse:collapse;width:100%;font-size:13px;">
-    <thead><tr style="background:#f3f4f6;text-align:left;">
-      <th style="padding:6px 8px;">Artikel</th>
-      <th style="padding:6px 8px;text-align:right;width:90px;">Aantal</th>
-      <th style="padding:6px 8px;width:100px;">Eenheid</th>
-    </tr></thead>
-    <tbody>${rows}</tbody>
-  </table>`;
-}
-function renderOrderBlock(o) {
-    const orderRows = renderDefinitionList([
-        { label: "Ordernummer", value: `<strong>${val(o.orderNumber)}</strong>` },
-        { label: "Besteldatum", value: escape(fmtIsoDate(o.orderDate)) },
-        { label: "Gewenste leverdatum", value: escape(fmtIsoDate(o.deliveryDate)) },
-        { label: "Type levering", value: val(o.deliveryType) },
-        { label: "Karren", value: String(o.cartCount ?? "—") },
-        { label: "Planten", value: String(o.plantCount ?? "—") },
-    ]);
-    const customerRows = renderDefinitionList([
-        { label: "Klantnaam", value: val(o.customer.name) },
-        { label: "E-mailadres", value: val(o.customer.email) },
-    ]);
-    const pickupHtml = o.pickupLocations && o.pickupLocations.length > 0
-        ? o.pickupLocations.map((p) => `<div>${escape(p)}</div>`).join("")
-        : `<div style="color:#6b7280;">Onbekend</div>`;
-    const notesHtml = o.notes && o.notes.trim()
-        ? `<div style="background:#fffbeb;border:1px solid #fde68a;border-radius:6px;padding:10px 12px;font-size:13px;white-space:pre-wrap;">${escape(o.notes)}</div>`
-        : "";
-    return `
-  <div style="border:1px solid #e5e7eb;border-radius:8px;padding:16px;margin-bottom:20px;">
-    <h3 style="margin:0 0 12px 0;font-size:16px;">Order ${escape(o.orderNumber)}</h3>
-
-    <div style="margin-bottom:14px;">
-      <div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Ordergegevens</div>
-      ${orderRows}
-    </div>
-
-    <div style="margin-bottom:14px;">
-      <div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Klantgegevens</div>
-      ${customerRows}
-    </div>
-
-    <table style="width:100%;border-collapse:collapse;margin-bottom:14px;">
-      <tr>
-        <td style="vertical-align:top;width:50%;padding-right:8px;">
-          <div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Afleverlocatie</div>
-          <div style="font-size:13px;">${renderAddress(o.deliveryLocation)}</div>
-        </td>
-        <td style="vertical-align:top;width:50%;padding-left:8px;">
-          <div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Ophaallocatie</div>
-          <div style="font-size:13px;">${pickupHtml}</div>
-        </td>
-      </tr>
-    </table>
-
-    <div style="margin-bottom:14px;">
-      <div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Bestelde artikelen</div>
-      ${renderItemsTable(o.items)}
-    </div>
-
-    ${notesHtml ? `<div><div style="font-weight:bold;font-size:13px;margin-bottom:6px;color:#111827;">Opmerkingen</div>${notesHtml}</div>` : ""}
-  </div>`;
+        return "—";
+    const street = [a.street, a.houseNumber].filter(Boolean).join(" ").trim();
+    const city = [a.postalCode, a.city].filter(Boolean).join(" ").trim();
+    const parts = [street, city].filter((v) => v && v.trim() !== "");
+    return parts.length > 0 ? parts.join(", ") : "—";
 }
 export function buildCarrierSignupMail(input) {
     const totalCarts = input.orders.reduce((s, o) => s + (o.cartCount ?? 0), 0);
-    const totalPlants = input.orders.reduce((s, o) => s + (o.plantCount ?? 0), 0);
-    const subject = `Aanmelden karren ${input.carrierName} — ${input.pickupDate.toLocaleDateString("nl-NL", { day: "2-digit", month: "2-digit", year: "numeric" })} ${input.pickupTime}`;
-    const summaryRows = input.orders
+    const orderCount = input.orders.length;
+    const subject = `Aanmelden karren ${input.carrierName} — ${fmtDdMmYyyy(input.pickupDate)} ${input.pickupTime}`;
+    const rows = input.orders
         .map((o) => `
-      <tr>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;">${escape(o.orderNumber)}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;">${escape(o.customer.name)}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;">${escape(o.deliveryType)}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;text-align:right;">${o.cartCount ?? "—"}</td>
-        <td style="padding:6px 8px;border-bottom:1px solid #e5e7eb;text-align:right;">${o.plantCount ?? "—"}</td>
-      </tr>`)
+        <tr>
+          <td style="padding:6px 8px;border:1px solid #d1d5db;">${escape(o.orderNumber)}</td>
+          <td style="padding:6px 8px;border:1px solid #d1d5db;">${escape(o.customer.name)}</td>
+          <td style="padding:6px 8px;border:1px solid #d1d5db;">${escape(o.deliveryDate ?? "—")}</td>
+          <td style="padding:6px 8px;border:1px solid #d1d5db;text-align:right;">${o.cartCount ?? "—"}</td>
+          <td style="padding:6px 8px;border:1px solid #d1d5db;">${escape(formatFullAddress(o.deliveryLocation))}</td>
+        </tr>`)
         .join("");
-    const orderBlocks = input.orders.map(renderOrderBlock).join("");
     const html = `<!doctype html>
-<html lang="nl"><body style="font-family:Arial,sans-serif;color:#111;background:#f9fafb;margin:0;padding:24px;">
-  <div style="max-width:760px;margin:0 auto;background:#ffffff;padding:24px;border-radius:8px;">
-    <h2 style="margin:0 0 8px 0;">Aanmelden karren — ${escape(input.carrierName)}</h2>
-    <p style="margin:0 0 20px 0;color:#374151;font-size:14px;">
-      Ophaalmoment: <strong>${escape(fmtDate(input.pickupDate))} om ${escape(input.pickupTime)}</strong><br/>
-      Aanmelddeadline: <strong>${escape(fmtDateTime(input.signupDeadline))}</strong>
-    </p>
+<html lang="nl"><body style="font-family:Arial,sans-serif;color:#111;margin:0;padding:24px;">
+  <h2 style="margin:0 0 16px 0;">Aanmelden karren</h2>
+  <p style="margin:0 0 12px 0;">Beste ${escape(input.carrierName)},</p>
+  <p style="margin:0 0 12px 0;">Graag aanmelden voor ophalen op <strong>${fmtDdMmYyyy(input.pickupDate)} om ${escape(input.pickupTime)}</strong>.</p>
+  <p style="margin:0 0 16px 0;"><strong>${orderCount} order${orderCount === 1 ? "" : "s"} · ${totalCarts} karren</strong></p>
 
-    <div style="font-weight:bold;font-size:14px;margin-bottom:6px;">Overzicht</div>
-    <table style="border-collapse:collapse;width:100%;font-size:13px;margin-bottom:24px;">
-      <thead><tr style="background:#f3f4f6;text-align:left;">
-        <th style="padding:6px 8px;">Order</th>
-        <th style="padding:6px 8px;">Klant</th>
-        <th style="padding:6px 8px;">Type</th>
-        <th style="padding:6px 8px;text-align:right;">Karren</th>
-        <th style="padding:6px 8px;text-align:right;">Planten</th>
-      </tr></thead>
-      <tbody>${summaryRows}</tbody>
-      <tfoot><tr style="font-weight:bold;background:#f9fafb;">
-        <td colspan="3" style="padding:6px 8px;text-align:right;">Totaal</td>
-        <td style="padding:6px 8px;text-align:right;">${totalCarts}</td>
-        <td style="padding:6px 8px;text-align:right;">${totalPlants}</td>
-      </tr></tfoot>
-    </table>
-
-    ${orderBlocks}
-
-    <p style="margin-top:16px;font-size:12px;color:#6b7280;">
-      Automatisch verzonden door Flowselections Afhandeling.
-    </p>
-  </div>
+  <table style="border-collapse:collapse;font-size:13px;">
+    <thead>
+      <tr style="background:#f3f4f6;text-align:left;">
+        <th style="padding:6px 8px;border:1px solid #d1d5db;">Order</th>
+        <th style="padding:6px 8px;border:1px solid #d1d5db;">Klant</th>
+        <th style="padding:6px 8px;border:1px solid #d1d5db;">Leverdatum</th>
+        <th style="padding:6px 8px;border:1px solid #d1d5db;text-align:right;">Karren</th>
+        <th style="padding:6px 8px;border:1px solid #d1d5db;">Plaats</th>
+      </tr>
+    </thead>
+    <tbody>${rows}</tbody>
+  </table>
 </body></html>`;
-    const textOrders = input.orders
-        .map((o) => {
-        const addr = o.deliveryLocation
-            ? [
-                o.deliveryLocation.name,
-                [o.deliveryLocation.street, o.deliveryLocation.houseNumber].filter(Boolean).join(" "),
-                [o.deliveryLocation.postalCode, o.deliveryLocation.city].filter(Boolean).join(" "),
-                o.deliveryLocation.province,
-                o.deliveryLocation.country,
-            ]
-                .filter((v) => v && String(v).trim())
-                .join(", ")
-            : "Onbekend";
-        const items = (o.items ?? [])
-            .map((it) => `   - ${it.name}: ${it.quantity ?? "-"} ${it.unit ?? ""}`.trim())
-            .join("\n");
-        return [
-            `Order ${o.orderNumber}`,
-            `  Besteldatum: ${fmtIsoDate(o.orderDate)}`,
-            `  Leverdatum: ${fmtIsoDate(o.deliveryDate)}`,
-            `  Type: ${o.deliveryType}`,
-            `  Karren: ${o.cartCount ?? "-"} | Planten: ${o.plantCount ?? "-"}`,
-            `  Klant: ${o.customer.name}` +
-                (o.customer.email ? ` <${o.customer.email}>` : ""),
-            `  Afleverlocatie: ${addr}`,
-            `  Ophaallocatie: ${(o.pickupLocations ?? []).join(", ") || "Onbekend"}`,
-            items ? `  Artikelen:\n${items}` : `  Artikelen: -`,
-            o.notes ? `  Opmerkingen: ${o.notes}` : "",
-        ]
-            .filter(Boolean)
-            .join("\n");
-    })
-        .join("\n\n");
-    const text = `Aanmelden karren — ${input.carrierName}\n` +
-        `Ophaalmoment: ${fmtDate(input.pickupDate)} ${input.pickupTime}\n` +
-        `Aanmelddeadline: ${fmtDateTime(input.signupDeadline)}\n\n` +
-        textOrders +
-        `\n\nTotaal: ${totalCarts} karren, ${totalPlants} planten.`;
-    return { subject, html, text, totalCarts, totalPlants };
-}
-function escape(s) {
-    return String(s)
-        .replace(/&/g, "&amp;")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;");
+    const textRows = input.orders
+        .map((o) => `- ${o.orderNumber} | ${o.customer.name} | ${o.deliveryDate ?? "—"} | ${o.cartCount ?? "—"} karren | ${formatFullAddress(o.deliveryLocation)}`)
+        .join("\n");
+    const text = `Aanmelden karren\n\n` +
+        `Beste ${input.carrierName},\n\n` +
+        `Graag aanmelden voor ophalen op ${fmtDdMmYyyy(input.pickupDate)} om ${input.pickupTime}.\n\n` +
+        `${orderCount} order${orderCount === 1 ? "" : "s"} · ${totalCarts} karren\n\n` +
+        textRows;
+    return { subject, html, text, totalCarts };
 }