@flowselections/floriday-verkoop-module 1.0.164 → 1.0.166
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/CartLayersDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CartLayersDialog.js +35 -30
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +31 -45
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +13 -1
- package/dist-lib/components/verkoop/KarSlotMelding.d.ts +7 -0
- package/dist-lib/components/verkoop/KarSlotMelding.d.ts.map +1 -0
- package/dist-lib/components/verkoop/KarSlotMelding.js +32 -0
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +34 -8
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +18 -3
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +12 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +3 -0
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +6 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +2 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.js +47 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.js +11 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.js +16 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.js +31 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +7 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.js +17 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +5 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.js +48 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.js +53 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.js +31 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +11 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.js +17 -0
- package/dist-lib/index.d.ts +1 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +1 -0
- package/dist-lib/integrations/supabase/types.d.ts +2699 -2
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/belading-format.d.ts +3 -2
- package/dist-lib/lib/belading-format.d.ts.map +1 -1
- package/dist-lib/lib/belading-format.js +5 -3
- package/dist-lib/lib/beslis-rollen.server.d.ts +10 -0
- package/dist-lib/lib/beslis-rollen.server.d.ts.map +1 -0
- package/dist-lib/lib/beslis-rollen.server.js +10 -0
- package/dist-lib/lib/cart-layers.functions.d.ts +31 -0
- package/dist-lib/lib/cart-layers.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-layers.functions.js +33 -5
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +8 -4
- package/dist-lib/lib/create-order-customers.d.ts +12 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +36 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +83 -44
- package/dist-lib/lib/engine-tijdlijn.d.ts +69 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.js +47 -0
- package/dist-lib/lib/engine-tijdlijn.js +101 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.server.js +41 -0
- package/dist-lib/lib/kar-handmatig.d.ts +52 -0
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -0
- package/dist-lib/lib/kar-handmatig.js +106 -0
- package/dist-lib/lib/kar-handmatig.server.d.ts +25 -0
- package/dist-lib/lib/kar-handmatig.server.d.ts.map +1 -0
- package/dist-lib/lib/kar-handmatig.server.js +24 -0
- package/dist-lib/lib/kar-tekening.d.ts +58 -5
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +95 -8
- package/dist-lib/lib/kar-tekening.server.d.ts +5 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.server.js +18 -0
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +13 -9
- package/dist-lib/lib/order-item-packing.functions.d.ts +23 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +75 -8
- package/dist-lib/lib/order-row.server.d.ts.map +1 -1
- package/dist-lib/lib/order-row.server.js +9 -6
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +4 -2
- package/dist-lib/lib/sales-corrections.d.ts +44 -0
- package/dist-lib/lib/sales-corrections.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts +92 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.js +132 -0
- package/dist-lib/lib/sales-corrections.js +129 -0
- package/dist-lib/lib/sales-corrections.server.d.ts +27 -0
- package/dist-lib/lib/sales-corrections.server.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.server.js +68 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +17 -11
- package/dist-lib/lib/step-timer.server.d.ts +13 -0
- package/dist-lib/lib/step-timer.server.d.ts.map +1 -0
- package/dist-lib/lib/step-timer.server.js +33 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -1
- package/dist-lib/lib/stock-product-link.server.js +12 -8
- package/dist-lib/lib/useOpenCorrections.d.ts +17 -0
- package/dist-lib/lib/useOpenCorrections.d.ts.map +1 -0
- package/dist-lib/lib/useOpenCorrections.js +34 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts +9 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts.map +1 -0
- package/dist-lib/lib/useOrderDetailPrefetch.js +45 -0
- package/package.json +6 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CartLayersDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CartLayersDialog.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CartLayersDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CartLayersDialog.tsx"],"names":[],"mappings":"AA2BA,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC;AA2ID,wBAAgB,gBAAgB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,KAAK,+BAqMjF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
1
|
+
import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
// Visuele weergave van de lagen van één kar.
|
|
3
3
|
//
|
|
4
4
|
// BELANGRIJK: dit scherm TOONT alleen. De Logistiek Engine bepaalt laag, positie
|
|
@@ -8,8 +8,9 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
8
8
|
import { useRef, useState } from "react";
|
|
9
9
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
10
10
|
import { useServerFn } from "@tanstack/react-start";
|
|
11
|
-
import { Badge,
|
|
12
|
-
import {
|
|
11
|
+
import { Badge, Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, toast, } from "@flowselections/core";
|
|
12
|
+
import { ConfirmDialog } from "./ConfirmDialog.js";
|
|
13
|
+
import { listCartLayers, moveCartLayerPosition, swapCartLayerPositions, } from "../../lib/cart-layers.functions.js";
|
|
13
14
|
// Zachte vulkleur per product uit de designtokens (geen hardgecodeerde kleuren).
|
|
14
15
|
const FILLS = [
|
|
15
16
|
"bg-primary/15 border-primary/50",
|
|
@@ -93,9 +94,18 @@ export function CartLayersDialog({ cartId, cartNumber, open, onOpenChange }) {
|
|
|
93
94
|
const moveFn = useServerFn(moveCartLayerPosition);
|
|
94
95
|
const queryClient = useQueryClient();
|
|
95
96
|
const [selected, setSelected] = useState(null);
|
|
97
|
+
// "Past niet" (te hoog / te zwaar / te veel per laag): één bevestiging met de reden.
|
|
98
|
+
const [pastNiet, setPastNiet] = useState(null);
|
|
99
|
+
const naWijziging = async (melding) => {
|
|
100
|
+
// Reden van de Engine bij vastleggen letterlijk tonen.
|
|
101
|
+
if (melding)
|
|
102
|
+
toast.error(melding);
|
|
103
|
+
await queryClient.invalidateQueries({ queryKey: ["cart-layers", cartId] });
|
|
104
|
+
void queryClient.invalidateQueries({ queryKey: ["kar-tekening"] });
|
|
105
|
+
};
|
|
96
106
|
const swap = useMutation({
|
|
97
107
|
mutationFn: async (vars) => {
|
|
98
|
-
const result = await swapFn({ data: vars });
|
|
108
|
+
const result = await swapFn({ data: { ...vars, cartId: cartId ?? undefined } });
|
|
99
109
|
if (!result.ok)
|
|
100
110
|
return result;
|
|
101
111
|
return result;
|
|
@@ -103,10 +113,13 @@ export function CartLayersDialog({ cartId, cartNumber, open, onOpenChange }) {
|
|
|
103
113
|
onSuccess: async (result) => {
|
|
104
114
|
setSelected(null);
|
|
105
115
|
if (!result.ok) {
|
|
106
|
-
|
|
116
|
+
if (result.pastNiet)
|
|
117
|
+
setPastNiet(result.pastNiet);
|
|
118
|
+
else
|
|
119
|
+
toast.error(result.error);
|
|
107
120
|
return;
|
|
108
121
|
}
|
|
109
|
-
await
|
|
122
|
+
await naWijziging(result.melding);
|
|
110
123
|
toast.success("Fusten gewisseld");
|
|
111
124
|
},
|
|
112
125
|
onError: (e) => {
|
|
@@ -114,27 +127,18 @@ export function CartLayersDialog({ cartId, cartNumber, open, onOpenChange }) {
|
|
|
114
127
|
toast.error(e.message);
|
|
115
128
|
},
|
|
116
129
|
});
|
|
117
|
-
const resetFn = useServerFn(resetCartLayerPositions);
|
|
118
|
-
const reset = useMutation({
|
|
119
|
-
mutationFn: async () => resetFn({ data: { cartId: cartId } }),
|
|
120
|
-
onSuccess: async (res) => {
|
|
121
|
-
setSelected(null);
|
|
122
|
-
await queryClient.invalidateQueries({ queryKey: ["cart-layers", cartId] });
|
|
123
|
-
toast.success(res.restored > 0
|
|
124
|
-
? `${res.restored} fust(en) teruggezet naar de indeling van de Engine`
|
|
125
|
-
: "Er waren geen handmatige aanpassingen");
|
|
126
|
-
},
|
|
127
|
-
onError: (e) => toast.error(e.message),
|
|
128
|
-
});
|
|
129
130
|
const move = useMutation({
|
|
130
|
-
mutationFn: async (vars) => moveFn({ data: vars }),
|
|
131
|
+
mutationFn: async (vars) => moveFn({ data: { ...vars, cartId: cartId ?? undefined } }),
|
|
131
132
|
onSuccess: async (result) => {
|
|
132
133
|
setSelected(null);
|
|
133
134
|
if (!result.ok) {
|
|
134
|
-
|
|
135
|
+
if (result.pastNiet)
|
|
136
|
+
setPastNiet(result.pastNiet);
|
|
137
|
+
else
|
|
138
|
+
toast.error(result.error);
|
|
135
139
|
return;
|
|
136
140
|
}
|
|
137
|
-
await
|
|
141
|
+
await naWijziging(result.melding);
|
|
138
142
|
},
|
|
139
143
|
onError: (e) => toast.error(e.message),
|
|
140
144
|
});
|
|
@@ -165,13 +169,14 @@ export function CartLayersDialog({ cartId, cartNumber, open, onOpenChange }) {
|
|
|
165
169
|
});
|
|
166
170
|
const layers = data?.layers ?? [];
|
|
167
171
|
const palette = new Map();
|
|
168
|
-
return (
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
172
|
+
return (_jsxs(_Fragment, { children: [_jsx(ConfirmDialog, { open: !!pastNiet, onOpenChange: (v) => { if (!v)
|
|
173
|
+
setPastNiet(null); }, title: "Dit past niet", description: pastNiet ?? undefined, confirmLabel: "Begrepen", cancelLabel: "Sluiten", onConfirm: () => setPastNiet(null) }), _jsx(Dialog, { open: open, onOpenChange: onOpenChange, children: _jsxs(DialogContent, { className: "flex max-h-[90vh] w-[95vw] max-w-7xl flex-col overflow-hidden", children: [_jsxs(DialogHeader, { children: [_jsxs(DialogTitle, { children: ["Laagindeling ", cartNumber != null ? `· Kar ${cartNumber}` : ""] }), _jsx(DialogDescription, { children: "De indeling komt van de Logistiek Engine. Klik twee fusten aan om ze van plek te wisselen, of sleep een fust naar een lege plek of naar een ander fust. Handmatige plekken blijven staan bij herplannen (stippellijn)." })] }), _jsx("div", { className: "flex-1 overflow-y-auto pr-1", children: isLoading ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "Laagindeling laden\u2026" })) : error ? (_jsx("p", { className: "text-sm text-destructive", children: error.message })) : layers.length === 0 ? (_jsx("div", { className: "space-y-1", children: (data?.missing ?? []).length > 0 ? ((data?.missing ?? []).map((m, i) => (_jsxs("p", { className: "text-sm text-muted-foreground", children: [m.productName ? `${m.productName}: ` : "", m.reason] }, i)))) : (_jsx("p", { className: "text-sm text-muted-foreground", children: "De Logistiek Engine heeft voor deze kar nog geen laagindeling aangeleverd." })) })) : (_jsxs("div", { className: "space-y-4 pb-2", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsxs(Badge, { variant: "secondary", children: [layers.length, " laag/lagen"] }), selected && (_jsxs(Badge, { variant: "secondary", children: ["Geselecteerd: ", selected.productName ?? selected.label ?? selected.kegId, " \u2014 kies een tweede fust"] })), (swap.isPending || move.isPending) && (_jsx(Badge, { variant: "outline", children: "Opslaan\u2026" })), data?.source && (_jsxs(Badge, { variant: "outline", className: "font-mono text-[10px]", children: [data.source, data.algorithmVersion ? ` · v${data.algorithmVersion}` : ""] }))] }), selected && (_jsxs("div", { className: "flex flex-wrap items-center gap-x-3 gap-y-1 rounded-md border border-border bg-muted/30 px-3 py-2 text-sm", children: [_jsx("span", { className: "font-medium", children: selected.productName ?? selected.label ?? "Onbekend artikel" }), _jsxs("span", { className: "text-muted-foreground", children: ["Fust ", selected.kegId] }), selected.fustName && (_jsx("span", { className: "text-muted-foreground", children: selected.fustName })), _jsx("span", { className: "font-mono text-xs text-muted-foreground", children: selected.fustLengthMm != null && selected.fustWidthMm != null
|
|
174
|
+
? `l ${selected.fustLengthMm} × b ${selected.fustWidthMm} mm`
|
|
175
|
+
: `l ${selected.height} × b ${selected.width} mm` }), _jsx("span", { className: "font-mono text-xs text-muted-foreground", children: selected.plantHeightCm != null
|
|
176
|
+
? `planthoogte ${Math.round(Number(selected.plantHeightCm) * 10)} mm (${selected.plantHeightCm} cm)`
|
|
177
|
+
: "planthoogte onbekend" }), selected.plantHeightCm != null && selected.heightSource && (_jsx("span", { className: "text-xs text-muted-foreground", children: selected.heightSource === "handmatig"
|
|
178
|
+
? "handmatig ingevuld"
|
|
179
|
+
: selected.heightSource === "floriday"
|
|
180
|
+
? "uit Floriday"
|
|
181
|
+
: "berekend uit de ladingdrager (fust + ruimte erboven)" }))] })), _jsx("div", { className: "grid grid-cols-2 gap-3 sm:grid-cols-3 lg:grid-cols-5", children: layers.map((l) => (_jsx(LayerCanvas, { layer: l, palette: palette, selectedId: selected?.id ?? null, onSelect: handleSelect, onDrop: (id, lyr, x, y) => move.mutate({ id, layer: lyr, x, y }), onSwap: (aId, bId) => swap.mutate({ aId, bId }), busy: swap.isPending || move.isPending }, l.layer))) })] })) })] }) })] }));
|
|
177
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AA0GA,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AA0GA,wBAAgB,eAAe,gCAu1C9B"}
|
|
@@ -11,7 +11,7 @@ import { Button, Input, Label, Textarea, toast, Dialog, DialogContent, DialogDes
|
|
|
11
11
|
import { Link, useBlocker, useNavigate } from "@tanstack/react-router";
|
|
12
12
|
import { keepPreviousData, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
13
13
|
import { useDebouncedValue } from "../../lib/use-debounced-value.js";
|
|
14
|
-
import { korteMelding
|
|
14
|
+
import { korteMelding } from "../../lib/korte-melding.js";
|
|
15
15
|
import { AlertTriangle, ArrowLeft, CheckCircle2, ChevronUp, Loader2, Plus, Trash2 } from "lucide-react";
|
|
16
16
|
import { isOwnTransportKind, ownPickupLabel, vervoerSoort, vervoerderKeuzes, vertrekControle, vervoerFout, datumLabel, klantHaaltOpTekst, AFLEVER_NIET_NODIG, OPHAALTIJD_ONTBREEKT, EIGEN_VERVOER_WERKWIJZE } from "../../lib/own-transport.js";
|
|
17
17
|
import { missingItems, lineTotal, dateWithWeekday, eur, attentionItems, selectionKey, resetOnSelectionChange, applyFirstFeasible, prijsSleutel, PRIJS_FOUT_TEXT, PRIJS_ONBEKEND_TEXT, bekendePrijs, regelMistPrijs, groepLeden, groepZonderLedenTekst } from "../../lib/create-order-form.js";
|
|
@@ -211,18 +211,11 @@ export function CreateOrderPage() {
|
|
|
211
211
|
const withSticker = new Set(customerId ? (stickerQ.data?.productIds ?? []) : []);
|
|
212
212
|
if (customerId && stickerQ.isFetching)
|
|
213
213
|
return;
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
if (!!l.needs_sticker === want)
|
|
220
|
-
return l;
|
|
221
|
-
changed = true;
|
|
222
|
-
return { ...l, needs_sticker: want };
|
|
223
|
-
});
|
|
224
|
-
if (changed)
|
|
225
|
-
setLines(next);
|
|
214
|
+
// Altijd op de nieuwste regels werken: een verouderde kopie wiste eerder een
|
|
215
|
+
// net binnengekomen automatische prijs (bijv. bij "Klant haalt zelf op").
|
|
216
|
+
const want = (l) => !!l.product_id && l.sticker_manual_for !== l.product_id && !!l.needs_sticker !== withSticker.has(l.product_id);
|
|
217
|
+
if (lines.some(want))
|
|
218
|
+
setLines((cur) => cur.map((l) => (want(l) ? { ...l, needs_sticker: withSticker.has(l.product_id) } : l)));
|
|
226
219
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
227
220
|
}, [customerId, stickerQ.data, stickerQ.isFetching, lines]);
|
|
228
221
|
// Beladingen die daadwerkelijk bij de gekozen producten horen.
|
|
@@ -288,31 +281,32 @@ export function CreateOrderPage() {
|
|
|
288
281
|
useEffect(() => {
|
|
289
282
|
if (!beladingQ.data)
|
|
290
283
|
return;
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
if (!
|
|
284
|
+
setLines((cur) => {
|
|
285
|
+
let changed = false;
|
|
286
|
+
const next = cur.map((l) => {
|
|
287
|
+
if (!l.product_id)
|
|
288
|
+
return l;
|
|
289
|
+
const opts = beladingByProduct[l.product_id];
|
|
290
|
+
if (!opts || opts.length === 0) {
|
|
291
|
+
if (!l.belading)
|
|
292
|
+
return l;
|
|
293
|
+
changed = true;
|
|
294
|
+
return { ...l, belading: null };
|
|
295
|
+
}
|
|
296
|
+
const cur = l.belading ? beladingKey(l.belading) : null;
|
|
297
|
+
if (cur && opts.some((o) => beladingKey(o) === cur))
|
|
298
298
|
return l;
|
|
299
|
+
const def = opts.find((o) => o.is_default) ?? opts[0];
|
|
299
300
|
changed = true;
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
return {
|
|
309
|
-
...l,
|
|
310
|
-
belading: { plants_per_crate: def.plants_per_crate, crates_per_layer: def.crates_per_layer, layers_per_cart: def.layers_per_cart, crate_code: def.crate_code ?? null, cart_code: def.cart_code ?? null, is_default: true },
|
|
311
|
-
quantity: crates * def.plants_per_crate,
|
|
312
|
-
};
|
|
301
|
+
const crates = Math.max(1, Math.ceil(Number(l.quantity ?? 0) / Math.max(1, l.belading?.plants_per_crate ?? def.plants_per_crate)));
|
|
302
|
+
return {
|
|
303
|
+
...l,
|
|
304
|
+
belading: { plants_per_crate: def.plants_per_crate, crates_per_layer: def.crates_per_layer, layers_per_cart: def.layers_per_cart, crate_code: def.crate_code ?? null, cart_code: def.cart_code ?? null, is_default: true },
|
|
305
|
+
quantity: crates * def.plants_per_crate,
|
|
306
|
+
};
|
|
307
|
+
});
|
|
308
|
+
return changed ? next : cur;
|
|
313
309
|
});
|
|
314
|
-
if (changed)
|
|
315
|
-
setLines(next);
|
|
316
310
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
317
311
|
}, [beladingQ.data]);
|
|
318
312
|
// Afleverlocaties van gekozen klant
|
|
@@ -542,16 +536,8 @@ export function CreateOrderPage() {
|
|
|
542
536
|
throw new Error(`Vul bij regel ${lines.indexOf(l) + 1} een aantal in per hele fust, dus een veelvoud van ${ppc}.`);
|
|
543
537
|
}
|
|
544
538
|
}
|
|
545
|
-
// Verse voorraadcontrole
|
|
546
|
-
|
|
547
|
-
data: {
|
|
548
|
-
lines: validLines.map((l) => ({ productId: l.product_id, quantity: Number(l.quantity) })),
|
|
549
|
-
},
|
|
550
|
-
});
|
|
551
|
-
if (check.allowed === false) {
|
|
552
|
-
console.error("[voorraadcontrole]", check.shortages);
|
|
553
|
-
throw new Error(tekortMelding(check.shortages));
|
|
554
|
-
}
|
|
539
|
+
// Verse voorraadcontrole gebeurt bij het opslaan zelf op de server (createManualOrder,
|
|
540
|
+
// zelfde tekst via tekortMelding); een aparte controle vooraf kostte een extra ronde.
|
|
555
541
|
const customer = customers.find((c) => c.id === customerId);
|
|
556
542
|
if (!idempotencyKeyRef.current)
|
|
557
543
|
idempotencyKeyRef.current = crypto.randomUUID();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AAuDA,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC,sCAgnBA"}
|
|
@@ -11,6 +11,9 @@ import { checkEditOrderStock } from "../../lib/logistics-stock.functions.js";
|
|
|
11
11
|
import { bewerkTekortMelding, regelPerSleutel } from "../../lib/bewerk-voorraad.js";
|
|
12
12
|
import { SearchableSelect } from "./SearchableSelect.js";
|
|
13
13
|
import { datumLabel } from "../../lib/own-transport.js";
|
|
14
|
+
import { getKarTekening } from "../../lib/kar-tekening.functions.js";
|
|
15
|
+
import { EXTRA_KAR_MELDING } from "../../lib/kar-handmatig.js";
|
|
16
|
+
import { KarSlotMelding } from "./KarSlotMelding.js";
|
|
14
17
|
/** Positief geheel getal of null — ontbrekende belading blijft onbekend. */
|
|
15
18
|
const pos = (v) => {
|
|
16
19
|
const n = Number(v);
|
|
@@ -32,6 +35,15 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
32
35
|
const [shippedLock, setShippedLock] = useState(null);
|
|
33
36
|
const [removedIds, setRemovedIds] = useState([]);
|
|
34
37
|
const [newItems, setNewItems] = useState([]);
|
|
38
|
+
// Handmatig aangepaste kar (slot) uit de tekening van de Engine; oudere Engine → geen slot.
|
|
39
|
+
const tekeningFn = useServerFn(getKarTekening);
|
|
40
|
+
const slotQ = useQuery({
|
|
41
|
+
queryKey: ["kar-tekening", orderId, "bewerken"],
|
|
42
|
+
enabled: open && !!orderId,
|
|
43
|
+
staleTime: 15000,
|
|
44
|
+
queryFn: () => tekeningFn({ data: { orderId } }),
|
|
45
|
+
});
|
|
46
|
+
const slotDragers = slotQ.data && slotQ.data.beschikbaar && slotQ.data.ok ? slotQ.data.tekening.dragers.filter((d) => !!d.handmatig_at) : [];
|
|
35
47
|
useEffect(() => {
|
|
36
48
|
if (!open)
|
|
37
49
|
return;
|
|
@@ -289,7 +301,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
289
301
|
setSaving(false);
|
|
290
302
|
}
|
|
291
303
|
};
|
|
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) => {
|
|
304
|
+
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: [slotDragers.length > 0 && (_jsxs("div", { className: "mb-4 space-y-2", children: [_jsx(KarSlotMelding, { slot: slotDragers[0], orderId: orderId }), _jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: EXTRA_KAR_MELDING })] })), 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) => {
|
|
293
305
|
const ppc = it.plantsPerCrate;
|
|
294
306
|
const fusten = ppc !== null ? Math.ceil(it.quantity / ppc) : 0;
|
|
295
307
|
const removed = removedIds.includes(it.id);
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type KarSlot } from "../../lib/kar-handmatig.js";
|
|
2
|
+
export declare function KarSlotMelding({ slot, orderId, compact }: {
|
|
3
|
+
slot: KarSlot;
|
|
4
|
+
orderId: string | null;
|
|
5
|
+
compact?: boolean;
|
|
6
|
+
}): import("react").JSX.Element | null;
|
|
7
|
+
//# sourceMappingURL=KarSlotMelding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KarSlotMelding.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarSlotMelding.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGlE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAe,EAAE,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sCA2B9H"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
// "Aangepast door … op …" met de knop "Terug naar automatisch". Het slot en de
|
|
3
|
+
// kargroep komen uit logistics_kar_tekening; terugzetten doet de Engine.
|
|
4
|
+
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
|
5
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
6
|
+
import { Button, formatDatumTijd, toast } from "@flowselections/core";
|
|
7
|
+
import { Lock } from "lucide-react";
|
|
8
|
+
import { karTerugAutomatisch } from "../../lib/cart-layers.functions.js";
|
|
9
|
+
import { slotLabel } from "../../lib/kar-handmatig.js";
|
|
10
|
+
import { markIndelingBezig } from "../../lib/indeling-bezig.js";
|
|
11
|
+
export function KarSlotMelding({ slot, orderId, compact = false }) {
|
|
12
|
+
const qc = useQueryClient();
|
|
13
|
+
const terugFn = useServerFn(karTerugAutomatisch);
|
|
14
|
+
const label = slotLabel(slot, (iso) => formatDatumTijd(iso));
|
|
15
|
+
const terug = useMutation({
|
|
16
|
+
mutationFn: () => terugFn({ data: { kargroep: slot.kargroep } }),
|
|
17
|
+
onSuccess: (r) => {
|
|
18
|
+
if (!r.ok) {
|
|
19
|
+
toast.error(r.reden);
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
toast.success("De kar volgt weer de automatische indeling.");
|
|
23
|
+
markIndelingBezig(qc, orderId);
|
|
24
|
+
void qc.invalidateQueries({ queryKey: ["kar-tekening"] });
|
|
25
|
+
void qc.invalidateQueries({ queryKey: ["karindeling-stand"] });
|
|
26
|
+
},
|
|
27
|
+
onError: (e) => { console.error("[kar-slot] terug naar automatisch:", e); toast.error("Terugzetten is niet gelukt. Probeer het opnieuw of neem contact op met de beheerder."); },
|
|
28
|
+
});
|
|
29
|
+
if (!label)
|
|
30
|
+
return null;
|
|
31
|
+
return (_jsxs("div", { className: `flex flex-wrap items-center gap-2 rounded-lg border border-border bg-muted/40 px-3 ${compact ? "py-1.5" : "py-2"} text-xs text-foreground`, children: [_jsx(Lock, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground", "aria-hidden": true }), _jsx("span", { className: "min-w-0 flex-1", children: label }), slot.kargroep && (_jsx(Button, { size: "sm", variant: "outline", className: "h-8", disabled: terug.isPending, onClick: () => terug.mutate(), children: terug.isPending ? "Terugzetten…" : "Terug naar automatisch" }))] }));
|
|
32
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KarTekeningSection.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarTekeningSection.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"KarTekeningSection.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarTekeningSection.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAgJ,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAOnO,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"}
|
|
@@ -7,12 +7,16 @@ import { useEffect, useState } from "react";
|
|
|
7
7
|
import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
8
8
|
import { useServerFn } from "@tanstack/react-start";
|
|
9
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";
|
|
10
|
+
import { AlertTriangle, Info, Loader2, PencilRuler } from "lucide-react";
|
|
11
|
+
import { useRouter } from "@tanstack/react-router";
|
|
12
|
+
import { karBewerkenPad, karBewerkenStand } from "../../lib/engine-tijdlijn.js";
|
|
11
13
|
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";
|
|
14
|
+
import { dragerTitel, dragersKop, gedeeldTekst, markeringTekst, lagenTekst, langBezig, POLL_MS, regelBeladingTekst, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
13
15
|
import { bezigKey } from "../../lib/indeling-bezig.js";
|
|
14
16
|
import { korteMelding } from "../../lib/korte-melding.js";
|
|
15
17
|
import { SafeSvg } from "./SafeSvg.js";
|
|
18
|
+
import { KarSlotMelding } from "./KarSlotMelding.js";
|
|
19
|
+
import { karKop } from "../../lib/kar-handmatig.js";
|
|
16
20
|
export function KarindelingSkeleton() {
|
|
17
21
|
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
22
|
}
|
|
@@ -92,7 +96,7 @@ export function useKarTekening(orderId, opts) {
|
|
|
92
96
|
}
|
|
93
97
|
else if (shown === "bezig") {
|
|
94
98
|
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 })] }))] }));
|
|
99
|
+
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, orderId: orderId, orderDbId: null, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager })] }))] }));
|
|
96
100
|
}
|
|
97
101
|
else if (tekeningQ.isPending || !tekeningQ.data) {
|
|
98
102
|
node = _jsx(KarindelingSkeleton, {});
|
|
@@ -104,23 +108,45 @@ export function useKarTekening(orderId, opts) {
|
|
|
104
108
|
node = _jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen artikelen, dus nog geen indeling." });
|
|
105
109
|
}
|
|
106
110
|
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 }) });
|
|
111
|
+
node = _jsx("div", { className: "animate-in fade-in duration-300", children: _jsx(TekeningInhoud, { tek: tek, orderId: orderId, orderDbId: dbId, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager }) });
|
|
108
112
|
}
|
|
109
113
|
return { beschikbaar: true, kop, node };
|
|
110
114
|
}
|
|
111
115
|
function Melding({ tekst }) {
|
|
112
116
|
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
117
|
}
|
|
114
|
-
|
|
118
|
+
/**
|
|
119
|
+
* Knop "Indeling aanpassen" naar het Engine-scherm Kar bewerken (?order=<orders.id>).
|
|
120
|
+
* Alleen als logistics_kar_bewerkbaar (via de tekening) minstens één drager
|
|
121
|
+
* toestaat; anders de reden. Bestaat de route niet in de shell: niets.
|
|
122
|
+
*/
|
|
123
|
+
function IndelingAanpassen({ tek, orderDbId }) {
|
|
124
|
+
const router = useRouter();
|
|
125
|
+
const pad = karBewerkenPad(router, orderDbId);
|
|
126
|
+
const stand = karBewerkenStand(tek.dragers.map((d) => ({ bewerkbaar: d.bewerkbaar, niet_bewerkbaar_reden: d.niet_bewerkbaar_reden, titel: dragerTitel(d) })));
|
|
127
|
+
if (!pad || stand.soort === "onbekend")
|
|
128
|
+
return null;
|
|
129
|
+
if (stand.soort === "kan") {
|
|
130
|
+
return (_jsx("div", { className: "flex justify-end", children: _jsx(Button, { asChild: true, variant: "outline", size: "sm", className: "h-8", children: _jsxs("a", { href: pad, onClick: (e) => {
|
|
131
|
+
if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0)
|
|
132
|
+
return;
|
|
133
|
+
e.preventDefault();
|
|
134
|
+
router.history.push(pad);
|
|
135
|
+
}, children: [_jsx(PencilRuler, { className: "mr-2 h-4 w-4" }), " Indeling aanpassen"] }) }) }));
|
|
136
|
+
}
|
|
137
|
+
return (_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: [_jsx(Info, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), _jsxs("div", { className: "min-w-0", children: [_jsx("span", { className: "font-medium text-foreground", children: "Indeling aanpassen kan nu niet." }), " ", stand.redenen.length === 1 ? stand.redenen[0] : (_jsx("ul", { className: "mt-0.5 space-y-0.5", children: stand.redenen.map((r, i) => _jsx("li", { children: r }, i)) }))] })] }));
|
|
138
|
+
}
|
|
139
|
+
function TekeningInhoud({ tek, orderId, orderDbId, floriday, onLagen, regels }) {
|
|
115
140
|
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)
|
|
141
|
+
return (_jsxs("div", { className: "space-y-3", children: [tek.meldingen.length > 0 && (_jsx("ul", { className: "space-y-1 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-foreground", children: tek.meldingen.map((m, i) => (_jsxs("li", { className: "flex items-start gap-1.5", children: [_jsx(Info, { className: "mt-0.5 h-3 w-3 shrink-0 text-muted-foreground", "aria-hidden": true }), m] }, i))) })), _jsx(IndelingAanpassen, { tek: tek, orderDbId: orderDbId }), _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, orderId: orderId, regels: regels?.get(d.id) ?? [], floriday: floriday, onGroot: () => setGroot(d), onLagen: onLagen }, d.id)) }), _jsx(Dialog, { open: !!groot, onOpenChange: (v) => { if (!v)
|
|
117
142
|
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
143
|
}
|
|
119
|
-
function DragerKaart({ d, regels, floriday, onGroot, onLagen }) {
|
|
144
|
+
function DragerKaart({ d, orderId, regels, floriday, onGroot, onLagen }) {
|
|
120
145
|
const pct = d.vulgraad_pct != null ? Math.max(0, Math.min(100, Math.round(d.vulgraad_pct))) : null;
|
|
121
146
|
const status = statusLabel(d.status);
|
|
122
147
|
const dozen = toonDozen(regels);
|
|
123
148
|
const gedeeld = gedeeldTekst(d.gedeeld_met);
|
|
124
149
|
const lagen = lagenTekst(d.lagen_gebruikt, d.lagen_max);
|
|
125
|
-
|
|
150
|
+
const rood = markeringTekst(d);
|
|
151
|
+
return (_jsxs("div", { className: `min-w-0 space-y-2 rounded-xl border bg-card p-3 shadow-sm ${rood ? "border-destructive" : "border-border"}`, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("span", { className: "font-medium text-foreground", children: dragerTitel(d) }), rood && _jsxs(Badge, { variant: "destructive", className: "rounded-full", children: [_jsx(AlertTriangle, { className: "mr-1 h-3 w-3", "aria-hidden": true }), rood] }), 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 })] }), (d.nummer != null || d.letters.length > 0) && (_jsx("div", { className: "text-xs tabular-nums text-muted-foreground", children: karKop({ nummer: d.nummer, vulgraad_pct: d.vulgraad_pct, letters: d.letters, naam: d.naam }) })), _jsx(KarSlotMelding, { slot: d, orderId: orderId, compact: true }), 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: regelBeladingTekst(a, d) })] }, a.key))) })] }) })), onLagen && d.soort === "layered" && (_jsx(Button, { variant: "outline", size: "sm", className: "h-8", onClick: () => onLagen(d), children: "Lagen bekijken" }))] }));
|
|
126
152
|
}
|
|
@@ -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;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,+
|
|
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,+BAsXA;AAGD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAaxD"}
|
|
@@ -21,8 +21,8 @@ import { CartLayersDialog } from "./CartLayersDialog.js";
|
|
|
21
21
|
import { PlanCoverageBadge } from "./PlanCoverageBadge.js";
|
|
22
22
|
import { isProefindeling } from "../../lib/floriday-actual-carriers.js";
|
|
23
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";
|
|
24
|
+
import { karRegelsPerDrager, pickTekst, regelsZonderBelading, toonDozen } from "../../lib/kar-tekening.js";
|
|
25
|
+
import { listOrderItemBelading, listOrderItemPacking } from "../../lib/order-item-packing.functions.js";
|
|
26
26
|
export const PROEF_TITEL = "Proefindeling – afgehandeld in Floriday";
|
|
27
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;
|
|
28
28
|
const PICK_LABEL = {
|
|
@@ -128,7 +128,22 @@ export function OrderKarindelingCard({ order, pickProgress, }) {
|
|
|
128
128
|
});
|
|
129
129
|
if (packingQ.isError)
|
|
130
130
|
console.error("[karindeling] belading orderregels:", packingQ.error);
|
|
131
|
-
|
|
131
|
+
// Regels op de kar die niet (volledig) uit de eigen orderregels komen (gedeelde kar,
|
|
132
|
+
// onvolledige snapshot): belading uit de orderregel zelf of de Engine-uitleg.
|
|
133
|
+
const packingKlaar = packingQ.isSuccess || packingQ.isError;
|
|
134
|
+
const zonderBelading = packingKlaar ? regelsZonderBelading(carts, packingQ.data?.items ?? []) : [];
|
|
135
|
+
const fetchBelading = useServerFn(listOrderItemBelading);
|
|
136
|
+
const extraQ = useQuery({
|
|
137
|
+
queryKey: ["kar-regel-belading", zonderBelading.join(",")],
|
|
138
|
+
enabled: !proef && zonderBelading.length > 0,
|
|
139
|
+
staleTime: 60000,
|
|
140
|
+
queryFn: () => fetchBelading({ data: { orderItemIds: zonderBelading.slice(0, 100) } }),
|
|
141
|
+
});
|
|
142
|
+
if (extraQ.isError)
|
|
143
|
+
console.error("[karindeling] belading aanvullen:", extraQ.error);
|
|
144
|
+
const extraBelading = new Map(Object.entries(extraQ.data?.items ?? {}));
|
|
145
|
+
const beladingLaden = !proef && (packingQ.isPending || (zonderBelading.length > 0 && extraQ.isPending));
|
|
146
|
+
const regelsPerDrager = karRegelsPerDrager(carts, packingQ.data?.items ?? [], resolveProductName, extraBelading, beladingLaden);
|
|
132
147
|
const kt = useKarTekening(proef ? null : orderId, {
|
|
133
148
|
floriday: isFloriday,
|
|
134
149
|
onLagen: (d) => setLayersFor({ id: d.id, number: d.nummer ?? 0 }),
|
|
@@ -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":"AA8PA,wBAAgB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,sCA4CpE"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { fmtNLDefault } from "../../lib/nl-datetime.js";
|
|
3
3
|
import { formatBelading } from "../../lib/belading-format.js";
|
|
4
|
+
import { artikelPad, bronTekst, nogNodig, verpakkingRegel } from "../../lib/kar-handmatig.js";
|
|
5
|
+
import { useRouter } from "@tanstack/react-router";
|
|
4
6
|
// Belading per bestelregel: zichtbaar maken en handmatig vastzetten/losmaken.
|
|
5
7
|
//
|
|
6
8
|
// Vastzetten beschermt de regel tegen overschrijven door de volgende
|
|
@@ -21,6 +23,9 @@ function fmtWhen(iso) {
|
|
|
21
23
|
}
|
|
22
24
|
function LineRow({ item, onChanged, orderId, }) {
|
|
23
25
|
const setEngineMelding = useSetEngineMelding(orderId);
|
|
26
|
+
const router = useRouter();
|
|
27
|
+
// Link naar "Artikel bewerken" in Voorraad; geen route in de shell → geen link.
|
|
28
|
+
const artikelLink = artikelPad(router, item.productId);
|
|
24
29
|
// Melding van de Engine (bv. karren al geprint) blijft zichtbaar bij de regel.
|
|
25
30
|
const [melding, setMelding] = useState(null);
|
|
26
31
|
const noteMelding = (m) => {
|
|
@@ -88,10 +93,14 @@ function LineRow({ item, onChanged, orderId, }) {
|
|
|
88
93
|
},
|
|
89
94
|
onError: (e) => toast.error(e?.message ?? "Losmaken mislukt"),
|
|
90
95
|
});
|
|
96
|
+
const verp = { perFust: item.plantsPerCrate, fustenPerLaag: item.cratesPerLayer, lagenPerKar: item.layersPerCart };
|
|
91
97
|
const known = item.plantsPerCrate != null && item.cratesPerLayer != null && item.layersPerCart != null;
|
|
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:
|
|
93
|
-
|
|
94
|
-
|
|
98
|
+
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: verpakkingRegel(verp, bronTekst(item.packingSource, !!item.lockedAt)) ?? "Verpakking onbekend" }), nogNodig(verp) && (_jsxs("div", { className: "text-xs text-destructive", children: [nogNodig(verp), " \u2014 vul dit aan bij", " ", artikelLink ? (_jsx("a", { href: artikelLink, className: "underline underline-offset-2", onClick: (e) => {
|
|
99
|
+
if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0)
|
|
100
|
+
return;
|
|
101
|
+
e.preventDefault();
|
|
102
|
+
router.history.push(artikelLink);
|
|
103
|
+
}, children: "het artikel" })) : ("het artikel"), " ", "of zet de belading hieronder vast."] }))] }), 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
104
|
? formatBelading({ perFust: item.plantsPerCrate, fustenPerLaag: item.cratesPerLayer, lagenPerKar: item.layersPerCart })
|
|
96
105
|
: "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
|
|
97
106
|
? preview.tekst ?? "De Engine gaf geen toelichting."
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrderDetailPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailPage.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SalesOrderDetailPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailPage.tsx"],"names":[],"mappings":"AAuIA,wBAAgB,oBAAoB,gCAwWnC"}
|
|
@@ -37,6 +37,7 @@ import { PickupDeliveryLine, useOrderTransport } from "./OrderTransportCard.js";
|
|
|
37
37
|
import { groepZonderGeannuleerd, kanLidAnnuleren } from "../../lib/order-cancel-view.js";
|
|
38
38
|
import { geannuleerdMelding } from "../../lib/order-terugdraaien.js";
|
|
39
39
|
import { cancelLocalOrder } from "../../lib/create-order.functions.js";
|
|
40
|
+
import { useOrderDetailPrefetch } from "../../lib/useOrderDetailPrefetch.js";
|
|
40
41
|
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, toast } from "@flowselections/core";
|
|
41
42
|
import { Loader2 } from "lucide-react";
|
|
42
43
|
const eur = new Intl.NumberFormat("nl-NL", { style: "currency", currency: "EUR", minimumFractionDigits: 2, maximumFractionDigits: 2 });
|
|
@@ -103,6 +104,8 @@ export function SalesOrderDetailPage() {
|
|
|
103
104
|
const isLocal = salesOrderId.startsWith("local:");
|
|
104
105
|
const isMailboxProposal = salesOrderId.startsWith("mailbox-proposal:");
|
|
105
106
|
const isFloriday = !isLocal && !isMailboxProposal;
|
|
107
|
+
// Kaartgegevens tegelijk met de order ophalen (geen tweede wachtronde).
|
|
108
|
+
useOrderDetailPrefetch(salesOrderId, { reservation: cached.row?.isReservation ?? null });
|
|
106
109
|
// Floriday-orders: gerichte, snelle per-order fetch.
|
|
107
110
|
const detailQuery = useSalesOrderDetailQuery(isFloriday ? salesOrderId : null);
|
|
108
111
|
// Lokale orders: eveneens gericht ophalen, onafhankelijk van paginering en
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrderDetailView.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAmC,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGvH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesOrderDetailView.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAmC,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGvH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAkKnE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,KAAK,EAAE,aAAa,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,+BAkBA"}
|