@flowselections/floriday-verkoop-module 1.0.40 → 1.0.41

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

@@ -4,6 +4,8 @@ import { normalizeLoadCarrierCode } from "./load-carriers";
 import { normalizeTime, resolveDeliveryTimeForDate } from "./carrier-availability";
 import { expandOrderItemsForPlanner } from "./expand-group-order-items";
 import { planCarts } from "./cart-planner";
+import { mergeStages, resolveOrderStage } from "./order-status";
+import { expectedPackagesFromSalesOrder, isFullyFulfilled, loadFloridayFulfillmentStates, } from "./floriday-fulfillment-status.server";
 const FO_CAP = 20000;
 const LOCAL_CAP = 5000;
 const PROPOSAL_CAP = 2000;
@@ -182,7 +184,7 @@ export async function buildSalesOrdersList(supabase, params) {
         }
     }
     // 3) Lokale orders binnen hetzelfde venster.
-    const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, total, custom_fields, order_source, created_at, is_reservation, buffer_id, floriday_sales_order_id, order_items(id, product_id, product_name, quantity, unit, unit_price, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
+    const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, total, custom_fields, order_source, created_at, is_reservation, plan_locked_at, buffer_id, floriday_sales_order_id, order_items(id, product_id, product_name, quantity, unit, unit_price, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
     let localQ = supabase
         .from("orders")
         .select(localOrderSelect)
@@ -203,6 +205,39 @@ export async function buildSalesOrdersList(supabase, params) {
     if (localRes.error)
         throw new Error(`Lokale orders lezen faalde: ${localRes.error.message}`);
     const localOrderRows = (localRes.data ?? []);
+    // 3b) Vervoerders + verzendmomenten (best-effort, alleen voor deze orders).
+    const carrierNameById = new Map();
+    const shipmentStateByOrder = new Map();
+    try {
+        const { data: carrierRows } = await supabase.from("carriers").select("id, name").limit(2000);
+        for (const c of (carrierRows ?? []))
+            carrierNameById.set(String(c.id), String(c.name ?? ""));
+    }
+    catch {
+        /* vervoerdernamen zijn optioneel */
+    }
+    const localIds = localOrderRows.map((r) => String(r.id));
+    if (localIds.length) {
+        try {
+            const { data: shipRows } = await supabase
+                .from("order_shipments")
+                .select("order_id, status, shipped_at")
+                .in("order_id", localIds.slice(0, 1000));
+            for (const s of (shipRows ?? [])) {
+                const key = String(s.order_id);
+                const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false };
+                const st = String(s.status ?? "").toLowerCase();
+                if (s.shipped_at || st === "verzonden" || st === "shipped")
+                    prev.shipped = true;
+                if (st === "gepickt" || st === "picked" || st === "gecontroleerd")
+                    prev.picked = true;
+                shipmentStateByOrder.set(key, prev);
+            }
+        }
+        catch (e) {
+            warnings.push(`Verzendmomenten niet geladen: ${e.message}`);
+        }
+    }
     // 4) Mailbox-voorstellen (best-effort).
     let proposalRows = [];
     try {
@@ -375,6 +410,16 @@ export async function buildSalesOrdersList(supabase, params) {
         else
             bufferByLocalId.set(String(r.id), bid);
     }
+    // 8b) Afhandeling die in Floriday zelf is gedaan (afleverbrieven).
+    let fulfillmentStates = new Map();
+    if (foRows.length > 0) {
+        try {
+            fulfillmentStates = await loadFloridayFulfillmentStates(supabase, foRows.map((r) => String(r.floriday_id)));
+        }
+        catch (e) {
+            warnings.push(`Floriday-afhandelingen niet geladen: ${e.message}`);
+        }
+    }
     // 9) Floriday-orders → DTO (zonder zware raw-payload richting browser).
     const floridayOrders = foRows.map((r) => {
         const enriched = {
@@ -389,6 +434,22 @@ export async function buildSalesOrdersList(supabase, params) {
         const bid = bufferByFoId.get(dto.id) ?? null;
         if (bid)
             dto.bufferId = bid;
+        const ff = fulfillmentStates.get(String(r.floriday_id));
+        dto.stage = resolveOrderStage({
+            status: r.data?.status,
+            controlledAt: r.controlled_at ?? null,
+            floridayFulfillment: ff
+                ? {
+                    fulfilled: ff.fulfilled,
+                    fullyFulfilled: isFullyFulfilled(ff, expectedPackagesFromSalesOrder(r.data)),
+                    received: ff.received,
+                }
+                : null,
+        });
+        dto.incomplete = [
+            ...(dto.customer.name && dto.customer.name !== "Onbekende klant" ? [] : ["geen klant gekoppeld"]),
+            ...(dto.deliveryAt ? [] : ["geen leverdatum"]),
+        ];
         return dto;
     });
     // 10) Lokale orders → DTO.
@@ -502,6 +563,17 @@ export async function buildSalesOrdersList(supabase, params) {
                 logoUrl: null,
             },
             status: statusFlags(r.status),
+            stage: resolveOrderStage({
+                status: r.status,
+                shipped: shipmentStateByOrder.get(String(r.id))?.shipped,
+                controlledAt: shipmentStateByOrder.get(String(r.id))?.picked ? "picked" : null,
+                isReservation: !!r.is_reservation,
+            }),
+            carrierName: cf.carrier ? (carrierNameById.get(String(cf.carrier)) ?? null) : null,
+            incomplete: [
+                ...(r.customer_id || r.customer_name ? [] : ["geen klant gekoppeld"]),
+                ...(r.delivery_date ? [] : ["geen leverdatum"]),
+            ],
             raw: { order: { status: r.status ?? null }, customer: null, tradeItem: null },
             bufferId: bufferByLocalId.get(String(r.id)) ?? null,
         });
@@ -538,6 +610,11 @@ export async function buildSalesOrdersList(supabase, params) {
                 logoUrl: null,
             },
             status: statusFlags(p.status),
+            stage: "incoming",
+            incomplete: [
+                ...(matchedCustomer ? [] : ["geen klant gekoppeld"]),
+                ...(p.delivery_date ? [] : ["geen leverdatum"]),
+            ],
             raw: { order: { status: p.status ?? null }, customer: null, tradeItem: null },
         });
     }
@@ -551,79 +628,86 @@ export async function buildSalesOrdersList(supabase, params) {
     for (const o of all)
         if (o.bufferId)
             o.bufferSize = sizeByBuffer.get(o.bufferId) ?? 1;
-    // 13) Filteren (zoek + status), tellen, pagineren.
+    // 12b) Buffers samenvouwen tot één rij per buffer, vóór tellen en pagineren.
+    const groups = [];
+    const groupIndex = new Map();
+    for (const o of all) {
+        const key = o.bufferId && (o.bufferSize ?? 1) > 1 ? `buf:${o.bufferId}` : `one:${o.id}`;
+        const idx = groupIndex.get(key);
+        if (idx === undefined) {
+            groupIndex.set(key, groups.length);
+            groups.push([o]);
+        }
+        else {
+            groups[idx].push(o);
+        }
+    }
+    const mergeGroup = (members) => {
+        const head = members[0];
+        if (members.length === 1)
+            return head;
+        const revenue = members.reduce((s, m) => s + (m.revenue ?? 0), 0);
+        const fustCount = members.reduce((s, m) => s + (m.fustCount ?? 0), 0);
+        const karCount = members.reduce((s, m) => s + (m.karCount ?? 0), 0);
+        const totalPieces = members.reduce((s, m) => s + (m.totalPieces ?? 0), 0);
+        const incomplete = Array.from(new Set(members.flatMap((m) => m.incomplete ?? [])));
+        return {
+            ...head,
+            revenue,
+            fustCount,
+            karCount,
+            totalPieces,
+            bufferSize: members.length,
+            bufferOrderNumbers: members.map((m) => m.orderNumber).filter(Boolean),
+            bufferOrderIds: members.map((m) => m.id),
+            reservationCount: members.filter((m) => m.isReservation).length,
+            stage: mergeStages(members.map((m) => m.stage ?? "incoming")),
+            crateTypeName: mergeTypeNames(members.map((m) => m.crateTypeName ?? "")),
+            cartTypeName: mergeTypeNames(members.map((m) => m.cartTypeName ?? "")),
+            carrierName: head.carrierName ?? members.find((m) => m.carrierName)?.carrierName ?? null,
+            incomplete,
+        };
+    };
+    // 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
     const search = (params.search ?? "").trim().toLowerCase();
-    const matchesSearch = (o) => !search ||
-        `${o.productName} ${o.sku} ${o.orderNumber} ${o.customer.name}`.toLowerCase().includes(search);
-    const matchesStatusFilter = (o) => {
+    const matchesSearch = (members) => !search ||
+        members.some((o) => `${o.productName} ${o.sku} ${o.orderNumber} ${o.customer.name}`.toLowerCase().includes(search));
+    const stageOf = (members) => mergeStages(members.map((m) => m.stage ?? "incoming"));
+    const matchesStatusFilter = (members) => {
+        const stage = stageOf(members);
         switch (params.status) {
             case "cancelled":
-                return o.status.isCancelled;
+                return stage === "cancelled";
             case "shipped":
-                return o.status.isShipped;
-            case "invoiced":
-                return o.status.isInvoiced;
-            case "open":
-                return !o.status.isCancelled && !o.status.isShipped;
-            default:
-                return true;
-        }
-    };
-    const matchesTab = (o) => {
-        switch (params.tab) {
+                return stage === "shipped";
             case "open":
-                return !o.status.isCancelled && !o.status.isShipped;
-            case "shipped":
-                return o.status.isShipped && !o.status.isCancelled;
-            case "invoiced":
-                return o.status.isInvoiced;
-            case "cancelled":
-                return o.status.isCancelled;
+                return stage !== "cancelled" && stage !== "shipped";
             default:
                 return true;
         }
     };
-    const withoutTab = all.filter((o) => matchesSearch(o) && matchesStatusFilter(o));
-    const filtered = withoutTab.filter(matchesTab);
-    const collapse = (rows) => {
-        const seen = new Set();
-        const out = [];
-        for (const o of rows) {
-            const key = o.bufferId && (o.bufferSize ?? 1) > 1 ? `buf:${o.bufferId}` : `one:${o.id}`;
-            if (seen.has(key))
-                continue;
-            seen.add(key);
-            out.push(o);
-        }
-        return out;
-    };
-    const collapsedAll = collapse(withoutTab);
+    const matchesTab = (members) => params.tab === "all" || stageOf(members) === params.tab;
+    const withoutTab = groups.filter((g) => matchesSearch(g) && matchesStatusFilter(g));
+    const filteredGroups = withoutTab.filter(matchesTab);
     const statusCounts = {
-        all: collapsedAll.length,
-        open: 0,
+        all: withoutTab.length,
+        incoming: 0,
+        topick: 0,
+        picked: 0,
         shipped: 0,
-        invoiced: 0,
         cancelled: 0,
     };
-    for (const o of collapsedAll) {
-        if (o.status.isCancelled)
-            statusCounts.cancelled++;
-        else if (o.status.isShipped)
-            statusCounts.shipped++;
-        else
-            statusCounts.open++;
-        if (o.status.isInvoiced)
-            statusCounts.invoiced++;
-    }
-    const totals = computeTotals(collapse(filtered));
-    const totalCount = filtered.length;
-    const rows = params.all
-        ? filtered.slice(0, EXPORT_CAP)
-        : filtered.slice((page - 1) * pageSize, page * pageSize);
+    for (const g of withoutTab)
+        statusCounts[stageOf(g)]++;
+    const totalCount = filteredGroups.length;
+    const pageGroups = params.all
+        ? filteredGroups.slice(0, EXPORT_CAP)
+        : filteredGroups.slice((page - 1) * pageSize, page * pageSize);
     // 14) Karindeling alleen voor de zichtbare rijen (begrensd werk).
     if (!params.all) {
         const localById = new Map(localOrderRows.map((r) => [String(r.id), r]));
-        await Promise.all(rows
+        await Promise.all(pageGroups
+            .flat()
             .filter((o) => o.id.startsWith("local:"))
             .map(async (o) => {
             const r = localById.get(o.id.slice("local:".length));
@@ -655,6 +739,9 @@ export async function buildSalesOrdersList(supabase, params) {
             }
         }));
     }
+    const rows = pageGroups.map(mergeGroup);
+    // Totalen over de volledige gefilterde set (alle orders in elke buffer).
+    const totals = computeTotals(filteredGroups.map(mergeGroup));
     return {
         rows,
         totalCount,

package/dist-lib/lib/salesorders-mapping.d.ts

@@ -1,3 +1,4 @@
+import { type OrderStage } from "./order-status";
 export interface SalesOrderDTO {
     id: string;
     orderNumber: string;
@@ -26,6 +27,18 @@ export interface SalesOrderDTO {
     bufferId?: string | null;
     bufferSize?: number;
     bufferKey?: string | null;
+    /** Ordernummers van alle orders in dezelfde buffer (samengevouwen rij). */
+    bufferOrderNumbers?: string[];
+    /** Interne ids van alle orders in dezelfde buffer. */
+    bufferOrderIds?: string[];
+    /** Aantal reserveringen binnen de buffer. */
+    reservationCount?: number;
+    /** Vertaalde weergavestatus (zie order-status.ts). */
+    stage?: OrderStage;
+    /** Vervoerder van de order (indien bekend). */
+    carrierName?: string | null;
+    /** Concrete ontbrekende gegevens, bv. "geen klant gekoppeld". */
+    incomplete?: string[];
     customer: {
         name: string;
         postalCode: string;

package/dist-lib/lib/salesorders-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}

package/dist-lib/lib/salesorders-mapping.js

@@ -1,5 +1,6 @@
 // Client-safe mapping: jsonb cache row -> SalesOrderDTO used by the UI.
 import { cratePackageName, loadCarrierName } from "./load-carrier-labels";
+import { orderStageLabel } from "./order-status";
 function toNum(v, d = 0) {
     if (typeof v === "number")
         return v;
@@ -238,13 +239,7 @@ export function ordersToCsv(orders) {
         o.customer.postalCode,
         o.customer.city,
         o.deliveryAt,
-        o.status.isCancelled
-            ? "Geannuleerd"
-            : o.status.isShipped
-                ? "Verzonden"
-                : o.status.isInvoiced
-                    ? "Gefactureerd"
-                    : "Open",
+        orderStageLabel(o.stage ?? "incoming"),
     ]);
     const escape = (v) => `"${String(v).replace(/"/g, '""')}"`;
     const csv = [header, ...rows].map((r) => r.map(escape).join(";")).join("\n");