@flowselections/floriday-voorraad 1.0.21 → 1.0.22

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;AAqB5E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EAsP1D"}
+{"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;;;;;EAuS1D"}

package/dist-lib/hooks/useVoorraadData.js

@@ -37,6 +37,7 @@ export function useVoorraadData(connectionId) {
         groupKeysByFloridayId: new Map(),
         bomProdIds: new Set(),
         bomFloridayIds: new Set(),
+        membersByGroupKey: new Map(),
     });
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(null);
@@ -50,7 +51,7 @@ export function useVoorraadData(connectionId) {
         setLoading(true);
         setError(null);
         try {
-            const [pubRes, stock, groupsRes, bomRes] = await Promise.all([
+            const [pubRes, stock, groupsRes, bomRes, groupItemsRes] = await Promise.all([
                 supabase
                     .from("floriday_trade_items_cache")
                     .select("data,floriday_id,is_deleted")
@@ -65,6 +66,9 @@ export function useVoorraadData(connectionId) {
                 supabase
                     .from("product_bom_items")
                     .select("parent_product_id,parent_trade_item_floriday_id"),
+                supabase
+                    .from("product_group_items")
+                    .select("product_group_id,trade_item_id,quantity"),
             ]);
             if (pubRes.error)
                 throw pubRes.error;
@@ -105,6 +109,15 @@ export function useVoorraadData(connectionId) {
                 if (r.parent_trade_item_floriday_id)
                     bomFloridayIds.add(r.parent_trade_item_floriday_id);
             });
+            const membersByGroupKey = new Map();
+            (groupItemsRes.data ?? []).forEach((r) => {
+                if (!r.product_group_id || !r.trade_item_id)
+                    return;
+                const key = `group:${r.product_group_id}`;
+                const arr = membersByGroupKey.get(key) ?? [];
+                arr.push({ tradeItemId: String(r.trade_item_id), quantity: Number(r.quantity ?? 1) });
+                membersByGroupKey.set(key, arr);
+            });
             setTypeSets({
                 groupProdIds,
                 groupFloridayIds,
@@ -112,6 +125,7 @@ export function useVoorraadData(connectionId) {
                 groupKeysByFloridayId,
                 bomProdIds,
                 bomFloridayIds,
+                membersByGroupKey,
             });
         }
         catch (e) {
@@ -150,6 +164,9 @@ export function useVoorraadData(connectionId) {
         })
             .on("postgres_changes", { event: "*", schema: "public", table: "product_bom_items" }, () => {
             loadPublished();
+        })
+            .on("postgres_changes", { event: "*", schema: "public", table: "product_group_items" }, () => {
+            loadPublished();
         })
             .subscribe();
         return () => {
@@ -196,16 +213,37 @@ export function useVoorraadData(connectionId) {
         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)
+        if (!groupKey)
             return item;
-        const reserved = groupStock.reserved_stock;
-        const available = Math.max(0, item.quantity - reserved);
+        // Aggregeer voorraad van alle leden — een productgroep zelf heeft geen eigen
+        // voorraad, alleen de som van zijn onderliggende artikelen.
+        const members = typeSets.membersByGroupKey.get(groupKey) ?? [];
+        let physical = 0;
+        let incoming = 0;
+        let minimum = 0;
+        let memberReserved = 0;
+        for (const m of members) {
+            const s = stockMap.get(`product:${m.tradeItemId}`) ??
+                stockMap.get(m.tradeItemId);
+            if (!s)
+                continue;
+            const qty = m.quantity > 0 ? m.quantity : 1;
+            physical += s.physical_stock * qty;
+            incoming += s.incoming_stock * qty;
+            minimum += s.minimum_stock * qty;
+            memberReserved += s.reserved_stock * qty;
+        }
+        const groupStock = stockMap.get(groupKey);
+        const reserved = (groupStock?.reserved_stock ?? 0) + memberReserved;
+        const available = Math.max(0, physical - reserved);
         return {
             ...item,
+            quantity: physical,
+            minQuantity: minimum,
+            incomingQuantity: incoming,
             reservedQuantity: reserved,
             availableQuantity: available,
-            economicQuantity: available + item.incomingQuantity,
+            economicQuantity: available + incoming,
         };
     };
     // Voorkom dubbele rijen: Floriday-cache-items waar we al een lokaal product voor hebben

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-voorraad",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",