@flowselections/floriday-afhandeling-module 1.0.42 → 1.0.43

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

@@ -26,7 +26,39 @@ async function loadControlCarts(supabase) {
     const { data, error } = await supabase.rpc("control_get_todays_carts");
     if (error)
         throw new Error(error.message);
-    const rows = (data ?? []);
+    const allRows = (data ?? []);
+    if (allRows.length === 0)
+        return [];
+    // Alleen orders die de Verkoop-module kent mogen zichtbaar zijn.
+    const candidateIds = Array.from(new Set(allRows.map((r) => r.order_id).filter(Boolean)));
+    const candidateNumbers = Array.from(new Set(allRows.map((r) => r.order_number).filter((v) => !!v)));
+    const knownIds = new Set();
+    const knownNumbers = new Set();
+    if (candidateIds.length > 0) {
+        const { data: byId } = await supabase
+            .from("orders")
+            .select("id, order_number")
+            .is("deleted_at", null)
+            .in("id", candidateIds);
+        for (const o of (byId ?? [])) {
+            knownIds.add(o.id);
+            if (o.order_number)
+                knownNumbers.add(o.order_number);
+        }
+    }
+    if (candidateNumbers.length > 0) {
+        const { data: byNumber } = await supabase
+            .from("orders")
+            .select("id, order_number")
+            .is("deleted_at", null)
+            .in("order_number", candidateNumbers);
+        for (const o of (byNumber ?? [])) {
+            knownIds.add(o.id);
+            if (o.order_number)
+                knownNumbers.add(o.order_number);
+        }
+    }
+    const rows = allRows.filter((r) => knownIds.has(r.order_id) || (r.order_number ? knownNumbers.has(r.order_number) : false));
     if (rows.length === 0)
         return [];
     // --- Verrijking 1: ordergegevens ---
@@ -65,6 +97,42 @@ async function loadControlCarts(supabase) {
     catch {
         // Verrijking is optioneel: zonder deze gegevens blijft de kar zichtbaar.
     }
+    // --- Verrijking 3: totaal aantal karren per order uit de gedeelde karindex ---
+    // De karindex van de Engine is de enige bron voor "hoeveel karren heeft deze
+    // order". Lukt dat niet, dan valt het totaal terug op de karren die we hier
+    // zien (nooit een verzonnen getal).
+    const totalsByOrder = new Map();
+    try {
+        const pickDates = rows.map((r) => r.pick_date).filter(Boolean).sort();
+        if (pickDates.length > 0) {
+            const { data: idx } = await supabase.rpc("logistics_cart_index", {
+                p_from: pickDates[0],
+                p_to: pickDates[pickDates.length - 1],
+            });
+            const perRef = new Map();
+            for (const row of (Array.isArray(idx) ? idx : [])) {
+                if (!row.cart_id)
+                    continue;
+                for (const ref of [row.order_uuid, row.order_number]) {
+                    if (!ref)
+                        continue;
+                    const set = perRef.get(ref) ?? new Set();
+                    set.add(row.cart_id);
+                    perRef.set(ref, set);
+                }
+            }
+            for (const [ref, set] of perRef)
+                totalsByOrder.set(ref, set.size);
+        }
+    }
+    catch {
+        // Zonder karindex vallen we terug op de karren in deze lijst.
+    }
+    const fallbackTotals = new Map();
+    for (const r of rows) {
+        const cur = fallbackTotals.get(r.order_id) ?? 0;
+        fallbackTotals.set(r.order_id, Math.max(cur, r.cart_index));
+    }
     const carts = [];
     const seen = new Set();
     for (const r of rows) {
@@ -82,14 +150,20 @@ async function loadControlCarts(supabase) {
         const order = orderMap.get(r.order_id);
         const extra = extras.get(`${r.order_id}#${r.cart_index}`) ??
             extras.get(`${r.order_id}#${r.cart_index - 1}`);
-        const orderNumber = order?.orderNumber ?? "";
+        const orderNumber = r.order_number ?? order?.orderNumber ?? "";
         const orderNumbers = Array.from(new Set([orderNumber, ...(extra?.orderNumbers ?? [])].filter(Boolean)));
+        const cartTotal = totalsByOrder.get(r.order_id) ??
+            (orderNumber ? totalsByOrder.get(orderNumber) : undefined) ??
+            fallbackTotals.get(r.order_id) ??
+            null;
         carts.push({
             cartNumberId,
             cartNumber: r.cart_number ?? extra?.cartNumber ?? null,
             orderId: r.order_id,
             orderSource,
             cartIndex: r.cart_index,
+            cartSeq: r.cart_index,
+            cartTotal,
             orderNumber,
             orderNumbers,
             customerName: order?.customerName ?? "",
@@ -195,6 +269,7 @@ export const submitControlSession = createServerFn({ method: "POST" })
     const checkedSet = new Set(data.checkedCartKeys);
     const confirmedRescheduleSet = new Set(data.confirmedRescheduleCartKeys ?? []);
     const items = [];
+    const deliveredPayload = [];
     const rescheduled = [];
     const blocked = [];
     let checkedCount = 0;
@@ -215,12 +290,14 @@ export const submitControlSession = createServerFn({ method: "POST" })
             pickup_date: o.pickupDate,
         };
         if (checkedSet.has(key)) {
-            // Aangevinkt → status naar 'ready' (klaar voor transport)
-            await supabase.rpc("pickstation_set_cart_status", {
-                p_order_source: o.orderSource,
-                p_order_id: o.orderId,
-                p_cart_index: o.cartIndex,
-                p_status: "ready",
+            // De controleregel is leidend voor Engine-karren. Werk daarnaast de
+            // verouderde cart_numbers-status bij wanneer die bron dit ondersteunt.
+            deliveredPayload.push({
+                order_id: o.orderId,
+                order_source: o.orderSource,
+                cart_index: o.cartIndex,
+                cart_number: o.cartNumber,
+                pick_date: o.pickDate || toIso(new Date()),
             });
             items.push({ ...baseFields, action: "checked" });
             checkedCount++;
@@ -284,11 +361,22 @@ export const submitControlSession = createServerFn({ method: "POST" })
             });
         }
     }
+    // Afgevinkte karren krijgen de status 'afgeleverd' met het moment van controle,
+    // zodat andere modules alleen de karren van vandaag als afgeleverd tonen.
+    if (deliveredPayload.length > 0) {
+        const { error: deliveredError } = await supabase.rpc("control_mark_carts_delivered", {
+            p_carts: deliveredPayload,
+        });
+        if (deliveredError)
+            throw new Error(deliveredError.message);
+    }
     if (items.length > 0) {
-        await supabase.from("cart_control_items").insert(items);
+        const { error: itemsError } = await supabase.from("cart_control_items").insert(items);
+        if (itemsError)
+            throw new Error(itemsError.message);
     }
     // Update sessie-aantallen
-    await supabase
+    const { error: sessionUpdateError } = await supabase
         .from("cart_control_sessions")
         .update({
         checked_count: checkedCount,
@@ -296,6 +384,8 @@ export const submitControlSession = createServerFn({ method: "POST" })
         blocked_count: blocked.length,
     })
         .eq("id", session.id);
+    if (sessionUpdateError)
+        throw new Error(sessionUpdateError.message);
     // Kritieke melding aanmaken of oplossen
     const alertKey = `cart_not_rescheduled:${toIso(new Date())}`;
     if (blocked.length > 0) {
@@ -545,3 +635,37 @@ export const clearControlDraft = createServerFn({ method: "POST" })
         throw new Error(error.message);
     return { ok: true };
 });
+/**
+ * Karren die vandaag zijn gecontroleerd en daarmee op 'afgeleverd' staan.
+ * Vanaf de volgende dag is deze lijst weer leeg; oudere controles staan in de historie.
+ */
+export const listDeliveredToday = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const today = toIso(new Date());
+    const { data: sessions, error: sessErr } = await supabase
+        .from("cart_control_sessions")
+        .select("id")
+        .eq("user_id", context.userId)
+        .eq("control_date", today);
+    if (sessErr)
+        throw new Error(sessErr.message);
+    const sessionIds = (sessions ?? []).map((s) => s.id);
+    if (sessionIds.length === 0)
+        return { carts: [] };
+    const { data, error } = await supabase
+        .from("cart_control_items")
+        .select("cart_number_label, order_number, created_at")
+        .in("session_id", sessionIds)
+        .eq("action", "checked")
+        .order("order_number", { ascending: true });
+    if (error)
+        throw new Error(error.message);
+    const carts = (data ?? []).map((r) => ({
+        cartNumberLabel: r.cart_number_label ?? null,
+        orderNumber: r.order_number ?? null,
+        deliveredAt: r.created_at,
+    }));
+    return { carts };
+});