@flowselections/floriday-afhandeling-module 1.0.58 → 1.0.63

package/dist-lib/components/afhandeling/WeekAgendaView.js

@@ -1,5 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { supabase } from "../../integrations/supabase/moduleClient";
+import { isExcludedOrderStatus, normalizeOrderStatus } from "../../lib/orderStatus";
 import { Button, Badge } from "@flowselections/core";
 import { ChevronLeft, ChevronRight, Package, Truck, Sprout, Clock, CheckCircle2, Scale } from "lucide-react";
 import { isSameDay, startOfWeek, addDays } from "../../lib/pickDate";
@@ -8,6 +11,20 @@ import { usePickAgenda } from "../../hooks/usePickAgenda";
 import { useConsistencyCheck } from "../../hooks/useConsistencyCheck";
 import { CapacityWarning } from "./CapacityWarning";
 import { toDayKey } from "../../lib/logisticsEngine/capacity";
+const SHIPPED = new Set(["verzonden", "gereed voor facturatie", "gefactureerd", "geleverd", "afgeleverd", "afgerond", "afgehandeld", "afgemeld", "shipped", "delivered", "completed", "invoiced"]);
+/** Eén indeling per order. Floriday herkend op Floriday-id; afmeldstand uit de order. */
+function classify(o, scanned) {
+    if (/annul|cancel/i.test(o.status ?? "") || isExcludedOrderStatus(o.status))
+        return "uit";
+    if (SHIPPED.has(normalizeOrderStatus(o.status))) {
+        if (o.salesOrderId && o.floridayFulfilled !== true)
+            return "niet_afgemeld";
+        return "afgehandeld";
+    }
+    if (scanned || isOrderReady(o))
+        return "verzendklaar";
+    return "voorbereiding";
+}
 const WEEKDAY_LABELS = ["MAANDAG", "DINSDAG", "WOENSDAG", "DONDERDAG", "VRIJDAG", "ZATERDAG", "ZONDAG"];
 const MONTHS_NL_SHORT = ["jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"];
 function isOrderReady(o) {
@@ -87,6 +104,30 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
     // Pickagenda komt volledig uit de Engine-RPC; deze module rekent zelf geen
     // pickdagen meer uit en doet geen datum-, werkdagen- of tijdzonelogica.
     const pickAgenda = usePickAgenda(mode === "pick" ? toDayKey(weekStart) : null, mode === "pick" ? toDayKey(weekEnd) : null);
+    // Orders waarvan alle karren goedgekeurd gescand zijn (op order-id).
+    const orderIds = useMemo(() => (mode === "pick" ? [] : planned.map((p) => p.order.id).sort()), [planned, mode]);
+    const scanQuery = useQuery({
+        queryKey: ["afhandeling-scanned-orders", orderIds],
+        enabled: orderIds.length > 0,
+        staleTime: 30000,
+        refetchInterval: 60000,
+        queryFn: async () => {
+            const all = new Map();
+            for (let i = 0; i < orderIds.length; i += 100) {
+                const { data, error } = await supabase
+                    .from("logistics_control_scan").select("order_id, approved_at").in("order_id", orderIds.slice(i, i + 100));
+                if (error)
+                    throw new Error(error.message);
+                for (const r of Array.isArray(data) ? data : []) {
+                    if (!r.order_id)
+                        continue;
+                    all.set(r.order_id, (all.get(r.order_id) ?? true) && !!r.approved_at);
+                }
+            }
+            return [...all].filter(([, ok]) => ok).map(([id]) => id);
+        },
+    });
+    const scannedIds = useMemo(() => new Set(scanQuery.data ?? []), [scanQuery.data]);
     const days = useMemo(() => {
         return Array.from({ length: 7 }, (_, i) => {
             const date = addDays(weekStart, i);
@@ -104,6 +145,7 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
                     voorbereiding: row?.inPreparation ?? 0,
                     // Uitsluitend uit de Engine (taak afgemeld); geannuleerde orders zijn al weggelaten.
                     afgehandeld: row?.doneCount ?? 0,
+                    nietAfgemeld: 0,
                 };
             }
             const entries = [];
@@ -113,7 +155,7 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
                 const d = dateForPlanned(p, mode);
                 if (!d || !isSameDay(d, date))
                     continue;
-                if (/annul|cancel/i.test(p.order.status ?? ""))
+                if (classify(p.order, false) === "uit")
                     continue;
                 entries.push({
                     order: p.order,
@@ -126,8 +168,10 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
             }
             const karren = entries.reduce((s, e) => s + e.cartCount, 0);
             const planten = entries.reduce((s, e) => s + e.plantCount, 0);
-            const verzendklaar = entries.filter((e) => isOrderReady(e.order)).length;
-            const voorbereiding = entries.length - verzendklaar;
+            const cls = entries.map((e) => classify(e.order, scannedIds.has(e.order.id)));
+            const cnt = (b) => cls.filter((c) => c === b).length;
+            const verzendklaar = cnt("verzendklaar");
+            const voorbereiding = cnt("voorbereiding");
             return {
                 date,
                 entries,
@@ -137,16 +181,19 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
                 planten,
                 verzendklaar,
                 voorbereiding,
-                afgehandeld: entries.filter((e) => isDoneStatus(e.order.status)).length,
+                afgehandeld: cnt("afgehandeld"),
+                nietAfgemeld: cnt("niet_afgemeld"),
             };
         });
-    }, [planned, weekStart, mode, pickAgenda.byDate]);
+    }, [planned, weekStart, mode, pickAgenda.byDate, scannedIds]);
     const totals = useMemo(() => {
         const leveringen = days.reduce((s, d) => s + d.bestellingen, 0);
         const verzendklaar = days.reduce((s, d) => s + d.verzendklaar, 0);
         const voorbereiding = days.reduce((s, d) => s + d.voorbereiding, 0);
         const totaalStuks = days.reduce((s, d) => s + d.planten, 0);
-        return { leveringen, verzendklaar, voorbereiding, totaalStuks };
+        const afgehandeld = days.reduce((s, d) => s + d.afgehandeld, 0);
+        const nietAfgemeld = days.reduce((s, d) => s + d.nietAfgemeld, 0);
+        return { leveringen, verzendklaar, voorbereiding, totaalStuks, afgehandeld, nietAfgemeld };
     }, [days]);
     const { misaligned } = useConsistencyCheck();
     const capacity = useCapacityCheck(toDayKey(weekStart), toDayKey(weekEnd));
@@ -158,10 +205,10 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
         d.setHours(0, 0, 0, 0);
         setCursor(startOfWeek(d));
     };
-    return (_jsxs("div", { className: "flex h-full flex-col gap-4 overflow-hidden", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-3", children: [_jsx("h2", { className: "text-xl font-semibold tracking-tight", children: title ?? headerLabel }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsxs(Button, { variant: "outline", size: "sm", onClick: goPrev, children: [_jsx(ChevronLeft, { className: "mr-1 h-4 w-4" }), " Vorige week"] }), _jsx(Button, { variant: "outline", size: "sm", onClick: goToday, children: "Deze week" }), _jsxs(Button, { variant: "outline", size: "sm", onClick: goNext, children: ["Volgende week ", _jsx(ChevronRight, { className: "ml-1 h-4 w-4" })] })] })] }), misaligned && (_jsx("div", { className: "rounded-md border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Aantallen worden opnieuw uitgelijnd." })), _jsxs("div", { className: "grid shrink-0 grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4", children: [_jsx(SummaryCard, { label: MODE_LABELS[mode].summary, value: totals.leveringen, tone: "default" }), _jsx(SummaryCard, { label: "Verzendklaar", value: totals.verzendklaar, tone: "success" }), _jsx(SummaryCard, { label: "In voorbereiding", value: totals.voorbereiding, tone: "muted" }), _jsx(SummaryCard, { label: "Totaal stuks", value: totals.totaalStuks, tone: "default" })] }), _jsx("div", { className: "min-h-0 flex-1 space-y-2 overflow-y-auto rounded-lg border bg-muted/20 p-2", children: isLoading || (mode === "pick" && pickAgenda.isLoading) ? (_jsx("div", { className: "rounded-lg border bg-card p-10 text-center text-sm text-muted-foreground", children: "Laden\u2026" })) : (days.map((day) => (_jsx(DayRow, { day: day, onOrderClick: onOrderClick, onDayClick: onDayClick, capacity: mode === "delivery" ? undefined : capacity.byDate.get(toDayKey(day.date)) }, day.date.toISOString())))) })] }));
+    return (_jsxs("div", { className: "flex h-full flex-col gap-4 overflow-hidden", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-3", children: [_jsx("h2", { className: "text-xl font-semibold tracking-tight", children: title ?? headerLabel }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsxs(Button, { variant: "outline", size: "sm", onClick: goPrev, children: [_jsx(ChevronLeft, { className: "mr-1 h-4 w-4" }), " Vorige week"] }), _jsx(Button, { variant: "outline", size: "sm", onClick: goToday, children: "Deze week" }), _jsxs(Button, { variant: "outline", size: "sm", onClick: goNext, children: ["Volgende week ", _jsx(ChevronRight, { className: "ml-1 h-4 w-4" })] })] })] }), misaligned && (_jsx("div", { className: "rounded-md border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "De aantallen worden bijgewerkt." })), _jsxs("div", { className: "grid shrink-0 grid-cols-1 gap-3 sm:grid-cols-3 lg:grid-cols-6", children: [_jsx(SummaryCard, { label: MODE_LABELS[mode].summary, value: totals.leveringen, tone: "default" }), _jsx(SummaryCard, { label: "Verzendklaar", value: totals.verzendklaar, tone: "success" }), _jsx(SummaryCard, { label: "In voorbereiding", value: totals.voorbereiding, tone: "muted" }), _jsx(SummaryCard, { label: "Afgehandeld", value: totals.afgehandeld, tone: "success" }), _jsx(SummaryCard, { label: "Afgehandeld, nog niet gemeld bij Floriday", value: totals.nietAfgemeld, tone: "warning" }), _jsx(SummaryCard, { label: "Totaal stuks", value: totals.totaalStuks, tone: "default" })] }), _jsx("div", { className: "min-h-0 flex-1 space-y-2 overflow-y-auto rounded-lg border bg-muted/20 p-2", children: isLoading || (mode === "pick" && pickAgenda.isLoading) ? (_jsx("div", { className: "rounded-lg border bg-card p-10 text-center text-sm text-muted-foreground", children: "Laden\u2026" })) : (days.map((day) => (_jsx(DayRow, { day: day, onOrderClick: onOrderClick, onDayClick: onDayClick, capacity: mode === "delivery" ? undefined : capacity.byDate.get(toDayKey(day.date)) }, day.date.toISOString())))) })] }));
 }
 function SummaryCard({ label, value, tone, }) {
-    const valueClass = tone === "success" ? "text-green-600" : "text-foreground";
+    const valueClass = tone === "success" ? "text-green-600" : tone === "warning" ? "text-amber-600" : "text-foreground";
     return (_jsxs("div", { className: "rounded-lg border bg-card p-4", children: [_jsx("div", { className: `text-3xl font-bold ${valueClass}`, children: value }), _jsx("div", { className: "mt-1 text-sm text-muted-foreground", children: label })] }));
 }
 function DayRow({ day, onOrderClick, onDayClick, capacity, }) {
@@ -170,8 +217,11 @@ function DayRow({ day, onOrderClick, onDayClick, capacity, }) {
     today.setHours(0, 0, 0, 0);
     const isToday = isSameDay(day.date, today);
     // Alles van deze dag is afgehandeld: toon een groene bevestiging.
-    const dagAfgesloten = day.bestellingen > 0 && day.afgehandeld >= day.bestellingen;
-    return (_jsxs("div", { className: `rounded-lg border bg-card ${isToday ? "ring-1 ring-primary" : ""}`, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-6 px-4 py-4 sm:px-6", children: [_jsxs("div", { className: "w-20 shrink-0", children: [_jsx("div", { className: "text-xs font-medium tracking-wider text-muted-foreground", children: WEEKDAY_LABELS[weekdayIdx] }), _jsx("div", { className: "mt-1 text-3xl font-bold leading-none", children: day.date.getDate() }), _jsxs("div", { className: "text-sm text-muted-foreground", children: [MONTHS_NL_SHORT[day.date.getMonth()], "."] })] }), _jsxs("div", { className: "flex flex-1 flex-wrap items-center gap-6", children: [_jsx(Stat, { icon: _jsx(Package, { className: "h-4 w-4 text-slate-500" }), bg: "bg-slate-100", value: day.bestellingen, label: "bestellingen" }), _jsx(Stat, { icon: _jsx(Truck, { className: "h-4 w-4 text-amber-600" }), bg: "bg-amber-100", value: day.karren, label: "karren" }), _jsx(Stat, { icon: _jsx(Sprout, { className: "h-4 w-4 text-green-600" }), bg: "bg-green-100", value: day.planten, label: "planten" })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [dagAfgesloten && (_jsxs("div", { className: "flex items-center gap-2 rounded-md border border-green-600/30 bg-green-500/15 px-3 py-1.5 text-sm font-medium text-green-700", children: [_jsx(CheckCircle2, { className: "h-4 w-4" }), "Dag is afgesloten"] })), day.shiftedCount > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat te laat is aangemeld en door de Engine is verschoven.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.shiftedCount, " te laat aangemeld"] })), day.verzendklaar > 0 && (_jsxs(Badge, { className: "bg-green-500/15 text-green-700 hover:bg-green-500/15", variant: "secondary", children: [_jsx(CheckCircle2, { className: "mr-1 h-3.5 w-3.5" }), day.verzendklaar, " verzendklaar"] })), day.voorbereiding > 0 && (_jsxs(Badge, { className: "bg-blue-500/10 text-blue-700 hover:bg-blue-500/10", variant: "secondary", children: [_jsx(Clock, { className: "mr-1 h-3.5 w-3.5" }), day.voorbereiding, " in voorbereiding"] })), onDayClick && day.bestellingen > 0 && (_jsx(Button, { size: "sm", variant: "outline", onClick: () => onDayClick(day.date), children: "Dagdetails" }))] })] }), _jsx(CapacityWarning, { day: capacity, className: "mx-4 mb-4 sm:mx-6" })] }));
+    const dagAfgesloten = day.bestellingen > 0 && day.afgehandeld >= day.bestellingen && day.nietAfgemeld === 0;
+    return (_jsxs("div", { className: `rounded-lg border bg-card ${isToday ? "ring-1 ring-primary" : ""} ${onDayClick && day.bestellingen > 0 ? "cursor-pointer transition-colors hover:bg-muted/40" : ""}`, role: onDayClick && day.bestellingen > 0 ? "button" : undefined, tabIndex: onDayClick && day.bestellingen > 0 ? 0 : undefined, onClick: onDayClick && day.bestellingen > 0 ? () => onDayClick(day.date) : undefined, onKeyDown: onDayClick && day.bestellingen > 0 ? (e) => { if (e.key === "Enter" || e.key === " ") {
+            e.preventDefault();
+            onDayClick(day.date);
+        } } : undefined, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-6 px-4 py-4 sm:px-6", children: [_jsxs("div", { className: "w-20 shrink-0", children: [_jsx("div", { className: "text-xs font-medium tracking-wider text-muted-foreground", children: WEEKDAY_LABELS[weekdayIdx] }), _jsx("div", { className: "mt-1 text-3xl font-bold leading-none", children: day.date.getDate() }), _jsxs("div", { className: "text-sm text-muted-foreground", children: [MONTHS_NL_SHORT[day.date.getMonth()], "."] })] }), _jsxs("div", { className: "flex flex-1 flex-wrap items-center gap-6", children: [_jsx(Stat, { icon: _jsx(Package, { className: "h-4 w-4 text-slate-500" }), bg: "bg-slate-100", value: day.bestellingen, label: "bestellingen" }), _jsx(Stat, { icon: _jsx(Truck, { className: "h-4 w-4 text-amber-600" }), bg: "bg-amber-100", value: day.karren, label: "karren" }), _jsx(Stat, { icon: _jsx(Sprout, { className: "h-4 w-4 text-green-600" }), bg: "bg-green-100", value: day.planten, label: "planten" })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [dagAfgesloten && (_jsxs("div", { className: "flex items-center gap-2 rounded-md border border-green-600/30 bg-green-500/15 px-3 py-1.5 text-sm font-medium text-green-700", children: [_jsx(CheckCircle2, { className: "h-4 w-4" }), "Dag is afgesloten"] })), day.shiftedCount > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat te laat is aangemeld en door de planning is verschoven.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.shiftedCount, " te laat aangemeld"] })), day.nietAfgemeld > 0 && (_jsxs(Badge, { className: "bg-amber-500/15 text-amber-700 hover:bg-amber-500/15", variant: "secondary", children: [day.nietAfgemeld, " nog niet afgemeld bij Floriday"] })), day.verzendklaar > 0 && (_jsxs(Badge, { className: "bg-green-500/15 text-green-700 hover:bg-green-500/15", variant: "secondary", children: [_jsx(CheckCircle2, { className: "mr-1 h-3.5 w-3.5" }), day.verzendklaar, " verzendklaar"] })), day.voorbereiding > 0 && (_jsxs(Badge, { className: "bg-blue-500/10 text-blue-700 hover:bg-blue-500/10", variant: "secondary", children: [_jsx(Clock, { className: "mr-1 h-3.5 w-3.5" }), day.voorbereiding, " in voorbereiding"] })), onDayClick && day.bestellingen > 0 && (_jsx(Button, { size: "sm", variant: "outline", onClick: (e) => { e.stopPropagation(); onDayClick(day.date); }, children: "Dagdetails" }))] })] }), _jsx(CapacityWarning, { day: capacity, className: "mx-4 mb-4 sm:mx-6" })] }));
 }
 function Stat({ icon, bg, value, label, }) {
     return (_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: `grid h-8 w-8 place-items-center rounded-full ${bg}`, children: icon }), _jsxs("div", { children: [_jsx("div", { className: "text-lg font-bold leading-none", children: value }), _jsx("div", { className: "text-xs text-muted-foreground", children: label })] })] }));

package/dist-lib/components/settings/AfhandelingSettingsCard.js

@@ -47,5 +47,5 @@ export function AfhandelingSettingsCard() {
             toast.error(e instanceof Error ? e.message : "Opslaan mislukt");
         },
     });
-    return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(CalendarClock, { className: "h-5 w-5 text-primary" }), _jsx(CardTitle, { children: "Afhandeling \u2014 Planning" })] }), _jsx(CardDescription, { children: "De pickplanning (pickdagen, picktijd en verdeling over de week) wordt volledig bepaald door de Logistics Engine. Hieronder staan alleen de instellingen van deze module zelf." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "rounded-md border p-4 space-y-4", children: [_jsxs("div", { className: "flex items-start justify-between gap-4", children: [_jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Mail, { className: "h-4 w-4 text-primary" }), _jsx(Label, { htmlFor: "mailEnabled", className: "font-semibold", children: "Aanmeldmail vervoerders" })] }), _jsx("p", { className: "text-xs text-muted-foreground max-w-prose", children: "Verstuurt automatisch een mail met de te verwachten karren naar de vervoerder v\u00F3\u00F3r de aanmelddeadline van het ophaalmoment. E\u00E9n mail per ophaaldag/-moment per vervoerder." })] }), _jsx(Switch, { id: "mailEnabled", checked: mailEnabled, onCheckedChange: setMailEnabled })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "mailLead", children: "Minuten v\u00F3\u00F3r aanmelddeadline versturen" }), _jsx(Input, { id: "mailLead", type: "number", min: 0, max: 1440, value: mailLead, disabled: !mailEnabled, onChange: (e) => setMailLead(Math.max(0, Math.min(1440, Math.floor(Number(e.target.value)) || 0))) })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "mailPurpose", children: "E-mail-doeleinde (purpose)" }), _jsx(Input, { id: "mailPurpose", value: mailPurpose, disabled: !mailEnabled, onChange: (e) => setMailPurpose(e.target.value) }), _jsxs("p", { className: "text-xs text-muted-foreground", children: ["Koppel dit doeleinde in de module ", _jsx("strong", { children: "E-mailkoppeling" }), " aan een actief send-adres. Standaard: ", _jsx("code", { children: "afhandeling_carrier_signup" }), "."] })] })] }), _jsxs("div", { className: "rounded-md bg-muted/50 p-3 text-xs text-muted-foreground", children: [_jsx("strong", { children: "Ophaaltijd" }), " en ", _jsx("strong", { children: "Aanmeldtijd" }), " stel je per vervoerder in (werkdagen v\u00F3\u00F3r bezorgdag). De vervoerder die als ", _jsx("strong", { children: "standaard" }), " is gemarkeerd, wordt gebruikt voor orders zonder eigen vervoerder."] }), _jsx(Button, { onClick: () => mutation.mutate(), disabled: mutation.isPending, children: mutation.isPending ? "Opslaan…" : "Opslaan" })] })] }));
+    return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(CalendarClock, { className: "h-5 w-5 text-primary" }), _jsx(CardTitle, { children: "Afhandeling \u2014 Planning" })] }), _jsx(CardDescription, { children: "De pickplanning (pickdagen, picktijd en verdeling over de week) wordt volledig bepaald door de planning. Hieronder staan alleen de instellingen van deze module zelf." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "rounded-md border p-4 space-y-4", children: [_jsxs("div", { className: "flex items-start justify-between gap-4", children: [_jsxs("div", { className: "space-y-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Mail, { className: "h-4 w-4 text-primary" }), _jsx(Label, { htmlFor: "mailEnabled", className: "font-semibold", children: "Aanmeldmail vervoerders" })] }), _jsx("p", { className: "text-xs text-muted-foreground max-w-prose", children: "Verstuurt automatisch een mail met de te verwachten karren naar de vervoerder v\u00F3\u00F3r de aanmelddeadline van het ophaalmoment. E\u00E9n mail per ophaaldag/-moment per vervoerder." })] }), _jsx(Switch, { id: "mailEnabled", checked: mailEnabled, onCheckedChange: setMailEnabled })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "mailLead", children: "Minuten v\u00F3\u00F3r aanmelddeadline versturen" }), _jsx(Input, { id: "mailLead", type: "number", min: 0, max: 1440, value: mailLead, disabled: !mailEnabled, onChange: (e) => setMailLead(Math.max(0, Math.min(1440, Math.floor(Number(e.target.value)) || 0))) })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "mailPurpose", children: "E-mail-doeleinde (purpose)" }), _jsx(Input, { id: "mailPurpose", value: mailPurpose, disabled: !mailEnabled, onChange: (e) => setMailPurpose(e.target.value) }), _jsxs("p", { className: "text-xs text-muted-foreground", children: ["Koppel dit doeleinde in de module ", _jsx("strong", { children: "E-mailkoppeling" }), " aan een actief send-adres. Standaard: ", _jsx("code", { children: "afhandeling_carrier_signup" }), "."] })] })] }), _jsxs("div", { className: "rounded-md bg-muted/50 p-3 text-xs text-muted-foreground", children: [_jsx("strong", { children: "Ophaaltijd" }), " en ", _jsx("strong", { children: "Aanmeldtijd" }), " stel je per vervoerder in (werkdagen v\u00F3\u00F3r bezorgdag). De vervoerder die als ", _jsx("strong", { children: "standaard" }), " is gemarkeerd, wordt gebruikt voor orders zonder eigen vervoerder."] }), _jsx(Button, { onClick: () => mutation.mutate(), disabled: mutation.isPending, children: mutation.isPending ? "Opslaan…" : "Opslaan" })] })] }));
 }

package/dist-lib/hooks/useConsistencyCheck.d.ts

@@ -1,5 +1,5 @@
 /**
- * Eenmalige controle bij het laden van de agenda. Deze module corrigeert niets
+ * Controle van de Engine, elke 2 minuten opnieuw opgevraagd. Deze module corrigeert niets
  * zelf: bij een afwijking tonen we alleen een discrete melding.
  */
 export declare function useConsistencyCheck(): {

package/dist-lib/hooks/useConsistencyCheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useConsistencyCheck.d.ts","sourceRoot":"","sources":["../../src/hooks/useConsistencyCheck.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,mBAAmB;;EAelC"}
+{"version":3,"file":"useConsistencyCheck.d.ts","sourceRoot":"","sources":["../../src/hooks/useConsistencyCheck.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,mBAAmB;;EAiBlC"}

package/dist-lib/hooks/useConsistencyCheck.js

@@ -1,15 +1,17 @@
 import { useQuery } from "@tanstack/react-query";
 import { supabase } from "../integrations/supabase/moduleClient";
 /**
- * Eenmalige controle bij het laden van de agenda. Deze module corrigeert niets
+ * Controle van de Engine, elke 2 minuten opnieuw opgevraagd. Deze module corrigeert niets
  * zelf: bij een afwijking tonen we alleen een discrete melding.
  */
 export function useConsistencyCheck() {
     const query = useQuery({
         queryKey: ["logistics-consistency-check"],
-        staleTime: Infinity,
+        staleTime: 60000,
+        refetchInterval: 120000,
+        refetchIntervalInBackground: false,
         retry: false,
-        refetchOnWindowFocus: false,
+        refetchOnWindowFocus: true,
         queryFn: async () => {
             const { data, error } = await supabase.rpc("logistics_consistency_check");
             if (error)

package/dist-lib/hooks/useOrderPlanning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderPlanning.d.ts","sourceRoot":"","sources":["../../src/hooks/useOrderPlanning.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAYtG;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,iBAAiB,GACjB,gBAAgB,GAChB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,6EAA6E;IAC7E,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IAC/B,qEAAqE;IACrE,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,gFAAgF;IAChF,cAAc,EAAE,OAAO,CAAC;IACxB,iDAAiD;IACjD,KAAK,EAAE,aAAa,CAAC;IACrB,uEAAuE;IACvE,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,6EAA6E;IAC7E,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,wEAAwE;IACxE,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,wDAAwD;IACxD,iBAAiB,EAAE,YAAY,EAAE,CAAC;IAClC,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mEAAmE;IACnE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAGD,MAAM,WAAW,uBAAuB;IACtC,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,uBAAuB,GAAG,sBAAsB,CAkTxF"}
+{"version":3,"file":"useOrderPlanning.d.ts","sourceRoot":"","sources":["../../src/hooks/useOrderPlanning.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAYtG;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,iBAAiB,GACjB,gBAAgB,GAChB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,6EAA6E;IAC7E,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IAC/B,qEAAqE;IACrE,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,gFAAgF;IAChF,cAAc,EAAE,OAAO,CAAC;IACxB,iDAAiD;IACjD,KAAK,EAAE,aAAa,CAAC;IACrB,uEAAuE;IACvE,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,6EAA6E;IAC7E,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,wEAAwE;IACxE,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,wDAAwD;IACxD,iBAAiB,EAAE,YAAY,EAAE,CAAC;IAClC,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mEAAmE;IACnE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAGD,MAAM,WAAW,uBAAuB;IACtC,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,uBAAuB,GAAG,sBAAsB,CAmTxF"}

package/dist-lib/hooks/useOrderPlanning.js

@@ -11,7 +11,7 @@ import { useCartIndex } from "./useCartIndex";
 import { emitEngineEvent, listComposeTaskRefs } from "../lib/logisticsEngine/engine";
 import { orderRefsFor } from "../lib/orderRefs";
 import { isOpenOrderStatus } from "../lib/orderStatus";
-import { MAX_ATTEMPTS, emitQueueStatus, markInFlight, markResult, resetEmitQueue, selectEmitBatch, } from "../lib/logisticsEngine/emitQueue";
+import { emitQueueStatus, markInFlight, markResult, resetEmitQueue, selectEmitBatch, } from "../lib/logisticsEngine/emitQueue";
 export function useOrderPlanning(range) {
     const from = range?.from ?? null;
     const to = range?.to ?? null;
@@ -34,7 +34,8 @@ export function useOrderPlanning(range) {
                 let message = "Onbekende fout";
                 if (e instanceof Response) {
                     const text = await e.clone().text().catch(() => "");
-                    message = `Floriday-aanvraag mislukt (${e.status}): ${text.slice(0, 200) || e.statusText}`;
+                    message = "Floriday reageert nu niet goed. Probeer het over een paar minuten opnieuw.";
+                    console.warn(`Floriday-aanvraag mislukt (${e.status}): ${text.slice(0, 200) || e.statusText}`);
                 }
                 else if (e instanceof Error) {
                     message = e.message;
@@ -182,7 +183,7 @@ export function useOrderPlanning(range) {
                         cartIndexes: Array.from({ length: carrierCount }, (_, i) => i),
                     },
                 ],
-                reason: `Ingepland door de Logistics Engine (taak ${(pickTask ?? task).task_type}, regelversie ${(pickTask ?? task).rule_version ?? "-"}).`,
+                reason: `Ingepland door de planning (taak ${(pickTask ?? task).task_type}, regelversie ${(pickTask ?? task).rule_version ?? "-"}).`,
                 carrierName: carrier?.name ?? base.carrierName,
             };
             return { order, planning, engineTask: task, awaitingEngine: false, state: "planned", hasComposeTask: true };
@@ -223,7 +224,7 @@ export function useOrderPlanning(range) {
         if (!batch.length) {
             const status = emitQueueStatus(refs);
             if (status.gaveUp.length) {
-                setSignalError(`Melden bij de Logistics Engine is na ${MAX_ATTEMPTS} pogingen gestopt voor ${status.gaveUp.length} order(s): ${status.gaveUp.slice(0, 5).join(", ")}${status.gaveUp.length > 5 ? "…" : ""}. ${status.lastError ?? ""}`.trim());
+                setSignalError(`${status.gaveUp.length} order(s) konden niet automatisch worden ingepland. Open de order en kies ‘Opnieuw inplannen’.`);
             }
             return;
         }
@@ -257,8 +258,8 @@ export function useOrderPlanning(range) {
                 else {
                     const status = emitQueueStatus(refs);
                     setSignalError(status.gaveUp.length
-                        ? `Melden bij de Logistics Engine is na ${MAX_ATTEMPTS} pogingen gestopt voor ${status.gaveUp.length} order(s): ${status.gaveUp.slice(0, 5).join(", ")}${status.gaveUp.length > 5 ? "…" : ""}. ${status.lastError ?? ""}`.trim()
-                        : `Melding aan de Logistics Engine is mislukt (nieuwe poging volgt automatisch). ${result.error ?? ""}`.trim());
+                        ? `${status.gaveUp.length} order(s) konden niet automatisch worden ingepland. Open de order en kies ‘Opnieuw inplannen’.`
+                        : "Inplannen lukt nog niet; er volgt automatisch een nieuwe poging.");
                 }
             }
         })();

package/dist-lib/hooks/usePickAgenda.d.ts

@@ -6,6 +6,10 @@ export interface PickAgendaOrder {
     carts: number;
     plants: number;
     shifted: boolean;
+    /** Orders in deze (buffer)taak; leeg = alleen orderRef. */
+    bufferOrders: string[];
+    /** Unieke kar-id's van deze taak. */
+    cartIds: string[];
     /** Verkoop-module zegt: deze order is afgehandeld (verzonden/geleverd). */
     fulfilled?: boolean;
 }

package/dist-lib/hooks/usePickAgenda.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAQA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AAwCD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EA8GnE"}
+{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAQA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,2DAA2D;IAC3D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,qCAAqC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AA4CD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EAoInE"}

package/dist-lib/hooks/usePickAgenda.js

@@ -16,6 +16,10 @@ function toOrders(value) {
             carts: Number(r.carts ?? 0),
             plants: Number(r.plants ?? 0),
             shifted: Boolean(r.shifted),
+            bufferOrders: Array.isArray(r.bufferOrders) ? r.bufferOrders.map(String).filter(Boolean) : [],
+            cartIds: Array.isArray(r.cartList)
+                ? r.cartList.map((c) => c?.cartId).filter((x) => typeof x === "string" && !!x)
+                : [],
         };
     });
 }
@@ -110,16 +114,43 @@ export function usePickAgenda(from, to) {
             if (to && pickDate > to)
                 continue;
             // "Afgehandeld" volgt uitsluitend de Engine (taak afgemeld), niet de Verkoop-status.
-            const doneCount = orders.filter((o) => o.status === "done" || o.status === "completed").length;
-            const ready = orders.filter((o) => o.status === "ready" || o.status === "done").length;
+            // Tellen per losse order (ook elke order in een buffer) en per unieke kar-id,
+            // gelijk aan Dagdetails. "Afgehandeld" = taak afgemeld of Verkoop-status afgehandeld,
+            // gelijk aan Planning en leveringen.
+            const refsOf = (o) => (o.bufferOrders.length ? o.bufferOrders : [o.orderRef]);
+            const allRefs = new Set();
+            const doneRefs = new Set();
+            const readyRefs = new Set();
+            for (const o of orders) {
+                for (const r of refsOf(o)) {
+                    if (isCancelledRef(r))
+                        continue;
+                    allRefs.add(r);
+                    const engineDone = o.status === "done" || o.status === "completed";
+                    if (engineDone || isFulfilledRef(r))
+                        doneRefs.add(r);
+                    if (o.status === "ready" || engineDone || isFulfilledRef(r))
+                        readyRefs.add(r);
+                }
+            }
+            const cartIds = new Set();
+            let cartsWithoutId = 0;
+            for (const o of orders) {
+                if (o.cartIds.length)
+                    o.cartIds.forEach((c) => cartIds.add(c));
+                else
+                    cartsWithoutId += o.carts || 0;
+            }
+            const doneCount = doneRefs.size;
+            const ready = readyRefs.size;
             out.push({
                 pickDate,
                 orders,
-                orderCount: orders.length,
-                cartCount: orders.reduce((s, o) => s + (o.carts || 0), 0),
+                orderCount: allRefs.size,
+                cartCount: cartIds.size + cartsWithoutId,
                 plantCount: orders.reduce((s, o) => s + (o.plants || 0), 0),
                 ready,
-                inPreparation: Math.max(0, orders.length - ready),
+                inPreparation: Math.max(0, allRefs.size - ready),
                 shiftedCount: orders.filter((o) => o.shifted).length,
                 doneCount,
             });

package/dist-lib/integrations/supabase/previewAuthStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"previewAuthStorage.d.ts","sourceRoot":"","sources":["../../../src/integrations/supabase/previewAuthStorage.ts"],"names":[],"mappings":"AAIA,wBAAgB,sBAAsB;mBA2Db,MAAM;mBAeZ,MAAM,SAAS,MAAM;sBASlB,MAAM;cAK3B"}
+{"version":3,"file":"previewAuthStorage.d.ts","sourceRoot":"","sources":["../../../src/integrations/supabase/previewAuthStorage.ts"],"names":[],"mappings":"AAIA,wBAAgB,sBAAsB;mBA6Db,MAAM;mBAwBZ,MAAM,SAAS,MAAM;sBASlB,MAAM;cAM3B"}

package/dist-lib/integrations/supabase/previewAuthStorage.js

@@ -61,21 +61,38 @@ export function brokeredPreviewStorage() {
     // The editor may not be listening yet at the first getItem, so retry once.
     let firstGet = true;
     const RETRY_DELAY = 250;
+    // Blocked third-party storage throws here; seeding must not break broker reads.
+    const readLocal = (key) => { try {
+        return localStorage.getItem(key);
+    }
+    catch {
+        return undefined;
+    } };
     return {
         getItem: async (key) => {
-            let res = await request('lovable-preview-auth:get', key);
+            // Sent with GET and REMOVE so an editor that never cached this session can check or revoke it.
+            const local = readLocal(key);
+            let res = await request('lovable-preview-auth:get', key, local ?? undefined);
             if (!res && firstGet) {
                 await new Promise((r) => setTimeout(r, RETRY_DELAY));
-                res = await request('lovable-preview-auth:get', key);
+                res = await request('lovable-preview-auth:get', key, local ?? undefined);
             }
             firstGet = false;
             // '' is the logout tombstone: clear the local copy too so it can't resurrect if
             // the broker later goes silent. A null reply means never-synced -> keep local.
             if (res && res.ok && typeof res.value === 'string') {
                 if (res.value === '') {
-                    localStorage.removeItem(key);
+                    if (local !== undefined && readLocal(key) === local)
+                        localStorage.removeItem(key);
                     return null;
                 }
+                // Seed this origin so a new tab, whose editor holds no session, stays signed in.
+                if (local === null && readLocal(key) === null) {
+                    try {
+                        localStorage.setItem(key, res.value);
+                    }
+                    catch { /* storage full: still return the editor's session */ }
+                }
                 return res.value;
             }
             return localStorage.getItem(key);
@@ -92,8 +109,9 @@ export function brokeredPreviewStorage() {
             });
         },
         removeItem: (key) => {
+            const local = readLocal(key);
             localStorage.removeItem(key);
-            return request('lovable-preview-auth:remove', key).then(() => undefined);
+            return request('lovable-preview-auth:remove', key, local ?? undefined).then(() => undefined);
         },
     };
 }