@flowselections/floriday-verkoop-module 1.0.166 → 1.0.168
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +155 -34
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +63 -8
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +11 -4
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +1 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +9 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +21 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +13 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +26 -4
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.js +11 -3
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +8 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +107 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +19 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +33 -0
- package/dist-lib/integrations/supabase/types.d.ts +1492 -68
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.d.ts +13 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +41 -0
- package/dist-lib/lib/create-order-form.d.ts +30 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +55 -1
- package/dist-lib/lib/create-order.functions.d.ts +16 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +104 -21
- package/dist-lib/lib/customer-stickers.d.ts +2 -1
- package/dist-lib/lib/customer-stickers.d.ts.map +1 -1
- package/dist-lib/lib/customer-stickers.js +2 -2
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/engine-tijdlijn.d.ts +11 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -1
- package/dist-lib/lib/engine-tijdlijn.js +26 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +47 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-tijdlijn.server.js +119 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +5 -0
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +21 -0
- package/dist-lib/lib/kar-tekening.d.ts +23 -0
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +51 -1
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-bijwerken.server.d.ts +20 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts.map +1 -0
- package/dist-lib/lib/order-bijwerken.server.js +31 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +33 -23
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +4 -13
- package/dist-lib/lib/order-cf-merge.d.ts +17 -0
- package/dist-lib/lib/order-cf-merge.d.ts.map +1 -0
- package/dist-lib/lib/order-cf-merge.js +51 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +20 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +26 -5
- package/dist-lib/lib/order-line-extras.d.ts +157 -0
- package/dist-lib/lib/order-line-extras.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts +55 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.js +184 -0
- package/dist-lib/lib/order-line-extras.js +281 -0
- package/dist-lib/lib/order-nav.d.ts +8 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -1
- package/dist-lib/lib/order-nav.js +13 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +5 -9
- package/dist-lib/lib/order-status.d.ts +9 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -0
- package/dist-lib/lib/order-transport.functions.d.ts +9 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +21 -3
- package/dist-lib/lib/order-transport.server.d.ts +1 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.server.js +15 -1
- package/dist-lib/lib/own-transport.d.ts +6 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +12 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +41 -3
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +12 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.js +2 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.js +7 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.js +5 -0
- package/dist-lib/lib/voorraad-vrij.d.ts +30 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +64 -0
- package/package.json +4 -4
- package/schema/verkoop.sql +630 -0
|
@@ -11,7 +11,7 @@ import { AlertTriangle, Info, Loader2, PencilRuler } from "lucide-react";
|
|
|
11
11
|
import { useRouter } from "@tanstack/react-router";
|
|
12
12
|
import { karBewerkenPad, karBewerkenStand } from "../../lib/engine-tijdlijn.js";
|
|
13
13
|
import { getIndelingStand, getKarTekening } from "../../lib/kar-tekening.functions.js";
|
|
14
|
-
import { dragerTitel, dragersKop, gedeeldTekst, markeringTekst, lagenTekst, langBezig, POLL_MS, regelBeladingTekst, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
14
|
+
import { artikelKleur, legendaTekst, legendaVoorRegel, dragerTitel, dragersKop, gedeeldTekst, markeringTekst, lagenTekst, langBezig, POLL_MS, regelBeladingTekst, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
15
15
|
import { bezigKey } from "../../lib/indeling-bezig.js";
|
|
16
16
|
import { korteMelding } from "../../lib/korte-melding.js";
|
|
17
17
|
import { SafeSvg } from "./SafeSvg.js";
|
|
@@ -138,15 +138,22 @@ function IndelingAanpassen({ tek, orderDbId }) {
|
|
|
138
138
|
}
|
|
139
139
|
function TekeningInhoud({ tek, orderId, orderDbId, floriday, onLagen, regels }) {
|
|
140
140
|
const [groot, setGroot] = useState(null);
|
|
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)
|
|
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, kleuren: tek.kleuren, orderId: orderId, regels: regels?.get(d.id) ?? [], floriday: floriday, onGroot: () => setGroot(d), onLagen: onLagen }, d.id)) }), _jsx(Dialog, { open: !!groot, onOpenChange: (v) => { if (!v)
|
|
142
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." })] }) })] }));
|
|
143
143
|
}
|
|
144
|
-
function DragerKaart({ d, orderId, regels, floriday, onGroot, onLagen }) {
|
|
144
|
+
function DragerKaart({ d, kleuren, orderId, regels, floriday, onGroot, onLagen }) {
|
|
145
145
|
const pct = d.vulgraad_pct != null ? Math.max(0, Math.min(100, Math.round(d.vulgraad_pct))) : null;
|
|
146
146
|
const status = statusLabel(d.status);
|
|
147
147
|
const dozen = toonDozen(regels);
|
|
148
148
|
const gedeeld = gedeeldTekst(d.gedeeld_met);
|
|
149
149
|
const lagen = lagenTekst(d.lagen_gebruikt, d.lagen_max);
|
|
150
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) }) })),
|
|
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) }) })), d.legenda.length > 0 && (_jsx("ul", { className: "flex flex-wrap gap-x-3 gap-y-1 text-xs text-foreground", "aria-label": "Legenda", children: d.legenda.map((l) => (_jsxs("li", { className: "flex items-center gap-1.5", children: [_jsx(ArtikelLetter, { letter: l.letter, kleur: artikelKleur(l.letter, kleuren) }), _jsx("span", { className: "min-w-0 break-words", children: legendaTekst(l).replace(/^\S+ = /, "") })] }, l.letter))) })), regels.length > 0 && (_jsx("div", { className: "overflow-x-auto", children: _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [d.legenda.length > 0 && _jsx(TableHead, { className: "w-10", children: _jsx("span", { className: "sr-only", children: "Letter" }) }), _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: [d.legenda.length > 0 && (() => {
|
|
152
|
+
const l = legendaVoorRegel(a.product, d.legenda);
|
|
153
|
+
return _jsx(TableCell, { children: l ? _jsx(ArtikelLetter, { letter: l.letter, kleur: artikelKleur(l.letter, kleuren) }) : _jsx("span", { className: "text-muted-foreground", children: "\u2014" }) });
|
|
154
|
+
})(), _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" }))] }));
|
|
155
|
+
}
|
|
156
|
+
/** Letter van een artikel met zijn kleur (zelfde letters als de legenda op de pakbon). */
|
|
157
|
+
function ArtikelLetter({ letter, kleur }) {
|
|
158
|
+
return (_jsxs("span", { className: "relative inline-flex h-5 min-w-5 shrink-0 items-center justify-center overflow-hidden rounded px-1 text-[11px] font-semibold text-foreground ring-1 ring-border", children: [_jsx("span", { "aria-hidden": true, className: "absolute inset-0 opacity-40", style: { backgroundColor: kleur } }), _jsx("span", { className: "relative", children: letter })] }));
|
|
152
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,EACd,SAAS,GACV,EAAE;IACD,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+
|
|
1
|
+
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,EACd,SAAS,GACV,EAAE;IACD,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+BA8GA"}
|
|
@@ -49,6 +49,7 @@ export function OrderCarrierPicker({ orderId, applyToBuffer = false, compact = f
|
|
|
49
49
|
if (!res.ok || res.results.length > 1)
|
|
50
50
|
setResults(res.results);
|
|
51
51
|
await qc.invalidateQueries({ queryKey: ["order-carrier"] });
|
|
52
|
+
await qc.invalidateQueries({ queryKey: ["order-transport"] });
|
|
52
53
|
await qc.invalidateQueries({ queryKey: ["sales-orders"] });
|
|
53
54
|
}
|
|
54
55
|
catch (e) {
|
|
@@ -6,6 +6,7 @@ export declare function useOrderTransport(orderId: string | null | undefined, en
|
|
|
6
6
|
deliveryDate: string | null;
|
|
7
7
|
carrier: import("../../lib/carrier-resolve.js").ResolvedCarrier;
|
|
8
8
|
carrierGln: string | null;
|
|
9
|
+
floridayCarrierNotice: string | null;
|
|
9
10
|
own: boolean;
|
|
10
11
|
ownKind: string | null;
|
|
11
12
|
ownPickup: {
|
|
@@ -16,6 +17,14 @@ export declare function useOrderTransport(orderId: string | null | undefined, en
|
|
|
16
17
|
lockReason: import("../../lib/own-transport.js").PickupLockReason;
|
|
17
18
|
lockKnown: boolean;
|
|
18
19
|
}, Error>;
|
|
20
|
+
/** Melding bij Vervoer: transporteur in Floriday wijkt af van de gekozen vervoerder (alleen weergave). */
|
|
21
|
+
export declare function FloridayCarrierNoticeText({ text }: {
|
|
22
|
+
text: string;
|
|
23
|
+
}): import("react").JSX.Element;
|
|
24
|
+
/** Zelfde melding voor meerdere orders (groep); per order met ordernummer als er meer zijn. */
|
|
25
|
+
export declare function FloridayCarrierNotices({ orderIds }: {
|
|
26
|
+
orderIds: string[];
|
|
27
|
+
}): import("react").JSX.Element | null;
|
|
19
28
|
/** "do 29 okt 15:00" uit { date, time }. */
|
|
20
29
|
export declare function ownPickupText(p: {
|
|
21
30
|
date: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderTransportCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderTransportCard.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAcjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,yCAA0C,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,UAAO
|
|
1
|
+
{"version":3,"file":"OrderTransportCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderTransportCard.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAcjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,yCAA0C,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,UAAO;;;;;;;;;;;;;;;UAQnF;AAED,0GAA0G;AAC1G,wBAAgB,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAMnE;AAED,+FAA+F;AAC/F,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,sCAkB1E;AAED,4CAA4C;AAC5C,wBAAgB,aAAa,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIjG;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,UAAmC,EAAE,EAAE;IACpH,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,+BAuCA;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,+BAyF9H;AAED,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,sCAWrE"}
|
|
@@ -10,7 +10,7 @@ import { OrderPickupMomentPicker } from "./OrderPickupMomentPicker.js";
|
|
|
10
10
|
import { usePickupMoment } from "../../lib/usePickupMoment.js";
|
|
11
11
|
import { formatMoment } from "../../lib/order-departure.js";
|
|
12
12
|
import { dateWithWeekday } from "../../lib/create-order-form.js";
|
|
13
|
-
import { getOrderTransport, setOrderOwnPickupTime } from "../../lib/order-transport.functions.js";
|
|
13
|
+
import { getFloridayCarrierNotices, getOrderTransport, setOrderOwnPickupTime } from "../../lib/order-transport.functions.js";
|
|
14
14
|
import { OWN_PICKUP_LOCKED_TEXT, OWN_PICKUP_MISSING_TEXT, OWN_PICKUP_UNKNOWN_TEXT, ownPickupLabel, ownPickupPlannedText, ownPickupView } from "../../lib/own-transport.js";
|
|
15
15
|
import { formatLoadUnits } from "../../lib/load-carrier-labels.js";
|
|
16
16
|
import { formatDelivery, deliveryHasTimeFor, deliveryIsWallClockFor } from "../../lib/delivery-format.js";
|
|
@@ -24,6 +24,25 @@ export function useOrderTransport(orderId, enabled = true) {
|
|
|
24
24
|
staleTime: 30000,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
+
/** Melding bij Vervoer: transporteur in Floriday wijkt af van de gekozen vervoerder (alleen weergave). */
|
|
28
|
+
export function FloridayCarrierNoticeText({ text }) {
|
|
29
|
+
return (_jsxs("div", { role: "status", className: "mt-1 flex items-start gap-1.5 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", _jsx("span", { children: text })] }));
|
|
30
|
+
}
|
|
31
|
+
/** Zelfde melding voor meerdere orders (groep); per order met ordernummer als er meer zijn. */
|
|
32
|
+
export function FloridayCarrierNotices({ orderIds }) {
|
|
33
|
+
const fetchN = useServerFn(getFloridayCarrierNotices);
|
|
34
|
+
const ids = orderIds.filter(Boolean);
|
|
35
|
+
const q = useQuery({
|
|
36
|
+
queryKey: ["order-transport", "floriday-carrier", ...ids],
|
|
37
|
+
queryFn: () => fetchN({ data: { orderIds: ids } }),
|
|
38
|
+
enabled: ids.length > 0,
|
|
39
|
+
staleTime: 30000,
|
|
40
|
+
});
|
|
41
|
+
const rows = q.data ?? [];
|
|
42
|
+
if (!rows.length)
|
|
43
|
+
return null;
|
|
44
|
+
return (_jsx("div", { className: "space-y-0.5", children: rows.map((r) => (_jsx(FloridayCarrierNoticeText, { text: ids.length > 1 && r.orderNumber ? `${r.orderNumber}: ${r.melding}` : r.melding }, r.orderId))) }));
|
|
45
|
+
}
|
|
27
46
|
/** "do 29 okt 15:00" uit { date, time }. */
|
|
28
47
|
export function ownPickupText(p) {
|
|
29
48
|
if (!p)
|
|
@@ -82,7 +101,7 @@ export function OrderTransportCard({ order, groupSize, extra }) {
|
|
|
82
101
|
const missingOwnTime = view.melding === "invullen";
|
|
83
102
|
const signup = !t?.own && !afgehandeld ? formatMoment(pm.data?.departure?.signupDeadline ?? null) : null;
|
|
84
103
|
const karren = Number(order.karCount ?? 0);
|
|
85
|
-
return (_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer", attention: missingOwnTime, action: !locked ? (_jsx(Button, { size: "sm", variant: "ghost", className: "[@media(pointer:coarse)]:h-11", onClick: () => setChanging((v) => !v), "aria-expanded": changing, children: changing ? "Klaar" : "Vervoerder wijzigen" })) : undefined, children: [(groupSize ?? 0) > 1 && (_jsxs("div", { className: "mb-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: ["Vervoerder en ophaalmoment gelden voor alle ", groupSize, " orders in deze groep."] })), missingOwnTime && (_jsxs("div", { role: "status", className: "mb-2 flex items-start gap-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", OWN_PICKUP_MISSING_TEXT] })), view.melding === "onbekend" && !t?.ownPickup && (_jsx("div", { role: "status", className: "mb-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: OWN_PICKUP_UNKNOWN_TEXT })), locked ? (
|
|
104
|
+
return (_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer", attention: missingOwnTime, action: !locked ? (_jsx(Button, { size: "sm", variant: "ghost", className: "[@media(pointer:coarse)]:h-11", onClick: () => setChanging((v) => !v), "aria-expanded": changing, children: changing ? "Klaar" : "Vervoerder wijzigen" })) : undefined, children: [(groupSize ?? 0) > 1 && (_jsxs("div", { className: "mb-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: ["Vervoerder en ophaalmoment gelden voor alle ", groupSize, " orders in deze groep."] })), missingOwnTime && (_jsxs("div", { role: "status", className: "mb-2 flex items-start gap-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", OWN_PICKUP_MISSING_TEXT] })), view.melding === "onbekend" && !t?.ownPickup && (_jsx("div", { role: "status", className: "mb-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: OWN_PICKUP_UNKNOWN_TEXT })), locked ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: orderId, locked: true, compact: true }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : changing ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: orderId, compact: true, groupSize: groupSize }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : q.isLoading ? (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-muted-foreground", children: "Laden\u2026" }) })) : q.isError ? (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-destructive", children: "Het vervoer kon nu niet worden gelezen. Lukt het later nog niet, neem dan contact op met de beheerder." }) })) : hasCarrier ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsxs("span", { className: "inline-flex flex-wrap items-center gap-2", children: [_jsx("span", { children: carrier.carrierName }), _jsx(Badge, { variant: "outline", className: "text-xs", children: manual ? "Handmatig" : "Automatisch" })] }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-muted-foreground", children: "Nog geen vervoerder" }) })), !locked && t?.own && !view.editable && !t.ownPickup ? (_jsx(InfoRow, { label: ownPickupLabel(t.ownKind), children: _jsxs("div", { className: "space-y-0.5", children: [view.kopTijd && _jsx("div", { className: "tabular-nums", children: view.kopTijd }), view.melding === "planning" && _jsx("div", { className: "text-xs text-muted-foreground", children: ownPickupPlannedText(view.plannedTime) })] }) })) : !locked && t?.own ? (_jsx(InfoRow, { label: ownPickupLabel(t.ownKind), children: _jsx(OwnPickupEditor, { orderId: orderId, kind: t.ownKind, current: t.ownPickup, defaultDate: t.deliveryDate, locked: t.locked, lockedText: t.lockReason === "onbekend" ? OWN_PICKUP_UNKNOWN_TEXT : OWN_PICKUP_LOCKED_TEXT }, `${t.ownPickup?.date ?? ""}|${t.ownPickup?.time ?? ""}`) })) : !locked && t && !t.own ? (_jsx(InfoRow, { label: "Ophaalmoment", children: _jsx(OrderPickupMomentPicker, { orderId: orderId, pickupOnly: true, compact: true }) })) : null, signup && _jsx(InfoRow, { label: "Aanmelden v\u00F3\u00F3r", children: signup }), t?.carrierGln && _jsx(InfoRow, { label: "GLN vervoerder", children: t.carrierGln }), order.cartTypeName && _jsx(InfoRow, { label: "Ladingdrager", children: order.cartTypeName }), karren > 0 && _jsx(InfoRow, { label: "Karren", children: formatLoadUnits(karren, order.cartTypeName ?? null) }), extra] }));
|
|
86
105
|
}
|
|
87
106
|
/** Kopregel van een handmatige order: "Ophalen do 29 okt 15:00 · Levering vr 30 okt 08:00". */
|
|
88
107
|
export function PickupDeliveryLine({ order }) {
|
|
@@ -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":"AAwIA,wBAAgB,oBAAoB,gCA6WnC"}
|
|
@@ -23,6 +23,7 @@ import { useSalesOrdersQuery } from "../../lib/useSalesOrdersQuery.js";
|
|
|
23
23
|
import { useBufferEvents } from "../../lib/useBufferEvents.js";
|
|
24
24
|
import { useSalesOrderDetailQuery } from "../../lib/useSalesOrderDetailQuery.js";
|
|
25
25
|
import { useLocalSalesOrderDetailQuery } from "../../lib/useLocalSalesOrderDetailQuery.js";
|
|
26
|
+
import { localIdFallback } from "../../lib/order-nav.js";
|
|
26
27
|
import { getOrderAddresses } from "../../lib/order-addresses.functions.js";
|
|
27
28
|
import { orderStageLabel, orderStageBadgeClass } from "../../lib/order-status.js";
|
|
28
29
|
import { useDetailProgressFallback } from "../../lib/useDetailProgressFallback.js";
|
|
@@ -33,7 +34,7 @@ import { OrderStepper } from "./v3/OrderStepper.js";
|
|
|
33
34
|
import { NavigationTooltip } from "./v3/NavigationTooltip.js";
|
|
34
35
|
import { FactTile, InfoCard, InfoRow } from "./v3/InfoCard.js";
|
|
35
36
|
import { KLANT_HAALT_ZELF_OP } from "../../lib/own-transport.js";
|
|
36
|
-
import { PickupDeliveryLine, useOrderTransport } from "./OrderTransportCard.js";
|
|
37
|
+
import { FloridayCarrierNotices, PickupDeliveryLine, useOrderTransport } from "./OrderTransportCard.js";
|
|
37
38
|
import { groepZonderGeannuleerd, kanLidAnnuleren } from "../../lib/order-cancel-view.js";
|
|
38
39
|
import { geannuleerdMelding } from "../../lib/order-terugdraaien.js";
|
|
39
40
|
import { cancelLocalOrder } from "../../lib/create-order.functions.js";
|
|
@@ -101,16 +102,20 @@ export function SalesOrderDetailPage() {
|
|
|
101
102
|
const { weergave } = useSearch({ from: "/_authenticated/floriday-verkoop/verkooporders/$salesOrderId" });
|
|
102
103
|
const singleInGroup = weergave === "order";
|
|
103
104
|
const cached = useListRow(salesOrderId);
|
|
104
|
-
const
|
|
105
|
+
const isLocalPrefix = salesOrderId.startsWith("local:");
|
|
105
106
|
const isMailboxProposal = salesOrderId.startsWith("mailbox-proposal:");
|
|
106
|
-
const isFloriday = !isLocal && !isMailboxProposal;
|
|
107
107
|
// Kaartgegevens tegelijk met de order ophalen (geen tweede wachtronde).
|
|
108
108
|
useOrderDetailPrefetch(salesOrderId, { reservation: cached.row?.isReservation ?? null });
|
|
109
109
|
// Floriday-orders: gerichte, snelle per-order fetch.
|
|
110
|
-
const detailQuery = useSalesOrderDetailQuery(
|
|
110
|
+
const detailQuery = useSalesOrderDetailQuery(!isLocalPrefix && !isMailboxProposal ? salesOrderId : null);
|
|
111
|
+
// De route accepteert ook het kale orders.id: geen Floriday-order met dit id → eigen order.
|
|
112
|
+
const kaalId = localIdFallback(salesOrderId, detailQuery.data ? { order: detailQuery.data.order ?? null } : null);
|
|
113
|
+
const isLocal = isLocalPrefix || !!kaalId;
|
|
114
|
+
const isFloriday = !isLocal && !isMailboxProposal;
|
|
115
|
+
const localDetailId = isLocalPrefix ? salesOrderId : kaalId;
|
|
111
116
|
// Lokale orders: eveneens gericht ophalen, onafhankelijk van paginering en
|
|
112
117
|
// filters in de algemene verkooplijst.
|
|
113
|
-
const localDetailQuery = useLocalSalesOrderDetailQuery(
|
|
118
|
+
const localDetailQuery = useLocalSalesOrderDetailQuery(localDetailId);
|
|
114
119
|
// Alleen mailbox-orders hebben de algemene lijst nog nodig. Lokale en
|
|
115
120
|
// Floriday-details hebben een eigen gerichte bron; een tweede beschermde
|
|
116
121
|
// aanvraag kan hun detailweergave dus niet meer verstoren.
|
|
@@ -194,8 +199,8 @@ export function SalesOrderDetailPage() {
|
|
|
194
199
|
const bufferCartsQ = useBufferCarts(isBuffer ? bufferId : null);
|
|
195
200
|
const engineBuffer = bufferCartsQ.data?.carts ?? null;
|
|
196
201
|
const [editOpen, setEditOpen] = useState(false);
|
|
197
|
-
const rawLocalId = isLocal &&
|
|
198
|
-
?
|
|
202
|
+
const rawLocalId = isLocal && localDetailId?.startsWith("local:")
|
|
203
|
+
? localDetailId.slice("local:".length)
|
|
199
204
|
: null;
|
|
200
205
|
// Factuurstand + pickvoortgang komen mee in het detailverzoek (geen tweede ronde).
|
|
201
206
|
const qcSeed = useQueryClient();
|
|
@@ -262,7 +267,7 @@ export function SalesOrderDetailPage() {
|
|
|
262
267
|
: `${sourceLabel(sources[0])}-order` }), isBuffer && fTotal > 0 && (_jsxs("p", { className: "text-xs font-medium tabular-nums text-foreground", children: ["Afgemeld: ", fDone, " van ", fTotal] })), !isBuffer && isLocal && _jsx(PickupDeliveryLine, { order: head }), !isBuffer && fmtDT(head.orderedAt) && (_jsxs("p", { className: "text-xs text-muted-foreground", children: ["Ontvangen op ", fmtDT(head.orderedAt)] }))] })] }), rawLocalId && !isBuffer && (_jsxs(Button, { variant: "outline", size: "sm", onClick: () => setEditOpen(true), disabled: !primary, className: "w-full sm:w-auto", children: [_jsx(Pencil, { className: "mr-2 h-4 w-4" }), " Bestelling bewerken"] }))] })), singleInGroup && inGroup && primary && (_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2 rounded-xl border border-primary/30 bg-primary/5 px-4 py-3 text-sm", children: [_jsxs("span", { className: "inline-flex items-center gap-2 text-foreground", children: [_jsx(Layers, { className: "h-4 w-4 text-primary" }), " Onderdeel van een samengevoegde order met ", bufferOrders.length, " orders"] }), _jsx(Button, { asChild: true, variant: "outline", size: "sm", children: _jsx(Link, { to: "/floriday-verkoop/verkooporders/$salesOrderId", params: { salesOrderId }, children: "Naar samengevoegde weergave" }) })] })), primary && _jsx(OrderStepper, { members: membersFor(isBuffer ? bufferOrders : [primary]), features: features, invoiceLoad: invoiceLoad }), isLoading && !primary && _jsx(DetailSkeleton, {}), error && !primary && (() => {
|
|
263
268
|
const f = friendlyLoadError(error);
|
|
264
269
|
return (_jsxs("div", { role: "alert", className: "flex items-start gap-3 rounded-xl border border-destructive/30 bg-destructive-soft p-4 text-sm", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-5 w-5 shrink-0 text-destructive" }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "font-medium text-foreground", children: f.text }), _jsxs("details", { className: "mt-1 text-xs text-muted-foreground", children: [_jsx("summary", { className: "cursor-pointer", children: "Technische details" }), f.tech] })] }), _jsx(Button, { size: "sm", variant: "outline", onClick: () => activeQuery.refetch(), children: "Opnieuw" })] }));
|
|
265
|
-
})(), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-xl border border-border bg-card p-8 text-center text-sm text-muted-foreground shadow-sm", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(Euro, {}), label: "Totale omzet", value: eur.format(totals.revenue), sub: `${bufferOrders.length} orders` }), _jsx(FactTile, { icon: _jsx(Boxes, {}), label: "Karren", value: engineBuffer ? engineBuffer.karren : totals.karren == null ? "Nog niet bekend" : formatLoadUnits(totals.karren, totals.cartType), sub: engineBuffer && engineBuffer.ladingdragers.length > 0 ? ladingdragerSummary(engineBuffer) : undefined }), _jsx(FactTile, { icon: _jsx(Layers, {}), label: "Fust", value: formatLoadUnits(totals.fusten, totals.crateType) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: primary.customer.name, sub: primary.customer.legalName ?? undefined })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx(InfoCard, { icon: _jsx(Layers, {}), title: `Orders in deze groep (${bufferOrders.length})`, children: _jsx("div", { className: "space-y-3", children: bufferOrders.map((o) => (_jsx(BufferOrderRow, { order: o, member: membersFor([o])[0], sellerFallback: sellerFallback }, o.id))) }) }), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-semibold text-foreground", children: "Gecombineerde karindeling" }), _jsx(OrderKarindelingCard, { order: primary, pickProgress: bufferPickProgress(engineBuffer, membersFor(bufferOrders).map((m) => m.pickProgress ?? null)) })] })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer en ophalen", children: [
|
|
270
|
+
})(), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-xl border border-border bg-card p-8 text-center text-sm text-muted-foreground shadow-sm", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(Euro, {}), label: "Totale omzet", value: eur.format(totals.revenue), sub: `${bufferOrders.length} orders` }), _jsx(FactTile, { icon: _jsx(Boxes, {}), label: "Karren", value: engineBuffer ? engineBuffer.karren : totals.karren == null ? "Nog niet bekend" : formatLoadUnits(totals.karren, totals.cartType), sub: engineBuffer && engineBuffer.ladingdragers.length > 0 ? ladingdragerSummary(engineBuffer) : undefined }), _jsx(FactTile, { icon: _jsx(Layers, {}), label: "Fust", value: formatLoadUnits(totals.fusten, totals.crateType) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: primary.customer.name, sub: primary.customer.legalName ?? undefined })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx(InfoCard, { icon: _jsx(Layers, {}), title: `Orders in deze groep (${bufferOrders.length})`, children: _jsx("div", { className: "space-y-3", children: bufferOrders.map((o) => (_jsx(BufferOrderRow, { order: o, member: membersFor([o])[0], sellerFallback: sellerFallback }, o.id))) }) }), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-semibold text-foreground", children: "Gecombineerde karindeling" }), _jsx(OrderKarindelingCard, { order: primary, pickProgress: bufferPickProgress(engineBuffer, membersFor(bufferOrders).map((m) => m.pickProgress ?? null)) })] })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer en ophalen", children: [_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: primary.id, applyToBuffer: true, compact: true, groupSize: bufferOrders.length, locked: bufferOrders.every((o) => !!o.isReservation) }), _jsx(FloridayCarrierNotices, { orderIds: bufferOrders.map((o) => String(o.id)) })] }), _jsxs(InfoRow, { label: "Ophaalmoment", children: [_jsx(OrderPickupMomentPicker, { orderId: primary.id, readOnly: true, compact: true }), _jsxs("div", { className: "mt-1 text-xs font-medium text-warning-soft-foreground", children: ["Geldt voor alle ", bufferOrders.length, " orders in deze groep"] })] }), _jsx(BufferAddresses, { orderId: primary.id })] }), fTotal > 0 && (_jsxs(InfoCard, { icon: _jsx(ReceiptText, {}), title: "Floriday", children: [_jsx(InfoRow, { label: "Floriday-orders", children: _jsx("span", { className: "flex flex-wrap gap-1.5", children: bufferOrders.filter((o) => !o.isLocal && o.orderNumber).map((o) => (_jsx(Badge, { variant: "outline", className: "text-xs", children: o.orderNumber }, o.id))) }) }), _jsxs(InfoRow, { label: "Afgemeld", children: [fDone, " van ", fTotal] })] }))] })] })] })), inGroup && !singleInGroup && rawLocalId && _jsx(EngineBufferCard, { orderId: rawLocalId }), primary && !isBuffer && (_jsx(SalesOrderDetailView, { order: primary, sellerFallback: sellerFallback, members: membersFor([primary]), features: features, groupSize: inGroup ? bufferOrders.length : undefined })), rawLocalId && _jsx(EditLocalOrderDialog, { orderId: rawLocalId, open: editOpen, onOpenChange: setEditOpen })] }));
|
|
266
271
|
}
|
|
267
272
|
function BufferOrderRow({ order, member, sellerFallback }) {
|
|
268
273
|
const [open, setOpen] = useState(false);
|
|
@@ -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;AAqKnE,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"}
|
|
@@ -26,6 +26,9 @@ import { OrderCorrectiesCard } from "./correcties/OrderCorrectiesCard.js";
|
|
|
26
26
|
import { OudeOrderCard } from "./correcties/OudeOrderCard.js";
|
|
27
27
|
import { GewijzigdNaPrintCard } from "./tijdlijn/GewijzigdNaPrintCard.js";
|
|
28
28
|
import { OrderTijdlijnCard } from "./tijdlijn/OrderTijdlijnCard.js";
|
|
29
|
+
import { OrderLineExtrasCard } from "./regel/OrderLineExtrasCard.js";
|
|
30
|
+
import { listOrderItemPacking } from "../../lib/order-item-packing.functions.js";
|
|
31
|
+
import { formatBelading } from "../../lib/belading-format.js";
|
|
29
32
|
function AddressCard({ icon, lines, extra, }) {
|
|
30
33
|
return (_jsxs("div", { className: "inline-flex max-w-xs items-start gap-3 rounded-md border border-border bg-card p-3", children: [_jsx("div", { className: "flex h-9 w-9 items-center justify-center rounded-md bg-primary/10 text-primary", children: icon }), _jsxs("div", { className: "text-sm", children: [lines.length > 0 ? lines.map((l, i) => _jsx("div", { children: l }, i)) : _jsx("div", { children: "\u2014" }), extra && _jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: extra })] })] }));
|
|
31
34
|
}
|
|
@@ -147,14 +150,28 @@ function SalesOrderDetailViewInner({ floridayLoading, order, sellerFallback, hid
|
|
|
147
150
|
const o = order.raw.order ?? {};
|
|
148
151
|
const c = order.raw.customer ?? {};
|
|
149
152
|
const cRaw = c?.raw ?? {};
|
|
153
|
+
// Floriday-order die nog niet als eigen order bestaat: niets opvragen dat een eigen order nodig heeft.
|
|
154
|
+
const wordtVerwerkt = order.stageNote === "processing";
|
|
150
155
|
const fetchAddresses = useServerFn(getOrderAddresses);
|
|
151
156
|
const { data: resolvedAddresses } = useQuery({
|
|
152
157
|
queryKey: ["order-addresses", order.id],
|
|
153
158
|
queryFn: () => fetchAddresses({ data: { orderId: String(order.id) } }),
|
|
154
159
|
staleTime: 60000,
|
|
160
|
+
enabled: !wordtVerwerkt,
|
|
155
161
|
});
|
|
162
|
+
// Regels met belading en prijs: één aanvraag, gedeeld met de beladingkaart en de karindeling.
|
|
163
|
+
const fetchPacking = useServerFn(listOrderItemPacking);
|
|
164
|
+
const packingQ = useQuery({
|
|
165
|
+
queryKey: ["order-item-packing", String(order.id)],
|
|
166
|
+
queryFn: () => fetchPacking({ data: { orderId: String(order.id) } }),
|
|
167
|
+
staleTime: 15000,
|
|
168
|
+
enabled: !wordtVerwerkt,
|
|
169
|
+
});
|
|
170
|
+
if (packingQ.isError)
|
|
171
|
+
console.error("[orderpagina] regels laden:", packingQ.error);
|
|
172
|
+
const regelItems = packingQ.data?.items ?? [];
|
|
156
173
|
// Zelf ophalen (carrier_kind klant_haalt_op, via de Engine): geen afleveradres maar "Klant haalt zelf op".
|
|
157
|
-
const transportQ = useOrderTransport(String(order.id), !order.isReservation);
|
|
174
|
+
const transportQ = useOrderTransport(String(order.id), !order.isReservation && !wordtVerwerkt);
|
|
158
175
|
const klantHaaltOp = transportQ.data?.ownKind === "klant_haalt_op";
|
|
159
176
|
const instr = String(o.tradeInstrument ?? o.tradingType ?? o.tradeType ?? "").toUpperCase();
|
|
160
177
|
const tradingType = TRADE_INSTRUMENT_LABELS[instr] ?? (instr ? instr.replace(/_/g, " ").toLowerCase() : "—");
|
|
@@ -313,15 +330,20 @@ function SalesOrderDetailViewInner({ floridayLoading, order, sellerFallback, hid
|
|
|
313
330
|
const verkoopwijze = [tradingType !== "—" ? tradingType : null, financial !== "—" ? financial : null].filter(Boolean).join(" · ") || "—";
|
|
314
331
|
const showIncoterm = !!fe && incoterm !== "niet opgegeven" && incoterm !== "—";
|
|
315
332
|
const hasExternal = !!order.floridayExternalFulfilledAt || (order.floridayExternalFulfilledIds?.length ?? 0) > 0;
|
|
316
|
-
return (_jsxs("div", { className: "space-y-4", children: [order.needsManualReview ? (_jsxs(Notice, { tone: "destructive", title: "Handmatige controle nodig", children: [order.needsManualReview.reason, order.needsManualReview.at ? ` (gezien op ${fmtNLDefault(order.needsManualReview.at)})` : ""] })) : null, isFlorinOrder && order.mixedDeliveryDates ? (_jsx(Notice, { tone: "muted", title: "Bestellingen met verschillende leverdatums", children: "Deze order bestaat uit Floriday-bestellingen met verschillende leverdatums. De vroegste leverdatum is aangehouden." })) : null, isFlorinOrder && (order.unlinkedProducts?.length ?? 0) > 0 ? (_jsxs(Notice, { tone: "destructive", title: "Artikel uit Floriday nog niet gekoppeld aan een eigen product", children: [_jsx("ul", { className: "mt-1 space-y-0.5", children: order.unlinkedProducts.map((u, i) => (_jsx("li", { children: u.name }, i))) }), _jsx("div", { className: "mt-1 text-xs", children: "Koppel het artikel aan een eigen product; bij de volgende update wordt het overgenomen." })] })) : null, order.floridayMissingLineKeyNotice && (_jsx(Notice, { tone: "destructive", title: "Let op", children: order.floridayMissingLineKeyNotice })), _jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(CalendarDays, {}), label: "Leverdatum", value: order.deliveryAt ? formatDelivery(order.deliveryAt, deliveryHasTimeFor(order), { year: true, wallClock: deliveryIsWallClockFor(order) }).date : "—", sub: _jsx(DeliveryTileSub, { order: order }) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: customerName || "—", sub: [customerLegalName, order.customer.city].filter(Boolean).join(" · ") || undefined }), klantHaaltOp
|
|
333
|
+
return (_jsxs("div", { className: "space-y-4", children: [wordtVerwerkt ? (_jsx(Notice, { tone: "muted", title: "Wordt verwerkt", children: "Deze Floriday-order staat nog niet in het ERP. Hij wordt binnen een paar minuten overgenomen; daarna verschijnen karindeling en afhandeling hier vanzelf." })) : null, order.needsManualReview ? (_jsxs(Notice, { tone: "destructive", title: "Handmatige controle nodig", children: [order.needsManualReview.reason, order.needsManualReview.at ? ` (gezien op ${fmtNLDefault(order.needsManualReview.at)})` : ""] })) : null, isFlorinOrder && order.mixedDeliveryDates ? (_jsx(Notice, { tone: "muted", title: "Bestellingen met verschillende leverdatums", children: "Deze order bestaat uit Floriday-bestellingen met verschillende leverdatums. De vroegste leverdatum is aangehouden." })) : null, isFlorinOrder && (order.unlinkedProducts?.length ?? 0) > 0 ? (_jsxs(Notice, { tone: "destructive", title: "Artikel uit Floriday nog niet gekoppeld aan een eigen product", children: [_jsx("ul", { className: "mt-1 space-y-0.5", children: order.unlinkedProducts.map((u, i) => (_jsx("li", { children: u.name }, i))) }), _jsx("div", { className: "mt-1 text-xs", children: "Koppel het artikel aan een eigen product; bij de volgende update wordt het overgenomen." })] })) : null, order.floridayMissingLineKeyNotice && (_jsx(Notice, { tone: "destructive", title: "Let op", children: order.floridayMissingLineKeyNotice })), _jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(CalendarDays, {}), label: "Leverdatum", value: order.deliveryAt ? formatDelivery(order.deliveryAt, deliveryHasTimeFor(order), { year: true, wallClock: deliveryIsWallClockFor(order) }).date : "—", sub: _jsx(DeliveryTileSub, { order: order }) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: customerName || "—", sub: [customerLegalName, order.customer.city].filter(Boolean).join(" · ") || undefined }), klantHaaltOp
|
|
317
334
|
? _jsx(FactTile, { icon: _jsx(MapPin, {}), label: "Leveradres", value: KLANT_HAALT_ZELF_OP })
|
|
318
335
|
: _jsx(FactTile, { icon: _jsx(MapPin, {}), label: "Leveradres", value: deliveryLines[0] ?? "—", sub: deliveryLines.slice(1).join(", ") || undefined }), (() => {
|
|
319
336
|
const noCarrier = !order.cartTypeName || /geen ladingdrager/i.test(order.cartTypeName);
|
|
320
337
|
const fust = order.fustCount > 0 ? `${formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName)} fust` : "";
|
|
321
338
|
return (_jsx(FactTile, { icon: _jsx(Boxes, {}), label: "Karren / fusten", value: noCarrier ? (fust || "Geen ladingdrager") : formatLoadUnits(order.karCount, order.cartTypeName), sub: [noCarrier ? (fust ? "Geen ladingdrager" : "") : fust, order.karShared ? "kar gedeeld met andere orders" : ""].filter(Boolean).join(" · ") || undefined }));
|
|
322
|
-
})()] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Flower2, {}), title: "Artikelen", attention: priceProblem, children: [_jsx("div", { className: "-mx-4 overflow-x-auto sm:-mx-5", children: _jsxs("table", { className: "w-full min-w-[520px] text-sm", children: [_jsx("thead", { children: _jsxs("tr", { className: "border-b border-border text-left text-[11px] font-semibold uppercase tracking-wider text-muted-foreground", children: [_jsx("th", { className: "px-4 py-2 font-semibold sm:px-5", children: "Artikel" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Aantal" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Fust" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Prijs" }), _jsx("th", { className: "px-4 py-2 font-semibold sm:px-5", children: "Totaal" })] }) }), _jsx("tbody", { children:
|
|
339
|
+
})()] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Flower2, {}), title: "Artikelen", attention: priceProblem, children: [_jsx("div", { className: "-mx-4 overflow-x-auto sm:-mx-5", children: _jsxs("table", { className: "w-full min-w-[520px] text-sm", children: [_jsx("thead", { children: _jsxs("tr", { className: "border-b border-border text-left text-[11px] font-semibold uppercase tracking-wider text-muted-foreground", children: [_jsx("th", { className: "px-4 py-2 font-semibold sm:px-5", children: "Artikel" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Aantal" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Fust" }), _jsx("th", { className: "px-2 py-2 font-semibold", children: "Prijs" }), _jsx("th", { className: "px-4 py-2 font-semibold sm:px-5", children: "Totaal" })] }) }), _jsx("tbody", { children: regelItems.length > 1 ? regelItems.map((it) => {
|
|
340
|
+
const bel = formatBelading({ perFust: it.plantsPerCrate, fustenPerLaag: it.cratesPerLayer, lagenPerKar: it.layersPerCart });
|
|
341
|
+
const fusten = it.plantsPerCrate && it.plantsPerCrate > 0 ? Math.ceil(it.quantity / it.plantsPerCrate) : null;
|
|
342
|
+
const prijs = it.unitPrice != null && it.unitPrice > 0 ? it.unitPrice : null;
|
|
343
|
+
return (_jsxs("tr", { className: "border-b border-border", children: [_jsx("td", { className: "px-4 py-3 sm:px-5", children: _jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate font-medium text-foreground", children: it.productName }), _jsx("div", { className: "text-xs text-muted-foreground", children: bel ? `Belading ${bel}` : "Belading onbekend" })] }) }), _jsx("td", { className: "px-2 py-3 font-semibold tabular-nums", children: it.quantity > 0 ? it.quantity.toLocaleString("nl-NL") : "—" }), _jsx("td", { className: "px-2 py-3 tabular-nums", children: fusten != null ? fusten.toLocaleString("nl-NL") : "—" }), _jsx("td", { className: "px-2 py-3 tabular-nums", children: prijs != null ? eurFlex.format(prijs) : "—" }), _jsx("td", { className: "px-4 py-3 font-semibold tabular-nums sm:px-5", children: prijs != null ? eurFlex.format(prijs * it.quantity) : "—" })] }, it.id));
|
|
344
|
+
}) : (_jsxs("tr", { className: "border-b border-border", children: [_jsx("td", { className: "px-4 py-3 sm:px-5", children: _jsxs("div", { className: "flex min-w-0 items-center gap-3", children: [_jsx("div", { className: "flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-lg 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", children: [_jsx("div", { className: "truncate font-medium text-foreground", children: order.productName }), _jsx("div", { className: "text-xs text-muted-foreground", children: order.mixedPacking
|
|
323
345
|
? (order.articleCount ?? 0) > 1 ? `Gemengd (${order.articleCount} artikelen)` : "Gemengd"
|
|
324
|
-
: `Belading ${belading}` })] })] }) }), _jsx("td", { className: "px-2 py-3 font-semibold tabular-nums", children: numberOfPieces > 0 ? numberOfPieces.toLocaleString("nl-NL") : "—" }), _jsx("td", { className: "px-2 py-3 tabular-nums", children: formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName) }), _jsxs("td", { className: "px-2 py-3 tabular-nums", children: [oldProductPrice !== null && _jsx("span", { className: "mr-1 text-destructive line-through", children: eurFlex.format(oldProductPrice) }), eurFlex.format(productUnit)] }), _jsx("td", { className: "px-4 py-3 font-semibold tabular-nums sm:px-5", children: eurFlex.format(totalAmount) })] }) })] }) }), _jsxs("div", { className: "mt-3 space-y-1.5 text-sm", children: [_jsxs("div", { className: "flex justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Transportkosten per stuk" }), _jsx("span", { className: "tabular-nums", children: eurFlex.format(transportPerPiece) })] }), _jsxs("div", { className: "flex justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Inkoopprijs per stuk" }), _jsx("span", { className: "tabular-nums", children: hasPurchase ? eurFlex.format(purchaseUnit) : "—" })] }), hasCorrection && (_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Prijscorrectie" }), _jsxs("span", { className: "inline-flex items-center gap-1.5", children: [_jsx(CheckCircle2, { className: "h-4 w-4 text-primary" }), " Verwerkt"] })] })), _jsxs("div", { className: "flex items-baseline justify-between gap-3 border-t border-border pt-2 text-base font-semibold", children: [_jsx("span", { children: "Totaal" }), _jsxs("span", { className: "text-right tabular-nums", children: [totalBreakdown && _jsxs("span", { className: "mr-2 block text-xs font-normal text-muted-foreground sm:inline", children: ["(", totalBreakdown, ")"] }), eurFlex.format(totalAmount)] })] }), priceProblem && (_jsxs("div", { className: "rounded-lg border border-destructive/40 bg-destructive-soft px-3 py-2 text-xs text-destructive", children: ["Prijs ontbreekt: ", linesWithoutPrice || "een of meer", " regel(s) zonder prijs. Vul de prijs in voordat de order wordt bevestigd."] }))] })] }), _jsx(InfoCard, { icon: _jsx(MapPin, {}), title: "Aflever- en ophaalgegevens", children: _jsxs("div", { className: "grid grid-cols-1 gap-3 py-1 sm:grid-cols-2", children: [klantHaaltOp ? (_jsxs("div", { className: "flex min-w-0 items-start gap-3 rounded-xl border border-border p-4", children: [_jsx("span", { className: "mt-0.5 shrink-0 text-primary [&_svg]:h-5 [&_svg]:w-5", "aria-hidden": true, children: _jsx(MapPin, {}) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "mb-1 text-sm font-semibold text-foreground", children: "Afleveradres" }), _jsx("span", { className: "text-foreground", children: KLANT_HAALT_ZELF_OP })] })] })) : (_jsx(AddressBox, { title: "Afleveradres", icon: _jsx(MapPin, {}), lines: deliveryLines })), _jsx(AddressBox, { title: "Ophaaladres", icon: _jsx(Truck, {}), lines: pickupLines })] }) }), _jsx(GewijzigdNaPrintCard, { orderRowId: invoiceOrderId, floriday: !order.isLocal }), _jsx(OrderCorrectiesCard, { salesOrderIds: Array.from(new Set([...(order.floridayIds ?? []), ...(o?.salesOrderId ? [String(o.salesOrderId)] : [])])), floridayOrder: o, orderRowId: invoiceOrderId }), _jsx(OudeOrderCard, { orderRowId: invoiceOrderId }), _jsx(OrderShipmentsCard, { order: order }), _jsx(OrderLinePackingCard, { orderId: String(order.id) }), !hideKarindeling && _jsx(OrderKarindelingCard, { order: order, pickProgress: member?.pickProgress ?? null })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(ClipboardList, {}), title: "Orderinformatie", children: [_jsx(InfoRow, { label: "Ordernummer", children: order.orderNumber || "—" }), _jsx(InfoRow, { label: "Status", children: _jsx("span", { className: `rounded-full px-2 py-0.5 text-xs font-medium ${orderStageBadgeClass(order.stage ?? "incoming")}`, children: bestellingLabel }) }), _jsx(InfoRow, { label: "Besteld op", children: fmtDateTime(order.orderedAt) }), _jsx(InfoRow, { label: "Klantreferentie", children: klantReferentie }), isFlorinOrder && _jsx(InfoRow, { label: "Verkoopkanaal", children: verkoopkanaal }), isFlorinOrder && _jsx(InfoRow, { label: "Verkoopwijze", children: verkoopwijze }), isFlorinOrder && _jsx(InfoRow, { label: "Floriday-referentie", children: floridayRef }), _jsx(InfoRow, { label: "Verkoper", children: sellerName ? (_jsxs("span", { className: "inline-flex items-center gap-2", children: [_jsx("span", { className: "inline-flex h-6 w-6 items-center justify-center rounded-full bg-muted text-[10px] font-semibold text-muted-foreground", children: initials(sellerName) }), sellerName] })) : "—" }), hasExternal && (_jsx(InfoRow, { label: "Afhandeling", children: order.floridayExternalFulfilledAt
|
|
346
|
+
: `Belading ${belading}` })] })] }) }), _jsx("td", { className: "px-2 py-3 font-semibold tabular-nums", children: numberOfPieces > 0 ? numberOfPieces.toLocaleString("nl-NL") : "—" }), _jsx("td", { className: "px-2 py-3 tabular-nums", children: formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName) }), _jsxs("td", { className: "px-2 py-3 tabular-nums", children: [oldProductPrice !== null && _jsx("span", { className: "mr-1 text-destructive line-through", children: eurFlex.format(oldProductPrice) }), eurFlex.format(productUnit)] }), _jsx("td", { className: "px-4 py-3 font-semibold tabular-nums sm:px-5", children: eurFlex.format(totalAmount) })] })) })] }) }), _jsxs("div", { className: "mt-3 space-y-1.5 text-sm", children: [_jsxs("div", { className: "flex justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Transportkosten per stuk" }), _jsx("span", { className: "tabular-nums", children: eurFlex.format(transportPerPiece) })] }), _jsxs("div", { className: "flex justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Inkoopprijs per stuk" }), _jsx("span", { className: "tabular-nums", children: hasPurchase ? eurFlex.format(purchaseUnit) : "—" })] }), hasCorrection && (_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Prijscorrectie" }), _jsxs("span", { className: "inline-flex items-center gap-1.5", children: [_jsx(CheckCircle2, { className: "h-4 w-4 text-primary" }), " Verwerkt"] })] })), _jsxs("div", { className: "flex items-baseline justify-between gap-3 border-t border-border pt-2 text-base font-semibold", children: [_jsx("span", { children: "Totaal" }), _jsxs("span", { className: "text-right tabular-nums", children: [totalBreakdown && _jsxs("span", { className: "mr-2 block text-xs font-normal text-muted-foreground sm:inline", children: ["(", totalBreakdown, ")"] }), eurFlex.format(totalAmount)] })] }), priceProblem && (_jsxs("div", { className: "rounded-lg border border-destructive/40 bg-destructive-soft px-3 py-2 text-xs text-destructive", children: ["Prijs ontbreekt: ", linesWithoutPrice || "een of meer", " regel(s) zonder prijs. Vul de prijs in voordat de order wordt bevestigd."] }))] })] }), _jsx(InfoCard, { icon: _jsx(MapPin, {}), title: "Aflever- en ophaalgegevens", children: _jsxs("div", { className: "grid grid-cols-1 gap-3 py-1 sm:grid-cols-2", children: [klantHaaltOp ? (_jsxs("div", { className: "flex min-w-0 items-start gap-3 rounded-xl border border-border p-4", children: [_jsx("span", { className: "mt-0.5 shrink-0 text-primary [&_svg]:h-5 [&_svg]:w-5", "aria-hidden": true, children: _jsx(MapPin, {}) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "mb-1 text-sm font-semibold text-foreground", children: "Afleveradres" }), _jsx("span", { className: "text-foreground", children: KLANT_HAALT_ZELF_OP })] })] })) : (_jsx(AddressBox, { title: "Afleveradres", icon: _jsx(MapPin, {}), lines: deliveryLines })), _jsx(AddressBox, { title: "Ophaaladres", icon: _jsx(Truck, {}), lines: pickupLines })] }) }), !wordtVerwerkt && _jsx(GewijzigdNaPrintCard, { orderRowId: invoiceOrderId, floriday: !order.isLocal }), _jsx(OrderCorrectiesCard, { salesOrderIds: Array.from(new Set([...(order.floridayIds ?? []), ...(o?.salesOrderId ? [String(o.salesOrderId)] : [])])), floridayOrder: o, orderRowId: invoiceOrderId }), _jsx(OudeOrderCard, { orderRowId: invoiceOrderId }), _jsx(OrderShipmentsCard, { order: order }), !wordtVerwerkt && _jsx(OrderLinePackingCard, { orderId: String(order.id) }), !wordtVerwerkt && order.isLocal && (_jsx(OrderLineExtrasCard, { orderId: String(order.id), pickProgress: member?.pickProgress ?? null, pickKnown: features?.pickProgress === true })), !hideKarindeling && !wordtVerwerkt && _jsx(OrderKarindelingCard, { order: order, pickProgress: member?.pickProgress ?? null })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(ClipboardList, {}), title: "Orderinformatie", children: [_jsx(InfoRow, { label: "Ordernummer", children: order.orderNumber || "—" }), _jsx(InfoRow, { label: "Status", children: _jsx("span", { className: `rounded-full px-2 py-0.5 text-xs font-medium ${orderStageBadgeClass(order.stage ?? "incoming")}`, children: bestellingLabel }) }), _jsx(InfoRow, { label: "Besteld op", children: fmtDateTime(order.orderedAt) }), _jsx(InfoRow, { label: "Klantreferentie", children: klantReferentie }), isFlorinOrder && _jsx(InfoRow, { label: "Verkoopkanaal", children: verkoopkanaal }), isFlorinOrder && _jsx(InfoRow, { label: "Verkoopwijze", children: verkoopwijze }), isFlorinOrder && _jsx(InfoRow, { label: "Floriday-referentie", children: floridayRef }), _jsx(InfoRow, { label: "Verkoper", children: sellerName ? (_jsxs("span", { className: "inline-flex items-center gap-2", children: [_jsx("span", { className: "inline-flex h-6 w-6 items-center justify-center rounded-full bg-muted text-[10px] font-semibold text-muted-foreground", children: initials(sellerName) }), sellerName] })) : "—" }), hasExternal && (_jsx(InfoRow, { label: "Afhandeling", children: order.floridayExternalFulfilledAt
|
|
325
347
|
? `Afgehandeld in Floriday · ${formatMoment(order.floridayExternalFulfilledAt)}`
|
|
326
348
|
: `${order.floridayExternalFulfilledIds.length} bestelling(en) afgehandeld in Floriday; de rest loopt door` }))] }), _jsx(OrderTijdlijnCard, { orderRowId: invoiceOrderId, floriday: !order.isLocal }), _jsx(OrderTransportCard, { order: order, groupSize: groupSize, extra: showIncoterm ? _jsx(InfoRow, { label: "Leveringsvoorwaarde", children: incoterm }) : undefined }), _jsx(InfoCard, { icon: _jsx(ReceiptText, {}), title: route === "floriday" ? "Factuur via Floriday" : "Factuur", attention: route === "erp" && priceProblem, children: route === "floriday" ? (_jsxs(_Fragment, { children: [_jsx(InfoRow, { label: "Stand", children: invoiceStandText(member, features) }), _jsx(InfoRow, { label: "Gefactureerd door", children: "Royal FloraHolland, via Floriday" }), member && (_jsxs(InfoRow, { label: "Afgemeld", children: [member.floridayDone, " van ", member.floridayTotal] })), member && member.stage === "shipped" && member.floridayDone < member.floridayTotal && (_jsx("div", { className: "mt-2 text-xs text-warning-soft-foreground", children: "De factuur volgt pas na afmelden bij Floriday." })), (() => {
|
|
327
349
|
const line = floridayInvoiceState(order.floridayRawStatus, member?.floridayDone ?? 0, member?.floridayTotal ?? 0, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchableSelect.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SearchableSelect.tsx"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yEAAyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uDAAuD;IACvD,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC;IAC9D,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAUD,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"SearchableSelect.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SearchableSelect.tsx"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yEAAyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uDAAuD;IACvD,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC;IAC9D,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAUD,eAAO,MAAM,gBAAgB,qHAsH3B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { forwardRef, useMemo, useState } from "react";
|
|
2
|
+
import { forwardRef, useEffect, useMemo, useRef, useState } from "react";
|
|
3
3
|
import { Button, Input, Popover, PopoverContent, PopoverTrigger, } from "@flowselections/core";
|
|
4
4
|
import { Check, ChevronsUpDown, Search } from "lucide-react";
|
|
5
5
|
function Thumb({ src }) {
|
|
@@ -7,7 +7,16 @@ function Thumb({ src }) {
|
|
|
7
7
|
}
|
|
8
8
|
export const SearchableSelect = forwardRef(function SearchableSelect({ value, options, placeholder = "Kies...", emptyLabel = "Geen resultaat", allowClear = true, clearLabel = "— Geen koppeling —", onChange, className, disabled = false, showImages = false, renderValue, id, }, ref) {
|
|
9
9
|
const [open, setOpen] = useState(false);
|
|
10
|
+
// De zoektekst blijft na sluiten staan; bij openen wordt hij geselecteerd,
|
|
11
|
+
// zodat typen hem direct vervangt.
|
|
10
12
|
const [q, setQ] = useState("");
|
|
13
|
+
const zoekRef = useRef(null);
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
if (!open)
|
|
16
|
+
return;
|
|
17
|
+
const t = setTimeout(() => zoekRef.current?.select(), 0);
|
|
18
|
+
return () => clearTimeout(t);
|
|
19
|
+
}, [open]);
|
|
11
20
|
const selected = useMemo(() => options.find((o) => o.value === value) ?? null, [options, value]);
|
|
12
21
|
const filtered = useMemo(() => {
|
|
13
22
|
const needle = q.trim().toLowerCase();
|
|
@@ -19,8 +28,7 @@ export const SearchableSelect = forwardRef(function SearchableSelect({ value, op
|
|
|
19
28
|
.slice(0, 200);
|
|
20
29
|
}, [options, q]);
|
|
21
30
|
return (_jsxs(Popover, { open: open, onOpenChange: (o) => { if (disabled)
|
|
22
|
-
return; setOpen(o);
|
|
23
|
-
setQ(""); }, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs(Button, { type: "button", variant: "outline", role: "combobox", "aria-expanded": open, disabled: disabled, ref: ref, id: id, className: `w-full min-w-0 max-w-full [@media(pointer:coarse)]:min-h-11 justify-between overflow-hidden font-normal ${className ?? ""}`, children: [renderValue && selected ? (_jsx("span", { className: "flex min-w-0 flex-1 items-center gap-2 text-left", children: renderValue(selected) })) : (_jsx("span", { className: `truncate ${selected ? "" : "text-muted-foreground"}`, children: selected?.label ?? placeholder })), _jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), _jsxs(PopoverContent, { className: "w-[--radix-popover-trigger-width] p-0", align: "start", children: [_jsx("div", { className: "p-2 border-b", children: _jsxs("div", { className: "relative", children: [_jsx(Search, { className: "absolute left-2 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" }), _jsx(Input, { autoFocus: true, value: q, onChange: (e) => setQ(e.target.value), onKeyDown: (e) => {
|
|
31
|
+
return; setOpen(o); }, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs(Button, { type: "button", variant: "outline", role: "combobox", "aria-expanded": open, disabled: disabled, ref: ref, id: id, className: `w-full min-w-0 max-w-full [@media(pointer:coarse)]:min-h-11 justify-between overflow-hidden font-normal ${className ?? ""}`, children: [renderValue && selected ? (_jsx("span", { className: "flex min-w-0 flex-1 items-center gap-2 text-left", children: renderValue(selected) })) : (_jsx("span", { className: `truncate ${selected ? "" : "text-muted-foreground"}`, children: selected?.label ?? placeholder })), _jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), _jsxs(PopoverContent, { className: "w-[--radix-popover-trigger-width] p-0", align: "start", children: [_jsx("div", { className: "p-2 border-b", children: _jsxs("div", { className: "relative", children: [_jsx(Search, { className: "absolute left-2 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" }), _jsx(Input, { autoFocus: true, ref: zoekRef, onFocus: (e) => e.currentTarget.select(), value: q, onChange: (e) => setQ(e.target.value), onKeyDown: (e) => {
|
|
24
32
|
if (e.key === "Enter" && filtered.length > 0) {
|
|
25
33
|
e.preventDefault();
|
|
26
34
|
onChange(filtered[0].value);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { PickProgress } from "../../../lib/order-progress.js";
|
|
2
|
+
export declare function OrderLineExtrasCard({ orderId, pickProgress, pickKnown, }: {
|
|
3
|
+
/** DTO-id van de order (local:<uuid> of Floriday-id); zelfde sleutel als de beladingkaart. */
|
|
4
|
+
orderId: string;
|
|
5
|
+
pickProgress: PickProgress | null;
|
|
6
|
+
pickKnown: boolean;
|
|
7
|
+
}): import("react").JSX.Element | null;
|
|
8
|
+
//# sourceMappingURL=OrderLineExtrasCard.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OrderLineExtrasCard.d.ts","sourceRoot":"","sources":["../../../../src/components/verkoop/regel/OrderLineExtrasCard.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAmFhE,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,YAAY,EACZ,SAAS,GACV,EAAE;IACD,8FAA8F;IAC9F,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;CACpB,sCA6DA"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
// Orderpagina: per orderregel productsticker, fuststicker, opmerking en extra
|
|
3
|
+
// velden. Aanpasbaar tot de kar geprint is; daarna via "Kar aanpassen".
|
|
4
|
+
// Leest de regels uit dezelfde aanvraag als de belading (listOrderItemPacking).
|
|
5
|
+
import { useEffect, useMemo, useState } from "react";
|
|
6
|
+
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
7
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
8
|
+
import { useRouter } from "@tanstack/react-router";
|
|
9
|
+
import { Button, toast } from "@flowselections/core";
|
|
10
|
+
import { Tags } from "lucide-react";
|
|
11
|
+
import { InfoCard } from "../v3/InfoCard.js";
|
|
12
|
+
import { RegelGegevensVelden } from "./RegelGegevensVelden.js";
|
|
13
|
+
import { listOrderItemPacking } from "../../../lib/order-item-packing.functions.js";
|
|
14
|
+
import { getLineFieldDefinitions, listLineStickerOptions, saveOrderLineExtra } from "../../../lib/order-line-extras.functions.js";
|
|
15
|
+
import { normRegelVelden, opmerkingNorm, regelVeldenMetDefinities } from "../../../lib/order-line-extras.js";
|
|
16
|
+
import { klantPad } from "../../../lib/kar-handmatig.js";
|
|
17
|
+
import { pickupLockReason } from "../../../lib/own-transport.js";
|
|
18
|
+
const GEPRINT = 'De kar is al geprint. Pas dit aan via "Kar aanpassen".';
|
|
19
|
+
function startWaarde(it, defs) {
|
|
20
|
+
return {
|
|
21
|
+
productStickerId: it.productStickerId,
|
|
22
|
+
fustStickerId: it.fustStickerId,
|
|
23
|
+
note: it.lineNote ?? "",
|
|
24
|
+
fields: regelVeldenMetDefinities(it.lineFields, defs),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
const sleutel = (v) => JSON.stringify([v.productStickerId, v.fustStickerId, (v.note ?? "").trim(), v.fields.map((f) => [f.key, f.value.trim()])]);
|
|
28
|
+
function Regel({ item, defs, opties, optiesLaden, klantLink, locked, orderId, }) {
|
|
29
|
+
const qc = useQueryClient();
|
|
30
|
+
const save = useServerFn(saveOrderLineExtra);
|
|
31
|
+
const begin = useMemo(() => startWaarde(item, defs), [item, defs]);
|
|
32
|
+
const [waarde, setWaarde] = useState(begin);
|
|
33
|
+
useEffect(() => setWaarde(begin), [begin]);
|
|
34
|
+
const gewijzigd = sleutel(waarde) !== sleutel(begin);
|
|
35
|
+
const mut = useMutation({
|
|
36
|
+
mutationFn: () => save({
|
|
37
|
+
data: {
|
|
38
|
+
orderItemId: item.id,
|
|
39
|
+
patch: {
|
|
40
|
+
line_note: opmerkingNorm(waarde.note),
|
|
41
|
+
line_fields: normRegelVelden(waarde.fields),
|
|
42
|
+
product_sticker_id: waarde.productStickerId,
|
|
43
|
+
fust_sticker_id: waarde.fustStickerId,
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
}),
|
|
47
|
+
onSuccess: (r) => {
|
|
48
|
+
if (!r.ok) {
|
|
49
|
+
toast.error(r.reden ?? "Opslaan lukte niet. Probeer het opnieuw.");
|
|
50
|
+
if (r.geprint)
|
|
51
|
+
qc.invalidateQueries({ queryKey: ["order-item-packing", orderId] });
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
toast.success("Regel opgeslagen");
|
|
55
|
+
qc.invalidateQueries({ queryKey: ["order-item-packing", orderId] });
|
|
56
|
+
},
|
|
57
|
+
onError: (e) => {
|
|
58
|
+
console.error("[regelgegevens] opslaan:", e);
|
|
59
|
+
toast.error("Opslaan lukte niet. Probeer het opnieuw; lukt het niet, neem contact op met de beheerder.");
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
return (_jsxs("div", { className: "space-y-2 border-b border-border py-3 last:border-0", children: [_jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("div", { className: "min-w-0 truncate text-sm font-medium text-foreground", children: item.productName }), !locked && (_jsx(Button, { size: "sm", variant: gewijzigd ? "default" : "outline", disabled: !gewijzigd || mut.isPending, onClick: () => mut.mutate(), children: mut.isPending ? "Opslaan…" : "Opslaan" }))] }), _jsx(RegelGegevensVelden, { idPrefix: `ore-${item.id}`, value: waarde, onChange: (p) => setWaarde((w) => ({ ...w, ...p })), opties: opties, optiesLaden: optiesLaden, definities: defs, needsSticker: item.needsSticker, klantLink: klantLink, disabled: !!locked || mut.isPending })] }));
|
|
63
|
+
}
|
|
64
|
+
export function OrderLineExtrasCard({ orderId, pickProgress, pickKnown, }) {
|
|
65
|
+
const fetchItems = useServerFn(listOrderItemPacking);
|
|
66
|
+
const fetchOpts = useServerFn(listLineStickerOptions);
|
|
67
|
+
const fetchDefs = useServerFn(getLineFieldDefinitions);
|
|
68
|
+
const router = useRouter();
|
|
69
|
+
const itemsQ = useQuery({
|
|
70
|
+
queryKey: ["order-item-packing", orderId],
|
|
71
|
+
queryFn: () => fetchItems({ data: { orderId } }),
|
|
72
|
+
staleTime: 15000,
|
|
73
|
+
});
|
|
74
|
+
const order = itemsQ.data?.order ?? null;
|
|
75
|
+
const items = itemsQ.data?.items ?? [];
|
|
76
|
+
const customerId = order?.customerId ?? null;
|
|
77
|
+
const productIds = Array.from(new Set(items.map((i) => i.productId).filter((x) => !!x))).sort();
|
|
78
|
+
const optsQ = useQuery({
|
|
79
|
+
queryKey: ["order-line-sticker-options", customerId, productIds.join(",")],
|
|
80
|
+
enabled: !!customerId && productIds.length > 0 && !order?.floriday,
|
|
81
|
+
staleTime: 60000,
|
|
82
|
+
queryFn: () => fetchOpts({ data: { customerId: customerId, productIds } }),
|
|
83
|
+
});
|
|
84
|
+
const defsQ = useQuery({
|
|
85
|
+
queryKey: ["co-line-fields", customerId],
|
|
86
|
+
enabled: !!customerId && !order?.floriday,
|
|
87
|
+
staleTime: 5 * 60000,
|
|
88
|
+
queryFn: () => fetchDefs({ data: { customerId: customerId } }),
|
|
89
|
+
});
|
|
90
|
+
if (itemsQ.isError)
|
|
91
|
+
console.error("[regelgegevens] regels laden:", itemsQ.error);
|
|
92
|
+
if (optsQ.isError)
|
|
93
|
+
console.error("[regelgegevens] stickers laden:", optsQ.error);
|
|
94
|
+
if (defsQ.isError)
|
|
95
|
+
console.error("[regelgegevens] extra velden laden:", defsQ.error);
|
|
96
|
+
// Alleen eigen orders; Floriday-orders wijzig je in Floriday.
|
|
97
|
+
if (!order || order.floriday || items.length === 0)
|
|
98
|
+
return null;
|
|
99
|
+
if (!order.extrasAvailable)
|
|
100
|
+
return null;
|
|
101
|
+
const reason = pickupLockReason(pickProgress, pickKnown);
|
|
102
|
+
const locked = reason === "geprint" || reason === "gepickt" ? GEPRINT : reason === "onbekend" ? "De pickstand is nu niet bekend; wijzigen kan over een minuut weer." : null;
|
|
103
|
+
const defs = defsQ.data?.velden ?? [];
|
|
104
|
+
const klantLink = klantPad(router, customerId);
|
|
105
|
+
const optsFout = optsQ.data?.error ?? (optsQ.isError ? "Stickers van deze klant konden niet worden geladen." : null);
|
|
106
|
+
return (_jsxs(InfoCard, { icon: _jsx(Tags, {}), title: "Stickers, opmerkingen en extra velden", children: [locked && _jsx("div", { className: "mb-2 rounded-md bg-muted px-3 py-2 text-xs text-muted-foreground", children: locked }), optsFout && _jsx("div", { className: "mb-2 text-xs text-destructive", children: optsFout }), defsQ.data?.error && _jsx("div", { className: "mb-2 text-xs text-destructive", children: defsQ.data.error }), _jsx("div", { children: items.map((it) => (_jsx(Regel, { item: it, defs: defs, opties: it.productId ? (optsQ.data?.byProduct?.[it.productId] ?? null) : null, optiesLaden: optsQ.isPending && optsQ.fetchStatus !== "idle", klantLink: klantLink, locked: locked, orderId: orderId }, it.id))) })] }));
|
|
107
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type RegelVeld, type RegelVeldDefinitie, type StickerOptiesPerProduct } from "../../../lib/order-line-extras.js";
|
|
2
|
+
export interface RegelGegevens {
|
|
3
|
+
productStickerId: string | null;
|
|
4
|
+
fustStickerId: string | null;
|
|
5
|
+
note: string;
|
|
6
|
+
fields: RegelVeld[];
|
|
7
|
+
}
|
|
8
|
+
export declare function RegelGegevensVelden({ value, onChange, opties, optiesLaden, definities, needsSticker, klantLink, disabled, idPrefix, }: {
|
|
9
|
+
value: RegelGegevens;
|
|
10
|
+
onChange: (patch: Partial<RegelGegevens>) => void;
|
|
11
|
+
opties: StickerOptiesPerProduct | null;
|
|
12
|
+
optiesLaden: boolean;
|
|
13
|
+
definities: RegelVeldDefinitie[];
|
|
14
|
+
needsSticker: boolean;
|
|
15
|
+
klantLink: string | null;
|
|
16
|
+
disabled?: boolean;
|
|
17
|
+
idPrefix: string;
|
|
18
|
+
}): import("react").JSX.Element;
|
|
19
|
+
//# sourceMappingURL=RegelGegevensVelden.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RegelGegevensVelden.d.ts","sourceRoot":"","sources":["../../../../src/components/verkoop/regel/RegelGegevensVelden.tsx"],"names":[],"mappings":"AAMA,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,kBAAkB,EAEvB,KAAK,uBAAuB,EAC7B,MAAM,gCAAgC,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAiBD,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,WAAW,EACX,UAAU,EACV,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IAClD,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,+BA0FA"}
|