@flowselections/floriday-afhandeling-module 1.0.9 → 1.0.11

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

@@ -29,17 +29,46 @@ export interface PlanningRules {
     /** Tijdstip waarop de order is binnengekomen (voor moment-selectie). */
     orderCreatedAt?: string | Date | null;
     holidays?: Date[];
+    /** ISO-dagnummers (1=ma … 7=zo) waarop gepickt mag worden. */
+    pickWeekdays?: number[];
+    /** ISO-dagnummers waarop de vervoerder karren bij ons ophaalt. */
+    carrierPickupWeekdays?: number[];
+    /** ISO-dagnummers waarop de vervoerder bij de klant bezorgt. */
+    carrierDeliveryWeekdays?: number[];
+}
+export interface PickAssignment {
+    date: Date;
+    cartCount: number;
+    /** Concrete kar-indexen op deze datum; nodig voor handmatig verplaatsen. */
+    cartIndexes?: number[];
 }
 export interface OrderPlanning {
     deliveryDate: Date;
+    /** Oorspronkelijk gevraagde bezorgdatum (vóór eventuele weekdag-snap). */
+    requestedDeliveryDate: Date;
     pickupDate: Date;
     transportRegisterDate: Date;
     pickStartDate: Date;
     scheduledPickDate: Date;
+    /** Verdeling van karren over één of meerdere pickdagen. */
+    pickAssignments: PickAssignment[];
     movedEarlier: boolean;
     /** Welk moment is gekozen (handig voor debug / UI). */
     selectedMoment: PickupMoment;
+    /** Korte uitleg waarom deze planning zo is gekozen. */
+    reason?: string;
+    /** Naam van de gekozen vervoerder (indien bekend). */
+    carrierName?: string;
 }
+/** ISO-dagnummer 1=ma … 7=zo van een Date. */
+export declare function isoWeekday(d: Date): number;
+export declare function normalizeWeekdays(days: number[] | undefined | null): number[];
+/**
+ * Schuif een datum naar de dichtstbijzijnde toegestane weekdag
+ * (feestdagen uitgesloten). `direction` bepaalt of we naar het verleden
+ * of naar de toekomst opschuiven.
+ */
+export declare function snapToAllowedDay(date: Date, allowedWeekdays: number[] | undefined, direction: "backward" | "forward", holidays?: Date[]): Date;
 export declare function isWorkday(d: Date, holidays?: Date[]): boolean;
 export declare function subtractWorkdays(date: Date, n: number, holidays?: Date[]): Date;
 export declare function addWorkdays(date: Date, n: number, holidays?: Date[]): Date;
@@ -55,12 +84,22 @@ export declare function getSignupDeadline(deliveryDate: Date, moment: PickupMome
  */
 export declare function selectPickupMoment(deliveryDate: Date, orderCreatedAt: Date | null | undefined, moments: PickupMoment[], holidays?: Date[]): PickupMoment;
 export declare function calculateOrderPlanning(deliveryDate: string | Date | null | undefined, rules: PlanningRules): OrderPlanning | null;
-export interface PickDistributionOptions {
+export interface PickDistributionOptions<T = unknown> {
     enabled: boolean;
     maxWorkdaysEarlier: number;
     holidays?: Date[];
+    /** ISO-dagnummers waarop gepickt mag worden (1=ma … 7=zo). */
+    pickWeekdays?: number[];
+    /** Aantal karren per item — bepaalt het gewicht in de verdeling. */
+    getCartCount?: (item: T) => number;
+    /** Manual per-cart overrides — geïndexeerd op (itemKey, cartIndex) → Date. */
+    getCartOverride?: (item: T, cartIndex: number) => Date | PickCartOverride | null;
+}
+export interface PickCartOverride {
+    date: Date;
+    movedFromDate?: Date | null;
 }
 export declare function distributePickDates<T extends {
     planning: OrderPlanning | null;
-}>(items: T[], options: PickDistributionOptions): T[];
+}>(items: T[], options: PickDistributionOptions<T>): T[];
 //# sourceMappingURL=planning.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"planning.d.ts","sourceRoot":"","sources":["../../src/lib/planning.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,aAAa,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,qBAAqB,EAAE,YAOnC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,iDAAiD;IACjD,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,wDAAwD;IACxD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wEAAwE;IACxE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,IAAI,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,qBAAqB,EAAE,IAAI,CAAC;IAC5B,aAAa,EAAE,IAAI,CAAC;IACpB,iBAAiB,EAAE,IAAI,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,uDAAuD;IACvD,cAAc,EAAE,YAAY,CAAC;CAC9B;AAUD,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAK7D;AAQD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAQ/E;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAQ1E;AAcD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,IAAI,EAClB,MAAM,EAAE,YAAY,EACpB,QAAQ,CAAC,EAAE,IAAI,EAAE,GAChB,IAAI,CAGN;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,IAAI,EAClB,cAAc,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,YAAY,EAAE,EACvB,QAAQ,CAAC,EAAE,IAAI,EAAE,GAChB,YAAY,CAgBd;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,EAC9C,KAAK,EAAE,aAAa,GACnB,aAAa,GAAG,IAAI,CA6BtB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS;IAAE,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAA;CAAE,EAC9E,KAAK,EAAE,CAAC,EAAE,EACV,OAAO,EAAE,uBAAuB,GAC/B,CAAC,EAAE,CA2DL"}
+{"version":3,"file":"planning.d.ts","sourceRoot":"","sources":["../../src/lib/planning.ts"],"names":[],"mappings":"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"}

package/dist-lib/lib/planning.js

@@ -14,6 +14,38 @@ export const DEFAULT_PICKUP_MOMENT = {
     delivery_days: 0,
     delivery_time: "08:00",
 };
+/** ISO-dagnummer 1=ma … 7=zo van een Date. */
+export function isoWeekday(d) {
+    const g = d.getDay();
+    return g === 0 ? 7 : g;
+}
+const DEFAULT_WEEKDAYS = [1, 2, 3, 4, 5];
+export function normalizeWeekdays(days) {
+    if (!Array.isArray(days) || days.length === 0)
+        return DEFAULT_WEEKDAYS;
+    const clean = days.map((n) => Number(n)).filter((n) => n >= 1 && n <= 7);
+    return clean.length > 0 ? Array.from(new Set(clean)) : DEFAULT_WEEKDAYS;
+}
+function isHoliday(d, holidays) {
+    return !!holidays && holidays.some((h) => sameDay(h, d));
+}
+/**
+ * Schuif een datum naar de dichtstbijzijnde toegestane weekdag
+ * (feestdagen uitgesloten). `direction` bepaalt of we naar het verleden
+ * of naar de toekomst opschuiven.
+ */
+export function snapToAllowedDay(date, allowedWeekdays, direction, holidays) {
+    const allowed = new Set(normalizeWeekdays(allowedWeekdays));
+    const out = normalize(date);
+    const step = direction === "forward" ? 1 : -1;
+    // Vangnet: max 62 iteraties om oneindige loops te voorkomen.
+    for (let i = 0; i < 62; i++) {
+        if (allowed.has(isoWeekday(out)) && !isHoliday(out, holidays))
+            return out;
+        out.setDate(out.getDate() + step);
+    }
+    return out;
+}
 function sameDay(a, b) {
     return (a.getFullYear() === b.getFullYear() &&
         a.getMonth() === b.getMonth() &&
@@ -99,79 +131,170 @@ export function calculateOrderPlanning(deliveryDate, rules) {
     const d = typeof deliveryDate === "string" ? new Date(deliveryDate) : deliveryDate;
     if (Number.isNaN(d.getTime()))
         return null;
-    const delivery = normalize(d);
+    const requested = normalize(d);
     const moments = rules.pickupMoments.length > 0 ? rules.pickupMoments : [DEFAULT_PICKUP_MOMENT];
     const orderCreated = rules.orderCreatedAt == null
         ? null
         : rules.orderCreatedAt instanceof Date
             ? rules.orderCreatedAt
             : new Date(rules.orderCreatedAt);
+    const reasons = [];
+    // 1) Snap bezorgdatum vooruit naar een dag waarop de vervoerder bezorgt.
+    const delivery = snapToAllowedDay(requested, rules.carrierDeliveryWeekdays, "forward", rules.holidays);
+    if (!sameDay(delivery, requested)) {
+        reasons.push(`Bezorgdatum verschoven naar ${delivery.toLocaleDateString("nl-NL")} omdat de vervoerder niet bezorgt op de gevraagde dag.`);
+    }
     const moment = selectPickupMoment(delivery, orderCreated, moments, rules.holidays);
-    const pickup = subtractWorkdays(delivery, moment.pickup_days, rules.holidays);
+    // 2) Ophaaldatum: terugtellen op werkdagen, daarna snappen op ophaaldagen vervoerder.
+    const pickupRaw = subtractWorkdays(delivery, moment.pickup_days, rules.holidays);
+    const pickup = snapToAllowedDay(pickupRaw, rules.carrierPickupWeekdays, "backward", rules.holidays);
+    if (!sameDay(pickup, pickupRaw)) {
+        reasons.push(`Ophaaldatum verschoven naar ${pickup.toLocaleDateString("nl-NL")} omdat de vervoerder alleen op bepaalde dagen ophaalt.`);
+    }
     const transportRegister = subtractWorkdays(delivery, moment.signup_days, rules.holidays);
-    const pickStart = subtractWorkdays(pickup, rules.pickDurationWorkdays, rules.holidays);
+    // 3) Pickstart: terugtellen vanaf ophaal, daarna snappen op pickdagen.
+    const pickStartRaw = subtractWorkdays(pickup, rules.pickDurationWorkdays, rules.holidays);
+    const pickStart = snapToAllowedDay(pickStartRaw, rules.pickWeekdays, "backward", rules.holidays);
+    if (!sameDay(pickStart, pickStartRaw)) {
+        reasons.push(`Pickdatum verschoven naar ${pickStart.toLocaleDateString("nl-NL")} vanwege de ingestelde pickdagen.`);
+    }
+    if (reasons.length === 0) {
+        reasons.push(`Planning gebaseerd op ophaalmoment ${moment.pickup_time ?? "standaard"}.`);
+    }
     return {
         deliveryDate: delivery,
+        requestedDeliveryDate: requested,
         pickupDate: pickup,
         transportRegisterDate: transportRegister,
         pickStartDate: pickStart,
         scheduledPickDate: pickStart,
+        pickAssignments: [{ date: pickStart, cartCount: 0 }],
         movedEarlier: false,
         selectedMoment: moment,
+        reason: reasons.join(" "),
     };
 }
 export function distributePickDates(items, options) {
-    if (!options.enabled || options.maxWorkdaysEarlier <= 0) {
-        return items.map((it) => {
-            if (!it.planning)
-                return it;
-            return {
-                ...it,
-                planning: {
-                    ...it.planning,
-                    scheduledPickDate: it.planning.pickStartDate,
-                    movedEarlier: false,
-                },
-            };
-        });
-    }
+    const getCarts = (it) => {
+        const n = options.getCartCount?.(it);
+        return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
+    };
+    const getOverride = (it, idx) => {
+        const raw = options.getCartOverride?.(it, idx);
+        if (!raw)
+            return null;
+        const date = raw instanceof Date ? raw : raw.date;
+        const out = new Date(date);
+        out.setHours(0, 0, 0, 0);
+        const movedFrom = raw instanceof Date ? null : raw.movedFromDate;
+        const movedFromDate = movedFrom ? new Date(movedFrom) : null;
+        if (movedFromDate)
+            movedFromDate.setHours(0, 0, 0, 0);
+        return { date: out, movedFromDate };
+    };
+    const key = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
+    const load = new Map();
+    const result = new Map();
+    const distribute = options.enabled && options.maxWorkdaysEarlier > 0;
     const sorted = [...items].sort((a, b) => {
         const ad = a.planning?.pickStartDate.getTime() ?? Infinity;
         const bd = b.planning?.pickStartDate.getTime() ?? Infinity;
         return ad - bd;
     });
-    const load = new Map();
-    const key = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
-    const result = new Map();
+    const baseTargets = new Map();
+    // Stap 1: bepaal eerst de volledige automatische verdeling, zonder
+    // handmatige overrides. Daardoor blijft de automatische balans stabiel en
+    // kan een latere handmatige verplaatsing niet door volgende orders worden
+    // "teruggevuld".
     for (const item of sorted) {
         if (!item.planning) {
             result.set(item, item);
             continue;
         }
         const deadline = item.planning.pickStartDate;
-        const candidates = [deadline];
-        let cursor = deadline;
-        for (let i = 0; i < options.maxWorkdaysEarlier; i++) {
-            cursor = subtractWorkdays(cursor, 1, options.holidays);
-            candidates.unshift(cursor);
+        const carts = getCarts(item);
+        // Kandidaten in chronologische volgorde — alleen toegestane pickdagen.
+        const allowedSet = new Set(normalizeWeekdays(options.pickWeekdays));
+        const isAllowed = (d) => allowedSet.has(isoWeekday(d)) && !(options.holidays?.some((h) => sameDay(h, d)));
+        const candidates = [];
+        if (distribute) {
+            let cursor = deadline;
+            let added = 0;
+            // Loop met veiligheidsmarge; sla dagen over die niet zijn toegestaan.
+            for (let i = 0; i < options.maxWorkdaysEarlier * 3 && added < options.maxWorkdaysEarlier; i++) {
+                cursor = subtractWorkdays(cursor, 1, options.holidays);
+                if (isAllowed(cursor)) {
+                    candidates.unshift(cursor);
+                    added++;
+                }
+            }
         }
-        let best = candidates[0];
-        let bestLoad = load.get(key(best)) ?? 0;
-        for (let i = 1; i < candidates.length; i++) {
-            const c = candidates[i];
-            const l = load.get(key(c)) ?? 0;
-            if (l < bestLoad) {
-                best = c;
-                bestLoad = l;
+        candidates.push(deadline);
+        const targets = [];
+        for (let c = 0; c < carts; c++) {
+            let target;
+            if (!distribute) {
+                target = deadline;
+                load.set(key(target), (load.get(key(target)) ?? 0) + 1);
+            }
+            else {
+                let best = candidates[candidates.length - 1];
+                let bestLoad = load.get(key(best)) ?? 0;
+                for (let i = candidates.length - 2; i >= 0; i--) {
+                    const cand = candidates[i];
+                    const l = load.get(key(cand)) ?? 0;
+                    if (l < bestLoad) {
+                        best = cand;
+                        bestLoad = l;
+                    }
+                }
+                target = best;
+                load.set(key(target), bestLoad + 1);
+            }
+            targets[c] = target;
+        }
+        baseTargets.set(item, targets);
+    }
+    // Stap 2: pas overrides pas toe nadat alle automatische doelen vaststaan.
+    // Dit maakt een verplaatsing absoluut: 10/10 wordt na één kar verplaatsen
+    // echt 9/11, niet opnieuw 10/10 door load-balancing.
+    for (const item of sorted) {
+        if (!item.planning)
+            continue;
+        const deadline = item.planning.pickStartDate;
+        const carts = getCarts(item);
+        const targets = [...(baseTargets.get(item) ?? [])];
+        const perDay = new Map();
+        for (let c = 0; c < carts; c++) {
+            const override = getOverride(item, c);
+            if (override) {
+                // Handmatige verplaatsingen gelden altijd voor de concrete kar-index
+                // die de gebruiker aanklikt. Niet ruilen met een andere kar op dezelfde
+                // brondag, want dan blijft de aangeklikte kar visueel staan.
+                targets[c] = override.date;
+            }
+        }
+        for (let c = 0; c < carts; c++) {
+            const target = targets[c];
+            const k = key(target);
+            const existing = perDay.get(k);
+            if (existing) {
+                existing.cartCount += 1;
+                existing.cartIndexes.push(c);
+            }
+            else {
+                perDay.set(k, { date: target, cartCount: 1, cartIndexes: [c] });
             }
         }
-        load.set(key(best), bestLoad + 1);
-        const moved = best.getTime() !== deadline.getTime();
+        const assignments = Array.from(perDay.values()).sort((a, b) => a.date.getTime() - b.date.getTime());
+        const earliest = assignments[0]?.date ?? deadline;
+        const moved = assignments.some((a) => a.date.getTime() !== deadline.getTime());
         result.set(item, {
             ...item,
             planning: {
                 ...item.planning,
-                scheduledPickDate: best,
+                scheduledPickDate: earliest,
+                pickAssignments: assignments,
                 movedEarlier: moved,
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-afhandeling-module",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "private": false,
   "sideEffects": false,
   "type": "module",
@@ -41,7 +41,7 @@
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
     "@flowselections/core": "^1.0.11",
-    "@lovable.dev/vite-tanstack-config": "2.6.2",
+    "@lovable.dev/vite-tanstack-config": "2.6.4",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",
     "@tanstack/react-query": "^5.83.0",