@flowselections/floriday-verkoop-module 1.0.51 → 1.0.52

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

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
 import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping";
 import { resolveOrderStage } from "./order-status";
+import { resolveOrderNumbers } from "./order-numbers.server";
 import { loadActiveConnections, syncBySequence, } from "./floriday-sync";
 const ENTITY_TYPE = "salesorders";
 const MAX_ENDPOINT = "/sales-orders/current-max-sequence";
@@ -288,13 +289,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
                 .then((r) => r)
                 .catch((e) => ({ data: null, error: e }))
             : Promise.resolve({ data: null, error: null }),
-        supabase
-            .from("floriday_order_number_map")
-            .select("floriday_id, order_number")
-            .eq("floriday_id", data.id)
-            .maybeSingle()
-            .then((r) => r)
-            .catch((e) => ({ data: null, error: e })),
+        resolveOrderNumbers(supabase, [data.id]).catch(() => new Map()),
     ]);
     // 4) Bouw lookups met precies één klant en één trade-item.
     const customerLookup = new Map();
@@ -344,11 +339,11 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
         });
     }
     // 5) Verrijk met order_number + controle-status zodat de mapping alles heeft.
-    const onRow = (orderNumberRes?.data ?? null);
+    const ownOrderNumber = orderNumberRes.get(String(data.id)) ?? null;
     const controlledAt = row.controlled_at ?? null;
     const enrichedOrder = {
         ...orderData,
-        ...(onRow?.order_number ? { orderNumber: String(onRow.order_number) } : {}),
+        ...(ownOrderNumber ? { orderNumber: ownOrderNumber } : {}),
         __controlledAt: controlledAt,
     };
     let dto = mapJsonbToSalesOrderDTO(enrichedOrder, customerLookup, tradeItemLookup);
@@ -399,6 +394,9 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
                     .eq("connection_id", conn.id)
                     .in("floriday_id", sibFoIds);
                 const sibRows = (sibCacheRes.data ?? []);
+                // Ordernummers van de siblings in één batch; zonder deze lookup
+                // bleef orderNumber leeg en verzon de UI een uuid-fragment.
+                const sibOrderNumbers = await resolveOrderNumbers(supabase, sibRows.map((r) => String(r.floriday_id))).catch(() => new Map());
                 // Verzamel extra klant/trade-item lookups voor de siblings.
                 const extraOrgIds = Array.from(new Set(sibRows
                     .map((r) => String(r?.data?.customerOrganizationId ?? ""))
@@ -481,9 +479,11 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
                     const sMirrored = sr.data?.packingConfiguration
                         ? null
                         : packingConfigFromFloridayPacking((sLocalRow?.custom_fields ?? {})?.floriday_packing);
+                    const sOrderNumber = sibOrderNumbers.get(String(sr.floriday_id)) ?? null;
                     const sDto = mapJsonbToSalesOrderDTO({
                         ...sr.data,
                         ...(sMirrored ? { packingConfiguration: sMirrored } : {}),
+                        ...(sOrderNumber ? { orderNumber: sOrderNumber } : {}),
                         __controlledAt: sr.controlled_at ?? null,
                     }, customerLookup, tradeItemLookup);
                     sDto.bufferId = bufferId;

package/package.json

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