@flowselections/mailbox-orders 1.0.4 → 1.0.5

package/dist-lib/components/MailboxProposalsPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MailboxProposalsPage.d.ts","sourceRoot":"","sources":["../../src/components/MailboxProposalsPage.tsx"],"names":[],"mappings":"AAmCA,wBAAgB,oBAAoB,gCA+PnC"}
+{"version":3,"file":"MailboxProposalsPage.d.ts","sourceRoot":"","sources":["../../src/components/MailboxProposalsPage.tsx"],"names":[],"mappings":"AAmCA,wBAAgB,oBAAoB,gCAiQnC"}

package/dist-lib/components/MailboxProposalsPage.js

@@ -152,29 +152,29 @@ export function MailboxProposalsPage() {
                                     const date = p.mailbox_messages?.received_at ?? p.created_at;
                                     return (_jsxs(TableRow, { className: "cursor-pointer hover:bg-muted/50", onClick: () => setActiveId(p.id), children: [_jsx(TableCell, { className: "font-mono text-xs", children: orderNumberFor(p) }), _jsx(TableCell, { className: "font-medium", children: customerNameFor(p) }), _jsx(TableCell, { className: "text-sm text-muted-foreground", children: date ? new Date(date).toLocaleDateString("nl-NL") : "-" }), _jsx(TableCell, { children: _jsxs("div", { className: "flex items-center gap-1", children: [_jsx(Badge, { variant: statusVariant(p.status), children: statusLabel(p.status) }), needsReview && (_jsxs(Badge, { variant: "outline", className: "text-xs border-yellow-500 text-yellow-700", children: [_jsx(AlertTriangle, { className: "h-3 w-3 mr-1" }), "Controleren"] }))] }) }), _jsx(TableCell, { className: "text-right text-sm text-muted-foreground", children: "\u2014" })] }, p.id));
                                 }) })] }) }) })), _jsx(Dialog, { open: !!active, onOpenChange: (o) => { if (!o)
-                    setActiveId(null); }, children: _jsx(DialogContent, { className: "max-w-[95vw] w-[95vw] h-[92vh] max-h-[92vh] overflow-y-auto p-6", children: active && (_jsxs(_Fragment, { children: [_jsx(DialogHeader, { children: _jsxs(DialogTitle, { children: [orderNumberFor(active), " \u00B7 ", customerNameFor(active)] }) }), _jsx(ProposalEditor, { proposal: active, template: template, customers: customers, products: products, plantTypes: plantTypes, suppliers: suppliers, carriers: carriers, pickupLocations: pickupLocations, onApprove: async (payload) => {
-                                    try {
-                                        const res = await fetchApprove({ data: payload });
-                                        toast.success("Bestelling aangemaakt");
-                                        qc.invalidateQueries({ queryKey: ["mailbox-proposals"] });
-                                        setActiveId(null);
-                                        if (res?.orderId)
-                                            setCartOrderId(res.orderId);
-                                    }
-                                    catch (e) {
-                                        toast.error(e?.message ?? "Goedkeuren mislukt");
-                                    }
-                                }, onReject: async (reason) => {
-                                    try {
-                                        await fetchReject({ data: { proposalId: active.id, reason } });
-                                        toast.success("Voorstel afgewezen");
-                                        qc.invalidateQueries({ queryKey: ["mailbox-proposals"] });
-                                        setActiveId(null);
-                                    }
-                                    catch (e) {
-                                        toast.error(e?.message ?? "Afwijzen mislukt");
-                                    }
-                                } }, active.id)] })) }) }), _jsx(CartAssignmentWizard, { orderId: cartOrderId, open: !!cartOrderId, onClose: () => setCartOrderId(null) })] }));
+                    setActiveId(null); }, children: _jsx(DialogContent, { className: "max-w-[95vw] w-[95vw] h-[92vh] max-h-[92vh] p-0 flex flex-col overflow-hidden", children: active && (_jsxs(_Fragment, { children: [_jsx(DialogHeader, { className: "px-6 pt-6 pb-3 shrink-0 border-b", children: _jsxs(DialogTitle, { children: [orderNumberFor(active), " \u00B7 ", customerNameFor(active)] }) }), _jsx("div", { className: "flex-1 min-h-0 overflow-y-auto overscroll-contain p-6", children: _jsx(ProposalEditor, { proposal: active, template: template, customers: customers, products: products, plantTypes: plantTypes, suppliers: suppliers, carriers: carriers, pickupLocations: pickupLocations, onApprove: async (payload) => {
+                                        try {
+                                            const res = await fetchApprove({ data: payload });
+                                            toast.success("Bestelling aangemaakt");
+                                            qc.invalidateQueries({ queryKey: ["mailbox-proposals"] });
+                                            setActiveId(null);
+                                            if (res?.orderId)
+                                                setCartOrderId(res.orderId);
+                                        }
+                                        catch (e) {
+                                            toast.error(e?.message ?? "Goedkeuren mislukt");
+                                        }
+                                    }, onReject: async (reason) => {
+                                        try {
+                                            await fetchReject({ data: { proposalId: active.id, reason } });
+                                            toast.success("Voorstel afgewezen");
+                                            qc.invalidateQueries({ queryKey: ["mailbox-proposals"] });
+                                            setActiveId(null);
+                                        }
+                                        catch (e) {
+                                            toast.error(e?.message ?? "Afwijzen mislukt");
+                                        }
+                                    } }, active.id) })] })) }) }), _jsx(CartAssignmentWizard, { orderId: cartOrderId, open: !!cartOrderId, onClose: () => setCartOrderId(null) })] }));
 }
 function ReadOnlyField({ label, value }) {
     return (_jsxs("div", { className: "space-y-0.5", children: [_jsx("div", { className: "text-[11px] uppercase tracking-wide text-muted-foreground", children: label }), _jsx("div", { className: "text-sm", children: value && String(value).trim() !== "" ? value : _jsx("span", { className: "text-muted-foreground", children: "\u2014" }) })] }));
@@ -202,16 +202,22 @@ function ProposalEditor({ proposal, template, customers, products, plantTypes, s
         return init;
     });
     const initialLines = Array.isArray(proposal.mailbox_proposal_lines)
-        ? proposal.mailbox_proposal_lines.map((l) => ({
-            id: l.id,
-            product_id: l.product_id,
-            raw_product_text: l.raw_product_text ?? "",
-            quantity: l.quantity,
-            unit: l.unit,
-        }))
+        ? proposal.mailbox_proposal_lines.map((l) => {
+            const p = products.find((x) => x.id === l.product_id);
+            const ppc = Math.max(1, Number(p?.plants_per_crate ?? 1));
+            const q = Number(l.quantity ?? 0);
+            const normalized = q > 0 ? Math.ceil(q / ppc) * ppc : q;
+            return {
+                id: l.id,
+                product_id: l.product_id,
+                raw_product_text: l.raw_product_text ?? "",
+                quantity: normalized || null,
+                unit: l.unit,
+            };
+        })
         : [];
     const [lines, setLines] = useState(initialLines.length ? initialLines : [
-        { product_id: null, raw_product_text: "", quantity: 1, unit: "stuks" },
+        { product_id: null, raw_product_text: "", quantity: null, unit: "stuks" },
     ]);
     const customerVal = values["customer"];
     const deliveryVal = values["delivery_date"];
@@ -310,6 +316,15 @@ function ProposalEditor({ proposal, template, customers, products, plantTypes, s
             toast.error("Voeg minimaal één product toe aan de bestelling.");
             return;
         }
+        for (const l of validLines) {
+            const p = products.find((x) => x.id === l.product_id);
+            const ppc = Math.max(1, Number(p?.plants_per_crate ?? 1));
+            const qty = l.quantity ?? 0;
+            if (qty < ppc || qty % ppc !== 0) {
+                toast.error(`"${p?.product ?? l.raw_product_text}" moet per hele fust besteld worden (minimaal 1 fust = ${ppc} planten).`);
+                return;
+            }
+        }
         const cust = customers.find((c) => c.id === customerVal);
         onApprove({
             proposalId: proposal.id,
@@ -365,31 +380,43 @@ function ProposalEditor({ proposal, template, customers, products, plantTypes, s
                                         const ppc = Math.max(1, Number(product?.plants_per_crate ?? 1));
                                         const plants = line.quantity ?? null;
                                         const cratesExact = plants !== null ? plants / ppc : null;
-                                        const cratesDisplay = cratesExact === null ? "" :
-                                            Number.isInteger(cratesExact) ? String(cratesExact) : cratesExact.toFixed(2);
+                                        const cratesDisplay = cratesExact === null ? "" : String(Math.ceil(cratesExact));
+                                        const blockDecimal = (e) => {
+                                            if (e.key === "." || e.key === "," || e.key === "e" || e.key === "E" || e.key === "+" || e.key === "-") {
+                                                e.preventDefault();
+                                            }
+                                        };
                                         return (_jsxs("div", { className: "grid grid-cols-12 gap-2 items-start", children: [_jsx("div", { className: "col-span-5", children: _jsx(SearchableSelect, { value: line.product_id, placeholder: "Kies product...", clearLabel: "\u2014 Handmatig \u2014", options: products.map((p) => ({ value: p.id, label: p.product, hint: p.unit })), onChange: (v) => {
                                                             const next = [...lines];
                                                             if (v === null)
                                                                 next[idx] = { ...next[idx], product_id: null };
                                                             else {
                                                                 const p = products.find((x) => x.id === v);
+                                                                const newPpc = Math.max(1, Number(p?.plants_per_crate ?? 1));
+                                                                const currentQ = Number(next[idx].quantity ?? 0);
+                                                                const normalizedQ = currentQ > 0 ? Math.ceil(currentQ / newPpc) * newPpc : newPpc;
                                                                 next[idx] = {
                                                                     ...next[idx], product_id: v,
                                                                     raw_product_text: p?.product ?? next[idx].raw_product_text,
                                                                     unit: next[idx].unit ?? p?.unit ?? "stuks",
+                                                                    quantity: normalizedQ,
                                                                 };
                                                             }
                                                             setLines(next);
-                                                        } }) }), _jsx(Input, { className: "col-span-2", type: "number", min: 0, value: plants ?? "", onChange: (e) => {
+                                                        } }) }), _jsx(Input, { className: "col-span-2", type: "number", min: ppc, step: ppc, inputMode: "numeric", onKeyDown: blockDecimal, value: plants ?? "", onChange: (e) => {
                                                         const next = [...lines];
-                                                        next[idx] = { ...next[idx], quantity: e.target.value ? Number(e.target.value) : null };
+                                                        const raw = e.target.value.replace(/[.,]/g, "");
+                                                        const v = raw ? Number(raw) : null;
+                                                        const rounded = v === null ? null : Math.max(1, Math.ceil(v / ppc)) * ppc;
+                                                        next[idx] = { ...next[idx], quantity: rounded };
                                                         setLines(next);
-                                                    }, placeholder: "Planten" }), _jsx(Input, { className: "col-span-2", type: "number", min: 0, step: "0.01", value: cratesDisplay, onChange: (e) => {
+                                                    }, placeholder: "Planten", title: `Verkoop per hele fust van ${ppc} planten` }), _jsx(Input, { className: "col-span-2", type: "number", min: 1, step: 1, inputMode: "numeric", onKeyDown: blockDecimal, value: cratesDisplay, onChange: (e) => {
                                                         const next = [...lines];
-                                                        const cr = e.target.value ? Number(e.target.value) : null;
-                                                        next[idx] = { ...next[idx], quantity: cr === null ? null : Math.round(cr * ppc) };
+                                                        const raw = e.target.value.replace(/[.,]/g, "");
+                                                        const cr = raw ? Math.max(1, Math.floor(Number(raw))) : null;
+                                                        next[idx] = { ...next[idx], quantity: cr === null ? null : cr * ppc };
                                                         setLines(next);
-                                                    }, placeholder: "Fusten", title: `${ppc} planten per fust` }), _jsx(Input, { className: "col-span-2", value: line.unit ?? "", onChange: (e) => {
+                                                    }, placeholder: "Fusten", title: `${ppc} planten per fust — verkoop per hele fust` }), _jsx(Input, { className: "col-span-2", value: line.unit ?? "", onChange: (e) => {
                                                         const next = [...lines];
                                                         next[idx] = { ...next[idx], unit: e.target.value };
                                                         setLines(next);