@flowselections/floriday-verkoop-module 1.0.162 → 1.0.164
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +108 -59
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +61 -37
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts +16 -0
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -0
- package/dist-lib/components/verkoop/KarTekeningSection.js +126 -0
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +3 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +31 -2
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +5 -8
- package/dist-lib/components/verkoop/SafeSvg.d.ts +7 -0
- package/dist-lib/components/verkoop/SafeSvg.d.ts.map +1 -0
- package/dist-lib/components/verkoop/SafeSvg.js +31 -0
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +6 -2
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +8 -2
- package/dist-lib/integrations/supabase/types.d.ts +3268 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/backfill-flag.d.ts +2 -0
- package/dist-lib/lib/backfill-flag.d.ts.map +1 -0
- package/dist-lib/lib/backfill-flag.js +18 -0
- package/dist-lib/lib/belading-format.d.ts +8 -0
- package/dist-lib/lib/belading-format.d.ts.map +1 -0
- package/dist-lib/lib/belading-format.js +17 -0
- package/dist-lib/lib/bewerk-voorraad.d.ts +42 -0
- package/dist-lib/lib/bewerk-voorraad.d.ts.map +1 -0
- package/dist-lib/lib/bewerk-voorraad.js +43 -0
- package/dist-lib/lib/cart-replan.functions.d.ts +7 -12
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +6 -12
- package/dist-lib/lib/cart-replan.server.d.ts +5 -45
- package/dist-lib/lib/cart-replan.server.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.server.js +13 -364
- package/dist-lib/lib/create-order-form.d.ts +4 -0
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +8 -3
- package/dist-lib/lib/create-order.functions.d.ts +3 -1
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +86 -45
- package/dist-lib/lib/departure-preview.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.js +5 -2
- package/dist-lib/lib/floriday-backfill.d.ts.map +1 -1
- package/dist-lib/lib/floriday-backfill.js +5 -4
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +0 -3
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +3 -24
- package/dist-lib/lib/indeling-bezig.d.ts +9 -0
- package/dist-lib/lib/indeling-bezig.d.ts.map +1 -0
- package/dist-lib/lib/indeling-bezig.js +15 -0
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.js +2 -2
- package/dist-lib/lib/kar-tekening.d.ts +118 -0
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -0
- package/dist-lib/lib/kar-tekening.functions.d.ts +30 -0
- package/dist-lib/lib/kar-tekening.functions.d.ts.map +1 -0
- package/dist-lib/lib/kar-tekening.functions.js +27 -0
- package/dist-lib/lib/kar-tekening.js +194 -0
- package/dist-lib/lib/kar-tekening.server.d.ts +34 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -0
- package/dist-lib/lib/kar-tekening.server.js +26 -0
- package/dist-lib/lib/korte-melding.d.ts +7 -0
- package/dist-lib/lib/korte-melding.d.ts.map +1 -0
- package/dist-lib/lib/korte-melding.js +38 -0
- package/dist-lib/lib/load-carrier-labels.d.ts +3 -10
- package/dist-lib/lib/load-carrier-labels.d.ts.map +1 -1
- package/dist-lib/lib/load-carrier-labels.js +5 -11
- package/dist-lib/lib/logistics-stock.functions.d.ts +12 -0
- package/dist-lib/lib/logistics-stock.functions.d.ts.map +1 -1
- package/dist-lib/lib/logistics-stock.functions.js +13 -0
- package/dist-lib/lib/logistics-stock.server.d.ts +11 -0
- package/dist-lib/lib/logistics-stock.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-stock.server.js +43 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +2 -4
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +11 -3
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +5 -3
- package/dist-lib/lib/own-transport.d.ts +54 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +101 -0
- package/dist-lib/lib/product-plannable.functions.js +3 -3
- package/dist-lib/lib/rpc-missing.d.ts +2 -0
- package/dist-lib/lib/rpc-missing.d.ts.map +1 -0
- package/dist-lib/lib/rpc-missing.js +7 -0
- package/dist-lib/lib/use-debounced-value.d.ts +3 -0
- package/dist-lib/lib/use-debounced-value.d.ts.map +1 -0
- package/dist-lib/lib/use-debounced-value.js +10 -0
- package/package.json +2 -1
- package/schema/verkoop.sql +700 -17
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect, useMemo, useState } from "react";
|
|
3
|
+
import { markIndelingBezig } from "../../lib/indeling-bezig.js";
|
|
4
|
+
import { tekortMelding } from "../../lib/korte-melding.js";
|
|
3
5
|
import { Button, Input, toast } from "@flowselections/core";
|
|
4
6
|
import { Trash2 } from "lucide-react";
|
|
5
7
|
import { useServerFn } from "@tanstack/react-start";
|
|
6
8
|
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
|
7
9
|
import { getLocalOrderForEdit, updateLocalOrder, listProductsForCreateOrder, } from "../../lib/create-order.functions.js";
|
|
8
|
-
import {
|
|
10
|
+
import { checkEditOrderStock } from "../../lib/logistics-stock.functions.js";
|
|
11
|
+
import { bewerkTekortMelding, regelPerSleutel } from "../../lib/bewerk-voorraad.js";
|
|
9
12
|
import { SearchableSelect } from "./SearchableSelect.js";
|
|
13
|
+
import { datumLabel } from "../../lib/own-transport.js";
|
|
10
14
|
/** Positief geheel getal of null — ontbrekende belading blijft onbekend. */
|
|
11
15
|
const pos = (v) => {
|
|
12
16
|
const n = Number(v);
|
|
@@ -21,6 +25,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
21
25
|
const [error, setError] = useState(null);
|
|
22
26
|
const [deliveryDate, setDeliveryDate] = useState("");
|
|
23
27
|
const [isReservation, setIsReservation] = useState(false);
|
|
28
|
+
const [vervoerSoortV, setVervoerSoortV] = useState(null);
|
|
24
29
|
const [items, setItems] = useState([]);
|
|
25
30
|
const [canEditProducts, setCanEditProducts] = useState(true);
|
|
26
31
|
const [priceLock, setPriceLock] = useState(null);
|
|
@@ -41,6 +46,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
41
46
|
return;
|
|
42
47
|
setDeliveryDate((r.deliveryDate ?? "").slice(0, 10));
|
|
43
48
|
setIsReservation(!!r.isReservation);
|
|
49
|
+
setVervoerSoortV(r.vervoerSoort ?? null);
|
|
44
50
|
setCanEditProducts(r.canEditProducts !== false);
|
|
45
51
|
setPriceLock(r.priceLock ?? null);
|
|
46
52
|
setShippedLock(r.shippedLock ?? null);
|
|
@@ -114,32 +120,55 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
114
120
|
},
|
|
115
121
|
]);
|
|
116
122
|
};
|
|
117
|
-
// Voorraadcontrole
|
|
118
|
-
|
|
119
|
-
const
|
|
123
|
+
// Voorraadcontrole bij bewerken: deze order telt niet mee (voorraad_beschikbaar_v2).
|
|
124
|
+
// Ontbreekt die functie, dan de oude controle als terugval (modus "terugval").
|
|
125
|
+
const fetchStockCheck = useServerFn(checkEditOrderStock);
|
|
126
|
+
const stockEntries = useMemo(() => [
|
|
120
127
|
...items
|
|
121
128
|
.filter((i) => i.productId && i.quantity > 0 && !removedIds.includes(i.id))
|
|
122
|
-
.map((i) => ({ productId: i.productId, quantity: Math.round(i.quantity) })),
|
|
129
|
+
.map((i) => ({ key: `item:${i.id}`, productId: i.productId, quantity: Math.round(i.quantity) })),
|
|
123
130
|
...newItems
|
|
124
131
|
.filter((n) => n.quantity > 0)
|
|
125
|
-
.map((n) => ({ productId: n.productId, quantity: Math.round(n.quantity) })),
|
|
132
|
+
.map((n) => ({ key: `new:${n.key}`, productId: n.productId, quantity: Math.round(n.quantity) })),
|
|
126
133
|
], [items, removedIds, newItems]);
|
|
134
|
+
const stockLines = useMemo(() => stockEntries.map(({ productId, quantity }) => ({ productId, quantity })), [stockEntries]);
|
|
127
135
|
const stockQ = useQuery({
|
|
128
|
-
queryKey: ["edit-order-stock-check", orderId, stockLines],
|
|
136
|
+
queryKey: ["edit-order-stock-check", orderId, stockLines.map((l) => `${l.productId}:${l.quantity}`).join("|")],
|
|
129
137
|
enabled: open && stockLines.length > 0,
|
|
130
|
-
staleTime:
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
queryFn: () => fetchStockCheck({ data: { lines: stockLines } }),
|
|
138
|
+
staleTime: 10000,
|
|
139
|
+
refetchOnWindowFocus: false,
|
|
140
|
+
queryFn: () => fetchStockCheck({ data: { orderId, lines: stockLines } }),
|
|
134
141
|
});
|
|
135
142
|
const stockCheck = stockQ.data;
|
|
136
|
-
|
|
143
|
+
// Uitkomst per schermregel: bij "uitgesloten" de melding van Voorraad, bij
|
|
144
|
+
// terugval alleen het product (geen tekortgetal: de eigen reservering telt dan mee).
|
|
145
|
+
const stockByKey = useMemo(() => {
|
|
137
146
|
const m = new Map();
|
|
138
|
-
|
|
139
|
-
m
|
|
147
|
+
if (stockCheck?.modus !== "uitgesloten")
|
|
148
|
+
return m;
|
|
149
|
+
const sleutels = stockEntries.map((e) => e.key);
|
|
150
|
+
for (const [k, r] of regelPerSleutel(stockCheck.regels, sleutels))
|
|
151
|
+
if (r.tekort > 0)
|
|
152
|
+
m.set(k, r);
|
|
153
|
+
return m;
|
|
154
|
+
}, [stockCheck, stockEntries]);
|
|
155
|
+
const fallbackShortage = useMemo(() => {
|
|
156
|
+
const m = new Set();
|
|
157
|
+
if (stockCheck?.modus === "terugval")
|
|
158
|
+
for (const sh of stockCheck.shortages)
|
|
159
|
+
m.add(sh.productId);
|
|
140
160
|
return m;
|
|
141
161
|
}, [stockCheck]);
|
|
142
|
-
const
|
|
162
|
+
const stockNote = (key, productId) => {
|
|
163
|
+
const r = stockByKey.get(key);
|
|
164
|
+
if (r) {
|
|
165
|
+
return (_jsx("div", { className: `text-xs ${stockCheck?.allowed === false ? "text-destructive" : "text-muted-foreground"}`, children: r.melding || "Te weinig voorraad." }));
|
|
166
|
+
}
|
|
167
|
+
if (productId && fallbackShortage.has(productId)) {
|
|
168
|
+
return (_jsx("div", { className: "text-xs text-muted-foreground", children: "Voorraad niet exact te controleren bij bewerken" }));
|
|
169
|
+
}
|
|
170
|
+
return null;
|
|
171
|
+
};
|
|
143
172
|
if (!open)
|
|
144
173
|
return null;
|
|
145
174
|
const setPlants = (idx, plants) => {
|
|
@@ -185,21 +214,25 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
185
214
|
toast.error("Een bestelling moet minimaal één regel houden.");
|
|
186
215
|
return;
|
|
187
216
|
}
|
|
188
|
-
// Verse voorraadcontrole (nooit gecachet)
|
|
217
|
+
// Verse voorraadcontrole (nooit gecachet); deze order telt niet mee.
|
|
189
218
|
if (stockLines.length > 0) {
|
|
190
219
|
try {
|
|
191
|
-
const check = await fetchStockCheck({ data: { lines: stockLines } });
|
|
192
|
-
await stockQ.refetch();
|
|
220
|
+
const check = (await fetchStockCheck({ data: { orderId, lines: stockLines } }));
|
|
193
221
|
if (check.allowed === false) {
|
|
194
|
-
|
|
195
|
-
"
|
|
196
|
-
|
|
197
|
-
|
|
222
|
+
if (check.modus === "uitgesloten") {
|
|
223
|
+
console.error("[voorraadcontrole bewerken]", check.regels);
|
|
224
|
+
toast.error(bewerkTekortMelding(check.regels));
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
console.error("[voorraadcontrole bewerken, terugval]", check.shortages);
|
|
228
|
+
toast.error(tekortMelding(check.shortages));
|
|
229
|
+
}
|
|
198
230
|
return;
|
|
199
231
|
}
|
|
200
232
|
}
|
|
201
233
|
catch (e) {
|
|
202
|
-
|
|
234
|
+
console.error("[voorraadcontrole bewerken]", e);
|
|
235
|
+
toast.error("De voorraad kon niet worden gecontroleerd. Probeer het opnieuw.");
|
|
203
236
|
return;
|
|
204
237
|
}
|
|
205
238
|
}
|
|
@@ -236,6 +269,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
236
269
|
.map((i) => ({ itemId: i.id, needsSticker: i.needsSticker })),
|
|
237
270
|
},
|
|
238
271
|
});
|
|
272
|
+
markIndelingBezig(queryClient, orderId);
|
|
239
273
|
toast.success("Bestelling bijgewerkt");
|
|
240
274
|
if (saveRes?.engineWarning)
|
|
241
275
|
toast.warning(saveRes.engineWarning);
|
|
@@ -255,14 +289,11 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
255
289
|
setSaving(false);
|
|
256
290
|
}
|
|
257
291
|
};
|
|
258
|
-
return (_jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4", onClick: () => !saving && onOpenChange(false), children: _jsxs("div", { className: "flex w-full max-w-4xl max-h-[90vh] flex-col rounded-lg border border-border bg-card shadow-lg", onClick: (e) => e.stopPropagation(), children: [_jsxs("div", { className: "shrink-0 p-6 pb-4", children: [_jsx("h2", { className: "text-lg font-semibold text-foreground", children: "Bestelling bewerken" }),
|
|
292
|
+
return (_jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4", onClick: () => !saving && onOpenChange(false), children: _jsxs("div", { className: "flex w-full max-w-4xl max-h-[90vh] flex-col rounded-lg border border-border bg-card shadow-lg", onClick: (e) => e.stopPropagation(), children: [_jsxs("div", { className: "shrink-0 p-6 pb-4", children: [_jsx("h2", { className: "text-lg font-semibold text-foreground", children: "Bestelling bewerken" }), _jsxs("p", { className: "mt-1 text-sm text-muted-foreground", children: ["Pas de ", datumLabel(vervoerSoortV).toLowerCase(), " en het aantal planten of fusten per regel aan. Voorraad en karindeling worden automatisch bijgewerkt."] })] }), _jsxs("div", { className: "flex-1 overflow-y-auto px-6 pb-4 min-h-0", children: [loading ? (_jsx("div", { className: "text-sm text-muted-foreground", children: "Laden\u2026" })) : error ? (_jsx("div", { className: "rounded border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive", children: error })) : (_jsxs("fieldset", { disabled: !!shippedLock, className: "min-w-0", children: [shippedLock && (_jsx("div", { className: "mb-4 rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: shippedLock })), _jsxs("div", { className: "space-y-4", children: [!isReservation && (_jsxs("div", { children: [_jsx("label", { className: "mb-1 block text-sm font-medium text-foreground", children: datumLabel(vervoerSoortV) }), _jsx(Input, { type: "date", value: deliveryDate, onChange: (e) => setDeliveryDate(e.target.value) })] })), isReservation && (_jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Dit is een reservering \u2014 er is nog geen leverdatum. Voeg een bezorgmoment toe om (deels) uit te leveren." })), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-medium text-foreground", children: "Regels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 px-1 text-xs text-muted-foreground", children: [_jsx("div", { className: "col-span-5", children: "Product" }), _jsx("div", { className: "col-span-1 text-center", children: "Sticker" }), _jsx("div", { className: "col-span-3", children: "Planten" }), _jsx("div", { className: "col-span-3", children: "Fusten" })] }), _jsxs("div", { className: "mt-1 space-y-2", children: [priceLock && _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Prijs wijzigen kan niet: ", priceLock] }), items.map((it, idx) => {
|
|
259
293
|
const ppc = it.plantsPerCrate;
|
|
260
294
|
const fusten = ppc !== null ? Math.ceil(it.quantity / ppc) : 0;
|
|
261
295
|
const removed = removedIds.includes(it.id);
|
|
262
|
-
return (_jsxs("div", { className: `grid grid-cols-12 items-start gap-2 rounded border border-border p-2 ${removed ? "opacity-50" : ""}`, children: [_jsxs("div", { className: "col-span-4 min-w-0 text-sm", children: [_jsx("div", { className: `truncate font-medium text-foreground ${removed ? "line-through" : ""}`, children: it.productName }), ppc === null ? (_jsx("div", { className: "text-xs text-destructive", children: "Belading onbekend \u2014 deze regel kan niet opgeslagen worden" })) : (_jsxs("div", { className: "text-xs text-muted-foreground", children: [ppc, " planten per fust"] })), _jsxs("label", { className: "mt-1 flex items-center gap-1 text-xs text-muted-foreground", children: ["Prijs per stuk \u20AC", _jsx(Input, { type: "number", min: 0, step: 0.01, className: "h-7 w-24", "aria-label": "Prijs per stuk", value: it.unitPrice ?? "", disabled: removed || !!priceLock, title: priceLock ?? undefined, onChange: (e) => setItems((prev) => prev.map((p, i) => (i === idx ? { ...p, unitPrice: e.target.value === "" ? null : Number(e.target.value) } : p))) })] }), it.minQuantity > 0 && (_jsxs("div", { className: "text-xs text-primary", children: ["min. ", it.minQuantity, " (reeds ", it.shippedQuantity, " geleverd, ", it.plannedQuantity, " gepland)"] })), it.productId
|
|
263
|
-
const s = shortageByProduct.get(it.productId);
|
|
264
|
-
return `${s.product}: besteld ${s.wanted}, beschikbaar ${s.available}, tekort ${s.missing}`;
|
|
265
|
-
})() }))] }), _jsx("div", { className: "col-span-1 flex h-10 items-center justify-center", children: _jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary", "aria-label": "Sticker nodig", checked: it.needsSticker, disabled: removed, onChange: (e) => setItems((prev) => prev.map((p, i) => (i === idx ? { ...p, needsSticker: e.target.checked } : p))) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: ppc ?? 1, value: it.quantity, disabled: removed, onChange: (e) => setPlants(idx, Number(e.target.value)) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: 1, value: ppc === null ? "" : fusten, disabled: removed || ppc === null, onChange: (e) => setFusten(idx, Number(e.target.value)) }) }), _jsx("div", { className: "col-span-1 flex justify-end", children: canEditProducts && (_jsx(Button, { variant: "ghost", size: "sm", title: removed ? "Verwijderen ongedaan maken" : "Regel verwijderen", onClick: () => setRemovedIds((prev) => prev.includes(it.id)
|
|
296
|
+
return (_jsxs("div", { className: `grid grid-cols-12 items-start gap-2 rounded border border-border p-2 ${removed ? "opacity-50" : ""}`, children: [_jsxs("div", { className: "col-span-4 min-w-0 text-sm", children: [_jsx("div", { className: `truncate font-medium text-foreground ${removed ? "line-through" : ""}`, children: it.productName }), ppc === null ? (_jsx("div", { className: "text-xs text-destructive", children: "Belading onbekend \u2014 deze regel kan niet opgeslagen worden" })) : (_jsxs("div", { className: "text-xs text-muted-foreground", children: [ppc, " planten per fust"] })), _jsxs("label", { className: "mt-1 flex items-center gap-1 text-xs text-muted-foreground", children: ["Prijs per stuk \u20AC", _jsx(Input, { type: "number", min: 0, step: 0.01, className: "h-7 w-24", "aria-label": "Prijs per stuk", value: it.unitPrice ?? "", disabled: removed || !!priceLock, title: priceLock ?? undefined, onChange: (e) => setItems((prev) => prev.map((p, i) => (i === idx ? { ...p, unitPrice: e.target.value === "" ? null : Number(e.target.value) } : p))) })] }), it.minQuantity > 0 && (_jsxs("div", { className: "text-xs text-primary", children: ["min. ", it.minQuantity, " (reeds ", it.shippedQuantity, " geleverd, ", it.plannedQuantity, " gepland)"] })), stockNote(`item:${it.id}`, it.productId)] }), _jsx("div", { className: "col-span-1 flex h-10 items-center justify-center", children: _jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary", "aria-label": "Sticker nodig", checked: it.needsSticker, disabled: removed, onChange: (e) => setItems((prev) => prev.map((p, i) => (i === idx ? { ...p, needsSticker: e.target.checked } : p))) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: ppc ?? 1, value: it.quantity, disabled: removed, onChange: (e) => setPlants(idx, Number(e.target.value)) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: 1, value: ppc === null ? "" : fusten, disabled: removed || ppc === null, onChange: (e) => setFusten(idx, Number(e.target.value)) }) }), _jsx("div", { className: "col-span-1 flex justify-end", children: canEditProducts && (_jsx(Button, { variant: "ghost", size: "sm", title: removed ? "Verwijderen ongedaan maken" : "Regel verwijderen", onClick: () => setRemovedIds((prev) => prev.includes(it.id)
|
|
266
297
|
? prev.filter((x) => x !== it.id)
|
|
267
298
|
: [...prev, it.id]), children: _jsx(Trash2, { className: "h-4 w-4" }) })) })] }, it.id));
|
|
268
299
|
}), newItems.some((n) => !(Number(n.unitPrice) > 0)) && (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive", children: ["Geen prijs: ", newItems.filter((n) => !(Number(n.unitPrice) > 0)).length, " nieuwe regel(s) zonder prijs in artikel of prijsgroep."] })), newItems.map((n, idx) => {
|
|
@@ -271,13 +302,6 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
271
302
|
const setNewQty = (plants) => setNewItems((prev) => prev.map((p, i) => i === idx
|
|
272
303
|
? { ...p, quantity: Number.isFinite(plants) ? Math.max(0, plants) : 0 }
|
|
273
304
|
: p));
|
|
274
|
-
return (_jsxs("div", { className: "grid grid-cols-12 items-start gap-2 rounded border border-primary/40 bg-primary/5 p-2", children: [_jsxs("div", { className: "col-span-4 min-w-0 text-sm", children: [_jsx("div", { className: "truncate font-medium text-foreground", children: n.productName }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["nieuw \u00B7 ", ppc, " planten per fust"] }),
|
|
275
|
-
|
|
276
|
-
return `${s.product}: besteld ${s.wanted}, beschikbaar ${s.available}, tekort ${s.missing}`;
|
|
277
|
-
})() }))] }), _jsx("div", { className: "col-span-1 flex h-10 items-center justify-center", children: _jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary", "aria-label": "Sticker nodig", checked: n.needsSticker, onChange: (e) => setNewItems((prev) => prev.map((p, i) => (i === idx ? { ...p, needsSticker: e.target.checked } : p))) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: ppc, value: n.quantity, onChange: (e) => setNewQty(Number(e.target.value)) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: 1, value: fusten, onChange: (e) => setNewQty(Math.max(0, Number(e.target.value)) * ppc) }) }), _jsx("div", { className: "col-span-1 flex justify-end", children: _jsx(Button, { variant: "ghost", size: "sm", title: "Regel verwijderen", onClick: () => setNewItems((prev) => prev.filter((_, i) => i !== idx)), children: _jsx(Trash2, { className: "h-4 w-4" }) }) })] }, n.key));
|
|
278
|
-
}), items.length === 0 && newItems.length === 0 && (_jsx("div", { className: "text-sm text-muted-foreground", children: "Geen regels op deze bestelling." }))] }), canEditProducts ? (_jsxs("div", { className: "mt-3", children: [_jsx("div", { className: "mb-1 text-xs text-muted-foreground", children: "Product toevoegen" }), _jsx(SearchableSelect, { value: null, options: productOptions, allowClear: false, placeholder: productsQ.isLoading ? "Producten laden…" : "Zoek een product…", onChange: addProduct, disabled: productsQ.isLoading })] })) : (_jsx("div", { className: "mt-3 rounded border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Producten kunnen niet meer gewijzigd worden: deze bestelling is al geprint in het Pickstation. Aantallen aanpassen kan wel." }))] })] })] })), stockCheck && stockCheck.shortages.length > 0 && (_jsxs("div", { className: `mt-4 rounded-md border p-3 text-sm ${stockBlocked
|
|
279
|
-
? "border-destructive/40 bg-destructive/5 text-destructive"
|
|
280
|
-
: "border-amber-500/40 bg-amber-500/5 text-amber-700"}`, children: [_jsx("div", { className: "font-medium", children: stockBlocked
|
|
281
|
-
? "Opslaan geblokkeerd — onvoldoende voorraad"
|
|
282
|
-
: "Let op: tekorten (uitleveren zonder voorraad staat aan)" }), _jsx("ul", { className: "mt-1 space-y-0.5", children: stockCheck.shortages.map((s) => (_jsxs("li", { children: [s.product, ": besteld ", s.wanted, ", beschikbaar ", s.available, ", tekort ", s.missing] }, s.productId))) })] }))] }), _jsxs("div", { className: "shrink-0 border-t border-border p-6 pt-4 flex justify-end gap-2", children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => onOpenChange(false), disabled: saving, children: "Annuleren" }), _jsx(Button, { size: "sm", onClick: handleSave, disabled: saving || loading || !!error || !!shippedLock || stockBlocked || stockQ.isFetching, children: saving ? "Bezig…" : stockQ.isFetching ? "Voorraad controleren…" : "Opslaan" })] })] }) }));
|
|
305
|
+
return (_jsxs("div", { className: "grid grid-cols-12 items-start gap-2 rounded border border-primary/40 bg-primary/5 p-2", children: [_jsxs("div", { className: "col-span-4 min-w-0 text-sm", children: [_jsx("div", { className: "truncate font-medium text-foreground", children: n.productName }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["nieuw \u00B7 ", ppc, " planten per fust"] }), stockNote(`new:${n.key}`, n.productId)] }), _jsx("div", { className: "col-span-1 flex h-10 items-center justify-center", children: _jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary", "aria-label": "Sticker nodig", checked: n.needsSticker, onChange: (e) => setNewItems((prev) => prev.map((p, i) => (i === idx ? { ...p, needsSticker: e.target.checked } : p))) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: ppc, value: n.quantity, onChange: (e) => setNewQty(Number(e.target.value)) }) }), _jsx("div", { className: "col-span-3", children: _jsx(Input, { type: "number", min: 0, step: 1, value: fusten, onChange: (e) => setNewQty(Math.max(0, Number(e.target.value)) * ppc) }) }), _jsx("div", { className: "col-span-1 flex justify-end", children: _jsx(Button, { variant: "ghost", size: "sm", title: "Regel verwijderen", onClick: () => setNewItems((prev) => prev.filter((_, i) => i !== idx)), children: _jsx(Trash2, { className: "h-4 w-4" }) }) })] }, n.key));
|
|
306
|
+
}), items.length === 0 && newItems.length === 0 && (_jsx("div", { className: "text-sm text-muted-foreground", children: "Geen regels op deze bestelling." }))] }), canEditProducts ? (_jsxs("div", { className: "mt-3", children: [_jsx("div", { className: "mb-1 text-xs text-muted-foreground", children: "Product toevoegen" }), _jsx(SearchableSelect, { value: null, options: productOptions, allowClear: false, placeholder: productsQ.isLoading ? "Producten laden…" : "Zoek een product…", onChange: addProduct, disabled: productsQ.isLoading })] })) : (_jsx("div", { className: "mt-3 rounded border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Producten kunnen niet meer gewijzigd worden: deze bestelling is al geprint in het Pickstation. Aantallen aanpassen kan wel." }))] })] })] })), stockCheck?.modus === "terugval" && stockCheck.shortages.length > 0 && (_jsx("div", { className: "mt-4 rounded-md border border-border bg-muted/40 p-3 text-sm text-muted-foreground", children: "Voorraad kan bij bewerken nog niet exact worden gecontroleerd; de eigen reservering van deze bestelling telt nog mee." }))] }), _jsxs("div", { className: "shrink-0 border-t border-border p-6 pt-4 flex justify-end gap-2", children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => onOpenChange(false), disabled: saving, children: "Annuleren" }), _jsx(Button, { size: "sm", onClick: handleSave, disabled: saving || loading || !!error || !!shippedLock, children: saving ? "Bezig…" : "Opslaan" })] })] }) }));
|
|
283
307
|
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type KarDrager, type KarRegel } from "../../lib/kar-tekening.js";
|
|
2
|
+
export declare function KarindelingSkeleton(): import("react").JSX.Element;
|
|
3
|
+
export interface KarTekeningState {
|
|
4
|
+
/** null = nog onbekend, false = functies ontbreken (terugval). */
|
|
5
|
+
beschikbaar: boolean | null;
|
|
6
|
+
kop: string | null;
|
|
7
|
+
node: React.ReactNode;
|
|
8
|
+
}
|
|
9
|
+
/** Leest stand + tekening en geeft de inhoud voor het blok. */
|
|
10
|
+
export declare function useKarTekening(orderId: string | null, opts: {
|
|
11
|
+
floriday: boolean;
|
|
12
|
+
onLagen?: (d: KarDrager) => void;
|
|
13
|
+
/** Artikelregels per drager (kar-id) uit orderregels + karregels; niet uit de tekening. */
|
|
14
|
+
regelsPerDrager?: Map<string, KarRegel[]>;
|
|
15
|
+
}): KarTekeningState;
|
|
16
|
+
//# sourceMappingURL=KarTekeningSection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KarTekeningSection.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarTekeningSection.tsx"],"names":[],"mappings":"AAUA,OAAO,EAA4G,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAK/L,wBAAgB,mBAAmB,gCAiBlC;AAED,MAAM,WAAW,gBAAgB;IAC/B,kEAAkE;IAClE,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;CACvB;AAED,+DAA+D;AAC/D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,IAAI,EAAE;IACJ,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;IACjC,2FAA2F;IAC3F,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CAC3C,GACA,gBAAgB,CAqGlB"}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
// Blok Karindeling met tekening. Rekent en tekent niets zelf: stand en
|
|
3
|
+
// tekening komen uit de database (logistics_order_indeling_stand /
|
|
4
|
+
// logistics_kar_tekening). Ontbreken die functies, dan beschikbaar=false en
|
|
5
|
+
// toont de kaart stil het huidige blok.
|
|
6
|
+
import { useEffect, useState } from "react";
|
|
7
|
+
import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
8
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
9
|
+
import { Badge, Button, Dialog, DialogContent, DialogHeader, DialogTitle, Skeleton, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@flowselections/core";
|
|
10
|
+
import { AlertTriangle, Loader2 } from "lucide-react";
|
|
11
|
+
import { getIndelingStand, getKarTekening } from "../../lib/kar-tekening.functions.js";
|
|
12
|
+
import { dragerTitel, dragersKop, gedeeldTekst, lagenTekst, langBezig, POLL_MS, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
13
|
+
import { bezigKey } from "../../lib/indeling-bezig.js";
|
|
14
|
+
import { korteMelding } from "../../lib/korte-melding.js";
|
|
15
|
+
import { SafeSvg } from "./SafeSvg.js";
|
|
16
|
+
export function KarindelingSkeleton() {
|
|
17
|
+
return (_jsxs("div", { className: "space-y-3", "aria-label": "Indeling laden", "aria-busy": "true", children: [_jsx("div", { className: "flex gap-2 overflow-hidden", children: [0, 1, 2].map((i) => _jsx(Skeleton, { className: "h-16 w-12 shrink-0 rounded-lg" }, i)) }), _jsx("div", { className: "grid gap-3 md:grid-cols-2", children: [0, 1].map((i) => (_jsxs("div", { className: "space-y-2 rounded-xl border border-border p-3", children: [_jsx(Skeleton, { className: "h-4 w-40" }), _jsx(Skeleton, { className: "h-2 w-full" }), _jsx(Skeleton, { className: "h-24 w-full rounded-lg" })] }, i))) })] }));
|
|
18
|
+
}
|
|
19
|
+
/** Leest stand + tekening en geeft de inhoud voor het blok. */
|
|
20
|
+
export function useKarTekening(orderId, opts) {
|
|
21
|
+
const qc = useQueryClient();
|
|
22
|
+
const fetchStand = useServerFn(getIndelingStand);
|
|
23
|
+
const fetchTekening = useServerFn(getKarTekening);
|
|
24
|
+
const [now, setNow] = useState(() => Date.now());
|
|
25
|
+
const standQ = useQuery({
|
|
26
|
+
queryKey: ["karindeling-stand", orderId],
|
|
27
|
+
enabled: !!orderId,
|
|
28
|
+
staleTime: 0,
|
|
29
|
+
queryFn: async () => {
|
|
30
|
+
const fetchedFrom = Date.now();
|
|
31
|
+
const r = await fetchStand({ data: { orderId: orderId } });
|
|
32
|
+
return { r, fetchedFrom };
|
|
33
|
+
},
|
|
34
|
+
refetchInterval: (q) => {
|
|
35
|
+
const d = q.state.data;
|
|
36
|
+
if (!d || !d.r.beschikbaar)
|
|
37
|
+
return false;
|
|
38
|
+
const m = qc.getQueryData(bezigKey(d.r.orderDbId ?? orderId ?? "-")) ?? null;
|
|
39
|
+
if (m != null && d.fetchedFrom < m + 1000)
|
|
40
|
+
return 1000;
|
|
41
|
+
return d.r.ok && d.r.stand.stand === "bezig" ? POLL_MS : false;
|
|
42
|
+
},
|
|
43
|
+
refetchIntervalInBackground: false,
|
|
44
|
+
});
|
|
45
|
+
const standRes = standQ.data?.r;
|
|
46
|
+
// "Bezig na opslaan" hangt aan het echte order-id (orders.id) dat de server
|
|
47
|
+
// teruggeeft; de vervoerderkeuze en het bewerkscherm markeren hetzelfde id.
|
|
48
|
+
const dbId = standQ.data?.r && "orderDbId" in standQ.data.r ? (standQ.data.r.orderDbId ?? null) : null;
|
|
49
|
+
const markQ = useQuery({ queryKey: bezigKey(dbId ?? orderId ?? "-"), queryFn: () => null, enabled: false, staleTime: Infinity, initialData: null });
|
|
50
|
+
const markAt = markQ.data ?? null;
|
|
51
|
+
const stand = standRes && standRes.beschikbaar && standRes.ok ? standRes.stand : null;
|
|
52
|
+
const shown = toonStand({ stand: stand?.stand ?? null, markAt, fetchedFrom: standQ.data?.fetchedFrom ?? null });
|
|
53
|
+
// Na opslaan: binnen ±1 s een nieuwe ronde, ook als de vorige stand "klaar" was.
|
|
54
|
+
useEffect(() => {
|
|
55
|
+
if (markAt == null || !orderId)
|
|
56
|
+
return;
|
|
57
|
+
const t = setTimeout(() => void qc.invalidateQueries({ queryKey: ["karindeling-stand", orderId] }), 1050);
|
|
58
|
+
return () => clearTimeout(t);
|
|
59
|
+
}, [markAt, orderId, qc]);
|
|
60
|
+
useEffect(() => {
|
|
61
|
+
if (shown !== "bezig")
|
|
62
|
+
return;
|
|
63
|
+
const t = setInterval(() => setNow(Date.now()), 5000);
|
|
64
|
+
return () => clearInterval(t);
|
|
65
|
+
}, [shown]);
|
|
66
|
+
const tekeningQ = useQuery({
|
|
67
|
+
queryKey: ["kar-tekening", orderId, stand?.stand ?? null, stand?.bijgewerkt_op ?? null],
|
|
68
|
+
enabled: !!orderId && !!standRes && standRes.beschikbaar && shown !== "bezig",
|
|
69
|
+
staleTime: 30000,
|
|
70
|
+
placeholderData: keepPreviousData,
|
|
71
|
+
queryFn: () => fetchTekening({ data: { orderId: orderId } }),
|
|
72
|
+
});
|
|
73
|
+
if (standQ.isError) {
|
|
74
|
+
console.error("[karindeling] stand:", standQ.error);
|
|
75
|
+
return { beschikbaar: false, kop: null, node: null };
|
|
76
|
+
}
|
|
77
|
+
if (!standRes)
|
|
78
|
+
return { beschikbaar: null, kop: null, node: _jsx(KarindelingSkeleton, {}) };
|
|
79
|
+
if (!standRes.beschikbaar || (tekeningQ.data && !tekeningQ.data.beschikbaar))
|
|
80
|
+
return { beschikbaar: false, kop: null, node: null };
|
|
81
|
+
const tek = tekeningQ.data && tekeningQ.data.beschikbaar && tekeningQ.data.ok ? tekeningQ.data.tekening : null;
|
|
82
|
+
const kop = shown === "klaar" && tek && tek.dragers.length > 0 ? `Karindeling · ${dragersKop(tek.dragers)}` : null;
|
|
83
|
+
let node;
|
|
84
|
+
if (!standRes.ok) {
|
|
85
|
+
node = _jsx(Melding, { tekst: standRes.fout });
|
|
86
|
+
}
|
|
87
|
+
else if (shown === "geen_regels") {
|
|
88
|
+
node = _jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen artikelen, dus nog geen indeling." });
|
|
89
|
+
}
|
|
90
|
+
else if (shown === "niet_gelukt") {
|
|
91
|
+
node = _jsx(Melding, { tekst: korteMelding(stand?.tekst) ?? "De indeling is niet gelukt." });
|
|
92
|
+
}
|
|
93
|
+
else if (shown === "bezig") {
|
|
94
|
+
const sinds = stand?.stand === "bezig" ? (stand.bezig_sinds ?? markAt) : markAt;
|
|
95
|
+
node = (_jsxs("div", { className: "space-y-3", children: [_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", role: "status", "aria-live": "polite", children: [_jsx(Loader2, { className: "mt-0.5 h-4 w-4 shrink-0 animate-spin text-primary" }), _jsxs("div", { children: [_jsx("div", { children: "Indeling wordt gemaakt\u2026 meestal binnen een minuut" }), langBezig(sinds, now) && (_jsx("div", { className: "mt-0.5 text-xs text-muted-foreground", children: "Dit duurt langer dan normaal. Je kunt gewoon verder werken; de indeling verschijnt vanzelf." }))] })] }), tek && tek.dragers.length > 0 && (_jsxs("div", { className: "relative opacity-50 transition-opacity duration-300", children: [_jsx(Badge, { variant: "secondary", className: "absolute right-2 top-2 z-10", children: "Wordt bijgewerkt" }), _jsx(TekeningInhoud, { tek: tek, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager })] }))] }));
|
|
96
|
+
}
|
|
97
|
+
else if (tekeningQ.isPending || !tekeningQ.data) {
|
|
98
|
+
node = _jsx(KarindelingSkeleton, {});
|
|
99
|
+
}
|
|
100
|
+
else if (!tekeningQ.data.ok) {
|
|
101
|
+
node = _jsx(Melding, { tekst: tekeningQ.data.fout });
|
|
102
|
+
}
|
|
103
|
+
else if (tek && tek.dragers.length === 0) {
|
|
104
|
+
node = _jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen artikelen, dus nog geen indeling." });
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
node = _jsx("div", { className: "animate-in fade-in duration-300", children: _jsx(TekeningInhoud, { tek: tek, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager }) });
|
|
108
|
+
}
|
|
109
|
+
return { beschikbaar: true, kop, node };
|
|
110
|
+
}
|
|
111
|
+
function Melding({ tekst }) {
|
|
112
|
+
return (_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-4 w-4 shrink-0 text-destructive" }), _jsx("span", { children: tekst })] }));
|
|
113
|
+
}
|
|
114
|
+
function TekeningInhoud({ tek, floriday, onLagen, regels }) {
|
|
115
|
+
const [groot, setGroot] = useState(null);
|
|
116
|
+
return (_jsxs("div", { className: "space-y-3", children: [_jsx("div", { className: "-mx-1 flex gap-2 overflow-x-auto px-1 pb-1", children: tek.dragers.map((d) => (_jsx("button", { type: "button", onClick: () => setGroot(d), className: "shrink-0 rounded-lg border border-border bg-card p-1 transition-shadow hover:border-ring/50 hover:shadow-md focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", "aria-label": `Grote tekening van ${dragerTitel(d)}`, title: dragerTitel(d), children: d.svg ? _jsx(SafeSvg, { svg: d.svg, className: "h-16 w-12 [&>svg]:h-full [&>svg]:w-full", label: dragerTitel(d) }) : _jsx("div", { className: "flex h-16 w-12 items-center justify-center text-xs tabular-nums text-muted-foreground", children: d.nummer ?? "—" }) }, d.id))) }), tek.dragers.length === 0 && tek.svg_rij && _jsx(SafeSvg, { svg: tek.svg_rij, className: "overflow-x-auto", label: "Overzicht van de indeling" }), _jsx("div", { className: "grid gap-3 md:grid-cols-2", children: tek.dragers.map((d) => _jsx(DragerKaart, { d: d, regels: regels?.get(d.id) ?? [], floriday: floriday, onGroot: () => setGroot(d), onLagen: onLagen }, d.id)) }), _jsx(Dialog, { open: !!groot, onOpenChange: (v) => { if (!v)
|
|
117
|
+
setGroot(null); }, children: _jsxs(DialogContent, { className: "max-w-2xl", children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: groot ? dragerTitel(groot) : "" }) }), groot?.svg ? _jsx(SafeSvg, { svg: groot.svg, className: "max-h-[70vh] overflow-auto [&>svg]:h-auto [&>svg]:w-full", label: dragerTitel(groot) }) : _jsx("p", { className: "text-sm text-muted-foreground", children: "Geen tekening beschikbaar." })] }) })] }));
|
|
118
|
+
}
|
|
119
|
+
function DragerKaart({ d, regels, floriday, onGroot, onLagen }) {
|
|
120
|
+
const pct = d.vulgraad_pct != null ? Math.max(0, Math.min(100, Math.round(d.vulgraad_pct))) : null;
|
|
121
|
+
const status = statusLabel(d.status);
|
|
122
|
+
const dozen = toonDozen(regels);
|
|
123
|
+
const gedeeld = gedeeldTekst(d.gedeeld_met);
|
|
124
|
+
const lagen = lagenTekst(d.lagen_gebruikt, d.lagen_max);
|
|
125
|
+
return (_jsxs("div", { className: "min-w-0 space-y-2 rounded-xl border border-border bg-card p-3 shadow-sm", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("span", { className: "font-medium text-foreground", children: dragerTitel(d) }), status && _jsx(Badge, { variant: "outline", className: "rounded-full", children: status }), floriday && d.floriday_gelijk === true && _jsx(Badge, { variant: "secondary", className: "rounded-full", children: "Floriday gelijk" }), gedeeld && _jsx(Badge, { variant: "outline", className: "rounded-full", children: gedeeld })] }), pct != null && (_jsxs("div", { className: "flex items-center gap-2 text-xs text-muted-foreground", children: [_jsx("div", { className: "h-2 flex-1 overflow-hidden rounded-full bg-muted", role: "progressbar", "aria-valuenow": pct, "aria-valuemin": 0, "aria-valuemax": 100, "aria-label": "Vulgraad", children: _jsx("div", { className: "h-full rounded-full bg-primary", style: { width: `${pct}%` } }) }), _jsxs("span", { className: "tabular-nums", children: [pct, "%"] })] })), lagen && _jsx("div", { className: "text-xs tabular-nums text-muted-foreground", children: lagen }), d.waarschuwingen.length > 0 && (_jsx("ul", { className: "space-y-0.5 text-xs text-foreground", children: d.waarschuwingen.map((w, i) => (_jsxs("li", { className: "flex items-start gap-1", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3 w-3 shrink-0 text-warning" }), w] }, i))) })), d.svg && (_jsx("button", { type: "button", onClick: onGroot, className: "block w-full rounded-lg focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", "aria-label": `Grote tekening van ${dragerTitel(d)}`, children: _jsx(SafeSvg, { svg: d.svg, className: "max-h-64 overflow-hidden [&>svg]:mx-auto [&>svg]:h-auto [&>svg]:max-h-64 [&>svg]:w-full", label: dragerTitel(d) }) })), regels.length > 0 && (_jsx("div", { className: "overflow-x-auto", children: _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel" }), _jsx(TableHead, { children: "Fusten" }), dozen && _jsx(TableHead, { children: "Dozen" }), _jsx(TableHead, { children: "Belading" })] }) }), _jsx(TableBody, { children: regels.map((a) => (_jsxs(TableRow, { children: [_jsx(TableCell, { className: "min-w-0", children: a.product }), _jsx(TableCell, { className: "tabular-nums", children: a.fusten ?? "—" }), dozen && _jsx(TableCell, { className: "tabular-nums", children: a.dozen ?? "—" }), _jsx(TableCell, { className: "text-xs text-muted-foreground", children: a.belading ?? "Belading onbekend" })] }, a.key))) })] }) })), onLagen && d.soort === "layered" && (_jsx(Button, { variant: "outline", size: "sm", className: "h-8", onClick: () => onLagen(d), children: "Lagen bekijken" }))] }));
|
|
126
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,EACd,SAAS,GACV,EAAE;IACD,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+BA6GA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useState } from "react";
|
|
3
|
+
import { markIndelingBezig } from "../../lib/indeling-bezig.js";
|
|
3
4
|
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
|
4
5
|
import { useServerFn } from "@tanstack/react-start";
|
|
5
6
|
import { Truck } from "lucide-react";
|
|
@@ -42,6 +43,8 @@ export function OrderCarrierPicker({ orderId, applyToBuffer = false, compact = f
|
|
|
42
43
|
const res = await saveCarrier({
|
|
43
44
|
data: { orderId, carrierId: next === AUTO ? null : next, applyToBuffer },
|
|
44
45
|
});
|
|
46
|
+
// Echte order-id's (orders.id) uit de server, ook van de andere orders in de groep.
|
|
47
|
+
markIndelingBezig(qc, res.results.filter((r) => r.ok).map((r) => r.orderId));
|
|
45
48
|
setNotice(res.adminNotice);
|
|
46
49
|
if (!res.ok || res.results.length > 1)
|
|
47
50
|
setResults(res.results);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAgB/D,eAAO,MAAM,WAAW,iDAA4C,CAAC;AAiBrE,wBAAgB,oBAAoB,CAAC,EACnC,KAAK,EACL,YAAY,GACb,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,2EAA2E;IAC3E,YAAY,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAClH,+BAwWA;AAGD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAaxD"}
|
|
@@ -20,6 +20,9 @@ import { resolveProductName } from "../../lib/product-name.js";
|
|
|
20
20
|
import { CartLayersDialog } from "./CartLayersDialog.js";
|
|
21
21
|
import { PlanCoverageBadge } from "./PlanCoverageBadge.js";
|
|
22
22
|
import { isProefindeling } from "../../lib/floriday-actual-carriers.js";
|
|
23
|
+
import { KarindelingSkeleton, useKarTekening } from "./KarTekeningSection.js";
|
|
24
|
+
import { karRegelsPerDrager, pickTekst, toonDozen } from "../../lib/kar-tekening.js";
|
|
25
|
+
import { listOrderItemPacking } from "../../lib/order-item-packing.functions.js";
|
|
23
26
|
export const PROEF_TITEL = "Proefindeling – afgehandeld in Floriday";
|
|
24
27
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
25
28
|
const PICK_LABEL = {
|
|
@@ -111,13 +114,39 @@ export function OrderKarindelingCard({ order, pickProgress, }) {
|
|
|
111
114
|
const [layersFor, setLayersFor] = useState(null);
|
|
112
115
|
// In Floriday afgehandeld: indeling van de Engine als proefindeling, geen pick-/aanmeldacties.
|
|
113
116
|
const proef = isProefindeling({ coverageFull: cov?.externalFulfilled?.full ?? null, externalFulfilledAt: data?.externalFulfilledAt ?? order?.floridayExternalFulfilledAt ?? null });
|
|
117
|
+
// Nieuw blok met tekening (stand + tekening uit de database). Ontbreken die
|
|
118
|
+
// functies, dan beschikbaar=false en blijft het huidige blok staan.
|
|
119
|
+
const isFloriday = typeof rawId === "string" && !/^(local:|mailbox-proposal:)/.test(rawId);
|
|
120
|
+
// Artikeltabel per drager: orderregels (belading) + bestaande karregels, niet uit de tekening.
|
|
121
|
+
// Zelfde cache als de beladingkaart op deze pagina.
|
|
122
|
+
const fetchPacking = useServerFn(listOrderItemPacking);
|
|
123
|
+
const packingQ = useQuery({
|
|
124
|
+
queryKey: ["order-item-packing", String(rawId ?? "")],
|
|
125
|
+
enabled: !!rawId && !proef,
|
|
126
|
+
staleTime: 30000,
|
|
127
|
+
queryFn: () => fetchPacking({ data: { orderId: String(rawId) } }),
|
|
128
|
+
});
|
|
129
|
+
if (packingQ.isError)
|
|
130
|
+
console.error("[karindeling] belading orderregels:", packingQ.error);
|
|
131
|
+
const regelsPerDrager = karRegelsPerDrager(carts, packingQ.data?.items ?? [], resolveProductName);
|
|
132
|
+
const kt = useKarTekening(proef ? null : orderId, {
|
|
133
|
+
floriday: isFloriday,
|
|
134
|
+
onLagen: (d) => setLayersFor({ id: d.id, number: d.nummer ?? 0 }),
|
|
135
|
+
regelsPerDrager,
|
|
136
|
+
});
|
|
137
|
+
const nieuw = !proef && kt.beschikbaar === true;
|
|
138
|
+
const wachtOpKeuze = !proef && !!orderId && kt.beschikbaar === null;
|
|
139
|
+
const pickZin = pickTekst(pickProgress);
|
|
114
140
|
const floridayCarriers = data?.floriday;
|
|
115
|
-
return (_jsxs(Card, { children: [_jsxs(CardHeader, { className: "grid grid-cols-[minmax(0,1fr)_auto] items-center gap-2 sm:flex sm:flex-row sm:justify-between", children: [_jsx(CardTitle, { className: "truncate text-base", children: proef ? PROEF_TITEL :
|
|
141
|
+
return (_jsxs(Card, { children: [_jsxs(CardHeader, { className: "grid grid-cols-[minmax(0,1fr)_auto] items-center gap-2 sm:flex sm:flex-row sm:justify-between", children: [_jsx(CardTitle, { className: "truncate text-base", children: proef ? PROEF_TITEL : nieuw && kt.kop ? kt.kop : "Karindeling" }), _jsxs("div", { className: "flex items-center gap-2", children: [!nieuw && cov && cov.state !== "onbekend" && (() => {
|
|
142
|
+
const n = engineBuffer ? engineBuffer.karren : carts.length;
|
|
143
|
+
return _jsxs(Badge, { variant: "secondary", children: [n, " ", n === 1 ? "kar" : "karren"] });
|
|
144
|
+
})(), _jsx(Button, { variant: "ghost", size: "icon", "aria-label": "Vernieuwen", title: "Vernieuwen", onClick: () => void queryClient.invalidateQueries({ queryKey }), children: _jsx(RefreshCw, { className: "h-4 w-4 " + (isFetching ? "animate-spin" : "") }) })] })] }), _jsx(CardContent, { className: "space-y-4", children: isLoading || wachtOpKeuze ? (_jsx(KarindelingSkeleton, {})) : nieuw ? (_jsxs(_Fragment, { children: [(pickZin || pickRows.length > 0) && (_jsxs("div", { className: "flex flex-wrap items-start gap-x-6 gap-y-2 text-sm", children: [pickZin && (_jsxs("div", { children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Picken" }), _jsx("div", { className: "mt-1", children: pickZin })] })), pickRows.length > 0 && (_jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Pickdocumenten" }), _jsx("div", { className: "mt-1 flex flex-wrap gap-1", children: pickRows.map((p, i) => (_jsxs(Badge, { variant: "outline", className: "text-[10px]", children: [p.documentNumber ?? "Pickdocument", " \u00B7 ", p.completedAt ? "gepickt" : p.printedAt ? "geprint" : "nog niet geprint"] }, p.queueItemId ?? i))) })] }))] })), cov && (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), kt.node] })) : error ? (_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: "Indeling onbekend" }), _jsx("p", { className: "text-sm text-muted-foreground", children: error.message })] })) : cov ? (_jsxs(_Fragment, { children: [cov.externalFulfilled && !cov.externalFulfilled.full && (_jsxs("p", { className: "text-sm text-muted-foreground", children: [cov.externalFulfilled.salesOrderIds.length, " bestelling(en) afgehandeld in Floriday; de voortgang telt alleen de rest."] })), data?.externalEvent?.sendError ? (_jsxs("p", { className: "text-sm text-destructive", children: ["Het afronden in de planning lukte niet: de melding kon niet worden verstuurd (", data.externalEvent.sendError, ")."] })) : data?.externalEvent?.status === "failed" ? (_jsxs("p", { className: "text-sm text-destructive", children: ["Het afronden in de planning lukte niet: ", data.externalEvent.error ?? "geen reden opgegeven"] })) : data?.externalEvent && data.externalEvent.status && !["done", "processed", "completed", "applied", "skipped"].includes(data.externalEvent.status) ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "De planning verwerkt \"Afgehandeld in Floriday\" nog." })) : null, _jsxs("div", { className: "flex flex-wrap items-start gap-x-6 gap-y-2 text-sm", children: [_jsxs("div", { children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Indeling" }), creating ? (_jsx("p", { className: "mt-1 text-sm text-muted-foreground", children: "Karindeling wordt gemaakt\u2026" })) : (_jsx(PlanCoverageBadge, { coverage: summarize(cov) }))] }), !proef && (_jsxs("div", { children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Pickstatus" }), _jsxs("div", { className: "mt-1", children: [pickZin ?? (cov.pickStatus ? PICK_LABEL[cov.pickStatus] : "—"), cov.pickStatus === "gepickt" && cov.pickedAt ? ` · ${fmt(cov.pickedAt)}` : ""] })] })), !proef && pickRows.length > 0 && (_jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Pickdocumenten" }), _jsx("div", { className: "mt-1 flex flex-wrap gap-1", children: pickRows.map((p, i) => (_jsxs(Badge, { variant: "outline", className: "text-[10px]", title: [
|
|
116
145
|
p.printedAt ? `Geprint ${fmt(p.printedAt)}` : "Nog niet geprint",
|
|
117
146
|
p.completedAt ? `Afgerond ${fmt(p.completedAt)}` : null,
|
|
118
147
|
]
|
|
119
148
|
.filter(Boolean)
|
|
120
|
-
.join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), engineBuffer && engineBuffer.dubbeleDocumenten.length > 0 && (_jsx("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive", children: engineBuffer.dubbeleDocumenten.map((d) => (_jsxs("div", { children: ["Pickdocument ", d.documentNumber, " bestaat twee keer"] }, d.documentNumber))) })), !proef && (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), proef && carts.length === 0 && (_jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen proefindeling beschikbaar." })), !proef && cov.state === "geen_indeling" && !creating && (cov.geenIndeling ? (_jsxs("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm", children: [_jsxs("div", { className: "font-medium text-destructive", children: ["Geen indeling", cov.geenIndeling.code ? ` (${cov.geenIndeling.code})` : ""] }), cov.geenIndeling.regels.length > 0 ? (_jsx("ul", { className: "mt-1 list-disc space-y-0.5 pl-5 text-foreground", children: cov.geenIndeling.regels.map((r, i) => _jsx("li", { className: "break-words", children: r }, i)) })) : cov.geenIndeling.tekst ? (_jsx(ExpandableText, { text: cov.geenIndeling.tekst })) : null, cov.geenIndeling.actieUrl && (cov.geenIndeling.actieLabel || cov.geenIndeling.actie) && (_jsx(Button, { asChild: true, size: "sm", variant: "outline", className: "mt-2", children: _jsx("a", { href: cov.geenIndeling.actieUrl, children: cov.geenIndeling.actieLabel ?? cov.geenIndeling.actie }) }))] })) : (_jsxs("p", { className: "text-sm text-muted-foreground", children: ["
|
|
149
|
+
.join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), engineBuffer && engineBuffer.dubbeleDocumenten.length > 0 && (_jsx("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive", children: engineBuffer.dubbeleDocumenten.map((d) => (_jsxs("div", { children: ["Pickdocument ", d.documentNumber, " bestaat twee keer"] }, d.documentNumber))) })), !proef && (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), proef && carts.length === 0 && (_jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen proefindeling beschikbaar." })), !proef && cov.state === "geen_indeling" && !creating && (cov.geenIndeling ? (_jsxs("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm", children: [_jsxs("div", { className: "font-medium text-destructive", children: ["Geen indeling", cov.geenIndeling.code ? ` (${cov.geenIndeling.code})` : ""] }), cov.geenIndeling.regels.length > 0 ? (_jsx("ul", { className: "mt-1 list-disc space-y-0.5 pl-5 text-foreground", children: cov.geenIndeling.regels.map((r, i) => _jsx("li", { className: "break-words", children: r }, i)) })) : cov.geenIndeling.tekst ? (_jsx(ExpandableText, { text: cov.geenIndeling.tekst })) : null, cov.geenIndeling.actieUrl && (cov.geenIndeling.actieLabel || cov.geenIndeling.actie) && (_jsx(Button, { asChild: true, size: "sm", variant: "outline", className: "mt-2", children: _jsx("a", { href: cov.geenIndeling.actieUrl, children: cov.geenIndeling.actieLabel ?? cov.geenIndeling.actie }) }))] })) : (_jsxs("p", { className: "text-sm text-muted-foreground", children: ["Er is nog geen indeling.", cov.reason && _jsx(ExpandableText, { text: cov.reason })] }))), cov.state === "onbekend" && cov.error && (_jsx("p", { className: "text-sm text-muted-foreground", children: cov.error })), carts.map((c) => (_jsxs("div", { className: "rounded-md border border-border", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2 border-b border-border bg-muted/30 px-3 py-2 text-sm", children: [_jsxs("button", { type: "button", className: "flex items-center gap-2 rounded-sm text-left hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", onClick: () => setLayersFor({ id: c.cartId, number: c.cartNumber ?? 0 }), title: "Bekijk de lagen van deze kar", children: [_jsx(LayoutGrid, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("span", { className: "font-mono font-medium", children: ["Kar ", c.cartNumber ?? "—"] })] }), c.shared && _jsx(Badge, { variant: "outline", children: "Gedeeld met gecombineerde order" }), cartSummary(c) ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: cartSummary(c) })) : c.carrierType ? (_jsxs(Badge, { variant: "outline", className: "text-[10px]", children: [loadCarrierName(c.carrierType) ?? c.carrierType, c.additionalLayers != null ? ` · ${c.additionalLayers} ${c.additionalLayers === 1 ? "plaat" : "platen"}` : ""] })) : null, c.teHoog === true && _jsx(Badge, { variant: "destructive", className: "text-[10px]", children: "Te hoog" })] }), _jsx(VerouderdRedenen, { regels: verouderdRegels(c) }), c.blokkade && (_jsxs("div", { className: "border-b border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-destructive", children: ["Blokkade", c.blokkade.code ? ` (${c.blokkade.code})` : "", ": ", c.blokkade.tekst ?? "neem contact op met de beheerder"] })), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), toonDozen((c.lines ?? []).map((l) => ({ fusten: l.crates ?? null, dozen: l.boxes ?? null }))) && _jsx(TableHead, { className: "text-right", children: "Dozen" })] }) }), _jsx(TableBody, { children: (Array.isArray(c.lines) ? c.lines : []).map((l, i) => (_jsxs(TableRow, { children: [_jsx(TableCell, { children: resolveProductName(l.productName) ?? "—" }), _jsx(TableCell, { className: "text-right", children: l.crates }), toonDozen((c.lines ?? []).map((x) => ({ fusten: x.crates ?? null, dozen: x.boxes ?? null }))) && _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId))), proef && (_jsxs("div", { className: "space-y-2", children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Werkelijke ladingdragers uit Floriday" }), floridayCarriers?.error ? (_jsx("p", { className: "text-sm text-muted-foreground", children: floridayCarriers.error })) : !floridayCarriers || floridayCarriers.carriers.length === 0 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "Floriday heeft (nog) geen ladingdragers voor deze order." })) : (_jsx("ul", { className: "divide-y divide-border rounded-md border border-border text-sm", children: floridayCarriers.carriers.map((c, i) => (_jsxs("li", { className: "flex flex-wrap items-center gap-2 px-3 py-2", children: [_jsx("span", { className: "font-medium", children: loadCarrierName(c.type ?? "") ?? c.type ?? "Ladingdrager" }), _jsxs("span", { className: "tabular-nums text-muted-foreground", children: [c.packages, " fust"] }), c.code && _jsx("span", { className: "font-mono text-xs text-muted-foreground", children: c.code })] }, `${c.fulfillmentId}-${c.index}-${i}`))) }))] }))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
|
|
121
150
|
if (!v)
|
|
122
151
|
setLayersFor(null);
|
|
123
152
|
} })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"AAqOA,wBAAgB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,sCA4CpE"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { fmtNLDefault } from "../../lib/nl-datetime.js";
|
|
3
|
+
import { formatBelading } from "../../lib/belading-format.js";
|
|
3
4
|
// Belading per bestelregel: zichtbaar maken en handmatig vastzetten/losmaken.
|
|
4
5
|
//
|
|
5
6
|
// Vastzetten beschermt de regel tegen overschrijven door de volgende
|
|
@@ -89,14 +90,10 @@ function LineRow({ item, onChanged, orderId, }) {
|
|
|
89
90
|
});
|
|
90
91
|
const known = item.plantsPerCrate != null && item.cratesPerLayer != null && item.layersPerCart != null;
|
|
91
92
|
return (_jsxs("div", { className: "rounded-md border border-border p-3", children: [melding && (_jsxs("div", { className: "mb-2 rounded-md border border-amber-400/60 bg-amber-50 px-3 py-2 text-xs text-amber-900", children: [_jsx("span", { className: "font-medium", children: "Engine: " }), _jsx("span", { className: "break-words", children: melding.tekst }), _jsx(EngineActieButtons, { orderId: orderId, acties: melding.acties, onDone: () => { noteMelding(null); onChanged(); } })] })), _jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate text-sm font-medium text-foreground", children: item.productName }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Sticker: ", item.needsSticker ? "ja" : "nee"] }), _jsx("div", { className: "text-xs text-muted-foreground", children: known
|
|
92
|
-
?
|
|
93
|
-
: "Belading onbekend — deze regel blokkeert de indeling tot er waarden staan" })] }), item.lockedAt ? (_jsxs(Badge, { variant: "outline", className: "gap-1 text-[11px]", children: [_jsx(Lock, { className: "h-3 w-3" }), "Handmatig vastgezet"] })) : null] }), item.lockedAt ? (_jsxs("div", { className: "mt-1 space-y-0.5 text-xs", children: [_jsxs("div", { className: "text-foreground", children: ["
|
|
94
|
-
?
|
|
95
|
-
: "onbekend"] }), item.floridayPacking ? (_jsxs("div", { className: "text-muted-foreground", children: ["Floriday:", " ", [
|
|
96
|
-
item.floridayPacking.plantsPerCrate != null ? `${item.floridayPacking.plantsPerCrate} planten/fust` : null,
|
|
97
|
-
item.floridayPacking.cratesPerLayer != null ? `${item.floridayPacking.cratesPerLayer} fusten/laag` : null,
|
|
98
|
-
item.floridayPacking.layersPerCart != null ? `${item.floridayPacking.layersPerCart} lagen/kar` : null,
|
|
99
|
-
].filter(Boolean).join(" · ") || "onbekend"] })) : null] })) : null, item.lockedAt ? (_jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Vastgezet door ", item.lockedByName ?? "onbekend", " op ", fmtWhen(item.lockedAt)] })) : null, editing ? (_jsxs("div", { className: "mt-3 flex flex-wrap items-end gap-2", children: [_jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Planten/fust" }), _jsx(Input, { className: "w-28", value: ppc, onChange: (e) => { setPpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Fusten/laag" }), _jsx(Input, { className: "w-28", value: cpl, onChange: (e) => { setCpl(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Lagen/kar" }), _jsx(Input, { className: "w-28", value: lpc, onChange: (e) => { setLpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), !preview ? (_jsx(Button, { size: "sm", onClick: () => previewM.mutate(), disabled: previewM.isPending, children: "Bekijk gevolgen" })) : !confirmText ? (_jsx(Button, { size: "sm", onClick: () => lockM.mutate(false), disabled: lockM.isPending, children: "Vastzetten" })) : (_jsx(Button, { size: "sm", variant: "destructive", onClick: () => lockM.mutate(true), disabled: lockM.isPending, children: "Ja, toch vastzetten" })), _jsx(Button, { size: "sm", variant: "ghost", onClick: () => { setEditing(false); resetSteps(); }, disabled: lockM.isPending, children: "Annuleren" }), preview && (_jsx("div", { className: "w-full rounded-md border border-border bg-muted/30 p-2 text-xs text-foreground", children: preview.available
|
|
93
|
+
? formatBelading({ perFust: item.plantsPerCrate, fustenPerLaag: item.cratesPerLayer, lagenPerKar: item.layersPerCart })
|
|
94
|
+
: "Belading onbekend — deze regel blokkeert de indeling tot er waarden staan" })] }), item.lockedAt ? (_jsxs(Badge, { variant: "outline", className: "gap-1 text-[11px]", children: [_jsx(Lock, { className: "h-3 w-3" }), "Handmatig vastgezet"] })) : null] }), item.lockedAt ? (_jsxs("div", { className: "mt-1 space-y-0.5 text-xs", children: [_jsxs("div", { className: "text-foreground", children: ["Indeling gebruikt:", " ", known
|
|
95
|
+
? formatBelading({ perFust: item.plantsPerCrate, fustenPerLaag: item.cratesPerLayer, lagenPerKar: item.layersPerCart })
|
|
96
|
+
: "onbekend"] }), item.floridayPacking ? (_jsxs("div", { className: "text-muted-foreground", children: ["Floriday:", " ", formatBelading({ perFust: item.floridayPacking.plantsPerCrate, fustenPerLaag: item.floridayPacking.cratesPerLayer, lagenPerKar: item.floridayPacking.layersPerCart }) ?? "onbekend"] })) : null] })) : null, item.lockedAt ? (_jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Vastgezet door ", item.lockedByName ?? "onbekend", " op ", fmtWhen(item.lockedAt)] })) : null, editing ? (_jsxs("div", { className: "mt-3 flex flex-wrap items-end gap-2", children: [_jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Planten/fust" }), _jsx(Input, { className: "w-28", value: ppc, onChange: (e) => { setPpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Fusten/laag" }), _jsx(Input, { className: "w-28", value: cpl, onChange: (e) => { setCpl(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Lagen/kar" }), _jsx(Input, { className: "w-28", value: lpc, onChange: (e) => { setLpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), !preview ? (_jsx(Button, { size: "sm", onClick: () => previewM.mutate(), disabled: previewM.isPending, children: "Bekijk gevolgen" })) : !confirmText ? (_jsx(Button, { size: "sm", onClick: () => lockM.mutate(false), disabled: lockM.isPending, children: "Vastzetten" })) : (_jsx(Button, { size: "sm", variant: "destructive", onClick: () => lockM.mutate(true), disabled: lockM.isPending, children: "Ja, toch vastzetten" })), _jsx(Button, { size: "sm", variant: "ghost", onClick: () => { setEditing(false); resetSteps(); }, disabled: lockM.isPending, children: "Annuleren" }), preview && (_jsx("div", { className: "w-full rounded-md border border-border bg-muted/30 p-2 text-xs text-foreground", children: preview.available
|
|
100
97
|
? preview.tekst ?? "De Engine gaf geen toelichting."
|
|
101
98
|
: "Deze Engine geeft nog geen voorbeeld; controleer de waarden zelf." })), confirmText && (_jsx("div", { className: "w-full rounded-md border border-destructive/30 bg-destructive/5 p-2 text-xs text-destructive", children: confirmText }))] })) : (_jsxs("div", { className: "mt-3 flex flex-wrap gap-2", children: [_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setEditing(true), children: [_jsx(Lock, { className: "mr-2 h-3.5 w-3.5" }), item.lockedAt ? "Vastgezette belading aanpassen" : "Belading handmatig vastzetten"] }), item.lockedAt ? (_jsxs(Button, { size: "sm", variant: "ghost", onClick: () => unlockM.mutate(), disabled: unlockM.isPending, children: [_jsx(LockOpen, { className: "mr-2 h-3.5 w-3.5" }), "Losmaken"] })) : null] }))] }));
|
|
102
99
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SafeSvg.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SafeSvg.tsx"],"names":[],"mappings":"AAKA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;IAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,sCAS5G"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
// Toont een SVG uit de database pas na opschonen (DOMPurify, SVG-profiel):
|
|
3
|
+
// geen script, geen event-attributen, geen foreignObject. Alleen in de browser.
|
|
4
|
+
import { useEffect, useState } from "react";
|
|
5
|
+
import DOMPurify from "dompurify";
|
|
6
|
+
export function sanitizeSvg(svg) {
|
|
7
|
+
return DOMPurify.sanitize(svg, {
|
|
8
|
+
USE_PROFILES: { svg: true, svgFilters: true },
|
|
9
|
+
FORBID_TAGS: ["script", "foreignObject", "iframe", "object", "embed", "a"],
|
|
10
|
+
FORBID_ATTR: ["href", "xlink:href"],
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
export function SafeSvg({ svg, className, label }) {
|
|
14
|
+
const [html, setHtml] = useState(null);
|
|
15
|
+
useEffect(() => {
|
|
16
|
+
if (!svg) {
|
|
17
|
+
setHtml(null);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
try {
|
|
21
|
+
setHtml(sanitizeSvg(svg));
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
console.error("[karindeling] tekening opschonen mislukt:", e);
|
|
25
|
+
setHtml(null);
|
|
26
|
+
}
|
|
27
|
+
}, [svg]);
|
|
28
|
+
if (!html)
|
|
29
|
+
return null;
|
|
30
|
+
return _jsx("div", { role: "img", "aria-label": label, className: className, dangerouslySetInnerHTML: { __html: html } });
|
|
31
|
+
}
|