@flowselections/floriday-verkoop-module 1.0.46 → 1.0.48

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

@@ -4,6 +4,7 @@ import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
 import { mapJsonbToSalesOrderDTO, } from "./salesorders-mapping";
+import { resolveOrderStage } from "./order-status";
 import { loadActiveConnections, syncBySequence, } from "./floriday-sync";
 const ENTITY_TYPE = "salesorders";
 const MAX_ENDPOINT = "/sales-orders/current-max-sequence";
@@ -354,25 +355,35 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
     // 6) Buffer-siblings: zoek buffer_id via orders-tabel en verzamel alle
     //    verwante Floriday-orders. Zo werkt de detailweergave onafhankelijk
     //    van de (soms trage of gefilterde) lijst-query.
+    //    De lokale orderrij is tevens de bron van waarheid voor de status.
     let bufferId = null;
     const bufferSiblings = [];
     try {
         const ownRes = await supabase
             .from("orders")
-            .select("buffer_id")
+            .select("buffer_id, status, is_reservation, custom_fields")
             .eq("floriday_sales_order_id", data.id)
             .maybeSingle();
-        bufferId = ownRes.data?.buffer_id ?? null;
+        const ownRow = ownRes.data ?? null;
+        dto.stage = resolveOrderStage({
+            status: ownRow ? ownRow.status : orderData?.status,
+            controlledAt: controlledAt,
+            isReservation: ownRow ? !!ownRow.is_reservation : false,
+        });
+        dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
+        bufferId = ownRow?.buffer_id ?? null;
         if (bufferId) {
             dto.bufferId = bufferId;
             const sibRes = await supabase
                 .from("orders")
-                .select("floriday_sales_order_id")
+                .select("floriday_sales_order_id, status, is_reservation, custom_fields")
                 .eq("buffer_id", bufferId)
                 .not("floriday_sales_order_id", "is", null);
-            const sibFoIds = (sibRes.data ?? [])
-                .map((r) => String(r.floriday_sales_order_id))
-                .filter((id) => id && id !== data.id);
+            const sibLocalByFoId = new Map();
+            for (const r of (sibRes.data ?? [])) {
+                sibLocalByFoId.set(String(r.floriday_sales_order_id), r);
+            }
+            const sibFoIds = Array.from(sibLocalByFoId.keys()).filter((id) => id && id !== data.id);
             if (sibFoIds.length > 0) {
                 const sibCacheRes = await supabase
                     .from("floriday_salesorders_cache")
@@ -460,6 +471,13 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
                 for (const sr of sibRows) {
                     const sDto = mapJsonbToSalesOrderDTO({ ...sr.data, __controlledAt: sr.controlled_at ?? null }, customerLookup, tradeItemLookup);
                     sDto.bufferId = bufferId;
+                    const sLocal = sibLocalByFoId.get(String(sr.floriday_id)) ?? null;
+                    sDto.stage = resolveOrderStage({
+                        status: sLocal ? sLocal.status : sr.data?.status,
+                        controlledAt: sr.controlled_at ?? null,
+                        isReservation: sLocal ? !!sLocal.is_reservation : false,
+                    });
+                    sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
                     bufferSiblings.push(sDto);
                 }
             }