@flowselections/floriday-afhandeling-module 1.0.42 → 1.0.43

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

@@ -1,83 +1,6 @@
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { normalizeOrderNumber } from "./orderRefs";
-function pickStr(r, ...keys) {
-    if (!r)
-        return null;
-    for (const k of keys) {
-        const v = r[k];
-        if (typeof v === "string" && v.length > 0)
-            return v;
-    }
-    return null;
-}
-function pickDeliveryDate(raw) {
-    const delivery = raw.delivery;
-    const candidates = [
-        delivery?.latestDeliveryDateTime,
-        raw.deliveryDate,
-        raw.requestedDeliveryDate,
-        raw.expectedDeliveryDate,
-        raw.loadingDateTime,
-        raw.deliveryDateTime,
-    ];
-    const found = candidates.find((v) => typeof v === "string" && v);
-    return found ?? null;
-}
-function pickAddress(raw) {
-    const buyer = raw.buyer;
-    const customer = raw.customer;
-    const delivery = raw.delivery;
-    const addr = raw.deliveryAddress ??
-        raw.shipTo ??
-        delivery?.address ??
-        buyer?.address ??
-        customer?.address;
-    return {
-        country: pickStr(addr, "countryCode", "country") ?? pickStr(raw, "deliveryCountry", "countryCode"),
-        province: pickStr(addr, "province", "state", "region"),
-        city: pickStr(addr, "city", "locality"),
-    };
-}
-function pickDeliveryType(raw) {
-    const delivery = raw.delivery;
-    return (raw.tradeInstrument ??
-        delivery?.incoterm ??
-        raw.deliveryType ??
-        "—");
-}
-function pickTotal(raw) {
-    const calc = raw.calculatedFields;
-    const orderAmount = calc?.orderAmount;
-    if (orderAmount && typeof orderAmount.value === "number") {
-        return { amount: orderAmount.value, currency: orderAmount.currency ?? null };
-    }
-    const ppp = raw.pricePerPiece;
-    const pieces = typeof raw.numberOfPieces === "number" ? raw.numberOfPieces : null;
-    if (ppp && typeof ppp.value === "number" && pieces !== null) {
-        return { amount: ppp.value * pieces, currency: ppp.currency ?? null };
-    }
-    return { amount: null, currency: null };
-}
-async function getActiveConnectionId(supabase) {
-    const { data: settings } = await supabase
-        .from("floriday_settings")
-        .select("active_environment")
-        .eq("id", 1)
-        .maybeSingle();
-    const env = settings?.active_environment ?? null;
-    let q = supabase
-        .from("floriday_connections")
-        .select("id")
-        .eq("is_active", true)
-        .order("updated_at", { ascending: false })
-        .limit(1);
-    if (env)
-        q = q.eq("environment", env);
-    const { data: conn } = await q.maybeSingle();
-    return conn?.id ?? null;
-}
-const DELIVERY_PATH = "data->delivery->>latestDeliveryDateTime";
+import { isVisibleOrderStatus } from "./orderStatus";
 function dayKey(d) {
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
 }
@@ -88,28 +11,26 @@ function defaultRange() {
     return { from: dayKey(from), to: dayKey(to) };
 }
 /** Eerste leverdatum ná het venster, anders de laatste ervóór. Voor auto-jump. */
-async function findNearestDeliveryDate(supabase, connectionId, range) {
-    const base = () => {
-        let q = supabase
-            .from("floriday_salesorders_cache")
-            .select("dd:data->delivery->>latestDeliveryDateTime")
-            .eq("is_deleted", false)
-            .limit(1);
-        if (connectionId)
-            q = q.eq("connection_id", connectionId);
-        return q;
-    };
+async function findNearestDeliveryDate(supabase, range) {
     try {
-        const { data: next } = await base()
-            .gt(DELIVERY_PATH, `${range.to}T23:59:59Z`)
-            .order(DELIVERY_PATH, { ascending: true });
-        const nextDate = next?.[0]?.dd;
+        const { data: next } = await supabase
+            .from("orders")
+            .select("delivery_date")
+            .is("deleted_at", null)
+            .gt("delivery_date", range.to)
+            .order("delivery_date", { ascending: true })
+            .limit(1);
+        const nextDate = next?.[0]?.delivery_date;
         if (nextDate)
             return nextDate;
-        const { data: prev } = await base()
-            .lt(DELIVERY_PATH, `${range.from}T00:00:00Z`)
-            .order(DELIVERY_PATH, { ascending: false });
-        return prev?.[0]?.dd ?? null;
+        const { data: prev } = await supabase
+            .from("orders")
+            .select("delivery_date")
+            .is("deleted_at", null)
+            .lt("delivery_date", range.from)
+            .order("delivery_date", { ascending: false })
+            .limit(1);
+        return prev?.[0]?.delivery_date ?? null;
     }
     catch (e) {
         console.warn("[planning-orders] nearest delivery date lookup failed", {
@@ -118,6 +39,12 @@ async function findNearestDeliveryDate(supabase, connectionId, range) {
         return null;
     }
 }
+/**
+ * Orders van deze module. De orderadministratie van de Verkoop-module
+ * (public.orders) is de ENIGE bron: staat een order daar niet in, dan wordt hij
+ * hier ook niet getoond. De ruwe Floriday-ordercache wordt alleen nog gebruikt
+ * om extra gegevens (stickers) op te zoeken bij orders die al bestaan.
+ */
 export const getFloridayOrders = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .inputValidator((input) => input ?? {})
@@ -133,199 +60,29 @@ export const getFloridayOrders = createServerFn({ method: "GET" })
         at: new Date().toISOString(),
         userId: context.userId,
         range,
-        sources: ["floriday_salesorders_cache", "orders"],
+        sources: ["orders"],
     });
-    const connectionId = await getActiveConnectionId(supabase);
-    let ordersQuery = supabase
-        .from("floriday_salesorders_cache")
-        .select("floriday_id, status, buyer_organization_id, data, updated_at")
-        .eq("is_deleted", false)
-        .gte(DELIVERY_PATH, `${range.from}T00:00:00Z`)
-        .lte(DELIVERY_PATH, `${range.to}T23:59:59Z`)
-        .order(DELIVERY_PATH, { ascending: true })
-        .limit(1500);
-    if (connectionId)
-        ordersQuery = ordersQuery.eq("connection_id", connectionId);
-    const { data: rows, error } = await ordersQuery;
-    if (error) {
-        console.error("[planning-orders] floriday cache query failed", {
-            message: error.message,
-            code: error.code,
-            details: error.details,
-            connectionId,
-        });
-        throw new Error(`Kon Floriday-orders niet laden: ${error.message}`);
-    }
-    // Sommige rijen hebben de kolom buyer_organization_id (nog) niet gevuld
-    // terwijl de JSON `customerOrganizationId` wel bevat. Vul lokaal aan zodat
-    // deze orders óók een klantnaam krijgen en gewoon meegepland worden.
-    const buyerOrgByFloridayId = new Map();
-    for (const r of rows ?? []) {
-        const fid = r.floriday_id ?? undefined;
-        if (!fid)
-            continue;
-        const fromCol = r.buyer_organization_id ?? null;
-        const data = (r.data ?? {});
-        const fromData = data.customerOrganizationId ??
-            data.buyerOrganizationId ??
-            null;
-        const org = fromCol ?? fromData;
-        if (org)
-            buyerOrgByFloridayId.set(fid, org);
-    }
-    const buyerIds = Array.from(new Set(Array.from(buyerOrgByFloridayId.values())));
-    const nameByOrgId = new Map();
-    if (buyerIds.length > 0) {
-        // Via de geïndexeerde kolom organization_id; het JSON-pad (data->>'organizationId')
-        // dwingt een seq scan over ~24k rijen af en kost seconden.
-        const CHUNK = 200;
-        for (let i = 0; i < buyerIds.length; i += CHUNK) {
-            const { data: customers, error: custErr } = await supabase
-                .from("floriday_customers_cache")
-                .select("organization_id, data")
-                .in("organization_id", buyerIds.slice(i, i + CHUNK));
-            if (custErr) {
-                console.warn("[planning-orders] customer lookup failed", { message: custErr.message });
-                break;
-            }
-            for (const c of customers ?? []) {
-                const d = (c.data ?? {});
-                const orgId = c.organization_id ??
-                    d.organizationId ??
-                    null;
-                const name = d.commercialName ??
-                    d.name ??
-                    d.company_name ??
-                    d.commercial_name;
-                if (orgId && name)
-                    nameByOrgId.set(orgId, name);
-            }
-        }
-    }
-    // Reserve/lookup interne FO-nummers voor alle Floriday-orders (centrale teller).
-    // Eerst bestaande mapping ophalen; alleen voor onbekende IDs de RPC aanroepen
-    // (die per ID een insert/counter-update doet en anders een statement timeout geeft).
-    const floridayIds = (rows ?? [])
-        .map((r) => r.floriday_id ?? null)
-        .filter((v) => !!v);
-    const foNumberById = new Map();
-    if (floridayIds.length > 0) {
-        const { data: existing, error: existErr } = await supabase
-            .from("floriday_order_number_map")
-            .select("floriday_id, order_number")
-            .in("floriday_id", floridayIds);
-        if (existErr) {
-            console.warn("[planning-orders] floriday_order_number_map lookup failed", {
-                message: existErr.message,
-            });
-        }
-        else {
-            for (const m of (existing ?? [])) {
-                foNumberById.set(m.floriday_id, m.order_number);
-            }
-        }
-        const missing = floridayIds.filter((id) => !foNumberById.has(id));
-        if (missing.length > 0) {
-            const { data: mapped, error: mapErr } = await supabase.rpc("assign_floriday_order_numbers", { p_ids: missing });
-            if (mapErr) {
-                console.warn("[planning-orders] assign_floriday_order_numbers failed", {
-                    message: mapErr.message,
-                    missingCount: missing.length,
-                });
-            }
-            else {
-                for (const m of (mapped ?? [])) {
-                    foNumberById.set(m.floriday_id, m.order_number);
-                }
-            }
-        }
-    }
-    // Bepaal welke Floriday-orders klant-stickers hebben.
-    const stickerOrderIds = new Set();
-    if (floridayIds.length > 0) {
-        const { data: stickerRows, error: stickerErr } = await supabase
-            .from("floriday_customer_stickers_cache")
-            .select("sales_order_id, quantity, is_deleted")
-            .in("sales_order_id", floridayIds)
-            .eq("is_deleted", false);
-        if (stickerErr) {
-            console.warn("[planning-orders] sticker lookup failed", {
-                message: stickerErr.message,
-            });
-        }
-        else {
-            for (const s of stickerRows ?? []) {
-                const soId = s.sales_order_id ?? null;
-                const qty = Number(s.quantity ?? 1);
-                if (soId && (!Number.isFinite(qty) || qty > 0))
-                    stickerOrderIds.add(soId);
-            }
-        }
-    }
-    const orders = (rows ?? []).map((row) => {
-        const r = (row.data ?? {});
-        const total = pickTotal(r);
-        const floridayId = row.floriday_id ??
-            r.salesOrderId ??
-            crypto.randomUUID();
-        const orgId = buyerOrgByFloridayId.get(floridayId) ?? null;
-        const fallbackNumber = pickStr(r, "customerOrderId", "salesChannelOrderId", "salesOrderNumber") ?? "—";
-        // cartCount uit packingConfiguration afleiden zodat Floriday-orders
-        // niet standaard op 1 kar blijven staan.
-        let cartCount = null;
-        let plantCount = null;
-        const pieces = typeof r.numberOfPieces === "number" ? r.numberOfPieces : null;
-        if (pieces != null && Number.isFinite(pieces) && pieces > 0) {
-            plantCount = pieces;
-            const pkg = (r.packingConfiguration ?? {});
-            const perPkg = Number(pkg.piecesPerPackage ?? 0);
-            const pkgsPerLayer = Number(pkg.packagesPerLayer ?? 0);
-            const layers = Number(pkg.layersPerLoadCarrier ?? 0);
-            const perCart = perPkg > 0 && pkgsPerLayer > 0 && layers > 0
-                ? perPkg * pkgsPerLayer * layers
-                : 0;
-            if (perCart > 0)
-                cartCount = Math.max(1, Math.ceil(pieces / perCart));
-        }
-        return {
-            id: floridayId,
-            source: "floriday",
-            orderNumber: foNumberById.get(floridayId) ?? fallbackNumber,
-            customerName: (orgId && nameByOrgId.get(orgId)) || "—",
-            deliveryDate: pickDeliveryDate(r),
-            deliveryType: pickDeliveryType(r),
-            status: row.status ?? r.status ?? "—",
-            lineCount: 1,
-            cartCount,
-            plantCount,
-            totalAmount: total.amount,
-            currency: total.currency,
-            createdAt: pickStr(r, "creationDateTime", "orderDateTime", "createDateTime") ?? null,
-            hasStickers: stickerOrderIds.has(floridayId),
-            salesOrderId: floridayId,
-        };
-    });
-    // Ook handmatige / mailbox-orders uit public.orders meenemen — alleen
-    // binnen hetzelfde leverdatumvenster.
-    const { data: manualRows, error: manualError } = await supabase
+    const { data: orderRows, error: ordersError } = await supabase
         .from("orders")
         .select("id, order_number, customer_name, customer_id, delivery_date, status, total, created_at, custom_fields, order_items(id, quantity, products(plants_per_crate, crates_per_layer, layers_per_cart))")
         .is("deleted_at", null)
         .gte("delivery_date", range.from)
         .lte("delivery_date", range.to)
         .order("delivery_date", { ascending: true })
-        .limit(1000);
-    let partialError;
-    if (manualError) {
-        partialError = `Handmatige orders konden niet geladen worden: ${manualError.message}`;
-        console.error("[planning-orders] manual orders query failed", {
-            message: manualError.message,
-            code: manualError.code,
-            details: manualError.details,
+        .limit(2000);
+    if (ordersError) {
+        console.error("[planning-orders] orders query failed", {
+            message: ordersError.message,
+            code: ordersError.code,
+            details: ordersError.details,
         });
+        throw new Error(`Kon orders niet laden: ${ordersError.message}`);
     }
-    const manualCustomerIds = Array.from(new Set((manualRows ?? []).map((row) => row.customer_id).filter((v) => !!v)));
-    const manualDeliveryLocationIds = Array.from(new Set((manualRows ?? [])
+    // Orders die in de Verkoop-module open of net afgehandeld zijn, blijven
+    // zichtbaar; geannuleerde/vervallen/concept/gereserveerde orders niet.
+    const rows = (orderRows ?? []).filter((row) => isVisibleOrderStatus(row.status));
+    const customerIds = Array.from(new Set(rows.map((row) => row.customer_id).filter((v) => !!v)));
+    const deliveryLocationIds = Array.from(new Set(rows
         .map((row) => {
         const fields = (row.custom_fields ?? {});
         const id = fields.delivery_location;
@@ -333,21 +90,21 @@ export const getFloridayOrders = createServerFn({ method: "GET" })
     })
         .filter((v) => !!v)));
     const customerCountryById = new Map();
-    if (manualCustomerIds.length > 0) {
+    if (customerIds.length > 0) {
         const { data: customers } = await supabase
             .from("customers")
             .select("id, country")
-            .in("id", manualCustomerIds);
+            .in("id", customerIds);
         for (const c of customers ?? []) {
             customerCountryById.set(c.id, c.country ?? null);
         }
     }
     const deliveryLocationById = new Map();
-    if (manualDeliveryLocationIds.length > 0) {
+    if (deliveryLocationIds.length > 0) {
         const { data: locations } = await supabase
             .from("customer_delivery_locations")
             .select("id, country, province, city")
-            .in("id", manualDeliveryLocationIds);
+            .in("id", deliveryLocationIds);
         for (const loc of locations ?? []) {
             deliveryLocationById.set(loc.id, {
                 country: loc.country ?? null,
@@ -356,7 +113,36 @@ export const getFloridayOrders = createServerFn({ method: "GET" })
             });
         }
     }
-    const manualOrders = (manualRows ?? []).map((row) => {
+    // Floriday sales-order-id's van de orders die de Verkoop-module kent.
+    const salesOrderIdByOrderId = new Map();
+    for (const row of rows) {
+        const fields = (row.custom_fields ?? {});
+        const fid = fields.floriday_sales_order_id;
+        if (typeof fid === "string" && fid)
+            salesOrderIdByOrderId.set(row.id, fid);
+    }
+    // Stickers alleen opzoeken voor die bekende Floriday-orders.
+    const stickerOrderIds = new Set();
+    const salesOrderIds = Array.from(new Set(salesOrderIdByOrderId.values()));
+    if (salesOrderIds.length > 0) {
+        const { data: stickerRows, error: stickerErr } = await supabase
+            .from("floriday_customer_stickers_cache")
+            .select("sales_order_id, quantity, is_deleted")
+            .in("sales_order_id", salesOrderIds)
+            .eq("is_deleted", false);
+        if (stickerErr) {
+            console.warn("[planning-orders] sticker lookup failed", { message: stickerErr.message });
+        }
+        else {
+            for (const s of stickerRows ?? []) {
+                const soId = s.sales_order_id ?? null;
+                const qty = Number(s.quantity ?? 1);
+                if (soId && (!Number.isFinite(qty) || qty > 0))
+                    stickerOrderIds.add(soId);
+            }
+        }
+    }
+    const orders = rows.map((row) => {
         const totalNum = row.total != null ? Number(row.total) : NaN;
         const items = (row.order_items ?? []);
         let cartCount = null;
@@ -370,22 +156,26 @@ export const getFloridayOrders = createServerFn({ method: "GET" })
             const perCart = p && p.plants_per_crate && p.crates_per_layer && p.layers_per_cart
                 ? Number(p.plants_per_crate) * Number(p.crates_per_layer) * Number(p.layers_per_cart)
                 : 0;
-            if (perCart > 0) {
+            if (perCart > 0)
                 cartCount = (cartCount ?? 0) + Math.ceil(qty / perCart);
-            }
         }
         const fields = (row.custom_fields ?? {});
         const deliveryLocationId = typeof fields.delivery_location === "string" ? fields.delivery_location : null;
-        const deliveryLocation = deliveryLocationId ? deliveryLocationById.get(deliveryLocationId) : undefined;
+        const deliveryLocation = deliveryLocationId
+            ? deliveryLocationById.get(deliveryLocationId)
+            : undefined;
         const customerId = row.customer_id ?? null;
         const carrierId = typeof fields.carrier === "string" && fields.carrier ? fields.carrier : null;
+        const orderId = row.id;
+        const salesOrderId = salesOrderIdByOrderId.get(orderId) ?? null;
         return {
-            id: row.id,
+            id: orderId,
+            // Orders komen altijd uit public.orders; regels staan in order_items.
             source: "manual",
             orderNumber: row.order_number ?? "—",
             customerName: row.customer_name ?? "—",
             deliveryDate: row.delivery_date ?? null,
-            deliveryType: "Mailbox",
+            deliveryType: salesOrderId ? "Floriday" : "Mailbox",
             status: row.status ?? "—",
             lineCount: items.length,
             cartCount,
@@ -394,65 +184,50 @@ export const getFloridayOrders = createServerFn({ method: "GET" })
             currency: null,
             createdAt: row.created_at ?? null,
             carrierId,
-            country: deliveryLocation?.country ?? (customerId ? customerCountryById.get(customerId) ?? null : null),
+            country: deliveryLocation?.country ??
+                (customerId ? customerCountryById.get(customerId) ?? null : null),
             province: deliveryLocation?.province ?? null,
             city: deliveryLocation?.city ?? null,
+            hasStickers: salesOrderId ? stickerOrderIds.has(salesOrderId) : false,
+            salesOrderId,
+            mirrored: true,
+            mirroredOrderId: orderId,
         };
     });
-    // Verkoop-module schrijft Floriday-orders óók in public.orders. Zonder dedup
-    // verschijnt elke order dubbel: één keer vanuit de cache, één keer vanuit
-    // orders. De orders-versie wint (juist FO-nummer, juiste klantnaam).
-    //
-    // Dedup op DRIE sleutels, want custom_fields.floriday_sales_order_id is niet
-    // gegarandeerd gevuld: (1) floriday_sales_order_id, (2) genormaliseerd
-    // ordernummer, (3) orders.id gelijk aan het cache-id. Cache-rijen zonder
-    // pendant blijven staan en worden gemarkeerd als niet-gemirrord.
-    const manualIdByFloridayId = new Map();
-    const manualIdByNumber = new Map();
-    const manualIds = new Set();
-    for (const row of manualRows ?? []) {
-        const fields = (row.custom_fields ?? {});
-        const fid = fields.floriday_sales_order_id;
-        const rowId = row.id;
-        manualIds.add(rowId);
-        if (typeof fid === "string" && fid)
-            manualIdByFloridayId.set(fid, rowId);
-        const num = normalizeOrderNumber(row.order_number);
-        if (num && !manualIdByNumber.has(num))
-            manualIdByNumber.set(num, rowId);
-    }
-    const dedupedFloriday = [];
-    for (const o of orders) {
-        const mirroredId = manualIdByFloridayId.get(o.id) ??
-            manualIdByNumber.get(normalizeOrderNumber(o.orderNumber) ?? "\u0000") ??
-            (manualIds.has(o.id) ? o.id : null) ??
-            null;
-        if (mirroredId)
-            continue; // pendant in public.orders bestaat al
-        dedupedFloriday.push({ ...o, mirrored: false, mirroredOrderId: null });
-    }
-    // Laatste net: nooit twee items met dezelfde ref-sleutel.
-    const seenRefs = new Set();
-    const combined = [];
-    for (const o of [
-        ...manualOrders.map((m) => ({ ...m, mirrored: true, mirroredOrderId: m.id })),
-        ...dedupedFloriday,
-    ]) {
-        const key = normalizeOrderNumber(o.orderNumber) ?? o.id;
-        if (seenRefs.has(key))
-            continue;
-        seenRefs.add(key);
-        combined.push(o);
-    }
-    const nearestDeliveryDate = combined.length === 0 ? await findNearestDeliveryDate(supabase, connectionId, range) : null;
+    const nearestDeliveryDate = orders.length === 0 ? await findNearestDeliveryDate(supabase, range) : null;
     console.info("[planning-orders] load completed", {
-        floridayOrders: orders.length,
-        manualOrders: manualOrders.length,
-        totalOrders: combined.length,
+        totalOrders: orders.length,
         range,
         nearestDeliveryDate,
-        partialError: partialError ?? null,
         durationMs: Date.now() - startedAt,
     });
-    return { orders: combined, error: partialError, range, nearestDeliveryDate };
+    return { orders, range, nearestDeliveryDate };
+});
+/**
+ * Alle orders die in de Verkoop-module open of net afgehandeld zijn. Deze lijst
+ * bepaalt wat deze module überhaupt mag tonen: agenda, dagdetails, karren en
+ * controle filteren erop. Alleen geannuleerde, vervallen, concept- en
+ * gereserveerde orders verdwijnen hieruit.
+ */
+export const listKnownOrders = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const { data, error } = await supabase
+        .from("orders")
+        .select("id, order_number, status")
+        .is("deleted_at", null)
+        .limit(5000);
+    if (error) {
+        console.warn("[planning-orders] known orders lookup failed", { message: error.message });
+        return { orders: [], error: error.message };
+    }
+    return {
+        orders: (data ?? [])
+            .filter((r) => isVisibleOrderStatus(r.status))
+            .map((r) => ({
+            id: r.id,
+            orderNumber: r.order_number ?? null,
+        })),
+    };
 });

package/dist-lib/lib/logisticsEngine/reschedule.d.ts

@@ -62,4 +62,21 @@ export declare function setPickDay(orderRef: string, day: string): Promise<{
     error?: string;
     updated: number;
 }>;
+export interface NextDeliveryMoment {
+    date: string;
+    time: string;
+    label?: string | null;
+}
+/**
+ * Het eerstvolgende aflever-/ophaalmoment uit de agenda van de Engine
+ * (tabel logistics_pickup_moments). Momenten in het verleden vallen af.
+ */
+export declare function getNextDeliveryMoment(): Promise<NextDeliveryMoment | null>;
+/**
+ * Plant een order opnieuw in op het eerstvolgende aflevermoment.
+ * De Engine bepaalt op basis daarvan zelf de pickdag en de taken.
+ */
+export declare function replanToNextDeliveryMoment(orderRef: string): Promise<RescheduleResult & {
+    moment?: NextDeliveryMoment;
+}>;
 //# sourceMappingURL=reschedule.d.ts.map

package/dist-lib/lib/logisticsEngine/reschedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reschedule.d.ts","sourceRoot":"","sources":["../../../src/lib/logisticsEngine/reschedule.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAY1F;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,eAAe,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7F,OAAO,CAAC,gBAAgB,CAAC,CAgB3B;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAY7F;AAID,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,+EAA+E;AAC/E,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAgB5E;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAezH"}
+{"version":3,"file":"reschedule.d.ts","sourceRoot":"","sources":["../../../src/lib/logisticsEngine/reschedule.ts"],"names":[],"mappings":"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"}

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

@@ -3,6 +3,7 @@
  * Deze module rekent zelf niets uit en doet nooit een eigen UPDATE.
  */
 import { supabase } from "../../integrations/supabase/moduleClient";
+import { amsterdamDay, formatAmsterdam } from "../timezone";
 export async function previewReschedule(input) {
     const { data, error } = await supabase.rpc("logistics_reschedule_preview", {
         p_order_ref: input.orderRef,
@@ -84,3 +85,65 @@ export async function setPickDay(orderRef, day) {
         updated: result?.updated ?? 0,
     };
 }
+/**
+ * Het eerstvolgende aflever-/ophaalmoment uit de agenda van de Engine
+ * (tabel logistics_pickup_moments). Momenten in het verleden vallen af.
+ */
+export async function getNextDeliveryMoment() {
+    const today = amsterdamDay(new Date());
+    const { data, error } = await supabase
+        .from("logistics_pickup_moments")
+        .select("moment_date, pickup_time, label, sequence")
+        .gte("moment_date", today)
+        .order("moment_date", { ascending: true })
+        .order("sequence", { ascending: true })
+        .order("pickup_time", { ascending: true })
+        .limit(50);
+    if (error) {
+        console.error("[reschedule] next moment failed", { message: error.message });
+        return null;
+    }
+    const nowTime = formatAmsterdam(new Date(), { hour: "2-digit", minute: "2-digit" });
+    for (const r of (data ?? [])) {
+        const time = (r.pickup_time ?? "").slice(0, 5);
+        if (r.moment_date === today && time && time <= nowTime)
+            continue;
+        return { date: r.moment_date, time, label: r.label ?? null };
+    }
+    // Geen ophaalmomenten ingesteld in de Engine: val terug op de eerstvolgende
+    // afleverdag uit de leveragenda van de Engine. Nog steeds Engine-data; deze
+    // module verzint zelf geen datum.
+    const { data: agenda, error: agendaError } = await supabase.rpc("logistics_delivery_agenda", {
+        p_from: today,
+        p_to: undefined,
+    });
+    if (agendaError) {
+        console.error("[reschedule] delivery agenda failed", { message: agendaError.message });
+        return null;
+    }
+    const rows = (Array.isArray(agenda) ? agenda : []);
+    const dates = rows
+        .map((r) => r.delivery_date ?? null)
+        .filter((d) => !!d && d > today)
+        .sort();
+    const first = dates[0];
+    return first ? { date: first, time: "", label: null } : null;
+}
+/**
+ * Plant een order opnieuw in op het eerstvolgende aflevermoment.
+ * De Engine bepaalt op basis daarvan zelf de pickdag en de taken.
+ */
+export async function replanToNextDeliveryMoment(orderRef) {
+    const moment = await getNextDeliveryMoment();
+    if (!moment) {
+        return { ok: false, error: "Geen eerstvolgend aflevermoment bekend: er staan geen ophaalmomenten en geen toekomstige afleverdagen in de Logistics Engine." };
+    }
+    const res = await applyReschedule({
+        orderRef,
+        pickupDate: moment.date,
+        pickupFrom: moment.time || null,
+        pickupTo: null,
+        reason: "Handmatig ingepland op het eerstvolgende aflevermoment",
+    });
+    return { ...res, moment };
+}