@flowselections/floriday-afhandeling-module 1.0.9 → 1.0.11

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 };
             }
         },
@@ -39,7 +52,7 @@ export function useOrderPlanning() {
                 return await fetchSettings();
             }
             catch {
-                return { pickDaysBeforeTransport: 1, transportRegisterDaysBefore: 1, pickDistributionEnabled: false, maxWorkdaysEarlierPick: 2 };
+                return { pickDaysBeforeTransport: 1, transportRegisterDaysBefore: 1, pickDistributionEnabled: false, maxWorkdaysEarlierPick: 2, signupMailEnabled: false, signupMailLeadMinutes: 60, signupMailPurpose: "afhandeling_carrier_signup", pickWeekdays: [1, 2, 3, 4, 5] };
             }
         },
     });
@@ -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 ?? {
@@ -62,29 +87,56 @@ export function useOrderPlanning() {
             transportRegisterDaysBefore: 1,
             pickDistributionEnabled: false,
             maxWorkdaysEarlierPick: 2,
+            pickWeekdays: [1, 2, 3, 4, 5],
         };
         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 initial = orders.map((order) => ({
-            order,
-            planning: calculateOrderPlanning(order.deliveryDate, {
+        const carrierPickupWeekdays = defaultCarrier?.pickup_weekdays ?? [1, 2, 3, 4, 5];
+        const carrierDeliveryWeekdays = defaultCarrier?.delivery_weekdays ?? [1, 2, 3, 4, 5];
+        const pickWeekdays = settings.pickWeekdays ?? [1, 2, 3, 4, 5];
+        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) => {
+            const planning = calculateOrderPlanning(order.deliveryDate, {
                 pickupMoments: moments,
                 pickDurationWorkdays: settings.pickDaysBeforeTransport,
                 orderCreatedAt: order.createdAt,
-            }),
-        }));
-        return distributePickDates(initial, {
+                pickWeekdays,
+                carrierPickupWeekdays,
+                carrierDeliveryWeekdays,
+            });
+            if (planning && defaultCarrier) {
+                planning.carrierName = defaultCarrier.name;
+            }
+            return { order, planning };
+        });
+        const distributed = distributePickDates(initial, {
             enabled: Boolean(settings.pickDistributionEnabled),
             maxWorkdaysEarlier: settings.maxWorkdaysEarlierPick ?? 0,
+            pickWeekdays,
+            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(); },
     };
 }

package/dist-lib/index.d.ts

@@ -6,6 +6,7 @@ export { NieuweLeveringPage } from "./components/afhandeling/NieuweLeveringPage"
 export { PickAgendaView } from "./components/afhandeling/PickAgendaView";
 export { PickingPage } from "./components/afhandeling/PickingPage";
 export { PlanningAgendaPage } from "./components/afhandeling/PlanningAgendaPage";
+export { ControlePage } from "./components/afhandeling/ControlePage";
 export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 export declare const floridayAfhandelingModule: FlowModule;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAKxF,eAAO,MAAM,yBAAyB,EAAE,UAiBvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAKxF,eAAO,MAAM,yBAAyB,EAAE,UAkBvC,CAAC"}

package/dist-lib/index.js

@@ -1,4 +1,4 @@
-import { PackageCheck, CalendarCheck, CalendarRange } from "lucide-react";
+import { PackageCheck, CalendarCheck, CalendarRange, ClipboardCheck } from "lucide-react";
 export * from "./_core-safelist";
 export { LeveringenPage } from "./components/afhandeling/LeveringenPage";
 export { VervoerdersPage } from "./components/afhandeling/VervoerdersPage";
@@ -6,6 +6,7 @@ export { NieuweLeveringPage } from "./components/afhandeling/NieuweLeveringPage"
 export { PickAgendaView } from "./components/afhandeling/PickAgendaView";
 export { PickingPage } from "./components/afhandeling/PickingPage";
 export { PlanningAgendaPage } from "./components/afhandeling/PlanningAgendaPage";
+export { ControlePage } from "./components/afhandeling/ControlePage";
 export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 import { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
@@ -13,7 +14,7 @@ import { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettin
 export const floridayAfhandelingModule = {
     id: "afhandeling",
     name: "Afhandeling",
-    version: "1.2.0",
+    version: "1.3.0",
     nav: {
         label: "Afhandeling",
         href: "/afhandeling/picking",
@@ -21,6 +22,7 @@ export const floridayAfhandelingModule = {
         children: [
             { label: "Pick Agenda", href: "/afhandeling/picking", icon: CalendarCheck },
             { label: "Planning en leveringen", href: "/afhandeling/leveringen", icon: CalendarRange },
+            { label: "Controle karren", href: "/afhandeling/controle", icon: ClipboardCheck },
         ],
     },
     settingsCards: [