@flowselections/floriday-voorraad 1.0.19 → 1.0.21

package/dist-lib/hooks/useLocalTradeItems.d.ts

@@ -1,5 +1,11 @@
 import type { WizardData } from "../lib/floriday-payload";
-import type { FloridayLinkStatus, TradeItem } from "../lib/floriday-client";
+import { type FloridayLinkStatus, type TradeItem } from "../lib/floriday-client";
+/**
+ * Concept/Draft is verwijderd. Alle "lokale trade items" leven nu als volwaardige rijen in
+ * `public.products` met de Floriday-velden in `floriday_payload`. Dit bestand behoudt de
+ * oorspronkelijke API-namen zodat bestaande callers blijven werken, maar leest en schrijft
+ * uitsluitend op `products`. `trade_item_drafts` is read-only (trigger blokkeert writes).
+ */
 export interface LocalTradeItemRow {
     id: string;
     connection_id: string | null;
@@ -13,7 +19,11 @@ export interface LocalTradeItemRow {
     last_floriday_sync_at?: string | null;
     source?: string | null;
 }
-export declare function useLocalTradeItems(connectionId: string | null): {
+/**
+ * `connectionId` wordt vandaag genegeerd: producten zijn niet meer per Floriday-connectie gescoped.
+ * De parameter blijft in de signatuur zodat bestaande callers zonder wijziging werken.
+ */
+export declare function useLocalTradeItems(_connectionId: string | null): {
     items: TradeItem[];
     loading: boolean;
     reload: () => Promise<void>;
@@ -27,12 +37,26 @@ export interface DraftMeta {
     lastFloridaySyncAt?: string | null;
     source?: "manual" | "excel_import";
 }
+/**
+ * Slaat Floriday-velden op in `products.floriday_payload`. Als `id` ontbreekt maken we een
+ * nieuw product aan (met minimale ERP-velden uit de payload). Nooit een concept-rij.
+ */
 export declare function upsertLocalTradeItem(params: {
     id?: string;
     connectionId: string;
     data: WizardData;
     meta?: DraftMeta;
 }): Promise<string>;
+/**
+ * Legacy API. Alleen meta-velden die vandaag nog op `products` bestaan (`floriday_active`,
+ * `floriday_trade_item_id`) worden gepersisteerd; overige velden worden stilzwijgend genegeerd
+ * omdat het draft-model verdwenen is.
+ */
 export declare function updateDraftMeta(id: string, meta: DraftMeta): Promise<void>;
+/**
+ * Vroeger: draft-rij verwijderen. Nu: hele product verwijderen. Callers die dit
+ * gebruikten (bijv. "Concept weggooien"-knop) verwijderen daarmee het product.
+ * De UI-flow moet dit alleen aanroepen bij een expliciete verwijderactie.
+ */
 export declare function deleteLocalTradeItem(id: string): Promise<void>;
 //# sourceMappingURL=useLocalTradeItems.d.ts.map

package/dist-lib/hooks/useLocalTradeItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalTradeItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalTradeItems.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAE5E,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAoCD,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;EA+B7D;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAQrF;AAED,MAAM,WAAW,SAAS;IACxB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;CACpC;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ClB;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAYhF;AAED,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE"}
+{"version":3,"file":"useLocalTradeItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalTradeItems.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAwB,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGvG;;;;;GAKG;AAEH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AA2DD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;;;;EA0B9D;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAsBrF;AAED,MAAM,WAAW,SAAS;IACxB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2DlB;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhF;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE"}

package/dist-lib/hooks/useLocalTradeItems.js

@@ -1,19 +1,24 @@
 import { useCallback, useEffect, useState } from "react";
 import { supabase } from "../integrations/supabase/client";
-function draftToTradeItem(row) {
-    const d = row.data ?? {};
-    const linkedProductId = typeof d.linkedProductId === "string" ? d.linkedProductId : undefined;
-    const firstImage = Array.isArray(d.images) && d.images.length > 0 ? d.images[0] : null;
-    const imageUrl = (firstImage && (firstImage.url || firstImage.previewUrl)) ?? null;
+import { derivePrimaryPacking } from "../lib/floriday-client";
+function productToTradeItem(row) {
+    const payload = (row.floriday_payload ?? {});
+    const firstImage = Array.isArray(payload.images) && payload.images.length > 0 ? payload.images[0] : null;
+    const payloadImage = (firstImage && (firstImage.url || firstImage.previewUrl)) ?? null;
+    const packingConfigurations = Array.isArray(payload.packingConfigurations)
+        ? payload.packingConfigurations
+        : undefined;
+    const name = row.product || payload.name || payload.vbnName || "(naamloos)";
+    const articleNumber = row.article_number || payload.articleCode || payload.gtin || "";
     return {
-        id: `local:${row.id}`,
+        id: row.id,
+        productId: row.id,
         localId: row.id,
-        productId: linkedProductId,
-        tradeItemKey: linkedProductId ? `product:${linkedProductId}` : `draft:${row.id}`,
-        source: "draft",
-        name: d.name || d.vbnName || "(naamloos)",
-        articleNumber: d.articleCode || d.gtin || "",
-        imageUrl,
+        tradeItemKey: `product:${row.id}`,
+        source: "product",
+        name,
+        articleNumber,
+        imageUrl: row.image_url || payloadImage,
         quantity: 0,
         minQuantity: 0,
         reservedQuantity: 0,
@@ -21,34 +26,36 @@ function draftToTradeItem(row) {
         incomingQuantity: 0,
         economicQuantity: 0,
         raw: row,
-        published: false,
-        linkStatus: row.floriday_link_status ?? "unlinked",
-        missingFields: row.missing_required_fields ?? [],
-        linkError: row.floriday_link_error ?? null,
-        lastSyncAt: row.last_floriday_sync_at ?? null,
-        floridayId: row.floriday_id ?? null,
+        floridayActive: row.floriday_active,
+        published: row.floriday_active,
+        linkStatus: row.floriday_active ? "published" : "linked",
+        missingFields: [],
+        linkError: null,
+        lastSyncAt: null,
+        floridayId: row.floriday_trade_item_id,
+        packingConfigurations,
+        primaryPacking: derivePrimaryPacking(packingConfigurations),
     };
 }
-const SELECT_COLS = "id,connection_id,data,updated_at,created_at,floriday_link_status,floriday_id,floriday_link_error,missing_required_fields,last_floriday_sync_at,source";
-export function useLocalTradeItems(connectionId) {
+const SELECT_COLS = "id,product,article_number,barcode,image_url,floriday_active,floriday_trade_item_id,floriday_payload,updated_at,created_at";
+/**
+ * `connectionId` wordt vandaag genegeerd: producten zijn niet meer per Floriday-connectie gescoped.
+ * De parameter blijft in de signatuur zodat bestaande callers zonder wijziging werken.
+ */
+export function useLocalTradeItems(_connectionId) {
     const [items, setItems] = useState([]);
     const [loading, setLoading] = useState(false);
     const load = useCallback(async () => {
-        if (!connectionId) {
-            setItems([]);
-            return;
-        }
         setLoading(true);
         try {
             const { data, error } = await supabase
-                .from("trade_item_drafts")
+                .from("products")
                 .select(SELECT_COLS)
-                .eq("connection_id", connectionId)
                 .order("updated_at", { ascending: false })
                 .limit(1000);
             if (error)
                 throw error;
-            setItems((data ?? []).map((r) => draftToTradeItem(r)));
+            setItems((data ?? []).map(productToTradeItem));
         }
         catch {
             setItems([]);
@@ -56,7 +63,7 @@ export function useLocalTradeItems(connectionId) {
         finally {
             setLoading(false);
         }
-    }, [connectionId]);
+    }, []);
     useEffect(() => {
         load();
     }, [load]);
@@ -64,85 +71,118 @@ export function useLocalTradeItems(connectionId) {
 }
 export async function getLocalTradeItem(id) {
     const { data, error } = await supabase
-        .from("trade_item_drafts")
+        .from("products")
         .select(SELECT_COLS)
         .eq("id", id)
         .maybeSingle();
     if (error)
         throw new Error(error.message);
-    return data ?? null;
+    if (!data)
+        return null;
+    const p = data;
+    return {
+        id: p.id,
+        connection_id: null,
+        data: (p.floriday_payload ?? {}),
+        updated_at: p.updated_at,
+        created_at: p.created_at,
+        floriday_id: p.floriday_trade_item_id,
+        floriday_link_status: p.floriday_active ? "published" : "linked",
+        missing_required_fields: [],
+        last_floriday_sync_at: null,
+        floriday_link_error: null,
+        source: "product",
+    };
 }
+/**
+ * Slaat Floriday-velden op in `products.floriday_payload`. Als `id` ontbreekt maken we een
+ * nieuw product aan (met minimale ERP-velden uit de payload). Nooit een concept-rij.
+ */
 export async function upsertLocalTradeItem(params) {
     const userRes = await supabase.auth.getUser();
     const userId = userRes.data.user?.id;
     if (!userId)
         throw new Error("Niet ingelogd");
-    const metaRow = {};
-    const m = params.meta;
-    if (m) {
-        if (m.floridayLinkStatus !== undefined)
-            metaRow.floriday_link_status = m.floridayLinkStatus;
-        if (m.floridayId !== undefined)
-            metaRow.floriday_id = m.floridayId;
-        if (m.floridayLinkError !== undefined)
-            metaRow.floriday_link_error = m.floridayLinkError;
-        if (m.missingRequiredFields !== undefined)
-            metaRow.missing_required_fields = m.missingRequiredFields;
-        if (m.lastFloridaySyncAt !== undefined)
-            metaRow.last_floriday_sync_at = m.lastFloridaySyncAt;
-        if (m.source !== undefined)
-            metaRow.source = m.source;
+    const payload = params.data ?? {};
+    const linkedProductId = typeof payload.linkedProductId === "string" && payload.linkedProductId
+        ? String(payload.linkedProductId)
+        : null;
+    const targetId = params.id && params.id.length > 0 ? params.id : linkedProductId;
+    const productPatch = {
+        floriday_payload: payload,
+        updated_at: new Date().toISOString(),
+    };
+    if (params.meta?.floridayId !== undefined) {
+        productPatch.floriday_trade_item_id = params.meta.floridayId;
+    }
+    if (params.meta?.floridayLinkStatus === "published") {
+        productPatch.floriday_active = true;
     }
-    if (params.id) {
-        const patch = {
-            data: params.data,
-            connection_id: params.connectionId,
-            updated_at: new Date().toISOString(),
-            ...metaRow,
-        };
+    if (payload.name)
+        productPatch.product = payload.name;
+    if (payload.articleCode)
+        productPatch.article_number = payload.articleCode;
+    if (payload.gtin)
+        productPatch.barcode = payload.gtin;
+    const firstImage = Array.isArray(payload.images) && payload.images.length > 0 ? payload.images[0] : null;
+    const firstImageUrl = firstImage?.url || firstImage?.previewUrl;
+    if (firstImageUrl)
+        productPatch.image_url = firstImageUrl;
+    if (targetId) {
         const { error } = await supabase
-            .from("trade_item_drafts")
-            .update(patch)
-            .eq("id", params.id);
+            .from("products")
+            .update(productPatch)
+            .eq("id", targetId);
         if (error)
             throw new Error(error.message);
-        return params.id;
+        return targetId;
     }
+    const generatedId = crypto.randomUUID();
     const insertRow = {
-        user_id: userId,
-        connection_id: params.connectionId,
-        data: params.data,
-        ...metaRow,
+        id: generatedId,
+        product: payload.name || "Naamloos artikel",
+        batch: "-",
+        location: "onbekend",
+        quantity: 0,
+        unit: "stuks",
+        article_number: payload.articleCode || null,
+        barcode: payload.gtin || null,
+        image_url: firstImageUrl || null,
+        product_type: "levend",
+        trade_item_key: `product:${generatedId}`,
+        floriday_payload: payload,
+        floriday_trade_item_id: params.meta?.floridayId ?? null,
+        floriday_active: params.meta?.floridayLinkStatus === "published",
     };
-    const { data, error } = await supabase
-        .from("trade_item_drafts")
-        .insert(insertRow)
-        .select("id")
-        .single();
+    const { error } = await supabase.from("products").insert(insertRow);
     if (error)
         throw new Error(error.message);
-    return data.id;
+    return generatedId;
 }
+/**
+ * Legacy API. Alleen meta-velden die vandaag nog op `products` bestaan (`floriday_active`,
+ * `floriday_trade_item_id`) worden gepersisteerd; overige velden worden stilzwijgend genegeerd
+ * omdat het draft-model verdwenen is.
+ */
 export async function updateDraftMeta(id, meta) {
-    const row = {};
-    if (meta.floridayLinkStatus !== undefined)
-        row.floriday_link_status = meta.floridayLinkStatus;
+    const patch = {};
     if (meta.floridayId !== undefined)
-        row.floriday_id = meta.floridayId;
-    if (meta.floridayLinkError !== undefined)
-        row.floriday_link_error = meta.floridayLinkError;
-    if (meta.missingRequiredFields !== undefined)
-        row.missing_required_fields = meta.missingRequiredFields;
-    if (meta.lastFloridaySyncAt !== undefined)
-        row.last_floriday_sync_at = meta.lastFloridaySyncAt;
-    if (Object.keys(row).length === 0)
+        patch.floriday_trade_item_id = meta.floridayId;
+    if (meta.floridayLinkStatus === "published")
+        patch.floriday_active = true;
+    if (Object.keys(patch).length === 0)
         return;
-    const { error } = await supabase.from("trade_item_drafts").update(row).eq("id", id);
+    const { error } = await supabase.from("products").update(patch).eq("id", id);
     if (error)
         throw new Error(error.message);
 }
+/**
+ * Vroeger: draft-rij verwijderen. Nu: hele product verwijderen. Callers die dit
+ * gebruikten (bijv. "Concept weggooien"-knop) verwijderen daarmee het product.
+ * De UI-flow moet dit alleen aanroepen bij een expliciete verwijderactie.
+ */
 export async function deleteLocalTradeItem(id) {
-    const { error } = await supabase.from("trade_item_drafts").delete().eq("id", id);
+    const { error } = await supabase.from("products").delete().eq("id", id);
     if (error)
         throw new Error(error.message);
 }

package/dist-lib/hooks/useVoorraadData.d.ts

@@ -1,10 +1,10 @@
 import { type TradeItem } from "../lib/floriday-client";
 /**
- * Reads trade items from three sources and merges them into one voorraad list:
- * 1. `products` rows tied to a `product:<id>` key (pure ERP items).
- * 2. `trade_item_drafts` (lokaal concept, mogelijk in publiceerflow).
- * 3. `floriday_trade_items_cache` (gepubliceerd artikel).
- * Voorraadwaarden komen uit `trade_item_stock` en overschrijven cache-defaults.
+ * Voorraaddata na de dedup-migratie:
+ * - `products` is de canonieke bron; alle items (inclusief Floriday-velden) leven daar.
+ * - `floriday_trade_items_cache` levert alleen extra Floriday-metadata voor producten die
+ *   nog geen lokale spiegel hebben (mag zelden voorkomen: nieuwe imports).
+ * - Concept/Draft bestaat niet meer.
  */
 export declare function useVoorraadData(connectionId: string | null): {
     items: TradeItem[];

package/dist-lib/hooks/useVoorraadData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useVoorraadData.d.ts","sourceRoot":"","sources":["../../src/hooks/useVoorraadData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAkD5E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EA4H1D"}
+{"version":3,"file":"useVoorraadData.d.ts","sourceRoot":"","sources":["../../src/hooks/useVoorraadData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAqB5E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EAsP1D"}

package/dist-lib/hooks/useVoorraadData.js

@@ -3,6 +3,7 @@ import { supabase } from "../integrations/supabase/client";
 import { normaliseTradeItem } from "../lib/floriday-client";
 import { useLocalTradeItems } from "./useLocalTradeItems";
 import { fetchStockMap } from "./useTradeItemStock";
+import { useFloridayContinuousStockMap } from "./useFloridayContinuousStock";
 function applyStock(item, s) {
     if (!s)
         return item;
@@ -19,81 +20,103 @@ function applyStock(item, s) {
         economicQuantity: available + s.incoming_stock,
     };
 }
-function erpToTradeItem(row) {
-    const key = row.trade_item_key ?? `product:${row.id}`;
-    return {
-        id: `erp:${row.id}`,
-        productId: row.id,
-        tradeItemKey: key,
-        source: "erp",
-        name: row.product || "(naamloos product)",
-        articleNumber: row.barcode || "",
-        imageUrl: row.image_url,
-        quantity: 0,
-        minQuantity: 0,
-        reservedQuantity: 0,
-        availableQuantity: 0,
-        incomingQuantity: 0,
-        economicQuantity: 0,
-        raw: row,
-        published: false,
-        linkStatus: "unlinked",
-    };
-}
 /**
- * Reads trade items from three sources and merges them into one voorraad list:
- * 1. `products` rows tied to a `product:<id>` key (pure ERP items).
- * 2. `trade_item_drafts` (lokaal concept, mogelijk in publiceerflow).
- * 3. `floriday_trade_items_cache` (gepubliceerd artikel).
- * Voorraadwaarden komen uit `trade_item_stock` en overschrijven cache-defaults.
+ * Voorraaddata na de dedup-migratie:
+ * - `products` is de canonieke bron; alle items (inclusief Floriday-velden) leven daar.
+ * - `floriday_trade_items_cache` levert alleen extra Floriday-metadata voor producten die
+ *   nog geen lokale spiegel hebben (mag zelden voorkomen: nieuwe imports).
+ * - Concept/Draft bestaat niet meer.
  */
 export function useVoorraadData(connectionId) {
     const [publishedItems, setPublishedItems] = useState([]);
-    const [erpItems, setErpItems] = useState([]);
     const [stockMap, setStockMap] = useState(new Map());
+    const [typeSets, setTypeSets] = useState({
+        groupProdIds: new Set(),
+        groupFloridayIds: new Set(),
+        groupKeysByProdId: new Map(),
+        groupKeysByFloridayId: new Map(),
+        bomProdIds: new Set(),
+        bomFloridayIds: new Set(),
+    });
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(null);
     const { items: localItems, loading: localLoading, reload: reloadLocal, } = useLocalTradeItems(connectionId);
     const loadPublished = useCallback(async () => {
         if (!connectionId) {
             setPublishedItems([]);
-            setErpItems([]);
             setStockMap(new Map());
             return;
         }
         setLoading(true);
         setError(null);
         try {
-            const [pubRes, erpRes, stock] = await Promise.all([
+            const [pubRes, stock, groupsRes, bomRes] = await Promise.all([
                 supabase
                     .from("floriday_trade_items_cache")
                     .select("data,floriday_id,is_deleted")
                     .eq("connection_id", connectionId)
                     .eq("is_deleted", false)
                     .limit(1000),
-                supabase
-                    .from("products")
-                    .select("id,product,barcode,image_url,trade_item_key")
-                    .or("trade_item_key.is.null,trade_item_key.like.product:%")
-                    .limit(1000),
                 fetchStockMap(connectionId),
+                supabase
+                    .from("product_groups")
+                    .select("id,head_product_id,head_trade_item_floriday_id")
+                    .eq("is_active", true),
+                supabase
+                    .from("product_bom_items")
+                    .select("parent_product_id,parent_trade_item_floriday_id"),
             ]);
             if (pubRes.error)
                 throw pubRes.error;
-            if (erpRes.error)
-                throw erpRes.error;
             const normalised = (pubRes.data ?? [])
                 .map((row) => normaliseTradeItem({ ...row.data, id: row.floriday_id }))
                 .filter((i) => i.id)
-                .map((i) => ({ ...i, published: true, source: "published", tradeItemKey: i.id }));
+                .map((i) => ({
+                ...i,
+                published: true,
+                floridayActive: true,
+                source: "published",
+                tradeItemKey: i.id,
+            }));
             setPublishedItems(normalised);
-            setErpItems((erpRes.data ?? []).map((r) => erpToTradeItem(r)));
             setStockMap(stock);
+            const groupProdIds = new Set();
+            const groupFloridayIds = new Set();
+            const groupKeysByProdId = new Map();
+            const groupKeysByFloridayId = new Map();
+            (groupsRes.data ?? []).forEach((r) => {
+                const groupKey = r.id ? `group:${r.id}` : null;
+                if (r.head_product_id) {
+                    groupProdIds.add(r.head_product_id);
+                    if (groupKey)
+                        groupKeysByProdId.set(r.head_product_id, groupKey);
+                }
+                if (r.head_trade_item_floriday_id) {
+                    groupFloridayIds.add(r.head_trade_item_floriday_id);
+                    if (groupKey)
+                        groupKeysByFloridayId.set(r.head_trade_item_floriday_id, groupKey);
+                }
+            });
+            const bomProdIds = new Set();
+            const bomFloridayIds = new Set();
+            (bomRes.data ?? []).forEach((r) => {
+                if (r.parent_product_id)
+                    bomProdIds.add(r.parent_product_id);
+                if (r.parent_trade_item_floriday_id)
+                    bomFloridayIds.add(r.parent_trade_item_floriday_id);
+            });
+            setTypeSets({
+                groupProdIds,
+                groupFloridayIds,
+                groupKeysByProdId,
+                groupKeysByFloridayId,
+                bomProdIds,
+                bomFloridayIds,
+            });
         }
         catch (e) {
             setError(e.message);
             setPublishedItems([]);
-            setErpItems([]);
         }
         finally {
             setLoading(false);
@@ -102,9 +125,6 @@ export function useVoorraadData(connectionId) {
     useEffect(() => {
         loadPublished();
     }, [loadPublished]);
-    // Realtime: refresh stock map whenever any trade_item_stock row for this
-    // connection changes (insert/update/delete). Keeps Voorraad in sync with
-    // reservations, order completions, wizard saves, imports, etc.
     useEffect(() => {
         if (!connectionId)
             return;
@@ -120,27 +140,84 @@ export function useVoorraadData(connectionId) {
         })
             .on("postgres_changes", { event: "*", schema: "public", table: "products" }, () => {
             loadPublished();
+            reloadLocal();
         })
             .on("postgres_changes", { event: "*", schema: "public", table: "floriday_trade_items_cache", filter: `connection_id=eq.${connectionId}` }, () => {
             loadPublished();
+        })
+            .on("postgres_changes", { event: "*", schema: "public", table: "product_groups" }, () => {
+            loadPublished();
+        })
+            .on("postgres_changes", { event: "*", schema: "public", table: "product_bom_items" }, () => {
+            loadPublished();
         })
             .subscribe();
         return () => {
             supabase.removeChannel(channel);
         };
-    }, [connectionId, loadPublished]);
+    }, [connectionId, loadPublished, reloadLocal]);
     const reload = useCallback(async () => {
         await Promise.all([loadPublished(), reloadLocal()]);
     }, [loadPublished, reloadLocal]);
-    const linkedProductIds = new Set(localItems
-        .map((i) => i.productId)
+    const floridayStockMap = useFloridayContinuousStockMap(connectionId);
+    const applyFloridayOverride = (item) => {
+        if (item.source !== "published" || !item.id)
+            return item;
+        const pieces = floridayStockMap.get(item.id);
+        if (pieces === undefined)
+            return item;
+        const reserved = item.reservedQuantity;
+        const available = Math.max(0, pieces - reserved);
+        return {
+            ...item,
+            quantity: pieces,
+            availableQuantity: available,
+            economicQuantity: available + item.incomingQuantity,
+        };
+    };
+    const classify = (item) => {
+        const prodId = item.productId ?? undefined;
+        const floridayId = item.source === "published" ? item.id : (item.floridayId ?? undefined);
+        let itemType = "artikel";
+        if ((prodId && typeSets.bomProdIds.has(prodId)) ||
+            (floridayId && typeSets.bomFloridayIds.has(floridayId))) {
+            itemType = "samenstelling";
+        }
+        else if ((prodId && typeSets.groupProdIds.has(prodId)) ||
+            (floridayId && typeSets.groupFloridayIds.has(floridayId))) {
+            itemType = "productgroep";
+        }
+        return { ...item, itemType };
+    };
+    const applyProductGroupReservation = (item) => {
+        if (item.itemType !== "productgroep")
+            return item;
+        const prodId = item.productId ?? undefined;
+        const floridayId = item.source === "published" ? item.id : (item.floridayId ?? undefined);
+        const groupKey = (prodId && typeSets.groupKeysByProdId.get(prodId)) ||
+            (floridayId && typeSets.groupKeysByFloridayId.get(floridayId));
+        const groupStock = groupKey ? stockMap.get(groupKey) : undefined;
+        if (!groupStock)
+            return item;
+        const reserved = groupStock.reserved_stock;
+        const available = Math.max(0, item.quantity - reserved);
+        return {
+            ...item,
+            reservedQuantity: reserved,
+            availableQuantity: available,
+            economicQuantity: available + item.incomingQuantity,
+        };
+    };
+    // Voorkom dubbele rijen: Floriday-cache-items waar we al een lokaal product voor hebben
+    // (op `floriday_trade_item_id`) tonen we niet apart — het lokale product wint.
+    const localFloridayIds = new Set(localItems
+        .map((i) => i.floridayId)
         .filter((id) => Boolean(id)));
     const merged = [
-        ...erpItems
-            .filter((i) => !i.productId || !linkedProductIds.has(i.productId))
-            .map((i) => applyStock(i, stockMap.get(i.tradeItemKey ?? ""))),
-        ...localItems.map((i) => applyStock(i, stockMap.get(i.tradeItemKey ?? (i.localId ? `draft:${i.localId}` : "")))),
-        ...publishedItems.map((i) => applyStock(i, stockMap.get(i.id))),
+        ...localItems.map((i) => applyProductGroupReservation(classify(applyStock(i, stockMap.get(i.tradeItemKey ?? ""))))),
+        ...publishedItems
+            .filter((i) => !i.id || !localFloridayIds.has(i.id))
+            .map((i) => applyProductGroupReservation(classify(applyFloridayOverride(applyStock(i, stockMap.get(i.id)))))),
     ];
     return {
         items: merged,