@flowselections/floriday-verkoop-module 1.0.111 → 1.0.115

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.
Files changed (32) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +31 -31
  3. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +4 -4
  4. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
  5. package/dist-lib/components/verkoop/OrderCarrierPicker.js +26 -19
  6. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  7. package/dist-lib/components/verkoop/SalesOrdersTable.js +1 -1
  8. package/dist-lib/integrations/supabase/types.d.ts +901 -10
  9. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  10. package/dist-lib/lib/carrier-resolve.check.d.ts +2 -0
  11. package/dist-lib/lib/carrier-resolve.check.d.ts.map +1 -0
  12. package/dist-lib/lib/carrier-resolve.check.js +38 -0
  13. package/dist-lib/lib/carrier-resolve.d.ts +27 -0
  14. package/dist-lib/lib/carrier-resolve.d.ts.map +1 -0
  15. package/dist-lib/lib/carrier-resolve.js +100 -0
  16. package/dist-lib/lib/carrier-resolve.server.d.ts +15 -0
  17. package/dist-lib/lib/carrier-resolve.server.d.ts.map +1 -0
  18. package/dist-lib/lib/carrier-resolve.server.js +32 -0
  19. package/dist-lib/lib/create-order.functions.d.ts +2 -0
  20. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  21. package/dist-lib/lib/create-order.functions.js +22 -10
  22. package/dist-lib/lib/module-version.d.ts +1 -1
  23. package/dist-lib/lib/module-version.js +1 -1
  24. package/dist-lib/lib/order-carrier.functions.d.ts +10 -4
  25. package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
  26. package/dist-lib/lib/order-carrier.functions.js +64 -40
  27. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  28. package/dist-lib/lib/salesorders-list.server.js +24 -0
  29. package/dist-lib/lib/salesorders-mapping.d.ts +7 -0
  30. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  31. package/package.json +3 -3
  32. package/schema/verkoop.sql +216 -42
@@ -1 +1 @@
1
- {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAkGA,wBAAgB,eAAe,gCA+/B9B"}
1
+ {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAkGA,wBAAgB,eAAe,gCAwgC9B"}
@@ -53,18 +53,11 @@ export function CreateOrderPage() {
53
53
  const fetchCreate = useServerFn(createManualOrder);
54
54
  const fetchStickerProducts = useServerFn(listCustomerStickerProducts);
55
55
  const loadCarriersEngine = useAllowedLoadCarriers();
56
- const safe = async (fn) => {
57
- try {
58
- return await fn();
59
- }
60
- catch {
61
- return { items: [] };
62
- }
63
- };
64
- const customersQ = useQuery({ queryKey: ["co-customers"], queryFn: () => safe(() => fetchCustomers()) });
65
- const productsQ = useQuery({ queryKey: ["co-products"], queryFn: () => safe(() => fetchProducts()) });
66
- const pickupQ = useQuery({ queryKey: ["co-pickup"], queryFn: () => safe(() => fetchPickupLocations()) });
67
- const carriersQ = useQuery({ queryKey: ["co-carriers"], queryFn: () => safe(() => fetchCarriers()) });
56
+ // Fouten niet inslikken: elke query toont zijn fout boven het formulier.
57
+ const customersQ = useQuery({ queryKey: ["co-customers"], queryFn: () => fetchCustomers() });
58
+ const productsQ = useQuery({ queryKey: ["co-products"], queryFn: () => fetchProducts() });
59
+ const pickupQ = useQuery({ queryKey: ["co-pickup"], queryFn: () => fetchPickupLocations() });
60
+ const carriersQ = useQuery({ queryKey: ["co-carriers"], queryFn: () => fetchCarriers() });
68
61
  const pickDaysQ = useQuery({
69
62
  queryKey: ["co-pickdays"],
70
63
  queryFn: async () => { try {
@@ -74,6 +67,14 @@ export function CreateOrderPage() {
74
67
  return { pickDays: 0 };
75
68
  } },
76
69
  });
70
+ const loadErrors = [
71
+ ["Klanten", customersQ.error],
72
+ ["Producten", productsQ.error],
73
+ ["Afhaallocaties", pickupQ.error],
74
+ ["Vervoerders", carriersQ.error],
75
+ ]
76
+ .filter(([, e]) => !!e)
77
+ .map(([label, e]) => `${label} konden niet worden geladen: ${e.message}`);
77
78
  const customers = customersQ.data?.items ?? [];
78
79
  const products = productsQ.data?.items ?? [];
79
80
  const pickupLocations = pickupQ.data?.items ?? [];
@@ -230,17 +231,14 @@ export function CreateOrderPage() {
230
231
  }
231
232
  // eslint-disable-next-line react-hooks/exhaustive-deps
232
233
  }, [customerId, deliveryLocQ.data]);
233
- // Auto-fill vervoerder op basis van gekozen afleverlocatie (één keer per wissel)
234
+ // Andere afleverlocatie: terug naar "Automatisch" (de Engine kiest op de locatie).
234
235
  const lastLocRef = useRef(null);
235
236
  useEffect(() => {
236
237
  if (deliveryLocationId !== lastLocRef.current) {
237
238
  lastLocRef.current = deliveryLocationId;
238
- const loc = deliveryLocations.find((l) => l.id === deliveryLocationId);
239
- // Zonder standaardvervoerder kiest de Engine er een (voorbeeldversie).
240
- setCarrierId(loc?.carrier_id ? loc.carrier_id : null);
239
+ setCarrierId(null);
241
240
  }
242
- // eslint-disable-next-line react-hooks/exhaustive-deps
243
- }, [deliveryLocationId, deliveryLocations.length]);
241
+ }, [deliveryLocationId]);
244
242
  // Eerst mogelijke leverdatum
245
243
  useEffect(() => {
246
244
  const allowed = loadCarriersEngine.allowed;
@@ -292,12 +290,7 @@ export function CreateOrderPage() {
292
290
  setDeliveryDate(preview.firstFeasibleDeliveryDate);
293
291
  // eslint-disable-next-line react-hooks/exhaustive-deps
294
292
  }, [preview?.firstFeasibleDeliveryDate]);
295
- // Geen vervoerder gekozen: de Engine kiest er een op de afleverlocatie.
296
- useEffect(() => {
297
- if (!carrierId && preview?.carrierId)
298
- setCarrierId(preview.carrierId);
299
- // eslint-disable-next-line react-hooks/exhaustive-deps
300
- }, [preview?.carrierId]);
293
+ // Geen vervoerder gekozen = "Automatisch": de Engine kiest; niets overnemen.
301
294
  // Andere vervoerder/locatie/datum: eigen momentkeuze vervalt als hij er niet meer is.
302
295
  useEffect(() => {
303
296
  if (momentKey && preview && !preview.moments.some((m) => m.momentKey === momentKey && m.feasible)) {
@@ -403,7 +396,8 @@ export function CreateOrderPage() {
403
396
  customerName: customer?.company_name ?? "Onbekende klant",
404
397
  deliveryLocationId,
405
398
  pickupLocationId,
406
- carrierId: isReservation || ownTransport ? null : (carrierId ?? preview?.carrierId ?? null),
399
+ // Alleen een handmatige keuze; "Automatisch" geeft niets mee.
400
+ carrierId: isReservation || ownTransport ? null : carrierId,
407
401
  momentKey: isReservation || ownTransport ? null : momentKey,
408
402
  ownTransport: !isReservation && ownTransport,
409
403
  customerReference: customerReference.trim() ? customerReference.trim() : null,
@@ -439,6 +433,8 @@ export function CreateOrderPage() {
439
433
  },
440
434
  onSuccess: (res) => {
441
435
  toast.success("Bestelling aangemaakt — karindeling is automatisch berekend");
436
+ if (res?.carrierAdminNotice)
437
+ toast.warning(`Voor beheer: ${res.carrierAdminNotice}`);
442
438
  qc.invalidateQueries({ queryKey: ["floriday", "salesorders-cache"] });
443
439
  if (res?.orderId) {
444
440
  try {
@@ -462,7 +458,7 @@ export function CreateOrderPage() {
462
458
  toast.error(msg ?? "De order is niet aangemaakt. Controleer de regels en probeer opnieuw.");
463
459
  },
464
460
  });
465
- return (_jsxs("main", { className: "space-y-5 p-6", children: [_jsx("div", { 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"] }) }) }), _jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Nieuwe Bestelling" }), _jsx("p", { className: "text-sm text-muted-foreground", children: "Doorloop de stappen: klant \u2192 afleverlocatie \u2192 afhaallocatie \u2192 vervoerder \u2192 leverdatum \u2192 producten." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Klant ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: customerId, placeholder: customersQ.isLoading ? "Laden..." : "Kies klant...", options: customers.map((c) => ({
461
+ return (_jsxs("main", { className: "space-y-5 p-6", children: [_jsx("div", { 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"] }) }) }), loadErrors.length > 0 && (_jsx("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 p-3 text-sm text-destructive", children: loadErrors.map((m) => _jsx("div", { children: m }, m)) })), _jsxs(Card, { children: [_jsxs(CardHeader, { children: [_jsx(CardTitle, { children: "Nieuwe Bestelling" }), _jsx("p", { className: "text-sm text-muted-foreground", children: "Doorloop de stappen: klant \u2192 afleverlocatie \u2192 afhaallocatie \u2192 vervoerder \u2192 leverdatum \u2192 producten." })] }), _jsxs(CardContent, { className: "space-y-5", children: [_jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Klant ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: customerId, placeholder: customersQ.isLoading ? "Laden..." : "Kies klant...", options: customers.map((c) => ({
466
462
  value: c.id,
467
463
  label: c.company_name ?? "Onbekend",
468
464
  hint: c.source === "twinfield" && String(c.id).startsWith("twinfield:")
@@ -480,12 +476,16 @@ export function CreateOrderPage() {
480
476
  label: (l.name || addr || "Locatie") + (l.is_primary ? " ★" : ""),
481
477
  hint: l.name && addr ? addr : undefined,
482
478
  };
483
- }), onChange: setDeliveryLocationId })] }), selectedLocation && (_jsxs("div", { className: "rounded-md border bg-muted/30 p-3 space-y-2", children: [_jsx("div", { className: "text-xs font-medium text-muted-foreground", children: "Adresgegevens" }), _jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(ReadOnlyField, { label: "Straat", value: selectedLocation.street }), _jsx(ReadOnlyField, { label: "Huisnummer", value: selectedLocation.house_number }), _jsx(ReadOnlyField, { label: "Postcode", value: selectedLocation.postal_code }), _jsx(ReadOnlyField, { label: "Plaats", value: selectedLocation.city }), _jsx(ReadOnlyField, { label: "Provincie", value: selectedLocation.province }), _jsx(ReadOnlyField, { label: "Land", value: selectedLocation.country })] })] })), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Afhaallocatie / Tuin ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: pickupLocationId, placeholder: pickupLocations.length ? "Kies eigen locatie..." : "Geen eigen locaties bekend", disabled: pickupLocations.length === 0, allowClear: false, options: pickupLocations.map((l) => ({ value: l.id, label: l.name })), onChange: setPickupLocationId }), _jsx("div", { className: "text-xs text-muted-foreground", children: "Eigen locatie (tuin) van waaruit de bestelling wordt geleverd of opgehaald." })] }), isReservation ? (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Vervoerder" }), _jsx("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-sm text-muted-foreground", children: "Nog niet van toepassing \u2014 de vervoerder wordt pas gekozen bij het aanmaken van de verzending." })] })) : (_jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { children: ["Vervoerder ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: carrierId, placeholder: !customerId ? "Selecteer eerst een klant"
479
+ }), onChange: setDeliveryLocationId })] }), selectedLocation && (_jsxs("div", { className: "rounded-md border bg-muted/30 p-3 space-y-2", children: [_jsx("div", { className: "text-xs font-medium text-muted-foreground", children: "Adresgegevens" }), _jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsx(ReadOnlyField, { label: "Straat", value: selectedLocation.street }), _jsx(ReadOnlyField, { label: "Huisnummer", value: selectedLocation.house_number }), _jsx(ReadOnlyField, { label: "Postcode", value: selectedLocation.postal_code }), _jsx(ReadOnlyField, { label: "Plaats", value: selectedLocation.city }), _jsx(ReadOnlyField, { label: "Provincie", value: selectedLocation.province }), _jsx(ReadOnlyField, { label: "Land", value: selectedLocation.country })] })] })), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Afhaallocatie / Tuin ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: pickupLocationId, placeholder: pickupLocations.length ? "Kies eigen locatie..." : "Geen eigen locaties bekend", disabled: pickupLocations.length === 0, allowClear: false, options: pickupLocations.map((l) => ({ value: l.id, label: l.name })), onChange: setPickupLocationId }), _jsx("div", { className: "text-xs text-muted-foreground", children: "Eigen locatie (tuin) van waaruit de bestelling wordt geleverd of opgehaald." })] }), isReservation ? (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Vervoerder" }), _jsx("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-sm text-muted-foreground", children: "Nog niet van toepassing \u2014 de vervoerder wordt pas gekozen bij het aanmaken van de verzending." })] })) : (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Vervoerder" }), _jsx(SearchableSelect, { value: carrierId ?? "__auto__", placeholder: !customerId ? "Selecteer eerst een klant"
484
480
  : !deliveryLocationId ? "Selecteer eerst een afleverlocatie"
485
- : "Wordt gekozen bij de afleverlocatie", disabled: !deliveryLocationId, allowClear: false, options: carriers.map((c) => ({
486
- value: c.id,
487
- label: c.name + (c.is_default ? " (standaard)" : ""),
488
- })), onChange: (v) => { setCarrierId(v); setMomentKey(null); } }), selectedLocation?.carrier_id && carrierId && carrierId !== selectedLocation.carrier_id && (_jsx("div", { className: "text-xs text-muted-foreground", children: "Wijkt af van standaard vervoerder van deze locatie \u2014 geldt alleen voor deze bestelling." }))] })), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Leverdatum ", !isReservation && _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(Input, { type: "date", value: !isReservation && canPickDate ? deliveryDate : "", disabled: isReservation || !canPickDate, onChange: (e) => { setDeliveryDate(e.target.value || ""); setMomentKey(null); } }), _jsxs("label", { className: "mt-1 flex items-center gap-2 text-sm text-foreground", children: [_jsx("input", { type: "checkbox", checked: isReservation, onChange: (e) => setIsReservation(e.target.checked), className: "h-4 w-4 rounded border-input" }), "Reservering (nog geen vaste leverdatum)"] }), !isReservation && (_jsxs("label", { className: "flex items-center gap-2 text-sm text-foreground", children: [_jsx("input", { type: "checkbox", checked: ownTransport, onChange: (e) => { setOwnTransport(e.target.checked); setMomentKey(null); }, className: "h-4 w-4 rounded border-input" }), "Eigen vervoer / zelf afleveren (geen vervoerder)"] })), isReservation ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "De bestelling wordt als reservering aangemaakt zonder leverdatumvalidatie." })) : !canPickDate ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Selecteer eerst klant, afleverlocatie en afhaallocatie." })) : !decision ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Ophaalmoment ophalen\u2026" })) : decision.kind === "blocked" ? (_jsx("div", { className: "text-xs text-destructive", children: decision.reason })) : decision.kind === "departed" ? (_jsxs("div", { className: "space-y-2 rounded-md border border-destructive/40 p-2 text-xs", children: [_jsx("div", { className: "text-destructive", children: decision.reason }), firstDateText(decision.firstDate, decision.next?.signupDeadline ?? null) && (_jsx("div", { className: "text-muted-foreground", children: firstDateText(decision.firstDate, decision.next?.signupDeadline ?? null) })), _jsxs("div", { className: "flex flex-wrap gap-2", children: [decision.firstDate && (_jsxs(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setDeliveryDate(decision.firstDate); setMomentKey(null); }, children: ["Gebruik ", fmtDate(decision.firstDate)] })), _jsx(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setOwnTransport(true); setMomentKey(null); }, children: "Eigen vervoer / zelf afleveren" })] })] })) : (_jsxs("div", { className: "space-y-2 text-xs", children: [!ownTransport && preview && preview.moments.length > 0 && (_jsx("select", { className: "h-9 w-full rounded-md border border-border bg-background px-2 text-sm text-foreground", value: momentKey ?? decision.momentKey ?? "", onChange: (e) => setMomentKey(e.target.value || null), "aria-label": "Ophaalmoment kiezen", children: preview.moments.map((m) => (_jsxs("option", { value: m.momentKey, disabled: !m.feasible, className: m.feasible ? "" : "text-muted-foreground", children: [momentLabel(m), m.feasible ? "" : " (niet haalbaar)"] }, m.momentKey))) })), decision.text && _jsx("div", { className: "text-foreground", children: decision.text }), decision.kind === "late" && (_jsxs("div", { className: "space-y-2 rounded-md border border-destructive/40 p-2", children: [_jsx("div", { className: "text-destructive", children: decision.reason }), (firstDateText(decision.firstDate, preview?.nextFeasibleMoment?.signupDeadline ?? null) ?? decision.firstReason) && (_jsx("div", { className: "text-muted-foreground", children: firstDateText(decision.firstDate, preview?.nextFeasibleMoment?.signupDeadline ?? null) ?? decision.firstReason })), _jsxs("div", { className: "flex flex-wrap gap-2", children: [decision.firstDate && (_jsxs(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setDeliveryDate(decision.firstDate); setMomentKey(null); }, children: ["Gebruik ", fmtDate(decision.firstDate)] })), _jsxs(Button, { type: "button", size: "sm", variant: "outline", disabled: createMut.isPending, onClick: () => setLateConfirmOpen(true), children: ["Toch aanmaken voor ", deliveryDate ? fmtDate(deliveryDate) : "de gekozen datum"] })] })] }))] }))] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { children: "Bestelregels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 text-xs text-muted-foreground px-1", children: [_jsx("div", { className: "col-span-3", children: "Product" }), _jsx("div", { className: "col-span-1 text-center", children: "Sticker" }), _jsx("div", { className: "col-span-3", children: "Belading" }), _jsx("div", { className: "col-span-2", children: "Fusten" }), _jsx("div", { className: "col-span-2", children: "Prijs" }), _jsx("div", { className: "col-span-1" })] }), lines.map((line, idx) => {
481
+ : "Automatisch", disabled: !deliveryLocationId, allowClear: false, options: [
482
+ { value: "__auto__", label: "Automatisch (Logistiek Engine kiest)" },
483
+ ...carriers.map((c) => ({ value: c.id, label: c.name })),
484
+ ], onChange: (v) => { setCarrierId(!v || v === "__auto__" ? null : v); setMomentKey(null); } }), deliveryLocationId && (_jsx("div", { className: "text-xs text-muted-foreground", children: carrierId
485
+ ? `Vervoerder: ${carriers.find((c) => c.id === carrierId)?.name ?? "onbekend"} – handmatig gekozen`
486
+ : preview?.carrierId
487
+ ? `Vervoerder: ${carriers.find((c) => c.id === preview.carrierId)?.name ?? "onbekend"} – voorgesteld door de Logistiek Engine; na aanmaken zie je de reden bij de order`
488
+ : "Vervoerder: nog onbekend – de Logistiek Engine kiest bij het aanmaken" }))] })), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Leverdatum ", !isReservation && _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(Input, { type: "date", value: !isReservation && canPickDate ? deliveryDate : "", disabled: isReservation || !canPickDate, onChange: (e) => { setDeliveryDate(e.target.value || ""); setMomentKey(null); } }), _jsxs("label", { className: "mt-1 flex items-center gap-2 text-sm text-foreground", children: [_jsx("input", { type: "checkbox", checked: isReservation, onChange: (e) => setIsReservation(e.target.checked), className: "h-4 w-4 rounded border-input" }), "Reservering (nog geen vaste leverdatum)"] }), !isReservation && (_jsxs("label", { className: "flex items-center gap-2 text-sm text-foreground", children: [_jsx("input", { type: "checkbox", checked: ownTransport, onChange: (e) => { setOwnTransport(e.target.checked); setMomentKey(null); }, className: "h-4 w-4 rounded border-input" }), "Eigen vervoer / zelf afleveren (geen vervoerder)"] })), isReservation ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "De bestelling wordt als reservering aangemaakt zonder leverdatumvalidatie." })) : !canPickDate ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Selecteer eerst klant, afleverlocatie en afhaallocatie." })) : !decision ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Ophaalmoment ophalen\u2026" })) : decision.kind === "blocked" ? (_jsx("div", { className: "text-xs text-destructive", children: decision.reason })) : decision.kind === "departed" ? (_jsxs("div", { className: "space-y-2 rounded-md border border-destructive/40 p-2 text-xs", children: [_jsx("div", { className: "text-destructive", children: decision.reason }), firstDateText(decision.firstDate, decision.next?.signupDeadline ?? null) && (_jsx("div", { className: "text-muted-foreground", children: firstDateText(decision.firstDate, decision.next?.signupDeadline ?? null) })), _jsxs("div", { className: "flex flex-wrap gap-2", children: [decision.firstDate && (_jsxs(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setDeliveryDate(decision.firstDate); setMomentKey(null); }, children: ["Gebruik ", fmtDate(decision.firstDate)] })), _jsx(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setOwnTransport(true); setMomentKey(null); }, children: "Eigen vervoer / zelf afleveren" })] })] })) : (_jsxs("div", { className: "space-y-2 text-xs", children: [!ownTransport && preview && preview.moments.length > 0 && (_jsx("select", { className: "h-9 w-full rounded-md border border-border bg-background px-2 text-sm text-foreground", value: momentKey ?? decision.momentKey ?? "", onChange: (e) => setMomentKey(e.target.value || null), "aria-label": "Ophaalmoment kiezen", children: preview.moments.map((m) => (_jsxs("option", { value: m.momentKey, disabled: !m.feasible, className: m.feasible ? "" : "text-muted-foreground", children: [momentLabel(m), m.feasible ? "" : " (niet haalbaar)"] }, m.momentKey))) })), decision.text && _jsx("div", { className: "text-foreground", children: decision.text }), decision.kind === "late" && (_jsxs("div", { className: "space-y-2 rounded-md border border-destructive/40 p-2", children: [_jsx("div", { className: "text-destructive", children: decision.reason }), (firstDateText(decision.firstDate, preview?.nextFeasibleMoment?.signupDeadline ?? null) ?? decision.firstReason) && (_jsx("div", { className: "text-muted-foreground", children: firstDateText(decision.firstDate, preview?.nextFeasibleMoment?.signupDeadline ?? null) ?? decision.firstReason })), _jsxs("div", { className: "flex flex-wrap gap-2", children: [decision.firstDate && (_jsxs(Button, { type: "button", size: "sm", variant: "outline", onClick: () => { setDeliveryDate(decision.firstDate); setMomentKey(null); }, children: ["Gebruik ", fmtDate(decision.firstDate)] })), _jsxs(Button, { type: "button", size: "sm", variant: "outline", disabled: createMut.isPending, onClick: () => setLateConfirmOpen(true), children: ["Toch aanmaken voor ", deliveryDate ? fmtDate(deliveryDate) : "de gekozen datum"] })] })] }))] }))] }), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { children: "Bestelregels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 text-xs text-muted-foreground px-1", children: [_jsx("div", { className: "col-span-3", children: "Product" }), _jsx("div", { className: "col-span-1 text-center", children: "Sticker" }), _jsx("div", { className: "col-span-3", children: "Belading" }), _jsx("div", { className: "col-span-2", children: "Fusten" }), _jsx("div", { className: "col-span-2", children: "Prijs" }), _jsx("div", { className: "col-span-1" })] }), lines.map((line, idx) => {
489
489
  const product = line.product_id ? products.find((p) => p.id === line.product_id) : null;
490
490
  const defaultBelading = completeBelading(product);
491
491
  const effBelading = completeBelading(line.belading) ?? defaultBelading;
@@ -1,8 +1,8 @@
1
1
  /**
2
- * Toont en wijzigt de vervoerder van een order. Met `applyToBuffer` wordt de
3
- * keuze op alle orders in dezelfde buffer toegepast. Met `locked` (bij een
4
- * reservering) is kiezen niet mogelijk: de vervoerder wordt pas vastgelegd bij
5
- * het aanmaken van de verzending.
2
+ * Toont de vervoerder van een order met bron en reden (Logistiek Engine) en
3
+ * laat hem handmatig overschrijven of terugzetten naar automatisch.
4
+ * Met `applyToBuffer` geldt de keuze voor alle orders in de buffer; per order
5
+ * zie je wat gelukt is en wat niet.
6
6
  */
7
7
  export declare function OrderCarrierPicker({ orderId, applyToBuffer, compact, locked, }: {
8
8
  orderId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,GACf,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+BA4EA"}
1
+ {"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,GACf,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+BA0GA"}
@@ -1,14 +1,16 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { useEffect, useState } from "react";
2
+ import { useState } from "react";
3
3
  import { useQuery, useQueryClient } from "@tanstack/react-query";
4
4
  import { useServerFn } from "@tanstack/react-start";
5
5
  import { Truck } from "lucide-react";
6
6
  import { getOrderCarrier, setOrderCarrier } from "../../lib/order-carrier.functions.js";
7
+ import { carrierLine } from "../../lib/carrier-resolve.js";
8
+ const AUTO = "__auto__";
7
9
  /**
8
- * Toont en wijzigt de vervoerder van een order. Met `applyToBuffer` wordt de
9
- * keuze op alle orders in dezelfde buffer toegepast. Met `locked` (bij een
10
- * reservering) is kiezen niet mogelijk: de vervoerder wordt pas vastgelegd bij
11
- * het aanmaken van de verzending.
10
+ * Toont de vervoerder van een order met bron en reden (Logistiek Engine) en
11
+ * laat hem handmatig overschrijven of terugzetten naar automatisch.
12
+ * Met `applyToBuffer` geldt de keuze voor alle orders in de buffer; per order
13
+ * zie je wat gelukt is en wat niet.
12
14
  */
13
15
  export function OrderCarrierPicker({ orderId, applyToBuffer = false, compact = false, locked = false, }) {
14
16
  const qc = useQueryClient();
@@ -16,37 +18,42 @@ export function OrderCarrierPicker({ orderId, applyToBuffer = false, compact = f
16
18
  const saveCarrier = useServerFn(setOrderCarrier);
17
19
  const [saving, setSaving] = useState(false);
18
20
  const [error, setError] = useState(null);
19
- const [value, setValue] = useState("");
20
- const { data } = useQuery({
21
+ const [results, setResults] = useState(null);
22
+ const [notice, setNotice] = useState(null);
23
+ const q = useQuery({
21
24
  queryKey: ["order-carrier", orderId],
22
25
  queryFn: () => fetchCarrier({ data: { orderId } }),
23
26
  staleTime: 30000,
27
+ enabled: !locked,
24
28
  });
25
- useEffect(() => {
26
- setValue(data?.carrierId ?? "");
27
- }, [data?.carrierId]);
28
- const options = data?.options ?? [];
29
+ if (locked) {
30
+ return (_jsxs("div", { className: "flex items-center gap-2 text-sm text-muted-foreground", children: [!compact && _jsx(Truck, { className: "h-4 w-4" }), _jsx("span", { children: "Nog geen vervoerder \u2014 wordt gekozen bij het aanmaken van de verzending" })] }));
31
+ }
32
+ const resolved = q.data?.resolved ?? null;
33
+ const options = q.data?.options ?? [];
34
+ const isManual = resolved?.source === "handmatig";
35
+ const value = isManual && resolved?.carrierId ? resolved.carrierId : AUTO;
29
36
  async function onChange(next) {
30
- setValue(next);
31
37
  setSaving(true);
32
38
  setError(null);
39
+ setResults(null);
40
+ setNotice(null);
33
41
  try {
34
- await saveCarrier({
35
- data: { orderId, carrierId: next ? next : null, applyToBuffer },
42
+ const res = await saveCarrier({
43
+ data: { orderId, carrierId: next === AUTO ? null : next, applyToBuffer },
36
44
  });
45
+ setNotice(res.adminNotice);
46
+ if (!res.ok || res.results.length > 1)
47
+ setResults(res.results);
37
48
  await qc.invalidateQueries({ queryKey: ["order-carrier"] });
38
49
  await qc.invalidateQueries({ queryKey: ["sales-orders"] });
39
50
  }
40
51
  catch (e) {
41
52
  setError(e?.message ?? "Opslaan mislukt");
42
- setValue(data?.carrierId ?? "");
43
53
  }
44
54
  finally {
45
55
  setSaving(false);
46
56
  }
47
57
  }
48
- if (locked) {
49
- return (_jsxs("div", { className: "flex items-center gap-2 text-sm text-muted-foreground", children: [!compact && _jsx(Truck, { className: "h-4 w-4" }), _jsx("span", { children: "Nog geen vervoerder \u2014 wordt gekozen bij het aanmaken van de verzending" })] }));
50
- }
51
- return (_jsxs("div", { className: compact ? "" : "inline-flex flex-col gap-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [!compact && _jsx(Truck, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("select", { className: "h-9 min-w-[12rem] rounded-md border border-border bg-background px-2 text-sm text-foreground disabled:opacity-60", value: value, disabled: saving, onChange: (e) => onChange(e.target.value), children: [_jsx("option", { value: "", children: "\u2014 Geen vervoerder \u2014" }), options.map((o) => (_jsx("option", { value: o.id, children: o.name }, o.id)))] }), saving && _jsx("span", { className: "text-xs text-muted-foreground", children: "Opslaan\u2026" })] }), applyToBuffer && (_jsx("span", { className: "text-xs text-muted-foreground", children: "Geldt voor alle orders in deze buffer" })), error && _jsx("span", { className: "text-xs text-destructive", children: error })] }));
58
+ return (_jsxs("div", { className: compact ? "space-y-1" : "inline-flex flex-col gap-1", children: [_jsxs("div", { className: "flex items-center gap-2", children: [!compact && _jsx(Truck, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("select", { className: "h-9 min-w-[12rem] rounded-md border border-border bg-background px-2 text-sm text-foreground disabled:opacity-60", value: value, disabled: saving || q.isLoading || q.isError, onChange: (e) => onChange(e.target.value), children: [_jsx("option", { value: AUTO, children: "Automatisch (Logistiek Engine kiest)" }), options.map((o) => (_jsx("option", { value: o.id, children: o.name }, o.id)))] }), saving && _jsx("span", { className: "text-xs text-muted-foreground", children: "Opslaan\u2026" })] }), q.isError && (_jsx("span", { className: "text-xs text-destructive", children: q.error?.message ?? "Vervoerder kon niet worden geladen" })), resolved && (_jsxs("span", { className: `text-xs ${resolved.state === "ok" ? "text-muted-foreground" : "text-destructive"}`, children: [carrierLine(resolved), resolved.badge && (_jsx("span", { className: "ml-2 rounded border border-border bg-muted px-1.5 py-0.5 text-[10px] uppercase tracking-wide text-muted-foreground", children: resolved.badge }))] })), resolved?.state === "geen" && (_jsx("a", { href: "/afhandeling/vervoerders", className: "text-xs text-primary underline", children: "Stel een vervoerder in bij Afhandeling \u2192 Vervoerders" })), resolved?.warning && _jsx("span", { className: "text-xs text-muted-foreground", children: resolved.warning }), (resolved?.adminNotice || notice) && (_jsxs("span", { className: "text-xs text-muted-foreground", children: ["Voor beheer: ", notice ?? resolved?.adminNotice] })), applyToBuffer && (_jsx("span", { className: "text-xs text-muted-foreground", children: "Geldt voor alle orders in deze buffer" })), results && (_jsx("ul", { className: "text-xs", children: results.map((r) => (_jsxs("li", { className: r.ok ? "text-muted-foreground" : "text-destructive", children: [r.orderNumber ?? r.orderId, ": ", r.ok ? "gelukt" : `niet gelukt – ${r.error}`] }, r.orderId))) })), error && _jsx("span", { className: "text-xs text-destructive", children: error })] }));
52
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAsBjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAyGnE,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAG1D;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,OAAO,EACP,aAAa,EACb,aAAa,EACb,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,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;CAC7C,qBAoTA"}
1
+ {"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAsBjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAyGnE,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAG1D;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,OAAO,EACP,aAAa,EACb,aAAa,EACb,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,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;CAC7C,qBA2UA"}
@@ -106,7 +106,7 @@ export function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder
106
106
  .map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)
107
107
  .join("\n"), children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3 w-3 shrink-0" }), _jsxs("span", { children: ["Floriday-artikel niet gekoppeld aan product:", " ", row.unlinkedProducts
108
108
  .map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)
109
- .join(", ")] })] }))] }), _jsxs(TableCell, { children: [_jsx("div", { className: "font-medium text-foreground", children: row.karUnknown ? (_jsx("span", { className: "text-muted-foreground", children: "Karren onbekend" })) : row.engineCounts && row.karCount > 0 ? (_jsxs(_Fragment, { children: [formatLoadUnits(row.karCount, row.cartTypeName), row.karShared && isBuffer && (_jsx("span", { className: "ml-1 text-xs font-normal text-muted-foreground", children: "(gedeeld met gecombineerde order)" }))] })) : (_jsx("span", { className: "text-muted-foreground", children: "\u2014" })) }), _jsx(PlanCoverageBadge, { coverage: row.planCoverage }), _jsx(FloridayStageLine, { status: row.floridayStatus, stage: row.stage, floridayFulfilled: isBuffer ? !row.notReportedToFloriday : row.floridayFulfilled, isFloriday: !!row.notReportedToFloriday || (row.floridayIds?.length ?? 0) > 0, notReportedCount: row.notReportedCount, bufferSize: bufferSize })] }), _jsx(TableCell, { children: _jsx("div", { className: "font-medium text-foreground", children: formatLoadUnits(row.fustCount, row.crateTypeName) }) }), _jsx(TableCell, { className: "text-sm text-foreground", children: row.carrierName || _jsx("span", { className: "text-muted-foreground", children: "\u2014" }) }), _jsx(TableCell, { children: _jsx(StatusTag, { order: row }) }), showRevenue && (_jsxs(TableCell, { className: "font-medium text-foreground", children: ["\u20AC ", Math.round(row.revenue ?? 0).toLocaleString("nl-NL")] })), _jsxs(TableCell, { children: [_jsx("div", { className: "text-sm text-foreground", children: ordered.date }), _jsx("div", { className: "text-xs text-muted-foreground", children: isBuffer
109
+ .join(", ")] })] }))] }), _jsxs(TableCell, { children: [_jsx("div", { className: "font-medium text-foreground", children: row.karUnknown ? (_jsx("span", { className: "text-muted-foreground", children: "Karren onbekend" })) : row.engineCounts && row.karCount > 0 ? (_jsxs(_Fragment, { children: [formatLoadUnits(row.karCount, row.cartTypeName), row.karShared && isBuffer && (_jsx("span", { className: "ml-1 text-xs font-normal text-muted-foreground", children: "(gedeeld met gecombineerde order)" }))] })) : (_jsx("span", { className: "text-muted-foreground", children: "\u2014" })) }), _jsx(PlanCoverageBadge, { coverage: row.planCoverage }), _jsx(FloridayStageLine, { status: row.floridayStatus, stage: row.stage, floridayFulfilled: isBuffer ? !row.notReportedToFloriday : row.floridayFulfilled, isFloriday: !!row.notReportedToFloriday || (row.floridayIds?.length ?? 0) > 0, notReportedCount: row.notReportedCount, bufferSize: bufferSize })] }), _jsx(TableCell, { children: _jsx("div", { className: "font-medium text-foreground", children: formatLoadUnits(row.fustCount, row.crateTypeName) }) }), _jsx(TableCell, { className: "text-sm text-foreground", children: row.carrierState === "geen" ? (_jsx("a", { href: "/afhandeling/vervoerders", onClick: (e) => e.stopPropagation(), className: "text-xs text-destructive underline", title: row.carrierReason ?? undefined, children: "Geen vervoerder \u2013 stel in bij Afhandeling \u2192 Vervoerders" })) : (_jsxs("div", { title: row.carrierReason ?? undefined, children: [_jsx("div", { children: row.carrierName || _jsx("span", { className: "text-muted-foreground", children: "onbekend" }) }), (row.carrierSource || row.carrierBadge) && (_jsxs("div", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [row.carrierSource && _jsx("span", { children: row.carrierSource }), row.carrierBadge && (_jsx("span", { className: "rounded border border-border bg-muted px-1 text-[10px] uppercase tracking-wide", children: row.carrierBadge }))] }))] })) }), _jsx(TableCell, { children: _jsx(StatusTag, { order: row }) }), showRevenue && (_jsxs(TableCell, { className: "font-medium text-foreground", children: ["\u20AC ", Math.round(row.revenue ?? 0).toLocaleString("nl-NL")] })), _jsxs(TableCell, { children: [_jsx("div", { className: "text-sm text-foreground", children: ordered.date }), _jsx("div", { className: "text-xs text-muted-foreground", children: isBuffer
110
110
  ? `${bufferSize} orders`
111
111
  : row.orderNumber || ordered.time })] }), _jsx(TableCell, { onClick: (e) => e.stopPropagation(), children: _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { className: "inline-flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(MoreVertical, { className: "h-4 w-4" }) }), _jsxs(DropdownMenuContent, { align: "end", children: [_jsx(DropdownMenuItem, { disabled: isBuffer || !row.isLocal, onClick: () => !isBuffer && row.isLocal && onEditOrder?.(row), title: isBuffer
112
112
  ? "Een gecombineerde order kun je niet in één keer bewerken."