@flowselections/floriday-afhandeling-module 1.0.10 → 1.0.12

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

@@ -0,0 +1,489 @@
+import { createServerFn } from "@tanstack/react-start";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
+import { tryReschedule } from "./cartRescheduling";
+function toIso(d) {
+    const y = d.getFullYear();
+    const m = String(d.getMonth() + 1).padStart(2, "0");
+    const day = String(d.getDate()).padStart(2, "0");
+    return `${y}-${m}-${day}`;
+}
+const APPROVED_STATUSES = new Set(["ready", "shipped", "delivered"]);
+async function loadControlPlanningSettings(supabase, userId) {
+    const { data: settings } = await supabase
+        .from("afhandeling_settings")
+        .select("pick_weekdays, pick_days_before_transport")
+        .eq("user_id", userId)
+        .maybeSingle();
+    const pickWeekdays = Array.isArray(settings?.pick_weekdays) && settings.pick_weekdays.length > 0
+        ? settings.pick_weekdays
+        : [1, 2, 3, 4, 5];
+    const minWorkdays = Math.max(1, Number(settings?.pick_days_before_transport ?? 1));
+    return { pickWeekdays, minWorkdays };
+}
+/** Haal alle karren op die vandaag gepickt / klaargezet hadden moeten worden. */
+export const getTodaysControlCarts = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async () => {
+    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
+    const orders = await loadTodaysPickstationOrders();
+    const carts = orders
+        .filter((o) => !APPROVED_STATUSES.has(o.status))
+        .map((o) => ({
+        cartNumberId: null, // will be resolved below via cart_numbers lookup
+        cartNumber: o.cartNumber,
+        orderId: o.orderId,
+        orderSource: o.orderSource,
+        cartIndex: o.cartIndex - 1, // pickstation uses 1-based, DB is 0-based
+        orderNumber: o.orderNumber,
+        customerName: o.customerName,
+        carrierName: o.carrierName,
+        deliveryDate: o.deliveryDate,
+        pickupDate: o.pickupDate,
+        pickDate: o.pickDate,
+        printedCount: o.printedCount,
+        status: o.status,
+    }));
+    return { carts };
+});
+export const getControlRescheduleProposals = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => d)
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
+    const orders = await loadTodaysPickstationOrders();
+    const pendingOrders = orders.filter((o) => !APPROVED_STATUSES.has(o.status));
+    const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
+    const checkedSet = new Set(data.checkedCartKeys);
+    const proposals = [];
+    const blocked = [];
+    for (const o of pendingOrders) {
+        const key = `${o.orderSource}#${o.orderId}#${o.cartIndex - 1}`;
+        if (checkedSet.has(key))
+            continue;
+        const currentIso = o.pickDate || toIso(new Date());
+        const result = tryReschedule({
+            currentPickDate: new Date(currentIso),
+            deliveryDate: o.deliveryDate ? new Date(o.deliveryDate) : null,
+            pickWeekdays,
+            minWorkdaysBeforeDelivery: minWorkdays,
+        });
+        if (result.ok) {
+            const proposedPickDate = toIso(result.newPickDate);
+            proposals.push({
+                key,
+                cartNumber: o.cartNumber,
+                orderNumber: o.orderNumber,
+                customerName: o.customerName,
+                carrierName: o.carrierName,
+                deliveryDate: o.deliveryDate,
+                pickupDate: o.pickupDate,
+                currentPickDate: currentIso,
+                proposedPickDate,
+                reason: "Deze kar is niet afgevinkt tijdens de controle en staat nog op de picklijst van vandaag.",
+                impact: `De kar verdwijnt uit de pickagenda van ${currentIso} en komt op ${proposedPickDate}. Controleer of ophalen en levering op ${o.deliveryDate ?? "de leverdatum"} hierdoor haalbaar blijven.`,
+            });
+        }
+        else {
+            blocked.push({
+                cartNumberId: null,
+                cartNumber: o.cartNumber,
+                orderId: o.orderId,
+                orderSource: o.orderSource,
+                cartIndex: o.cartIndex - 1,
+                orderNumber: o.orderNumber,
+                customerName: o.customerName,
+                carrierName: o.carrierName,
+                deliveryDate: o.deliveryDate,
+                pickupDate: o.pickupDate,
+                reason: result.reason,
+            });
+        }
+    }
+    return { proposals, blocked };
+});
+export const submitControlSession = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => d)
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    // 1) Laad alle karren van vandaag + instellingen
+    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
+    const orders = await loadTodaysPickstationOrders();
+    const pendingOrders = orders.filter((o) => !APPROVED_STATUSES.has(o.status));
+    const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
+    // 2) Maak sessie aan
+    const { data: session, error: sessErr } = await supabase
+        .from("cart_control_sessions")
+        .insert({
+        user_id: context.userId,
+        control_date: toIso(new Date()),
+        total_carts: pendingOrders.length,
+        notes: data.notes ?? null,
+    })
+        .select()
+        .single();
+    if (sessErr)
+        throw new Error(sessErr.message);
+    const checkedSet = new Set(data.checkedCartKeys);
+    const confirmedRescheduleSet = new Set(data.confirmedRescheduleCartKeys ?? []);
+    const items = [];
+    const rescheduled = [];
+    const blocked = [];
+    let checkedCount = 0;
+    // Lookup cart_numbers row ids
+    const { data: cnRows } = await supabase
+        .from("cart_numbers")
+        .select("id, order_source, order_id, cart_index")
+        .in("order_id", Array.from(new Set(pendingOrders.map((o) => o.orderId))));
+    const cnMap = new Map();
+    for (const r of (cnRows ?? [])) {
+        cnMap.set(`${r.order_source}#${r.order_id}#${r.cart_index}`, r.id);
+    }
+    for (const o of pendingOrders) {
+        const key = `${o.orderSource}#${o.orderId}#${o.cartIndex - 1}`;
+        const cartNumberId = cnMap.get(key) ?? null;
+        const baseFields = {
+            session_id: session.id,
+            cart_number_id: cartNumberId,
+            cart_number_label: o.cartNumber,
+            order_id: o.orderId,
+            order_source: o.orderSource,
+            cart_index: o.cartIndex - 1,
+            order_number: o.orderNumber,
+            customer_name: o.customerName,
+            carrier_name: o.carrierName,
+            delivery_date: o.deliveryDate,
+            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 - 1,
+                p_status: "ready",
+            });
+            items.push({ ...baseFields, action: "checked" });
+            checkedCount++;
+            continue;
+        }
+        // Niet aangevinkt → alleen verplaatsen wanneer de gebruiker dit expliciet
+        // in de bevestigings-pop-up heeft gekozen. Zonder bevestiging blijft de
+        // kar op de huidige pickdatum staan en registreren we uitsluitend een
+        // blokkade/waarschuwing.
+        const result = tryReschedule({
+            currentPickDate: new Date(o.pickDate || toIso(new Date())),
+            deliveryDate: o.deliveryDate ? new Date(o.deliveryDate) : null,
+            pickWeekdays,
+            minWorkdaysBeforeDelivery: minWorkdays,
+        });
+        if (result.ok && confirmedRescheduleSet.has(key)) {
+            const newIso = toIso(result.newPickDate);
+            await supabase
+                .from("cart_pick_overrides")
+                .upsert({
+                order_id: o.orderId,
+                order_source: o.orderSource,
+                cart_index: o.cartIndex - 1,
+                pick_date: newIso,
+                moved_from_date: toIso(new Date()),
+            }, { onConflict: "order_id,order_source,cart_index" });
+            items.push({
+                ...baseFields,
+                action: "rescheduled",
+                new_pick_date: newIso,
+            });
+            rescheduled.push({
+                key,
+                cartNumber: o.cartNumber,
+                orderNumber: o.orderNumber,
+                customerName: o.customerName,
+                newPickDate: newIso,
+            });
+        }
+        else {
+            const blockReason = result.ok
+                ? `Verplaatsing naar ${toIso(result.newPickDate)} is voorgesteld, maar niet bevestigd. De kar blijft op de huidige pickdatum staan.`
+                : result.reason;
+            items.push({
+                ...baseFields,
+                action: "blocked",
+                block_reason: blockReason,
+            });
+            blocked.push({
+                cartNumberId,
+                cartNumber: o.cartNumber,
+                orderId: o.orderId,
+                orderSource: o.orderSource,
+                cartIndex: o.cartIndex - 1,
+                orderNumber: o.orderNumber,
+                customerName: o.customerName,
+                carrierName: o.carrierName,
+                deliveryDate: o.deliveryDate,
+                pickupDate: o.pickupDate,
+                reason: blockReason,
+            });
+        }
+    }
+    if (items.length > 0) {
+        await supabase.from("cart_control_items").insert(items);
+    }
+    // Update sessie-aantallen
+    await supabase
+        .from("cart_control_sessions")
+        .update({
+        checked_count: checkedCount,
+        rescheduled_count: rescheduled.length,
+        blocked_count: blocked.length,
+    })
+        .eq("id", session.id);
+    // Kritieke melding aanmaken of oplossen
+    const alertKey = `cart_not_rescheduled:${toIso(new Date())}`;
+    if (blocked.length > 0) {
+        const relatedIds = blocked
+            .map((b) => b.cartNumberId)
+            .filter((v) => !!v);
+        await supabase
+            .from("dashboard_critical_alerts")
+            .upsert({
+            user_id: context.userId,
+            alert_key: alertKey,
+            alert_type: "cart_not_rescheduled",
+            priority: "critical",
+            title: "Karren kunnen niet doorgeschoven worden",
+            description: `Er zijn ${blocked.length} karren die vandaag niet zijn klaargezet en niet automatisch naar een volgende pickdag kunnen worden verplaatst. Directe actie is vereist.`,
+            related_cart_ids: relatedIds,
+            resolved_at: null,
+            metadata: { blocked: blocked },
+        }, { onConflict: "user_id,alert_key" });
+    }
+    else {
+        // Auto-resolve als er geen blokkades zijn
+        await supabase
+            .from("dashboard_critical_alerts")
+            .update({ resolved_at: new Date().toISOString() })
+            .eq("user_id", context.userId)
+            .eq("alert_key", alertKey)
+            .is("resolved_at", null);
+    }
+    // Definitieve controle: wis alleen het autosave-concept van deze gebruiker voor vandaag.
+    await supabase
+        .from("cart_control_draft")
+        .delete()
+        .eq("user_id", context.userId)
+        .eq("draft_date", toIso(new Date()));
+    return {
+        sessionId: session.id,
+        checkedCount,
+        rescheduledCount: rescheduled.length,
+        blockedCount: blocked.length,
+        rescheduled,
+        blocked,
+    };
+});
+export const listControlHistory = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const { data, error } = await supabase
+        .from("cart_control_sessions")
+        .select("id, control_date, performed_at, total_carts, checked_count, rescheduled_count, blocked_count, notes")
+        .eq("user_id", context.userId)
+        .order("performed_at", { ascending: false })
+        .limit(200);
+    if (error)
+        throw new Error(error.message);
+    const sessions = (data ?? []).map((r) => ({
+        id: r.id,
+        controlDate: r.control_date,
+        performedAt: r.performed_at,
+        totalCarts: r.total_carts,
+        checkedCount: r.checked_count,
+        rescheduledCount: r.rescheduled_count,
+        blockedCount: r.blocked_count,
+        notes: r.notes ?? null,
+    }));
+    return { sessions };
+});
+export const getControlSessionDetail = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => d)
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    const { data: rows, error } = await supabase
+        .from("cart_control_items")
+        .select("cart_number_label, order_number, customer_name, carrier_name, delivery_date, pickup_date, action, new_pick_date, block_reason")
+        .eq("session_id", data.sessionId)
+        .order("cart_number_label", { ascending: true });
+    if (error)
+        throw new Error(error.message);
+    const items = (rows ?? []).map((r) => ({
+        cartNumberLabel: r.cart_number_label ?? null,
+        orderNumber: r.order_number ?? null,
+        customerName: r.customer_name ?? null,
+        carrierName: r.carrier_name ?? null,
+        deliveryDate: r.delivery_date ?? null,
+        pickupDate: r.pickup_date ?? null,
+        action: r.action,
+        newPickDate: r.new_pick_date ?? null,
+        blockReason: r.block_reason ?? null,
+    }));
+    return { items };
+});
+export const listActiveCriticalAlerts = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const { data, error } = await supabase
+        .from("dashboard_critical_alerts")
+        .select("id, alert_key, alert_type, priority, title, description, raised_at, metadata")
+        .eq("user_id", context.userId)
+        .is("resolved_at", null)
+        .order("raised_at", { ascending: false });
+    if (error)
+        throw new Error(error.message);
+    const alerts = (data ?? []).map((r) => {
+        const meta = r.metadata ?? {};
+        const blockedCount = Array.isArray(meta.blocked) ? meta.blocked.length : 0;
+        return {
+            id: r.id,
+            alertKey: r.alert_key,
+            alertType: r.alert_type,
+            priority: r.priority,
+            title: r.title,
+            description: r.description ?? null,
+            raisedAt: r.raised_at,
+            blockedCount,
+        };
+    });
+    return { alerts };
+});
+export const resolveCriticalAlert = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => d)
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    const { error } = await supabase
+        .from("dashboard_critical_alerts")
+        .update({ resolved_at: new Date().toISOString() })
+        .eq("id", data.id)
+        .eq("user_id", context.userId);
+    if (error)
+        throw new Error(error.message);
+    return { ok: true };
+});
+function normalizeStringArray(value) {
+    return Array.isArray(value) ? value.filter((k) => typeof k === "string") : [];
+}
+function normalizeCartStates(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return {};
+    const result = {};
+    for (const [key, raw] of Object.entries(value)) {
+        if (!key || !raw || typeof raw !== "object" || Array.isArray(raw))
+            continue;
+        const row = raw;
+        const status = row.status === "ready" ? "ready" : "pending";
+        const state = { status };
+        if (typeof row.note === "string")
+            state.note = row.note;
+        if (typeof row.updatedAt === "string")
+            state.updatedAt = row.updatedAt;
+        result[key] = state;
+    }
+    return result;
+}
+function isJsonValue(value) {
+    if (value === null)
+        return true;
+    if (["string", "number", "boolean"].includes(typeof value))
+        return true;
+    if (Array.isArray(value))
+        return value.every(isJsonValue);
+    if (typeof value === "object") {
+        return Object.values(value).every((v) => v === undefined || isJsonValue(v));
+    }
+    return false;
+}
+function normalizeFormState(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return {};
+    const result = {};
+    for (const [key, raw] of Object.entries(value)) {
+        if (!key)
+            continue;
+        if (raw !== undefined && isJsonValue(raw))
+            result[key] = raw;
+    }
+    return result;
+}
+export const getControlDraft = createServerFn({ method: "GET" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const today = toIso(new Date());
+    const { data, error } = await supabase
+        .from("cart_control_draft")
+        .select("notes, checked_keys, cart_states, form_state, updated_at")
+        .eq("user_id", context.userId)
+        .eq("draft_date", today)
+        .maybeSingle();
+    if (error)
+        throw new Error(error.message);
+    const cartStates = normalizeCartStates(data?.cart_states);
+    const checkedKeys = normalizeStringArray(data?.checked_keys);
+    const derivedCheckedKeys = checkedKeys.length > 0
+        ? checkedKeys
+        : Object.entries(cartStates)
+            .filter(([, state]) => state.status === "ready")
+            .map(([key]) => key);
+    return {
+        notes: data?.notes ?? "",
+        checkedKeys: derivedCheckedKeys,
+        cartStates,
+        formState: normalizeFormState(data?.form_state),
+        updatedAt: data?.updated_at ?? null,
+    };
+});
+export const saveControlDraft = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => d)
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    const today = toIso(new Date());
+    const nowIso = new Date().toISOString();
+    const patch = {
+        user_id: context.userId,
+        draft_date: today,
+        updated_at: nowIso,
+    };
+    if (data.notes !== undefined)
+        patch.notes = data.notes;
+    if (data.checkedKeys !== undefined)
+        patch.checked_keys = normalizeStringArray(data.checkedKeys);
+    if (data.cartStates !== undefined)
+        patch.cart_states = normalizeCartStates(data.cartStates);
+    if (data.formState !== undefined)
+        patch.form_state = normalizeFormState(data.formState);
+    const { error } = await supabase
+        .from("cart_control_draft")
+        .upsert(patch, { onConflict: "user_id,draft_date" });
+    if (error)
+        throw new Error(error.message);
+    return { ok: true, updatedAt: nowIso };
+});
+export const clearControlDraft = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const supabase = context.supabase;
+    const today = toIso(new Date());
+    const { error } = await supabase
+        .from("cart_control_draft")
+        .delete()
+        .eq("user_id", context.userId)
+        .eq("draft_date", today);
+    if (error)
+        throw new Error(error.message);
+    return { ok: true };
+});

package/dist-lib/lib/cartRescheduling.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Bepaalt of een niet-gecontroleerde kar als voorstel één (of meer) pickdagen
+ * kan opschuiven zonder de leverdatum in gevaar te brengen.
+ *
+ * We gebruiken uitsluitend globale instellingen (pickWeekdays) en de
+ * originele leverdatum als harde deadline. De heuristiek is bewust
+ * conservatief: een kar mag alleen als voorstel opschuiven wanneer er nog
+ * minstens één werkdag zit tussen de nieuwe pickdatum en de leverdatum. De
+ * daadwerkelijke verplaatsing gebeurt alleen na expliciete gebruikerskeuze.
+ */
+export interface RescheduleInput {
+    /** Huidige (originele) pickdatum. */
+    currentPickDate: Date;
+    /** Bezorgdatum van de order. */
+    deliveryDate: Date | null;
+    /** Toegestane ISO-weekdagen (1=ma … 7=zo). */
+    pickWeekdays: number[];
+    /** Aantal werkdagen dat een order minimaal vóór levering nog gepickt moet zijn. */
+    minWorkdaysBeforeDelivery: number;
+    holidays?: Date[];
+}
+export type RescheduleResult = {
+    ok: true;
+    newPickDate: Date;
+} | {
+    ok: false;
+    reason: string;
+};
+export declare function tryReschedule(input: RescheduleInput): RescheduleResult;
+//# sourceMappingURL=cartRescheduling.d.ts.map

package/dist-lib/lib/cartRescheduling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cartRescheduling.d.ts","sourceRoot":"","sources":["../../src/lib/cartRescheduling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,eAAe,EAAE,IAAI,CAAC;IACtB,gCAAgC;IAChC,YAAY,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,8CAA8C;IAC9C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,mFAAmF;IACnF,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAgClC,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAsDtE"}

package/dist-lib/lib/cartRescheduling.js

@@ -0,0 +1,71 @@
+/**
+ * Bepaalt of een niet-gecontroleerde kar als voorstel één (of meer) pickdagen
+ * kan opschuiven zonder de leverdatum in gevaar te brengen.
+ *
+ * We gebruiken uitsluitend globale instellingen (pickWeekdays) en de
+ * originele leverdatum als harde deadline. De heuristiek is bewust
+ * conservatief: een kar mag alleen als voorstel opschuiven wanneer er nog
+ * minstens één werkdag zit tussen de nieuwe pickdatum en de leverdatum. De
+ * daadwerkelijke verplaatsing gebeurt alleen na expliciete gebruikerskeuze.
+ */
+import { addWorkdays, isoWeekday, isWorkday, normalizeWeekdays, subtractWorkdays, } from "./planning";
+function normalize(d) {
+    const out = new Date(d);
+    out.setHours(0, 0, 0, 0);
+    return out;
+}
+function fmt(d) {
+    return d.toLocaleDateString("nl-NL", { day: "2-digit", month: "2-digit" });
+}
+/** Zoek de eerstvolgende toegestane pickdag na `from`. */
+function nextAllowedPickDay(from, allowedWeekdays, holidays) {
+    const cursor = new Date(from);
+    cursor.setDate(cursor.getDate() + 1);
+    for (let i = 0; i < 30; i++) {
+        if (allowedWeekdays.has(isoWeekday(cursor)) &&
+            isWorkday(cursor, holidays)) {
+            return normalize(cursor);
+        }
+        cursor.setDate(cursor.getDate() + 1);
+    }
+    return normalize(cursor);
+}
+export function tryReschedule(input) {
+    if (!input.deliveryDate) {
+        return { ok: false, reason: "Geen leverdatum bekend." };
+    }
+    const allowed = new Set(normalizeWeekdays(input.pickWeekdays));
+    const delivery = normalize(input.deliveryDate);
+    const today = normalize(new Date());
+    if (delivery.getTime() <= today.getTime()) {
+        return {
+            ok: false,
+            reason: `Leverdatum ${fmt(delivery)} is vandaag of al verstreken.`,
+        };
+    }
+    const newDate = nextAllowedPickDay(normalize(input.currentPickDate), allowed, input.holidays);
+    // Uiterste pickdatum: minWorkdaysBeforeDelivery werkdagen vóór levering.
+    const latest = subtractWorkdays(delivery, Math.max(1, input.minWorkdaysBeforeDelivery), input.holidays);
+    if (newDate.getTime() > latest.getTime()) {
+        return {
+            ok: false,
+            reason: `Volgende pickdag ${fmt(newDate)} valt na de uiterste pickdatum ${fmt(latest)} voor levering op ${fmt(delivery)}.`,
+        };
+    }
+    // Extra check: nieuwe pickdatum moet vóór leverdatum liggen.
+    if (newDate.getTime() >= delivery.getTime()) {
+        return {
+            ok: false,
+            reason: `Nieuwe pickdatum ${fmt(newDate)} ligt niet vóór de leverdatum ${fmt(delivery)}.`,
+        };
+    }
+    // Sanity: hebben we wél minimaal 1 werkdag tussen pick en levering?
+    const minRequired = addWorkdays(newDate, 1, input.holidays);
+    if (minRequired.getTime() > delivery.getTime()) {
+        return {
+            ok: false,
+            reason: `Onvoldoende werkdagen tussen pickdatum en leverdatum ${fmt(delivery)}.`,
+        };
+    }
+    return { ok: true, newPickDate: newDate };
+}