@flowselections/floriday-verkoop-module 1.0.19 → 1.0.21

package/dist-lib/lib/useSalesOrdersQuery.js

@@ -1,11 +1,67 @@
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useServerFn } from "@tanstack/react-start";
 import { supabase } from "../integrations/supabase/client";
 import { getActiveFloridayEnvironment, getFlorydayCachedList } from "./floriday-public.functions";
 import { expandOrderItemsForPlanner } from "./expand-group-order-items";
 import { planCarts } from "./cart-planner";
-import { centralOrderNumber, mapJsonbToSalesOrderDTO, } from "./salesorders-mapping";
+import { centralOrderNumber, isoWeekRange, mapJsonbToSalesOrderDTO, monthRange, } from "./salesorders-mapping";
+// Bepaal het serverside periode-venster op basis van de UI-filters.
+// Retourneert `since`/`until` als ISO-strings + het gekozen dateField.
+// Bij ontbrekende/onvolledige filters geen venster → server past geen
+// periode-filter toe (client-side applyFilters filtert dan alsnog).
+function derivePeriodWindow(filters) {
+    const dateField = filters?.dateField ?? "ordered";
+    if (!filters)
+        return { dateField };
+    const ymdToUtc = (ymd) => {
+        const [y, m, d] = ymd.split("-").map(Number);
+        return new Date(Date.UTC(y, (m ?? 1) - 1, d ?? 1));
+    };
+    const startOfTodayUtc = () => {
+        const now = new Date();
+        return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+    };
+    let start = null;
+    let end = null;
+    if (filters.period === "month" && filters.month !== undefined && filters.monthYear !== undefined) {
+        const r = monthRange(filters.month, filters.monthYear);
+        start = r.start;
+        end = r.end;
+    }
+    else if (filters.period === "day" && filters.day) {
+        start = ymdToUtc(filters.day);
+        end = new Date(start);
+        end.setUTCDate(start.getUTCDate() + 1);
+    }
+    else if (filters.period === "last7" || filters.period === "last30") {
+        const days = filters.period === "last7" ? 7 : 30;
+        end = startOfTodayUtc();
+        end.setUTCDate(end.getUTCDate() + 1);
+        start = new Date(end);
+        start.setUTCDate(end.getUTCDate() - days);
+    }
+    else if (filters.period === "custom" && filters.customFrom && filters.customTo) {
+        start = ymdToUtc(filters.customFrom);
+        end = ymdToUtc(filters.customTo);
+        end.setUTCDate(end.getUTCDate() + 1);
+    }
+    else if (filters.week && filters.year) {
+        const r = isoWeekRange(filters.week, filters.year);
+        start = r.start;
+        end = r.end;
+    }
+    // Buffer van 1 dag rond het venster: order/delivery-tijden kunnen net buiten
+    // de weekgrens vallen; de client filtert alsnog exact via applyFilters.
+    if (start && end) {
+        const s = new Date(start);
+        s.setUTCDate(s.getUTCDate() - 1);
+        const e = new Date(end);
+        e.setUTCDate(e.getUTCDate() + 1);
+        return { since: s.toISOString(), until: e.toISOString(), dateField };
+    }
+    return { dateField };
+}
 function pickString(v) {
     if (v == null)
         return null;
@@ -69,6 +125,8 @@ function statusFlags(statusValue) {
             status === "approved" ||
             status === "open" ||
             status === "concept",
+        isControlled: false,
+        controlledAt: null,
     };
 }
 async function fetchAllLocalOrders() {
@@ -91,18 +149,25 @@ async function fetchAllLocalOrders() {
     }
     return rows;
 }
-export function useSalesOrdersQuery() {
+export function useSalesOrdersQuery(filters) {
     const fetchCachedList = useServerFn(getFlorydayCachedList);
     const fetchActiveEnv = useServerFn(getActiveFloridayEnvironment);
     const queryClient = useQueryClient();
-    const queryKey = ["floriday", "salesorders-cache"];
+    const periodWindow = useMemo(() => derivePeriodWindow(filters), [filters]);
+    const queryKey = useMemo(() => [
+        "floriday",
+        "salesorders-cache",
+        periodWindow.dateField,
+        periodWindow.since ?? null,
+        periodWindow.until ?? null,
+    ], [periodWindow.dateField, periodWindow.since, periodWindow.until]);
     useEffect(() => {
         let timer = null;
         const invalidate = () => {
             if (timer)
                 clearTimeout(timer);
             timer = setTimeout(() => {
-                queryClient.invalidateQueries({ queryKey });
+                queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-cache"] });
             }, 250);
         };
         const channel = supabase
@@ -125,9 +190,17 @@ export function useSalesOrdersQuery() {
             const { environment } = await fetchActiveEnv();
             const dbEnv = environment === "live" ? "live" : "staging";
             // Floriday-data via de centrale gateway (geen directe floriday_*_cache reads).
-            const [ordersList, customersList, tradeItemsList, connectionsRes, localOrderRows, localCustomersRes, mailboxProposalsRes,] = await Promise.all([
-                fetchCachedList({ data: { environment, entity: "sales-orders", limit: 5000 } }),
-                fetchCachedList({ data: { environment, entity: "customer-organizations", limit: 2000 } }),
+            const [ordersList, tradeItemsList, connectionsRes, localOrderRows, localCustomersRes, mailboxProposalsRes,] = await Promise.all([
+                fetchCachedList({
+                    data: {
+                        environment,
+                        entity: "sales-orders",
+                        limit: 20000,
+                        since: periodWindow.since,
+                        until: periodWindow.until,
+                        dateField: periodWindow.dateField,
+                    },
+                }),
                 fetchCachedList({ data: { environment, entity: "trade-items", limit: 5000 } }),
                 supabase
                     .from("floriday_connections")
@@ -151,6 +224,27 @@ export function useSalesOrdersQuery() {
                 throw localCustomersRes.error;
             if (mailboxProposalsRes.error)
                 throw mailboxProposalsRes.error;
+            // Targeted customer-cache fetch: alleen orgIds die daadwerkelijk in de
+            // orders voorkomen. Voorkomt dat we vastlopen op limit 2000 terwijl er
+            // tienduizenden klanten in floriday_customers_cache staan.
+            const neededOrgIds = Array.from(new Set((ordersList.rows ?? [])
+                .map((r) => String(r?.data?.customerOrganizationId ?? ""))
+                .filter((id) => id.length > 0)));
+            const customerCacheRows = [];
+            const orgChunkSize = 500;
+            for (let i = 0; i < neededOrgIds.length; i += orgChunkSize) {
+                const chunk = neededOrgIds.slice(i, i + orgChunkSize);
+                const { data, error } = await supabase
+                    .from("floriday_customers_cache")
+                    .select("organization_id, data")
+                    .in("organization_id", chunk);
+                if (error) {
+                    console.warn("[useSalesOrdersQuery] floriday_customers_cache chunk faalde:", error.message);
+                    continue;
+                }
+                customerCacheRows.push(...(data ?? []));
+            }
+            const customersList = { rows: customerCacheRows };
             const lookup = new Map();
             // Primair: gekoppelde klanten uit de Klanten Module (customers-tabel).
             for (const c of localCustomersRes.data ?? []) {
@@ -203,7 +297,7 @@ export function useSalesOrdersQuery() {
                     pickString(d.articleCode);
                 tradeItemLookup.set(id, { name, imageUrl: firstPhoto, sku, raw: d });
             }
-            const floridayOrders = (ordersList.rows ?? []).map((r) => mapJsonbToSalesOrderDTO(r.data, lookup, tradeItemLookup));
+            const floridayOrders = (ordersList.rows ?? []).map((r) => mapJsonbToSalesOrderDTO({ ...r.data, __controlledAt: r.controlled_at ?? null }, lookup, tradeItemLookup));
             const localCustomerLookup = new Map();
             for (const c of localCustomersRes.data ?? []) {
                 localCustomerLookup.set(String(c.id), {
@@ -213,6 +307,65 @@ export function useSalesOrdersQuery() {
             }
             const localOrders = [];
             const includedOrderIds = new Set();
+            // Belading per productgroep: head_product_id (products-rij) heeft
+            // voorrang, val terug op de group-mirror (products.trade_item_key =
+            // 'group:<id>'). Bij verkoop-lijnen met product_name "[Groep] X"
+            // gebruiken we deze belading i.p.v. die van de eerste member.
+            const [productGroupsRes, groupMirrorRes] = await Promise.all([
+                supabase
+                    .from("product_groups")
+                    .select("id, name, head_product_id, head_trade_item_floriday_id")
+                    .limit(5000),
+                supabase
+                    .from("products")
+                    .select("id, plants_per_crate, crates_per_layer, layers_per_cart, trade_item_key")
+                    .like("trade_item_key", "group:%")
+                    .limit(5000),
+            ]);
+            const mirrorByGroupId = new Map();
+            for (const p of groupMirrorRes.data ?? []) {
+                const key = p.trade_item_key;
+                if (typeof key === "string" && key.startsWith("group:")) {
+                    mirrorByGroupId.set(key.slice(6), p);
+                }
+            }
+            const headProductIds = Array.from(new Set((productGroupsRes.data ?? [])
+                .map((g) => g.head_product_id)
+                .filter((v) => typeof v === "string" && !!v)));
+            const headProductById = new Map();
+            if (headProductIds.length > 0) {
+                const { data: hp } = await supabase
+                    .from("products")
+                    .select("id, plants_per_crate, crates_per_layer, layers_per_cart")
+                    .in("id", headProductIds);
+                for (const p of hp ?? [])
+                    headProductById.set(p.id, p);
+            }
+            const packFromRow = (row) => row
+                ? {
+                    plants_per_crate: Math.max(1, Number(row.plants_per_crate ?? 1)),
+                    crates_per_layer: Math.max(1, Number(row.crates_per_layer ?? 1)),
+                    layers_per_cart: Math.max(1, Number(row.layers_per_cart ?? 1)),
+                }
+                : null;
+            const groupPackingByNameLower = new Map();
+            for (const g of productGroupsRes.data ?? []) {
+                const packing = packFromRow(headProductById.get(g.head_product_id)) ??
+                    packFromRow(mirrorByGroupId.get(g.id));
+                const gname = g.name ? String(g.name).trim().toLowerCase() : "";
+                if (packing && gname)
+                    groupPackingByNameLower.set(gname, packing);
+            }
+            const resolveLinePacking = (item) => {
+                const name = String(item?.product_name ?? "");
+                if (name.startsWith("[Groep] ")) {
+                    const gname = name.slice("[Groep] ".length).trim().toLowerCase();
+                    const gp = groupPackingByNameLower.get(gname);
+                    if (gp)
+                        return gp;
+                }
+                return item?.products ?? null;
+            };
             // Bereken karren per lokale order via de karindeling-planner (inclusief
             // uitpakken van groep-artikelen naar members met eigen belading). Zo
             // matcht de kolom "Karren" in de tabel met de karindeling-kaart.
@@ -222,7 +375,7 @@ export function useSalesOrdersQuery() {
                 if (!lineItems.length)
                     return;
                 const raws = lineItems.map((it, idx) => {
-                    const packing = it?.products ?? null;
+                    const packing = resolveLinePacking(it);
                     return {
                         id: String(it?.id ?? `${r.id}#${idx}`),
                         product_id: it?.product_id ?? null,
@@ -263,7 +416,7 @@ export function useSalesOrdersQuery() {
                     const pieces = toNumber(item?.quantity) || 0;
                     if (pieces <= 0)
                         continue;
-                    const packing = item?.products ?? null;
+                    const packing = resolveLinePacking(item);
                     const plantsPerCrate = Math.max(1, Number(packing?.plants_per_crate ?? 1));
                     const cratesPerLayer = Math.max(0, Number(packing?.crates_per_layer ?? 0));
                     const layersPerCart = Math.max(0, Number(packing?.layers_per_cart ?? 0));
@@ -289,7 +442,7 @@ export function useSalesOrdersQuery() {
                 const customerId = r.customer_id ? String(r.customer_id) : "";
                 const localCustomer = customerId ? localCustomerLookup.get(customerId) : undefined;
                 const firstProduct = pickString(firstLine?.product_name);
-                const firstProductPacking = firstLine?.products ?? null;
+                const firstProductPacking = firstLine ? resolveLinePacking(firstLine) : null;
                 const firstPlantsPerCrate = Math.max(1, Number(firstProductPacking?.plants_per_crate ?? 1));
                 const firstCratesPerLayer = Math.max(0, Number(firstProductPacking?.crates_per_layer ?? 0));
                 const firstLayersPerCart = Math.max(0, Number(firstProductPacking?.layers_per_cart ?? 0));

package/package.json

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