@flowselections/floriday-voorraad 1.0.143 → 1.0.147

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

@@ -1,13 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
-import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle, Checkbox, Input, Label, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, toast, } from "@flowselections/core";
-import { Loader2, Save } from "lucide-react";
+import { useOpslagDeelnemer } from "./artikel/opslaan-context.js";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle, Checkbox, Input, Label, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from "@flowselections/core";
 import { useVoorraadCustomFields } from "../../hooks/useVoorraadCustomFields.js";
 import { fetchProductCustomValues, saveProductCustomValues, } from "../../lib/voorraad-custom-fields.js";
 /** Eigen voorraadvelden met `show_in_detail`, tonen en bewerken op de productpagina. */
 export function ProductCustomFieldsCard({ productId }) {
     const { fields, loading } = useVoorraadCustomFields();
     const [values, setValues] = useState({});
+    const [opened, setOpened] = useState({});
     const [loadingValues, setLoadingValues] = useState(true);
     const [saving, setSaving] = useState(false);
     useEffect(() => {
@@ -15,12 +16,16 @@ export function ProductCustomFieldsCard({ productId }) {
         setLoadingValues(true);
         fetchProductCustomValues(productId)
             .then((v) => {
-            if (!cancelled)
+            if (!cancelled) {
                 setValues(v);
+                setOpened(v);
+            }
         })
             .catch(() => {
-            if (!cancelled)
+            if (!cancelled) {
                 setValues({});
+                setOpened({});
+            }
         })
             .finally(() => {
             if (!cancelled)
@@ -31,25 +36,36 @@ export function ProductCustomFieldsCard({ productId }) {
         };
     }, [productId]);
     const detailFields = fields.filter((f) => f.show_in_detail);
-    if (loading || loadingValues) {
-        return null;
-    }
-    if (detailFields.length === 0)
-        return null;
     const set = (key, value) => setValues((prev) => ({ ...prev, [key]: value }));
+    const gewijzigd = detailFields.filter((f) => JSON.stringify(values[f.field_key] ?? null) !== JSON.stringify(opened[f.field_key] ?? null));
+    useOpslagDeelnemer("eigen_velden", gewijzigd.length > 0, () => save());
     const save = async () => {
+        if (gewijzigd.length === 0)
+            return { ok: true };
         setSaving(true);
         try {
-            await saveProductCustomValues(productId, Object.fromEntries(detailFields.map((f) => [f.field_key, values[f.field_key] ?? null])));
-            toast.success("Eigen velden opgeslagen");
+            const res = await saveProductCustomValues(productId, Object.fromEntries(gewijzigd.map((f) => [f.field_key, opened[f.field_key] ?? null])), Object.fromEntries(gewijzigd.map((f) => [f.field_key, values[f.field_key] ?? null])));
+            if (!res.ok) {
+                const namen = res.conflicten
+                    .map((c) => detailFields.find((f) => f.field_key === c.veld)?.field_label ?? c.veld)
+                    .join(", ");
+                const fresh = await fetchProductCustomValues(productId);
+                setOpened(fresh);
+                setValues(fresh);
+                return { ok: false, melding: `Eigen velden niet opgeslagen: iemand anders wijzigde intussen ${namen}. De nieuwste waarden zijn geladen; vul je wijziging opnieuw in.` };
+            }
+            setOpened((prev) => ({ ...prev, ...Object.fromEntries(gewijzigd.map((f) => [f.field_key, values[f.field_key] ?? null])) }));
+            return { ok: true };
         }
         catch (e) {
-            toast.error(`Opslaan mislukt: ${e.message}`);
+            return { ok: false, melding: `Eigen velden: opslaan mislukt (${e.message}).` };
         }
         finally {
             setSaving(false);
         }
     };
+    if (loading || loadingValues || detailFields.length === 0)
+        return null;
     return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Eigen velden" }), _jsx(CardDescription, { children: "Extra voorraadvelden zoals ingesteld bij Instellingen \u2192 Voorraadvelden." })] }), _jsxs(CardContent, { className: "space-y-4", children: [_jsx("div", { className: "grid gap-4 sm:grid-cols-2", children: detailFields.map((f) => {
                             const v = values[f.field_key];
                             return (_jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { htmlFor: `cf-${f.field_key}`, children: f.field_label }), f.field_type === "boolean" ? (_jsx("div", { className: "pt-1", children: _jsx(Checkbox, { id: `cf-${f.field_key}`, checked: v === true, onCheckedChange: (c) => set(f.field_key, c === true) }) })) : f.field_type === "select" ? (_jsxs(Select, { value: typeof v === "string" ? v : "", onValueChange: (val) => set(f.field_key, val), children: [_jsx(SelectTrigger, { id: `cf-${f.field_key}`, children: _jsx(SelectValue, { placeholder: "Kies\u2026" }) }), _jsx(SelectContent, { children: f.options.map((o) => (_jsx(SelectItem, { value: o, children: o }, o))) })] })) : (_jsx(Input, { id: `cf-${f.field_key}`, type: f.field_type === "number"
@@ -61,5 +77,5 @@ export function ProductCustomFieldsCard({ productId }) {
                                                 ? null
                                                 : Number(e.target.value)
                                             : e.target.value) }))] }, f.id));
-                        }) }), _jsxs(Button, { onClick: save, disabled: saving, children: [saving ? (_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" })) : (_jsx(Save, { className: "mr-2 h-4 w-4" })), "Eigen velden opslaan"] })] })] }));
+                        }) }), gewijzigd.length > 0 && (_jsx("p", { className: "text-xs text-muted-foreground", children: "Niet opgeslagen wijzigingen; bewaar met \"Opslaan\" bovenaan." }))] })] }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ProductSalePriceField.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ProductSalePriceField.tsx"],"names":[],"mappings":"AAmBA,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EACT,OAAO,GACR,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,sCAkGA;AAED,wFAAwF;AACxF,wBAAgB,kBAAkB,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,sCAqCtE"}
+{"version":3,"file":"ProductSalePriceField.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ProductSalePriceField.tsx"],"names":[],"mappings":"AAmBA,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EACT,OAAO,GACR,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,sCAoGA;AAED,wFAAwF;AACxF,wBAAgB,kBAAkB,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,sCAqCtE"}

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

@@ -58,18 +58,19 @@ export function ProductSalePriceField({ productId, onSaved, }) {
         setSaving(true);
         setError(null);
         try {
-            const { data, error: err } = await supabase
-                .from("products")
-                .update({ sale_price: parsed })
-                .eq("id", productId)
-                .select("id");
+            // Zelfde opslagroute als "Opslaan" op de artikelpagina: conflictcontrole per veld.
+            const { data, error: err } = await supabase.rpc("voorraad_artikel_opslaan", {
+                p_id: productId, p_oud: { sale_price: saved }, p_nieuw: { sale_price: parsed },
+            });
             if (err)
                 throw new Error(err.message);
-            if (!data || data.length === 0)
-                throw new Error("geen rechten om dit artikel te wijzigen");
+            if (!data?.ok) {
+                const hun = data?.conflicten?.[0]?.hun;
+                throw new Error(`iemand anders heeft de prijs intussen gewijzigd${hun != null ? ` naar € ${hun}` : ""}. Laad het artikel opnieuw`);
+            }
             setSaved(parsed);
             onSaved?.(parsed);
-            toast.success("Prijs opgeslagen. Het artikel gaat opnieuw naar Floriday.");
+            toast.success("Prijs opgeslagen (alleen lokaal).");
         }
         catch (e) {
             const msg = `Prijs niet opgeslagen: ${e?.message ?? e}`;

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

@@ -1 +1 @@
-{"version":3,"file":"StepSamenstelling.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/StepSamenstelling.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAsB5E,UAAU,KAAK;IACb,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,yBAAyB,EAAE,CAAC;IACtC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C;AA6FD,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,UAAU,EACV,QAAQ,EACR,kBAAkB,GACnB,EAAE,KAAK,+BA+aP"}
+{"version":3,"file":"StepSamenstelling.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/StepSamenstelling.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAwB5E,UAAU,KAAK;IACb,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,yBAAyB,EAAE,CAAC;IACtC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C;AA6FD,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,UAAU,EACV,QAAQ,EACR,kBAAkB,GACnB,EAAE,KAAK,+BAqcP"}

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

@@ -94,6 +94,7 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
     const [loading, setLoading] = useState(true);
     const [saving, setSaving] = useState(false);
     const [rows, setRows] = useState([]);
+    const [teVerwijderen, setTeVerwijderen] = useState([]);
     const [names, setNames] = useState(new Map());
     const [activeTab, setActiveTab] = useState("__base__");
     const hasParent = Boolean(productId || floridayId);
@@ -131,8 +132,10 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
             component_trade_item_floriday_id: r.component_trade_item_floriday_id ?? null,
             quantity: Number(r.quantity ?? 1),
             sort_order: Number(r.sort_order ?? 0),
+            _orig: { quantity: Number(r.quantity ?? 1), sort_order: Number(r.sort_order ?? 0) },
         }));
         setRows(list);
+        setTeVerwijderen([]);
         await resolveNames(list);
         setLoading(false);
     }, [productId, floridayId, hasParent]);
@@ -230,13 +233,9 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
         const row = rows.find((r) => r.id === id);
         if (!row)
             return;
-        if (!row._new) {
-            const { error } = await supabase.from("product_bom_items").delete().eq("id", id);
-            if (error) {
-                toast.error("Verwijderen mislukt");
-                return;
-            }
-        }
+        // Verwijderen gebeurt pas bij "Opslaan" (bewuste actie met conflictcontrole).
+        if (!row._new)
+            setTeVerwijderen((l) => [...l, row]);
         setRows((prev) => prev.filter((r) => r.id !== id));
     };
     const saveAll = async () => {
@@ -245,7 +244,7 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
             return;
         }
         const dirty = rows.filter((r) => r._dirty);
-        if (dirty.length === 0)
+        if (dirty.length === 0 && teVerwijderen.length === 0)
             return;
         setSaving(true);
         // Verhoudingscontrole: alle lagen meetellen, nooit blokkeren.
@@ -264,6 +263,32 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
             // Controle mislukt: opslaan gaat gewoon door.
         }
         try {
+            // Conflictcontrole: bestaande regels die je wijzigt of verwijdert moeten nog
+            // dezelfde stand hebben als bij openen.
+            const gecontroleerd = [...dirty.filter((r) => !r._new), ...teVerwijderen].filter((r) => r._orig);
+            if (gecontroleerd.length) {
+                const { data: nu, error: nuErr } = await supabase
+                    .from("product_bom_items")
+                    .select("id,quantity,sort_order")
+                    .in("id", gecontroleerd.map((r) => r.id));
+                if (nuErr)
+                    throw nuErr;
+                const huidig = new Map((nu ?? []).map((r) => [r.id, r]));
+                const afwijkend = gecontroleerd.filter((r) => {
+                    const h = huidig.get(r.id);
+                    return !h || Number(h.quantity) !== r._orig.quantity || Number(h.sort_order) !== r._orig.sort_order;
+                });
+                if (afwijkend.length) {
+                    toast.error("Iemand anders heeft deze samenstelling intussen gewijzigd. Er is niets opgeslagen; laad de samenstelling opnieuw.");
+                    return;
+                }
+            }
+            for (const r of teVerwijderen) {
+                const { error } = await supabase.from("product_bom_items").delete().eq("id", r.id);
+                if (error)
+                    throw error;
+            }
+            setTeVerwijderen([]);
             const inserts = dirty
                 .filter((r) => r._new)
                 .map((r) => ({
@@ -309,7 +334,7 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
                 if (error)
                     throw error;
             }
-            setRows((prev) => prev.map((r) => ({ ...r, _dirty: false })));
+            setRows((prev) => prev.map((r) => ({ ...r, _dirty: false, _orig: { quantity: r.quantity, sort_order: r.sort_order } })));
             toast.success("Samenstelling opgeslagen");
         }
         catch (e) {
@@ -319,7 +344,7 @@ export function StepSamenstelling({ productId, floridayId, packings, packagingTy
             setSaving(false);
         }
     };
-    const hasUnsaved = rows.some((r) => r._dirty);
+    const hasUnsaved = rows.some((r) => r._dirty) || teVerwijderen.length > 0;
     if (!hasParent) {
         return (_jsx("div", { className: "rounded-md border border-dashed p-6 text-center text-sm text-muted-foreground", children: "Sla het artikel eerst op om een samenstelling te configureren." }));
     }

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

@@ -0,0 +1,8 @@
+/**
+ * Telmoment vastleggen: orders vóór de teldag en orders die vóór het telmoment vertrokken
+ * zijn tellen niet mee; orders van de teldag die al weg zijn vink je aan.
+ */
+export declare function TelmomentButton({ onSaved }: {
+    onSaved?: () => void;
+}): import("react").JSX.Element;
+//# sourceMappingURL=TelmomentButton.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TelmomentButton.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/TelmomentButton.tsx"],"names":[],"mappings":"AA6BA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE,+BAkGpE"}

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

@@ -0,0 +1,65 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from "react";
+import { ClipboardCheck } from "lucide-react";
+import { Button, Dialog, DialogContent, DialogHeader, DialogTitle, Input, toast, } from "@flowselections/core";
+import { supabase } from "../../integrations/supabase/client.js";
+import { TELMOMENT_LABEL } from "../../lib/fust-administratie.js";
+function lokaleInvoer(d) {
+    const p = (n) => String(n).padStart(2, "0");
+    return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}T${p(d.getHours())}:${p(d.getMinutes())}`;
+}
+/**
+ * Telmoment vastleggen: orders vóór de teldag en orders die vóór het telmoment vertrokken
+ * zijn tellen niet mee; orders van de teldag die al weg zijn vink je aan.
+ */
+export function TelmomentButton({ onSaved }) {
+    const [open, setOpen] = useState(false);
+    const [moment, setMoment] = useState(() => lokaleInvoer(new Date()));
+    const [regels, setRegels] = useState(null);
+    const [alWeg, setAlWeg] = useState(new Set());
+    const [busy, setBusy] = useState(false);
+    const laden = async (m = moment) => {
+        setRegels(null);
+        const { data, error } = await supabase.rpc("voorraad_telmoment_lijst", { p_telmoment: new Date(m).toISOString(), p_keys: null });
+        if (error) {
+            toast.error(error.message);
+            setRegels([]);
+            return;
+        }
+        setRegels((data?.regels ?? []));
+        setAlWeg(new Set());
+    };
+    const opslaan = async () => {
+        setBusy(true);
+        try {
+            const { data, error } = await supabase.rpc("voorraad_telmoment_opslaan", {
+                p_telmoment: new Date(moment).toISOString(), p_keys: null, p_al_weg: [...alWeg], p_notitie: null,
+            });
+            if (error)
+                throw new Error(error.message);
+            toast.success(`Telmoment vastgelegd: ${data?.buiten_telling ?? 0} orderregels tellen niet mee.`);
+            setOpen(false);
+            onSaved?.();
+        }
+        catch (e) {
+            toast.error(e.message);
+        }
+        finally {
+            setBusy(false);
+        }
+    };
+    const groepen = ["teldag_open", "vertrokken", "voor_teldag"];
+    return (_jsxs(_Fragment, { children: [_jsxs(Button, { variant: "outline", size: "sm", onClick: () => { setOpen(true); void laden(); }, children: [_jsx(ClipboardCheck, { className: "mr-2 h-4 w-4" }), "Telmoment"] }), _jsx(Dialog, { open: open, onOpenChange: setOpen, children: _jsxs(DialogContent, { className: "max-w-3xl", children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: "Telmoment vastleggen" }) }), _jsxs("div", { className: "flex items-end gap-2", children: [_jsxs("label", { className: "text-xs text-muted-foreground space-y-1", children: [_jsx("span", { className: "block", children: "Moment van tellen" }), _jsx(Input, { type: "datetime-local", className: "h-9 w-56", value: moment, onChange: (e) => setMoment(e.target.value) })] }), _jsx(Button, { size: "sm", variant: "outline", onClick: () => void laden(), children: "Ververs lijst" })] }), _jsxs("div", { className: "max-h-[50vh] overflow-y-auto space-y-4 text-sm", children: [regels === null && _jsx("p", { className: "text-muted-foreground", children: "Laden\u2026" }), regels !== null && regels.length === 0 && (_jsx("p", { className: "text-muted-foreground", children: "Geen openstaande orderregels tot en met de teldag." })), regels !== null && groepen.map((g) => {
+                                    const lijst = regels.filter((r) => r.categorie === g);
+                                    if (lijst.length === 0)
+                                        return null;
+                                    return (_jsxs("div", { children: [_jsxs("p", { className: "font-medium", children: [TELMOMENT_LABEL[g], " (", lijst.length, ")"] }), _jsx("ul", { className: "mt-1 divide-y divide-border rounded-md border border-border", children: lijst.map((r) => (_jsxs("li", { className: "flex items-center gap-3 px-3 py-1.5", children: [g === "teldag_open" && (_jsx("input", { type: "checkbox", "aria-label": "Is al weg", checked: alWeg.has(r.order_item_id), onChange: (e) => setAlWeg((s) => {
+                                                                const n = new Set(s);
+                                                                if (e.target.checked)
+                                                                    n.add(r.order_item_id);
+                                                                else
+                                                                    n.delete(r.order_item_id);
+                                                                return n;
+                                                            }) })), _jsx("span", { className: "w-28 text-muted-foreground", children: r.order_number ?? "—" }), _jsxs("span", { className: "flex-1 truncate", children: [r.artikel ?? "—", " \u00B7 ", r.klant ?? ""] }), _jsx("span", { className: "tabular-nums", children: r.aantal })] }, r.order_item_id))) })] }, g));
+                                })] }), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(Button, { variant: "ghost", onClick: () => setOpen(false), children: "Annuleren" }), _jsx(Button, { onClick: () => void opslaan(), disabled: busy || regels === null, children: busy ? "Opslaan…" : "Telmoment opslaan" })] })] }) })] }));
+}

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

@@ -1,4 +1,8 @@
-/** Traysticker-afbeelding per product — los van de Floriday-productfoto (`products.image_url`). */
+/**
+ * Traysticker-afbeelding per artikel — los van de Floriday-productfoto.
+ * Kiezen of verwijderen wordt pas bewaard met de knop "Opslaan" van de pagina,
+ * met controle tegen de stand bij openen.
+ */
 export declare function TrayStickerCard({ productId }: {
     productId: string;
 }): import("react").JSX.Element;

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

@@ -1 +1 @@
-{"version":3,"file":"TrayStickerCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/TrayStickerCard.tsx"],"names":[],"mappings":"AAyBA,mGAAmG;AACnG,wBAAgB,eAAe,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,+BA+HnE"}
+{"version":3,"file":"TrayStickerCard.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/TrayStickerCard.tsx"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,+BAoInE"}

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

@@ -1,100 +1,98 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from "react";
-import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle, toast, } from "@flowselections/core";
-import { Loader2, Trash2, Upload } from "lucide-react";
+import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle, } from "@flowselections/core";
+import { Loader2, Trash2, Undo2, Upload } from "lucide-react";
 import { supabase } from "../../integrations/supabase/client.js";
+import { useOpslagDeelnemer } from "./artikel/opslaan-context.js";
 const BUCKET = "product-tray-stickers";
 // Bucket is privé (publieke buckets zijn geblokkeerd): lange signed URL voor de logistiek-engine.
 const SIGNED_URL_SECONDS = 60 * 60 * 24 * 365 * 10;
-/** Traysticker-afbeelding per product — los van de Floriday-productfoto (`products.image_url`). */
+/**
+ * Traysticker-afbeelding per artikel — los van de Floriday-productfoto.
+ * Kiezen of verwijderen wordt pas bewaard met de knop "Opslaan" van de pagina,
+ * met controle tegen de stand bij openen.
+ */
 export function TrayStickerCard({ productId }) {
     const [row, setRow] = useState(null);
     const [loading, setLoading] = useState(true);
-    const [busy, setBusy] = useState(false);
+    const [wachtend, setWachtend] = useState(null);
     const inputRef = useRef(null);
-    useEffect(() => {
-        let cancelled = false;
-        setLoading(true);
-        supabase
+    const laad = async () => {
+        const { data } = await supabase
             .from("product_tray_stickers")
             .select("*")
             .eq("product_id", productId)
-            .maybeSingle()
-            .then(({ data }) => {
-            if (!cancelled)
-                setRow(data ?? null);
+            .maybeSingle();
+        setRow(data ?? null);
+    };
+    useEffect(() => {
+        let cancelled = false;
+        setLoading(true);
+        void laad().finally(() => {
             if (!cancelled)
                 setLoading(false);
         });
         return () => {
             cancelled = true;
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [productId]);
-    const upload = async (file) => {
-        setBusy(true);
+    useEffect(() => () => {
+        if (wachtend?.soort === "nieuw")
+            URL.revokeObjectURL(wachtend.voorbeeld);
+    }, [wachtend]);
+    const opslaan = async () => {
+        if (!wachtend)
+            return { ok: true };
+        let pad = null;
         try {
-            const ext = file.name.includes(".") ? file.name.slice(file.name.lastIndexOf(".")) : "";
-            const path = `${productId}/${crypto.randomUUID()}${ext}`;
-            const up = await supabase.storage.from(BUCKET).upload(path, file, {
-                contentType: file.type || undefined,
+            let next = null;
+            if (wachtend.soort === "nieuw") {
+                const file = wachtend.file;
+                const ext = file.name.includes(".") ? file.name.slice(file.name.lastIndexOf(".")) : "";
+                pad = `${productId}/${crypto.randomUUID()}${ext}`;
+                const up = await supabase.storage.from(BUCKET).upload(pad, file, { contentType: file.type || undefined });
+                if (up.error)
+                    throw up.error;
+                const signed = await supabase.storage.from(BUCKET).createSignedUrl(pad, SIGNED_URL_SECONDS);
+                if (signed.error || !signed.data)
+                    throw signed.error ?? new Error("Geen URL");
+                next = { product_id: productId, bestand_url: signed.data.signedUrl, bestandspad: pad, bestandsnaam: file.name, bestandsgrootte: file.size };
+            }
+            const { data, error } = await supabase.rpc("voorraad_traysticker_opslaan", {
+                p_product_id: productId,
+                p_oud_pad: row?.bestandspad ?? null,
+                p_nieuw: next,
             });
-            if (up.error)
-                throw up.error;
-            const signed = await supabase.storage.from(BUCKET).createSignedUrl(path, SIGNED_URL_SECONDS);
-            if (signed.error || !signed.data)
-                throw signed.error ?? new Error("Geen URL");
-            const next = {
-                product_id: productId,
-                bestand_url: signed.data.signedUrl,
-                bestandspad: path,
-                bestandsnaam: file.name,
-                bestandsgrootte: file.size,
-            };
-            const { error } = await supabase
-                .from("product_tray_stickers")
-                .upsert(next, { onConflict: "product_id" });
             if (error)
                 throw error;
+            if (!data.ok) {
+                if (pad)
+                    await supabase.storage.from(BUCKET).remove([pad]);
+                setWachtend(null);
+                await laad();
+                return { ok: false, melding: "Traysticker niet opgeslagen: iemand anders wijzigde hem intussen. De nieuwste stand is geladen." };
+            }
             if (row?.bestandspad)
                 await supabase.storage.from(BUCKET).remove([row.bestandspad]);
             setRow(next);
-            toast.success("Traysticker-afbeelding opgeslagen");
-        }
-        catch (e) {
-            toast.error(`Uploaden mislukt: ${e.message}`);
-        }
-        finally {
-            setBusy(false);
-            if (inputRef.current)
-                inputRef.current.value = "";
-        }
-    };
-    const remove = async () => {
-        if (!row)
-            return;
-        setBusy(true);
-        try {
-            const { error } = await supabase
-                .from("product_tray_stickers")
-                .delete()
-                .eq("product_id", productId);
-            if (error)
-                throw error;
-            if (row.bestandspad)
-                await supabase.storage.from(BUCKET).remove([row.bestandspad]);
-            setRow(null);
-            toast.success("Traysticker-afbeelding verwijderd");
+            setWachtend(null);
+            return { ok: true };
         }
         catch (e) {
-            toast.error(`Verwijderen mislukt: ${e.message}`);
-        }
-        finally {
-            setBusy(false);
+            if (pad)
+                await supabase.storage.from(BUCKET).remove([pad]);
+            return { ok: false, melding: `Traysticker: opslaan mislukt (${e.message}).` };
         }
     };
-    return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Traysticker-afbeelding" }), _jsx(CardDescription, { children: "Afbeelding die op het traysticker-etiket bij de pakbon op het pickstation wordt geprint. Dit staat los van de productfoto uit Floriday." })] }), _jsxs(CardContent, { className: "space-y-4", children: [loading ? (_jsx(Loader2, { className: "h-4 w-4 animate-spin text-muted-foreground" })) : row ? (_jsxs("div", { className: "flex items-center gap-4", children: [_jsx("img", { src: row.bestand_url, alt: "Traysticker", className: "h-24 w-24 rounded border object-contain bg-muted" }), _jsxs("div", { className: "text-sm text-muted-foreground", children: [_jsx("div", { children: row.bestandsnaam }), row.bestandsgrootte != null && _jsxs("div", { children: [Math.round(row.bestandsgrootte / 1024), " KB"] })] })] })) : (_jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen traysticker-afbeelding ge\u00FCpload." })), _jsx("input", { ref: inputRef, type: "file", accept: "image/*", className: "hidden", onChange: (e) => {
+    useOpslagDeelnemer("traysticker", wachtend !== null, opslaan);
+    const toonUrl = wachtend?.soort === "nieuw" ? wachtend.voorbeeld : wachtend?.soort === "weg" ? null : row?.bestand_url;
+    const toonNaam = wachtend?.soort === "nieuw" ? wachtend.file.name : row?.bestandsnaam;
+    return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Traysticker-afbeelding" }), _jsx(CardDescription, { children: "Afbeelding die op het traysticker-etiket bij de pakbon op het pickstation wordt geprint. Dit staat los van de productfoto uit Floriday." })] }), _jsxs(CardContent, { className: "space-y-4", children: [loading ? (_jsx(Loader2, { className: "h-4 w-4 animate-spin text-muted-foreground" })) : toonUrl ? (_jsxs("div", { className: "flex items-center gap-4", children: [_jsx("img", { src: toonUrl, alt: "Traysticker", className: "h-24 w-24 rounded border object-contain bg-muted" }), _jsx("div", { className: "text-sm text-muted-foreground", children: _jsx("div", { children: toonNaam }) })] })) : (_jsx("p", { className: "text-sm text-muted-foreground", children: wachtend?.soort === "weg" ? "Wordt verwijderd bij Opslaan." : "Nog geen traysticker-afbeelding." })), wachtend && (_jsx("p", { className: "text-xs text-muted-foreground", children: "Niet opgeslagen wijziging; bewaar met \"Opslaan\" bovenaan." })), _jsx("input", { ref: inputRef, type: "file", accept: "image/*", className: "hidden", onChange: (e) => {
                             const f = e.target.files?.[0];
                             if (f)
-                                void upload(f);
-                        } }), _jsxs("div", { className: "flex gap-2", children: [_jsxs(Button, { onClick: () => inputRef.current?.click(), disabled: busy || loading, children: [busy ? _jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : _jsx(Upload, { className: "mr-2 h-4 w-4" }), row ? "Vervangen" : "Afbeelding uploaden"] }), row && (_jsxs(Button, { variant: "outline", onClick: remove, disabled: busy, children: [_jsx(Trash2, { className: "mr-2 h-4 w-4" }), "Verwijderen"] }))] })] })] }));
+                                setWachtend({ soort: "nieuw", file: f, voorbeeld: URL.createObjectURL(f) });
+                            if (inputRef.current)
+                                inputRef.current.value = "";
+                        } }), _jsxs("div", { className: "flex gap-2", children: [_jsxs(Button, { variant: "outline", onClick: () => inputRef.current?.click(), disabled: loading, children: [_jsx(Upload, { className: "mr-2 h-4 w-4" }), row || wachtend?.soort === "nieuw" ? "Andere kiezen" : "Afbeelding kiezen"] }), row && wachtend?.soort !== "weg" && (_jsxs(Button, { variant: "outline", onClick: () => setWachtend({ soort: "weg" }), children: [_jsx(Trash2, { className: "mr-2 h-4 w-4" }), "Verwijderen"] })), wachtend && (_jsxs(Button, { variant: "ghost", onClick: () => setWachtend(null), children: [_jsx(Undo2, { className: "mr-2 h-4 w-4" }), "Ongedaan maken"] }))] })] })] }));
 }

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

@@ -1,9 +1,4 @@
 import type { TradeItem } from "../../lib/floriday-client.js";
-/**
- * Overzicht van producten die (nog) niet actief op Floriday staan. Er is geen concept-status
- * meer — het gaat puur om welke Floriday-velden ontbreken en of het product klaar is om te
- * activeren. Producten blijven volwaardig in gebruik binnen ERP, ongeacht Floriday-status.
- */
 export declare function ValidationOverviewTable({ items, connectionId, onChanged, }: {
     items: TradeItem[];
     connectionId: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"ValidationOverviewTable.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ValidationOverviewTable.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAQ3D;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,KAAK,EACL,YAAY,EACZ,SAAS,GACV,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC,+BAwKA"}
+{"version":3,"file":"ValidationOverviewTable.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ValidationOverviewTable.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAoB3D,wBAAgB,uBAAuB,CAAC,EACtC,KAAK,EACL,YAAY,EACZ,SAAS,GACV,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC,+BAwKA"}

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

@@ -3,7 +3,7 @@ import { useMemo, useState } from "react";
 import { useNavigate } from "@tanstack/react-router";
 import { Badge, Button } from "@flowselections/core";
 import { Link2, Loader2, Pencil, Send } from "lucide-react";
-import { validateDraftForPublish } from "../../lib/floriday-import-validator.js";
+import { conceptMetArtikel, validateDraftForPublish } from "../../lib/floriday-import-validator.js";
 import { updateDraftMeta } from "../../hooks/useLocalTradeItems.js";
 import { floriday } from "../../lib/floriday-client.js";
 import { relinkProducts } from "../../lib/floriday-relink.js";
@@ -13,6 +13,12 @@ import { toast } from "@flowselections/core";
  * meer — het gaat puur om welke Floriday-velden ontbreken en of het product klaar is om te
  * activeren. Producten blijven volwaardig in gebruik binnen ERP, ongeacht Floriday-status.
  */
+/** Eigen naam en artikelnummer van het artikel (niet het Floriday-concept). */
+function artikelVan(it) {
+    const raw = (it.raw ?? {});
+    const s = (v) => (typeof v === "string" && v.trim() ? v : null);
+    return { name: s(raw.product) ?? s(it.name), articleNumber: s(raw.article_number) ?? s(it.articleNumber) };
+}
 export function ValidationOverviewTable({ items, connectionId, onChanged, }) {
     const navigate = useNavigate();
     const [relinking, setRelinking] = useState(false);
@@ -53,14 +59,14 @@ export function ValidationOverviewTable({ items, connectionId, onChanged, }) {
             item.raw?.floriday_payload ??
             item.raw?.data ??
             {};
-        const v = validateDraftForPublish(payload);
+        const v = validateDraftForPublish(conceptMetArtikel(payload, artikelVan(item)));
         if (!v.ok) {
             toast.error("Nog niet compleet: " + v.missing.join(", "));
             return;
         }
         try {
             const { buildAddTradeItemPayload } = await import("../../lib/floriday-payload.js");
-            const built = buildAddTradeItemPayload(payload);
+            const built = buildAddTradeItemPayload(conceptMetArtikel(payload, artikelVan(item)));
             const res = await floriday.createTradeItem(connectionId, built);
             await updateDraftMeta(productId, {
                 floridayLinkStatus: "published",
@@ -85,7 +91,7 @@ export function ValidationOverviewTable({ items, connectionId, onChanged, }) {
                                 it.raw?.floriday_payload ??
                                 it.raw?.data ??
                                 {};
-                            const v = validateDraftForPublish(payload);
+                            const v = validateDraftForPublish(conceptMetArtikel(payload, artikelVan(it)));
                             return (_jsxs("tr", { className: "border-t align-top", children: [_jsx("td", { className: "p-3 font-mono text-xs", children: it.articleNumber || "—" }), _jsx("td", { className: "p-3", children: it.name }), _jsx("td", { className: "p-3", children: _jsx(Badge, { className: "bg-slate-500/15 text-slate-700 border-slate-500/30", children: "Niet actief op Floriday" }) }), _jsx("td", { className: "p-3 text-xs text-muted-foreground max-w-[260px]", children: reasonFor(it) }), _jsx("td", { className: "p-3", children: v.missing.length === 0 ? (_jsx("span", { className: "text-xs text-emerald-700", children: "Klaar om te activeren" })) : (_jsxs("span", { className: "text-xs text-muted-foreground", title: v.missing.join(", "), children: ["Nog nodig: ", v.missing.slice(0, 3).join(", ").toLowerCase(), v.missing.length > 3 ? ` en nog ${v.missing.length - 3} andere` : "", "."] })) }), _jsx("td", { className: "p-3", children: _jsxs("div", { className: "flex justify-end gap-1", children: [_jsxs(Button, { size: "sm", variant: "outline", onClick: () => {
                                                         const target = it.productId ?? it.localId ?? it.id;
                                                         navigate({ to: "/voorraad/$id", params: { id: target } });

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

@@ -1 +1 @@
-{"version":3,"file":"ValidationPage.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ValidationPage.tsx"],"names":[],"mappings":"AAOA,wBAAgB,cAAc,gCAiC7B"}
+{"version":3,"file":"ValidationPage.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/ValidationPage.tsx"],"names":[],"mappings":"AAQA,wBAAgB,cAAc,gCAkC7B"}

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

@@ -5,8 +5,9 @@ import { ArrowLeft } from "lucide-react";
 import { useFloridayConnection } from "../../hooks/useFloridayConnection.js";
 import { useVoorraadData } from "../../hooks/useVoorraadData.js";
 import { ValidationOverviewTable } from "./ValidationOverviewTable.js";
+import { KoppelingStatusPanel } from "./KoppelingStatusPanel.js";
 export function ValidationPage() {
     const { activeId } = useFloridayConnection();
     const { items, loading, reload } = useVoorraadData(activeId);
-    return (_jsxs("main", { className: "p-6 space-y-4", children: [_jsx("div", { className: "flex items-center gap-2", children: _jsxs(Link, { to: "/voorraad", className: "inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground", children: [_jsx(ArrowLeft, { className: "h-4 w-4" }), "Terug naar voorraad"] }) }), _jsxs("div", { children: [_jsx("h1", { className: "text-xl font-semibold", children: "Floriday-koppeling \u2014 validatie" }), _jsx("p", { className: "text-sm text-muted-foreground", children: "Alle artikelen die nog niet succesvol met Floriday gekoppeld zijn." })] }), _jsx(Card, { className: "overflow-hidden", children: loading ? (_jsx("div", { className: "p-6 text-sm text-muted-foreground", children: "Laden\u2026" })) : (_jsx(ValidationOverviewTable, { items: items, connectionId: activeId, onChanged: reload })) })] }));
+    return (_jsxs("main", { className: "p-6 space-y-4", children: [_jsx("div", { className: "flex items-center gap-2", children: _jsxs(Link, { to: "/voorraad", className: "inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground", children: [_jsx(ArrowLeft, { className: "h-4 w-4" }), "Terug naar voorraad"] }) }), _jsxs("div", { children: [_jsx("h1", { className: "text-xl font-semibold", children: "Floriday-koppeling \u2014 validatie" }), _jsx("p", { className: "text-sm text-muted-foreground", children: "Alle artikelen die nog niet succesvol met Floriday gekoppeld zijn." })] }), _jsx(KoppelingStatusPanel, { connectionId: activeId, onChanged: reload }), _jsx(Card, { className: "overflow-hidden", children: loading ? (_jsx("div", { className: "p-6 text-sm text-muted-foreground", children: "Laden\u2026" })) : (_jsx(ValidationOverviewTable, { items: items, connectionId: activeId, onChanged: reload })) })] }));
 }

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

@@ -1,15 +1,3 @@
-import type { TradeItem } from "../../lib/floriday-client.js";
-/**
- * "Op voorraad" = artikelen met liggende voorraad (fysiek > 0).
- * "Vrij beschikbaar" = artikelen waarvan liggend min gereserveerd > 0.
- */
-export declare function countStock(items: Array<Pick<TradeItem, "quantity" | "availableQuantity" | "minQuantity">>): {
-    total: number;
-    inStock: number;
-    outOfStock: number;
-    belowMin: number;
-    fullyReserved: number;
-    freeAvailable: number;
-};
+export { countStock } from "../../lib/count-stock.js";
 export declare function VoorraadPage(): import("react").JSX.Element;
 //# sourceMappingURL=VoorraadPage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"VoorraadPage.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadPage.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAmF3D;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,mBAAmB,GAAG,aAAa,CAAC,CAAC;;;;;;;EAgBzG;AAED,wBAAgB,YAAY,gCAsW3B"}
+{"version":3,"file":"VoorraadPage.d.ts","sourceRoot":"","sources":["../../../src/components/voorraad/VoorraadPage.tsx"],"names":[],"mappings":"AAwCA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AA2CnD,wBAAgB,YAAY,gCA6M3B"}