@flowselections/floriday-verkoop-module 1.0.138 → 1.0.140
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/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +24 -22
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts +2 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.js +48 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +32 -5
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +12 -2
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +3 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.js +13 -51
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +17 -3
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +168 -116
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +203 -89
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts +9 -0
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/CustomerName.js +16 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts +15 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/HoverTip.js +24 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/KpiTile.js +8 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts +7 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.js +127 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/RowMenu.js +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.js +45 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts +2 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.js +2 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +2 -0
- package/dist-lib/integrations/supabase/types.d.ts +431 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.check.d.ts +2 -0
- package/dist-lib/lib/buffer-carts.check.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.check.js +23 -0
- package/dist-lib/lib/buffer-carts.d.ts +35 -0
- package/dist-lib/lib/buffer-carts.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts +12 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.js +18 -0
- package/dist-lib/lib/buffer-carts.js +41 -0
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +8 -1
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/motion.d.ts +13 -0
- package/dist-lib/lib/motion.d.ts.map +1 -0
- package/dist-lib/lib/motion.js +36 -0
- package/dist-lib/lib/order-price-lock.check.js +21 -5
- package/dist-lib/lib/order-price-lock.d.ts +14 -6
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.js +40 -8
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.server.js +10 -0
- package/dist-lib/lib/order-progress.check.d.ts +2 -0
- package/dist-lib/lib/order-progress.check.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.check.js +90 -0
- package/dist-lib/lib/order-progress.d.ts +154 -0
- package/dist-lib/lib/order-progress.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.js +171 -0
- package/dist-lib/lib/order-progress.server.d.ts +41 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.server.js +136 -0
- package/dist-lib/lib/order-status.js +2 -2
- package/dist-lib/lib/period-range.check.d.ts +2 -0
- package/dist-lib/lib/period-range.check.d.ts.map +1 -0
- package/dist-lib/lib/period-range.check.js +63 -0
- package/dist-lib/lib/period-range.d.ts +66 -0
- package/dist-lib/lib/period-range.d.ts.map +1 -0
- package/dist-lib/lib/period-range.js +213 -0
- package/dist-lib/lib/plan-coverage.d.ts +17 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +24 -0
- package/dist-lib/lib/reference-cache.check.d.ts +2 -0
- package/dist-lib/lib/reference-cache.check.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.check.js +31 -0
- package/dist-lib/lib/reference-cache.server.d.ts +17 -0
- package/dist-lib/lib/reference-cache.server.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.server.js +65 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +4 -2
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +5 -1
- package/dist-lib/lib/salesorders-list.server.d.ts +7 -2
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +228 -119
- package/dist-lib/lib/salesorders-mapping.d.ts +18 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +19 -58
- package/dist-lib/lib/session-error.check.d.ts +2 -0
- package/dist-lib/lib/session-error.check.d.ts.map +1 -0
- package/dist-lib/lib/session-error.check.js +17 -0
- package/dist-lib/lib/session-error.d.ts +2 -0
- package/dist-lib/lib/session-error.d.ts.map +1 -0
- package/dist-lib/lib/session-error.js +10 -0
- package/dist-lib/lib/useBufferCarts.d.ts +6 -0
- package/dist-lib/lib/useBufferCarts.d.ts.map +1 -0
- package/dist-lib/lib/useBufferCarts.js +15 -0
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +11 -2
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +75 -52
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AAgDA,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,
|
|
1
|
+
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AAgDA,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,sCA6mBA"}
|
|
@@ -24,6 +24,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
24
24
|
const [items, setItems] = useState([]);
|
|
25
25
|
const [canEditProducts, setCanEditProducts] = useState(true);
|
|
26
26
|
const [priceLock, setPriceLock] = useState(null);
|
|
27
|
+
const [shippedLock, setShippedLock] = useState(null);
|
|
27
28
|
const [removedIds, setRemovedIds] = useState([]);
|
|
28
29
|
const [newItems, setNewItems] = useState([]);
|
|
29
30
|
useEffect(() => {
|
|
@@ -42,6 +43,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
42
43
|
setIsReservation(!!r.isReservation);
|
|
43
44
|
setCanEditProducts(r.canEditProducts !== false);
|
|
44
45
|
setPriceLock(r.priceLock ?? null);
|
|
46
|
+
setShippedLock(r.shippedLock ?? null);
|
|
45
47
|
setItems(r.items.map((it) => ({
|
|
46
48
|
id: it.id,
|
|
47
49
|
productId: it.productId ?? null,
|
|
@@ -253,29 +255,29 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
253
255
|
setSaving(false);
|
|
254
256
|
}
|
|
255
257
|
};
|
|
256
|
-
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" }), _jsx("p", { className: "mt-1 text-sm text-muted-foreground", children: "Pas de leverdatum 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("div", { className: "space-y-4", children: [!isReservation && (_jsxs("div", { children: [_jsx("label", { className: "mb-1 block text-sm font-medium text-foreground", children: "Leverdatum" }), _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) => {
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
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" }), _jsx("p", { className: "mt-1 text-sm text-muted-foreground", children: "Pas de leverdatum 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: "Leverdatum" }), _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
|
+
const ppc = it.plantsPerCrate;
|
|
260
|
+
const fusten = ppc !== null ? Math.ceil(it.quantity / ppc) : 0;
|
|
261
|
+
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 && shortageByProduct.has(it.productId) && (_jsx("div", { className: `text-xs ${stockBlocked ? "text-destructive" : "text-amber-600"}`, children: (() => {
|
|
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)
|
|
266
|
+
? prev.filter((x) => x !== it.id)
|
|
267
|
+
: [...prev, it.id]), children: _jsx(Trash2, { className: "h-4 w-4" }) })) })] }, it.id));
|
|
268
|
+
}), 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) => {
|
|
269
|
+
const ppc = Math.max(1, n.plantsPerCrate);
|
|
270
|
+
const fusten = Math.ceil(n.quantity / ppc);
|
|
271
|
+
const setNewQty = (plants) => setNewItems((prev) => prev.map((p, i) => i === idx
|
|
272
|
+
? { ...p, quantity: Number.isFinite(plants) ? Math.max(0, plants) : 0 }
|
|
273
|
+
: 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"] }), shortageByProduct.has(n.productId) && (_jsx("div", { className: `text-xs ${stockBlocked ? "text-destructive" : "text-amber-600"}`, children: (() => {
|
|
275
|
+
const s = shortageByProduct.get(n.productId);
|
|
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
|
|
277
279
|
? "border-destructive/40 bg-destructive/5 text-destructive"
|
|
278
280
|
: "border-amber-500/40 bg-amber-500/5 text-amber-700"}`, children: [_jsx("div", { className: "font-medium", children: stockBlocked
|
|
279
281
|
? "Opslaan geblokkeerd — onvoldoende voorraad"
|
|
280
|
-
: "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 || stockBlocked || stockQ.isFetching, children: saving ? "Bezig…" : stockQ.isFetching ? "Voorraad controleren…" : "Opslaan" })] })] }) }));
|
|
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" })] })] }) }));
|
|
281
283
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FloridaySyncSettings.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/FloridaySyncSettings.tsx"],"names":[],"mappings":"AAkBA,wBAAgB,wBAAwB,uCAuDvC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
// Instellingenkaart "Floriday": handmatig de al binnengekomen Floriday-orders
|
|
3
|
+
// doorzetten naar de orderlijst. Alleen zichtbaar bij een actieve koppeling.
|
|
4
|
+
// De automatische ophaalronde en de realtime-verversing blijven gewoon lopen.
|
|
5
|
+
import { useState } from "react";
|
|
6
|
+
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
|
7
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
8
|
+
import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle, toast, } from "@flowselections/core";
|
|
9
|
+
import { RefreshCw } from "lucide-react";
|
|
10
|
+
import { getFloridaySyncHealth, runSalesOrdersSync } from "../../lib/salesorders.functions.js";
|
|
11
|
+
export function FloridaySyncSettingsCard() {
|
|
12
|
+
const fetchHealth = useServerFn(getFloridaySyncHealth);
|
|
13
|
+
const triggerSync = useServerFn(runSalesOrdersSync);
|
|
14
|
+
const qc = useQueryClient();
|
|
15
|
+
const [syncing, setSyncing] = useState(false);
|
|
16
|
+
const { data: health } = useQuery({
|
|
17
|
+
queryKey: ["floriday-sync-health"],
|
|
18
|
+
queryFn: () => fetchHealth(),
|
|
19
|
+
retry: 1,
|
|
20
|
+
});
|
|
21
|
+
if (!health?.connected)
|
|
22
|
+
return null;
|
|
23
|
+
async function handleSync() {
|
|
24
|
+
const withTimeout = (p, ms) => Promise.race([p, new Promise((resolve) => setTimeout(() => resolve(null), ms))]);
|
|
25
|
+
setSyncing(true);
|
|
26
|
+
try {
|
|
27
|
+
const res = await withTimeout(triggerSync(), 12000);
|
|
28
|
+
if (!res)
|
|
29
|
+
toast.info("Bijwerken loopt op de achtergrond door. Nieuwe orders verschijnen vanzelf.");
|
|
30
|
+
else if (!res.mirrorOk)
|
|
31
|
+
toast.error("Bijwerken van Floriday-orders is niet gelukt. Probeer het zo opnieuw.");
|
|
32
|
+
else
|
|
33
|
+
toast.success(res.mirrored > 0
|
|
34
|
+
? `${res.mirrored} Floriday-order(s) bijgewerkt. De karren worden automatisch verdeeld.`
|
|
35
|
+
: "Alle Floriday-orders zijn al bijgewerkt.");
|
|
36
|
+
await qc.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] });
|
|
37
|
+
await qc.invalidateQueries({ queryKey: ["floriday-sync-health"] });
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
toast.error("Floriday-orders bijwerken is niet gelukt. Probeer het zo opnieuw.");
|
|
41
|
+
}
|
|
42
|
+
finally {
|
|
43
|
+
setSyncing(false);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const last = health.lastSuccessAt ? new Date(health.lastSuccessAt).toLocaleString("nl-NL") : "nog nooit";
|
|
47
|
+
return (_jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Floriday" }), _jsx(CardDescription, { children: "Floriday-orders komen automatisch binnen. Hier kun je ze ook handmatig direct ophalen." })] }), _jsx(CardContent, { children: _jsxs("div", { className: "flex flex-wrap items-center justify-between gap-4", children: [_jsxs("p", { className: "text-sm text-muted-foreground", children: ["Laatst met succes opgehaald: ", last] }), _jsxs(Button, { variant: "outline", size: "sm", onClick: handleSync, disabled: syncing, children: [_jsx(RefreshCw, { className: "mr-2 h-4 w-4 motion-reduce:animate-none " + (syncing ? "animate-spin" : "") }), "Floriday-orders nu ophalen"] })] }) })] }));
|
|
48
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AA2B/D,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,+BAoRvE;AAGD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAaxD"}
|
|
@@ -11,7 +11,8 @@ import { LayoutGrid, RefreshCw } from "lucide-react";
|
|
|
11
11
|
import { getOrderPlanCoverage } from "../../lib/cart-replan.functions.js";
|
|
12
12
|
import { summarize } from "../../lib/plan-coverage.js";
|
|
13
13
|
import { useEngineMelding, useSetEngineMelding } from "../../lib/useEngineMelding.js";
|
|
14
|
-
import { cartSummary } from "../../lib/plan-coverage.js";
|
|
14
|
+
import { cartSummary, verouderdRegels, verouderdToon } from "../../lib/plan-coverage.js";
|
|
15
|
+
import { useBufferCarts } from "../../lib/useBufferCarts.js";
|
|
15
16
|
import { EngineActieButtons } from "./EngineActieButtons.js";
|
|
16
17
|
import { loadCarrierName } from "../../lib/load-carrier-labels.js";
|
|
17
18
|
import { resolveProductName } from "../../lib/product-name.js";
|
|
@@ -83,15 +84,34 @@ export function OrderKarindelingCard({ order }) {
|
|
|
83
84
|
}, 3000);
|
|
84
85
|
return () => clearInterval(t);
|
|
85
86
|
}, [waiting, orderId, queryClient]);
|
|
86
|
-
const
|
|
87
|
-
|
|
87
|
+
const covCarts = Array.isArray(cov?.carts) ? cov.carts : [];
|
|
88
|
+
// Engine 1.0.220: in een buffer precies carts[] uit logistics_buffer_carts (één regel per kar,
|
|
89
|
+
// pickdocument per kar). Ontbreekt die functie, dan de huidige weergave.
|
|
90
|
+
const bufferQ = useBufferCarts(order?.bufferId ?? null);
|
|
91
|
+
const engineBuffer = bufferQ.data?.carts ?? null;
|
|
92
|
+
const carts = engineBuffer
|
|
93
|
+
? engineBuffer.carts.map((b) => {
|
|
94
|
+
const c = covCarts.find((k) => k.cartId === b.cartId);
|
|
95
|
+
return {
|
|
96
|
+
...(c ?? { cartId: b.cartId, cartNumber: null, bufferId: engineBuffer.bufferId, shared: true, carrierType: b.carrierType, additionalLayers: null,
|
|
97
|
+
ladingdragerTekst: b.ladingdrager, karTekst: null, teHoog: null, blokkade: null, capaciteitBron: null, capaciteit: null, lagen: null, vulgraad: null, lines: [] }),
|
|
98
|
+
cartNumber: b.seq ?? c?.cartNumber ?? null,
|
|
99
|
+
verouderdReden: b.verouderdReden ?? c?.verouderdReden ?? null,
|
|
100
|
+
verouderdRedenen: b.verouderdRedenen ?? c?.verouderdRedenen ?? null,
|
|
101
|
+
pickDocument: b.pickDocument,
|
|
102
|
+
};
|
|
103
|
+
})
|
|
104
|
+
: covCarts.map((c) => ({ ...c, pickDocument: undefined }));
|
|
105
|
+
const pickRows = engineBuffer
|
|
106
|
+
? engineBuffer.carts.filter((b) => b.pickDocument).map((b) => ({ queueItemId: b.pickDocument.id, documentNumber: b.pickDocument.documentNumber, cartId: b.cartId, printedAt: b.pickDocument.printedAt, completedAt: null }))
|
|
107
|
+
: Array.isArray(cov?.pickRows) ? cov.pickRows : [];
|
|
88
108
|
const [layersFor, setLayersFor] = useState(null);
|
|
89
|
-
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: "Karindeling" }), _jsxs("div", { className: "flex items-center gap-2", children: [cov && cov.state !== "onbekend" && (_jsxs(Badge, { variant: "secondary", children: [carts.length, " kar(ren)"] })), _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 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "Karindeling laden\u2026" })) : 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) }))] }), _jsxs("div", { children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Pickstatus" }), _jsxs("div", { className: "mt-1", children: [cov.pickStatus ? PICK_LABEL[cov.pickStatus] : "—", cov.pickStatus === "gepickt" && cov.pickedAt ? ` · ${fmt(cov.pickedAt)}` : ""] })] }), 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: [
|
|
109
|
+
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: "Karindeling" }), _jsxs("div", { className: "flex items-center gap-2", children: [cov && cov.state !== "onbekend" && (_jsxs(Badge, { variant: "secondary", children: [engineBuffer ? engineBuffer.karren : carts.length, " kar(ren)"] })), _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 ? (_jsx("p", { className: "text-sm text-muted-foreground", children: "Karindeling laden\u2026" })) : 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) }))] }), _jsxs("div", { children: [_jsx("div", { className: "text-xs text-muted-foreground", children: "Pickstatus" }), _jsxs("div", { className: "mt-1", children: [cov.pickStatus ? PICK_LABEL[cov.pickStatus] : "—", cov.pickStatus === "gepickt" && cov.pickedAt ? ` · ${fmt(cov.pickedAt)}` : ""] })] }), 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: [
|
|
90
110
|
p.printedAt ? `Geprint ${fmt(p.printedAt)}` : "Nog niet geprint",
|
|
91
111
|
p.completedAt ? `Afgerond ${fmt(p.completedAt)}` : null,
|
|
92
112
|
]
|
|
93
113
|
.filter(Boolean)
|
|
94
|
-
.join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), 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: ["Geen indeling: bekijk de reden in Engine beheer.", 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" })] }), 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 ?? "zie Engine beheer"] })), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), _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 }), _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId)))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
|
|
114
|
+
.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))) })), (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), 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: ["Geen indeling: bekijk de reden in Engine beheer.", 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 ?? "zie Engine beheer"] })), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), _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 }), _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId)))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
|
|
95
115
|
if (!v)
|
|
96
116
|
setLayersFor(null);
|
|
97
117
|
} })] }));
|
|
@@ -107,3 +127,10 @@ function IndelingVerouderdBlock({ orderId, verouderd, melding, onDone, }) {
|
|
|
107
127
|
const tekst = verouderd?.tekst ?? melding?.tekst ?? null;
|
|
108
128
|
return (_jsxs("div", { className: "rounded-md border border-amber-400/60 bg-amber-50 p-3 text-sm text-amber-900", children: [_jsx("div", { className: "font-medium", children: "Karindeling verouderd" }), tekst && _jsx(ExpandableText, { text: tekst }), verouderd && verouderd.producten.length > 0 && (_jsxs("div", { className: "mt-1 text-xs", children: ["Producten: ", verouderd.producten.join(", ")] })), verouderd?.vastliggendeKarren != null && (_jsxs("div", { className: "mt-1 text-xs", children: [verouderd.vastliggendeKarren, " ", verouderd.vastliggendeKarren === 1 ? "kar ligt" : "karren liggen", " al vast (geprint) en blijven staan."] })), melding && melding.acties.length > 0 && _jsx(EngineActieButtons, { orderId: orderId, acties: melding.acties, onDone: onDone })] }));
|
|
109
129
|
}
|
|
130
|
+
/** Redenen per verouderde kar (Engine 1.0.220). Code bepaalt alleen de kleur; tekst komt van de Engine. */
|
|
131
|
+
function VerouderdRedenen({ regels }) {
|
|
132
|
+
if (regels.length === 0)
|
|
133
|
+
return null;
|
|
134
|
+
const cls = { blok: "text-destructive", let_op: "text-foreground", melding: "text-muted-foreground" };
|
|
135
|
+
return (_jsx("ul", { className: "space-y-0.5 border-b border-border bg-muted/20 px-3 py-2 text-xs", children: regels.map((r, i) => (_jsx("li", { className: cls[verouderdToon(r.code)], children: r.tekst }, `${r.code ?? "x"}-${i}`))) }));
|
|
136
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderShipmentsCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderShipmentsCard.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AA+C/D,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"OrderShipmentsCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderShipmentsCard.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AA+C/D,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,sCAQrE"}
|
|
@@ -21,9 +21,8 @@ function formatDate(iso) {
|
|
|
21
21
|
}
|
|
22
22
|
export function OrderShipmentsCard({ order }) {
|
|
23
23
|
// Alleen lokale (en dus reserveer-bare) orders ondersteunen deelleveringen.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
: null;
|
|
24
|
+
// Ook buffer-orders zonder "local:"-voorvoegsel (kale uuid) tonen hun bezorgmomenten.
|
|
25
|
+
const rawId = order.isLocal ? String(order.id).replace(/^local:/, "") || null : null;
|
|
27
26
|
if (!rawId)
|
|
28
27
|
return null;
|
|
29
28
|
return _jsx(OrderShipmentsInner, { orderId: rawId });
|
|
@@ -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":"AAoGA,wBAAgB,oBAAoB,gCAqQnC"}
|
|
@@ -12,6 +12,10 @@ import { EngineBufferCard } from "./EngineBufferCard.js";
|
|
|
12
12
|
import { OrderCarrierPicker } from "./OrderCarrierPicker.js";
|
|
13
13
|
import { OrderPickupMomentPicker } from "./OrderPickupMomentPicker.js";
|
|
14
14
|
import { EditLocalOrderDialog } from "./EditLocalOrderDialog.js";
|
|
15
|
+
import { OrderInvoiceCard } from "./OrderInvoiceCard.js";
|
|
16
|
+
import { orderUuid } from "../../lib/order-price-lock.js";
|
|
17
|
+
import { useBufferCarts } from "../../lib/useBufferCarts.js";
|
|
18
|
+
import { ladingdragerSummary } from "../../lib/buffer-carts.js";
|
|
15
19
|
import { useSalesOrdersQuery } from "../../lib/useSalesOrdersQuery.js";
|
|
16
20
|
import { useBufferEvents } from "../../lib/useBufferEvents.js";
|
|
17
21
|
import { useSalesOrderDetailQuery } from "../../lib/useSalesOrderDetailQuery.js";
|
|
@@ -132,11 +136,16 @@ export function SalesOrderDetailPage() {
|
|
|
132
136
|
const crateType = mergeTypeNames(bufferOrders.map((o) => o.crateTypeName));
|
|
133
137
|
return { revenue, karren, fusten, cartType, crateType };
|
|
134
138
|
}, [bufferOrders]);
|
|
139
|
+
// Engine 1.0.220: buffertelling uit logistics_buffer_carts; ontbreekt die, dan het huidige totaal.
|
|
140
|
+
const bufferCartsQ = useBufferCarts(isBuffer ? bufferId : null);
|
|
141
|
+
const engineBuffer = bufferCartsQ.data?.carts ?? null;
|
|
135
142
|
const [editOpen, setEditOpen] = useState(false);
|
|
136
143
|
const rawLocalId = isLocal && salesOrderId.startsWith("local:")
|
|
137
144
|
? salesOrderId.slice("local:".length)
|
|
138
145
|
: null;
|
|
139
|
-
return (_jsxs("main", { className: "space-y-5 p-6", children: [_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsx(Button, { asChild: true, variant: "ghost", size: "sm", children: _jsxs(Link, { to: "/floriday-verkoop/verkooporders", children: [_jsx(ArrowLeft, { className: "mr-2 h-4 w-4" }), "Terug naar verkooporders"] }) }), rawLocalId && (_jsxs(Button, { variant: "outline", size: "sm", onClick: () => setEditOpen(true), children: [_jsx(Pencil, { className: "mr-2 h-4 w-4" }), "Bestelling bewerken"] }))] }), isLoading && (_jsx("div", { className: "rounded-lg border border-border bg-card p-8 text-sm text-muted-foreground", children: "Laden\u2026" })), error && (_jsx("div", { className: "rounded-lg border border-destructive/30 bg-destructive/5 p-4 text-sm text-destructive", children: error.message })), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-lg border border-border bg-card p-8 text-sm text-muted-foreground", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs("div", { className: "rounded-lg border border-primary/30 bg-primary/5 p-4", children: [_jsxs("div", { className: "mb-3 flex items-center gap-2", children: [_jsx(Layers, { className: "h-4 w-4 text-primary" }), _jsx("span", { className: "text-sm font-semibold text-foreground", children: "Orderbuffer" }), _jsxs(Badge, { variant: "outline", className: "border-primary/40 text-primary", children: [bufferOrders.length, " orders samengevoegd"] })] }), _jsxs("div", { className: "grid grid-cols-2 gap-3 text-sm md:grid-cols-4", children: [_jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Totale omzet" }), _jsx("div", { className: "font-semibold text-foreground", children: eur.format(totals.revenue) })] }), _jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Karren" }), _jsx("div", { className: "font-semibold text-foreground", children:
|
|
146
|
+
return (_jsxs("main", { className: "space-y-5 p-6", children: [_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsx(Button, { asChild: true, variant: "ghost", size: "sm", children: _jsxs(Link, { to: "/floriday-verkoop/verkooporders", children: [_jsx(ArrowLeft, { className: "mr-2 h-4 w-4" }), "Terug naar verkooporders"] }) }), rawLocalId && (_jsxs(Button, { variant: "outline", size: "sm", onClick: () => setEditOpen(true), children: [_jsx(Pencil, { className: "mr-2 h-4 w-4" }), "Bestelling bewerken"] }))] }), isLoading && (_jsx("div", { className: "rounded-lg border border-border bg-card p-8 text-sm text-muted-foreground", children: "Laden\u2026" })), error && (_jsx("div", { className: "rounded-lg border border-destructive/30 bg-destructive/5 p-4 text-sm text-destructive", children: error.message })), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-lg border border-border bg-card p-8 text-sm text-muted-foreground", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs("div", { className: "rounded-lg border border-primary/30 bg-primary/5 p-4", children: [_jsxs("div", { className: "mb-3 flex items-center gap-2", children: [_jsx(Layers, { className: "h-4 w-4 text-primary" }), _jsx("span", { className: "text-sm font-semibold text-foreground", children: "Orderbuffer" }), _jsxs(Badge, { variant: "outline", className: "border-primary/40 text-primary", children: [bufferOrders.length, " orders samengevoegd"] })] }), _jsxs("div", { className: "grid grid-cols-2 gap-3 text-sm md:grid-cols-4", children: [_jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Totale omzet" }), _jsx("div", { className: "font-semibold text-foreground", children: eur.format(totals.revenue) })] }), _jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Karren" }), _jsx("div", { className: "font-semibold text-foreground", children: engineBuffer
|
|
147
|
+
? engineBuffer.karren
|
|
148
|
+
: totals.karren == null ? "Karren onbekend" : formatLoadUnits(totals.karren, totals.cartType) }), engineBuffer && engineBuffer.ladingdragers.length > 0 && (_jsx("div", { className: "text-xs text-muted-foreground", children: ladingdragerSummary(engineBuffer) }))] }), _jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Fusten" }), _jsx("div", { className: "font-semibold text-foreground", children: formatLoadUnits(totals.fusten, totals.crateType) })] }), _jsxs("div", { children: [_jsx("div", { className: "text-muted-foreground", children: "Klant" }), _jsx("div", { className: "font-semibold text-foreground", children: primary.customer.name }), primary.customer.legalName && (_jsx("div", { className: "text-xs text-muted-foreground", children: primary.customer.legalName }))] })] }), _jsx(BufferAddresses, { orderId: primary.id }), _jsxs("div", { className: "mt-4 border-t border-primary/20 pt-3 text-sm", children: [_jsxs("div", { className: "mb-1 flex items-center gap-1.5 text-muted-foreground", children: [_jsx(Truck, { className: "h-3.5 w-3.5" }), _jsx("span", { children: "Vervoerder" })] }), _jsx(OrderCarrierPicker, { orderId: primary.id, applyToBuffer: true, locked: bufferOrders.every((o) => !!o.isReservation) }), _jsxs("div", { className: "mt-3 mb-1 flex items-center gap-1.5 text-muted-foreground", children: [_jsx(Clock, { className: "h-3.5 w-3.5" }), _jsx("span", { children: "Ophaalmoment" })] }), _jsx(OrderPickupMomentPicker, { orderId: primary.id, readOnly: true, compact: true })] }), _jsx("div", { className: "mt-3 flex flex-wrap gap-2", children: bufferOrders.map((o) => {
|
|
140
149
|
// Een Floriday-order hoort altijd een centraal ordernummer te
|
|
141
150
|
// hebben. Ontbreekt het, dan tonen we bewust géén chip: liever
|
|
142
151
|
// zichtbaar missend dan een verzonnen uuid-fragment.
|
|
@@ -149,5 +158,6 @@ export function SalesOrderDetailPage() {
|
|
|
149
158
|
}
|
|
150
159
|
function BufferOrderRow({ order, sellerFallback, }) {
|
|
151
160
|
const [open, setOpen] = useState(false);
|
|
152
|
-
|
|
161
|
+
const bufferInvoiceId = orderUuid(order.orderRowId ?? order.id);
|
|
162
|
+
return (_jsxs("div", { className: "overflow-hidden rounded-lg border border-border bg-card", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), className: "flex w-full items-center gap-3 p-3 text-left hover:bg-muted/40", children: [open ? (_jsx(ChevronDown, { className: "h-4 w-4 shrink-0 text-muted-foreground" })) : (_jsx(ChevronRight, { className: "h-4 w-4 shrink-0 text-muted-foreground" })), _jsx("div", { className: "flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted", children: order.imageUrl ? (_jsx("img", { src: order.imageUrl, alt: "", className: "h-full w-full object-cover" })) : (_jsx(ImageIcon, { className: "h-5 w-5 text-muted-foreground" })) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "truncate text-sm font-semibold text-foreground", children: order.productName }), _jsxs("div", { className: "flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-muted-foreground", children: [order.orderNumber && _jsx("span", { children: order.orderNumber }), _jsxs("span", { children: [formatLoadUnits(order.karCount, order.cartTypeName), " karren", order.karShared ? " (gedeeld met buffer)" : ""] }), _jsxs("span", { children: [formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName), " fusten"] }), order.mixedPacking && (order.articleCount ?? 0) > 1 && _jsxs("span", { children: ["Gemengd (", order.articleCount, " artikelen)"] }), _jsx("span", { children: eur.format(order.revenue ?? 0) })] })] }), order.isLocal ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "BVO" })) : (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "FO" }))] }), _jsxs("div", { className: "space-y-2 border-t border-border px-3 py-2", children: [_jsx("div", { className: "flex justify-end", children: _jsx(Button, { asChild: true, variant: "outline", size: "sm", children: _jsx(Link, { to: "/floriday-verkoop/verkooporders/$salesOrderId", params: { salesOrderId: order.id }, children: "Open order" }) }) }), bufferInvoiceId && !open && _jsx(OrderInvoiceCard, { orderId: bufferInvoiceId })] }), open && (_jsx("div", { className: "border-t border-border bg-background p-4", children: _jsx(SalesOrderDetailView, { order: order, sellerFallback: sellerFallback ?? null, hideKarindeling: true }) }))] }));
|
|
153
163
|
}
|
|
@@ -236,7 +236,7 @@ function SalesOrderDetailViewInner({ floridayLoading, order, sellerFallback, hid
|
|
|
236
236
|
const purchaseRaw = o.pricePerPiece?.value;
|
|
237
237
|
const hasPurchase = purchaseRaw != null && Number.isFinite(Number(purchaseRaw));
|
|
238
238
|
const purchaseUnit = hasPurchase ? Number(purchaseRaw) : productUnit;
|
|
239
|
-
const invoiceOrderId = orderUuid(order.orderRowId ?? (
|
|
239
|
+
const invoiceOrderId = orderUuid(order.orderRowId ?? (order.isLocal ? order.id : null));
|
|
240
240
|
const transportPerPiece = Number(o.deliveryPricePerPiece ?? Math.max(0, productUnit - purchaseUnit)) || 0;
|
|
241
241
|
const priceLines = (order.priceLines ?? []).filter((l) => l.pieces > 0);
|
|
242
242
|
const linesTotal = priceLines.reduce((sum, l) => sum + l.pieces * l.unitPrice, 0);
|
|
@@ -22,8 +22,10 @@ export interface Filters {
|
|
|
22
22
|
dateField?: "ordered" | "delivery";
|
|
23
23
|
period?: "week" | "month" | "day" | "last7" | "last30" | "custom";
|
|
24
24
|
}
|
|
25
|
-
export declare function SalesOrdersFilters({ value, onChange, }: {
|
|
25
|
+
export declare function SalesOrdersFilters({ value, onChange, part, }: {
|
|
26
26
|
value: Filters;
|
|
27
27
|
onChange: (next: Filters) => void;
|
|
28
|
+
/** Alleen de periodekeuze, alleen het zoekveld, of beide (standaard). */
|
|
29
|
+
part?: "both" | "period" | "search";
|
|
28
30
|
}): import("react").JSX.Element;
|
|
29
31
|
//# sourceMappingURL=SalesOrdersFilters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrdersFilters.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersFilters.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SalesOrdersFilters.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersFilters.tsx"],"names":[],"mappings":"AA6BA,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACnE;AA6BD,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,EACR,IAAa,GACd,EAAE;IACD,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACrC,+BA0NA"}
|
|
@@ -3,19 +3,14 @@ import { useState } from "react";
|
|
|
3
3
|
import { DropdownMenu, DropdownMenuContent, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuTrigger, Input, Popover, PopoverContent, PopoverTrigger, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from "@flowselections/core";
|
|
4
4
|
import { ChevronDown, ChevronLeft, ChevronRight, MoreVertical, Search, } from "lucide-react";
|
|
5
5
|
import { WeekCalendar } from "./WeekCalendar.js";
|
|
6
|
+
import { amsterdamYmd, isoWeekOf, shiftPeriod as shiftPeriodRange, ymdString } from "../../lib/period-range.js";
|
|
7
|
+
// Huidige week/maand/dag altijd in Europe/Amsterdam (period-range.ts).
|
|
6
8
|
function getCurrentWeek() {
|
|
7
|
-
|
|
8
|
-
const target = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()));
|
|
9
|
-
const dayNr = (target.getUTCDay() + 6) % 7;
|
|
10
|
-
target.setUTCDate(target.getUTCDate() - dayNr + 3);
|
|
11
|
-
const firstThursday = new Date(Date.UTC(target.getUTCFullYear(), 0, 4));
|
|
12
|
-
const week = 1 +
|
|
13
|
-
Math.round(((target.getTime() - firstThursday.getTime()) / 86400000 - 3 + ((firstThursday.getUTCDay() + 6) % 7)) / 7);
|
|
14
|
-
return { week, year: target.getUTCFullYear() };
|
|
9
|
+
return isoWeekOf(amsterdamYmd());
|
|
15
10
|
}
|
|
16
11
|
function getCurrentMonth() {
|
|
17
|
-
const
|
|
18
|
-
return { month:
|
|
12
|
+
const t = amsterdamYmd();
|
|
13
|
+
return { month: t.m - 1, year: t.y };
|
|
19
14
|
}
|
|
20
15
|
const MONTHS_NL = [
|
|
21
16
|
"januari", "februari", "maart", "april", "mei", "juni",
|
|
@@ -32,7 +27,7 @@ function generateMonthOptions() {
|
|
|
32
27
|
}
|
|
33
28
|
return options;
|
|
34
29
|
}
|
|
35
|
-
export function SalesOrdersFilters({ value, onChange, }) {
|
|
30
|
+
export function SalesOrdersFilters({ value, onChange, part = "both", }) {
|
|
36
31
|
const currentWeek = getCurrentWeek();
|
|
37
32
|
const week = value.week ?? currentWeek.week;
|
|
38
33
|
const year = value.year ?? currentWeek.year;
|
|
@@ -40,10 +35,7 @@ export function SalesOrdersFilters({ value, onChange, }) {
|
|
|
40
35
|
const month = value.month ?? currentMonth.month;
|
|
41
36
|
const monthYear = value.monthYear ?? currentMonth.year;
|
|
42
37
|
const period = value.period ?? "week";
|
|
43
|
-
const todayYmd = (()
|
|
44
|
-
const n = new Date();
|
|
45
|
-
return `${n.getFullYear()}-${String(n.getMonth() + 1).padStart(2, "0")}-${String(n.getDate()).padStart(2, "0")}`;
|
|
46
|
-
})();
|
|
38
|
+
const todayYmd = ymdString(amsterdamYmd());
|
|
47
39
|
const day = value.day ?? todayYmd;
|
|
48
40
|
const [search, setSearch] = useState(value.search ?? "");
|
|
49
41
|
const monthOptions = generateMonthOptions();
|
|
@@ -52,40 +44,10 @@ export function SalesOrdersFilters({ value, onChange, }) {
|
|
|
52
44
|
const dt = new Date(Date.UTC(y, (m ?? 1) - 1, d ?? 1));
|
|
53
45
|
return `${String(dt.getUTCDate()).padStart(2, "0")} ${MONTHS_NL[dt.getUTCMonth()]} ${dt.getUTCFullYear()}`;
|
|
54
46
|
};
|
|
47
|
+
// Pijltjes bij dag, week en maand; week 53 ↔ week 1 rond de jaarwisseling.
|
|
55
48
|
const shiftPeriod = (delta) => {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
let y = monthYear;
|
|
59
|
-
if (m < 0) {
|
|
60
|
-
m = 11;
|
|
61
|
-
y -= 1;
|
|
62
|
-
}
|
|
63
|
-
else if (m > 11) {
|
|
64
|
-
m = 0;
|
|
65
|
-
y += 1;
|
|
66
|
-
}
|
|
67
|
-
onChange({ ...value, month: m, monthYear: y });
|
|
68
|
-
}
|
|
69
|
-
else if (period === "day") {
|
|
70
|
-
const [y, m, d] = day.split("-").map(Number);
|
|
71
|
-
const dt = new Date(Date.UTC(y, m - 1, d));
|
|
72
|
-
dt.setUTCDate(dt.getUTCDate() + delta);
|
|
73
|
-
const ymd = `${dt.getUTCFullYear()}-${String(dt.getUTCMonth() + 1).padStart(2, "0")}-${String(dt.getUTCDate()).padStart(2, "0")}`;
|
|
74
|
-
onChange({ ...value, day: ymd });
|
|
75
|
-
}
|
|
76
|
-
else if (period === "week") {
|
|
77
|
-
let w = week + delta;
|
|
78
|
-
let y = year;
|
|
79
|
-
if (w < 1) {
|
|
80
|
-
w = 52;
|
|
81
|
-
y -= 1;
|
|
82
|
-
}
|
|
83
|
-
else if (w > 53) {
|
|
84
|
-
w = 1;
|
|
85
|
-
y += 1;
|
|
86
|
-
}
|
|
87
|
-
onChange({ ...value, week: w, year: y });
|
|
88
|
-
}
|
|
49
|
+
const next = shiftPeriodRange({ period, week, year, month, monthYear, day }, delta);
|
|
50
|
+
onChange({ ...value, ...next });
|
|
89
51
|
};
|
|
90
52
|
const handlePeriodChange = (nextPeriod) => {
|
|
91
53
|
const base = { ...value, period: nextPeriod };
|
|
@@ -124,11 +86,11 @@ export function SalesOrdersFilters({ value, onChange, }) {
|
|
|
124
86
|
return `Week ${week}, ${year}`;
|
|
125
87
|
};
|
|
126
88
|
const showArrows = period === "week" || period === "month" || period === "day";
|
|
127
|
-
return (_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsxs("div", { className: "flex h-9 items-center gap-1 rounded-md border border-border bg-card px-1", children: [showArrows && (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", onClick: () => shiftPeriod(-1), className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Vorige", children: _jsx(ChevronLeft, { className: "h-4 w-4" }) }), _jsx("button", { type: "button", onClick: () => shiftPeriod(1), className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Volgende", children: _jsx(ChevronRight, { className: "h-4 w-4" }) })] })), period === "month" ? (_jsxs(Select, { value: `${monthYear}-${month}`, onValueChange: (v) => {
|
|
89
|
+
return (_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [part !== "search" && (_jsxs("div", { className: "flex h-9 items-center gap-1 rounded-md border border-border bg-card px-1", children: [showArrows && (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", onClick: () => shiftPeriod(-1), className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Vorige", children: _jsx(ChevronLeft, { className: "h-4 w-4" }) }), _jsx("button", { type: "button", onClick: () => shiftPeriod(1), className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Volgende", children: _jsx(ChevronRight, { className: "h-4 w-4" }) })] })), period === "month" ? (_jsxs(Select, { value: `${monthYear}-${month}`, onValueChange: (v) => {
|
|
128
90
|
const [y, m] = v.split("-").map(Number);
|
|
129
91
|
onChange({ ...value, month: m, monthYear: y });
|
|
130
|
-
}, children: [_jsx(SelectTrigger, { className: "h-7 w-36 border-0 bg-transparent px-2 text-sm font-medium text-foreground shadow-none focus:ring-0", children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: monthOptions.map((opt) => (_jsx(SelectItem, { value: opt.value, children: opt.label }, opt.value))) })] })) : period === "day" ? (_jsx(Input, { type: "date", value: day, onChange: (e) => onChange({ ...value, day: e.target.value }), className: "h-7 w-40 border-0 bg-transparent px-2 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" })) : period === "custom" ? (_jsxs("div", { className: "flex items-center gap-1 px-2", children: [_jsx(Input, { type: "date", value: value.customFrom ?? todayYmd, onChange: (e) => onChange({ ...value, customFrom: e.target.value }), className: "h-7 w-36 border-0 bg-transparent px-1 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" }), _jsx("span", { className: "text-muted-foreground", children: "\u2013" }), _jsx(Input, { type: "date", value: value.customTo ?? todayYmd, onChange: (e) => onChange({ ...value, customTo: e.target.value }), className: "h-7 w-36 border-0 bg-transparent px-1 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" })] })) : period === "last7" || period === "last30" ? (_jsx("span", { className: "px-2 text-sm font-medium text-foreground whitespace-nowrap", children: period === "last7" ? "Afgelopen 7 dagen" : "Afgelopen 30 dagen" })) : (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs("button", { type: "button", className: "px-2 text-sm font-medium text-foreground whitespace-nowrap rounded hover:bg-accent h-7", "aria-label": "Kies week", children: ["Week ", week, " - ", year] }) }), _jsx(PopoverContent, { className: "w-auto p-0 pointer-events-auto", align: "start", children: _jsx(WeekCalendar, { week: week, year: year, onSelect: (w, y) => onChange({ ...value, week: w, year: y }) }) })] })), _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx("button", { type: "button", className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Periode-opties", children: _jsx(MoreVertical, { className: "h-4 w-4" }) }) }), _jsxs(DropdownMenuContent, { align: "end", className: "w-56", children: [_jsxs(DropdownMenuRadioGroup, { value: period, onValueChange: (v) => handlePeriodChange(v), children: [_jsx(DropdownMenuRadioItem, { value: "day", children: "Dag" }), _jsx(DropdownMenuRadioItem, { value: "week", children: "Week" }), _jsx(DropdownMenuRadioItem, { value: "month", children: "Maand" }), _jsx(DropdownMenuRadioItem, { value: "last7", children: "Afgelopen 7 dagen" }), _jsx(DropdownMenuRadioItem, { value: "last30", children: "Afgelopen 30 dagen" }), _jsx(DropdownMenuRadioItem, { value: "custom", children: "Aangepast tijdsbestek" })] }), _jsx(DropdownMenuSeparator, {}), _jsxs("div", { className: "px-2 py-1.5 text-sm text-muted-foreground inline-flex items-center gap-1", children: [periodLabel(), _jsx(ChevronDown, { className: "h-3.5 w-3.5" })] })] })] })] }), _jsxs("div", { className: "flex h-9 items-center overflow-hidden rounded-md border border-border bg-card", children: [_jsx(Input, { placeholder: "Op briefnummer zoeken", value: search, onChange: (e) => setSearch(e.target.value), onKeyDown: (e) => {
|
|
92
|
+
}, children: [_jsx(SelectTrigger, { className: "h-7 w-36 border-0 bg-transparent px-2 text-sm font-medium text-foreground shadow-none focus:ring-0", children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: monthOptions.map((opt) => (_jsx(SelectItem, { value: opt.value, children: opt.label }, opt.value))) })] })) : period === "day" ? (_jsx(Input, { type: "date", value: day, onChange: (e) => onChange({ ...value, day: e.target.value }), className: "h-7 w-40 border-0 bg-transparent px-2 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" })) : period === "custom" ? (_jsxs("div", { className: "flex items-center gap-1 px-2", children: [_jsx(Input, { type: "date", value: value.customFrom ?? todayYmd, onChange: (e) => onChange({ ...value, customFrom: e.target.value }), className: "h-7 w-36 border-0 bg-transparent px-1 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" }), _jsx("span", { className: "text-muted-foreground", children: "\u2013" }), _jsx(Input, { type: "date", value: value.customTo ?? todayYmd, onChange: (e) => onChange({ ...value, customTo: e.target.value }), className: "h-7 w-36 border-0 bg-transparent px-1 text-sm font-medium text-foreground shadow-none focus-visible:ring-0" })] })) : period === "last7" || period === "last30" ? (_jsx("span", { className: "px-2 text-sm font-medium text-foreground whitespace-nowrap", children: period === "last7" ? "Afgelopen 7 dagen" : "Afgelopen 30 dagen" })) : (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs("button", { type: "button", className: "px-2 text-sm font-medium text-foreground whitespace-nowrap rounded hover:bg-accent h-7", "aria-label": "Kies week", children: ["Week ", week, " - ", year] }) }), _jsx(PopoverContent, { className: "w-auto p-0 pointer-events-auto", align: "start", children: _jsx(WeekCalendar, { week: week, year: year, onSelect: (w, y) => onChange({ ...value, week: w, year: y }) }) })] })), (value.dateField ?? "delivery") === "ordered" && (_jsx("span", { className: "pr-1 text-sm text-muted-foreground whitespace-nowrap", "aria-label": "Periode op besteldatum", children: "\u00B7 besteldatum" })), _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx("button", { type: "button", className: "inline-flex h-7 w-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", "aria-label": "Periode-opties", children: _jsx(MoreVertical, { className: "h-4 w-4" }) }) }), _jsxs(DropdownMenuContent, { align: "end", className: "w-56", children: [_jsxs(DropdownMenuRadioGroup, { value: period, onValueChange: (v) => handlePeriodChange(v), children: [_jsx(DropdownMenuRadioItem, { value: "day", children: "Dag" }), _jsx(DropdownMenuRadioItem, { value: "week", children: "Week" }), _jsx(DropdownMenuRadioItem, { value: "month", children: "Maand" }), _jsx(DropdownMenuRadioItem, { value: "last7", children: "Afgelopen 7 dagen" }), _jsx(DropdownMenuRadioItem, { value: "last30", children: "Afgelopen 30 dagen" }), _jsx(DropdownMenuRadioItem, { value: "custom", children: "Aangepast tijdsbestek" })] }), _jsx(DropdownMenuSeparator, {}), _jsxs(DropdownMenuRadioGroup, { value: value.dateField ?? "delivery", onValueChange: (v) => onChange({ ...value, dateField: v === "ordered" ? "ordered" : "delivery" }), children: [_jsx(DropdownMenuRadioItem, { value: "delivery", children: "Op leverdatum" }), _jsx(DropdownMenuRadioItem, { value: "ordered", children: "Op besteldatum" })] }), _jsx(DropdownMenuSeparator, {}), _jsxs("div", { className: "px-2 py-1.5 text-sm text-muted-foreground inline-flex items-center gap-1", children: [periodLabel(), (value.dateField ?? "delivery") === "ordered" ? " · besteldatum" : "", _jsx(ChevronDown, { className: "h-3.5 w-3.5" })] })] })] })] })), part !== "period" && (_jsxs("div", { className: "flex h-9 w-full items-center overflow-hidden rounded-md border border-border bg-card sm:w-auto", children: [_jsx(Input, { placeholder: part === "search" ? "Zoek op ordernummer, klant, artikel of referentie" : "Op briefnummer zoeken", "aria-label": "Zoeken", value: search, onChange: (e) => setSearch(e.target.value), onKeyDown: (e) => {
|
|
131
93
|
if (e.key === "Enter")
|
|
132
94
|
onChange({ ...value, search });
|
|
133
|
-
}, onBlur: () => onChange({ ...value, search }), className: "h-9
|
|
95
|
+
}, onBlur: () => onChange({ ...value, search }), className: "h-9 border-0 shadow-none focus-visible:ring-0 " + (part === "search" ? "min-w-0 flex-1 sm:w-80" : "w-56") }), _jsx("button", { type: "button", onClick: () => onChange({ ...value, search }), className: "inline-flex h-9 w-10 items-center justify-center bg-primary text-primary-foreground hover:opacity-90", "aria-label": "Zoeken", children: _jsx(Search, { className: "h-4 w-4" }) })] }))] }));
|
|
134
96
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { type ReactNode } from "react";
|
|
2
2
|
import type { SalesOrderDTO } from "../../lib/salesorders-mapping.js";
|
|
3
|
+
import { type ProgressFeatures } from "../../lib/order-progress.js";
|
|
3
4
|
/** Stabiele rij-id: buffers zijn serverside al samengevouwen tot één rij. */
|
|
4
5
|
export declare function salesOrderRowId(row: SalesOrderDTO): string;
|
|
5
|
-
export declare function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder, onEditOrder, onFulfillOrder, fulfillingId, selectedIds, onSelectionChange, }: {
|
|
6
|
+
export declare function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder, onEditOrder, onFulfillOrder, fulfillingId, selectedIds, onSelectionChange, features, emptyText, onClearFilters, skeletonRows, fadeKey, quiet, highlightIds, topSlot, }: {
|
|
6
7
|
orders: SalesOrderDTO[];
|
|
7
8
|
loading?: boolean;
|
|
8
9
|
onSelectOrder?: (order: SalesOrderDTO) => void;
|
|
@@ -12,5 +13,18 @@ export declare function SalesOrdersTable({ orders, loading, onSelectOrder, onDel
|
|
|
12
13
|
fulfillingId?: string | null;
|
|
13
14
|
selectedIds?: string[];
|
|
14
15
|
onSelectionChange?: (ids: string[]) => void;
|
|
15
|
-
|
|
16
|
+
features?: ProgressFeatures;
|
|
17
|
+
emptyText?: string;
|
|
18
|
+
onClearFilters?: () => void;
|
|
19
|
+
/** Aantal skeletrijen (gelijk aan de paginagrootte, zodat de hoogte gelijk blijft). */
|
|
20
|
+
skeletonRows?: number;
|
|
21
|
+
/** Wisselt bij een eigen actie (tabblad, filter, zoeken, pagina, periode): rijen faden in. */
|
|
22
|
+
fadeKey?: string;
|
|
23
|
+
/** Achtergrondverversing: geen fade-in, verdwenen rijen faden 150 ms uit. */
|
|
24
|
+
quiet?: boolean;
|
|
25
|
+
/** Nieuwe rijen die kort gemarkeerd worden. */
|
|
26
|
+
highlightIds?: string[];
|
|
27
|
+
/** Ruimte boven de tabel (bijv. "2 nieuwe orders · Tonen"). */
|
|
28
|
+
topSlot?: ReactNode;
|
|
29
|
+
}): import("react").JSX.Element;
|
|
16
30
|
//# sourceMappingURL=SalesOrdersTable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA8C,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAWnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,0BAA0B,CAAC;AAgClC,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAG1D;AAyTD,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,OAAO,EACP,aAAa,EACb,aAAa,EACb,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,QAA2B,EAC3B,SAAmC,EACnC,cAAc,EACd,YAAgB,EAChB,OAAO,EACP,KAAa,EACb,YAAY,EACZ,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC/C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC/C,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8FAA8F;IAC9F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB,+BA+IA"}
|