@flowselections/floriday-authenticatie-module 1.0.68 → 1.0.72

package/dist-lib/lib/gateway/fulfillment-order-body.js

@@ -7,6 +7,7 @@
 // De body wordt volledig opgebouwd uit de delivery-order-cache plus een join
 // op de sales-order-cache; er wordt niets verzonnen. Ontbrekende gegevens
 // leiden tot een expliciete fout, nooit tot een stille aanname.
+import { defaultedFieldsWarning, packagesSumWarnings, resolveCartLoadCarrierType, } from "./load-carrier-checks";
 // ---------------------------------------------------------------------------
 // fulfillmentOrderId — deterministische UUIDv5
 // ---------------------------------------------------------------------------
@@ -260,6 +261,7 @@ export async function buildFulfillmentOrderBody(supabase, input) {
     }
     const usedRequestIds = [];
     const loadCarriers = [];
+    const loadWarnings = [];
     const buildItem = (req, override, sortIndex) => {
         const id = String(req?.fulfillmentRequestId ?? req?.id);
         const count = override?.numberOfPackages && Number(override.numberOfPackages) > 0
@@ -298,11 +300,13 @@ export async function buildFulfillmentOrderBody(supabase, input) {
     if (cartCarriers) {
         // ── Pad 1: onze eigen karrenindeling is leidend ────────────────────────
         let carrierIndex = 0;
+        const packageLines = [];
         for (const cart of cartCarriers) {
             carrierIndex += 1;
             const items = [];
             let itemIndex = 0;
-            let typeFromRequests = "";
+            const cartRequests = [];
+            const defaulted = [];
             for (const line of cart.items ?? []) {
                 const id = String(line?.fulfillmentRequestId ?? "").trim();
                 if (!id) {
@@ -329,8 +333,11 @@ export async function buildFulfillmentOrderBody(supabase, input) {
                     return { kind: "error", error: built.error, permanent: built.permanent };
                 }
                 items.push(built.item);
-                if (!typeFromRequests)
-                    typeFromRequests = String(req?.loadCarrier ?? "").trim();
+                packageLines.push({ fulfillmentRequestId: id, numberOfPackages: Number(built.item.numberOfPackages) });
+                if (!(Number(line?.numberOfPackages) > 0)) {
+                    defaulted.push({ field: `numberOfPackages[${id}]`, value: built.item.numberOfPackages, source: "fulfillment_request" });
+                }
+                cartRequests.push({ fulfillmentRequestId: id, loadCarrier: req?.loadCarrier });
             }
             if (items.length === 0) {
                 return {
@@ -339,14 +346,29 @@ export async function buildFulfillmentOrderBody(supabase, input) {
                     permanent: true,
                 };
             }
-            const loadCarrierType = String(cart.loadCarrierType ?? typeFromRequests).trim();
-            if (!loadCarrierType || loadCarrierType === "NONE") {
+            // Type uit de requests is leidend; Afhandeling alleen als terugval.
+            const typed = resolveCartLoadCarrierType(carrierIndex - 1, cart.loadCarrierType, cartRequests);
+            const loadCarrierType = typed.loadCarrierType;
+            if (!loadCarrierType) {
                 return {
                     kind: "error",
                     error: `Kar ${cart.loadCarrierReference ?? carrierIndex} heeft geen bruikbaar loadCarrierType`,
                     permanent: true,
                 };
             }
+            loadWarnings.push(...typed.warnings);
+            if (typed.source === "fulfillment_request" && !String(cart.loadCarrierType ?? "").trim()) {
+                defaulted.push({ field: "loadCarrierType", value: loadCarrierType, source: "fulfillment_request" });
+            }
+            const layersGiven = cart.numberOfAdditionalLayers !== undefined && cart.numberOfAdditionalLayers !== null;
+            if (!layersGiven)
+                defaulted.push({ field: "numberOfAdditionalLayers", value: 0, source: "default" });
+            if (cart.sortIndex === undefined || cart.sortIndex === null) {
+                defaulted.push({ field: "sortIndex", value: carrierIndex, source: "default" });
+            }
+            const dw = defaultedFieldsWarning(carrierIndex - 1, defaulted);
+            if (dw)
+                loadWarnings.push(dw);
             const carrier = {
                 sortIndex: cart.sortIndex ?? carrierIndex,
                 loadCarrierType,
@@ -359,6 +381,10 @@ export async function buildFulfillmentOrderBody(supabase, input) {
                 carrier.loadCarrierBarcode = cart.loadCarrierBarcode;
             loadCarriers.push(carrier);
         }
+        const expected = new Map();
+        for (const l of packageLines)
+            expected.set(l.fulfillmentRequestId, resolvePackageCount(byRequestId.get(l.fulfillmentRequestId)));
+        loadWarnings.push(...packagesSumWarnings(packageLines, expected));
     }
     else {
         // ── Pad 2 (fallback): groeperen per loadCarrier-waarde van de requests ──
@@ -411,5 +437,5 @@ export async function buildFulfillmentOrderBody(supabase, input) {
     const gln = input.deliveryLocationGln ?? doData?.destination?.location?.gln ?? null;
     if (gln)
         body.deliveryLocationGln = gln;
-    return { kind: "body", body, fulfillmentOrderId, usedRequestIds, skipped };
+    return { kind: "body", body, fulfillmentOrderId, usedRequestIds, skipped, loadWarnings };
 }

package/dist-lib/lib/gateway/fulfillment-order-send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fulfillment-order-send.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-send.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAyB5D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC,CAmOrC;AAeD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAmCnB"}
+{"version":3,"file":"fulfillment-order-send.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-send.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAyB5D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC,CA0OrC;AAeD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAmCnB"}

package/dist-lib/lib/gateway/fulfillment-order-send.js

@@ -156,6 +156,13 @@ export async function runFulfillmentOrderSend(supabase, body, caller) {
         }
         writeBody = built.body;
         skipped = built.skipped;
+        if (hasCartLoad) {
+            warnings.push(...built.loadWarnings);
+            if (typeof body?.oneLabelOnly !== "boolean") {
+                warnings.push({ code: "defaulted_fields", severity: "warning", fields: [{ field: "oneLabelOnly", value: false, source: "default" }],
+                    message: "oneLabelOnly niet meegegeven; door de module ingevuld als false (default)." });
+            }
+        }
     }
     // Laatste poort: zijn alle karren van de order afgemeld aan de controlebalie?
     const approval = await checkCartApproval(supabase, {

package/dist-lib/lib/gateway/fulfillment-order-status.d.ts

@@ -1,17 +1,23 @@
 import type { SupabaseClient } from "@supabase/supabase-js";
+import { type RefreshDeps, type RefreshMode } from "../status-overview.js";
 export interface FulfillmentOrderStatusResult {
     status: number;
     payload: unknown;
 }
 /**
- * Statusoverzicht per verkooporder, alleen uit de caches (geen Floriday-
- * aanroep): orderstatus, uitleveringen, fulfillmentRequestIds, floridayStage
- * en de ordervelden. Een order die niet in de cache staat krijgt stage
- * "unknown" — geen fout. Wijzigt nooit een orderstatus.
+ * Statusoverzicht per verkooporder. Leest de lokaal gesynchroniseerde
+ * orders, afleveropdrachten en uitleveringen per tabel in één keer. Alleen
+ * als een bron verouderd is of een order ontbreekt, volgt één begrensde
+ * inhaalronde op de bestaande sequence-sync (nooit een aanroep per order).
+ * Onbekende orders geven found:false; nooit een fout voor de hele lijst.
+ * Wijzigt nooit een orderstatus.
  */
 export declare function runSalesOrderStatusOverview(supabase: SupabaseClient, input: {
     salesOrderIds: string[];
+    fulfillmentOrderIds?: string[] | null;
+    refresh?: RefreshMode;
     environment?: "staging" | "live";
+    deps?: Partial<RefreshDeps>;
 }): Promise<FulfillmentOrderStatusResult>;
 export declare function runFulfillmentOrderStatus(supabase: SupabaseClient, input: {
     fulfillmentOrderId: string;

package/dist-lib/lib/gateway/fulfillment-order-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fulfillment-order-status.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-status.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAID;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GACnE,OAAO,CAAC,4BAA4B,CAAC,CAuFvC;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GACtE,OAAO,CAAC,4BAA4B,CAAC,CA6CvC;AAcD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CA4CnB"}
+{"version":3,"file":"fulfillment-order-status.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-status.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,WAAW,EAGjB,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AA2DD;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE;IACL,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACtC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACjC,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC7B,GACA,OAAO,CAAC,4BAA4B,CAAC,CA4IvC;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GACtE,OAAO,CAAC,4BAA4B,CAAC,CA8CvC;AAmBD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CA8CnB"}

package/dist-lib/lib/gateway/fulfillment-order-status.js

@@ -7,57 +7,157 @@
 import { resolveGatewayEnvironment } from "./shared.js";
 import { SUPPLIERS_API_VERSION, florydayFetch, getActiveFlorydayCredentials } from "../floriday.functions.js";
 import { deriveFloridayStage, isDeliveryNoteReady, readIncoterm } from "../floriday-order-stage.js";
-const MAX_SALES_ORDER_IDS = 100;
+import { MAX_SALES_ORDER_IDS, REFRESH_LIMITS, parseStatusRequest, refreshSource, } from "../status-overview.js";
+import { tryAcquireJobLock, releaseJobLock } from "../cron/job-lock.js";
+import { MODULE_VERSION } from "../module-version.js";
+/** Brokken van max 20 id's voor JSON-contains-filters; max 6 tegelijk (Worker-limiet). */
+async function inChunks(items, size, fn) {
+    const chunks = [];
+    for (let i = 0; i < items.length; i += size)
+        chunks.push(items.slice(i, i + size));
+    const out = [];
+    for (let i = 0; i < chunks.length; i += 6) {
+        const res = await Promise.all(chunks.slice(i, i + 6).map(fn));
+        for (const r of res)
+            out.push(...r);
+    }
+    return out;
+}
+async function readLocal(db, connId, ids) {
+    const soRows = await inChunks(ids, 100, async (c) => {
+        const { data, error } = await db.from("floriday_salesorders_cache")
+            .select("floriday_id, status, buyer_organization_id, data, updated_at")
+            .eq("connection_id", connId).in("floriday_id", c);
+        if (error)
+            throw new Error(error.message);
+        return data ?? [];
+    });
+    const doRows = await inChunks(ids, 20, async (c) => {
+        const or = c.map((sid) => `data->fulfillmentRequests.cs.${JSON.stringify([{ salesOrderId: sid }])}`).join(",");
+        const { data, error } = await db.from("floriday_delivery_orders_cache")
+            .select("floriday_id, data, updated_at").eq("connection_id", connId).or(or);
+        if (error)
+            throw new Error(error.message);
+        return data ?? [];
+    });
+    const requests = new Map();
+    const wanted = new Set(ids);
+    const seenReq = new Set();
+    for (const d of doRows) {
+        for (const r of (d.data?.fulfillmentRequests ?? [])) {
+            const sid = String(r?.salesOrderId ?? "");
+            if (!wanted.has(sid) || !r?.fulfillmentRequestId)
+                continue;
+            const key = `${sid}|${r.fulfillmentRequestId}`;
+            if (seenReq.has(key))
+                continue;
+            seenReq.add(key);
+            const list = requests.get(sid) ?? [];
+            list.push({
+                fulfillmentRequestId: String(r.fulfillmentRequestId),
+                deliveryOrderId: String(d.floriday_id),
+                fulfillmentOrderIds: Array.from(new Set((r.fulfillmentOrderClaims ?? [])
+                    .map((c) => c?.fulfillmentOrderId).filter(Boolean).map(String))),
+            });
+            requests.set(sid, list);
+        }
+    }
+    const foIds = Array.from(new Set(Array.from(requests.values()).flat().flatMap((r) => r.fulfillmentOrderIds)));
+    const foRows = foIds.length ? await inChunks(foIds, 100, async (c) => {
+        const { data, error } = await db.from("floriday_fulfillment_orders_cache")
+            .select("floriday_id, status, data, updated_at").eq("connection_id", connId).in("floriday_id", c);
+        if (error)
+            throw new Error(error.message);
+        return data ?? [];
+    }) : [];
+    return { soRows, requests, foRows };
+}
 /**
- * Statusoverzicht per verkooporder, alleen uit de caches (geen Floriday-
- * aanroep): orderstatus, uitleveringen, fulfillmentRequestIds, floridayStage
- * en de ordervelden. Een order die niet in de cache staat krijgt stage
- * "unknown" — geen fout. Wijzigt nooit een orderstatus.
+ * Statusoverzicht per verkooporder. Leest de lokaal gesynchroniseerde
+ * orders, afleveropdrachten en uitleveringen per tabel in één keer. Alleen
+ * als een bron verouderd is of een order ontbreekt, volgt één begrensde
+ * inhaalronde op de bestaande sequence-sync (nooit een aanroep per order).
+ * Onbekende orders geven found:false; nooit een fout voor de hele lijst.
+ * Wijzigt nooit een orderstatus.
  */
 export async function runSalesOrderStatusOverview(supabase, input) {
     const ids = Array.from(new Set(input.salesOrderIds.map((s) => String(s).trim()).filter(Boolean)));
     if (ids.length === 0 || ids.length > MAX_SALES_ORDER_IDS) {
-        return { status: 400, payload: { ok: false, error: `salesOrderIds: 1 tot ${MAX_SALES_ORDER_IDS} id's` } };
+        return { status: 400, payload: { ok: false, code: "invalid_request", errors: [`salesOrderIds: 1 tot ${MAX_SALES_ORDER_IDS} id's`] } };
+    }
+    let env;
+    let conn;
+    try {
+        env = await resolveGatewayEnvironment(supabase, input?.environment);
+        conn = await getActiveFlorydayCredentials(supabase, env);
+    }
+    catch {
+        conn = null;
     }
-    const env = await resolveGatewayEnvironment(supabase, input?.environment);
-    const conn = await getActiveFlorydayCredentials(supabase, env);
     if (!conn)
-        return { status: 409, payload: { ok: false, error: `Geen actieve Floriday-koppeling voor ${env}` } };
+        return { status: 409, payload: { ok: false, code: "no_active_connection", error: "Geen actieve Floriday-koppeling" } };
     const db = supabase;
-    const { data: soRows } = await db.from("floriday_salesorders_cache")
-        .select("floriday_id, status, buyer_organization_id, data, updated_at")
-        .eq("connection_id", conn.id).in("floriday_id", ids);
-    const soById = new Map((soRows ?? []).map((r) => [String(r.floriday_id), r]));
-    // fulfillmentRequests per verkooporder uit de afleveropdrachten.
-    const requests = new Map();
-    await Promise.all(ids.map(async (sid) => {
-        const { data } = await db.from("floriday_delivery_orders_cache")
-            .select("floriday_id, data").eq("connection_id", conn.id)
-            .filter("data->fulfillmentRequests", "cs", JSON.stringify([{ salesOrderId: sid }])).limit(20);
-        const list = [];
-        for (const d of data ?? []) {
-            for (const r of (d.data?.fulfillmentRequests ?? [])) {
-                if (String(r?.salesOrderId) !== sid || !r?.fulfillmentRequestId)
-                    continue;
-                list.push({
-                    fulfillmentRequestId: String(r.fulfillmentRequestId),
-                    deliveryOrderId: String(d.floriday_id),
-                    fulfillmentOrderIds: Array.from(new Set((r.fulfillmentOrderClaims ?? [])
-                        .map((c) => c?.fulfillmentOrderId).filter(Boolean).map(String))),
-                });
+    let local;
+    try {
+        local = await readLocal(db, conn.id, ids);
+    }
+    catch (e) {
+        return { status: 502, payload: { ok: false, code: "floriday_unavailable", error: `Lokale gegevens niet leesbaar: ${String(e?.message ?? e)}` } };
+    }
+    // Inhaalronde (alleen bij mode auto).
+    const mode = input.refresh ?? "auto";
+    const reports = [];
+    const beforeIds = new Set(local.soRows.map((r) => String(r.floriday_id)));
+    if (mode === "never") {
+        for (const source of ["sales-orders", "delivery-orders", "fulfillment-orders"]) {
+            reports.push({ source, attempted: false, skippedReason: "disabled", timedOut: false, durationMs: 0, synced: 0, error: null });
+        }
+    }
+    else {
+        const deps = {
+            now: () => Date.now(),
+            sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+            readState: async (source) => {
+                const { data } = await db.from("floriday_sync_state")
+                    .select("last_synced_at, last_success_at").eq("connection_id", conn.id).eq("entity_type", source).maybeSingle();
+                const t = (v) => (v ? Date.parse(v) : null);
+                return { lastSyncedAt: t(data?.last_synced_at), lastSuccessAt: t(data?.last_success_at) };
+            },
+            // Zelfde lock-sleutel als de cron: cron en statusoverzicht draaien nooit tegelijk.
+            tryLock: async (source) => (await tryAcquireJobLock(supabase, `floriday-sync:${source}`, REFRESH_LIMITS.lockTtlSeconds)).acquired,
+            unlock: async (source) => releaseJobLock(supabase, `floriday-sync:${source}`),
+            runSync: async (source, deadlineMs) => {
+                const { runBoundedSequenceSync } = await import("../floriday-sync.functions.js");
+                return runBoundedSequenceSync(supabase, conn.id, env, source, { maxBatches: REFRESH_LIMITS.maxBatches, deadlineMs });
+            },
+            ...(input.deps ?? {}),
+        };
+        const deadline = deps.now() + REFRESH_LIMITS.timeoutMs;
+        const missingSo = ids.some((sid) => !beforeIds.has(sid));
+        const missingReq = ids.some((sid) => beforeIds.has(sid) && !(local.requests.get(sid)?.length));
+        const claimedFo = new Set(Array.from(local.requests.values()).flat().flatMap((r) => r.fulfillmentOrderIds));
+        const missingFo = Array.from(claimedFo).some((id) => !local.foRows.some((f) => String(f.floriday_id) === id));
+        const needed = {
+            "sales-orders": missingSo,
+            "delivery-orders": missingReq,
+            "fulfillment-orders": missingFo,
+        };
+        // Bewust na elkaar: elke bron gebruikt de tokenemmer en telt mee in de 6 gelijktijdige aanroepen.
+        for (const source of ["sales-orders", "delivery-orders", "fulfillment-orders"]) {
+            reports.push(await refreshSource(deps, source, needed[source], deadline));
+        }
+        if (reports.some((r) => r.attempted || (r.skippedReason === "in_progress" && !r.timedOut))) {
+            try {
+                local = await readLocal(db, conn.id, ids);
             }
+            catch { /* lokale stand van vóór de ronde blijft */ }
         }
-        requests.set(sid, list);
-    }));
-    const foIds = Array.from(new Set(Array.from(requests.values()).flat().flatMap((r) => r.fulfillmentOrderIds)));
-    const foStatus = new Map();
-    if (foIds.length) {
-        const { data } = await db.from("floriday_fulfillment_orders_cache")
-            .select("floriday_id, status, data").eq("connection_id", conn.id).in("floriday_id", foIds);
-        for (const f of data ?? [])
-            foStatus.set(String(f.floriday_id), f.status ?? f.data?.status ?? null);
-    }
-    const buyerIds = Array.from(new Set((soRows ?? [])
+    }
+    const { soRows, requests, foRows } = local;
+    const soById = new Map(soRows.map((r) => [String(r.floriday_id), r]));
+    const foById = new Map(foRows.map((f) => [String(f.floriday_id), f]));
+    const foFilter = input.fulfillmentOrderIds?.length ? new Set(input.fulfillmentOrderIds) : null;
+    const buyerIds = Array.from(new Set(soRows
         .map((r) => r.data?.customerOrganizationId ?? r.buyer_organization_id).filter(Boolean).map(String)));
     const glnById = new Map();
     if (buyerIds.length) {
@@ -68,25 +168,35 @@ export async function runSalesOrderStatusOverview(supabase, input) {
     }
     const orders = ids.map((sid) => {
         const so = soById.get(sid);
-        const reqs = requests.get(sid) ?? [];
+        let reqs = requests.get(sid) ?? [];
+        if (foFilter) {
+            reqs = reqs.map((r) => ({ ...r, fulfillmentOrderIds: r.fulfillmentOrderIds.filter((id) => foFilter.has(id)) }));
+        }
+        const statusOf = (id) => {
+            const f = foById.get(id);
+            return f ? (f.status ?? f.data?.status ?? null) : null;
+        };
         const fulfillmentOrders = Array.from(new Set(reqs.flatMap((r) => r.fulfillmentOrderIds)))
             .map((id) => {
-            const status = foStatus.get(id) ?? null;
+            const status = statusOf(id);
             return { fulfillmentOrderId: id, status, deliveryNoteReady: isDeliveryNoteReady(status) };
         });
         if (!so) {
-            return { salesOrderId: sid, found: false, floridayStage: "unknown",
-                fulfillmentRequests: reqs, fulfillmentOrders };
+            return { salesOrderId: sid, found: false, salesOrderStatus: null, floridayStage: "unknown",
+                fulfillmentRequests: reqs, fulfillmentOrders, source: null, syncedAt: null };
         }
         const d = so.data ?? {};
         const buyer = d.customerOrganizationId ?? so.buyer_organization_id ?? null;
+        const status = so.status ?? d.status ?? null;
         return {
             salesOrderId: sid,
             found: true,
-            salesOrderStatus: so.status ?? d.status ?? null,
-            floridayStage: deriveFloridayStage(so.status ?? d.status, fulfillmentOrders.map((f) => f.status)),
+            salesOrderStatus: status,
+            floridayStage: deriveFloridayStage(status, reqs.map((r) => r.fulfillmentOrderIds.map(statusOf))),
             fulfillmentRequests: reqs,
             fulfillmentOrders,
+            source: beforeIds.has(sid) ? "local" : "live",
+            syncedAt: so.updated_at ?? null,
             salesChannel: d.salesChannel ?? null,
             tradeInstrument: d.tradeInstrument ?? null,
             incoterm: readIncoterm(d),
@@ -98,14 +208,27 @@ export async function runSalesOrderStatusOverview(supabase, input) {
             cachedAt: so.updated_at ?? null,
         };
     });
-    return { status: 200, payload: { ok: true, environment: env, orders } };
+    return {
+        status: 200,
+        payload: {
+            ok: true,
+            environment: env,
+            refresh: {
+                mode,
+                timedOut: reports.some((r) => r.timedOut),
+                error: reports.find((r) => r.error)?.error ?? null,
+                sources: reports,
+            },
+            orders,
+        },
+    };
 }
 export async function runFulfillmentOrderStatus(supabase, input) {
     const fulfillmentOrderId = String(input?.fulfillmentOrderId ?? "").trim();
     if (!fulfillmentOrderId) {
         return {
             status: 400,
-            payload: { ok: false, error: "fulfillmentOrderId is verplicht" },
+            payload: { ok: false, code: "invalid_request", error: "fulfillmentOrderId is verplicht", errors: ["fulfillmentOrderId is verplicht"] },
         };
     }
     const env = await resolveGatewayEnvironment(supabase, input?.environment);
@@ -124,6 +247,7 @@ export async function runFulfillmentOrderStatus(supabase, input) {
             status: res.status === 404 ? 404 : 502,
             payload: {
                 ok: false,
+                code: res.status === 404 ? "not_found" : "floriday_unavailable",
                 error: `Floriday fulfillment-order status ${res.status}`,
                 detail: data,
             },
@@ -145,46 +269,49 @@ export async function runFulfillmentOrderStatus(supabase, input) {
 // HTTP-handler
 // ---------------------------------------------------------------------------
 import { verifyGatewayCaller, corsPreflight, withCors, } from "../floriday-gateway-auth.js";
-const _fosStatusJson = (data, init) => withCors(Response.json(data, init));
+const _fosStatusJson = (data, init) => withCors(Response.json(data && typeof data === "object" && !Array.isArray(data)
+    ? { ...data, moduleVersion: MODULE_VERSION }
+    : { data, moduleVersion: MODULE_VERSION }, init));
 export async function handleFulfillmentOrderStatus(request, supabase) {
     if (request.method === "OPTIONS")
         return corsPreflight();
     const auth = await verifyGatewayCaller(request, supabase);
     if (!auth.ok) {
-        return _fosStatusJson({ ok: false, error: auth.error }, { status: auth.status });
+        return _fosStatusJson({ ok: false, code: auth.status === 401 ? "invalid_signature" : "gateway_error", error: auth.error }, { status: auth.status });
     }
     let body;
     try {
         body = JSON.parse(auth.rawBody || "{}");
     }
     catch {
-        return _fosStatusJson({ ok: false, error: "Ongeldige JSON-body" }, { status: 400 });
+        return _fosStatusJson({ ok: false, code: "invalid_request", error: "Ongeldige JSON-body", errors: ["Ongeldige JSON-body"] }, { status: 400 });
     }
-    if (body?.environment !== undefined &&
-        body.environment !== "staging" &&
-        body.environment !== "live") {
-        return _fosStatusJson({ ok: false, error: "Ongeldige environment" }, { status: 400 });
+    const parsed = parseStatusRequest(body);
+    if (!parsed.ok) {
+        return _fosStatusJson({ ok: false, code: "invalid_request", error: parsed.errors.join("; "), errors: parsed.errors }, { status: 400 });
     }
-    if (Array.isArray(body?.salesOrderIds)) {
-        try {
+    const req = parsed.value;
+    try {
+        if (req.kind === "overview") {
             const { status, payload } = await runSalesOrderStatusOverview(supabase, {
-                salesOrderIds: body.salesOrderIds,
-                environment: body?.environment,
+                salesOrderIds: req.salesOrderIds,
+                fulfillmentOrderIds: req.fulfillmentOrderIds,
+                refresh: req.refresh,
+                environment: req.environment,
             });
             return _fosStatusJson(payload, { status });
         }
-        catch (e) {
-            return _fosStatusJson({ ok: false, error: String(e?.message ?? e) }, { status: 500 });
-        }
-    }
-    try {
         const { status, payload } = await runFulfillmentOrderStatus(supabase, {
-            fulfillmentOrderId: String(body?.fulfillmentOrderId ?? ""),
-            environment: body?.environment,
+            fulfillmentOrderId: req.fulfillmentOrderId,
+            environment: req.environment,
         });
         return _fosStatusJson(payload, { status });
     }
     catch (e) {
-        return _fosStatusJson({ ok: false, error: String(e?.message ?? e) }, { status: 500 });
+        const msg = String(e?.message ?? e);
+        if (/actieve Floriday-koppeling/i.test(msg)) {
+            return _fosStatusJson({ ok: false, code: "no_active_connection", error: msg }, { status: 409 });
+        }
+        return _fosStatusJson({ ok: false, code: "floriday_unavailable", error: msg }, { status: 502 });
     }
 }

package/dist-lib/lib/gateway/load-carrier-checks.d.ts

@@ -0,0 +1,54 @@
+export type LoadFieldWarning = {
+    code: "defaulted_fields";
+    severity: "warning";
+    cartIndex: number;
+    fields: Array<{
+        field: string;
+        value: unknown;
+        source: "fulfillment_request" | "default";
+    }>;
+    message: string;
+} | {
+    code: "load_carrier_type_mismatch";
+    severity: "warning";
+    cartIndex: number;
+    sent: string;
+    fromAfhandeling: string;
+    typesByRequest: Array<{
+        fulfillmentRequestId: string;
+        loadCarrierType: string;
+    }>;
+    message: string;
+} | {
+    code: "packages_sum_mismatch";
+    severity: "warning";
+    fulfillmentRequestId: string;
+    sum: number;
+    expected: number;
+    message: string;
+};
+/**
+ * Bepaalt het loadCarrierType van één kar. Het type uit de requests is leidend
+ * (eerste request met een bruikbaar type); alleen als geen enkel request er een
+ * heeft, valt het terug op de waarde van Afhandeling.
+ */
+export declare function resolveCartLoadCarrierType(cartIndex: number, afhandelingType: unknown, requests: Array<{
+    fulfillmentRequestId: string;
+    loadCarrier: unknown;
+}>): {
+    loadCarrierType: string;
+    source: "fulfillment_request" | "afhandeling" | "none";
+    warnings: LoadFieldWarning[];
+};
+/** Velden die de module zelf invulde voor één kar. */
+export declare function defaultedFieldsWarning(cartIndex: number, fields: Array<{
+    field: string;
+    value: unknown;
+    source: "fulfillment_request" | "default";
+}>): LoadFieldWarning | null;
+/** Som van numberOfPackages per request over alle karren vergeleken met het request. */
+export declare function packagesSumWarnings(lines: Array<{
+    fulfillmentRequestId: string;
+    numberOfPackages: number;
+}>, expectedById: Map<string, number | null>): LoadFieldWarning[];
+//# sourceMappingURL=load-carrier-checks.d.ts.map

package/dist-lib/lib/gateway/load-carrier-checks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-carrier-checks.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/load-carrier-checks.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IAC5F,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,IAAI,EAAE,4BAA4B,CAAC;IACnC,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,KAAK,CAAC;QAAE,oBAAoB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,QAAQ,EAAE,SAAS,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAON;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,EACxB,QAAQ,EAAE,KAAK,CAAC;IAAE,oBAAoB,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,GACtE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,GAAG,aAAa,GAAG,MAAM,CAAC;IAAC,QAAQ,EAAE,gBAAgB,EAAE,CAAA;CAAE,CA2BnH;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC,GAC1F,gBAAgB,GAAG,IAAI,CASzB;AAED,wFAAwF;AACxF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,KAAK,CAAC;IAAE,oBAAoB,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,CAAC,EACxE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,GACvC,gBAAgB,EAAE,CAiBpB"}

package/dist-lib/lib/gateway/load-carrier-checks.js

@@ -0,0 +1,72 @@
+// Pure afleidregels en waarschuwingen voor de kar-velden van
+// FulfillmentOrderCreate (Suppliers API 2026v1). Geen I/O; getest in
+// tests/load-carrier-checks.test.ts. Waarschuwingen weigeren nooit.
+const usable = (t) => {
+    const s = String(t ?? "").trim();
+    return s && s !== "NONE" ? s : "";
+};
+/**
+ * Bepaalt het loadCarrierType van één kar. Het type uit de requests is leidend
+ * (eerste request met een bruikbaar type); alleen als geen enkel request er een
+ * heeft, valt het terug op de waarde van Afhandeling.
+ */
+export function resolveCartLoadCarrierType(cartIndex, afhandelingType, requests) {
+    const typesByRequest = requests
+        .map((r) => ({ fulfillmentRequestId: r.fulfillmentRequestId, loadCarrierType: usable(r.loadCarrier) }))
+        .filter((r) => r.loadCarrierType);
+    const fromAfh = usable(afhandelingType);
+    const warnings = [];
+    const fromReq = typesByRequest[0]?.loadCarrierType ?? "";
+    const loadCarrierType = fromReq || fromAfh;
+    const source = fromReq ? "fulfillment_request" : fromAfh ? "afhandeling" : "none";
+    const distinct = new Set(typesByRequest.map((t) => t.loadCarrierType));
+    const afhDiffers = !!fromAfh && !!fromReq && [...distinct].some((t) => t !== fromAfh);
+    if (fromReq && (afhDiffers || distinct.size > 1)) {
+        warnings.push({
+            code: "load_carrier_type_mismatch",
+            severity: "warning",
+            cartIndex,
+            sent: loadCarrierType,
+            fromAfhandeling: fromAfh,
+            typesByRequest,
+            message: `Kar ${cartIndex + 1}: verzonden loadCarrierType ${loadCarrierType} (uit request ${typesByRequest[0].fulfillmentRequestId})` +
+                (fromAfh ? `, Afhandeling stuurde ${fromAfh}` : "") +
+                (distinct.size > 1 ? `; requests op deze kar hebben verschillende types: ${typesByRequest.map((t) => `${t.fulfillmentRequestId}=${t.loadCarrierType}`).join(", ")}` : "") +
+                ".",
+        });
+    }
+    return { loadCarrierType, source, warnings };
+}
+/** Velden die de module zelf invulde voor één kar. */
+export function defaultedFieldsWarning(cartIndex, fields) {
+    if (fields.length === 0)
+        return null;
+    return {
+        code: "defaulted_fields",
+        severity: "warning",
+        cartIndex,
+        fields,
+        message: `Kar ${cartIndex + 1}: door de module ingevuld: ${fields.map((f) => `${f.field}=${String(f.value)} (${f.source})`).join(", ")}.`,
+    };
+}
+/** Som van numberOfPackages per request over alle karren vergeleken met het request. */
+export function packagesSumWarnings(lines, expectedById) {
+    const sums = new Map();
+    for (const l of lines)
+        sums.set(l.fulfillmentRequestId, (sums.get(l.fulfillmentRequestId) ?? 0) + l.numberOfPackages);
+    const out = [];
+    for (const [id, sum] of sums) {
+        const expected = expectedById.get(id);
+        if (expected == null || expected === sum)
+            continue;
+        out.push({
+            code: "packages_sum_mismatch",
+            severity: "warning",
+            fulfillmentRequestId: id,
+            sum,
+            expected,
+            message: `fulfillmentRequest ${id}: ${sum} pakketten over alle karren, request heeft ${expected}.`,
+        });
+    }
+    return out;
+}

package/dist-lib/lib/module-version.d.ts

@@ -0,0 +1,2 @@
+export declare const MODULE_VERSION = "1.0.71";
+//# sourceMappingURL=module-version.d.ts.map

package/dist-lib/lib/module-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-version.d.ts","sourceRoot":"","sources":["../../src/lib/module-version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,WAAW,CAAC"}

package/dist-lib/lib/module-version.js

@@ -0,0 +1,3 @@
+// Versie van dit pakket, meegegeven in gateway-antwoorden (moduleVersion).
+// Moet gelijk zijn aan "version" in package.json; tests/module-version.test.ts bewaakt dat.
+export const MODULE_VERSION = "1.0.71";