@flowselections/floriday-verkoop-module 1.0.93 → 1.0.98

package/dist-lib/lib/departure-preview.js

@@ -0,0 +1,70 @@
+// Voorbeeld van het ophaalmoment vóór er een order is, zoals de Logistiek
+// Engine het geeft (logistics_departure_preview). Alleen normaliseren en
+// beslissen wat je ziet; deze module rekent zelf niets uit.
+import { formatMoment } from "./order-departure.js";
+const s = (v) => (typeof v === "string" && v.trim() !== "" ? v : null);
+export function normalizePreview(raw) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return null;
+    const r = raw;
+    const moments = Array.isArray(r.moments)
+        ? r.moments
+            .filter((m) => m && s(m.momentKey))
+            .map((m) => ({
+            momentKey: String(m.momentKey),
+            departureAt: s(m.departureAt),
+            signupDeadline: s(m.signupDeadline),
+            feasible: m.feasible === true,
+        }))
+        : [];
+    const c = r.chosen && typeof r.chosen === "object" ? r.chosen : null;
+    return {
+        ok: r.ok === true,
+        reason: s(r.reason),
+        carrierId: s(r.carrierId),
+        moments,
+        chosen: c
+            ? { momentKey: s(c.momentKey), departureAt: s(c.departureAt), signupDeadline: s(c.signupDeadline) }
+            : null,
+        deliveryDateFeasible: r.deliveryDateFeasible === true,
+        deliveryDateReason: s(r.deliveryDateReason) ?? s(r.reason),
+        firstFeasibleDeliveryDate: s(r.firstFeasibleDeliveryDate),
+        firstFeasibleReason: s(r.firstFeasibleReason),
+    };
+}
+export const PREVIEW_UNKNOWN = "Het ophaalmoment is nu niet bekend. Probeer het over een minuut opnieuw.";
+function momentText(departureAt, signup) {
+    const p = formatMoment(departureAt);
+    if (!p)
+        return null;
+    const a = formatMoment(signup);
+    return a ? `ophalen ${p} · aanmelden ${a}` : `ophalen ${p}`;
+}
+/**
+ * Wat je ziet / of je mag aanmaken.
+ * - ok = false of geen antwoord: geblokkeerd, alleen de reden.
+ * - leverdatum niet haalbaar: "te laat" — alleen aanmaken na bewuste keuze.
+ */
+export function decidePreview(p) {
+    if (!p)
+        return { kind: "blocked", reason: PREVIEW_UNKNOWN };
+    if (!p.ok)
+        return { kind: "blocked", reason: p.reason ?? "Voor deze leverdatum is geen ophaalmoment mogelijk." };
+    const momentKey = p.chosen?.momentKey ?? null;
+    const text = momentText(p.chosen?.departureAt ?? null, p.chosen?.signupDeadline ?? null);
+    if (!p.deliveryDateFeasible) {
+        return {
+            kind: "late",
+            reason: p.deliveryDateReason ?? "Aanmelden voor deze leverdatum kan niet meer.",
+            firstDate: p.firstFeasibleDeliveryDate,
+            firstReason: p.firstFeasibleReason,
+            momentKey,
+            text,
+        };
+    }
+    return { kind: "ok", momentKey, text };
+}
+export function momentLabel(m) {
+    return momentText(m.departureAt, m.signupDeadline) ?? m.momentKey;
+}
+export const LATE_CONFIRM = "Deze order komt na de aanmeldtijd. De vervoerder krijgt hem als te laat aangemeld. Doorgaan?";

package/dist-lib/lib/departure-preview.server.d.ts

@@ -0,0 +1,10 @@
+import { type DeparturePreview } from "./departure-preview.js";
+export declare function loadDeparturePreview(supabase: any, input: {
+    carrierId: string | null;
+    deliveryLocation: string;
+    deliveryDate: string;
+    momentKey?: string | null;
+}): Promise<DeparturePreview | null>;
+/** Aanlevertijd opzoeken bij het door de Engine gekozen moment (geen berekening). */
+export declare function deliveryTimeForMoment(supabase: any, carrierId: string | null, momentKey: string | null): Promise<string | null>;
+//# sourceMappingURL=departure-preview.server.d.ts.map

package/dist-lib/lib/departure-preview.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"departure-preview.server.d.ts","sourceRoot":"","sources":["../../src/lib/departure-preview.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7G,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAiBlC;AAED,qFAAqF;AACrF,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKxB"}

package/dist-lib/lib/departure-preview.server.js

@@ -0,0 +1,29 @@
+// Vraagt het voorbeeld-ophaalmoment op bij de Engine. Fout => null (fail closed).
+import { normalizePreview } from "./departure-preview.js";
+export async function loadDeparturePreview(supabase, input) {
+    try {
+        const { data, error } = await supabase.rpc("logistics_departure_preview", {
+            p_carrier_id: input.carrierId ?? null,
+            p_delivery_location: input.deliveryLocation,
+            p_delivery_date: input.deliveryDate,
+            p_moment_key: input.momentKey ?? null,
+        });
+        if (error) {
+            console.warn("[departure-preview]", error.message);
+            return null;
+        }
+        return normalizePreview(data);
+    }
+    catch (err) {
+        console.warn("[departure-preview]", err);
+        return null;
+    }
+}
+/** Aanlevertijd opzoeken bij het door de Engine gekozen moment (geen berekening). */
+export async function deliveryTimeForMoment(supabase, carrierId, momentKey) {
+    if (!carrierId || !momentKey)
+        return null;
+    const { data } = await supabase.from("carriers").select("pickup_moments").eq("id", carrierId).maybeSingle();
+    const { carrierMomentOptions } = await import("./order-pickup.functions.js");
+    return carrierMomentOptions(data ?? null).find((o) => o.key === momentKey)?.deliveryTime ?? null;
+}

package/dist-lib/lib/floriday-external-fulfillment.check.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floriday-external-fulfillment.check.d.ts.map

package/dist-lib/lib/floriday-external-fulfillment.check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-external-fulfillment.check.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.check.ts"],"names":[],"mappings":""}

package/dist-lib/lib/floriday-external-fulfillment.check.js

@@ -0,0 +1,21 @@
+// Controle "afgehandeld in Floriday". Draai: bun src/lib/floriday-external-fulfillment.check.ts
+import { decideExternalFulfillment as d } from "./floriday-external-fulfillment.js";
+let failed = 0;
+const check = (n, got, want) => { const ok = got === want; if (!ok)
+    failed++; console.log(`${ok ? "OK  " : "FOUT"} ${n}: ${got}${ok ? "" : ` (verwacht ${want})`}`); };
+const base = { status: "Nog te picken", previousIds: [], alreadyFull: false };
+check("één bestelling, minder fust, buiten ERP → verzonden", d({ ...base, salesOrderIds: ["a"], isExternal: () => true }).kind, "full");
+check("door ERP gemaakt → niets", d({ ...base, salesOrderIds: ["a"], isExternal: () => false }).kind, "none");
+check("samengevoegd, alle afgehandeld → verzonden", d({ ...base, salesOrderIds: ["a", "b"], isExternal: () => true }).kind, "full");
+const p = d({ ...base, salesOrderIds: ["a", "b"], isExternal: (id) => id === "a" });
+check("samengevoegd, deel → partial", p.kind, "partial");
+check("deel: alleen a", p.kind === "partial" ? p.fulfilledIds.join() : "", "a");
+check("deel al vastgelegd → niets nieuws", d({ ...base, previousIds: ["a"], salesOrderIds: ["a", "b"], isExternal: (id) => id === "a" }).kind, "none");
+check("al verzonden door ERP → blijft", d({ ...base, status: "Verzonden", salesOrderIds: ["a"], isExternal: () => true }).kind, "none");
+check("geannuleerd → blijft", d({ ...base, status: "geannuleerd", salesOrderIds: ["a"], isExternal: () => true }).kind, "none");
+check("al afgerond → niet nogmaals", d({ ...base, alreadyFull: true, salesOrderIds: ["a"], isExternal: () => true }).kind, "none");
+if (failed) {
+    console.error(`${failed} controle(s) mislukt`);
+    process.exit(1);
+}
+console.log("Alle controles geslaagd");

package/dist-lib/lib/floriday-external-fulfillment.d.ts

@@ -0,0 +1,19 @@
+export declare const FLORIDAY_EXTERNAL_REASON = "Afgehandeld in Floriday";
+export declare const SHIPPED_STATUS = "Verzonden";
+export type ExternalDecision = {
+    kind: "none";
+} | {
+    kind: "full";
+    fulfilledIds: string[];
+} | {
+    kind: "partial";
+    fulfilledIds: string[];
+};
+export declare function decideExternalFulfillment(input: {
+    status: string | null | undefined;
+    salesOrderIds: string[];
+    isExternal: (salesOrderId: string) => boolean;
+    previousIds: string[];
+    alreadyFull: boolean;
+}): ExternalDecision;
+//# sourceMappingURL=floriday-external-fulfillment.d.ts.map

package/dist-lib/lib/floriday-external-fulfillment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-external-fulfillment.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wBAAwB,4BAA4B,CAAC;AAClE,eAAO,MAAM,cAAc,cAAc,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEhD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE;IAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG,gBAAgB,CAcnB"}

package/dist-lib/lib/floriday-external-fulfillment.js

@@ -0,0 +1,24 @@
+// Beslisregel "afgehandeld in Floriday" (buiten het ERP om). Zuiver, geen I/O.
+// Per Floriday-bestelling: er bestaat een afhandeling die niet door het ERP is
+// gemaakt. Het aantal fust telt niet mee.
+export const FLORIDAY_EXTERNAL_REASON = "Afgehandeld in Floriday";
+export const SHIPPED_STATUS = "Verzonden";
+export function decideExternalFulfillment(input) {
+    const st = String(input.status ?? "").trim().toLowerCase();
+    // Al verzonden (ERP) of geannuleerd: blijft zoals hij is.
+    if (input.alreadyFull || ["verzonden", "shipped", "geleverd", "delivered", "geannuleerd"].includes(st)) {
+        return { kind: "none" };
+    }
+    const ids = Array.from(new Set(input.salesOrderIds.filter(Boolean)));
+    if (ids.length === 0)
+        return { kind: "none" };
+    const done = ids.filter((id) => input.isExternal(id));
+    if (done.length === 0)
+        return { kind: "none" };
+    if (done.length === ids.length)
+        return { kind: "full", fulfilledIds: done };
+    const prev = new Set(input.previousIds);
+    if (done.length === prev.size && done.every((id) => prev.has(id)))
+        return { kind: "none" };
+    return { kind: "partial", fulfilledIds: done };
+}

package/dist-lib/lib/floriday-external-fulfillment.server.d.ts

@@ -0,0 +1,5 @@
+import type { FloridayFulfillmentState } from "./floriday-fulfillment-status.server.js";
+export declare function handleFloridayExternalFulfillment(orderId: string, states?: Map<string, FloridayFulfillmentState>): Promise<"none" | "shipped" | "partial">;
+/** Haalt het event-id uit het antwoord van logistics_emit_event (uuid, of object met id/eventId). */
+export declare function extractEventId(data: unknown): string | null;
+//# sourceMappingURL=floriday-external-fulfillment.server.d.ts.map

package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAgFzC;AAED,qGAAqG;AACrG,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ3D"}

package/dist-lib/lib/floriday-external-fulfillment.server.js

@@ -0,0 +1,110 @@
+// Order die in Floriday zelf is afgehandeld (buiten het ERP om) netjes afronden.
+// Naar het voorbeeld van handleFloridayCancellation. Geen melding voor kantoor,
+// geen voorraadmutatie (dat is aan Voorraad), schrijft nooit order_carts.
+import { decideExternalFulfillment, FLORIDAY_EXTERNAL_REASON, SHIPPED_STATUS } from "./floriday-external-fulfillment.js";
+import { externalFulfilledIdempotencyKey } from "./floriday-line-key.js";
+export async function handleFloridayExternalFulfillment(orderId, states) {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
+    const { data: order, error } = await supabaseAdmin
+        .from("orders")
+        .select("id, status, custom_fields")
+        .eq("id", orderId)
+        .maybeSingle();
+    if (error)
+        throw new Error(error.message);
+    if (!order)
+        return "none";
+    const o = order;
+    const cf = (o.custom_fields ?? {});
+    const soIds = Array.isArray(cf.floriday_sales_order_ids) && cf.floriday_sales_order_ids.length > 0
+        ? cf.floriday_sales_order_ids.map(String)
+        : cf.floriday_sales_order_id ? [String(cf.floriday_sales_order_id)] : [];
+    if (soIds.length === 0)
+        return "none";
+    // Ontbrekende bestellingen in de meegegeven stand: vers lezen (fail closed = niet afgehandeld).
+    let map = states ?? new Map();
+    if (soIds.some((id) => !map.has(id))) {
+        const { loadFloridayFulfillmentStates } = await import("./floriday-fulfillment-status.server.js");
+        const fresh = await loadFloridayFulfillmentStates(supabaseAdmin, soIds);
+        map = new Map([...map, ...fresh]);
+    }
+    const decision = decideExternalFulfillment({
+        status: o.status,
+        salesOrderIds: soIds,
+        isExternal: (id) => Boolean(map.get(id)?.external),
+        previousIds: Array.isArray(cf.floriday_external_fulfilled_sales_order_ids) ? cf.floriday_external_fulfilled_sales_order_ids : [],
+        alreadyFull: Boolean(cf.floriday_external_fulfilled_at),
+    });
+    if (decision.kind === "none")
+        return "none";
+    const now = new Date().toISOString();
+    const nextCf = { ...cf, floriday_external_fulfilled_sales_order_ids: decision.fulfilledIds };
+    let patch;
+    if (decision.kind === "full") {
+        nextCf.floriday_external_fulfilled_at = now;
+        nextCf.floriday_external_fulfilled_notice = FLORIDAY_EXTERNAL_REASON;
+        patch = { status: SHIPPED_STATUS, status_sync_token: globalThis.crypto.randomUUID(), custom_fields: nextCf };
+    }
+    else {
+        patch = { custom_fields: nextCf };
+    }
+    const { error: uErr } = await supabaseAdmin.from("orders").update(patch).eq("id", orderId);
+    if (uErr)
+        throw new Error(uErr.message);
+    if (decision.kind === "full") {
+        await supabaseAdmin.from("cart_replan_queue").delete().eq("order_id", orderId);
+    }
+    // Engine melden via logistics_emit_event (idempotent); event-id of fout op de order bewaren.
+    const ids = [...new Set(decision.fulfilledIds.map(String))].sort();
+    let eventId = null;
+    let emitError = null;
+    try {
+        const { data, error: rpcErr } = await supabaseAdmin.rpc("logistics_emit_event", {
+            p_source_module: "verkoop",
+            p_event_type: "order.changed",
+            p_order_ref: orderId,
+            p_payload: {
+                orderId,
+                reason: FLORIDAY_EXTERNAL_REASON,
+                floridayExternalFulfilledFull: decision.kind === "full",
+                floridayExternalFulfilledSalesOrderIds: ids,
+            },
+            p_idempotency_key: externalFulfilledIdempotencyKey(orderId, ids),
+        });
+        if (rpcErr)
+            emitError = rpcErr.message;
+        else
+            eventId = extractEventId(data);
+    }
+    catch (err) {
+        emitError = err.message;
+    }
+    const afterCf = { ...nextCf };
+    if (eventId)
+        afterCf.floriday_external_engine_event_id = eventId;
+    else
+        delete afterCf.floriday_external_engine_event_id;
+    if (emitError)
+        afterCf.floriday_external_engine_error = emitError.slice(0, 300);
+    else
+        delete afterCf.floriday_external_engine_error;
+    const { error: eErr } = await supabaseAdmin.from("orders").update({ custom_fields: afterCf }).eq("id", orderId);
+    if (eErr)
+        console.warn("[floriday-external] event-id bewaren faalde:", eErr.message);
+    if (emitError)
+        console.warn("[floriday-external] engine-melding faalde:", emitError);
+    console.info(`[floriday-external] order ${orderId}: ${decision.kind} (${decision.fulfilledIds.length}/${soIds.length})`);
+    return decision.kind === "full" ? "shipped" : "partial";
+}
+/** Haalt het event-id uit het antwoord van logistics_emit_event (uuid, of object met id/eventId). */
+export function extractEventId(data) {
+    if (typeof data === "string" && data.trim())
+        return data.trim();
+    if (data && typeof data === "object") {
+        const d = data;
+        const v = d.eventId ?? d.event_id ?? d.id;
+        if (typeof v === "string" && v.trim())
+            return v.trim();
+    }
+    return null;
+}

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

@@ -11,6 +11,8 @@ export interface FloridayFulfillmentState {
     deliveryNoteCodes: string[];
     /** Aangemaakt door ons ERP (auto-fulfillment) i.p.v. rechtstreeks in Floriday. */
     createdByErp: boolean;
+    /** Minstens één afhandeling die NIET door het ERP is gemaakt (rechtstreeks in Floriday). */
+    external: boolean;
 }
 /**
  * Bouwt een map salesOrderId -> afhandelstatus. Eén query over de

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

@@ -1 +1 @@
-{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;CACvB;AAID;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,cAAc,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CA+DhD;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAIhE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,wBAAwB,GAAG,SAAS,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT"}
+{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,EAAE,OAAO,CAAC;CACnB;AAID;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,cAAc,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAiEhD;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAIhE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,wBAAwB,GAAG,SAAS,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT"}

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

@@ -50,6 +50,7 @@ export async function loadFloridayFulfillmentStates(supabase, salesOrderIds) {
                         receivedAt: null,
                         deliveryNoteCodes: [],
                         createdByErp: false,
+                        external: false,
                     };
                 prev.fulfilled = true;
                 prev.packages += Number(item?.numberOfPackages ?? 0) || 0;
@@ -63,6 +64,8 @@ export async function loadFloridayFulfillmentStates(supabase, salesOrderIds) {
                 }
                 if (byErp)
                     prev.createdByErp = true;
+                else
+                    prev.external = true;
                 result.set(soId, prev);
             }
         }

package/dist-lib/lib/floriday-line-key.check.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floriday-line-key.check.d.ts.map

package/dist-lib/lib/floriday-line-key.check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-line-key.check.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-line-key.check.ts"],"names":[],"mappings":""}

package/dist-lib/lib/floriday-line-key.check.js

@@ -0,0 +1,31 @@
+// Draai met: bun src/lib/floriday-line-key.check.ts
+import { externalFulfilledIdempotencyKey, isValidSalesOrderId, splitByLineKey } from "./floriday-line-key.js";
+import { parseExternal, parsePlanCoverage, parsePlanCoverageListRow } from "./plan-coverage.js";
+import { extractEventId } from "./floriday-external-fulfillment.server.js";
+let fail = 0;
+const ok = (c, m) => {
+    if (!c)
+        fail++;
+    console.log(`${c ? "OK  " : "FOUT"} ${m}`);
+};
+const A = "11111111-1111-4111-8111-111111111111";
+const B = "22222222-2222-4222-8222-222222222222";
+ok(isValidSalesOrderId(A), "uuid is geldige sleutel");
+ok(!isValidSalesOrderId("undefined") && !isValidSalesOrderId("") && !isValidSalesOrderId(null), "lege/onzin-sleutel ongeldig");
+const s = splitByLineKey([{ foId: A }, { foId: B }, { foId: "null" }]);
+ok(s.valid.length === 2 && s.invalid.length === 1, "samengevoegde order: twee geldige regels, één apart gemeld");
+ok(s.valid.every((l) => isValidSalesOrderId(l.foId)), "elke opgeslagen regel heeft een uuid-sleutel");
+ok(externalFulfilledIdempotencyKey("o1", [B, A, A]) === `extern-afgehandeld:o1:${A},${B}`, "idempotentiesleutel gesorteerd en ontdubbeld");
+const full = parsePlanCoverage({ state: "afgehandeld_extern", externalFulfilled: { full: true, salesOrderIds: [A] } });
+ok(full.state === "afgehandeld_extern" && full.label === "Afgehandeld in Floriday", "volledig: 'Afgehandeld in Floriday'");
+ok(full.externalFulfilled?.full === true, "externalFulfilled.full gelezen");
+const part = parsePlanCoverage({ state: "deels", progressPct: 40, externalFulfilled: { full: false, salesOrderIds: [A] } });
+ok(part.progressPct === 40 && part.externalFulfilled?.full === false, "deels: voortgang van de Engine overgenomen");
+ok(parseExternal({ full: "ja" }) === null, "full geen boolean → genegeerd");
+ok(parsePlanCoverageListRow({ state: "afgehandeld_extern" }).label === "Afgehandeld in Floriday", "lijst: label");
+ok(extractEventId({ eventId: A }) === A && extractEventId(A) === A && extractEventId({}) === null, "event-id uit antwoord");
+if (fail) {
+    console.error(`${fail} controle(s) mislukt`);
+    process.exit(1);
+}
+console.log("Alle controles geslaagd");

package/dist-lib/lib/floriday-line-key.d.ts

@@ -0,0 +1,12 @@
+export declare const MISSING_LINE_KEY_NOTICE = "Een regel van deze Floriday-order mist het bestelnummer en is niet overgenomen";
+export declare function isValidSalesOrderId(v: unknown): v is string;
+/** Splitst regels in geldige (met uuid-sleutel) en ongeldige. */
+export declare function splitByLineKey<T extends {
+    foId: unknown;
+}>(lines: T[]): {
+    valid: T[];
+    invalid: T[];
+};
+/** Idempotentiesleutel voor de melding "Afgehandeld in Floriday" (id's gesorteerd). */
+export declare function externalFulfilledIdempotencyKey(orderId: string, salesOrderIds: string[]): string;
+//# sourceMappingURL=floriday-line-key.d.ts.map

package/dist-lib/lib/floriday-line-key.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-line-key.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-line-key.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,mFAC8C,CAAC;AAEnF,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAE3D;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,CAAC,EAAE,CAAA;CAAE,CAKpG;AAED,uFAAuF;AACvF,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAEhG"}

package/dist-lib/lib/floriday-line-key.js

@@ -0,0 +1,20 @@
+// Herkomstsleutel van een Floriday-orderregel: altijd de Floriday-salesOrderId (uuid).
+// Een regel zonder geldige id wordt niet overgenomen, maar nooit stil: de order
+// krijgt een zichtbare melding en het rondeverslag een foutregel.
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export const MISSING_LINE_KEY_NOTICE = "Een regel van deze Floriday-order mist het bestelnummer en is niet overgenomen";
+export function isValidSalesOrderId(v) {
+    return typeof v === "string" && UUID_RE.test(v.trim());
+}
+/** Splitst regels in geldige (met uuid-sleutel) en ongeldige. */
+export function splitByLineKey(lines) {
+    const valid = [];
+    const invalid = [];
+    for (const l of lines)
+        (isValidSalesOrderId(l.foId) ? valid : invalid).push(l);
+    return { valid, invalid };
+}
+/** Idempotentiesleutel voor de melding "Afgehandeld in Floriday" (id's gesorteerd). */
+export function externalFulfilledIdempotencyKey(orderId, salesOrderIds) {
+    return `extern-afgehandeld:${orderId}:${[...new Set(salesOrderIds)].sort().join(",")}`;
+}

package/dist-lib/lib/floriday-mirror.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AA+IA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAs3CD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,yBAEvE;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;yBAG0C,CAAC"}
+{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AAgJA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAy5CD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,yBAEvE;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;yBAG0C,CAAC"}

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

@@ -1,4 +1,5 @@
 import { diffBuyerChanges } from "./floriday-change-diff.js";
+import { MISSING_LINE_KEY_NOTICE, splitByLineKey } from "./floriday-line-key.js";
 // 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
@@ -717,6 +718,7 @@ async function mirrorUnlocked(limit) {
         lineInfoByFoId.set(l.foId, lineInfoOf(l));
     // Orders die in deze ronde al door een andere bestelling zijn geschreven.
     const handledOrderIds = new Set();
+    const legacyExternalIds = new Set();
     // Welke velden per order echt veranderden (voor melding en syncresultaat).
     const changedFieldsByOrder = new Map();
     const noteChange = (orderId, field) => {
@@ -756,7 +758,9 @@ async function mirrorUnlocked(limit) {
             floriday_status: primary.d?.status ?? null,
             floriday_trade_item_id: primary.tradeItemId || null,
             floriday_fulfilled: anyFulfilled,
-            floriday_fulfilled_externally: anyFulfilled && !ffPrimary?.createdByErp,
+            // Afgehandeld in Floriday = er is een afhandeling die niet door het ERP
+            // is gemaakt; het aantal fust doet er niet toe (koppelprompt 1.0.96).
+            floriday_fulfilled_externally: group.some((l) => Boolean(l.ff?.external)),
             floriday_fulfilled_by_erp: anyFulfilled && Boolean(ffPrimary?.createdByErp),
             floriday_delivery_notes: ffPrimary?.deliveryNoteCodes ?? [],
             floriday_received_at: ffPrimary?.receivedAt ?? null,
@@ -921,6 +925,11 @@ async function mirrorUnlocked(limit) {
                 // samenvoegen, nooit overschrijven — de order kan door de Engine uit
                 // meerdere bestellingen zijn samengesteld.
                 const prevCf = { ...(target.custom_fields ?? {}) };
+                // Bestaande orders die vóór 1.0.96 al als "buiten het ERP afgehandeld"
+                // stonden, worden niet vanzelf omgezet (eerst akkoord gebruiker).
+                if (prevCf.floriday_fulfilled_externally === true && !prevCf.floriday_external_fulfilled_sales_order_ids && !prevCf.floriday_external_fulfilled_at) {
+                    legacyExternalIds.add(String(target.id));
+                }
                 // Oudere orders kennen floriday_groups nog niet: hun eigen bestelling
                 // als eerste groep overnemen, zodat die lijst niet verloren gaat.
                 const prevGroups = (prevCf.floriday_groups ??
@@ -952,6 +961,20 @@ async function mirrorUnlocked(limit) {
                 mergedCf.floriday_sales_order_ids = [...allIds].sort();
                 mergedCf.floriday_lines = [...otherLines, ...floridayLines].sort((a, b) => String(a?.sales_order_id).localeCompare(String(b?.sales_order_id)));
                 mergedCf.floriday_line_count = mergedCf.floriday_lines.length;
+                // Regels zonder geldige Floriday-salesOrderId worden niet overgenomen,
+                // maar nooit stil: zichtbare melding op de order + foutregel.
+                {
+                    const { invalid } = splitByLineKey(group);
+                    if (invalid.length > 0) {
+                        mergedCf.floriday_missing_line_key_notice = MISSING_LINE_KEY_NOTICE;
+                        mergedCf.floriday_missing_line_key_count = invalid.length;
+                        errors.push(`${primary.foId}: ${invalid.length} regel(s) zonder geldig Floriday-bestelnummer niet overgenomen`);
+                    }
+                    else {
+                        delete mergedCf.floriday_missing_line_key_notice;
+                        delete mergedCf.floriday_missing_line_key_count;
+                    }
+                }
                 if (Object.keys(failures).length > 0)
                     mergedCf.mirror_failures = failures;
                 else {
@@ -1161,7 +1184,8 @@ async function mirrorUnlocked(limit) {
             // een vaste herkomstsleutel (source_line_key = Floriday sales order id),
             // nooit meer wissen-en-opnieuw-toevoegen: dat veroorzaakte duplicaten
             // zodra de verwijdering op een timeout stuk liep.
-            const lineRows = group.map((l) => {
+            // Alleen regels met een geldige Floriday-salesOrderId (uuid) als sleutel.
+            const lineRows = splitByLineKey(group).valid.map((l) => {
                 const locked = lockedByKey.get(l.foId);
                 return {
                     order_id: orderId,
@@ -1346,6 +1370,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).
+    // Afgehandeld in Floriday (buiten het ERP om) — na de ronde, per order.
+    for (const oid of Array.from(handledOrderIds)) {
+        if (legacyExternalIds.has(oid))
+            continue;
+        try {
+            const { handleFloridayExternalFulfillment } = await import("./floriday-external-fulfillment.server.js");
+            await handleFloridayExternalFulfillment(oid, fulfillmentStates);
+        }
+        catch (err) {
+            errors.push(`${oid}: afhandeling in Floriday verwerken faalde: ${err.message}`.slice(0, 200));
+        }
+    }
     for (const cid of Array.from(new Set(floridayCancelIds))) {
         try {
             const { handleFloridayCancellation } = await import("./order-cancel.server.js");

package/dist-lib/lib/logistics-engine.functions.d.ts

@@ -5,7 +5,7 @@ export declare const sendOrderEventToEngine: import("@tanstack/start-client-core
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
     orderId: string;
-    type: "order.received" | "order.changed";
+    type: "order.changed" | "order.received";
 }, Promise<{
     ok: false;
     error: string;

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

@@ -1,4 +1,5 @@
 import { type OrderDeparture } from "./order-departure.js";
+export declare const LIST_CHUNK = 1000;
 export declare function loadOrderDepartures(supabase: any, orderIds: string[]): Promise<Map<string, OrderDeparture>>;
 export declare function forgetOrderDeparture(orderId: string): void;
 //# sourceMappingURL=order-departure.server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"order-departure.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM5E,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAiDtC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,QAEnD"}
+{"version":3,"file":"order-departure.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG5E,eAAO,MAAM,UAAU,OAAO,CAAC;AAI/B,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwDtC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,QAEnD"}

package/dist-lib/lib/order-departure.server.js

@@ -3,6 +3,7 @@
 // order (maximaal 12 tegelijk). Fout => order ontbreekt in het resultaat.
 import { normalizeDeparture } from "./order-departure.js";
 const PARALLEL = 12;
+export const LIST_CHUNK = 1000;
 const CACHE_MS = 30000;
 const cache = new Map();
 export async function loadOrderDepartures(supabase, orderIds) {
@@ -18,11 +19,22 @@ export async function loadOrderDepartures(supabase, orderIds) {
     }
     if (todo.length === 0)
         return out;
-    // Lijstversie (Engine 1.0.162+): één aanroep.
+    // Lijstversie (Engine 1.0.162+): één aanroep per 1000 orders.
     try {
-        const { data, error } = await supabase.rpc("logistics_order_departure_list", { p_order_ids: todo });
-        if (!error) {
-            const rows = Array.isArray(data) ? data : [];
+        const rows = [];
+        let listOk = true;
+        for (let i = 0; i < todo.length; i += LIST_CHUNK) {
+            const { data, error } = await supabase.rpc("logistics_order_departure_list", {
+                p_order_ids: todo.slice(i, i + LIST_CHUNK),
+            });
+            if (error) {
+                listOk = false;
+                break;
+            }
+            if (Array.isArray(data))
+                rows.push(...data);
+        }
+        if (listOk) {
             for (const row of rows) {
                 const r = (row && typeof row === "object" && "departure" in row ? row.departure : row);
                 const id = String(row?.order_id ?? row?.orderId ?? r?.orderId ?? "");

package/dist-lib/lib/order-pickup.functions.d.ts

@@ -20,6 +20,10 @@ export declare const getOrderPickupMoment: import("@tanstack/start-client-core")
     options: PickupMomentOption[];
     hasCarrier: boolean;
     deliveryTime: string | null;
+    lateOverride: {
+        by: string | null;
+        at: string | null;
+    } | null;
 }>>;
 export declare const setOrderPickupMoment: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
     supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;

package/dist-lib/lib/order-pickup.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3F,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,GAAG,kBAAkB,EAAE,CAoB9E;AAaD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;GAyC7B,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;GAoB7B,CAAC"}
+{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3F,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,GAAG,kBAAkB,EAAE,CAoB9E;AAaD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;;YA2CgE,MAAM,GAAG,IAAI;YACtD,MAAM,GAAG,IAAI;;GAIjE,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;GAoB7B,CAAC"}

package/dist-lib/lib/order-pickup.functions.js

@@ -68,6 +68,7 @@ export const getOrderPickupMoment = createServerFn({ method: "GET" })
             options: [],
             hasCarrier: false,
             deliveryTime: null,
+            lateOverride: null,
         };
     }
     const cf = (order.custom_fields ?? {});
@@ -88,6 +89,12 @@ export const getOrderPickupMoment = createServerFn({ method: "GET" })
         options,
         hasCarrier: !!carrier,
         deliveryTime: normalizeTime(cf.delivery_time),
+        lateOverride: cf.late_signup_override
+            ? {
+                by: (cf.late_signup_override.by_name ?? cf.late_signup_override.by_email ?? null),
+                at: (cf.late_signup_override.at ?? null),
+            }
+            : null,
     };
 });
 export const setOrderPickupMoment = createServerFn({ method: "POST" })