@flowselections/floriday-afhandeling-module 1.0.50 → 1.0.54

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

@@ -40,18 +40,17 @@ async function buildLoading(supabase, orderRef) {
         throw new Error("Geen order opgegeven.");
     const blockers = [];
     const loadOrder = async (ref) => {
-        const { data: row, error } = await supabase
-            .from("orders")
-            .select("id, order_number, order_source, custom_fields")
-            .or(`order_number.eq."${ref.replace(/"/g, "")}"${/^[0-9a-f-]{36}$/i.test(ref) ? `,id.eq.${ref}` : ""}`)
-            .maybeSingle();
+        const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(ref);
+        const q = supabase.from("orders").select("id, order_number, order_source, custom_fields, buffer_id").is("deleted_at", null);
+        const { data: row, error } = await (isUuid ? q.eq("id", ref) : q.eq("order_number", ref)).maybeSingle();
         if (error)
             throw new Error(error.message);
         return row;
     };
     const coverage = new Map();
     const queue = [orderRef];
-    while (queue.length && coverage.size < 50) {
+    const bufferIds = new Set();
+    while (queue.length && coverage.size < 200) {
         const ref = queue.shift();
         const o = await loadOrder(ref);
         if (!o) {
@@ -66,13 +65,28 @@ async function buildLoading(supabase, orderRef) {
         const cf = o.custom_fields ?? {};
         const soId = typeof cf.floriday_sales_order_id === "string" ? cf.floriday_sales_order_id
             : typeof cf.salesOrderId === "string" ? cf.salesOrderId : null;
-        coverage.set(o.id, { ref: o.order_number ?? o.id, source: o.order_source, salesOrderId: soId, cov: cov ?? {} });
-        for (const k of arr(cov?.carts))
+        coverage.set(o.id, { ref: o.order_number ?? o.id, source: o.order_source, salesOrderId: soId, cov: cov ?? {}, bufferId: o.buffer_id });
+        // Andere orders op dezelfde (gedeelde) kar.
+        for (const k of arr(cov?.carts)) {
+            for (const id of arr(k?.orderIds))
+                if (typeof id === "string" && !coverage.has(id))
+                    queue.push(id);
             for (const r of arr(k?.orderRefs)) {
                 const s2 = String(r);
                 if (![...coverage.values()].some((c) => c.ref === s2))
                     queue.push(s2);
             }
+        }
+        // Alle orders van dezelfde buffer (koppeling op buffer-id van de Engine).
+        if (o.buffer_id && !bufferIds.has(o.buffer_id)) {
+            bufferIds.add(o.buffer_id);
+            const { data: sib, error: sErr } = await supabase.from("orders").select("id").eq("buffer_id", o.buffer_id).is("deleted_at", null);
+            if (sErr)
+                throw new Error(sErr.message);
+            for (const s of sib ?? [])
+                if (!coverage.has(s.id))
+                    queue.push(s.id);
+        }
     }
     // Gecontroleerd = elke kar van de order is bij de controlebalie afgemeld (scan of "Controle uitvoeren").
     const orderIds = [...coverage.keys()].sort();
@@ -88,14 +102,21 @@ async function buildLoading(supabase, orderRef) {
         for (const r of sc ?? [])
             approvedCarts.add(r.cart_id);
     }
+    // Vaste sleutel voor de opdracht: één buffer → buffer-id, anders de gesorteerde order-id's.
+    // Deterministisch: dubbele klik of herhaling geeft dezelfde fulfillmentOrderId.
+    const bufs = [...new Set([...coverage.values()].map((c) => c.bufferId))];
+    const foKey = bufs.length === 1 && bufs[0] ? `buffer:${bufs[0]}` : orderIds.join("|");
+    const baseFo = orderIds.length ? (await ensureIds(supabase, "fulfillment_order", [foKey])).get(foKey) : null;
     // Statusoverzicht van Floriday-authenticatie: fulfillmentRequestId + deliveryOrderId per order.
     const soIds = [...coverage.values()].map((c) => c.salesOrderId).filter((x) => !!x);
     let status = new Map();
+    let statusFailed = false;
     try {
         const { fetchFulfillmentStatus } = await import("./floridayFulfillmentSend.server");
-        status = await fetchFulfillmentStatus(soIds);
+        status = await fetchFulfillmentStatus(soIds, baseFo ? [baseFo] : []);
     }
     catch (e) {
+        statusFailed = true;
         blockers.push(e instanceof Error ? e.message : "Statusoverzicht ophalen mislukt.");
     }
     // Oude auto-verwerking: laatste logregel per order.
@@ -126,20 +147,22 @@ async function buildLoading(supabase, orderRef) {
         });
         if (!salesOrderId)
             blockers.push(`Order ${ref} heeft geen Floriday-verkooporder.`);
-        if (cov.pickStatus !== "gepickt")
-            blockers.push(`Order ${ref} is nog niet gepickt.`);
+        // "Gepickt" = alle karren goedgekeurd op de Scan-controle (logistics_control_scan.approved_at).
         if (!cartsTotal)
             blockers.push(`Order ${ref} heeft geen karindeling.`);
         else if (!controlled)
             blockers.push(`Order ${ref}: ${done} van ${cartsTotal} karren goedgekeurd op de Scan-controle.`);
-        if (salesOrderId && !st)
-            blockers.push(`Order ${ref} staat niet in het statusoverzicht van Floriday.`);
-        if (st && !st.found)
-            blockers.push(`Order ${ref} is niet gevonden in Floriday.`);
-        if (st && st.found && fr.length !== 1)
-            blockers.push(`Order ${ref}: ${fr.length === 0 ? "geen" : "meerdere"} fulfillmentRequest in het statusoverzicht.`);
-        if (fr.length === 1 && !fr[0].deliveryOrderId)
-            blockers.push(`Order ${ref}: nog geen levering (deliveryOrderId) in het statusoverzicht.`);
+        // Bij een mislukt statusoverzicht geen gevolgfouten per order tonen.
+        if (!statusFailed) {
+            if (salesOrderId && !st)
+                blockers.push(`Order ${ref} staat niet in het statusoverzicht van Floriday.`);
+            if (st && !st.found)
+                blockers.push(`Order ${ref} is niet gevonden in Floriday.`);
+            if (st && st.found && fr.length !== 1)
+                blockers.push(`Order ${ref}: ${fr.length === 0 ? "geen" : "meerdere"} fulfillmentRequest in het statusoverzicht.`);
+            if (fr.length === 1 && !fr[0].deliveryOrderId)
+                blockers.push(`Order ${ref}: nog geen levering (deliveryOrderId) in het statusoverzicht.`);
+        }
         if (auto && (AUTO_ALREADY_SENT.has(auto.status) || auto.fo))
             blockers.push(`Order ${ref} is al via de oude auto-verwerking verstuurd (${auto.status}); niet nogmaals versturen.`);
     }
@@ -170,8 +193,7 @@ async function buildLoading(supabase, orderRef) {
         if (new Set(c.lines.map((l) => l.dl ?? "")).size > 1)
             blockers.push(`Kar ${c.label} bevat orders van verschillende leveringen; één kar kan maar in één opdracht.`);
     }
-    // Opdrachten per levering. Eén levering → sleutel = orders (ongewijzigd t.o.v. eerdere versie).
-    const foKey = orderIds.join("|");
+    // Opdrachten per levering. Eén levering → de vaste sleutel van de order of buffer.
     const deliveries = [...new Set(orders.map((o) => o.deliveryOrderId ?? ""))];
     const shipKey = (dl) => (deliveries.length <= 1 ? foKey : `${foKey}|${dl}`);
     const [foIds, lcIds, itemIds] = await Promise.all([
@@ -183,6 +205,7 @@ async function buildLoading(supabase, orderRef) {
         loadCarrierReference: lcIds.get(ck),
         cartLabel: c.label,
         sortIndex: i + 1,
+        additionalLayers: c.layers,
         shared: c.shared || new Set(c.lines.map((l) => l.orderId)).size > 1,
         items: c.lines.map((l, j) => ({
             loadCarrierItemId: itemIds.get(`${ck}|${l.orderId}|${l.key}`),
@@ -210,8 +233,11 @@ async function buildLoading(supabase, orderRef) {
             })(),
         };
     }) : [];
-    if (allLines.some((l) => !l.frId))
-        blockers.push("Niet elke regel heeft een fulfillmentRequestId.");
+    if (!statusFailed) {
+        for (const ref of new Set(allLines.filter((l) => !l.frId).map((l) => l.ref))) {
+            blockers.push(`Order ${ref}: nog geen fulfillmentRequestId van Floriday.`);
+        }
+    }
     let lastAttempts = [];
     if (shipments.length) {
         const { data: at } = await supabase.from("floriday_loading_attempts")
@@ -273,6 +299,8 @@ export const sendFloridayLoading = createServerFn({ method: "POST" })
             loadCarriers: s.carriers.map((c) => ({
                 loadCarrierReference: c.loadCarrierReference,
                 sortIndex: c.sortIndex,
+                // Floriday 2026v1 AddLoadCarrierConfiguration: alleen meesturen als de Engine het kent.
+                ...(c.additionalLayers != null ? { numberOfAdditionalLayers: c.additionalLayers } : {}),
                 items: c.items.map((it) => ({
                     fulfillmentRequestId: it.fulfillmentRequestId,
                     loadCarrierItemId: it.loadCarrierItemId,
@@ -298,7 +326,7 @@ export const sendFloridayLoading = createServerFn({ method: "POST" })
         const code = String(body?.code ?? (httpStatus && httpStatus < 400 ? "ok" : `http_${httpStatus}`));
         const accepted = httpStatus === 200 && body?.ok === true && ACCEPTED.has(code);
         const message = accepted ? (code === "created" ? "Belading verstuurd, verzendbrief volgt via de Engine." : "Belading was al verstuurd (niets dubbel aangemaakt), verzendbrief volgt via de Engine.")
-            : arr(body?.errors).map((e) => (typeof e === "string" ? e : e?.message ?? JSON.stringify(e))).join("; ") || body?.message || code;
+            : [typeof body?.error === "string" ? body.error : null, ...arr(body?.errors).map((e) => (typeof e === "string" ? e : e?.message ?? JSON.stringify(e)))].filter(Boolean).join("; ") || body?.message || code;
         await log(s, {
             step: "send", http_status: httpStatus, code, message,
             warnings: arr(body?.warnings), skipped_requests: arr(body?.skippedRequests), request_summary: summary,

package/dist-lib/lib/logisticsEngine/capacity.js

@@ -1,4 +1,4 @@
-import { supabase } from "../../integrations/supabase/moduleClient";
+import { supabase } from "../../integrations/supabase/moduleClient.js";
 function num(v) {
     const n = typeof v === "string" ? Number(v) : typeof v === "number" ? v : NaN;
     return Number.isFinite(n) ? n : 0;

package/dist-lib/lib/logisticsEngine/staffPlanning.js

@@ -1,4 +1,4 @@
-import { supabase } from "../../integrations/supabase/moduleClient";
+import { supabase } from "../../integrations/supabase/moduleClient.js";
 import { SOURCE_MODULE } from "./engine";
 export function toDateKey(d) {
     const m = String(d.getMonth() + 1).padStart(2, "0");

package/dist-lib/lib/orderFulfilment.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orderFulfilment.functions.d.ts","sourceRoot":"","sources":["../../src/lib/orderFulfilment.functions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,qBAAqB;IACpC,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;8CAEH,qBAAqB;;mCAsB3C,CAAC"}
+{"version":3,"file":"orderFulfilment.functions.d.ts","sourceRoot":"","sources":["../../src/lib/orderFulfilment.functions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,qBAAqB;IACpC,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;8CAEH,qBAAqB;;mCAoC3C,CAAC"}

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

@@ -17,6 +17,23 @@ export const markOrderShipped = createServerFn({ method: "POST" })
 })
     .handler(async ({ data, context }) => {
     const { supabase } = context;
+    // Floriday-orders: "Verzonden" pas nadat Floriday de belading heeft geaccepteerd.
+    const { data: ord, error: oErr } = await supabase
+        .from("orders").select("id, order_source").eq("order_number", data.orderRef).is("deleted_at", null).maybeSingle();
+    if (oErr)
+        throw new Error(oErr.message);
+    if (!ord)
+        throw new Error(`Bestelling ${data.orderRef} niet gevonden in de orderadministratie.`);
+    if (ord.order_source === "floriday") {
+        const { data: acc, error: aErr } = await supabase
+            .from("floriday_loading_attempts").select("id")
+            .contains("order_refs", [data.orderRef]).in("code", ["created", "already_fulfilled"]).limit(1);
+        if (aErr)
+            throw new Error(aErr.message);
+        if (!acc?.length) {
+            throw new Error(`${data.orderRef}: nog niet door Floriday geaccepteerd. Verstuur eerst de belading met "Nu versturen".`);
+        }
+    }
     const { data: rows, error } = await supabase
         .from("orders")
         .update({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-afhandeling-module",
-  "version": "1.0.50",
+  "version": "1.0.54",
   "private": false,
   "sideEffects": false,
   "type": "module",