@flowselections/floriday-verkoop-module 1.0.21 → 1.0.25

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

@@ -84,6 +84,15 @@ async function runSalesOrdersSyncInternal() {
             });
         }
     }
+    // Spiegel recent gewijzigde FO's naar de lokale orders-tabel zodat
+    // buffergroepering en gedeelde karren werken.
+    try {
+        const { mirrorFloridayOrdersFromCron } = await import("./floriday-mirror.functions");
+        await mirrorFloridayOrdersFromCron(500);
+    }
+    catch (mirrorErr) {
+        console.error("[floriday-mirror] failed", mirrorErr);
+    }
     return { ok: results.every((r) => r.ok), results };
 }
 export async function runSalesOrdersSyncFromCron() {
@@ -230,7 +239,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
     const conn = (connRes.data ?? [])[0];
     const sellerFallback = conn?.organization_name ?? conn?.label ?? null;
     if (!conn?.id) {
-        return { order: null, sellerFallback, environment };
+        return { order: null, sellerFallback, environment, bufferId: null, bufferSiblings: [] };
     }
     // 2) De order zelf uit de cache (gerichte lookup op indexed kolom).
     const orderRes = await supabase
@@ -244,7 +253,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
     }
     const row = orderRes.data;
     if (!row?.data) {
-        return { order: null, sellerFallback, environment };
+        return { order: null, sellerFallback, environment, bufferId: null, bufferSiblings: [] };
     }
     const orderData = row.data;
     const customerOrgId = String(orderData?.customerOrganizationId ?? "");
@@ -342,7 +351,124 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
         __controlledAt: controlledAt,
     };
     const dto = mapJsonbToSalesOrderDTO(enrichedOrder, customerLookup, tradeItemLookup);
-    return { order: dto, sellerFallback, environment };
+    // 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.
+    let bufferId = null;
+    const bufferSiblings = [];
+    try {
+        const ownRes = await supabase
+            .from("orders")
+            .select("buffer_id")
+            .eq("floriday_sales_order_id", data.id)
+            .maybeSingle();
+        bufferId = ownRes.data?.buffer_id ?? null;
+        if (bufferId) {
+            dto.bufferId = bufferId;
+            const sibRes = await supabase
+                .from("orders")
+                .select("floriday_sales_order_id")
+                .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);
+            if (sibFoIds.length > 0) {
+                const sibCacheRes = await supabase
+                    .from("floriday_salesorders_cache")
+                    .select("floriday_id, data, controlled_at")
+                    .eq("connection_id", conn.id)
+                    .in("floriday_id", sibFoIds);
+                const sibRows = (sibCacheRes.data ?? []);
+                // Verzamel extra klant/trade-item lookups voor de siblings.
+                const extraOrgIds = Array.from(new Set(sibRows
+                    .map((r) => String(r?.data?.customerOrganizationId ?? ""))
+                    .filter((id) => id && !customerLookup.has(id))));
+                const extraTiIds = Array.from(new Set(sibRows
+                    .map((r) => String(r?.data?.tradeItemId ?? ""))
+                    .filter((id) => id && !tradeItemLookup.has(id))));
+                const [extraCustLocal, extraCustCache, extraTi] = await Promise.all([
+                    extraOrgIds.length
+                        ? supabase
+                            .from("customers")
+                            .select("id, company_name, commercial_name, city, postal_code, logo_url, floriday_organization_id")
+                            .in("floriday_organization_id", extraOrgIds)
+                        : Promise.resolve({ data: [] }),
+                    extraOrgIds.length
+                        ? supabase
+                            .from("floriday_customers_cache")
+                            .select("organization_id, data")
+                            .in("organization_id", extraOrgIds)
+                        : Promise.resolve({ data: [] }),
+                    extraTiIds.length
+                        ? supabase
+                            .from("floriday_trade_items_cache")
+                            .select("floriday_id, data")
+                            .in("floriday_id", extraTiIds)
+                        : Promise.resolve({ data: [] }),
+                ]);
+                const localByOrg = new Map();
+                for (const c of (extraCustLocal.data ?? [])) {
+                    localByOrg.set(String(c.floriday_organization_id), c);
+                }
+                for (const orgId of extraOrgIds) {
+                    const localC = localByOrg.get(orgId);
+                    if (localC) {
+                        customerLookup.set(orgId, {
+                            name: localC.commercial_name ?? localC.company_name ?? "Onbekende klant",
+                            postalCode: localC.postal_code ?? "",
+                            city: localC.city ?? "",
+                            logoUrl: localC.logo_url ?? null,
+                            raw: localC,
+                        });
+                    }
+                }
+                for (const c of (extraCustCache.data ?? [])) {
+                    const orgId = String(c.organization_id);
+                    if (customerLookup.has(orgId))
+                        continue;
+                    const d = c.data ?? {};
+                    const addr = d.physicalAddress ?? d.mailingAddress ?? {};
+                    customerLookup.set(orgId, {
+                        name: d.commercialName ?? d.name ?? "Onbekende klant",
+                        postalCode: addr.postalCode ?? "",
+                        city: addr.city ?? "",
+                        logoUrl: d.logoUrl ?? null,
+                        raw: d,
+                    });
+                }
+                for (const t of (extraTi.data ?? [])) {
+                    const tid = String(t.floriday_id);
+                    const d = t.data ?? {};
+                    const photos = d.photos ?? d.images ?? d.tradeItemPhotos ?? [];
+                    const firstPhotoRaw = Array.isArray(photos) && photos.length > 0
+                        ? (photos[0]?.url ?? photos[0]?.imageUrl ?? photos[0]?.href ?? photos[0])
+                        : null;
+                    tradeItemLookup.set(tid, {
+                        name: pickString(d.name) ??
+                            pickString(d.productName) ??
+                            pickString(d.tradeItemName) ??
+                            pickString(d.tradeItemTexts) ??
+                            "Onbekend artikel",
+                        imageUrl: pickString(firstPhotoRaw),
+                        sku: pickString(d.vbnProductCode) ??
+                            pickString(d.gtin) ??
+                            pickString(d.articleCode),
+                        raw: d,
+                    });
+                }
+                for (const sr of sibRows) {
+                    const sDto = mapJsonbToSalesOrderDTO({ ...sr.data, __controlledAt: sr.controlled_at ?? null }, customerLookup, tradeItemLookup);
+                    sDto.bufferId = bufferId;
+                    bufferSiblings.push(sDto);
+                }
+            }
+        }
+    }
+    catch (err) {
+        console.warn("[getSalesOrderDetail] buffer-siblings lookup faalde:", err.message);
+    }
+    return { order: dto, sellerFallback, environment, bufferId, bufferSiblings };
 });
 // ─── Handmatige controle na orderpicken ───────────────────────────────────
 const ControlInputSchema = z.object({