@flowselections/floriday-verkoop-module 1.0.130 → 1.0.132
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 +22 -4
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts +7 -0
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts.map +1 -0
- package/dist-lib/components/verkoop/EngineActieButtons.js +22 -0
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts +3 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.js +4 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +4 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +17 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +22 -5
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +25 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +23 -1
- package/dist-lib/integrations/supabase/types.d.ts +308 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/delivery-location.check.js +2 -1
- package/dist-lib/lib/floriday-line-key.check.js +19 -0
- package/dist-lib/lib/floriday-line-key.d.ts +20 -0
- package/dist-lib/lib/floriday-line-key.d.ts.map +1 -1
- package/dist-lib/lib/floriday-line-key.js +24 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +50 -4
- package/dist-lib/lib/floriday-status.server.d.ts +1 -1
- package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.server.js +3 -3
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-fust.check.d.ts +2 -0
- package/dist-lib/lib/order-fust.check.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.check.js +19 -0
- package/dist-lib/lib/order-fust.d.ts +19 -0
- package/dist-lib/lib/order-fust.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.js +21 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +22 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +29 -1
- package/dist-lib/lib/plan-coverage-v204.check.d.ts +2 -0
- package/dist-lib/lib/plan-coverage-v204.check.d.ts.map +1 -0
- package/dist-lib/lib/plan-coverage-v204.check.js +27 -0
- package/dist-lib/lib/plan-coverage.d.ts +30 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +57 -1
- package/dist-lib/lib/product-plannable.functions.d.ts +10 -0
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +60 -4
- package/dist-lib/lib/salesorders-list.functions.d.ts +17 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +23 -0
- package/dist-lib/lib/salesorders-list.server.d.ts +2 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +41 -12
- package/dist-lib/lib/salesorders-mapping.d.ts +6 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -8
- package/dist-lib/lib/useEngineMelding.d.ts +9 -0
- package/dist-lib/lib/useEngineMelding.d.ts.map +1 -0
- package/dist-lib/lib/useEngineMelding.js +20 -0
- package/package.json +1 -1
- package/schema/verkoop.sql +13 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAmGA,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAmGA,wBAAgB,eAAe,gCA4lC9B"}
|
|
@@ -172,20 +172,38 @@ export function CreateOrderPage() {
|
|
|
172
172
|
});
|
|
173
173
|
// Engine-oordeel per product: kan de Engine dit product indelen?
|
|
174
174
|
const fetchPlannability = useServerFn(getProductPlannability);
|
|
175
|
+
// Oordeel per regel op de gekozen belading (niet de standaard van het artikel).
|
|
176
|
+
const plannableRegels = useMemo(() => lines.flatMap((l, idx) => {
|
|
177
|
+
if (!l.product_id || !/^[0-9a-f-]{36}$/i.test(l.product_id))
|
|
178
|
+
return [];
|
|
179
|
+
const product = products.find((p) => p.id === l.product_id);
|
|
180
|
+
const def = completeBelading(product);
|
|
181
|
+
const eff = completeBelading(l.belading) ?? def;
|
|
182
|
+
return [{
|
|
183
|
+
key: String(idx),
|
|
184
|
+
productId: l.product_id,
|
|
185
|
+
plantsPerCrate: eff?.plants_per_crate ?? null,
|
|
186
|
+
cratesPerLayer: eff?.crates_per_layer ?? null,
|
|
187
|
+
layersPerCart: eff?.layers_per_cart ?? null,
|
|
188
|
+
isDefault: !!eff && !!def && beladingKey(eff) === beladingKey(def),
|
|
189
|
+
}];
|
|
190
|
+
}),
|
|
191
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
192
|
+
[lines, products]);
|
|
175
193
|
const plannableQ = useQuery({
|
|
176
|
-
queryKey: ["co-plannable", selectedProductIds],
|
|
194
|
+
queryKey: ["co-plannable", selectedProductIds, plannableRegels],
|
|
177
195
|
enabled: selectedProductIds.length > 0,
|
|
178
196
|
staleTime: 30000,
|
|
179
197
|
queryFn: async () => {
|
|
180
198
|
try {
|
|
181
|
-
return await fetchPlannability({ data: { productIds: selectedProductIds.filter((x) => /^[0-9a-f-]{36}$/i.test(x)) } });
|
|
199
|
+
return await fetchPlannability({ data: { productIds: selectedProductIds.filter((x) => /^[0-9a-f-]{36}$/i.test(x)), regels: plannableRegels } });
|
|
182
200
|
}
|
|
183
201
|
catch {
|
|
184
202
|
return { impossible: {}, available: false };
|
|
185
203
|
}
|
|
186
204
|
},
|
|
187
205
|
});
|
|
188
|
-
const
|
|
206
|
+
const impossibleByLine = plannableQ.data?.impossibleByLine ?? {};
|
|
189
207
|
const missingByProduct = plannableQ.data?.missing ?? {};
|
|
190
208
|
const beladingByProduct = beladingQ.data?.byProduct ?? {};
|
|
191
209
|
// Zodra de lijst binnen is: zorg dat de gekozen belading een geldige optie is.
|
|
@@ -660,7 +678,7 @@ export function CreateOrderPage() {
|
|
|
660
678
|
next[idx] = { ...next[idx], unit_price: v };
|
|
661
679
|
setLines(next);
|
|
662
680
|
}, 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));
|
|
663
|
-
}), lines.some((l) => l.product_id &&
|
|
681
|
+
}), lines.some((l, i) => l.product_id && impossibleByLine[String(i)]) && (_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 regels onmogelijk met de gekozen belading:" }), _jsx("ul", { className: "mt-1 list-disc pl-5", children: lines.map((l, i) => l.product_id && impossibleByLine[String(i)] ? (_jsxs("li", { children: [l.product_name || "Product", ": ", impossibleByLine[String(i)]] }, i)) : null) })] })), lines.some((l) => l.product_id && !impossibleByLine[String(lines.indexOf(l))] && 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 && !impossibleByLine[String(lines.indexOf(l))] && 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
|
|
664
682
|
? "border-destructive/40 bg-destructive/5 text-destructive"
|
|
665
683
|
: "border-amber-500/40 bg-amber-500/5 text-amber-700"}`, children: [_jsx("div", { className: "font-medium", children: stockBlocked
|
|
666
684
|
? "Bestelling geblokkeerd — onvoldoende voorraad"
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type EngineActie } from "../../lib/plan-coverage.js";
|
|
2
|
+
export declare function EngineActieButtons({ orderId, acties, onDone }: {
|
|
3
|
+
orderId: string;
|
|
4
|
+
acties: EngineActie[];
|
|
5
|
+
onDone?: () => void;
|
|
6
|
+
}): import("react").JSX.Element | null;
|
|
7
|
+
//# sourceMappingURL=EngineActieButtons.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EngineActieButtons.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EngineActieButtons.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtE,wBAAgB,kBAAkB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE,sCAkB9H"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
// Knoppen voor acties die de Logistiek Engine zelf meegeeft. Onbekende acties
|
|
3
|
+
// verschijnen nooit; "Alles herindelen" bestaat bewust niet (geprinte karren blijven staan).
|
|
4
|
+
import { useMutation } from "@tanstack/react-query";
|
|
5
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
6
|
+
import { Button, toast } from "@flowselections/core";
|
|
7
|
+
import { ENGINE_ACTIES } from "../../lib/plan-coverage.js";
|
|
8
|
+
import { herindelenNietGeprint } from "../../lib/order-item-packing.functions.js";
|
|
9
|
+
export function EngineActieButtons({ orderId, acties, onDone }) {
|
|
10
|
+
const run = useServerFn(herindelenNietGeprint);
|
|
11
|
+
const m = useMutation({
|
|
12
|
+
mutationFn: async () => run({ data: { orderId } }),
|
|
13
|
+
onSuccess: (r) => {
|
|
14
|
+
toast.success(r.tekst ?? "Niet-geprinte karren worden opnieuw ingedeeld");
|
|
15
|
+
onDone?.();
|
|
16
|
+
},
|
|
17
|
+
onError: (e) => toast.error(e?.message ?? "Herindelen mislukt"),
|
|
18
|
+
});
|
|
19
|
+
if (!acties.includes("herindelen_niet_geprint"))
|
|
20
|
+
return null;
|
|
21
|
+
return (_jsx("div", { className: "mt-2 flex flex-wrap gap-2", children: _jsx(Button, { size: "sm", variant: "outline", disabled: m.isPending, onClick: () => m.mutate(), children: m.isPending ? "Bezig…" : ENGINE_ACTIES.herindelen_niet_geprint }) }));
|
|
22
|
+
}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { type FloridayStatusSummary } from "../../lib/floriday-status.js";
|
|
2
2
|
import type { OrderStage } from "../../lib/order-status.js";
|
|
3
3
|
/** Extra regel "Floriday: …" met een melding als de stand afwijkt. Alleen weergave. */
|
|
4
|
-
export declare function FloridayStageLine({ status, stage, floridayFulfilled, isFloriday, notReportedCount, bufferSize, }: {
|
|
4
|
+
export declare function FloridayStageLine({ status, stage, floridayFulfilled, isFloriday, notReportedCount, bufferSize, loading, }: {
|
|
5
5
|
status: FloridayStatusSummary | null | undefined;
|
|
6
6
|
stage: OrderStage | undefined;
|
|
7
7
|
floridayFulfilled?: boolean;
|
|
8
8
|
isFloriday?: boolean;
|
|
9
9
|
notReportedCount?: number;
|
|
10
10
|
bufferSize?: number;
|
|
11
|
+
/** Stand wordt nog los nageladen. */
|
|
12
|
+
loading?: boolean;
|
|
11
13
|
}): import("react").JSX.Element | null;
|
|
12
14
|
export declare function MissingPriceBadge({ show }: {
|
|
13
15
|
show: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FloridayStageLine.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/FloridayStageLine.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA8D,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC/H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,uFAAuF;AACvF,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,KAAK,EACL,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAChB,UAAU,
|
|
1
|
+
{"version":3,"file":"FloridayStageLine.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/FloridayStageLine.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA8D,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC/H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,uFAAuF;AACvF,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,KAAK,EACL,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,OAAO,GACR,EAAE;IACD,MAAM,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC;IACjD,KAAK,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,sCAkDA;AAED,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,sCAOxE"}
|
|
@@ -4,7 +4,7 @@ import { Badge } from "@flowselections/core";
|
|
|
4
4
|
import { deviatesFromFloriday, floridayStageLabel, notReportedState } from "../../lib/floriday-status.js";
|
|
5
5
|
import { useFloridayReadOnlyReason } from "../../lib/useFloridayWriteMode.js";
|
|
6
6
|
/** Extra regel "Floriday: …" met een melding als de stand afwijkt. Alleen weergave. */
|
|
7
|
-
export function FloridayStageLine({ status, stage, floridayFulfilled, isFloriday, notReportedCount, bufferSize, }) {
|
|
7
|
+
export function FloridayStageLine({ status, stage, floridayFulfilled, isFloriday, notReportedCount, bufferSize, loading, }) {
|
|
8
8
|
const nr = isFloriday || status
|
|
9
9
|
? notReportedState(stage, status?.stage ?? null, !!floridayFulfilled)
|
|
10
10
|
: null;
|
|
@@ -14,6 +14,9 @@ export function FloridayStageLine({ status, stage, floridayFulfilled, isFloriday
|
|
|
14
14
|
? ` (${notReportedCount} van ${bufferSize} nog niet afgemeld)`
|
|
15
15
|
: "";
|
|
16
16
|
const notReported = warn ? (_jsxs("div", { className: "mt-1", children: [_jsxs(Badge, { variant: "outline", className: "border-amber-400/60 bg-amber-50 text-amber-800", children: [_jsx(AlertTriangle, { className: "mr-1 h-3 w-3" }), "Afgehandeld, nog niet gemeld bij Floriday", nr === "waarschuwing_onbekend" ? " (stand bij Floriday onbekend)" : "", bufferHint] }), readOnly && _jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Oorzaak: ", readOnly] })] })) : nr === "al_afgehandeld" ? (_jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: "Al afgehandeld in Floriday" })) : null;
|
|
17
|
+
if (!status && loading) {
|
|
18
|
+
return (_jsxs(_Fragment, { children: [_jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: "Floriday: laden\u2026" }), notReported] }));
|
|
19
|
+
}
|
|
17
20
|
if (!status)
|
|
18
21
|
return notReported;
|
|
19
22
|
const unknown = status.stage === "onbekend";
|
|
@@ -2,4 +2,8 @@ import type { SalesOrderDTO } from "../../lib/salesorders-mapping.js";
|
|
|
2
2
|
export declare function OrderKarindelingCard({ order }: {
|
|
3
3
|
order: SalesOrderDTO;
|
|
4
4
|
}): import("react").JSX.Element;
|
|
5
|
+
/** Lange Engine-tekst volledig tonen; boven ±160 tekens inklapbaar. */
|
|
6
|
+
export declare function ExpandableText({ text }: {
|
|
7
|
+
text: string;
|
|
8
|
+
}): import("react").JSX.Element;
|
|
5
9
|
//# sourceMappingURL=OrderKarindelingCard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AA0B/D,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,+BAwPvE;AAGD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAaxD"}
|
|
@@ -10,6 +10,9 @@ 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 { useEngineMelding, useSetEngineMelding } from "../../lib/useEngineMelding.js";
|
|
14
|
+
import { cartSummary } from "../../lib/plan-coverage.js";
|
|
15
|
+
import { EngineActieButtons } from "./EngineActieButtons.js";
|
|
13
16
|
import { loadCarrierName } from "../../lib/load-carrier-labels.js";
|
|
14
17
|
import { resolveProductName } from "../../lib/product-name.js";
|
|
15
18
|
import { CartLayersDialog } from "./CartLayersDialog.js";
|
|
@@ -31,6 +34,8 @@ export function OrderKarindelingCard({ order }) {
|
|
|
31
34
|
const rawId = order?.id ?? null;
|
|
32
35
|
const stripped = typeof rawId === "string" ? rawId.replace(/^(local:|mailbox-proposal:)/, "") : null;
|
|
33
36
|
const orderId = stripped && (UUID_RE.test(stripped) || stripped.length > 0) ? stripped : null;
|
|
37
|
+
const engineMelding = useEngineMelding(orderId);
|
|
38
|
+
const clearMelding = useSetEngineMelding(orderId);
|
|
34
39
|
const fetchCoverage = useServerFn(getOrderPlanCoverage);
|
|
35
40
|
const queryClient = useQueryClient();
|
|
36
41
|
const queryKey = ["order-plan-coverage", orderId];
|
|
@@ -86,8 +91,19 @@ export function OrderKarindelingCard({ order }) {
|
|
|
86
91
|
p.completedAt ? `Afgerond ${fmt(p.completedAt)}` : null,
|
|
87
92
|
]
|
|
88
93
|
.filter(Boolean)
|
|
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.
|
|
94
|
+
.join(" · "), children: [p.documentNumber ?? "pickrij", p.completedAt ? " ✓" : ""] }, p.queueItemId ?? i))) })] }))] }), (cov.indelingVerouderd || engineMelding) && (_jsx(IndelingVerouderdBlock, { orderId: orderId, verouderd: cov.indelingVerouderd ?? null, melding: engineMelding, onDone: () => { clearMelding(null); queryClient.invalidateQueries({ queryKey }); } })), cov.state === "geen_indeling" && !creating && (cov.geenIndeling ? (_jsxs("div", { className: "rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm", children: [_jsxs("div", { className: "font-medium text-destructive", children: ["Geen indeling", cov.geenIndeling.code ? ` (${cov.geenIndeling.code})` : ""] }), cov.geenIndeling.regels.length > 0 ? (_jsx("ul", { className: "mt-1 list-disc space-y-0.5 pl-5 text-foreground", children: cov.geenIndeling.regels.map((r, i) => _jsx("li", { className: "break-words", children: r }, i)) })) : cov.geenIndeling.tekst ? (_jsx(ExpandableText, { text: cov.geenIndeling.tekst })) : null, cov.geenIndeling.actieUrl && (cov.geenIndeling.actieLabel || cov.geenIndeling.actie) && (_jsx(Button, { asChild: true, size: "sm", variant: "outline", className: "mt-2", children: _jsx("a", { href: cov.geenIndeling.actieUrl, children: cov.geenIndeling.actieLabel ?? cov.geenIndeling.actie }) }))] })) : (_jsxs("p", { className: "text-sm text-muted-foreground", children: ["Geen indeling: bekijk de reden in Engine beheer.", cov.reason && _jsx(ExpandableText, { text: cov.reason })] }))), cov.state === "onbekend" && cov.error && (_jsx("p", { className: "text-sm text-muted-foreground", children: cov.error })), carts.map((c) => (_jsxs("div", { className: "rounded-md border border-border", children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2 border-b border-border bg-muted/30 px-3 py-2 text-sm", children: [_jsxs("button", { type: "button", className: "flex items-center gap-2 rounded-sm text-left hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", onClick: () => setLayersFor({ id: c.cartId, number: c.cartNumber ?? 0 }), title: "Bekijk de lagen van deze kar", children: [_jsx(LayoutGrid, { className: "h-4 w-4 text-muted-foreground" }), _jsxs("span", { className: "font-mono font-medium", children: ["Kar ", c.cartNumber ?? "—"] })] }), c.shared && _jsx(Badge, { variant: "outline", children: "Gedeeld met gecombineerde order" }), cartSummary(c) ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: cartSummary(c) })) : c.carrierType ? (_jsxs(Badge, { variant: "outline", className: "text-[10px]", children: [loadCarrierName(c.carrierType) ?? c.carrierType, c.additionalLayers != null ? ` · ${c.additionalLayers} ${c.additionalLayers === 1 ? "plaat" : "platen"}` : ""] })) : null, c.teHoog === true && _jsx(Badge, { variant: "destructive", className: "text-[10px]", children: "Te hoog" })] }), c.blokkade && (_jsxs("div", { className: "border-b border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-destructive", children: ["Blokkade", c.blokkade.code ? ` (${c.blokkade.code})` : "", ": ", c.blokkade.tekst ?? "zie Engine beheer"] })), _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel (deze order)" }), _jsx(TableHead, { className: "text-right", children: "Fusten" }), _jsx(TableHead, { className: "text-right", children: "Dozen" })] }) }), _jsx(TableBody, { children: (Array.isArray(c.lines) ? c.lines : []).map((l, i) => (_jsxs(TableRow, { children: [_jsx(TableCell, { children: resolveProductName(l.productName) ?? "—" }), _jsx(TableCell, { className: "text-right", children: l.crates }), _jsx(TableCell, { className: "text-right", children: l.boxes })] }, `${l.orderItemId ?? "x"}-${i}`))) })] })] }, c.cartId)))] })) : null }), _jsx(CartLayersDialog, { cartId: layersFor?.id ?? null, cartNumber: layersFor?.number ?? null, open: !!layersFor, onOpenChange: (v) => {
|
|
90
95
|
if (!v)
|
|
91
96
|
setLayersFor(null);
|
|
92
97
|
} })] }));
|
|
93
98
|
}
|
|
99
|
+
/** Lange Engine-tekst volledig tonen; boven ±160 tekens inklapbaar. */
|
|
100
|
+
export function ExpandableText({ text }) {
|
|
101
|
+
const [open, setOpen] = useState(false);
|
|
102
|
+
const long = text.length > 160;
|
|
103
|
+
return (_jsxs("span", { className: "mt-1 block text-foreground", children: [_jsx("span", { className: `whitespace-pre-line break-words ${long && !open ? "line-clamp-3" : ""}`, children: text }), long && (_jsx("button", { type: "button", className: "mt-1 block text-xs font-medium text-primary hover:underline", onClick: () => setOpen((v) => !v), children: open ? "Minder tonen" : "Meer tonen" }))] }));
|
|
104
|
+
}
|
|
105
|
+
/** Melding van de Engine: karindeling verouderd / karren liggen al vast. Alleen acties die de Engine geeft. */
|
|
106
|
+
function IndelingVerouderdBlock({ orderId, verouderd, melding, onDone, }) {
|
|
107
|
+
const tekst = verouderd?.tekst ?? melding?.tekst ?? null;
|
|
108
|
+
return (_jsxs("div", { className: "rounded-md border border-amber-400/60 bg-amber-50 p-3 text-sm text-amber-900", children: [_jsx("div", { className: "font-medium", children: "Karindeling verouderd" }), tekst && _jsx(ExpandableText, { text: tekst }), verouderd && verouderd.producten.length > 0 && (_jsxs("div", { className: "mt-1 text-xs", children: ["Producten: ", verouderd.producten.join(", ")] })), verouderd?.vastliggendeKarren != null && (_jsxs("div", { className: "mt-1 text-xs", children: [verouderd.vastliggendeKarren, " ", verouderd.vastliggendeKarren === 1 ? "kar ligt" : "karren liggen", " al vast (geprint) en blijven staan."] })), melding && melding.acties.length > 0 && _jsx(EngineActieButtons, { orderId: orderId, acties: melding.acties, onDone: onDone })] }));
|
|
109
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OrderLinePackingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderLinePackingCard.tsx"],"names":[],"mappings":"AAwOA,wBAAgB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,sCA4CpE"}
|
|
@@ -8,6 +8,8 @@ import { useEffect, useState } from "react";
|
|
|
8
8
|
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
|
+
import { useSetEngineMelding } from "../../lib/useEngineMelding.js";
|
|
12
|
+
import { EngineActieButtons } from "./EngineActieButtons.js";
|
|
11
13
|
import { Lock, LockOpen } from "lucide-react";
|
|
12
14
|
import { listOrderItemPacking, setOrderItemPacking, previewOrderItemPacking, clearOrderItemPackingLock, } from "../../lib/order-item-packing.functions.js";
|
|
13
15
|
function fmtWhen(iso) {
|
|
@@ -16,7 +18,14 @@ function fmtWhen(iso) {
|
|
|
16
18
|
const d = new Date(iso);
|
|
17
19
|
return Number.isNaN(d.getTime()) ? "" : d.toLocaleString("nl-NL");
|
|
18
20
|
}
|
|
19
|
-
function LineRow({ item, onChanged, }) {
|
|
21
|
+
function LineRow({ item, onChanged, orderId, }) {
|
|
22
|
+
const setEngineMelding = useSetEngineMelding(orderId);
|
|
23
|
+
// Melding van de Engine (bv. karren al geprint) blijft zichtbaar bij de regel.
|
|
24
|
+
const [melding, setMelding] = useState(null);
|
|
25
|
+
const noteMelding = (m) => {
|
|
26
|
+
setMelding(m);
|
|
27
|
+
setEngineMelding(m);
|
|
28
|
+
};
|
|
20
29
|
const lock = useServerFn(setOrderItemPacking);
|
|
21
30
|
const previewFn = useServerFn(previewOrderItemPacking);
|
|
22
31
|
// Stap 1: voorbeeld van de Engine; stap 2: vastzetten; stap 3: bevestigen indien nodig.
|
|
@@ -45,7 +54,13 @@ function LineRow({ item, onChanged, }) {
|
|
|
45
54
|
};
|
|
46
55
|
const previewM = useMutation({
|
|
47
56
|
mutationFn: async () => previewFn({ data: readNums() }),
|
|
48
|
-
onSuccess: (r) =>
|
|
57
|
+
onSuccess: (r) => {
|
|
58
|
+
setPreview({ tekst: r.tekst, available: r.available });
|
|
59
|
+
const tekst = r.vastliggendTekst ?? (r.vastliggendeKarren && r.vastliggendeKarren > 0
|
|
60
|
+
? `${r.vastliggendeKarren}${r.karrenTotaal != null ? ` van ${r.karrenTotaal}` : ""} karren liggen al vast (geprint).`
|
|
61
|
+
: null);
|
|
62
|
+
noteMelding(tekst ? { tekst, acties: r.acties } : null);
|
|
63
|
+
},
|
|
49
64
|
onError: (e) => toast.error(e?.message ?? "Voorbeeld mislukt"),
|
|
50
65
|
});
|
|
51
66
|
const lockM = useMutation({
|
|
@@ -60,7 +75,9 @@ function LineRow({ item, onChanged, }) {
|
|
|
60
75
|
toast.success(r.tekst ? `Belading vastgezet. ${r.tekst}` : "Belading handmatig vastgezet");
|
|
61
76
|
onChanged();
|
|
62
77
|
},
|
|
63
|
-
onError: (e) =>
|
|
78
|
+
onError: (e) => {
|
|
79
|
+
toast.error(e?.message ?? "Vastzetten mislukt");
|
|
80
|
+
},
|
|
64
81
|
});
|
|
65
82
|
const unlockM = useMutation({
|
|
66
83
|
mutationFn: async () => unlock({ data: { orderItemId: item.id } }),
|
|
@@ -71,7 +88,7 @@ function LineRow({ item, onChanged, }) {
|
|
|
71
88
|
onError: (e) => toast.error(e?.message ?? "Losmaken mislukt"),
|
|
72
89
|
});
|
|
73
90
|
const known = item.plantsPerCrate != null && item.cratesPerLayer != null && item.layersPerCart != null;
|
|
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
|
|
91
|
+
return (_jsxs("div", { className: "rounded-md border border-border p-3", children: [melding && (_jsxs("div", { className: "mb-2 rounded-md border border-amber-400/60 bg-amber-50 px-3 py-2 text-xs text-amber-900", children: [_jsx("span", { className: "font-medium", children: "Engine: " }), _jsx("span", { className: "break-words", children: melding.tekst }), _jsx(EngineActieButtons, { orderId: orderId, acties: melding.acties, onDone: () => { noteMelding(null); onChanged(); } })] })), _jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate text-sm font-medium text-foreground", children: item.productName }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Sticker: ", item.needsSticker ? "ja" : "nee"] }), _jsx("div", { className: "text-xs text-muted-foreground", children: known
|
|
75
92
|
? `${item.plantsPerCrate} planten/fust · ${item.cratesPerLayer} fusten/laag · ${item.layersPerCart} lagen/kar`
|
|
76
93
|
: "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
94
|
? `${item.plantsPerCrate} planten/fust · ${item.cratesPerLayer} fusten/laag · ${item.layersPerCart} lagen/kar`
|
|
@@ -104,5 +121,5 @@ export function OrderLinePackingCard({ orderId }) {
|
|
|
104
121
|
}
|
|
105
122
|
if (items.length === 0)
|
|
106
123
|
return null;
|
|
107
|
-
return (_jsxs("div", { className: "rounded-md border border-border p-4", children: [_jsx("div", { className: "mb-1 text-sm font-semibold text-foreground", children: "Belading per bestelregel" }), _jsx("div", { className: "mb-3 text-xs text-muted-foreground", children: "Standaard volgt een regel de belading van het artikel. Zet je een regel handmatig vast, dan blijft die waarde staan bij een volgende ophaalronde. Het artikel zelf verandert niet." }), _jsx("div", { className: "space-y-2", children: items.map((it) => (_jsx(LineRow, { item: it, onChanged: refresh }, it.id))) })] }));
|
|
124
|
+
return (_jsxs("div", { className: "rounded-md border border-border p-4", children: [_jsx("div", { className: "mb-1 text-sm font-semibold text-foreground", children: "Belading per bestelregel" }), _jsx("div", { className: "mb-3 text-xs text-muted-foreground", children: "Standaard volgt een regel de belading van het artikel. Zet je een regel handmatig vast, dan blijft die waarde staan bij een volgende ophaalronde. Het artikel zelf verandert niet." }), _jsx("div", { className: "space-y-2", children: items.map((it) => (_jsx(LineRow, { item: it, onChanged: refresh, orderId: orderId }, it.id))) })] }));
|
|
108
125
|
}
|
|
@@ -149,5 +149,5 @@ export function SalesOrderDetailPage() {
|
|
|
149
149
|
}
|
|
150
150
|
function BufferOrderRow({ order, sellerFallback, }) {
|
|
151
151
|
const [open, setOpen] = useState(false);
|
|
152
|
-
return (_jsxs("div", { className: "overflow-hidden rounded-lg border border-border bg-card", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), className: "flex w-full items-center gap-3 p-3 text-left hover:bg-muted/40", children: [open ? (_jsx(ChevronDown, { className: "h-4 w-4 shrink-0 text-muted-foreground" })) : (_jsx(ChevronRight, { className: "h-4 w-4 shrink-0 text-muted-foreground" })), _jsx("div", { className: "flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted", children: order.imageUrl ? (_jsx("img", { src: order.imageUrl, alt: "", className: "h-full w-full object-cover" })) : (_jsx(ImageIcon, { className: "h-5 w-5 text-muted-foreground" })) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "truncate text-sm font-semibold text-foreground", children: order.productName }), _jsxs("div", { className: "flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-muted-foreground", children: [order.orderNumber && _jsx("span", { children: order.orderNumber }), _jsxs("span", { children: [formatLoadUnits(order.karCount, order.cartTypeName), " karren", order.karShared ? " (gedeeld met buffer)" : ""] }), _jsxs("span", { children: [formatLoadUnits(order.fustCount, order.crateTypeName), " fusten"] }), _jsx("span", { children: eur.format(order.revenue ?? 0) })] })] }), order.isLocal ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "BVO" })) : (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "FO" }))] }), open && (_jsx("div", { className: "border-t border-border bg-background p-4", children: _jsx(SalesOrderDetailView, { order: order, sellerFallback: sellerFallback ?? null, hideKarindeling: true }) }))] }));
|
|
152
|
+
return (_jsxs("div", { className: "overflow-hidden rounded-lg border border-border bg-card", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), className: "flex w-full items-center gap-3 p-3 text-left hover:bg-muted/40", children: [open ? (_jsx(ChevronDown, { className: "h-4 w-4 shrink-0 text-muted-foreground" })) : (_jsx(ChevronRight, { className: "h-4 w-4 shrink-0 text-muted-foreground" })), _jsx("div", { className: "flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted", children: order.imageUrl ? (_jsx("img", { src: order.imageUrl, alt: "", className: "h-full w-full object-cover" })) : (_jsx(ImageIcon, { className: "h-5 w-5 text-muted-foreground" })) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "truncate text-sm font-semibold text-foreground", children: order.productName }), _jsxs("div", { className: "flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-muted-foreground", children: [order.orderNumber && _jsx("span", { children: order.orderNumber }), _jsxs("span", { children: [formatLoadUnits(order.karCount, order.cartTypeName), " karren", order.karShared ? " (gedeeld met buffer)" : ""] }), _jsxs("span", { children: [formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName), " fusten"] }), order.mixedPacking && (order.articleCount ?? 0) > 1 && _jsxs("span", { children: ["Gemengd (", order.articleCount, " artikelen)"] }), _jsx("span", { children: eur.format(order.revenue ?? 0) })] })] }), order.isLocal ? (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "BVO" })) : (_jsx(Badge, { variant: "outline", className: "text-[10px]", children: "FO" }))] }), open && (_jsx("div", { className: "border-t border-border bg-background p-4", children: _jsx(SalesOrderDetailView, { order: order, sellerFallback: sellerFallback ?? null, hideKarindeling: true }) }))] }));
|
|
153
153
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SalesOrderDTO } from "../../lib/salesorders-mapping.js";
|
|
2
|
-
export declare function SalesOrderDetailView(
|
|
2
|
+
export declare function SalesOrderDetailView(props: {
|
|
3
3
|
order: SalesOrderDTO;
|
|
4
4
|
sellerFallback?: string | null;
|
|
5
5
|
hideKarindeling?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrderDetailView.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailView.tsx"],"names":[],"mappings":"AAIA,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":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AA6JnE,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;CAC3B,+BAkBA"}
|
|
@@ -15,6 +15,7 @@ import { OrderCarrierPicker } from "./OrderCarrierPicker.js";
|
|
|
15
15
|
import { OrderPickupMomentPicker } from "./OrderPickupMomentPicker.js";
|
|
16
16
|
import { PlanCoverageBadge } from "./PlanCoverageBadge.js";
|
|
17
17
|
import { FloridayStageLine } from "./FloridayStageLine.js";
|
|
18
|
+
import { getFloridayStatusesForRows } from "../../lib/salesorders-list.functions.js";
|
|
18
19
|
function AddressCard({ icon, lines, extra, }) {
|
|
19
20
|
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 })] })] }));
|
|
20
21
|
}
|
|
@@ -116,7 +117,25 @@ function Row({ label, children }) {
|
|
|
116
117
|
function SectionTitle({ children }) {
|
|
117
118
|
return (_jsx("div", { className: "border-b border-border pb-2 text-sm font-semibold text-foreground", children: children }));
|
|
118
119
|
}
|
|
119
|
-
export function SalesOrderDetailView(
|
|
120
|
+
export function SalesOrderDetailView(props) {
|
|
121
|
+
// Floriday-stand los nalanden (zelfde serverfunctie als de lijst, ruime tijdslimiet).
|
|
122
|
+
const ids = props.order.floridayStatusIds ?? [];
|
|
123
|
+
const fetchStatuses = useServerFn(getFloridayStatusesForRows);
|
|
124
|
+
const statusQ = useQuery({
|
|
125
|
+
queryKey: ["floriday-status-detail", props.order.id, ids.join(",")],
|
|
126
|
+
queryFn: () => fetchStatuses({ data: { rows: [{ key: props.order.id, ids }] } }),
|
|
127
|
+
enabled: ids.length > 0,
|
|
128
|
+
staleTime: 60000,
|
|
129
|
+
retry: 1,
|
|
130
|
+
});
|
|
131
|
+
const loaded = statusQ.data?.statuses[props.order.id];
|
|
132
|
+
const order = ids.length === 0 ? props.order
|
|
133
|
+
: loaded ? { ...props.order, floridayStatus: loaded }
|
|
134
|
+
: statusQ.isError ? { ...props.order, floridayStatus: { stage: "onbekend", error: "niet geladen", entries: [] } }
|
|
135
|
+
: props.order;
|
|
136
|
+
return _jsx(SalesOrderDetailViewInner, { ...props, order: order, floridayLoading: ids.length > 0 && statusQ.isPending });
|
|
137
|
+
}
|
|
138
|
+
function SalesOrderDetailViewInner({ floridayLoading, order, sellerFallback, hideKarindeling = false, }) {
|
|
120
139
|
const o = order.raw.order ?? {};
|
|
121
140
|
const c = order.raw.customer ?? {};
|
|
122
141
|
const cRaw = c?.raw ?? {};
|
|
@@ -257,7 +276,11 @@ export function SalesOrderDetailView({ order, sellerFallback, hideKarindeling =
|
|
|
257
276
|
const bestellingLabel = orderStageLabel(order.stage ?? (order.status.isCancelled ? "cancelled" : "incoming"));
|
|
258
277
|
return (_jsxs("div", { className: "space-y-6", children: [order.needsManualReview ? (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 p-3 text-sm text-foreground", children: [_jsx("div", { className: "font-semibold", children: "Handmatige beoordeling nodig" }), _jsxs("div", { className: "text-muted-foreground", children: [order.needsManualReview.reason, order.needsManualReview.at
|
|
259
278
|
? ` (geconstateerd op ${new Date(order.needsManualReview.at).toLocaleString("nl-NL")})`
|
|
260
|
-
: ""] })] })) : null, order.mixedDeliveryDates ? (_jsxs("div", { className: "rounded-md border border-border bg-muted/40 p-3 text-sm text-foreground", children: [_jsx("div", { className: "font-semibold", children: "Bestellingen met verschillende leverdatums" }), _jsx("div", { className: "text-muted-foreground", children: "Deze order bestaat uit Floriday-bestellingen met verschillende leverdatums. De vroegste leverdatum is aangehouden." })] })) : null, (order.unlinkedProducts?.length ?? 0) > 0 ? (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 p-3 text-sm text-foreground", children: [_jsx("div", { className: "font-semibold", children: "Floriday-artikel niet gekoppeld aan product" }), _jsx("ul", { className: "mt-1 space-y-0.5 text-muted-foreground", children: order.unlinkedProducts.map((u, i) => (_jsxs("li", { children: [u.name, " \u2014 trade-item-id ", u.tradeItemId ?? "onbekend"] }, i))) }), _jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: "Koppel dit Floriday-artikel aan een eigen product; bij de volgende update wordt het overgenomen." })] })) : null, _jsxs("div", { className: "flex items-center gap-3 rounded-md border border-border bg-muted/30 p-3", children: [_jsx("div", { className: "flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted", children: order.imageUrl ? (_jsx("img", { src: order.imageUrl, alt: "", className: "h-full w-full object-cover" })) : (_jsx(ImageIcon, { className: "h-6 w-6 text-muted-foreground" })) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsxs("div", { className: "truncate text-base font-semibold text-foreground", children: [order.productName, o.tradeItemVersion ? (_jsxs("span", { className: "ml-2 text-xs font-normal text-muted-foreground", children: ["\u00B7 v", o.tradeItemVersion] })) : null] }), _jsx("div", { className: "truncate text-xs text-muted-foreground", children: order.orderNumber || order.sku || "—" })] })] }), _jsxs("div", { className: "grid grid-cols-1 gap-6 lg:grid-cols-[1fr_360px]", children: [_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { children: [_jsx(SectionTitle, { children: "Verkooporder" }), _jsx(Row, { label: "Ordernummer", children: order.orderNumber || "—" }), _jsx(Row, { label: "Handelsvorm", children: tradingType }), _jsx(Row, { label: "Bestelmoment", children: fmtDateTime(order.orderedAt) }), _jsx(Row, { label: "Aantal", children: _jsxs("div", { className: "flex flex-wrap gap-4", children: [_jsxs("div", { children: [formatLoadUnits(order.fustCount, order.crateTypeName), " fusten"] }), _jsxs("div", { children: [formatLoadUnits(order.karCount, order.cartTypeName), " karren", order.karShared ? " (gedeeld met buffer)" : "", _jsx(PlanCoverageBadge, { coverage: order.planCoverage })] })] }) }), _jsx(Row, { label: "Belading", children:
|
|
279
|
+
: ""] })] })) : null, order.mixedDeliveryDates ? (_jsxs("div", { className: "rounded-md border border-border bg-muted/40 p-3 text-sm text-foreground", children: [_jsx("div", { className: "font-semibold", children: "Bestellingen met verschillende leverdatums" }), _jsx("div", { className: "text-muted-foreground", children: "Deze order bestaat uit Floriday-bestellingen met verschillende leverdatums. De vroegste leverdatum is aangehouden." })] })) : null, (order.unlinkedProducts?.length ?? 0) > 0 ? (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/10 p-3 text-sm text-foreground", children: [_jsx("div", { className: "font-semibold", children: "Floriday-artikel niet gekoppeld aan product" }), _jsx("ul", { className: "mt-1 space-y-0.5 text-muted-foreground", children: order.unlinkedProducts.map((u, i) => (_jsxs("li", { children: [u.name, " \u2014 trade-item-id ", u.tradeItemId ?? "onbekend"] }, i))) }), _jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: "Koppel dit Floriday-artikel aan een eigen product; bij de volgende update wordt het overgenomen." })] })) : null, _jsxs("div", { className: "flex items-center gap-3 rounded-md border border-border bg-muted/30 p-3", children: [_jsx("div", { className: "flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted", children: order.imageUrl ? (_jsx("img", { src: order.imageUrl, alt: "", className: "h-full w-full object-cover" })) : (_jsx(ImageIcon, { className: "h-6 w-6 text-muted-foreground" })) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsxs("div", { className: "truncate text-base font-semibold text-foreground", children: [order.productName, o.tradeItemVersion ? (_jsxs("span", { className: "ml-2 text-xs font-normal text-muted-foreground", children: ["\u00B7 v", o.tradeItemVersion] })) : null] }), _jsx("div", { className: "truncate text-xs text-muted-foreground", children: order.orderNumber || order.sku || "—" })] })] }), _jsxs("div", { className: "grid grid-cols-1 gap-6 lg:grid-cols-[1fr_360px]", children: [_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { children: [_jsx(SectionTitle, { children: "Verkooporder" }), _jsx(Row, { label: "Ordernummer", children: order.orderNumber || "—" }), _jsx(Row, { label: "Handelsvorm", children: tradingType }), _jsx(Row, { label: "Bestelmoment", children: fmtDateTime(order.orderedAt) }), _jsx(Row, { label: "Aantal", children: _jsxs("div", { className: "flex flex-wrap gap-4", children: [_jsxs("div", { children: [formatLoadUnits(order.fustCount, order.mixedPacking ? null : order.crateTypeName), " fusten"] }), _jsxs("div", { children: [formatLoadUnits(order.karCount, order.cartTypeName), " karren", order.karShared ? " (gedeeld met buffer)" : "", _jsx(PlanCoverageBadge, { coverage: order.planCoverage })] })] }) }), _jsx(Row, { label: "Belading", children: order.mixedPacking
|
|
280
|
+
? (order.articleCount ?? 0) > 1
|
|
281
|
+
? `Gemengd (${order.articleCount} artikelen)`
|
|
282
|
+
: "Gemengd"
|
|
283
|
+
: belading }), _jsx(Row, { label: "Klant referentie", children: klantReferentie }), _jsx(Row, { label: "Floriday-referentie", children: floridayRef }), _jsx(Row, { label: "Verkoopkanaal", children: verkoopkanaal }), _jsx(Row, { label: "Financi\u00EBle afhandeling", children: financial }), _jsx(Row, { 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] })) : ("—") })] }), fs && (_jsxs("div", { children: [_jsx(SectionTitle, { children: "Floriday" }), _jsx(Row, { label: "Stand", children: _jsx(FloridayStageLine, { status: fs, stage: order.stage, floridayFulfilled: order.floridayFulfilled, isFloriday: true, loading: floridayLoading }) }), _jsxs(Row, { label: "Herkomst status", children: [order.statusOrigin === "floriday" ? "Floriday" : "ERP", order.statusChangedAt ? ` · ${fmtDateTime(order.statusChangedAt)}` : ""] }), fs.entries.map((e) => (_jsx(Row, { label: `Bestelling ${e.salesOrderId.slice(0, 8)}`, children: _jsxs("div", { className: "space-y-0.5 text-sm", children: [_jsxs("div", { children: ["Floriday-status: ", e.salesOrderStatus ?? "—"] }), _jsxs("div", { children: ["Afleververzoeken: ", e.fulfillmentRequests.length, " \u00B7 Afhandelingen:", " ", e.fulfillmentOrders.length
|
|
261
284
|
? e.fulfillmentOrders.map((f) => f.status ?? "?").join(", ")
|
|
262
285
|
: "geen"] }), _jsxs("div", { children: ["Verkoopkanaal: ", e.salesChannel ?? "—", " \u00B7 Handelsvorm: ", e.tradeInstrument ?? "—", " \u00B7 Incoterm: ", e.incoterm ?? "niet opgegeven"] }), _jsxs("div", { children: ["Klantreferentie: ", e.customerOrderId ?? "—", " \u00B7 Floriday-referentie: ", e.salesChannelOrderId ?? "—"] }), _jsxs("div", { children: ["Koper: ", e.customerOrganizationId ?? "—", " \u00B7 GLN: ", e.customerGln ?? "—"] }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Laatst gewijzigd: ", e.lastModifiedDateTime ? fmtDateTime(e.lastModifiedDateTime) : "—", " \u00B7 Ververst: ", e.cachedAt ? fmtDateTime(e.cachedAt) : "—"] })] }) }, e.salesOrderId)))] })), _jsxs("div", { children: [_jsx(SectionTitle, { children: "Levering" }), _jsx(Row, { label: "Afleverdatum", children: fmtDateTime(order.deliveryAt) }), _jsx(Row, { label: "Incoterm", children: incoterm }), _jsx(Row, { label: "Afleveradres", children: _jsx(AddressCard, { icon: _jsx(MapPin, { className: "h-5 w-5" }), lines: resolvedAddresses?.delivery
|
|
263
286
|
? [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesOrdersTable.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrdersTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAyBjD,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,qBAoWA"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { useMemo, useState } from "react";
|
|
3
|
+
import { useQuery } from "@tanstack/react-query";
|
|
4
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
5
|
+
import { getFloridayStatusesForRows } from "../../lib/salesorders-list.functions.js";
|
|
3
6
|
import { Badge, Checkbox, Skeleton, Table, TableBody, TableCell, TableHead, TableHeader, TableRow, } from "@flowselections/core";
|
|
4
7
|
import { formatLoadUnits } from "../../lib/load-carrier-labels.js";
|
|
5
8
|
import { orderStageBadgeClass, orderStageLabel } from "../../lib/order-status.js";
|
|
@@ -73,6 +76,25 @@ export function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder
|
|
|
73
76
|
const [internalSelected, setInternalSelected] = useState([]);
|
|
74
77
|
const selected = useMemo(() => new Set(selectedIds ?? internalSelected), [selectedIds, internalSelected]);
|
|
75
78
|
const rowIds = useMemo(() => orders.map(salesOrderRowId), [orders]);
|
|
79
|
+
// Floriday-stand los van de lijst nalanden; de cel ververst zodra hij binnen is.
|
|
80
|
+
const fetchStatuses = useServerFn(getFloridayStatusesForRows);
|
|
81
|
+
const statusRows = useMemo(() => orders.filter((o) => (o.floridayStatusIds?.length ?? 0) > 0).map((o) => ({ key: o.id, ids: o.floridayStatusIds })), [orders]);
|
|
82
|
+
const statusQ = useQuery({
|
|
83
|
+
queryKey: ["floriday-status-rows", statusRows.map((r) => `${r.key}:${r.ids.join(",")}`).join("|")],
|
|
84
|
+
queryFn: () => fetchStatuses({ data: { rows: statusRows } }),
|
|
85
|
+
enabled: statusRows.length > 0,
|
|
86
|
+
staleTime: 60000,
|
|
87
|
+
retry: 1,
|
|
88
|
+
});
|
|
89
|
+
const statusOf = (row) => {
|
|
90
|
+
if (!row.floridayStatusIds?.length)
|
|
91
|
+
return { status: row.floridayStatus, loading: false };
|
|
92
|
+
if (statusQ.data)
|
|
93
|
+
return { status: statusQ.data.statuses[row.id] ?? row.floridayStatus, loading: false };
|
|
94
|
+
if (statusQ.isError)
|
|
95
|
+
return { status: { stage: "onbekend", error: "niet geladen", entries: [] }, loading: false };
|
|
96
|
+
return { status: row.floridayStatus, loading: true };
|
|
97
|
+
};
|
|
76
98
|
const allChecked = rowIds.length > 0 && rowIds.every((id) => selected.has(id));
|
|
77
99
|
const someChecked = !allChecked && rowIds.some((id) => selected.has(id));
|
|
78
100
|
// Omzetkolom alleen tonen wanneer er daadwerkelijk bedragen bekend zijn.
|
|
@@ -107,7 +129,7 @@ export function SalesOrdersTable({ orders, loading, onSelectOrder, onDeleteOrder
|
|
|
107
129
|
.map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)
|
|
108
130
|
.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
|
|
109
131
|
.map((u) => `${u.name} (trade-item ${u.tradeItemId ?? "onbekend"})`)
|
|
110
|
-
.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.
|
|
132
|
+
.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: statusOf(row).status, loading: statusOf(row).loading, stage: row.stage, floridayFulfilled: isBuffer ? !row.notReportedToFloriday : row.floridayFulfilled, isFloriday: !!row.notReportedToFloriday || (row.floridayIds?.length ?? 0) > 0, notReportedCount: row.notReportedCount, bufferSize: bufferSize })] }), _jsxs(TableCell, { children: [_jsx("div", { className: "font-medium text-foreground", children: formatLoadUnits(row.fustCount, row.mixedPacking ? null : row.crateTypeName) }), row.mixedPacking && (row.articleCount ?? 0) > 1 && (_jsxs("div", { className: "text-xs text-muted-foreground", children: ["Gemengd (", row.articleCount, " artikelen)"] }))] }), _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
|
|
111
133
|
? `${bufferSize} orders`
|
|
112
134
|
: 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
|
|
113
135
|
? "Een gecombineerde order kun je niet in één keer bewerken."
|