@flowselections/floriday-verkoop-module 1.0.77 → 1.0.82

package/dist-lib/lib/floriday-mirror.functions.js

@@ -1,3 +1,4 @@
+import { diffBuyerChanges } from "./floriday-change-diff";
 // Spiegelt Floriday-verkooporders (FO's) uit `floriday_salesorders_cache`
 // naar de lokale `orders`-tabel, zodat ze via `resolveBufferForOrderInternal`
 // in dezelfde buffer terechtkomen als lokale orders en gedeelde karren
@@ -385,6 +386,7 @@ async function mirrorUnlocked(limit) {
     let inserted = 0, updated = 0, skipped = 0, unchanged = 0, failed = 0;
     const errors = [];
     const affectedOrderIds = [];
+    const floridayCancelIds = [];
     // Orders die in deze ronde echt zijn aangemaakt of gewijzigd: alleen die
     // melden we expliciet aan bij de planwachtrij van de logistiek-engine.
     const changedOrderIds = [];
@@ -829,12 +831,21 @@ async function mirrorUnlocked(limit) {
                         frozenCandidates.set(String(c.id), c);
                 }
                 if (frozenCandidates.size > 0) {
+                    // Alleen echte koperwijzigingen (artikel, aantal, leverdatum,
+                    // bestelling erbij/weg). Status, belading en Floriday-echo niet.
                     const signature = JSON.stringify({
-                        status: primary.d?.status ?? null,
-                        lines: floridayLines,
+                        lines: floridayLines.map((l) => ({
+                            id: l.sales_order_id,
+                            t: l.trade_item_id,
+                            p: l.pieces,
+                        })),
+                        d: groupLvl.deliveryDate ?? null,
                     });
                     for (const fo of frozenCandidates.values()) {
                         const cf = (fo.custom_fields ?? {});
+                        const changes = diffBuyerChanges(cf.floriday_lines, floridayLines, fo.delivery_date, groupLvl.deliveryDate);
+                        if (changes.length === 0)
+                            continue; // niets door de koper gewijzigd
                         if (cf.floriday_change_signature === signature)
                             continue; // al gemeld
                         const { error: revErr } = await supabaseAdmin.from("orders")
@@ -845,7 +856,8 @@ async function mirrorUnlocked(limit) {
                                 floriday_change_detected_at: new Date().toISOString(),
                                 floriday_change_signature: signature,
                                 needs_manual_review: true,
-                                manual_review_reason: "Wijziging binnengekomen na afronding — handmatige beoordeling nodig",
+                                floriday_change_summary: changes,
+                                manual_review_reason: `Wijziging door de koper na afronding: ${changes.join("; ")} — handmatige beoordeling nodig`,
                             },
                             updated_at: new Date().toISOString(),
                         })
@@ -855,6 +867,9 @@ async function mirrorUnlocked(limit) {
                         }
                     }
                     skipped += group.length;
+                    // Afgeronde order: deze ronde overslaan; alleen melden bij echte wijziging.
+                    if (![...frozenCandidates.values()].some((fo) => diffBuyerChanges((fo.custom_fields ?? {}).floriday_lines, floridayLines, fo.delivery_date, groupLvl.deliveryDate).length > 0))
+                        continue;
                     errors.push(`${primary.foId}: wijziging na afronding — order gemarkeerd voor handmatige beoordeling`);
                     continue;
                 }
@@ -992,7 +1007,12 @@ async function mirrorUnlocked(limit) {
                 const prevFloridayStatus = prevCf.floriday_status ?? null;
                 const floridayStatusChanged = String(lvl.floridayStatusSummary ?? "") !== String(prevFloridayStatus ?? "");
                 const localStatus = String(target?.status ?? "");
-                const statusPatch = floridayStatusChanged && lvl.status !== localStatus
+                // Annulering uit Floriday: niet zelf de status zetten, maar na de ronde
+                // via handleFloridayCancellation (pickstand bij de Engine controleren).
+                const isFloridayCancel = lvl.status === "geannuleerd" && localStatus.toLowerCase() !== "geannuleerd";
+                if (floridayStatusChanged && isFloridayCancel)
+                    floridayCancelIds.push(String(target.id));
+                const statusPatch = floridayStatusChanged && lvl.status !== localStatus && !isFloridayCancel
                     ? { status: lvl.status, status_sync_token: globalThis.crypto.randomUUID() }
                     : {};
                 // Alleen regels die eerder bij déze bestelling hoorden mogen als
@@ -1265,41 +1285,8 @@ async function mirrorUnlocked(limit) {
                     foIds: memberIds,
                 });
             }
-            // Belading-veiligheidscontrole — dezelfde als bij handmatig aanmaken.
-            // Een belading met een in de Logistics Engine uitgezette ladingdrager
-            // mag ook via Floriday niet doorlopen: blokkeren met reden i.p.v. plannen.
-            try {
-                const { assertBeladingAllowed } = await import("./belading.server");
-                await assertBeladingAllowed(supabaseAdmin, lineRows
-                    .filter((r) => r.product_id)
-                    .map((r) => ({
-                    product_id: r.product_id,
-                    plants_per_crate: r.plants_per_crate,
-                    crates_per_layer: r.crates_per_layer,
-                    layers_per_cart: r.layers_per_cart,
-                })));
-            }
-            catch (belErr) {
-                const reason = `Order ${orderId}: ${belErr.message}`;
-                const { error: blockErr } = await supabaseAdmin.rpc("logistics_plan_block", {
-                    p_order_ids: [orderId],
-                    p_reason: reason,
-                    p_details: { source: "floriday-verkoop-module/floriday-mirror" },
-                });
-                if (blockErr)
-                    console.warn("[floriday-mirror] blokkade vastleggen faalde:", blockErr.message);
-                // Eenmalige mailmelding naar het interne adres uit de e-mailmodule.
-                const { notifyOrderBlocked } = await import("./order-block-mail.server");
-                const mail = await notifyOrderBlocked({
-                    orderIds: [orderId],
-                    reasonKey: "belading_niet_toegestaan",
-                    reason: belErr.message,
-                    details: { source: "floriday-verkoop-module/floriday-mirror" },
-                });
-                for (const w of mail.warnings)
-                    console.warn("[floriday-mirror]", w);
-                errors.push(`${primary.foId}: ${reason.slice(0, 200)}`);
-            }
+            // Geen eigen beladings-/ladingdragercontrole: alleen de Logistiek Engine
+            // beslist of een belading kan (koppelprompt 22).
             // Buffer resolven en in de replan-queue zetten. Alleen orders die buiten
             // ons ERP om in Floriday zijn afgehandeld hoeven niet meer gepland te
             // worden.
@@ -1351,6 +1338,18 @@ async function mirrorUnlocked(limit) {
     }
     // Batch enqueue voor karherplanning. processed_at resetten, anders blijft een
     // eerder verwerkte order voor altijd overgeslagen door de cron.
+    // Annuleringen uit Floriday afhandelen (koppelprompt 1.0.77).
+    for (const cid of Array.from(new Set(floridayCancelIds))) {
+        try {
+            const { handleFloridayCancellation } = await import("./order-cancel.server");
+            const res = await handleFloridayCancellation(cid);
+            if (res !== "cancelled")
+                errors.push(`${cid}: ${res}`);
+        }
+        catch (err) {
+            errors.push(`${cid}: annulering uit Floriday faalde: ${err.message}`.slice(0, 200));
+        }
+    }
     if (affectedOrderIds.length > 0) {
         const queueRows = affectedOrderIds.map((oid) => ({
             order_id: oid,

package/dist-lib/lib/floriday-status.d.ts

@@ -0,0 +1,48 @@
+import type { OrderStage } from "./order-status";
+export type FloridayStage = "open" | "partially_fulfilled" | "fulfilled" | "cancelled" | "expired" | "unknown";
+export interface FloridayStatusEntry {
+    salesOrderId: string;
+    found: boolean;
+    salesOrderStatus: string | null;
+    floridayStage: FloridayStage;
+    fulfillmentRequests: {
+        fulfillmentRequestId: string | null;
+        deliveryOrderId: string | null;
+        fulfillmentOrderIds: string[];
+    }[];
+    fulfillmentOrders: {
+        fulfillmentOrderId: string | null;
+        status: string | null;
+    }[];
+    salesChannel: string | null;
+    tradeInstrument: string | null;
+    incoterm: string | null;
+    customerOrderId: string | null;
+    salesChannelOrderId: string | null;
+    customerOrganizationId: string | null;
+    customerGln: string | null;
+    lastModifiedDateTime: string | null;
+    cachedAt: string | null;
+}
+/** Samenvatting op orderniveau (een order kan meerdere bestellingen hebben). */
+export interface FloridayStatusSummary {
+    stage: FloridayStage | "onbekend";
+    /** Foutcode als het ophalen mislukte (bv. invalid_signature). */
+    error: string | null;
+    entries: FloridayStatusEntry[];
+}
+export declare function parseFloridayStatusEntry(raw: any): FloridayStatusEntry | null;
+/** Eén stand voor een order met meerdere Floriday-bestellingen. */
+export declare function combineStages(stages: FloridayStage[]): FloridayStage;
+export declare function floridayStageLabel(stage: FloridayStatusSummary["stage"]): string;
+/** Wijkt de Floriday-stand af van de ERP-stand? Alleen voor weergave. */
+export declare function deviatesFromFloriday(stage: FloridayStatusSummary["stage"], erp: OrderStage | undefined): boolean;
+/** Eigen kenmerk: verzonden in het ERP en nog niet afgemeld bij Floriday. */
+export declare function isNotReportedLocally(erp: OrderStage | undefined, floridayFulfilled: boolean): boolean;
+export type NotReportedState = "waarschuwing" | "waarschuwing_onbekend" | "al_afgehandeld" | null;
+/**
+ * Welke melding hoort bij een verzonden order? Floriday-stand gaat voor;
+ * bij onbekende stand valt het terug op ons eigen kenmerk. Alleen weergave.
+ */
+export declare function notReportedState(erp: OrderStage | undefined, floriday: FloridayStatusSummary["stage"] | null | undefined, floridayFulfilled: boolean): NotReportedState;
+//# sourceMappingURL=floriday-status.d.ts.map

package/dist-lib/lib/floriday-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-status.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,qBAAqB,GACrB,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE;QAAE,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,mBAAmB,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IAC9H,iBAAiB,EAAE;QAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IAClF,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,gFAAgF;AAChF,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC;IAClC,iEAAiE;IACjE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAMD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,mBAAmB,GAAG,IAAI,CA6B7E;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAWpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,MAAM,CAUhF;AAED,yEAAyE;AACzE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQhH;AAED,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,EAAE,iBAAiB,EAAE,OAAO,GAAG,OAAO,CAErG;AAED,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,uBAAuB,GAAG,gBAAgB,GAAG,IAAI,CAAC;AAElG;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,UAAU,GAAG,SAAS,EAC3B,QAAQ,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3D,iBAAiB,EAAE,OAAO,GACzB,gBAAgB,CAMlB"}

package/dist-lib/lib/floriday-status.js

@@ -0,0 +1,99 @@
+const STAGES = ["open", "partially_fulfilled", "fulfilled", "cancelled", "expired", "unknown"];
+const str = (v) => (typeof v === "string" && v.trim() ? v : null);
+const arr = (v) => (Array.isArray(v) ? v : []);
+export function parseFloridayStatusEntry(raw) {
+    if (!raw || typeof raw !== "object")
+        return null;
+    const id = str(raw.salesOrderId);
+    if (!id)
+        return null;
+    const stage = STAGES.includes(raw.floridayStage) ? raw.floridayStage : "unknown";
+    return {
+        salesOrderId: id,
+        found: raw.found === true,
+        salesOrderStatus: str(raw.salesOrderStatus),
+        floridayStage: stage,
+        fulfillmentRequests: arr(raw.fulfillmentRequests).map((r) => ({
+            fulfillmentRequestId: str(r?.fulfillmentRequestId),
+            deliveryOrderId: str(r?.deliveryOrderId),
+            fulfillmentOrderIds: arr(r?.fulfillmentOrderIds).map(String),
+        })),
+        fulfillmentOrders: arr(raw.fulfillmentOrders).map((f) => ({
+            fulfillmentOrderId: str(f?.fulfillmentOrderId),
+            status: str(f?.status),
+        })),
+        salesChannel: str(raw.salesChannel),
+        tradeInstrument: str(raw.tradeInstrument),
+        incoterm: str(raw.incoterm),
+        customerOrderId: str(raw.customerOrderId),
+        salesChannelOrderId: str(raw.salesChannelOrderId),
+        customerOrganizationId: str(raw.customerOrganizationId),
+        customerGln: str(raw.customerGln),
+        lastModifiedDateTime: str(raw.lastModifiedDateTime),
+        cachedAt: str(raw.cachedAt),
+    };
+}
+/** Eén stand voor een order met meerdere Floriday-bestellingen. */
+export function combineStages(stages) {
+    if (stages.length === 0)
+        return "unknown";
+    const all = (s) => stages.every((x) => x === s);
+    if (all("cancelled"))
+        return "cancelled";
+    if (all("expired"))
+        return "expired";
+    if (stages.every((x) => x === "cancelled" || x === "expired"))
+        return "cancelled";
+    const active = stages.filter((x) => x !== "cancelled" && x !== "expired");
+    if (active.includes("unknown"))
+        return "unknown";
+    if (active.every((x) => x === "fulfilled"))
+        return "fulfilled";
+    if (active.some((x) => x === "fulfilled" || x === "partially_fulfilled"))
+        return "partially_fulfilled";
+    return "open";
+}
+export function floridayStageLabel(stage) {
+    switch (stage) {
+        case "open": return "open";
+        case "partially_fulfilled": return "deels geleverd";
+        case "fulfilled": return "geleverd";
+        case "cancelled": return "geannuleerd";
+        case "expired": return "vervallen";
+        case "unknown": return "onbekend";
+        default: return "stand onbekend";
+    }
+}
+/** Wijkt de Floriday-stand af van de ERP-stand? Alleen voor weergave. */
+export function deviatesFromFloriday(stage, erp) {
+    if (!erp || stage === "onbekend" || stage === "unknown")
+        return false;
+    const erpCancelled = erp === "cancelled";
+    const erpShipped = erp === "shipped";
+    if (stage === "cancelled" || stage === "expired")
+        return !erpCancelled;
+    if (stage === "fulfilled")
+        return !erpShipped && !erpCancelled;
+    if (stage === "open")
+        return erpCancelled; // verzonden+open: aparte melding
+    return false;
+}
+/** Eigen kenmerk: verzonden in het ERP en nog niet afgemeld bij Floriday. */
+export function isNotReportedLocally(erp, floridayFulfilled) {
+    return erp === "shipped" && !floridayFulfilled;
+}
+/**
+ * Welke melding hoort bij een verzonden order? Floriday-stand gaat voor;
+ * bij onbekende stand valt het terug op ons eigen kenmerk. Alleen weergave.
+ */
+export function notReportedState(erp, floriday, floridayFulfilled) {
+    if (erp !== "shipped")
+        return null;
+    if (floriday === "open" || floriday === "partially_fulfilled")
+        return "waarschuwing";
+    if (floriday === "fulfilled")
+        return floridayFulfilled ? null : "al_afgehandeld";
+    if (floriday === "cancelled" || floriday === "expired")
+        return null;
+    return floridayFulfilled ? null : "waarschuwing_onbekend";
+}

package/dist-lib/lib/floriday-status.server.d.ts

@@ -0,0 +1,7 @@
+import { type FloridayStatusEntry } from "./floriday-status";
+export interface FloridayStatusResult {
+    entries: Map<string, FloridayStatusEntry>;
+    error: string | null;
+}
+export declare function loadFloridayStatuses(salesOrderIds: string[]): Promise<FloridayStatusResult>;
+//# sourceMappingURL=floriday-status.server.d.ts.map

package/dist-lib/lib/floriday-status.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,EAA4B,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAoBvF,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmDjG"}

package/dist-lib/lib/floriday-status.server.js

@@ -0,0 +1,74 @@
+// Server-only: Floriday-stand per verkooporder ophalen bij de gateway van de
+// Authenticatie-module (POST /api/public/gateway/fulfillment-order/status).
+// - Alleen lezen; schrijft nooit iets.
+// - Ondertekend volgens het gatewaycontract: tijd in epoch-ms, HMAC-SHA256 over
+//   precies `${timestamp}.${body}`, header `x-floriday-signature: sha256=<hex>`.
+// - Max 100 id's per verzoek, kort geheugen (30 s) per id.
+// - Fail closed: bij een fout geen stand, wel de foutcode (bv. invalid_signature).
+import { parseFloridayStatusEntry } from "./floriday-status";
+const TTL_MS = 30000;
+const MAX_IDS = 100;
+const cache = new Map();
+async function hmacHex(secret, payload) {
+    const key = await globalThis.crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+    const sig = await globalThis.crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload));
+    return Array.from(new Uint8Array(sig))
+        .map((b) => b.toString(16).padStart(2, "0"))
+        .join("");
+}
+export async function loadFloridayStatuses(salesOrderIds) {
+    const entries = new Map();
+    const now = Date.now();
+    const wanted = [];
+    for (const id of Array.from(new Set(salesOrderIds.filter(Boolean)))) {
+        const hit = cache.get(id);
+        if (hit && now - hit.at < TTL_MS)
+            entries.set(id, hit.value);
+        else
+            wanted.push(id);
+    }
+    if (wanted.length === 0)
+        return { entries, error: null };
+    let error = null;
+    try {
+        const { getFloridayGatewaySecret, getGatewayBaseUrl } = await import("./central-secrets.server");
+        const secret = await getFloridayGatewaySecret();
+        const base = await getGatewayBaseUrl();
+        for (let i = 0; i < wanted.length; i += MAX_IDS) {
+            const chunk = wanted.slice(i, i + MAX_IDS);
+            const body = JSON.stringify({ salesOrderIds: chunk });
+            const timestamp = String(Date.now());
+            const signature = await hmacHex(secret, `${timestamp}.${body}`);
+            const res = await fetch(`${base}/api/public/gateway/fulfillment-order/status`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-floriday-timestamp": timestamp,
+                    "x-floriday-signature": `sha256=${signature}`,
+                    "x-floriday-caller": "verkoop",
+                },
+                body,
+            });
+            const json = await res.json().catch(() => null);
+            if (!res.ok || json?.ok === false) {
+                const code = json?.code ?? json?.error ?? `HTTP ${res.status}`;
+                error = String(code);
+                console.warn("[floriday-status] gateway weigerde:", error, json?.error ?? "");
+                break;
+            }
+            const rows = Array.isArray(json?.orders) ? json.orders : [];
+            for (const r of rows) {
+                const e = parseFloridayStatusEntry(r);
+                if (!e)
+                    continue;
+                entries.set(e.salesOrderId, e);
+                cache.set(e.salesOrderId, { at: Date.now(), value: e });
+            }
+        }
+    }
+    catch (err) {
+        error = err.message;
+        console.warn("[floriday-status] ophalen faalde:", error);
+    }
+    return { entries, error };
+}

package/dist-lib/lib/load-carriers.server.d.ts

@@ -1,7 +1,7 @@
 export declare function fetchAllowedLoadCarriers(supabase: any, strategyId?: string | null): Promise<import("./load-carriers").AllowedLoadCarriers>;
 /**
  * Valideert de gekozen ladingdrager. Zonder keuze wordt de default van de
- * Engine teruggegeven. Gooit bij een uitgeschakelde drager.
+ * Engine teruggegeven. Geen eigen controle: alleen de Engine beslist.
  */
 export declare function resolveLoadCarrierType(supabase: any, value: string | null | undefined, strategyId?: string | null): Promise<string | null>;
 //# sourceMappingURL=load-carriers.server.d.ts.map

package/dist-lib/lib/load-carriers.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-carriers.server.d.ts","sourceRoot":"","sources":["../../src/lib/load-carriers.server.ts"],"names":[],"mappings":"AAQA,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,GAAG,EACb,UAAU,GAAE,MAAM,GAAG,IAAW,0DAOjC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB"}
+{"version":3,"file":"load-carriers.server.d.ts","sourceRoot":"","sources":["../../src/lib/load-carriers.server.ts"],"names":[],"mappings":"AAMA,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,GAAG,EACb,UAAU,GAAE,MAAM,GAAG,IAAW,0DAOjC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKxB"}

package/dist-lib/lib/load-carriers.server.js

@@ -1,6 +1,5 @@
-// Server-side bewaking: een order mag nooit worden opgeslagen met een
-// ladingdrager die de Engine heeft uitgeschakeld.
-import { DISABLED_LOAD_CARRIER_MESSAGE, normalizeAllowedLoadCarriers, normalizeLoadCarrierCode, } from "./load-carriers";
+// Leest de ladingdragerlijst van de Engine. Geen eigen blokkade (koppelprompt 22).
+import { normalizeAllowedLoadCarriers, normalizeLoadCarrierCode, } from "./load-carriers";
 export async function fetchAllowedLoadCarriers(supabase, strategyId = null) {
     const { data, error } = await supabase.rpc("logistics_allowed_load_carriers", {
         p_strategy_id: strategyId,
@@ -11,14 +10,12 @@ export async function fetchAllowedLoadCarriers(supabase, strategyId = null) {
 }
 /**
  * Valideert de gekozen ladingdrager. Zonder keuze wordt de default van de
- * Engine teruggegeven. Gooit bij een uitgeschakelde drager.
+ * Engine teruggegeven. Geen eigen controle: alleen de Engine beslist.
  */
 export async function resolveLoadCarrierType(supabase, value, strategyId = null) {
     const allowed = await fetchAllowedLoadCarriers(supabase, strategyId);
     if (value == null || String(value).trim() === "")
         return allowed.default;
     const code = normalizeLoadCarrierCode(value) ?? String(value).trim();
-    if (!allowed.allowed.includes(code))
-        throw new Error(DISABLED_LOAD_CARRIER_MESSAGE);
     return code;
 }

package/dist-lib/lib/logistics-engine.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logistics-engine.server.d.ts","sourceRoot":"","sources":["../../src/lib/logistics-engine.server.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAG7D,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,aAAa,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAG5C;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAyEpC;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAChD,SAAS,EAAE,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACzE,KAAK,EAAE,kBAAkB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAiBnE;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,GAAG,eAAe,GACvC,OAAO,CAAC,IAAI,CAAC,CAWf"}
+{"version":3,"file":"logistics-engine.server.d.ts","sourceRoot":"","sources":["../../src/lib/logistics-engine.server.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAG7D,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,aAAa,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAG5C;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAuDpC;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAChD,SAAS,EAAE,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACzE,KAAK,EAAE,kBAAkB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAiBnE;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,GAAG,eAAe,GACvC,OAAO,CAAC,IAAI,CAAC,CAWf"}

package/dist-lib/lib/logistics-engine.server.js

@@ -41,28 +41,8 @@ export async function buildEngineOrderPayload(orderId) {
         const reason = rawCarrier == null || String(rawCarrier).trim() === ""
             ? `Order ${orderRef}: geen ladingdrager bekend — niet ingedeeld, er wordt geen type geraden.`
             : `Order ${orderRef}: onbekende ladingdrager "${String(rawCarrier)}" — niet ingedeeld, er wordt geen type geraden.`;
-        const { error: blockErr } = await supabaseAdmin.rpc("logistics_plan_block", {
-            p_order_ids: [o.id],
-            p_reason: reason,
-            p_details: {
-                source: "floriday-verkoop-module/logistics-engine",
-                load_carrier_type: rawCarrier ?? null,
-            },
-        });
-        if (blockErr)
-            console.warn("[logistics-engine] blokkade vastleggen faalde:", blockErr.message, reason);
-        else
-            console.warn("[logistics-engine]", reason);
-        // Eenmalige mailmelding naar het interne adres uit de e-mailmodule.
-        const { notifyOrderBlocked } = await import("./order-block-mail.server");
-        const mail = await notifyOrderBlocked({
-            orderIds: [String(o.id)],
-            reasonKey: "ladingdrager_onbekend",
-            reason,
-            details: { load_carrier_type: rawCarrier ?? null },
-        });
-        for (const w of mail.warnings)
-            console.warn("[logistics-engine]", w);
+        // Geen eigen blokkade of mail meer (koppelprompt 22): de Engine beslist.
+        console.warn("[logistics-engine]", reason);
         return null;
     }
     return {

package/dist-lib/lib/order-block-mail.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-block-mail.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-block-mail.server.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AASD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwGhC;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CASpF"}
+{"version":3,"file":"order-block-mail.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-block-mail.server.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AASD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwHhC;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CASpF"}

package/dist-lib/lib/order-block-mail.server.js

@@ -6,6 +6,7 @@
 //
 // De mail wordt in public.email_auth_outbox gezet; de e-mailmodule verstuurt
 // hem in haar eigen verwerkingsronde.
+import { buildBlockMailLines, buyerLabel } from "./engine-block-alerts";
 const EMAIL_PURPOSE = "internal";
 function escapeHtml(value) {
     return value
@@ -52,34 +53,49 @@ export async function notifyOrderBlocked(input) {
             warnings.push('Geen actieve e-mailverbinding met doel "intern" — melding van geblokkeerde order(s) niet verstuurd.');
             return { sent: 0, warnings };
         }
-        // 3) Ordergegevens voor een leesbare mail.
+        // 3) Ordergegevens voor een leesbare mail. Klant = koper via klant-id;
+        //    afleverlocatie op een eigen regel (op id, nooit op naam).
         const { data: orderRows } = await supabaseAdmin
             .from("orders")
-            .select("id, order_number, delivery_date, customer_id")
+            .select("id, order_number, delivery_date, customer_id, custom_fields")
             .in("id", claimed);
-        const customerIds = Array.from(new Set((orderRows ?? []).map((o) => o.customer_id).filter(Boolean)));
+        const rowsArr = (orderRows ?? []);
+        const customerIds = Array.from(new Set(rowsArr.map((o) => o.customer_id).filter(Boolean)));
         const customerNames = new Map();
         if (customerIds.length > 0) {
             const { data: custRows } = await supabaseAdmin
                 .from("customers")
-                .select("id, company_name")
+                .select("id, company_name, commercial_name")
                 .in("id", customerIds);
             for (const c of (custRows ?? [])) {
-                customerNames.set(String(c.id), String(c.company_name ?? ""));
+                customerNames.set(String(c.id), buyerLabel(c.company_name, c.commercial_name));
+            }
+        }
+        const locIds = Array.from(new Set(rowsArr.map((o) => o.custom_fields?.delivery_location_id).filter(Boolean).map(String)));
+        const locNames = new Map();
+        if (locIds.length > 0) {
+            const { data: locRows } = await supabaseAdmin
+                .from("customer_delivery_locations")
+                .select("id, name, gln")
+                .in("id", locIds);
+            for (const l of (locRows ?? [])) {
+                locNames.set(String(l.id), String(l.name ?? l.gln ?? ""));
             }
         }
         let sent = 0;
-        for (const o of (orderRows ?? [])) {
+        for (const o of rowsArr) {
             const nummer = o.order_number ? String(o.order_number) : String(o.id).slice(0, 8);
-            const klant = o.customer_id ? (customerNames.get(String(o.customer_id)) ?? "") : "";
-            const datum = o.delivery_date ? String(o.delivery_date) : "onbekend";
-            const regels = [
-                `Order ${nummer} kan niet worden ingedeeld.`,
-                "",
-                `Klant: ${klant || "onbekend"}`,
-                `Leverdatum: ${datum}`,
-                `Reden: ${input.reason}`,
-            ];
+            const cf = (o.custom_fields ?? {});
+            const locId = cf.delivery_location_id ? String(cf.delivery_location_id) : null;
+            const afleverlocatie = (locId && locNames.get(locId)) ||
+                (cf.delivery_location_gln ? `GLN ${String(cf.delivery_location_gln)}` : null);
+            const regels = buildBlockMailLines({
+                orderNumber: nummer,
+                klant: o.customer_id ? (customerNames.get(String(o.customer_id)) ?? "") : "",
+                afleverlocatie,
+                leverdatum: o.delivery_date ? String(o.delivery_date) : null,
+                reden: input.reason,
+            });
             const text = regels.join("\n");
             const html = `<p>${regels.map((r) => escapeHtml(r)).join("<br/>")}</p>`;
             const { error: outErr } = await supabaseAdmin.from("email_auth_outbox").insert({

package/dist-lib/lib/order-cancel.server.d.ts

@@ -21,4 +21,13 @@ export declare function cancelLocalOrderInternal(input: {
     alreadyCancelled: boolean;
     reversedKeys: number;
 }>;
+export declare const FLORIDAY_CANCEL_REASON = "Koper heeft geannuleerd in Floriday";
+export declare const FLORIDAY_CANCEL_PICKED_MESSAGE = "Koper heeft geannuleerd in Floriday, order is al gepickt";
+/**
+ * Annulering uit Floriday (op order-id). Nog niet gepickt/gescand → order
+ * annuleren (voorraad terug, uit herplanning en buffer, Engine melden).
+ * Al gepickt/gescand, of pickstand onbekend → niet annuleren, wel een duidelijke
+ * melding voor handmatige beoordeling. Schrijft nooit order_carts (Engine).
+ */
+export declare function handleFloridayCancellation(orderId: string): Promise<"cancelled" | "already_picked" | "pick_unknown" | "already_cancelled">;
 //# sourceMappingURL=order-cancel.server.d.ts.map

package/dist-lib/lib/order-cancel.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-cancel.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cancel.server.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5E,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAsE5D;AAED,oFAAoF;AACpF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAqDzE"}
+{"version":3,"file":"order-cancel.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cancel.server.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5E,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAsE5D;AAED,oFAAoF;AACpF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAqDzE;AAED,eAAO,MAAM,sBAAsB,wCAAwC,CAAC;AAC5E,eAAO,MAAM,8BAA8B,6DACiB,CAAC;AAE7D;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,gBAAgB,GAAG,cAAc,GAAG,mBAAmB,CAAC,CA+EhF"}