@flowselections/floriday-verkoop-module 1.0.127 → 1.0.130

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 (66) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +20 -2
  3. package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
  4. package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -2
  5. package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
  6. package/dist-lib/components/verkoop/OrderKarindelingCard.js +5 -2
  7. package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
  8. package/dist-lib/components/verkoop/OrderLinePackingCard.js +37 -17
  9. package/dist-lib/components/verkoop/OrderShipmentsCard.js +1 -1
  10. package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
  11. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  12. package/dist-lib/components/verkoop/SalesOrdersTable.js +2 -1
  13. package/dist-lib/integrations/supabase/types.d.ts +824 -122
  14. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  15. package/dist-lib/integrations/supabase/types.js +1 -0
  16. package/dist-lib/lib/cron/cron-auth.check.d.ts +2 -0
  17. package/dist-lib/lib/cron/cron-auth.check.d.ts.map +1 -0
  18. package/dist-lib/lib/cron/cron-auth.check.js +25 -0
  19. package/dist-lib/lib/cron/cron-auth.server.d.ts +6 -0
  20. package/dist-lib/lib/cron/cron-auth.server.d.ts.map +1 -0
  21. package/dist-lib/lib/cron/cron-auth.server.js +53 -0
  22. package/dist-lib/lib/cron/index.d.ts +1 -0
  23. package/dist-lib/lib/cron/index.d.ts.map +1 -1
  24. package/dist-lib/lib/cron/index.js +1 -0
  25. package/dist-lib/lib/cron/invoice-due.d.ts.map +1 -1
  26. package/dist-lib/lib/cron/invoice-due.js +4 -5
  27. package/dist-lib/lib/cron/sync-salesorders-now.d.ts +10 -0
  28. package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -0
  29. package/dist-lib/lib/cron/sync-salesorders-now.js +79 -0
  30. package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
  31. package/dist-lib/lib/cron/sync-salesorders.js +4 -5
  32. package/dist-lib/lib/delivery-location.check.d.ts +2 -0
  33. package/dist-lib/lib/delivery-location.check.d.ts.map +1 -0
  34. package/dist-lib/lib/delivery-location.check.js +35 -0
  35. package/dist-lib/lib/delivery-location.server.d.ts +35 -0
  36. package/dist-lib/lib/delivery-location.server.d.ts.map +1 -0
  37. package/dist-lib/lib/delivery-location.server.js +171 -0
  38. package/dist-lib/lib/floriday-mirror.server.d.ts +7 -0
  39. package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
  40. package/dist-lib/lib/floriday-mirror.server.js +38 -5
  41. package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
  42. package/dist-lib/lib/floriday-status.server.js +2 -0
  43. package/dist-lib/lib/module-version.d.ts +1 -1
  44. package/dist-lib/lib/module-version.js +1 -1
  45. package/dist-lib/lib/order-addresses.functions.d.ts +1 -0
  46. package/dist-lib/lib/order-addresses.functions.d.ts.map +1 -1
  47. package/dist-lib/lib/order-addresses.functions.js +28 -29
  48. package/dist-lib/lib/order-item-packing.functions.d.ts +40 -4
  49. package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
  50. package/dist-lib/lib/order-item-packing.functions.js +72 -7
  51. package/dist-lib/lib/plan-coverage.d.ts +36 -0
  52. package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
  53. package/dist-lib/lib/plan-coverage.js +61 -2
  54. package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
  55. package/dist-lib/lib/plan-coverage.server.js +12 -2
  56. package/dist-lib/lib/product-plannable.functions.d.ts +13 -0
  57. package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -0
  58. package/dist-lib/lib/product-plannable.functions.js +34 -0
  59. package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
  60. package/dist-lib/lib/salesorders-list.functions.js +15 -1
  61. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  62. package/dist-lib/lib/salesorders-list.server.js +10 -0
  63. package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
  64. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  65. package/package.json +9 -1
  66. package/schema/verkoop.sql +363 -0
@@ -1 +1 @@
1
- {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAkGA,wBAAgB,eAAe,gCAsiC9B"}
1
+ {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAmGA,wBAAgB,eAAe,gCAwkC9B"}
@@ -13,6 +13,7 @@ import { useServerFn } from "@tanstack/react-start";
13
13
  import { SearchableSelect } from "./SearchableSelect.js";
14
14
  import { toISODate } from "../../lib/carrier-availability.js";
15
15
  import { getDeparturePreview } from "../../lib/departure-preview.functions.js";
16
+ import { getProductPlannability } from "../../lib/product-plannable.functions.js";
16
17
  import { decidePreview, momentLabel, firstDateText, LATE_CONFIRM } from "../../lib/departure-preview.js";
17
18
  import { ConfirmDialog } from "./ConfirmDialog.js";
18
19
  import { listCustomersForCreateOrder, ensureCustomerFromTwinfield, listProductsForCreateOrder, listCustomerStickerProducts, listDeliveryLocationsForCustomerCO, listPickupLocationsCO, listCarriersForCreateOrder, getOrderPickDaysCO, listBeladingOptionsForProducts, createManualOrder, getEffectivePrices, } from "../../lib/create-order.functions.js";
@@ -169,6 +170,23 @@ export function CreateOrderPage() {
169
170
  }
170
171
  },
171
172
  });
173
+ // Engine-oordeel per product: kan de Engine dit product indelen?
174
+ const fetchPlannability = useServerFn(getProductPlannability);
175
+ const plannableQ = useQuery({
176
+ queryKey: ["co-plannable", selectedProductIds],
177
+ enabled: selectedProductIds.length > 0,
178
+ staleTime: 30000,
179
+ queryFn: async () => {
180
+ try {
181
+ return await fetchPlannability({ data: { productIds: selectedProductIds.filter((x) => /^[0-9a-f-]{36}$/i.test(x)) } });
182
+ }
183
+ catch {
184
+ return { impossible: {}, available: false };
185
+ }
186
+ },
187
+ });
188
+ const impossibleByProduct = plannableQ.data?.impossible ?? {};
189
+ const missingByProduct = plannableQ.data?.missing ?? {};
172
190
  const beladingByProduct = beladingQ.data?.byProduct ?? {};
173
191
  // Zodra de lijst binnen is: zorg dat de gekozen belading een geldige optie is.
174
192
  useEffect(() => {
@@ -443,7 +461,7 @@ export function CreateOrderPage() {
443
461
  toast.warning(`Voor beheer: ${res.carrierAdminNotice}`);
444
462
  if (res?.engineWarning)
445
463
  toast.warning(res.engineWarning);
446
- qc.invalidateQueries({ queryKey: ["floriday", "salesorders-cache"] });
464
+ qc.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] });
447
465
  if (res?.orderId) {
448
466
  try {
449
467
  window.sessionStorage.setItem(`verkoop:just-created:${res.orderId}`, String(Date.now()));
@@ -642,7 +660,7 @@ export function CreateOrderPage() {
642
660
  next[idx] = { ...next[idx], unit_price: v };
643
661
  setLines(next);
644
662
  }, placeholder: "\u20AC prijs", "aria-invalid": !!line.product_id && !(Number(line.unit_price) > 0), title: !!line.product_id && !(Number(line.unit_price) > 0) ? "Prijs € 0" : undefined })] }), _jsx(Button, { variant: "ghost", size: "icon", className: "col-span-2 justify-self-end lg:col-span-1 lg:justify-self-auto", onClick: () => setLines(lines.filter((_, i) => i !== idx)), "aria-label": "Regel verwijderen", children: _jsx(Trash2, { className: "h-4 w-4" }) })] }, idx));
645
- }), lines.some((l) => l.product_id && !(Number(l.unit_price) > 0)) && (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive", children: ["Prijs \u20AC 0: ", zeroPriceCount, " regel(s) zonder prijs. Er is geen prijs gevonden in prijsgroep of artikel. Vul de prijs in, of bevestig bij het aanmaken dat \u20AC 0 klopt."] })), _jsxs(Button, { variant: "outline", size: "sm", onClick: () => setLines([...lines, { product_id: null, product_name: "", quantity: null, unit: "stuks", unit_price: null, belading: null }]), children: [_jsx(Plus, { className: "h-3 w-3 mr-1" }), " Regel toevoegen"] })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Referentie klant" }), _jsx(Input, { value: customerReference, maxLength: 100, onChange: (e) => setCustomerReference(e.target.value), placeholder: "Optioneel, bijvoorbeeld het bestelnummer van je klant" })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Opmerkingen" }), _jsx(Textarea, { value: notes, onChange: (e) => setNotes(e.target.value), placeholder: "Optionele notities bij deze bestelling", rows: 3 })] }), stockCheck && stockCheck.shortages.length > 0 && (_jsxs("div", { className: `rounded-md border p-3 text-sm ${stockBlocked
663
+ }), lines.some((l) => l.product_id && impossibleByProduct[l.product_id]) && (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive", children: [_jsx("div", { className: "font-medium", children: "De Engine noemt deze producten onmogelijk:" }), _jsx("ul", { className: "mt-1 list-disc pl-5", children: lines.filter((l) => l.product_id && impossibleByProduct[l.product_id]).map((l) => (_jsxs("li", { children: [l.product_name || "Product", ": ", impossibleByProduct[l.product_id]] }, l.product_id))) })] })), lines.some((l) => l.product_id && !impossibleByProduct[l.product_id] && missingByProduct[l.product_id]) && (_jsxs("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: [_jsx("div", { className: "font-medium", children: "Gegevens ontbreken voor de Engine:" }), _jsx("ul", { className: "mt-1 list-disc pl-5", children: lines.filter((l) => l.product_id && !impossibleByProduct[l.product_id] && missingByProduct[l.product_id]).map((l) => (_jsxs("li", { children: [l.product_name || "Product", ": ", missingByProduct[l.product_id]] }, l.product_id))) })] })), lines.some((l) => l.product_id && !(Number(l.unit_price) > 0)) && (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive", children: ["Prijs \u20AC 0: ", zeroPriceCount, " regel(s) zonder prijs. Er is geen prijs gevonden in prijsgroep of artikel. Vul de prijs in, of bevestig bij het aanmaken dat \u20AC 0 klopt."] })), _jsxs(Button, { variant: "outline", size: "sm", onClick: () => setLines([...lines, { product_id: null, product_name: "", quantity: null, unit: "stuks", unit_price: null, belading: null }]), children: [_jsx(Plus, { className: "h-3 w-3 mr-1" }), " Regel toevoegen"] })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Referentie klant" }), _jsx(Input, { value: customerReference, maxLength: 100, onChange: (e) => setCustomerReference(e.target.value), placeholder: "Optioneel, bijvoorbeeld het bestelnummer van je klant" })] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Opmerkingen" }), _jsx(Textarea, { value: notes, onChange: (e) => setNotes(e.target.value), placeholder: "Optionele notities bij deze bestelling", rows: 3 })] }), stockCheck && stockCheck.shortages.length > 0 && (_jsxs("div", { className: `rounded-md border p-3 text-sm ${stockBlocked
646
664
  ? "border-destructive/40 bg-destructive/5 text-destructive"
647
665
  : "border-amber-500/40 bg-amber-500/5 text-amber-700"}`, children: [_jsx("div", { className: "font-medium", children: stockBlocked
648
666
  ? "Bestelling geblokkeerd — onvoldoende voorraad"
@@ -1 +1 @@
1
- {"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AA+CA,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC,sCA0kBA"}
1
+ {"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AA+CA,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC,sCA2kBA"}
@@ -230,10 +230,11 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
230
230
  if (saveRes?.engineWarning)
231
231
  toast.warning(saveRes.engineWarning);
232
232
  await Promise.all([
233
- queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-cache"] }),
233
+ queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] }),
234
234
  queryClient.invalidateQueries({ queryKey: ["order-shipments", orderId] }),
235
235
  queryClient.invalidateQueries({ queryKey: ["order-carts", orderId] }),
236
- queryClient.invalidateQueries({ queryKey: ["salesorder-detail", orderId] }),
236
+ queryClient.invalidateQueries({ queryKey: ["salesorders", "local-detail", orderId] }),
237
+ queryClient.invalidateQueries({ queryKey: ["floriday", "salesorder-detail"] }),
237
238
  ]);
238
239
  onOpenChange(false);
239
240
  }
@@ -1 +1 @@
1
- {"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAoB/D,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,+BAyMvE"}
1
+ {"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAuB/D,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,+BAuOvE"}
@@ -10,6 +10,7 @@ import { Badge, Button, Card, CardContent, CardHeader, CardTitle, Table, TableBo
10
10
  import { LayoutGrid, RefreshCw } from "lucide-react";
11
11
  import { getOrderPlanCoverage } from "../../lib/cart-replan.functions.js";
12
12
  import { summarize } from "../../lib/plan-coverage.js";
13
+ import { loadCarrierName } from "../../lib/load-carrier-labels.js";
13
14
  import { resolveProductName } from "../../lib/product-name.js";
14
15
  import { CartLayersDialog } from "./CartLayersDialog.js";
15
16
  import { PlanCoverageBadge } from "./PlanCoverageBadge.js";
@@ -21,6 +22,8 @@ const PICK_LABEL = {
21
22
  gepickt: "Gepickt",
22
23
  };
23
24
  const JUST_CREATED_MS = 120000;
25
+ // "Karindeling wordt gemaakt…" alleen de eerste korte wachttijd, nooit als eindstand.
26
+ const CREATING_LABEL_MS = 20000;
24
27
  const fmt = (v) => (v ? new Date(v).toLocaleString("nl-NL") : null);
25
28
  export function OrderKarindelingCard({ order }) {
26
29
  // Lokale orders hebben een prefix in hun DTO-id; Floriday-orders hun
@@ -58,7 +61,7 @@ export function OrderKarindelingCard({ order }) {
58
61
  },
59
62
  });
60
63
  const cov = data?.coverage ?? null;
61
- const creating = !!justCreatedAt && cov?.state === "geen_indeling" && now - justCreatedAt < JUST_CREATED_MS;
64
+ const creating = !!justCreatedAt && cov?.state === "geen_indeling" && !cov?.geenIndeling && now - justCreatedAt < CREATING_LABEL_MS;
62
65
  // Zolang er nog geen kar is ("Karindeling wordt gemaakt…" of "Geen indeling"):
63
66
  // zelf elke 3 s opnieuw opvragen tot er een kar is, hooguit 2 minuten vanaf
64
67
  // het aanmaken (of vanaf het openen van dit scherm).
@@ -83,7 +86,7 @@ export function OrderKarindelingCard({ order }) {
83
86
  p.completedAt ? `Afgerond ${fmt(p.completedAt)}` : null,
84
87
  ]
85
88
  .filter(Boolean)
86
- .join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), cov.state === "onbekend" && cov.error && (_jsx("p", { className: "text-sm text-muted-foreground", children: cov.error })), carts.map((c) => (_jsxs("div", { className: "rounded-md border border-border", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2 border-b border-border bg-muted/30 px-3 py-2 text-sm", children: [_jsxs("button", { type: "button", className: "flex items-center gap-2 rounded-sm text-left hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", onClick: () => setLayersFor({ id: c.cartId, number: c.cartNumber ?? 0 }), title: "Bekijk de lagen van deze kar", children: [_jsx(LayoutGrid, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("span", { className: "font-mono font-medium", children: ["Kar ", c.cartNumber ?? "—"] })] }), c.shared && _jsx(Badge, { variant: "outline", children: "Gedeeld met gecombineerde order" }), c.carrierType && (_jsx(Badge, { variant: "outline", className: "font-mono text-[10px]", children: c.carrierType }))] }), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), _jsx(TableHead, { className: "text-right", children: "Dozen" })] }) }), _jsx(TableBody, { children: (Array.isArray(c.lines) ? c.lines : []).map((l, i) => (_jsxs(TableRow, { children: [_jsx(TableCell, { children: resolveProductName(l.productName) ?? "—" }), _jsx(TableCell, { className: "text-right", children: l.crates }), _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId)))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
89
+ .join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), cov.state === "geen_indeling" && !creating && (cov.geenIndeling ? (_jsxs("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm", children: [_jsxs("div", { className: "font-medium text-destructive", children: ["Geen indeling", cov.geenIndeling.code ? ` (${cov.geenIndeling.code})` : ""] }), cov.geenIndeling.tekst && _jsx("p", { className: "mt-1 text-foreground", children: cov.geenIndeling.tekst }), cov.geenIndeling.actieUrl && (cov.geenIndeling.actieLabel || cov.geenIndeling.actie) && (_jsx(Button, { asChild: true, size: "sm", variant: "outline", className: "mt-2", children: _jsx("a", { href: cov.geenIndeling.actieUrl, children: cov.geenIndeling.actieLabel ?? cov.geenIndeling.actie }) }))] })) : (_jsxs("p", { className: "text-sm text-muted-foreground", children: ["Geen indeling: bekijk de reden in Engine beheer", cov.reason ? ` (${cov.reason})` : "", "."] }))), cov.state === "onbekend" && cov.error && (_jsx("p", { className: "text-sm text-muted-foreground", children: cov.error })), carts.map((c) => (_jsxs("div", { className: "rounded-md border border-border", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2 border-b border-border bg-muted/30 px-3 py-2 text-sm", children: [_jsxs("button", { type: "button", className: "flex items-center gap-2 rounded-sm text-left hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", onClick: () => setLayersFor({ id: c.cartId, number: c.cartNumber ?? 0 }), title: "Bekijk de lagen van deze kar", children: [_jsx(LayoutGrid, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("span", { className: "font-mono font-medium", children: ["Kar ", c.cartNumber ?? "—"] })] }), c.shared && _jsx(Badge, { variant: "outline", children: "Gedeeld met gecombineerde order" }), c.ladingdragerTekst ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: c.ladingdragerTekst })) : c.carrierType ? (_jsxs(Badge, { variant: "outline", className: "text-[10px]", children: [loadCarrierName(c.carrierType) ?? c.carrierType, c.additionalLayers != null ? ` · ${c.additionalLayers} ${c.additionalLayers === 1 ? "plaat" : "platen"}` : ""] })) : null, c.teHoog === true && _jsx(Badge, { variant: "destructive", className: "text-[10px]", children: "Te hoog" })] }), c.blokkade && (_jsxs("div", { className: "border-b border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-destructive", children: ["Blokkade", c.blokkade.code ? ` (${c.blokkade.code})` : "", ": ", c.blokkade.tekst ?? "zie Engine beheer"] })), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), _jsx(TableHead, { className: "text-right", children: "Dozen" })] }) }), _jsx(TableBody, { children: (Array.isArray(c.lines) ? c.lines : []).map((l, i) => (_jsxs(TableRow, { children: [_jsx(TableCell, { children: resolveProductName(l.productName) ?? "—" }), _jsx(TableCell, { className: "text-right", children: l.crates }), _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId)))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
87
90
  if (!v)
88
91
  setLayersFor(null);
89
92
  } })] }));
@@ -1 +1 @@
1
- {"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"AAoJA,wBAAgB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,sCA4CpE"}
1
+ {"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"AA8MA,wBAAgB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,sCA4CpE"}
@@ -9,7 +9,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
9
9
  import { useServerFn } from "@tanstack/react-start";
10
10
  import { Badge, Button, Input, toast } from "@flowselections/core";
11
11
  import { Lock, LockOpen } from "lucide-react";
12
- import { listOrderItemPacking, setOrderItemPacking, clearOrderItemPackingLock, } from "../../lib/order-item-packing.functions.js";
12
+ import { listOrderItemPacking, setOrderItemPacking, previewOrderItemPacking, clearOrderItemPackingLock, } from "../../lib/order-item-packing.functions.js";
13
13
  function fmtWhen(iso) {
14
14
  if (!iso)
15
15
  return "";
@@ -18,6 +18,10 @@ function fmtWhen(iso) {
18
18
  }
19
19
  function LineRow({ item, onChanged, }) {
20
20
  const lock = useServerFn(setOrderItemPacking);
21
+ const previewFn = useServerFn(previewOrderItemPacking);
22
+ // Stap 1: voorbeeld van de Engine; stap 2: vastzetten; stap 3: bevestigen indien nodig.
23
+ const [preview, setPreview] = useState(null);
24
+ const [confirmText, setConfirmText] = useState(null);
21
25
  const unlock = useServerFn(clearOrderItemPackingLock);
22
26
  const [ppc, setPpc] = useState(item.plantsPerCrate?.toString() ?? "");
23
27
  const [cpl, setCpl] = useState(item.cratesPerLayer?.toString() ?? "");
@@ -28,24 +32,32 @@ function LineRow({ item, onChanged, }) {
28
32
  setCpl(item.cratesPerLayer?.toString() ?? "");
29
33
  setLpc(item.layersPerCart?.toString() ?? "");
30
34
  }, [item.plantsPerCrate, item.cratesPerLayer, item.layersPerCart]);
35
+ const readNums = () => {
36
+ const nums = [ppc, cpl, lpc].map((v) => Number(v));
37
+ if (nums.some((n) => !Number.isFinite(n) || !Number.isInteger(n) || n <= 0)) {
38
+ throw new Error("Vul alle drie de waarden in als heel getal groter dan 0.");
39
+ }
40
+ return { orderItemId: item.id, plantsPerCrate: nums[0], cratesPerLayer: nums[1], layersPerCart: nums[2] };
41
+ };
42
+ const resetSteps = () => {
43
+ setPreview(null);
44
+ setConfirmText(null);
45
+ };
46
+ const previewM = useMutation({
47
+ mutationFn: async () => previewFn({ data: readNums() }),
48
+ onSuccess: (r) => setPreview({ tekst: r.tekst, available: r.available }),
49
+ onError: (e) => toast.error(e?.message ?? "Voorbeeld mislukt"),
50
+ });
31
51
  const lockM = useMutation({
32
- mutationFn: async () => {
33
- const nums = [ppc, cpl, lpc].map((v) => Number(v));
34
- if (nums.some((n) => !Number.isFinite(n) || !Number.isInteger(n) || n <= 0)) {
35
- throw new Error("Vul alle drie de waarden in als heel getal groter dan 0.");
52
+ mutationFn: async (bevestigd) => lock({ data: { ...readNums(), bevestigd } }),
53
+ onSuccess: (r) => {
54
+ if (!r.ok) {
55
+ setConfirmText(r.tekst ?? "De Engine vraagt om bevestiging van deze wijziging.");
56
+ return;
36
57
  }
37
- return lock({
38
- data: {
39
- orderItemId: item.id,
40
- plantsPerCrate: nums[0],
41
- cratesPerLayer: nums[1],
42
- layersPerCart: nums[2],
43
- },
44
- });
45
- },
46
- onSuccess: () => {
47
58
  setEditing(false);
48
- toast.success("Belading handmatig vastgezet");
59
+ resetSteps();
60
+ toast.success(r.tekst ? `Belading vastgezet. ${r.tekst}` : "Belading handmatig vastgezet");
49
61
  onChanged();
50
62
  },
51
63
  onError: (e) => toast.error(e?.message ?? "Vastzetten mislukt"),
@@ -61,7 +73,15 @@ function LineRow({ item, onChanged, }) {
61
73
  const known = item.plantsPerCrate != null && item.cratesPerLayer != null && item.layersPerCart != null;
62
74
  return (_jsxs("div", { className: "rounded-md border border-border p-3", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate text-sm font-medium text-foreground", children: item.productName }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Sticker: ", item.needsSticker ? "ja" : "nee"] }), _jsx("div", { className: "text-xs text-muted-foreground", children: known
63
75
  ? `${item.plantsPerCrate} planten/fust · ${item.cratesPerLayer} fusten/laag · ${item.layersPerCart} lagen/kar`
64
- : "Belading onbekend — deze regel blokkeert de indeling tot er waarden staan" })] }), item.lockedAt ? (_jsxs(Badge, { variant: "outline", className: "gap-1 text-[11px]", children: [_jsx(Lock, { className: "h-3 w-3" }), "Handmatig vastgezet"] })) : null] }), item.lockedAt ? (_jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Vastgezet door ", item.lockedByName ?? "onbekend", " op ", fmtWhen(item.lockedAt)] })) : null, editing ? (_jsxs("div", { className: "mt-3 flex flex-wrap items-end gap-2", children: [_jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Planten/fust" }), _jsx(Input, { className: "w-28", value: ppc, onChange: (e) => setPpc(e.target.value), inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Fusten/laag" }), _jsx(Input, { className: "w-28", value: cpl, onChange: (e) => setCpl(e.target.value), inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Lagen/kar" }), _jsx(Input, { className: "w-28", value: lpc, onChange: (e) => setLpc(e.target.value), inputMode: "numeric" })] }), _jsx(Button, { size: "sm", onClick: () => lockM.mutate(), disabled: lockM.isPending, children: "Vastzetten" }), _jsx(Button, { size: "sm", variant: "ghost", onClick: () => setEditing(false), disabled: lockM.isPending, children: "Annuleren" })] })) : (_jsxs("div", { className: "mt-3 flex flex-wrap gap-2", children: [_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setEditing(true), children: [_jsx(Lock, { className: "mr-2 h-3.5 w-3.5" }), item.lockedAt ? "Vastgezette belading aanpassen" : "Belading handmatig vastzetten"] }), item.lockedAt ? (_jsxs(Button, { size: "sm", variant: "ghost", onClick: () => unlockM.mutate(), disabled: unlockM.isPending, children: [_jsx(LockOpen, { className: "mr-2 h-3.5 w-3.5" }), "Losmaken"] })) : null] }))] }));
76
+ : "Belading onbekend — deze regel blokkeert de indeling tot er waarden staan" })] }), item.lockedAt ? (_jsxs(Badge, { variant: "outline", className: "gap-1 text-[11px]", children: [_jsx(Lock, { className: "h-3 w-3" }), "Handmatig vastgezet"] })) : null] }), item.lockedAt ? (_jsxs("div", { className: "mt-1 space-y-0.5 text-xs", children: [_jsxs("div", { className: "text-foreground", children: ["Engine gebruikt:", " ", known
77
+ ? `${item.plantsPerCrate} planten/fust · ${item.cratesPerLayer} fusten/laag · ${item.layersPerCart} lagen/kar`
78
+ : "onbekend"] }), item.floridayPacking ? (_jsxs("div", { className: "text-muted-foreground", children: ["Floriday:", " ", [
79
+ item.floridayPacking.plantsPerCrate != null ? `${item.floridayPacking.plantsPerCrate} planten/fust` : null,
80
+ item.floridayPacking.cratesPerLayer != null ? `${item.floridayPacking.cratesPerLayer} fusten/laag` : null,
81
+ item.floridayPacking.layersPerCart != null ? `${item.floridayPacking.layersPerCart} lagen/kar` : null,
82
+ ].filter(Boolean).join(" · ") || "onbekend"] })) : null] })) : null, item.lockedAt ? (_jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Vastgezet door ", item.lockedByName ?? "onbekend", " op ", fmtWhen(item.lockedAt)] })) : null, editing ? (_jsxs("div", { className: "mt-3 flex flex-wrap items-end gap-2", children: [_jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Planten/fust" }), _jsx(Input, { className: "w-28", value: ppc, onChange: (e) => { setPpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Fusten/laag" }), _jsx(Input, { className: "w-28", value: cpl, onChange: (e) => { setCpl(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), _jsxs("div", { children: [_jsx("div", { className: "mb-1 text-[11px] text-muted-foreground", children: "Lagen/kar" }), _jsx(Input, { className: "w-28", value: lpc, onChange: (e) => { setLpc(e.target.value); resetSteps(); }, inputMode: "numeric" })] }), !preview ? (_jsx(Button, { size: "sm", onClick: () => previewM.mutate(), disabled: previewM.isPending, children: "Bekijk gevolgen" })) : !confirmText ? (_jsx(Button, { size: "sm", onClick: () => lockM.mutate(false), disabled: lockM.isPending, children: "Vastzetten" })) : (_jsx(Button, { size: "sm", variant: "destructive", onClick: () => lockM.mutate(true), disabled: lockM.isPending, children: "Ja, toch vastzetten" })), _jsx(Button, { size: "sm", variant: "ghost", onClick: () => { setEditing(false); resetSteps(); }, disabled: lockM.isPending, children: "Annuleren" }), preview && (_jsx("div", { className: "w-full rounded-md border border-border bg-muted/30 p-2 text-xs text-foreground", children: preview.available
83
+ ? preview.tekst ?? "De Engine gaf geen toelichting."
84
+ : "Deze Engine geeft nog geen voorbeeld; controleer de waarden zelf." })), confirmText && (_jsx("div", { className: "w-full rounded-md border border-destructive/30 bg-destructive/5 p-2 text-xs text-destructive", children: confirmText }))] })) : (_jsxs("div", { className: "mt-3 flex flex-wrap gap-2", children: [_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setEditing(true), children: [_jsx(Lock, { className: "mr-2 h-3.5 w-3.5" }), item.lockedAt ? "Vastgezette belading aanpassen" : "Belading handmatig vastzetten"] }), item.lockedAt ? (_jsxs(Button, { size: "sm", variant: "ghost", onClick: () => unlockM.mutate(), disabled: unlockM.isPending, children: [_jsx(LockOpen, { className: "mr-2 h-3.5 w-3.5" }), "Losmaken"] })) : null] }))] }));
65
85
  }
66
86
  export function OrderLinePackingCard({ orderId }) {
67
87
  const fetchItems = useServerFn(listOrderItemPacking);
@@ -54,7 +54,7 @@ function OrderShipmentsInner({ orderId }) {
54
54
  }, [totals]);
55
55
  const refresh = () => {
56
56
  queryClient.invalidateQueries({ queryKey: ["order-shipments", orderId] });
57
- queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-cache"] });
57
+ queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] });
58
58
  };
59
59
  const [pendingDelete, setPendingDelete] = useState(null);
60
60
  const doDelete = async (shipmentId) => {
@@ -247,7 +247,7 @@ export function SalesOrderDetailView({ order, sellerFallback, hideKarindeling =
247
247
  const customerLegalName = pickStr(c.commercial_name) && pickStr(c.company_name) && pickStr(c.company_name) !== pickStr(c.commercial_name)
248
248
  ? pickStr(c.company_name)
249
249
  : (order.customer.legalName ?? null);
250
- const customerGln = pickStr(c.gln) ?? pickStr(cRaw.companyGln) ?? "—";
250
+ const customerGln = pickStr(c.gln) ?? pickStr(cRaw.companyGln) ?? pickStr(resolvedAddresses?.buyerGln) ?? "—";
251
251
  const customerAdmin = pickStr(c.custom_fields?.rfh_relation_id) ??
252
252
  pickStr(cRaw.rfhRelationId) ??
253
253
  pickStr(cRaw.rfhCompanyAccountId) ??
@@ -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,qBA2UA"}
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,qBA4UA"}
@@ -102,7 +102,8 @@ export function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder
102
102
  const incomplete = row.incomplete ?? [];
103
103
  return (_jsxs(TableRow, { className: `align-top cursor-pointer ${isBuffer ? "bg-muted/20 border-l-2 border-primary/40" : ""}`, onClick: () => onSelectOrder?.(row), children: [_jsx(TableCell, { onClick: (e) => e.stopPropagation(), children: _jsx(Checkbox, { checked: selected.has(rowId), onCheckedChange: () => toggle(rowId) }) }), _jsxs(TableCell, { children: [_jsx("div", { className: "font-medium text-foreground", children: delivery.date }), delivery.time && (_jsx("div", { className: "text-xs text-muted-foreground", children: delivery.time }))] }), _jsxs(TableCell, { children: [_jsx("div", { className: "font-medium text-foreground", children: formatPickDate(row.pickDate) }), row.pickupLabel && (_jsxs("div", { className: "text-xs text-muted-foreground", title: "Ophaalmoment van de vervoerder", children: ["Ophalen: ", row.pickupLabel] })), _jsx("div", { className: "mt-1 flex flex-wrap gap-1", children: row.printedAt && (_jsx(Badge, { variant: "outline", className: "border-transparent bg-muted text-[11px] font-normal text-muted-foreground", title: "Deze order is al uitgeprint.", children: "uitgeprint" })) })] }), _jsxs(TableCell, { children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("span", { className: "font-medium text-foreground", children: row.customer.name }), row.customerReference && (_jsxs("span", { className: "text-xs text-muted-foreground", title: "Referentie klant", children: ["Ref. ", row.customerReference] })), isBuffer && (_jsxs(Badge, { variant: "outline", className: "border-primary/30 text-primary", children: ["Gecombineerd \u00B7 ", bufferSize] })), _jsx(MissingPriceBadge, { show: row.missingPrice }), reserved > 0 && (_jsx(Badge, { variant: "outline", className: "border-amber-400/40 text-amber-600", children: reserved === bufferSize
104
104
  ? "Reservering"
105
- : `Reservering · ${reserved} van ${bufferSize}` }))] }), row.customer.legalName && (_jsx("div", { className: "text-xs text-muted-foreground", children: row.customer.legalName })), _jsx("div", { className: "text-xs text-muted-foreground", children: [row.customer.postalCode, row.customer.city].filter(Boolean).join(" ") }), incomplete.length > 0 && (_jsxs("div", { className: "mt-1 inline-flex items-center gap-1 text-xs text-amber-600", children: [_jsx(AlertTriangle, { className: "h-3 w-3" }), incomplete.join(" · ")] })), (row.unlinkedProducts?.length ?? 0) > 0 && (_jsxs("div", { className: "mt-1 flex items-start gap-1 text-xs text-destructive", title: row.unlinkedProducts
105
+ : `Reservering · ${reserved} van ${bufferSize}` }))] }), row.customer.legalName && (_jsx("div", { className: "text-xs text-muted-foreground", children: row.customer.legalName })), _jsx("div", { className: "text-xs text-muted-foreground", children: row.deliveryLocationLabel ??
106
+ [row.customer.postalCode, row.customer.city].filter(Boolean).join(" ") }), incomplete.length > 0 && (_jsxs("div", { className: "mt-1 inline-flex items-center gap-1 text-xs text-amber-600", children: [_jsx(AlertTriangle, { className: "h-3 w-3" }), incomplete.join(" · ")] })), (row.unlinkedProducts?.length ?? 0) > 0 && (_jsxs("div", { className: "mt-1 flex items-start gap-1 text-xs text-destructive", title: row.unlinkedProducts
106
107
  .map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)
107
108
  .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
109
  .map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)