@flowselections/floriday-voorraad 1.0.15 → 1.0.17

package/dist-lib/components/voorraad/StockBulkButtons.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import * as XLSX from "xlsx";
 import { Button, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Checkbox, Label, toast, } from "@flowselections/core";
 import { Download, FileDown, Upload, Loader2 } from "lucide-react";
@@ -8,6 +8,7 @@ import { emptyWizardData } from "../../lib/floriday-payload";
 import { upsertLocalTradeItem, updateDraftMeta } from "../../hooks/useLocalTradeItems";
 import { validateDraftForPublish } from "../../lib/floriday-import-validator";
 import { floriday } from "../../lib/floriday-client";
+import { ensureArticleCodes } from "../../lib/ensure-article-codes";
 const COLUMNS = [
     "Artikelcode",
     "Artikelnaam",
@@ -20,8 +21,17 @@ const COLUMNS = [
     "Gereserveerde voorraad",
     "Inkomende voorraad",
 ];
+/**
+ * Determine which trade_item_stock key to write to. The stock table is keyed
+ * by whatever `products.trade_item_key` (or the draft/floriday id) resolved
+ * to when the row was created — never by the synthetic UI id `erp:<uuid>`.
+ */
 function toKey(item) {
-    return item.localId ? `draft:${item.localId}` : item.id;
+    if (item.tradeItemKey)
+        return item.tradeItemKey;
+    if (item.localId)
+        return `draft:${item.localId}`;
+    return item.id;
 }
 function parseNumber(val) {
     if (val === undefined || val === null || val === "")
@@ -49,6 +59,20 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
     const allowNegative = true;
     const [autoPublish, setAutoPublish] = useState(false);
     const [result, setResult] = useState(null);
+    const [pastRuns, setPastRuns] = useState([]);
+    const loadPastRuns = useCallback(async () => {
+        const { data, error } = await supabase
+            .from("stock_import_runs")
+            .select("id,filename,total_rows,updated_rows,created_rows,skipped_rows,created_at,errors,mutations")
+            .order("created_at", { ascending: false })
+            .limit(10);
+        if (!error)
+            setPastRuns((data ?? []));
+    }, []);
+    useEffect(() => {
+        if (open)
+            void loadPastRuns();
+    }, [open, loadPastRuns]);
     const byCode = useMemo(() => {
         const map = new Map();
         for (const it of items) {
@@ -73,11 +97,25 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
         }
         return map;
     }, [items]);
-    const downloadTemplate = () => {
-        const rows = items.map((i) => {
+    const downloadTemplate = async () => {
+        let exportItems;
+        try {
+            exportItems = await ensureArticleCodes(items);
+        }
+        catch (e) {
+            toast.error(`Artikelcodes genereren mislukt: ${e.message}`);
+            return;
+        }
+        const missing = exportItems.filter((i) => !(i.articleNumber ?? "").trim());
+        if (missing.length > 0) {
+            toast.error(`${missing.length} artikel(en) missen nog een artikelcode; export afgebroken.`);
+            return;
+        }
+        const generatedCount = exportItems.filter((i, idx) => i.articleNumber !== items[idx].articleNumber).length;
+        const rows = exportItems.map((i) => {
             const d = i.raw?.data;
             return {
-                Artikelcode: i.articleNumber ?? "",
+                Artikelcode: i.articleNumber,
                 Artikelnaam: i.name,
                 "VBN-code": d?.vbnCode ?? i.raw?.vbnProductCode ?? "",
                 "Botanische naam": d?.botanicalName ?? "",
@@ -97,6 +135,10 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
         XLSX.utils.book_append_sheet(wb, ws, "Voorraad");
         const stamp = new Date().toISOString().slice(0, 10);
         XLSX.writeFile(wb, `voorraad-template-${stamp}.xlsx`);
+        if (generatedCount > 0) {
+            toast.success(`${generatedCount} artikel(en) kregen automatisch een nieuwe artikelcode.`);
+            await onImported();
+        }
     };
     const downloadErrors = () => {
         if (!result?.errors.length)
@@ -121,6 +163,7 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
         setProgress(0);
         setResult(null);
         const errors = [];
+        const mutations = [];
         let updated = 0;
         let created = 0;
         let linked = 0;
@@ -205,6 +248,14 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
                         trade_item_key: toKey(existing),
                         ...applied,
                     });
+                    mutations.push({
+                        articleCode: code,
+                        articleName: existing.name,
+                        oldPhysical: existing.quantity,
+                        newPhysical: applied.physical_stock,
+                        oldReserved: existing.reservedQuantity,
+                        newReserved: applied.reserved_stock,
+                    });
                     updated++;
                     setProgress(Math.round(((idx + 1) / rows.length) * 100));
                     continue;
@@ -325,7 +376,37 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
                     });
                 }
             }
-            setResult({ updated, created, linked, published, waiting, errors });
+            const finalResult = {
+                updated,
+                created,
+                linked,
+                published,
+                waiting,
+                errors,
+                mutations,
+            };
+            setResult(finalResult);
+            // Persisteer het importverslag zodat het achteraf herbekeken kan worden.
+            try {
+                const { error: logErr } = await supabase.from("stock_import_runs").insert({
+                    user_id: userId,
+                    connection_id: activeConnectionId,
+                    filename: file.name,
+                    total_rows: rows.length,
+                    updated_rows: updated,
+                    created_rows: created,
+                    skipped_rows: errors.length,
+                    errors: errors,
+                    mutations: mutations,
+                });
+                if (logErr)
+                    console.warn("Import log opslaan mislukt", logErr);
+                else
+                    void loadPastRuns();
+            }
+            catch (logE) {
+                console.warn("Import log opslaan mislukt", logE);
+            }
             if (updated + created > 0) {
                 toast.success(`${updated} bijgewerkt · ${created} nieuw`);
                 await onImported();
@@ -349,7 +430,7 @@ export function StockBulkButtons({ items, activeConnectionId, onImported, }) {
                                         const f = e.target.files?.[0];
                                         if (f)
                                             void handleFile(f);
-                                    } }), importing && (_jsxs("div", { className: "space-y-1", children: [_jsx("div", { className: "h-2 w-full overflow-hidden rounded bg-muted", children: _jsx("div", { className: "h-full bg-primary transition-all", style: { width: `${progress}%` } }) }), _jsxs("p", { className: "text-xs text-muted-foreground flex items-center gap-2", children: [_jsx(Loader2, { className: "h-3 w-3 animate-spin" }), "Bezig met importeren\u2026 ", progress, "%"] })] })), result && (_jsxs("div", { className: "rounded-md border bg-muted/30 p-3 text-sm space-y-2", children: [_jsx("div", { className: "font-medium", children: "Importoverzicht" }), _jsxs("ul", { className: "text-xs space-y-1", children: [_jsxs("li", { children: ["Bestaande artikelen bijgewerkt:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.updated })] }), _jsxs("li", { children: ["Nieuwe artikelen aangemaakt:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.created })] }), _jsxs("li", { children: ["Automatisch gekoppeld met Floriday:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.linked })] }), _jsxs("li", { children: ["Gepubliceerd naar Floriday:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.published })] }), _jsxs("li", { children: ["Wacht op Floriday-publicatie (gegevens incompleet):", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.waiting })] }), _jsxs("li", { children: ["Fouten:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.errors.length })] })] }), result.errors.length > 0 && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "max-h-40 overflow-y-auto rounded border bg-background p-2 text-xs space-y-1", children: [result.errors.slice(0, 20).map((e, i) => (_jsxs("div", { className: "text-destructive", children: ["Regel ", e.row, " \u2014 ", e.articleCode || "(geen code)", " \u2014", " ", e.reden] }, i))), result.errors.length > 20 && (_jsxs("div", { className: "text-muted-foreground", children: ["\u2026 en ", result.errors.length - 20, " meer. Download het foutbestand voor de volledige lijst."] }))] }), _jsxs(Button, { variant: "outline", size: "sm", onClick: downloadErrors, children: [_jsx(Download, { className: "mr-2 h-4 w-4" }), "Download foutbestand"] })] }))] }))] }), _jsx(DialogFooter, { children: _jsx(Button, { variant: "ghost", onClick: () => {
+                                    } }), importing && (_jsxs("div", { className: "space-y-1", children: [_jsx("div", { className: "h-2 w-full overflow-hidden rounded bg-muted", children: _jsx("div", { className: "h-full bg-primary transition-all", style: { width: `${progress}%` } }) }), _jsxs("p", { className: "text-xs text-muted-foreground flex items-center gap-2", children: [_jsx(Loader2, { className: "h-3 w-3 animate-spin" }), "Bezig met importeren\u2026 ", progress, "%"] })] })), result && (_jsxs("div", { className: "rounded-md border bg-muted/30 p-3 text-sm space-y-2", children: [_jsx("div", { className: "font-medium", children: "Importoverzicht" }), _jsxs("ul", { className: "text-xs space-y-1", children: [_jsxs("li", { children: ["Bestaande artikelen bijgewerkt:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.updated })] }), _jsxs("li", { children: ["Nieuwe artikelen aangemaakt:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.created })] }), _jsxs("li", { children: ["Automatisch gekoppeld met Floriday:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.linked })] }), _jsxs("li", { children: ["Gepubliceerd naar Floriday:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.published })] }), _jsxs("li", { children: ["Wacht op Floriday-publicatie (gegevens incompleet):", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.waiting })] }), _jsxs("li", { children: ["Fouten:", " ", _jsx("span", { className: "tabular-nums font-medium text-foreground", children: result.errors.length })] })] }), result.errors.length > 0 && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "max-h-40 overflow-y-auto rounded border bg-background p-2 text-xs space-y-1", children: [result.errors.slice(0, 20).map((e, i) => (_jsxs("div", { className: "text-destructive", children: ["Regel ", e.row, " \u2014 ", e.articleCode || "(geen code)", " \u2014", " ", e.reden] }, i))), result.errors.length > 20 && (_jsxs("div", { className: "text-muted-foreground", children: ["\u2026 en ", result.errors.length - 20, " meer. Download het foutbestand voor de volledige lijst."] }))] }), _jsxs(Button, { variant: "outline", size: "sm", onClick: downloadErrors, children: [_jsx(Download, { className: "mr-2 h-4 w-4" }), "Download foutbestand"] })] }))] })), !importing && pastRuns.length > 0 && (_jsxs("div", { className: "rounded-md border bg-background p-3 text-sm space-y-2", children: [_jsx("div", { className: "font-medium", children: "Recente imports" }), _jsx("ul", { className: "text-xs space-y-1 max-h-48 overflow-y-auto", children: pastRuns.map((r) => (_jsxs("li", { className: "flex justify-between gap-2 border-b last:border-0 py-1", children: [_jsxs("span", { className: "truncate", children: [_jsx("span", { className: "text-muted-foreground", children: new Date(r.created_at).toLocaleString("nl-NL") }), " ", "\u2014 ", r.filename ?? "(zonder naam)"] }), _jsxs("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: [r.updated_rows, "\u21BB \u00B7 ", r.created_rows, "+ \u00B7 ", r.skipped_rows, "\u2715"] })] }, r.id))) })] }))] }), _jsx(DialogFooter, { children: _jsx(Button, { variant: "ghost", onClick: () => {
                                     setOpen(false);
                                     setResult(null);
                                 }, disabled: importing, children: "Sluiten" }) })] }) })] }));

package/dist-lib/components/voorraad/VoorraadStockCard.d.ts

@@ -2,7 +2,8 @@ interface Props {
     connectionId: string | null;
     tradeItemId?: string | null;
     draftId?: string | null;
+    productId?: string | null;
 }
-export declare function VoorraadStockCard({ connectionId, tradeItemId, draftId }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function VoorraadStockCard({ connectionId, tradeItemId, draftId, productId }: Props): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=VoorraadStockCard.d.ts.map

package/dist-lib/components/voorraad/VoorraadStockCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoorraadStockCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadStockCard.tsx"],"names":[],"mappings":"AAaA,UAAU,KAAK;IACb,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,KAAK,2CAoG9E"}
+{"version":3,"file":"VoorraadStockCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadStockCard.tsx"],"names":[],"mappings":"AAaA,UAAU,KAAK;IACb,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,wBAAgB,iBAAiB,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,KAAK,2CAqGzF"}

package/dist-lib/components/voorraad/VoorraadStockCard.js

@@ -2,10 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useEffect, useState } from "react";
 import { Button, Card, CardContent, Input, Label, Textarea, toast, } from "@flowselections/core";
 import { Loader2, Package, Check } from "lucide-react";
-import { useTradeItemStock, stockKeyFor } from "../../hooks/useTradeItemStock";
-export function VoorraadStockCard({ connectionId, tradeItemId, draftId }) {
-    const key = stockKeyFor({ tradeItemId, draftId });
-    const { row, loading, save } = useTradeItemStock(connectionId, key);
+import { useTradeItemStock, stockKeysFor } from "../../hooks/useTradeItemStock";
+export function VoorraadStockCard({ connectionId, tradeItemId, draftId, productId }) {
+    const keys = stockKeysFor({ tradeItemId, draftId, productId });
+    const key = keys[0] ?? null;
+    const { row, loading, save } = useTradeItemStock(connectionId, keys);
     const [values, setValues] = useState(row);
     const [saving, setSaving] = useState(false);
     useEffect(() => {

package/dist-lib/components/voorraad/VoorraadTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VoorraadTable.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadTable.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,OAAO,GACR,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB,2CA8GA"}
+{"version":3,"file":"VoorraadTable.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadTable.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,OAAO,GACR,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB,2CAmHA"}

package/dist-lib/components/voorraad/VoorraadTable.js

@@ -20,10 +20,15 @@ export function VoorraadTable({ items, loading, }) {
     }
     return (_jsx("div", { className: "overflow-x-auto", children: _jsxs("table", { className: "w-full text-sm", children: [_jsx("thead", { className: "bg-muted/50 text-left", children: _jsxs("tr", { children: [_jsx("th", { className: "p-3 w-14" }), _jsx("th", { className: "p-3", children: "Product" }), _jsx("th", { className: "p-3", children: "Artikelnummer" }), columns.map((c) => (_jsx("th", { className: "p-3 text-right whitespace-nowrap", children: c.label }, c.key)))] }) }), _jsx("tbody", { children: items.map((item) => {
                         const isLocal = !item.published;
+                        const isErp = item.source === "erp";
                         const low = !isLocal &&
                             item.minQuantity > 0 &&
                             item.availableQuantity < item.minQuantity;
-                        const linkId = isLocal ? item.localId : item.id;
+                        const linkId = isErp
+                            ? item.productId
+                            : isLocal
+                                ? item.localId
+                                : item.id;
                         const clickable = Boolean(linkId);
                         const open = () => {
                             if (linkId)

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;AAgCD,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,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"}

package/dist-lib/hooks/useLocalTradeItems.js

@@ -2,11 +2,15 @@ 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;
     return {
         id: `local:${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,

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

@@ -1 +1 @@
-{"version":3,"file":"useTradeItemSpec.d.ts","sourceRoot":"","sources":["../../src/hooks/useTradeItemSpec.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,eAAe,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,yEAAyE;IACzE,aAAa,EAAE,uBAAuB,EAAE,CAAC;CAC1C;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,kBAAkB,EAAE,CAAC;IACtC,2DAA2D;IAC3D,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,0FAA0F;IAC1F,2BAA2B,EAAE,OAAO,CAAC;IACrC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mGAAmG;IACnG,0BAA0B,EAAE,OAAO,CAAC;IACpC,4FAA4F;IAC5F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB,EAAE,OAAO,CAAC;CAClC;AA8bD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IAC/C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3C;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,cAAc,GAAG,SAAS,EAClC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,GAAG,IAAI,EACjC,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,GAAG,IAAI,GACnD,aAAa,CAmEf"}
+{"version":3,"file":"useTradeItemSpec.d.ts","sourceRoot":"","sources":["../../src/hooks/useTradeItemSpec.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,eAAe,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,yEAAyE;IACzE,aAAa,EAAE,uBAAuB,EAAE,CAAC;CAC1C;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,kBAAkB,EAAE,CAAC;IACtC,2DAA2D;IAC3D,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,0FAA0F;IAC1F,2BAA2B,EAAE,OAAO,CAAC;IACrC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mGAAmG;IACnG,0BAA0B,EAAE,OAAO,CAAC;IACpC,4FAA4F;IAC5F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB,EAAE,OAAO,CAAC;CAClC;AA8bD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IAC/C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3C;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,cAAc,GAAG,SAAS,EAClC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,GAAG,IAAI,EACjC,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,GAAG,IAAI,GACnD,aAAa,CAsEf"}

package/dist-lib/hooks/useTradeItemSpec.js

@@ -402,7 +402,10 @@ export function useTradeItemSpec(schema, vbnCode, productGroup, regulatoryFeatur
             fromRegulatory = regulatoryFeatures.map((f) => ({
                 code: f.code,
                 label: f.label,
-                required: f.regulation === "required",
+                // Floriday's server-side validator rejeert ook "advised" karakteristieken
+                // (bv. S62) met "Characteristic X is required". Behandel required+advised
+                // beide als verplicht om stille 400's te voorkomen.
+                required: f.regulation === "required" || f.regulation === "advised",
                 listName: f.code,
                 allowedValues: f.values,
             }));

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

@@ -9,8 +9,21 @@ export interface TradeItemStockRow {
 export declare function stockKeyFor(params: {
     tradeItemId?: string | null;
     draftId?: string | null;
+    productId?: string | null;
 }): string | null;
-export declare function useTradeItemStock(connectionId: string | null, key: string | null): {
+/**
+ * Build the ordered list of candidate keys for one artikel. Wij zoeken op
+ * ALLE bekende varianten (tradeItemId, product:{id}, draft:{id}) omdat de
+ * voorraadrij historisch onder één van die keys kan zijn aangemaakt (bv.
+ * concept → gepubliceerd, of gelinkt aan een ERP-product). Bij opslaan
+ * gebruiken wij altijd de eerste (meest specifieke) key.
+ */
+export declare function stockKeysFor(params: {
+    tradeItemId?: string | null;
+    draftId?: string | null;
+    productId?: string | null;
+}): string[];
+export declare function useTradeItemStock(connectionId: string | null, keyOrKeys: string | string[] | null): {
     row: TradeItemStockRow;
     loading: boolean;
     save: (values: TradeItemStockRow) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"useTradeItemStock.d.ts","sourceRoot":"","sources":["../../src/hooks/useTradeItemStock.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAUD,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,GAAG,MAAM,GAAG,IAAI,CAIhB;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;;;mBA4B9D,iBAAiB;EA2BnC;AAED,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAUzC"}
+{"version":3,"file":"useTradeItemStock.d.ts","sourceRoot":"","sources":["../../src/hooks/useTradeItemStock.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAUD,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG,MAAM,GAAG,IAAI,CAKhB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG,MAAM,EAAE,CAMX;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;;;mBA4ElB,iBAAiB;EA6BnC;AAED,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAUzC"}

package/dist-lib/hooks/useTradeItemStock.js

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { supabase } from "../integrations/supabase/client";
 const EMPTY = {
     physical_stock: 0,
@@ -12,37 +12,96 @@ export function stockKeyFor(params) {
         return params.tradeItemId;
     if (params.draftId)
         return `draft:${params.draftId}`;
+    if (params.productId)
+        return `product:${params.productId}`;
     return null;
 }
-export function useTradeItemStock(connectionId, key) {
+/**
+ * Build the ordered list of candidate keys for one artikel. Wij zoeken op
+ * ALLE bekende varianten (tradeItemId, product:{id}, draft:{id}) omdat de
+ * voorraadrij historisch onder één van die keys kan zijn aangemaakt (bv.
+ * concept → gepubliceerd, of gelinkt aan een ERP-product). Bij opslaan
+ * gebruiken wij altijd de eerste (meest specifieke) key.
+ */
+export function stockKeysFor(params) {
+    const keys = [];
+    if (params.tradeItemId)
+        keys.push(params.tradeItemId);
+    if (params.productId)
+        keys.push(`product:${params.productId}`);
+    if (params.draftId)
+        keys.push(`draft:${params.draftId}`);
+    return keys;
+}
+export function useTradeItemStock(connectionId, keyOrKeys) {
+    const keysKey = Array.isArray(keyOrKeys)
+        ? keyOrKeys.filter(Boolean).join("|")
+        : keyOrKeys ?? "";
+    const keys = useMemo(() => (keysKey ? keysKey.split("|") : []), [keysKey]);
+    const primaryKey = keys[0] ?? null;
     const [row, setRow] = useState(null);
     const [loading, setLoading] = useState(false);
+    const refetch = useCallback(async () => {
+        if (!connectionId || keys.length === 0)
+            return;
+        const { data } = await supabase
+            .from("trade_item_stock")
+            .select("trade_item_key,physical_stock,minimum_stock,reserved_stock,incoming_stock,notes,updated_at")
+            .eq("connection_id", connectionId)
+            .in("trade_item_key", keys);
+        const rows = (data ?? []);
+        // Kies de rij in volgorde van keys (meest specifiek eerst).
+        let picked = null;
+        for (const k of keys) {
+            const hit = rows.find((r) => r.trade_item_key === k);
+            if (hit) {
+                picked = hit;
+                break;
+            }
+        }
+        setRow(picked ?? { ...EMPTY });
+    }, [connectionId, keys]);
     useEffect(() => {
-        if (!connectionId || !key) {
+        if (!connectionId || keys.length === 0) {
             setRow(null);
             return;
         }
         let cancelled = false;
         setLoading(true);
         (async () => {
-            const { data } = await supabase
-                .from("trade_item_stock")
-                .select("physical_stock,minimum_stock,reserved_stock,incoming_stock,notes,updated_at")
-                .eq("connection_id", connectionId)
-                .eq("trade_item_key", key)
-                .maybeSingle();
-            if (cancelled)
-                return;
-            setRow(data ?? { ...EMPTY });
-            setLoading(false);
+            await refetch();
+            if (!cancelled)
+                setLoading(false);
         })();
         return () => {
             cancelled = true;
         };
-    }, [connectionId, key]);
+    }, [connectionId, keys, refetch]);
+    // Realtime: reflecteer elke externe mutatie (order-reservering,
+    // completion, bulk-import, wizard-save vanuit ander tabblad).
+    useEffect(() => {
+        if (!connectionId || keys.length === 0)
+            return;
+        const filter = `trade_item_key=in.(${keys.map((k) => `"${k}"`).join(",")})`;
+        const channel = supabase
+            .channel(`stock-${connectionId}-${primaryKey}`)
+            .on("postgres_changes", {
+            event: "*",
+            schema: "public",
+            table: "trade_item_stock",
+            filter,
+        }, () => {
+            refetch();
+        })
+            .subscribe();
+        return () => {
+            supabase.removeChannel(channel);
+        };
+    }, [connectionId, keys, primaryKey, refetch]);
     const save = useCallback(async (values) => {
-        if (!connectionId || !key)
+        if (!connectionId || !primaryKey) {
             throw new Error("Ontbrekende connectie of artikel-key");
+        }
         const userRes = await supabase.auth.getUser();
         const userId = userRes.data.user?.id;
         if (!userId)
@@ -52,7 +111,7 @@ export function useTradeItemStock(connectionId, key) {
             .upsert({
             user_id: userId,
             connection_id: connectionId,
-            trade_item_key: key,
+            trade_item_key: primaryKey,
             physical_stock: values.physical_stock,
             minimum_stock: values.minimum_stock,
             reserved_stock: values.reserved_stock,
@@ -62,7 +121,7 @@ export function useTradeItemStock(connectionId, key) {
         if (error)
             throw new Error(error.message);
         setRow(values);
-    }, [connectionId, key]);
+    }, [connectionId, primaryKey]);
     return { row: row ?? EMPTY, loading, save };
 }
 export async function fetchStockMap(connectionId) {

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

@@ -0,0 +1,21 @@
+export type TradeItemSupplyLine = {
+    id: string;
+    supply_line_id: string | null;
+    trade_item_id: string;
+    price_per_piece: number | null;
+    currency: string | null;
+    available_quantity: number | null;
+    period_start: string | null;
+    period_end: string | null;
+    packing_configuration_id: string | null;
+    endpoint_family: string | null;
+    year: number | null;
+    week: number | null;
+    updated_at: string;
+};
+/**
+ * Leest de meest recente supply-line voor een trade item en luistert realtime
+ * op wijzigingen zodat de UI direct meebeweegt na een push naar Floriday.
+ */
+export declare function useTradeItemSupplyLine(tradeItemId: string | null | undefined): import("@tanstack/react-query").UseQueryResult<TradeItemSupplyLine | null, Error>;
+//# sourceMappingURL=useTradeItemSupplyLine.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useTradeItemSupplyLine.d.ts","sourceRoot":"","sources":["../../src/hooks/useTradeItemSupplyLine.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,qFA+C5E"}

package/dist-lib/hooks/useTradeItemSupplyLine.js

@@ -0,0 +1,49 @@
+import { useEffect } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { supabase } from "../integrations/supabase/client";
+/**
+ * Leest de meest recente supply-line voor een trade item en luistert realtime
+ * op wijzigingen zodat de UI direct meebeweegt na een push naar Floriday.
+ */
+export function useTradeItemSupplyLine(tradeItemId) {
+    const queryClient = useQueryClient();
+    const key = ["trade-item-supply-line", tradeItemId];
+    const query = useQuery({
+        queryKey: key,
+        enabled: Boolean(tradeItemId),
+        queryFn: async () => {
+            if (!tradeItemId)
+                return null;
+            const { data, error } = await supabase
+                .from("trade_item_supply_lines")
+                .select("id,supply_line_id,trade_item_id,price_per_piece,currency,available_quantity,period_start,period_end,packing_configuration_id,endpoint_family,year,week,updated_at")
+                .eq("trade_item_id", tradeItemId)
+                .order("updated_at", { ascending: false })
+                .limit(1)
+                .maybeSingle();
+            if (error)
+                throw error;
+            return data ?? null;
+        },
+    });
+    useEffect(() => {
+        if (!tradeItemId)
+            return;
+        const channel = supabase
+            .channel(`supply-line:${tradeItemId}`)
+            .on("postgres_changes", {
+            event: "*",
+            schema: "public",
+            table: "trade_item_supply_lines",
+            filter: `trade_item_id=eq.${tradeItemId}`,
+        }, () => {
+            queryClient.invalidateQueries({ queryKey: key });
+        })
+            .subscribe();
+        return () => {
+            supabase.removeChannel(channel);
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [tradeItemId]);
+    return query;
+}

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

@@ -1,9 +1,10 @@
 import { type TradeItem } from "../lib/floriday-client";
 /**
- * Reads trade items from the shared `floriday_trade_items_cache` (gepubliceerd,
- * gevuld door de Auth-module elke 5 min) en merget lokale, niet-gepubliceerde
- * producten uit `trade_item_drafts`. Voorraadwaarden uit `trade_item_stock`
- * overschrijven de cache-waarden (lokale bron van waarheid voor stock).
+ * 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.
  */
 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;AAoB5E;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;;;;;EAkE1D"}
+{"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"}