@flowselections/floriday-verkoop-module 1.0.90 → 1.0.93

package/dist-lib/lib/invoice-timing.check.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=invoice-timing.check.d.ts.map

package/dist-lib/lib/invoice-timing.check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"invoice-timing.check.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.check.ts"],"names":[],"mappings":""}

package/dist-lib/lib/invoice-timing.check.js

@@ -0,0 +1,19 @@
+// Controle factuurtijdstip in Nederlandse tijd. Draai: bun src/lib/invoice-timing.check.ts
+import { computeInvoiceDueAt, DEFAULT_INVOICE_TIMING } from "./invoice-timing.js";
+let failed = 0;
+function check(name, got, want) {
+    const ok = got === want;
+    if (!ok)
+        failed++;
+    console.log(`${ok ? "OK  " : "FOUT"} ${name}: ${got}${ok ? "" : ` (verwacht ${want})`}`);
+}
+const s = { ...DEFAULT_INVOICE_TIMING, timeOfDay: "18:00" };
+check("zomertijd 21-10 18:00 NL = 16:00 UTC", computeInvoiceDueAt({ expectedDeliveryDate: "2026-10-21" }, s), "2026-10-21T16:00:00.000Z");
+check("wintertijd 2-11 18:00 NL = 17:00 UTC", computeInvoiceDueAt({ expectedDeliveryDate: "2026-11-02" }, s), "2026-11-02T17:00:00.000Z");
+check("+1 dag over de omschakeling (24-10 → 25-10, wintertijd)", computeInvoiceDueAt({ expectedDeliveryDate: "2026-10-24" }, { ...s, offsetDays: 1 }), "2026-10-25T17:00:00.000Z");
+check("tijdstip-ijkpunt laat op de avond telt Nederlandse kalenderdag", computeInvoiceDueAt({ createdAt: "2026-10-20T22:30:00Z" }, { ...s, anchor: "order_created", offsetDays: 1 }), "2026-10-22T16:00:00.000Z");
+if (failed) {
+    console.error(`${failed} controle(s) mislukt`);
+    process.exit(1);
+}
+console.log("Alle controles geslaagd");

package/dist-lib/lib/invoice-timing.d.ts

@@ -29,6 +29,8 @@ export interface InvoiceAnchorInput {
     selfPickup?: boolean;
 }
 export declare function normalizeTimeOfDay(value: unknown): string;
+/** Zet de kalenderdag van `date` op tijdstip T in Nederlandse tijd (zomer-/wintertijd). */
+export declare function applyTime(date: Date, timeOfDay: string): Date;
 /**
  * Berekent het moment waarop de order gefactureerd mag worden.
  * Geeft `null` wanneer het ijkpunt (nog) onbekend is.

package/dist-lib/lib/invoice-timing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoice-timing.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,WAAW,GACX,QAAQ,GACR,SAAS,GACT,mBAAmB,GACnB,aAAa,GACb,eAAe,CAAC;AAEpB,eAAO,MAAM,eAAe,EAAE;IAAE,EAAE,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAQ/E,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,aAAa,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,EAAE,qBAUpC,CAAC;AAEF,kFAAkF;AAClF,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOzD;AA+ED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,qBAAqB,GAC9B,MAAM,GAAG,IAAI,CAef;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,SAAS,UAAQ,GAAG,MAAM,CAWhG"}
+{"version":3,"file":"invoice-timing.d.ts","sourceRoot":"","sources":["../../src/lib/invoice-timing.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,WAAW,GACX,QAAQ,GACR,SAAS,GACT,mBAAmB,GACnB,aAAa,GACb,eAAe,CAAC;AAEpB,eAAO,MAAM,eAAe,EAAE;IAAE,EAAE,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAQ/E,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,aAAa,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,EAAE,qBAUpC,CAAC;AAEF,kFAAkF;AAClF,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOzD;AAoDD,2FAA2F;AAC3F,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAS7D;AAqCD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,qBAAqB,GAC9B,MAAM,GAAG,IAAI,CAef;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,SAAS,UAAQ,GAAG,MAAM,CAWhG"}

package/dist-lib/lib/invoice-timing.js

@@ -66,11 +66,29 @@ function addDays(date, days, businessOnly) {
     }
     return out;
 }
-function applyTime(date, timeOfDay) {
+const INVOICE_TIME_ZONE = "Europe/Amsterdam";
+/** Verschil (ms) tussen Amsterdamse kloktijd en UTC op dit moment. */
+function zoneOffsetMs(at) {
+    const parts = new Intl.DateTimeFormat("en-US", {
+        timeZone: INVOICE_TIME_ZONE,
+        hourCycle: "h23",
+        year: "numeric", month: "2-digit", day: "2-digit",
+        hour: "2-digit", minute: "2-digit", second: "2-digit",
+    }).formatToParts(at);
+    const get = (t) => Number(parts.find((p) => p.type === t)?.value ?? 0);
+    const asUtc = Date.UTC(get("year"), get("month") - 1, get("day"), get("hour"), get("minute"), get("second"));
+    return asUtc - at.getTime();
+}
+/** Zet de kalenderdag van `date` op tijdstip T in Nederlandse tijd (zomer-/wintertijd). */
+export function applyTime(date, timeOfDay) {
     const [h, m] = normalizeTimeOfDay(timeOfDay).split(":").map(Number);
-    const out = new Date(date.getTime());
-    out.setUTCHours(h ?? 18, m ?? 0, 0, 0);
-    return out;
+    // Kalenderdag volgens Amsterdam (bij tijdstip-ijkpunten), anders de UTC-datum.
+    const off0 = zoneOffsetMs(date);
+    const local = new Date(date.getTime() + off0);
+    const wall = Date.UTC(local.getUTCFullYear(), local.getUTCMonth(), local.getUTCDate(), h ?? 18, m ?? 0, 0, 0);
+    let guess = wall - zoneOffsetMs(new Date(wall));
+    guess = wall - zoneOffsetMs(new Date(guess));
+    return new Date(guess);
 }
 function anchorDate(anchor, input) {
     switch (anchor) {

package/dist-lib/lib/order-departure.check.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=order-departure.check.d.ts.map

package/dist-lib/lib/order-departure.check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"order-departure.check.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.check.ts"],"names":[],"mappings":""}

package/dist-lib/lib/order-departure.check.js

@@ -0,0 +1,25 @@
+// Controle weergave ophaalmoment. Draai: bun src/lib/order-departure.check.ts
+import { departureView, normalizeDeparture } from "./order-departure.js";
+let failed = 0;
+function check(name, got, want) {
+    const ok = got === want;
+    if (!ok)
+        failed++;
+    console.log(`${ok ? "OK  " : "FOUT"} ${name}: ${got}${ok ? "" : ` (verwacht ${want})`}`);
+}
+const ho = departureView(normalizeDeparture({
+    ok: true, departureAt: "2026-10-20T13:00:00Z", signupDeadline: "2026-10-20T11:00:00Z", lateSignup: false,
+}));
+check("HO-2601441", ho.text, "di 20 okt 15:00 ophalen · aanmelden di 20 okt 13:00");
+check("wintertijd", departureView(normalizeDeparture({ ok: true, departureAt: "2026-11-02T14:00:00Z" })).short, "ma 2 nov 15:00");
+check("te laat aangemeld", departureView(normalizeDeparture({ ok: true, departureAt: "2026-10-20T13:00:00Z", lateSignup: true })).lateSignup, true);
+const bad = departureView(normalizeDeparture({ ok: false, reason: "Geen vervoerder gekozen", departureAt: "2026-10-20T13:00:00Z" }));
+check("ok=false: geen tijd", bad.text, null);
+check("ok=false: reden", bad.reason, "Geen vervoerder gekozen");
+check("geen antwoord: geen tijd", departureView(null).text, null);
+check("ontbrekende velden", normalizeDeparture({ ok: true })?.departureAt, null);
+if (failed) {
+    console.error(`${failed} controle(s) mislukt`);
+    process.exit(1);
+}
+console.log("Alle controles geslaagd");

package/dist-lib/lib/order-departure.d.ts

@@ -0,0 +1,25 @@
+export interface OrderDeparture {
+    ok: boolean;
+    reason: string | null;
+    carrierId: string | null;
+    momentKey: string | null;
+    departureAt: string | null;
+    signupDeadline: string | null;
+    lateSignup: boolean;
+}
+/** Engine-antwoord veilig omzetten; ontbrekende velden worden null. */
+export declare function normalizeDeparture(raw: unknown): OrderDeparture | null;
+/** "di 20 okt 15:00" in Nederlandse tijd. */
+export declare function formatMoment(iso: string | null): string | null;
+export declare const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend. Ververs over een minuut.";
+export interface DepartureView {
+    /** Hoofdtekst, bv. "di 20 okt 15:00 ophalen · aanmelden di 20 okt 13:00". */
+    text: string | null;
+    /** Kort label voor de lijst, bv. "di 20 okt 15:00". */
+    short: string | null;
+    lateSignup: boolean;
+    /** Reden als er geen geldig ophaalmoment is (nooit met een tijd erbij). */
+    reason: string | null;
+}
+export declare function departureView(dep: OrderDeparture | null | undefined): DepartureView;
+//# sourceMappingURL=order-departure.d.ts.map

package/dist-lib/lib/order-departure.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"order-departure.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAQD,uEAAuE;AACvE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAYtE;AAED,6CAA6C;AAC7C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAS9D;AAED,eAAO,MAAM,iBAAiB,0DAA0D,CAAC;AAEzF,MAAM,WAAW,aAAa;IAC5B,6EAA6E;IAC7E,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,uDAAuD;IACvD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GAAG,aAAa,CAenF"}

package/dist-lib/lib/order-departure.js

@@ -0,0 +1,54 @@
+// Ophaal- en aanmeldmoment van een order, zoals de Logistiek Engine het
+// berekent (logistics_order_departure). Deze module rekent zelf niets uit:
+// alleen normaliseren en weergeven.
+const TIME_ZONE = "Europe/Amsterdam";
+function str(v) {
+    return typeof v === "string" && v.trim() !== "" ? v : null;
+}
+/** Engine-antwoord veilig omzetten; ontbrekende velden worden null. */
+export function normalizeDeparture(raw) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return null;
+    const r = raw;
+    return {
+        ok: r.ok === true,
+        reason: str(r.reason),
+        carrierId: str(r.carrierId),
+        momentKey: str(r.momentKey),
+        departureAt: str(r.departureAt),
+        signupDeadline: str(r.signupDeadline),
+        lateSignup: r.lateSignup === true,
+    };
+}
+/** "di 20 okt 15:00" in Nederlandse tijd. */
+export function formatMoment(iso) {
+    if (!iso)
+        return null;
+    const d = new Date(iso);
+    if (Number.isNaN(d.getTime()))
+        return null;
+    const date = d
+        .toLocaleDateString("nl-NL", { timeZone: TIME_ZONE, weekday: "short", day: "numeric", month: "short" })
+        .replace(/\./g, "");
+    const time = d.toLocaleTimeString("nl-NL", { timeZone: TIME_ZONE, hour: "2-digit", minute: "2-digit", hour12: false });
+    return `${date} ${time}`;
+}
+export const DEPARTURE_UNKNOWN = "Ophaalmoment nu niet bekend. Ververs over een minuut.";
+export function departureView(dep) {
+    if (!dep)
+        return { text: null, short: null, lateSignup: false, reason: DEPARTURE_UNKNOWN };
+    const pickup = dep.ok ? formatMoment(dep.departureAt) : null;
+    if (!pickup) {
+        return {
+            text: null,
+            short: null,
+            lateSignup: false,
+            reason: dep.reason ?? "Er is geen ophaalmoment bekend voor deze order.",
+        };
+    }
+    const signup = formatMoment(dep.signupDeadline);
+    const parts = [`${pickup} ophalen`];
+    if (signup)
+        parts.push(`aanmelden ${signup}`);
+    return { text: parts.join(" · "), short: pickup, lateSignup: dep.lateSignup, reason: dep.ok ? null : dep.reason };
+}

package/dist-lib/lib/order-departure.server.d.ts

@@ -0,0 +1,4 @@
+import { type OrderDeparture } from "./order-departure.js";
+export declare function loadOrderDepartures(supabase: any, orderIds: string[]): Promise<Map<string, OrderDeparture>>;
+export declare function forgetOrderDeparture(orderId: string): void;
+//# sourceMappingURL=order-departure.server.d.ts.map

package/dist-lib/lib/order-departure.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"order-departure.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-departure.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM5E,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAiDtC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,QAEnD"}

package/dist-lib/lib/order-departure.server.js

@@ -0,0 +1,62 @@
+// Leest ophaal-/aanmeldmomenten bij de Engine. Gebruikt de lijstversie
+// (logistics_order_departure_list) als die bestaat, anders één aanroep per
+// order (maximaal 12 tegelijk). Fout => order ontbreekt in het resultaat.
+import { normalizeDeparture } from "./order-departure.js";
+const PARALLEL = 12;
+const CACHE_MS = 30000;
+const cache = new Map();
+export async function loadOrderDepartures(supabase, orderIds) {
+    const out = new Map();
+    const now = Date.now();
+    const todo = [];
+    for (const id of Array.from(new Set(orderIds))) {
+        const hit = cache.get(id);
+        if (hit && now - hit.at < CACHE_MS)
+            out.set(id, hit.dep);
+        else
+            todo.push(id);
+    }
+    if (todo.length === 0)
+        return out;
+    // Lijstversie (Engine 1.0.162+): één aanroep.
+    try {
+        const { data, error } = await supabase.rpc("logistics_order_departure_list", { p_order_ids: todo });
+        if (!error) {
+            const rows = Array.isArray(data) ? data : [];
+            for (const row of rows) {
+                const r = (row && typeof row === "object" && "departure" in row ? row.departure : row);
+                const id = String(row?.order_id ?? row?.orderId ?? r?.orderId ?? "");
+                const dep = normalizeDeparture(r);
+                if (id && dep) {
+                    out.set(id, dep);
+                    cache.set(id, { at: now, dep });
+                }
+            }
+            return out;
+        }
+    }
+    catch {
+        /* lijstversie niet beschikbaar: per order */
+    }
+    for (let i = 0; i < todo.length; i += PARALLEL) {
+        await Promise.all(todo.slice(i, i + PARALLEL).map(async (id) => {
+            try {
+                const { data, error } = await supabase.rpc("logistics_order_departure", { p_order_id: id });
+                if (error)
+                    return;
+                const dep = normalizeDeparture(data);
+                if (dep) {
+                    out.set(id, dep);
+                    cache.set(id, { at: now, dep });
+                }
+            }
+            catch {
+                /* fail closed: onbekend */
+            }
+        }));
+    }
+    return out;
+}
+export function forgetOrderDeparture(orderId) {
+    cache.delete(orderId);
+}

package/dist-lib/lib/order-pickup.functions.d.ts

@@ -1,14 +1,12 @@
+import { type DepartureView, type OrderDeparture } from "./order-departure.js";
 export interface PickupMomentOption {
-    /** Stabiele sleutel: pickupdatum|aanmeldtijd|aanlevertijd. */
+    /** Sleutel in Engine-formaat: "dagen@ophaaltijd|dagen@aanmeldtijd". */
     key: string;
-    pickupDate: string;
-    pickupTime: string | null;
-    signupDate: string | null;
-    signupTime: string | null;
     deliveryTime: string | null;
     label: string;
 }
-export declare function buildPickupOptions(carrier: any | null, deliveryISO: string | null): PickupMomentOption[];
+/** Keuzes uit de vervoerdersmomenten — alleen tijden en dagen, geen datum. */
+export declare function carrierMomentOptions(carrier: any | null): PickupMomentOption[];
 export declare const getOrderPickupMoment: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
     supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
@@ -16,15 +14,12 @@ export declare const getOrderPickupMoment: import("@tanstack/start-client-core")
 }, undefined, undefined, undefined>], (input: unknown) => {
     orderId: string;
 }, Promise<{
-    selectedKey: null;
-    selected: null;
-    options: PickupMomentOption[];
-    hasCarrier?: undefined;
-} | {
-    selectedKey: string;
-    selected: PickupMomentOption;
+    view: DepartureView;
+    departure: OrderDeparture | null;
+    selectedKey: string | null;
     options: PickupMomentOption[];
     hasCarrier: boolean;
+    deliveryTime: string | null;
 }>>;
 export declare const setOrderPickupMoment: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
     supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;

package/dist-lib/lib/order-pickup.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,kBAAkB;IACjC,8DAA8D;IAC9D,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAgBD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,GAAG,GAAG,IAAI,EACnB,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,kBAAkB,EAAE,CAiDtB;AAqBD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;aAYgC,kBAAkB,EAAE;;;;;;;GAiCjF,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;GAqB7B,CAAC"}
+{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3F,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,GAAG,kBAAkB,EAAE,CAoB9E;AAaD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;GAyC7B,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;GAoB7B,CAAC"}

package/dist-lib/lib/order-pickup.functions.js

@@ -1,75 +1,47 @@
-// Ophaalmoment (pickup moment) van een order lezen en wijzigen.
+// Ophaalmoment van een order: tonen uit de Logistiek Engine, kiezen uit de
+// momenten van de vervoerder. Deze module rekent zelf geen datum uit.
 import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
 import { normalizeTime } from "./carrier-availability.js";
+import { departureView } from "./order-departure.js";
 import { assertRowsAffected, resolveOrderRow } from "./order-row.server.js";
-function addDaysISO(iso, n) {
-    const [y, m, d] = iso.split("-").map(Number);
-    const dt = new Date(y, (m ?? 1) - 1, d ?? 1);
-    dt.setDate(dt.getDate() + n);
-    return `${dt.getFullYear()}-${String(dt.getMonth() + 1).padStart(2, "0")}-${String(dt.getDate()).padStart(2, "0")}`;
+function daysText(n, what) {
+    if (n <= 0)
+        return `${what} op de leverdag`;
+    return `${what} ${n} werkdag${n === 1 ? "" : "en"} vóór levering`;
 }
-function fmtDate(iso) {
-    const [y, m, d] = iso.split("-").map(Number);
-    const dt = new Date(y, (m ?? 1) - 1, d ?? 1);
-    if (Number.isNaN(dt.getTime()))
-        return iso;
-    return dt.toLocaleDateString("nl-NL", { weekday: "short", day: "numeric", month: "short" });
-}
-export function buildPickupOptions(carrier, deliveryISO) {
-    if (!carrier || !deliveryISO)
-        return [];
-    const raw = Array.isArray(carrier.pickup_moments) ? carrier.pickup_moments : [];
-    const moments = raw.length > 0
-        ? raw
-        : [carrier.signup_time_1, carrier.signup_time_2]
-            .filter(Boolean)
-            .map((t) => ({
-            signup_time: t,
-            signup_days: carrier.signup_days_before_delivery ?? 0,
-            delivery_days: carrier.delivery_days ?? 0,
-        }));
+/** Keuzes uit de vervoerdersmomenten — alleen tijden en dagen, geen datum. */
+export function carrierMomentOptions(carrier) {
+    const raw = Array.isArray(carrier?.pickup_moments) ? carrier.pickup_moments : [];
     const seen = new Set();
     const out = [];
-    for (const m of moments) {
-        const deliveryDays = Math.max(0, Number(m.delivery_days ?? carrier.delivery_days ?? 0) || 0);
-        const pickupDate = addDaysISO(deliveryISO, -deliveryDays);
-        const signupDays = Math.max(0, Number(m.signup_days ?? carrier.signup_days_before_delivery ?? 0) || 0);
-        const signupTime = normalizeTime(m.signup_time);
-        const signupDate = signupTime ? addDaysISO(pickupDate, -signupDays) : null;
-        const pickupTime = normalizeTime(m.pickup_time);
-        const deliveryTime = normalizeTime(m.delivery_time);
-        const key = `${pickupDate}|${signupTime ?? ""}|${deliveryTime ?? ""}`;
+    for (const m of raw) {
+        const pt = normalizeTime(m.pickup_time);
+        if (!pt)
+            continue;
+        const pd = Math.max(0, Number(m.pickup_days ?? 0) || 0);
+        const st = normalizeTime(m.signup_time);
+        const sd = Math.max(0, Number(m.signup_days ?? pd) || 0);
+        const key = `${pd}@${pt}${st ? `|${sd}@${st}` : ""}`;
         if (seen.has(key))
             continue;
         seen.add(key);
-        const parts = [`${fmtDate(pickupDate)}${pickupTime ? ` ${pickupTime}` : ""} ophalen`];
-        if (signupDate && signupTime)
-            parts.push(`aanmelden ${fmtDate(signupDate)} ${signupTime}`);
-        if (deliveryTime)
-            parts.push(`aanlevering ${deliveryTime}`);
-        out.push({
-            key,
-            pickupDate,
-            pickupTime,
-            signupDate,
-            signupTime,
-            deliveryTime,
-            label: parts.join(" · "),
-        });
+        const dt = normalizeTime(m.delivery_time);
+        const parts = [`${daysText(pd, "ophalen")} ${pt}`];
+        if (st)
+            parts.push(`aanmelden ${st}`);
+        if (dt)
+            parts.push(`aanlevering ${dt}`);
+        out.push({ key, deliveryTime: dt, label: parts.join(" · ") });
     }
-    out.sort((a, b) => a.pickupDate === b.pickupDate
-        ? (a.deliveryTime ?? "99:99").localeCompare(b.deliveryTime ?? "99:99")
-        : a.pickupDate.localeCompare(b.pickupDate));
     return out;
 }
 async function findOrder(supabase, orderId) {
-    // DTO-id kan een Floriday salesOrderId zijn; resolveOrderRow vertaalt dat.
     const row = await resolveOrderRow(supabase, orderId);
     const { data, error } = await supabase
         .from("orders")
-        .select("id, buffer_id, delivery_date, custom_fields")
+        .select("id, custom_fields")
         .eq("id", row.id)
         .maybeSingle();
     if (error)
@@ -89,48 +61,47 @@ export const getOrderPickupMoment = createServerFn({ method: "GET" })
         order = null;
     }
     if (!order) {
-        return { selectedKey: null, selected: null, options: [] };
+        return {
+            view: departureView(null),
+            departure: null,
+            selectedKey: null,
+            options: [],
+            hasCarrier: false,
+            deliveryTime: null,
+        };
     }
     const cf = (order.custom_fields ?? {});
     const carrierId = cf.carrier ? String(cf.carrier) : null;
     let carrier = null;
     if (carrierId) {
-        const { data: c } = await supabase
-            .from("carriers")
-            .select("delivery_days, signup_time_1, signup_time_2, signup_days_before_delivery, pickup_weekdays, delivery_weekdays, pickup_moments")
-            .eq("id", carrierId)
-            .maybeSingle();
+        const { data: c } = await supabase.from("carriers").select("pickup_moments").eq("id", carrierId).maybeSingle();
         carrier = c ?? null;
     }
-    const options = buildPickupOptions(carrier, order.delivery_date);
-    const storedKey = cf.pickup_moment ? String(cf.pickup_moment) : null;
-    let selected = (storedKey ? options.find((o) => o.key === storedKey) : undefined) ?? null;
-    if (!selected && cf.delivery_time) {
-        const t = normalizeTime(cf.delivery_time);
-        selected = options.find((o) => o.deliveryTime === t) ?? null;
-    }
-    if (!selected)
-        selected = options[0] ?? null;
+    const { loadOrderDepartures } = await import("./order-departure.server.js");
+    const departure = (await loadOrderDepartures(supabase, [order.id])).get(order.id) ?? null;
+    const options = carrierMomentOptions(carrier);
+    const selectedKey = departure?.momentKey ?? (cf.pickup_moment ? String(cf.pickup_moment) : null);
     return {
-        selectedKey: selected?.key ?? null,
-        selected,
+        view: departureView(departure),
+        departure,
+        selectedKey: options.some((o) => o.key === selectedKey) ? selectedKey : null,
         options,
         hasCarrier: !!carrier,
+        deliveryTime: normalizeTime(cf.delivery_time),
     };
 });
 export const setOrderPickupMoment = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
-    .inputValidator((input) => z.object({ orderId: z.string().min(1), key: z.string().min(1) }).parse(input))
+    .inputValidator((input) => z.object({ orderId: z.string().min(1), key: z.string().min(1).max(64) }).parse(input))
     .handler(async ({ data, context }) => {
     const supabase = context.supabase;
     const order = await findOrder(supabase, data.orderId);
     if (!order)
         throw new Error("Order niet gevonden");
-    const deliveryTime = data.key.split("|")[2] || null;
     const cf = { ...(order.custom_fields ?? {}) };
+    if (cf.pickup_moment === data.key)
+        return { ok: true };
     cf.pickup_moment = data.key;
-    if (deliveryTime)
-        cf.delivery_time = deliveryTime;
     const { data: updated, error } = await supabase.from("orders")
         .update({ custom_fields: cf })
         .eq("id", order.id)
@@ -138,5 +109,7 @@ export const setOrderPickupMoment = createServerFn({ method: "POST" })
     if (error)
         throw new Error(error.message);
     assertRowsAffected(updated, "Ophaalmoment opslaan");
+    const { forgetOrderDeparture } = await import("./order-departure.server.js");
+    forgetOrderDeparture(order.id);
     return { ok: true };
 });

package/dist-lib/lib/salesorders-list.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAKjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAgnCrB"}
+{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAimCrB"}

package/dist-lib/lib/salesorders-list.server.js

@@ -12,7 +12,6 @@ import { combineStages } from "./floriday-status.js";
 import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js";
 import { resolveOrderNumbers } from "./order-numbers.server.js";
 import { mergeStages, resolveOrderStage } from "./order-status.js";
-import { buildPickupOptions } from "./order-pickup.functions.js";
 import { loadBacklogFlags } from "./order-backlog.server.js";
 const FO_CAP = 20000;
 const LOCAL_CAP = 5000;
@@ -802,42 +801,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
     }
     // 12a-ter) Ladingdragers en indelingsstatus komen uit de Engine
     // (logistics_order_plan_coverage), alleen voor de zichtbare rijen — zie stap 14.
-    // 12a-bis) Ophaalmoment per order (vervoerder + gekozen moment), kort label.
-    {
-        const shortPickup = (dateISO, time) => {
-            const [y, m, d] = dateISO.split("-").map(Number);
-            const dt = new Date(y ?? 0, (m ?? 1) - 1, d ?? 1);
-            const date = Number.isNaN(dt.getTime())
-                ? dateISO
-                : dt
-                    .toLocaleDateString("nl-NL", { weekday: "short", day: "numeric", month: "short" })
-                    .replace(/\./g, "");
-            return time ? `${date} ${time}` : date;
-        };
-        const localRowForDto = (o) => o.id.startsWith("local:")
-            ? (localOrderRows.find((r) => String(r.id) === o.id.slice("local:".length)) ?? null)
-            : (localRowByFoId.get(o.id) ?? null);
-        for (const o of all) {
-            const r = localRowForDto(o);
-            if (!r)
-                continue;
-            const cf = r.custom_fields ?? {};
-            const carrier = cf.carrier ? (carrierById.get(String(cf.carrier)) ?? null) : null;
-            const deliveryISO = r.delivery_date ? String(r.delivery_date).slice(0, 10) : null;
-            const options = buildPickupOptions(carrier, deliveryISO);
-            if (options.length === 0)
-                continue;
-            const storedKey = cf.pickup_moment ? String(cf.pickup_moment) : null;
-            let selected = (storedKey ? options.find((op) => op.key === storedKey) : undefined) ?? null;
-            if (!selected && cf.delivery_time) {
-                const t = normalizeTime(cf.delivery_time);
-                selected = options.find((op) => op.deliveryTime === t) ?? null;
-            }
-            if (!selected)
-                selected = options[0];
-            o.pickupLabel = shortPickup(selected.pickupDate, selected.pickupTime ?? selected.signupTime);
-        }
-    }
+    // 12a-bis) Ophaalmoment komt uit de Engine, alleen voor zichtbare rijen (stap 14).
     // 12a) Weggehaalde beoordelingsmeldingen (vals alarm) — los vastgelegd,
     // zodat de order zelf niet gewijzigd hoeft te worden.
     {
@@ -1074,6 +1038,28 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
             : (localRowByFoId.get(o.id)?.id ? String(localRowByFoId.get(o.id).id) : null);
         const ids = visible.map(idFor).filter((v) => !!v);
         if (ids.length) {
+            // Ophaalmoment uit de Engine (nooit zelf rekenen).
+            try {
+                const { loadOrderDepartures } = await import("./order-departure.server.js");
+                const { departureView } = await import("./order-departure.js");
+                const deps = await loadOrderDepartures(supabase, ids);
+                for (const o of visible) {
+                    const oid = idFor(o);
+                    if (!oid)
+                        continue;
+                    const v = departureView(deps.get(oid));
+                    o.pickupLabel = v.short
+                        ? `${v.short}${v.lateSignup ? " · te laat aangemeld" : ""}`
+                        : deps.has(oid)
+                            ? (v.reason ?? "onbekend")
+                            : "onbekend";
+                }
+            }
+            catch {
+                for (const o of visible)
+                    if (idFor(o))
+                        o.pickupLabel = "onbekend";
+            }
             const coverage = await loadPlanCoverage(supabase, ids, "list");
             let failed = 0;
             for (const o of visible) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-verkoop-module",
-  "version": "1.0.90",
+  "version": "1.0.93",
   "private": false,
   "sideEffects": false,
   "type": "module",