@flowselections/floriday-afhandeling-module 1.0.9 → 1.0.10

package/dist-lib/components/afhandeling/WeekAgendaView.d.ts

@@ -6,7 +6,8 @@ export interface WeekAgendaViewProps {
     mode: WeekAgendaMode;
     isLoading?: boolean;
     onOrderClick?: (order: FloridayOrder) => void;
+    onDayClick?: (date: Date) => void;
     title?: string;
 }
-export declare function WeekAgendaView({ planned, mode, isLoading, onOrderClick, title, }: WeekAgendaViewProps): import("react").JSX.Element;
+export declare function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayClick, title, }: WeekAgendaViewProps): import("react").JSX.Element;
 //# sourceMappingURL=WeekAgendaView.d.ts.map

package/dist-lib/components/afhandeling/WeekAgendaView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeekAgendaView.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/WeekAgendaView.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAEnF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAmDD,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,KAAK,GACN,EAAE,mBAAmB,+BA0FrB"}
+{"version":3,"file":"WeekAgendaView.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/WeekAgendaView.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAEnF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA4DD,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,UAAU,EACV,KAAK,GACN,EAAE,mBAAmB,+BAwHrB"}

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

@@ -37,7 +37,7 @@ const MODE_LABELS = {
     "transport-register": { summary: "Aanmeldingen deze week" },
     pick: { summary: "Te picken deze week" },
 };
-export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, title, }) {
+export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayClick, title, }) {
     const [cursor, setCursor] = useState(() => {
         const d = new Date();
         d.setHours(0, 0, 0, 0);
@@ -49,21 +49,51 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, title,
     const days = useMemo(() => {
         return Array.from({ length: 7 }, (_, i) => {
             const date = addDays(weekStart, i);
-            const dayPlanned = planned.filter((p) => {
-                const d = dateForPlanned(p, mode);
-                return d ? isSameDay(d, date) : false;
-            });
-            const dayOrders = dayPlanned.map((p) => p.order);
-            const karren = dayOrders.reduce((s, o) => s + (o.lineCount || 0), 0);
-            const planten = dayOrders.reduce((s, o) => s + (o.lineCount || 0) * 10, 0);
-            const verzendklaar = dayOrders.filter(isOrderReady).length;
-            const voorbereiding = dayOrders.length - verzendklaar;
-            const movedEarlierOrderIds = new Set(dayPlanned.filter((p) => isMovedEarlier(p, mode)).map((p) => p.order.id));
+            const entries = [];
+            for (const p of planned) {
+                if (!p.planning)
+                    continue;
+                if (mode === "pick") {
+                    const assigns = p.planning.pickAssignments ?? [
+                        { date: p.planning.scheduledPickDate ?? p.planning.pickStartDate, cartCount: p.order.cartCount ?? 0 },
+                    ];
+                    const total = assigns.length;
+                    assigns.forEach((a, idx) => {
+                        if (!isSameDay(a.date, date))
+                            return;
+                        const totalCarts = p.order.cartCount ?? 0;
+                        const ratio = totalCarts > 0 ? a.cartCount / totalCarts : 1 / Math.max(total, 1);
+                        entries.push({
+                            order: p.order,
+                            cartCount: a.cartCount,
+                            plantCount: Math.round((p.order.plantCount ?? 0) * ratio),
+                            movedEarlier: a.date.getTime() !== p.planning.pickStartDate.getTime(),
+                            splitPart: total > 1 ? { index: idx + 1, total } : undefined,
+                        });
+                    });
+                }
+                else {
+                    const d = dateForPlanned(p, mode);
+                    if (!d || !isSameDay(d, date))
+                        continue;
+                    entries.push({
+                        order: p.order,
+                        cartCount: p.order.cartCount ?? 0,
+                        plantCount: p.order.plantCount ?? 0,
+                        movedEarlier: false,
+                    });
+                }
+            }
+            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 movedEarlierOrderIds = new Set(entries.filter((e) => e.movedEarlier).map((e) => e.order.id));
             return {
                 date,
-                orders: dayOrders,
+                entries,
                 movedEarlierOrderIds,
-                bestellingen: dayOrders.length,
+                bestellingen: entries.length,
                 karren,
                 planten,
                 verzendklaar,
@@ -86,20 +116,25 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, title,
         d.setHours(0, 0, 0, 0);
         setCursor(startOfWeek(d));
     };
-    return (_jsxs("div", { className: "space-y-4", 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" })] })] })] }), _jsxs("div", { className: "grid 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: "space-y-2", children: 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 }, day.date.toISOString()))) })] }));
+    return (_jsxs("div", { className: "space-y-4", 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" })] })] })] }), _jsxs("div", { className: "grid 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: "space-y-2", children: 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 }, day.date.toISOString()))) })] }));
 }
 function SummaryCard({ label, value, tone, }) {
     const valueClass = tone === "success" ? "text-green-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 }) {
+function DayRow({ day, onOrderClick, onDayClick }) {
     const weekdayIdx = (day.date.getDay() + 6) % 7;
     const today = new Date();
     today.setHours(0, 0, 0, 0);
     const isToday = isSameDay(day.date, today);
-    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: [day.movedEarlierOrderIds.size > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat vervroegd is ingepland door Pickverdeling.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.movedEarlierOrderIds.size, " vervroegd"] })), 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"] }))] })] }), onOrderClick && day.orders.length > 0 && (_jsx("div", { className: "border-t px-4 py-2 sm:px-6", children: _jsx("div", { className: "flex flex-wrap gap-2", children: day.orders.map((o) => {
-                        const moved = day.movedEarlierOrderIds.has(o.id);
-                        return (_jsxs("button", { onClick: () => onOrderClick(o), title: moved ? "Deze order is eerder ingepland vanwege Pickverdeling." : undefined, className: `flex items-center gap-1 rounded border px-2 py-1 text-xs hover:bg-muted ${moved ? "border-purple-300 bg-purple-50" : ""}`, children: [moved && _jsx(Scale, { className: "h-3 w-3 text-purple-600" }), _jsx("span", { className: "font-medium", children: o.orderNumber }), _jsxs("span", { className: "ml-1 text-muted-foreground", children: ["\u00B7 ", o.customerName] })] }, o.id));
+    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: [day.movedEarlierOrderIds.size > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat vervroegd is ingepland door Pickverdeling.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.movedEarlierOrderIds.size, " vervroegd"] })), 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" }))] })] }), onOrderClick && day.entries.length > 0 && (_jsx("div", { className: "border-t px-4 py-2 sm:px-6", children: _jsx("div", { className: "flex flex-wrap gap-2", children: day.entries.map((e, idx) => {
+                        const moved = e.movedEarlier;
+                        const split = e.splitPart;
+                        return (_jsxs("button", { onClick: () => onOrderClick(e.order), title: split
+                                ? `Deel ${split.index}/${split.total} — ${e.cartCount} karren deze dag (verdeeld picken).`
+                                : moved
+                                    ? "Deze order is eerder ingepland vanwege Pickverdeling."
+                                    : undefined, className: `flex items-center gap-1 rounded border px-2 py-1 text-xs hover:bg-muted ${moved || split ? "border-purple-300 bg-purple-50" : ""}`, children: [(moved || split) && _jsx(Scale, { className: "h-3 w-3 text-purple-600" }), _jsx("span", { className: "font-medium", children: e.order.orderNumber }), _jsxs("span", { className: "ml-1 text-muted-foreground", children: ["\u00B7 ", e.order.customerName] }), _jsxs("span", { className: "ml-1 text-purple-700", children: ["\u00B7 ", e.cartCount, " karren", split ? ` (deel ${split.index}/${split.total})` : ""] })] }, `${e.order.id}-${idx}`));
                     }) }) }))] }));
 }
 function Stat({ icon, bg, value, label, }) {

package/dist-lib/components/pickstation/PakbonTemplate.d.ts

@@ -1,5 +1,5 @@
 import type { PickstationOrder } from "../../lib/pickstationTypes";
-/** Returns a fully self-contained printable HTML document for one packing slip. */
+/** Returns a fully self-contained printable HTML document for one packing slip per cart. */
 export declare function renderPakbonHtml(order: {
     id: string;
     orderNumber: string;
@@ -7,9 +7,12 @@ export declare function renderPakbonHtml(order: {
     country: string | null;
     deliveryDate: string | null;
     pickDate: string;
+    cartIndex: number;
+    cartTotal: number;
+    cratesOnCart: number | null;
     lines: {
         description: string;
-        quantity: number | null;
+        crates: number | null;
         unit: string | null;
     }[];
 }): string;

package/dist-lib/components/pickstation/PakbonTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PakbonTemplate.d.ts","sourceRoot":"","sources":["../../../src/components/pickstation/PakbonTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;CAChF,GAAG,MAAM,CAkET;AAYD,YAAY,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"PakbonTemplate.d.ts","sourceRoot":"","sources":["../../../src/components/pickstation/PakbonTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;CAC9E,GAAG,MAAM,CAqET;AAWD,YAAY,EAAE,gBAAgB,EAAE,CAAC"}

package/dist-lib/components/pickstation/PakbonTemplate.js

@@ -1,4 +1,4 @@
-/** Returns a fully self-contained printable HTML document for one packing slip. */
+/** Returns a fully self-contained printable HTML document for one packing slip per cart. */
 export function renderPakbonHtml(order) {
     const fmt = (d) => {
         if (!d)
@@ -13,21 +13,24 @@ export function renderPakbonHtml(order) {
             .map((l) => `
         <tr>
           <td>${escapeHtml(l.description)}</td>
-          <td style="text-align:right">${l.quantity ?? ""}</td>
+          <td style="text-align:right">${l.crates ?? ""}</td>
           <td>${escapeHtml(l.unit ?? "")}</td>
         </tr>`)
             .join("")
         : `<tr><td colspan="3" style="text-align:center;color:#666">Geen regels</td></tr>`;
+    const cartLabel = `Kar ${order.cartIndex} / ${order.cartTotal}`;
+    const fustenLabel = order.cratesOnCart != null ? `${order.cratesOnCart}` : "—";
     return `<!doctype html>
 <html lang="nl">
 <head>
   <meta charset="utf-8">
-  <title>Pakbon ${escapeHtml(order.orderNumber)}</title>
+  <title>Pakbon ${escapeHtml(order.orderNumber)} · ${escapeHtml(cartLabel)}</title>
   <style>
     @page { size: A4; margin: 16mm; }
     body { font-family: -apple-system, "Segoe UI", Helvetica, Arial, sans-serif; color:#111; }
     h1 { margin: 0 0 4px; font-size: 26px; }
     .sub { color:#444; margin-bottom: 18px; }
+    .cart-badge { display:inline-block; margin-left:8px; padding:2px 10px; border-radius:999px; background:#111; color:#fff; font-size:14px; vertical-align:middle; }
     .grid { display: grid; grid-template-columns: 1fr 1fr; gap: 12px 24px; margin: 18px 0 22px; }
     .grid div { font-size: 14px; }
     .label { color:#666; font-size: 11px; text-transform: uppercase; letter-spacing: .04em; }
@@ -35,13 +38,12 @@ export function renderPakbonHtml(order) {
     table { width:100%; border-collapse: collapse; font-size: 14px; }
     th, td { padding: 8px 6px; border-bottom: 1px solid #ddd; vertical-align: top; }
     th { text-align: left; background:#f5f5f5; }
-    .barcode { margin-top: 24px; font-family: "Libre Barcode 128", monospace; font-size: 56px; line-height: 1; }
-    .barcode-fallback { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 18px; letter-spacing: 4px; padding: 8px 12px; border: 2px solid #111; display: inline-block; }
+    .barcode-fallback { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 18px; letter-spacing: 4px; padding: 8px 12px; border: 2px solid #111; display: inline-block; margin-top: 18px; }
     .footer { margin-top: 28px; font-size: 11px; color:#666; }
   </style>
 </head>
 <body>
-  <h1>Pakbon</h1>
+  <h1>Pakbon <span class="cart-badge">${escapeHtml(cartLabel)}</span></h1>
   <div class="sub">Order ${escapeHtml(order.orderNumber)}</div>
 
   <div class="grid">
@@ -49,18 +51,18 @@ export function renderPakbonHtml(order) {
     <div><div class="label">Land</div><div class="value">${escapeHtml(order.country ?? "—")}</div></div>
     <div><div class="label">Leverdatum</div><div class="value">${fmt(order.deliveryDate)}</div></div>
     <div><div class="label">Pickdatum</div><div class="value">${fmt(order.pickDate)}</div></div>
+    <div><div class="label">Kar</div><div class="value">${escapeHtml(cartLabel)}</div></div>
+    <div><div class="label">Fusten op deze kar</div><div class="value">${escapeHtml(fustenLabel)}</div></div>
   </div>
 
   <table>
-    <thead><tr><th>Omschrijving</th><th style="text-align:right;width:90px">Aantal</th><th style="width:90px">Eenheid</th></tr></thead>
+    <thead><tr><th>Omschrijving</th><th style="text-align:right;width:90px">Fusten</th><th style="width:90px">Eenheid</th></tr></thead>
     <tbody>${rows}</tbody>
   </table>
 
-  <div class="barcode-fallback">*${escapeHtml(order.orderNumber)}*</div>
+  <div class="barcode-fallback">*${escapeHtml(order.orderNumber)}-${order.cartIndex}*</div>
 
   <div class="footer">Geprint via Pickstation · ${new Date().toLocaleString("nl-NL")}</div>
-
-  <script>window.addEventListener("load", function(){ setTimeout(function(){ try{ window.focus(); window.print(); }catch(e){} }, 100); });</script>
 </body>
 </html>`;
 }

package/dist-lib/components/settings/AfhandelingSettingsCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AfhandelingSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/components/settings/AfhandelingSettingsCard.tsx"],"names":[],"mappings":"AAqBA,wBAAgB,uBAAuB,gCAsItC"}
+{"version":3,"file":"AfhandelingSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/components/settings/AfhandelingSettingsCard.tsx"],"names":[],"mappings":"AAqBA,wBAAgB,uBAAuB,gCAoMtC"}

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

@@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useServerFn } from "@tanstack/react-start";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle, Button, Input, Label, Switch, toast, } from "@flowselections/core";
-import { CalendarClock, Scale } from "lucide-react";
+import { CalendarClock, Mail, Scale } from "lucide-react";
 import { getAfhandelingSettings, updateAfhandelingSettings, } from "../../lib/afhandelingSettings.functions";
 export function AfhandelingSettingsCard() {
     const qc = useQueryClient();
@@ -21,6 +21,9 @@ export function AfhandelingSettingsCard() {
                     transportRegisterDaysBefore: 1,
                     pickDistributionEnabled: false,
                     maxWorkdaysEarlierPick: 2,
+                    signupMailEnabled: false,
+                    signupMailLeadMinutes: 60,
+                    signupMailPurpose: "afhandeling_carrier_signup",
                 };
             }
         },
@@ -29,12 +32,18 @@ export function AfhandelingSettingsCard() {
     const [registerDays, setRegisterDays] = useState(1);
     const [distributionEnabled, setDistributionEnabled] = useState(false);
     const [maxEarlier, setMaxEarlier] = useState(2);
+    const [mailEnabled, setMailEnabled] = useState(false);
+    const [mailLead, setMailLead] = useState(60);
+    const [mailPurpose, setMailPurpose] = useState("afhandeling_carrier_signup");
     useEffect(() => {
         if (data) {
             setPickDays(data.pickDaysBeforeTransport);
             setRegisterDays(data.transportRegisterDaysBefore);
             setDistributionEnabled(Boolean(data.pickDistributionEnabled));
             setMaxEarlier(data.maxWorkdaysEarlierPick ?? 2);
+            setMailEnabled(Boolean(data.signupMailEnabled));
+            setMailLead(data.signupMailLeadMinutes ?? 60);
+            setMailPurpose(data.signupMailPurpose ?? "afhandeling_carrier_signup");
         }
     }, [data]);
     const mutation = useMutation({
@@ -44,17 +53,20 @@ export function AfhandelingSettingsCard() {
                 transportRegisterDaysBefore: registerDays,
                 pickDistributionEnabled: distributionEnabled,
                 maxWorkdaysEarlierPick: maxEarlier,
+                signupMailEnabled: mailEnabled,
+                signupMailLeadMinutes: mailLead,
+                signupMailPurpose: mailPurpose,
             },
         }),
-        onSuccess: () => {
-            qc.invalidateQueries({ queryKey: ["afhandeling", "settings"] });
-            qc.invalidateQueries({ queryKey: ["floriday", "orders"] });
-            toast.success("Instellingen opgeslagen");
+        onSuccess: async () => {
+            const { invalidatePlanning } = await import("../../lib/invalidatePlanning");
+            await invalidatePlanning(qc);
+            toast.success("Instellingen opgeslagen — planning herberekend");
         },
         onError: (e) => {
             toast.error(e instanceof Error ? e.message : "Opslaan mislukt");
         },
     });
     const clamp = (n) => Math.max(0, Math.min(30, Math.floor(n) || 0));
-    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: "Centrale werkdag-instellingen voor de automatische order\u00ADplanning. Alle berekeningen tellen alleen werkdagen (ma\u2013vr)." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "pickDays", children: "Aantal pickdagen (werkdagen v\u00F3\u00F3r ophaaldag)" }), _jsx(Input, { id: "pickDays", type: "number", min: 0, max: 30, value: pickDays, onChange: (e) => setPickDays(clamp(Number(e.target.value))) }), _jsx("p", { className: "text-xs text-muted-foreground", children: "Wordt vanaf de berekende ophaaldag teruggeteld om de uiterste pickdatum te bepalen." })] }), _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(Scale, { className: "h-4 w-4 text-primary" }), _jsx(Label, { htmlFor: "pickDistribution", className: "font-semibold", children: "Pickverdeling" })] }), _jsx("p", { className: "text-xs text-muted-foreground max-w-prose", children: "Verdeelt de pickbelasting automatisch over werkdagen. Orders mogen eerder ingepland worden, maar nooit later dan de berekende uiterste pickdatum \u2014 leverbetrouwbaarheid blijft gegarandeerd." })] }), _jsx(Switch, { id: "pickDistribution", checked: distributionEnabled, onCheckedChange: setDistributionEnabled })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "maxEarlier", children: "Maximaal aantal werkdagen eerder picken" }), _jsx(Input, { id: "maxEarlier", type: "number", min: 0, max: 30, value: maxEarlier, disabled: !distributionEnabled, onChange: (e) => setMaxEarlier(clamp(Number(e.target.value))) }), _jsx("p", { className: "text-xs text-muted-foreground", children: "0 = geen vervroeging. Bijv. 2 = orders mogen maximaal 2 werkdagen voor hun uiterste pickdatum ingepland worden." })] })] }), _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: "Centrale werkdag-instellingen voor de automatische order\u00ADplanning. Alle berekeningen tellen alleen werkdagen (ma\u2013vr)." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "pickDays", children: "Aantal pickdagen (werkdagen v\u00F3\u00F3r ophaaldag)" }), _jsx(Input, { id: "pickDays", type: "number", min: 0, max: 30, value: pickDays, onChange: (e) => setPickDays(clamp(Number(e.target.value))) }), _jsx("p", { className: "text-xs text-muted-foreground", children: "Wordt vanaf de berekende ophaaldag teruggeteld om de uiterste pickdatum te bepalen." })] }), _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(Scale, { className: "h-4 w-4 text-primary" }), _jsx(Label, { htmlFor: "pickDistribution", className: "font-semibold", children: "Pickverdeling" })] }), _jsx("p", { className: "text-xs text-muted-foreground max-w-prose", children: "Verdeelt de pickbelasting automatisch over werkdagen. Orders mogen eerder ingepland worden, maar nooit later dan de berekende uiterste pickdatum \u2014 leverbetrouwbaarheid blijft gegarandeerd." })] }), _jsx(Switch, { id: "pickDistribution", checked: distributionEnabled, onCheckedChange: setDistributionEnabled })] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { htmlFor: "maxEarlier", children: "Maximaal aantal werkdagen eerder picken" }), _jsx(Input, { id: "maxEarlier", type: "number", min: 0, max: 30, value: maxEarlier, disabled: !distributionEnabled, onChange: (e) => setMaxEarlier(clamp(Number(e.target.value))) }), _jsx("p", { className: "text-xs text-muted-foreground", children: "0 = geen vervroeging. Bijv. 2 = orders mogen maximaal 2 werkdagen voor hun uiterste pickdatum ingepland worden." })] })] }), _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/useOrderPlanning.d.ts

@@ -1,4 +1,5 @@
 import type { FloridayOrder } from "../lib/floriday.functions";
+import { type CartOverride } from "../lib/cartAssignments.functions";
 import { type OrderPlanning } from "../lib/planning";
 export interface PlannedOrder {
     order: FloridayOrder;
@@ -6,8 +7,10 @@ export interface PlannedOrder {
 }
 export interface UseOrderPlanningResult {
     planned: PlannedOrder[];
+    overrides: CartOverride[];
     isLoading: boolean;
     error?: string;
+    warning?: string;
     refetch: () => void;
 }
 export declare function useOrderPlanning(): UseOrderPlanningResult;

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;AAI/D,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,wBAAgB,gBAAgB,IAAI,sBAAsB,CA+EzD"}
+{"version":3,"file":"useOrderPlanning.d.ts","sourceRoot":"","sources":["../../src/hooks/useOrderPlanning.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,wBAAgB,gBAAgB,IAAI,sBAAsB,CAuHzD"}

package/dist-lib/hooks/useOrderPlanning.js

@@ -4,16 +4,25 @@ import { useServerFn } from "@tanstack/react-start";
 import { getFloridayOrders } from "../lib/floriday.functions";
 import { getAfhandelingSettings } from "../lib/afhandelingSettings.functions";
 import { listCarriers } from "../lib/carriers.functions";
+import { listCartOverrides } from "../lib/cartAssignments.functions";
 import { calculateOrderPlanning, distributePickDates, DEFAULT_PICKUP_MOMENT, } from "../lib/planning";
 export function useOrderPlanning() {
     const fetchOrders = useServerFn(getFloridayOrders);
     const fetchSettings = useServerFn(getAfhandelingSettings);
     const fetchCarriers = useServerFn(listCarriers);
+    const fetchOverrides = useServerFn(listCartOverrides);
     const ordersQuery = useQuery({
         queryKey: ["floriday", "orders"],
         queryFn: async () => {
             try {
-                return await fetchOrders();
+                const result = await fetchOrders();
+                if (result.error) {
+                    console.warn("[useOrderPlanning] orders loaded with warning", {
+                        message: result.error,
+                        orderCount: result.orders.length,
+                    });
+                }
+                return result;
             }
             catch (e) {
                 let message = "Onbekende fout";
@@ -27,6 +36,10 @@ export function useOrderPlanning() {
                 else {
                     message = String(e);
                 }
+                console.error("[useOrderPlanning] orders load failed", {
+                    message,
+                    action: "fetch planning orders",
+                });
                 return { orders: [], error: message };
             }
         },
@@ -55,6 +68,18 @@ export function useOrderPlanning() {
         },
         retry: false,
     });
+    const overridesQuery = useQuery({
+        queryKey: ["cart-overrides"],
+        queryFn: async () => {
+            try {
+                return await fetchOverrides();
+            }
+            catch {
+                return { overrides: [] };
+            }
+        },
+        retry: false,
+    });
     const planned = useMemo(() => {
         const orders = ordersQuery.data?.orders ?? [];
         const settings = settingsQuery.data ?? {
@@ -64,10 +89,18 @@ export function useOrderPlanning() {
             maxWorkdaysEarlierPick: 2,
         };
         const carriers = carriersQuery.data?.carriers ?? [];
+        const overrides = overridesQuery.data?.overrides ?? [];
         const defaultCarrier = carriers.find((c) => c.is_default);
         const moments = defaultCarrier && defaultCarrier.pickup_moments.length > 0
             ? defaultCarrier.pickup_moments
             : [DEFAULT_PICKUP_MOMENT];
+        const overrideMap = new Map();
+        for (const o of overrides) {
+            overrideMap.set(`${o.order_source}#${o.order_id}#${o.cart_index}`, {
+                date: new Date(o.pick_date),
+                movedFromDate: o.moved_from_date ? new Date(o.moved_from_date) : null,
+            });
+        }
         const initial = orders.map((order) => ({
             order,
             planning: calculateOrderPlanning(order.deliveryDate, {
@@ -76,15 +109,23 @@ export function useOrderPlanning() {
                 orderCreatedAt: order.createdAt,
             }),
         }));
-        return distributePickDates(initial, {
+        const distributed = distributePickDates(initial, {
             enabled: Boolean(settings.pickDistributionEnabled),
             maxWorkdaysEarlier: settings.maxWorkdaysEarlierPick ?? 0,
+            getCartCount: (it) => it.order.cartCount ?? 1,
+            getCartOverride: (it, idx) => {
+                const src = it.order.source;
+                return overrideMap.get(`${src}#${it.order.id}#${idx}`) ?? null;
+            },
         });
-    }, [ordersQuery.data, settingsQuery.data, carriersQuery.data]);
+        return distributed;
+    }, [ordersQuery.data, settingsQuery.data, carriersQuery.data, overridesQuery.data]);
     return {
         planned,
-        isLoading: ordersQuery.isLoading || settingsQuery.isLoading || carriersQuery.isLoading,
-        error: ordersQuery.data?.error,
-        refetch: () => { void ordersQuery.refetch(); },
+        overrides: overridesQuery.data?.overrides ?? [],
+        isLoading: ordersQuery.isLoading || settingsQuery.isLoading || carriersQuery.isLoading || overridesQuery.isLoading,
+        error: ordersQuery.data?.orders?.length ? undefined : ordersQuery.data?.error,
+        warning: ordersQuery.data?.orders?.length ? ordersQuery.data?.error : undefined,
+        refetch: () => { void ordersQuery.refetch(); void overridesQuery.refetch(); },
     };
 }