@flowselections/floriday-verkoop-module 1.0.87 → 1.0.93

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-fulfill.functions.d.ts

@@ -1,5 +1,5 @@
 export declare const markOrdersShipped: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {

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

@@ -3,8 +3,8 @@
 // vereist bewijs van vertrek (alle karren verzonden of dekkende zendingen).
 import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
-import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { resolveOrderRow } from "./order-row.server";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
+import { resolveOrderRow } from "./order-row.server.js";
 const Input = z.object({
     orderIds: z.array(z.string().min(1)).min(1).max(200),
 });
@@ -12,7 +12,7 @@ export const markOrdersShipped = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .inputValidator((input) => Input.parse(input))
     .handler(async ({ data, context }) => {
-    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
     const results = [];
     for (const raw of data.orderIds) {
         try {

package/dist-lib/lib/order-item-packing.functions.d.ts

@@ -14,7 +14,7 @@ export interface OrderItemPackingRow {
  * Floriday sales-order-id zijn (resolveOrderRow vertaalt dat).
  */
 export declare const listOrderItemPacking: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
@@ -24,7 +24,7 @@ export declare const listOrderItemPacking: import("@tanstack/start-client-core")
 }>>;
 /** Zet de belading van één orderregel handmatig vast. */
 export declare const setOrderItemPacking: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
@@ -38,7 +38,7 @@ export declare const setOrderItemPacking: import("@tanstack/start-client-core").
 }>>;
 /** Haal de handmatige markering weg; de regel volgt weer de standaardbelading. */
 export declare const clearOrderItemPackingLock: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {

package/dist-lib/lib/order-item-packing.functions.js

@@ -9,10 +9,10 @@
 // De correctie is strikt lokaal: hij wordt NOOIT teruggestuurd als wijziging
 // van het Floriday-artikel zelf — dat loopt uitsluitend via de voorraad-module.
 import { createServerFn } from "@tanstack/react-start";
-import { productNameForStorage } from "./product-name";
+import { productNameForStorage } from "./product-name.js";
 import { z } from "zod";
-import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { resolveOrderRow } from "./order-row.server";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
+import { resolveOrderRow } from "./order-row.server.js";
 /**
  * Belading per bestelregel van één order, inclusief de handmatige
  * "vastgezet"-markering. `orderId` mag een lokale orders.id of een

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

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

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

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

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

@@ -0,0 +1,40 @@
+// Controle zonder testomgeving: `bun src/lib/order-patch.check.ts`.
+import { diffPatch, distinctFilter } from "./order-patch.js";
+let failed = 0;
+const eq = (name, got, want) => {
+    const ok = JSON.stringify(got) === JSON.stringify(want);
+    if (!ok)
+        failed++;
+    console.log(`${ok ? "OK  " : "FOUT"} ${name}${ok ? "" : ` — kreeg ${JSON.stringify(got)}`}`);
+};
+const row = {
+    status: "Nog te picken",
+    delivery_date: "2026-10-16",
+    invoice_due_at: "2026-10-16T16:00:00+00:00",
+    total: "12.50",
+    custom_fields: { a: 1, b: { c: 2 } },
+};
+// Niets veranderd → niets opslaan
+eq("alles gelijk → leeg", diffPatch(row, { ...row }), {});
+eq("zelfde moment, andere notatie", diffPatch(row, { invoice_due_at: "2026-10-16T16:00:00.000Z" }), {});
+eq("jsonb andere volgorde", diffPatch(row, { custom_fields: { b: { c: 2 }, a: 1 } }), {});
+eq("bedrag 12.5 = 12.50", diffPatch(row, { total: "12.5" }), {});
+eq("leeg blijft leeg", diffPatch({ invoice_due_at: null }, { invoice_due_at: null }), {});
+// Echte wijziging → wél opslaan
+eq("nieuwe status uit Floriday", diffPatch(row, { status: "geannuleerd" }), { status: "geannuleerd" });
+eq("nieuwe leverdatum", diffPatch(row, { delivery_date: "2026-10-17" }), { delivery_date: "2026-10-17" });
+eq("gewijzigd factuurmoment", diffPatch(row, { invoice_due_at: "2026-10-17T16:00:00.000Z" }), { invoice_due_at: "2026-10-17T16:00:00.000Z" });
+eq("gewijzigde extra gegevens", Object.keys(diffPatch(row, { custom_fields: { a: 2, b: { c: 2 } } })), ["custom_fields"]);
+eq("leeg → gevuld", diffPatch({ invoice_due_at: null }, { invoice_due_at: "2026-10-17T16:00:00.000Z" }), { invoice_due_at: "2026-10-17T16:00:00.000Z" });
+eq("gevuld → leeg", diffPatch(row, { invoice_due_at: null }), { invoice_due_at: null });
+eq("alleen gewijzigd veld mee", Object.keys(diffPatch(row, { status: row.status, total: "13" })), ["total"]);
+// Voorwaarde in de database
+eq("filter naar leeg", distinctFilter({ invoice_due_at: null }), "invoice_due_at.not.is.null");
+eq("filter met waarde", distinctFilter({ status: "Gereed voor facturatie" }), 'status.is.null,status.neq."Gereed voor facturatie"');
+eq("filter jsonb", distinctFilter({ custom_fields: { a: "x,y" } }), 'custom_fields.is.null,custom_fields.neq."{\\"a\\":\\"x,y\\"}"');
+eq("lege patch → geen filter", distinctFilter({}), null);
+if (failed) {
+    console.log(`${failed} controle(s) mislukt`);
+    process.exit(1);
+}
+console.log("Alle controles geslaagd");

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

@@ -0,0 +1,18 @@
+export declare function sameJson(a: unknown, b: unknown): boolean;
+export declare function sameValue(key: string, prev: unknown, next: unknown): boolean;
+/** Alleen de velden die echt anders zijn dan de huidige rij. */
+export declare function diffPatch<T extends Record<string, unknown>>(current: Record<string, unknown> | null | undefined, patch: T): Partial<T>;
+/**
+ * PostgREST `or`-filter: de rij wordt alleen geraakt als minstens één veld uit
+ * de patch in de database anders is (IS DISTINCT FROM). Leeg → null.
+ */
+export declare function distinctFilter(patch: Record<string, unknown>): string | null;
+/**
+ * Slaat alleen gewijzigde velden op, met de "alleen als anders"-voorwaarde ook
+ * in de database. Geeft het aantal echt bijgewerkte rijen (0 of 1).
+ */
+export declare function updateOrderIfChanged(supabase: any, orderId: string, current: Record<string, unknown> | null | undefined, patch: Record<string, unknown>): Promise<{
+    written: number;
+    changed: string[];
+}>;
+//# sourceMappingURL=order-patch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"order-patch.d.ts","sourceRoot":"","sources":["../../src/lib/order-patch.ts"],"names":[],"mappings":"AAwBA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAExD;AAQD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAe5E;AAED,gEAAgE;AAChE,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACnD,KAAK,EAAE,CAAC,GACP,OAAO,CAAC,CAAC,CAAC,CAQZ;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAY5E;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACnD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAYjD"}

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

@@ -0,0 +1,105 @@
+// Alleen opslaan wat echt verandert. Elke opslag op `orders` laat triggers van
+// andere modules afgaan (planning, factuurkoppelingen, updated_at), dus een
+// gelijke waarde terugschrijven mag nooit.
+//
+// 1) diffPatch: vergelijking vooraf (jsonb op inhoud, tijdstippen als moment).
+// 2) distinctFilter: dezelfde voorwaarde ook in de database (IS DISTINCT FROM),
+//    zodat twee rondes tegelijk niet allebei schrijven.
+const DATE_KEYS = new Set(["delivery_date", "order_date"]);
+const NUMERIC_KEYS = new Set(["total"]);
+function canon(v) {
+    if (Array.isArray(v))
+        return v.map(canon);
+    if (v && typeof v === "object") {
+        const out = {};
+        for (const k of Object.keys(v).sort()) {
+            const x = v[k];
+            if (x !== undefined)
+                out[k] = canon(x);
+        }
+        return out;
+    }
+    return v;
+}
+export function sameJson(a, b) {
+    return JSON.stringify(canon(a ?? null)) === JSON.stringify(canon(b ?? null));
+}
+function asInstant(v) {
+    if (v === null || v === undefined || v === "")
+        return null;
+    const t = new Date(String(v)).getTime();
+    return Number.isNaN(t) ? null : t;
+}
+export function sameValue(key, prev, next) {
+    const pNull = prev === null || prev === undefined;
+    const nNull = next === null || next === undefined;
+    if (pNull || nNull)
+        return pNull && nNull;
+    if (typeof next === "object" || typeof prev === "object")
+        return sameJson(prev, next);
+    if (NUMERIC_KEYS.has(key))
+        return Number(prev) === Number(next);
+    if (DATE_KEYS.has(key))
+        return String(prev).slice(0, 10) === String(next).slice(0, 10);
+    const ps = String(prev);
+    const ns = String(next);
+    if (ps === ns)
+        return true;
+    // Tijdstippen in een andere notatie/tijdzone: zelfde moment = gelijk.
+    if (/^\d{4}-\d{2}-\d{2}T/.test(ps) && /^\d{4}-\d{2}-\d{2}T/.test(ns)) {
+        return asInstant(ps) === asInstant(ns);
+    }
+    return false;
+}
+/** Alleen de velden die echt anders zijn dan de huidige rij. */
+export function diffPatch(current, patch) {
+    const out = {};
+    for (const k of Object.keys(patch)) {
+        const next = patch[k];
+        if (next === undefined)
+            continue;
+        if (!sameValue(k, current?.[k], next))
+            out[k] = next;
+    }
+    return out;
+}
+function quote(v) {
+    return `"${v.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+/**
+ * PostgREST `or`-filter: de rij wordt alleen geraakt als minstens één veld uit
+ * de patch in de database anders is (IS DISTINCT FROM). Leeg → null.
+ */
+export function distinctFilter(patch) {
+    const parts = [];
+    for (const [k, v] of Object.entries(patch)) {
+        if (v === undefined)
+            continue;
+        if (v === null) {
+            parts.push(`${k}.not.is.null`);
+            continue;
+        }
+        const lit = typeof v === "object" ? JSON.stringify(v) : String(v);
+        parts.push(`${k}.is.null`, `${k}.neq.${quote(lit)}`);
+    }
+    return parts.length ? parts.join(",") : null;
+}
+/**
+ * Slaat alleen gewijzigde velden op, met de "alleen als anders"-voorwaarde ook
+ * in de database. Geeft het aantal echt bijgewerkte rijen (0 of 1).
+ */
+export async function updateOrderIfChanged(supabase, orderId, current, patch) {
+    const diff = diffPatch(current, patch);
+    const changed = Object.keys(diff);
+    if (changed.length === 0)
+        return { written: 0, changed };
+    const filter = distinctFilter(diff);
+    const { data, error } = await supabase.from("orders")
+        .update(diff)
+        .eq("id", orderId)
+        .or(filter)
+        .select("id");
+    if (error)
+        throw new Error(error.message);
+    return { written: (data ?? []).length, changed };
+}

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

@@ -1,33 +1,28 @@
+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").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, 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").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {

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";
-import { normalizeTime } from "./carrier-availability";
-import { assertRowsAffected, resolveOrderRow } from "./order-row.server";
-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")}`;
+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 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/order-shipments.functions.d.ts

@@ -1,5 +1,5 @@
 export declare const listOrderShipments: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
@@ -40,7 +40,7 @@ export declare const listOrderShipments: import("@tanstack/start-client-core").O
     }[];
 }>>;
 export declare const createShipment: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
@@ -60,7 +60,7 @@ export declare const createShipment: import("@tanstack/start-client-core").Optio
     shipmentId: string;
 }>>;
 export declare const markShipmentShipped: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {
@@ -69,7 +69,7 @@ export declare const markShipmentShipped: import("@tanstack/start-client-core").
     ok: true;
 }>>;
 export declare const cancelShipment: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
-    supabase: import("../integrations/supabase/auth-middleware").AuthedSupabaseClient;
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
     userId: string;
     claims: import("@supabase/auth-js").User;
 }, undefined, undefined, undefined>], (input: unknown) => {