@flowselections/floriday-verkoop-module 1.0.165 → 1.0.167
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 +163 -70
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -1
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +31 -7
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +1 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +18 -3
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +9 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +21 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +16 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +31 -5
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +2 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.js +47 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.js +11 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.js +16 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.js +31 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +7 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.js +17 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +5 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.js +48 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +8 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +107 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +19 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +26 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.js +53 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.js +31 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +11 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.js +17 -0
- package/dist-lib/index.d.ts +1 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +1 -0
- package/dist-lib/integrations/supabase/types.d.ts +2530 -2
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/belading-format.d.ts +3 -2
- package/dist-lib/lib/belading-format.d.ts.map +1 -1
- package/dist-lib/lib/belading-format.js +5 -3
- package/dist-lib/lib/beslis-rollen.server.d.ts +10 -0
- package/dist-lib/lib/beslis-rollen.server.d.ts.map +1 -0
- package/dist-lib/lib/beslis-rollen.server.js +10 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +8 -4
- package/dist-lib/lib/create-order-customers.d.ts +13 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +41 -0
- package/dist-lib/lib/create-order-form.d.ts +7 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +17 -1
- package/dist-lib/lib/create-order.functions.d.ts +10 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +163 -56
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/engine-tijdlijn.d.ts +69 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.js +47 -0
- package/dist-lib/lib/engine-tijdlijn.js +101 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.server.js +41 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +7 -1
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +24 -2
- package/dist-lib/lib/kar-tekening.d.ts +54 -4
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +92 -8
- package/dist-lib/lib/kar-tekening.server.d.ts +5 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.server.js +18 -0
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +13 -9
- package/dist-lib/lib/order-bijwerken.server.d.ts +20 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts.map +1 -0
- package/dist-lib/lib/order-bijwerken.server.js +31 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +33 -23
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +4 -13
- package/dist-lib/lib/order-cf-merge.d.ts +17 -0
- package/dist-lib/lib/order-cf-merge.d.ts.map +1 -0
- package/dist-lib/lib/order-cf-merge.js +51 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +40 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +95 -9
- package/dist-lib/lib/order-line-extras.d.ts +94 -0
- package/dist-lib/lib/order-line-extras.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts +55 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.js +117 -0
- package/dist-lib/lib/order-line-extras.js +171 -0
- package/dist-lib/lib/order-nav.d.ts +8 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -1
- package/dist-lib/lib/order-nav.js +13 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +5 -9
- package/dist-lib/lib/order-row.server.d.ts.map +1 -1
- package/dist-lib/lib/order-row.server.js +9 -6
- package/dist-lib/lib/order-status.d.ts +9 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -0
- package/dist-lib/lib/order-transport.functions.d.ts +9 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +21 -3
- package/dist-lib/lib/order-transport.server.d.ts +1 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.server.js +15 -1
- package/dist-lib/lib/own-transport.d.ts +6 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +12 -0
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +4 -2
- package/dist-lib/lib/sales-corrections.d.ts +44 -0
- package/dist-lib/lib/sales-corrections.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts +92 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.js +132 -0
- package/dist-lib/lib/sales-corrections.js +129 -0
- package/dist-lib/lib/sales-corrections.server.d.ts +27 -0
- package/dist-lib/lib/sales-corrections.server.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.server.js +68 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +17 -11
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -2
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +7 -2
- package/dist-lib/lib/step-timer.server.d.ts +13 -0
- package/dist-lib/lib/step-timer.server.d.ts.map +1 -0
- package/dist-lib/lib/step-timer.server.js +33 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -1
- package/dist-lib/lib/stock-product-link.server.js +12 -8
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.js +2 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.js +7 -1
- package/dist-lib/lib/useOpenCorrections.d.ts +17 -0
- package/dist-lib/lib/useOpenCorrections.d.ts.map +1 -0
- package/dist-lib/lib/useOpenCorrections.js +34 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts +9 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts.map +1 -0
- package/dist-lib/lib/useOrderDetailPrefetch.js +45 -0
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.js +5 -0
- package/dist-lib/lib/voorraad-vrij.d.ts +19 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +34 -0
- package/package.json +9 -4
- package/schema/verkoop.sql +560 -0
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
// Correctieverzoeken van kopers (Floriday sales-order-correction-requests).
|
|
2
|
+
// Alleen weergave- en teksthulp; lezen/beslissen loopt via de gateway van de
|
|
3
|
+
// Floriday-koppeling (sales-corrections.server.ts). Client-veilig.
|
|
4
|
+
import { fmtNL } from "./nl-datetime.js";
|
|
5
|
+
const s = (v) => (typeof v === "string" && v.trim() ? v : null);
|
|
6
|
+
export function parseCorrection(x) {
|
|
7
|
+
const id = s(x?.id);
|
|
8
|
+
if (!id)
|
|
9
|
+
return null;
|
|
10
|
+
return {
|
|
11
|
+
id,
|
|
12
|
+
salesOrderId: s(x.salesOrderId),
|
|
13
|
+
status: String(x.status ?? "").toUpperCase(),
|
|
14
|
+
isCancelRequest: x.isCancelRequest === true,
|
|
15
|
+
expiresAt: s(x.expiresAt),
|
|
16
|
+
numberOfPieces: x.numberOfPieces ?? null,
|
|
17
|
+
pricePerPiece: x.pricePerPiece ?? null,
|
|
18
|
+
package: x.package ?? null,
|
|
19
|
+
piecesPerPackage: x.piecesPerPackage ?? null,
|
|
20
|
+
latestDeliveryDateTime: x.latestDeliveryDateTime ?? null,
|
|
21
|
+
deliveryLocation: x.deliveryLocation ?? null,
|
|
22
|
+
reason: s(typeof x.reason === "object" ? x.reason?.text : x.reason),
|
|
23
|
+
besluit: s(x.besluit),
|
|
24
|
+
besluitDoor: s(x.besluitDoor),
|
|
25
|
+
besluitAt: s(x.besluitAt),
|
|
26
|
+
besluitFout: s(x.besluitFout),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export function isOpen(c, now = new Date()) {
|
|
30
|
+
if (c.status !== "PENDING")
|
|
31
|
+
return false;
|
|
32
|
+
return !c.expiresAt || Date.parse(c.expiresAt) > now.getTime();
|
|
33
|
+
}
|
|
34
|
+
const AMS_DAY = (d) => new Intl.DateTimeFormat("en-CA", { timeZone: "Europe/Amsterdam" }).format(d);
|
|
35
|
+
/** "vandaag 18:00", "morgen 18:00" of "do 14 nov 18:00" (Europe/Amsterdam). */
|
|
36
|
+
export function deadlineMoment(expiresAt, now = new Date()) {
|
|
37
|
+
const d = new Date(expiresAt);
|
|
38
|
+
const tijd = fmtNL(d, { hour: "2-digit", minute: "2-digit" }) ?? "";
|
|
39
|
+
const dag = AMS_DAY(d);
|
|
40
|
+
if (dag === AMS_DAY(now))
|
|
41
|
+
return `vandaag ${tijd}`;
|
|
42
|
+
if (dag === AMS_DAY(new Date(now.getTime() + 86400000)))
|
|
43
|
+
return `morgen ${tijd}`;
|
|
44
|
+
return `${fmtNL(d, { weekday: "short", day: "numeric", month: "short" }) ?? ""} ${tijd}`;
|
|
45
|
+
}
|
|
46
|
+
/** "Reageren vóór morgen 18:00" / "Verlopen" / "Geen deadline bekend". */
|
|
47
|
+
export function deadlineTekst(c, now = new Date()) {
|
|
48
|
+
if (c.status === "ACCEPTED")
|
|
49
|
+
return "Geaccepteerd";
|
|
50
|
+
if (c.status === "DECLINED")
|
|
51
|
+
return "Afgewezen";
|
|
52
|
+
if (!c.expiresAt)
|
|
53
|
+
return "Geen deadline bekend";
|
|
54
|
+
if (Date.parse(c.expiresAt) <= now.getTime() || c.status === "EXPIRED")
|
|
55
|
+
return "Verlopen";
|
|
56
|
+
if (c.status !== "PENDING")
|
|
57
|
+
return "Afgehandeld";
|
|
58
|
+
return `Reageren vóór ${deadlineMoment(c.expiresAt, now)}`;
|
|
59
|
+
}
|
|
60
|
+
/** Bijna verlopen: minder dan 2 uur over (zelfde grens als de koppeling). */
|
|
61
|
+
export function bijnaVerlopen(c, now = new Date()) {
|
|
62
|
+
if (!isOpen(c, now) || !c.expiresAt)
|
|
63
|
+
return false;
|
|
64
|
+
return Date.parse(c.expiresAt) - now.getTime() <= 2 * 3600000;
|
|
65
|
+
}
|
|
66
|
+
/** Balk bovenaan Verkoop. null = geen open verzoeken. */
|
|
67
|
+
export function balkTekst(open, now = new Date()) {
|
|
68
|
+
const lijst = open.filter((c) => isOpen(c, now));
|
|
69
|
+
if (!lijst.length)
|
|
70
|
+
return null;
|
|
71
|
+
const eerst = lijst.map((c) => c.expiresAt).filter((v) => !!v).sort()[0];
|
|
72
|
+
const wie = lijst.length === 1 ? "1 correctieverzoek wacht" : `${lijst.length} correctieverzoeken wachten`;
|
|
73
|
+
return eerst ? `${wie} op je reactie, uiterlijk ${deadlineMoment(eerst, now)}.` : `${wie} op je reactie.`;
|
|
74
|
+
}
|
|
75
|
+
/** Foutcodes uit het koppelcontract → één rustige zin. */
|
|
76
|
+
export function foutTekst(code, reden) {
|
|
77
|
+
switch (code) {
|
|
78
|
+
case "validation": return "Het verzoek is niet compleet. Vernieuw de pagina en probeer het opnieuw.";
|
|
79
|
+
case "unknown_request": return "Dit correctieverzoek is nog niet binnen. Probeer het over een minuut opnieuw.";
|
|
80
|
+
case "already_decided": return "Over dit correctieverzoek is al beslist.";
|
|
81
|
+
case "expired": return "De deadline van dit correctieverzoek is voorbij; je kunt niet meer reageren.";
|
|
82
|
+
case "read_only": return "De Floriday-koppeling staat op alleen lezen. Vraag de beheerder om schrijven aan te zetten.";
|
|
83
|
+
case "no_permission": return "Je hebt geen recht om correctieverzoeken te beantwoorden.";
|
|
84
|
+
case "floriday_rejected": return reden ? `Floriday wees het besluit af: ${reden}` : "Floriday wees het besluit af. Probeer het opnieuw of neem contact op met de beheerder.";
|
|
85
|
+
case "floriday_unavailable": return "Floriday is nu niet bereikbaar. Probeer het later opnieuw.";
|
|
86
|
+
default: return "Het besluit kon niet worden verstuurd. Probeer het opnieuw of neem contact op met de beheerder.";
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// ── Oud → nieuw ──────────────────────────────────────────────────────────
|
|
90
|
+
const num = (v) => {
|
|
91
|
+
const x = typeof v === "object" && v !== null ? v.value : v;
|
|
92
|
+
const n = typeof x === "string" ? Number(x) : x;
|
|
93
|
+
return typeof n === "number" && Number.isFinite(n) ? n : null;
|
|
94
|
+
};
|
|
95
|
+
const eur = (n) => new Intl.NumberFormat("nl-NL", { style: "currency", currency: "EUR", minimumFractionDigits: 2, maximumFractionDigits: 3 }).format(n);
|
|
96
|
+
const fust = (v) => s(v?.vbnPackageCode != null ? String(v.vbnPackageCode) : v?.code != null ? String(v.code) : typeof v === "string" || typeof v === "number" ? String(v) : null);
|
|
97
|
+
const datum = (v) => { const t = s(v); return t ? fmtNL(new Date(t), { weekday: "short", day: "numeric", month: "short" }) : null; };
|
|
98
|
+
const locatie = (v) => s(v?.name) ?? s(v?.gln) ?? s(v?.locationId) ?? s(v?.deliveryLocationId) ?? (typeof v === "string" ? v : null);
|
|
99
|
+
/**
|
|
100
|
+
* Gevraagde wijzigingen naast de huidige Floriday-order (o = salesorder-data).
|
|
101
|
+
* Alleen velden die de koper meestuurt en die echt anders zijn.
|
|
102
|
+
*/
|
|
103
|
+
export function verschillen(o, c) {
|
|
104
|
+
if (c.isCancelRequest)
|
|
105
|
+
return [{ veld: "Order", oud: "Actief", nieuw: "Annuleren" }];
|
|
106
|
+
const out = [];
|
|
107
|
+
const add = (veld, oud, nieuw) => {
|
|
108
|
+
if (nieuw == null || oud === nieuw)
|
|
109
|
+
return;
|
|
110
|
+
out.push({ veld, oud: oud ?? "—", nieuw });
|
|
111
|
+
};
|
|
112
|
+
const n = num(c.numberOfPieces), on = num(o?.numberOfPieces);
|
|
113
|
+
add("Aantal stuks", on == null ? null : String(on), n == null ? null : String(n));
|
|
114
|
+
const p = num(c.pricePerPiece), op = num(o?.pricePerPiece);
|
|
115
|
+
add("Prijs per stuk", op == null ? null : eur(op), p == null ? null : eur(p));
|
|
116
|
+
add("Fust", fust(o?.packingConfiguration?.package ?? o?.package), fust(c.package));
|
|
117
|
+
const ppp = num(c.piecesPerPackage), oppp = num(o?.packingConfiguration?.piecesPerPackage ?? o?.piecesPerPackage);
|
|
118
|
+
add("Stuks per fust", oppp == null ? null : String(oppp), ppp == null ? null : String(ppp));
|
|
119
|
+
add("Leverdag", datum(o?.delivery?.latestDeliveryDateTime), datum(c.latestDeliveryDateTime));
|
|
120
|
+
add("Afleverlocatie", locatie(o?.delivery?.location ?? o?.delivery?.deliveryLocation), locatie(c.deliveryLocation));
|
|
121
|
+
return out;
|
|
122
|
+
}
|
|
123
|
+
export function printVraag(stand) {
|
|
124
|
+
if (stand === "niet")
|
|
125
|
+
return null;
|
|
126
|
+
if (stand === "onbekend")
|
|
127
|
+
return "De pickstand is nu niet bekend. Er kan al een pakbon of karlabel geprint zijn.";
|
|
128
|
+
return "Voor deze order is al een pakbon of karlabel geprint.";
|
|
129
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** Omgeving van de actieve Floriday-koppeling; null = geen koppeling. */
|
|
2
|
+
export declare function actieveOmgeving(sb: any): Promise<string | null>;
|
|
3
|
+
export interface CorrectionsList {
|
|
4
|
+
ok: boolean;
|
|
5
|
+
totaal: number;
|
|
6
|
+
items: any[];
|
|
7
|
+
error?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function leesCorrecties(environment: string, args: {
|
|
10
|
+
p_status?: string | null;
|
|
11
|
+
p_zoek?: string | null;
|
|
12
|
+
p_limit: number;
|
|
13
|
+
p_offset: number;
|
|
14
|
+
}): Promise<CorrectionsList>;
|
|
15
|
+
export interface DecideResult {
|
|
16
|
+
ok: boolean;
|
|
17
|
+
code?: string;
|
|
18
|
+
reason?: string;
|
|
19
|
+
status?: string;
|
|
20
|
+
}
|
|
21
|
+
export declare function besluitVersturen(environment: string, payload: {
|
|
22
|
+
salesOrderCorrectionRequestId: string;
|
|
23
|
+
besluit: "accept" | "decline";
|
|
24
|
+
door: string;
|
|
25
|
+
stockApplication?: "DIRECT" | "NEVER";
|
|
26
|
+
}): Promise<DecideResult>;
|
|
27
|
+
//# sourceMappingURL=sales-corrections.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sales-corrections.server.d.ts","sourceRoot":"","sources":["../../src/lib/sales-corrections.server.ts"],"names":[],"mappings":"AA4BA,yEAAyE;AACzE,wBAAsB,eAAe,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASrE;AAED,MAAM,WAAW,eAAe;IAAG,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE;AAE9F,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAajL;AAED,MAAM,WAAW,YAAY;IAAG,EAAE,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;AAE9F,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,6BAA6B,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAazN"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
// Server-only: correctieverzoeken via de gateway van de Floriday-koppeling.
|
|
2
|
+
// Lezen: POST /api/public/gateway/corrections-read { environment, op:"sales-corrections-list", args }
|
|
3
|
+
// Schrijven: POST /api/public/gateway/write action "sales_correction_decide".
|
|
4
|
+
// Beide met HMAC over `${ms}.${body}` (zoals klok-gateway.server.ts); geheim en adres
|
|
5
|
+
// uit central-secrets.server.ts. Fail closed: fout = code + zin, nooit een gok.
|
|
6
|
+
async function hmacHex(secret, payload) {
|
|
7
|
+
const key = await globalThis.crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
|
|
8
|
+
const sig = await globalThis.crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload));
|
|
9
|
+
return Array.from(new Uint8Array(sig)).map((b) => b.toString(16).padStart(2, "0")).join("");
|
|
10
|
+
}
|
|
11
|
+
async function signedPost(path, bodyObj, timeoutMs) {
|
|
12
|
+
const { getFloridayGatewaySecret, getGatewayBaseUrl } = await import("./central-secrets.server.js");
|
|
13
|
+
const secret = await getFloridayGatewaySecret();
|
|
14
|
+
const base = await getGatewayBaseUrl();
|
|
15
|
+
const body = JSON.stringify(bodyObj);
|
|
16
|
+
const timestamp = String(Date.now());
|
|
17
|
+
const signature = await hmacHex(secret, `${timestamp}.${body}`);
|
|
18
|
+
const res = await fetch(`${base}${path}`, {
|
|
19
|
+
method: "POST",
|
|
20
|
+
headers: { "Content-Type": "application/json", "x-floriday-timestamp": timestamp, "x-floriday-signature": `sha256=${signature}`, "x-floriday-caller": "verkoop" },
|
|
21
|
+
body,
|
|
22
|
+
signal: AbortSignal.timeout(timeoutMs),
|
|
23
|
+
});
|
|
24
|
+
return { status: res.status, json: await res.json().catch(() => null) };
|
|
25
|
+
}
|
|
26
|
+
/** Omgeving van de actieve Floriday-koppeling; null = geen koppeling. */
|
|
27
|
+
export async function actieveOmgeving(sb) {
|
|
28
|
+
const { data, error } = await sb.rpc("get_active_floriday_connection_public");
|
|
29
|
+
if (error) {
|
|
30
|
+
if (error.code === "42883" || error.code === "PGRST202")
|
|
31
|
+
return null;
|
|
32
|
+
throw new Error(`Floriday-koppeling kon niet worden gecontroleerd: ${error.message}`);
|
|
33
|
+
}
|
|
34
|
+
const rows = Array.isArray(data) ? data : data ? [data] : [];
|
|
35
|
+
const r = rows.find((x) => typeof x?.id === "string");
|
|
36
|
+
return r ? String(r.active_environment ?? r.environment ?? "") || null : null;
|
|
37
|
+
}
|
|
38
|
+
export async function leesCorrecties(environment, args) {
|
|
39
|
+
try {
|
|
40
|
+
const { status, json } = await signedPost("/api/public/gateway/corrections-read", { environment, op: "sales-corrections-list", args }, 10000);
|
|
41
|
+
if (!json || json.ok !== true) {
|
|
42
|
+
console.error("[correcties] lezen mislukt", status, json?.code ?? json?.error ?? "");
|
|
43
|
+
return { ok: false, totaal: 0, items: [], error: "De correctieverzoeken konden niet worden opgehaald. Probeer het opnieuw." };
|
|
44
|
+
}
|
|
45
|
+
const d = json.data ?? {};
|
|
46
|
+
return { ok: true, totaal: Number(d.totaal ?? 0) || 0, items: Array.isArray(d.items) ? d.items : [] };
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
console.error("[correcties] lezen mislukt", e?.message ?? e);
|
|
50
|
+
return { ok: false, totaal: 0, items: [], error: "Floriday is nu niet bereikbaar. Probeer het later opnieuw." };
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
export async function besluitVersturen(environment, payload) {
|
|
54
|
+
try {
|
|
55
|
+
const { status, json } = await signedPost("/api/public/gateway/write", { environment, module: "verkoop", action: "sales_correction_decide", payload }, 30000);
|
|
56
|
+
if (!json || typeof json !== "object") {
|
|
57
|
+
console.error("[correcties] onleesbaar antwoord", status);
|
|
58
|
+
return { ok: false, code: "floriday_unavailable" };
|
|
59
|
+
}
|
|
60
|
+
if (json.ok !== true)
|
|
61
|
+
return { ok: false, code: String(json.code ?? `http_${status}`), reason: json.reason ?? json.error ?? undefined };
|
|
62
|
+
return { ok: true, status: json.status };
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
console.error("[correcties] besluit mislukt", e?.message ?? e);
|
|
66
|
+
return { ok: false, code: "floriday_unavailable" };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AA4DA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;;;2DAU7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AA4DA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;;;2DAU7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkD7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;;GAiB7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;GAW7B,CAAC"}
|
|
@@ -73,6 +73,11 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
73
73
|
.handler(async ({ data, context }) => {
|
|
74
74
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
75
75
|
const { buildSalesOrdersList } = await import("./salesorders-list.server.js");
|
|
76
|
+
const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
|
|
77
|
+
const orderId = `local:${data.id}`;
|
|
78
|
+
// Ophaalmoment hangt alleen van het order-id af: tegelijk met de order starten
|
|
79
|
+
// (gooit nooit; eigen tijdslimiet). Zonder order wordt de uitkomst genegeerd.
|
|
80
|
+
const pickupTask = loadPickupMomentForDetail(context.supabase, orderId);
|
|
76
81
|
const result = await buildSalesOrdersList(context.supabase, {
|
|
77
82
|
dateField: "ordered",
|
|
78
83
|
tab: "all",
|
|
@@ -82,28 +87,29 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
82
87
|
}, supabaseAdmin);
|
|
83
88
|
const { setResponseHeader } = await import("@tanstack/react-start/server");
|
|
84
89
|
setServerTiming(setResponseHeader, result.timing, "getLocalSalesOrderDetail");
|
|
85
|
-
const orderId = `local:${data.id}`;
|
|
86
90
|
const order = result.rows.find((row) => row.id === orderId) ?? null;
|
|
87
91
|
const bufferSiblings = order?.bufferId
|
|
88
92
|
? result.rows.filter((row) => row.bufferId === order.bufferId && row.id !== order.id)
|
|
89
93
|
: [];
|
|
90
|
-
if (order && order.bufferId && bufferSiblings.length > 0) {
|
|
91
|
-
const { loadBufferCarts } = await import("./plan-coverage.server.js");
|
|
92
|
-
const b = await loadBufferCarts(context.supabase, data.id);
|
|
93
|
-
order.bufferCartCount = b.count;
|
|
94
|
-
order.bufferCartTypeName = b.typeName;
|
|
95
|
-
}
|
|
96
94
|
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
97
|
-
|
|
98
|
-
const
|
|
95
|
+
// Buffertelling, factuur/pickstand en ophaalmoment tegelijk (voorheen na elkaar).
|
|
96
|
+
const bufferTask = order && order.bufferId && bufferSiblings.length > 0
|
|
97
|
+
? import("./plan-coverage.server.js").then(({ loadBufferCarts }) => loadBufferCarts(context.supabase, data.id))
|
|
98
|
+
: Promise.resolve(null);
|
|
99
|
+
const [progress, pickupMoment, b] = order
|
|
99
100
|
? await Promise.all([
|
|
100
101
|
attachDetailProgress(context.supabase, [order, ...bufferSiblings]).catch(() => ({
|
|
101
102
|
features: { erpInvoices: false, pickProgress: false },
|
|
102
103
|
invoice: "failed",
|
|
103
104
|
})),
|
|
104
|
-
|
|
105
|
+
pickupTask,
|
|
106
|
+
bufferTask,
|
|
105
107
|
])
|
|
106
|
-
: [undefined, null];
|
|
108
|
+
: [undefined, null, null];
|
|
109
|
+
if (order && b) {
|
|
110
|
+
order.bufferCartCount = b.count;
|
|
111
|
+
order.bufferCartTypeName = b.typeName;
|
|
112
|
+
}
|
|
107
113
|
return {
|
|
108
114
|
order,
|
|
109
115
|
progress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkD,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkD,KAAK,UAAU,EAA2B,MAAM,gBAAgB,CAAC;AAG1H,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAI1B,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,kEAAkE;IAClE,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AA6GD,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,GAAG,IAAW,QAEjE;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA+BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAk5CrB;AAyDD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,qBAAqB,CAIvB"}
|
|
@@ -21,7 +21,7 @@ import { loadPlanCoverage } from "./plan-coverage.server.js";
|
|
|
21
21
|
import { combineStages } from "./floriday-status.js";
|
|
22
22
|
import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js";
|
|
23
23
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
24
|
-
import { mergeStages, resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
24
|
+
import { mergeStages, resolveOrderStage, orderStageNote, floridayZonderOrderNote } from "./order-status.js";
|
|
25
25
|
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
26
26
|
import { loadBacklogFlags } from "./order-backlog.server.js";
|
|
27
27
|
import { detectSource, hasProblem, invoiceRoute, isInvoicedDone, toProgressMember, } from "./order-progress.js";
|
|
@@ -731,7 +731,9 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
731
731
|
});
|
|
732
732
|
dto.stageNote = !localRow && deletedFoIds.has(String(r.floriday_id))
|
|
733
733
|
? "deleted"
|
|
734
|
-
:
|
|
734
|
+
: localRow
|
|
735
|
+
? orderStageNote({ customFields: localRow?.custom_fields })
|
|
736
|
+
: floridayZonderOrderNote({ hasOwnRow: false, deleted: false, stage: dto.stage });
|
|
735
737
|
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
736
738
|
// Weergave: bron, klant-id, orders.id, factuurroute en verzendmoment.
|
|
737
739
|
dto.source = detectSource({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCA0czB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { invoiceStateLabel } from "./invoice-timing.js";
|
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
9
|
-
import { resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
9
|
+
import { resolveOrderStage, orderStageNote, floridayZonderOrderNote } from "./order-status.js";
|
|
10
10
|
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
11
11
|
import { invoiceRoute } from "./order-progress.js";
|
|
12
12
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
@@ -317,7 +317,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
317
317
|
deleted: !!ownRow?.deleted_at,
|
|
318
318
|
backfill: orderStageNote({ customFields: ownRow?.custom_fields }) === "handled",
|
|
319
319
|
});
|
|
320
|
-
|
|
320
|
+
// Nog geen eigen order (spiegelronde loopt): "Wordt verwerkt"; alleen als het lezen lukte.
|
|
321
|
+
dto.stageNote = ownRow
|
|
322
|
+
? orderStageNote({ deletedAt: ownRow.deleted_at, customFields: ownRow.custom_fields })
|
|
323
|
+
: ownRes.error
|
|
324
|
+
? null
|
|
325
|
+
: floridayZonderOrderNote({ hasOwnRow: false, deleted: false, stage: dto.stage });
|
|
321
326
|
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
322
327
|
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
323
328
|
// Zelfde factuurroute en ids als de lijst (salesorders-list.server).
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface StepTimer {
|
|
2
|
+
time<T>(step: string, fn: () => Promise<T>): Promise<T>;
|
|
3
|
+
/** Logt de meting en zet de Server-Timing-header (fouten bij de header worden genegeerd: alleen meting). */
|
|
4
|
+
finish(): Promise<{
|
|
5
|
+
totalMs: number;
|
|
6
|
+
steps: {
|
|
7
|
+
step: string;
|
|
8
|
+
ms: number;
|
|
9
|
+
}[];
|
|
10
|
+
}>;
|
|
11
|
+
}
|
|
12
|
+
export declare function makeStepTimer(name: string): StepTimer;
|
|
13
|
+
//# sourceMappingURL=step-timer.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-timer.server.d.ts","sourceRoot":"","sources":["../../src/lib/step-timer.server.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxD,4GAA4G;IAC5G,MAAM,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAAE,CAAC,CAAC;CAC/E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CA4BrD"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
// Meting per stap van één serververzoek: console-regel plus Server-Timing-header.
|
|
2
|
+
// Alleen meten; verandert niets aan de uitkomst van het verzoek.
|
|
3
|
+
export function makeStepTimer(name) {
|
|
4
|
+
const start = Date.now();
|
|
5
|
+
const steps = [];
|
|
6
|
+
return {
|
|
7
|
+
async time(step, fn) {
|
|
8
|
+
const s = Date.now();
|
|
9
|
+
try {
|
|
10
|
+
return await fn();
|
|
11
|
+
}
|
|
12
|
+
finally {
|
|
13
|
+
steps.push({ step, ms: Date.now() - s });
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
async finish() {
|
|
17
|
+
const totalMs = Date.now() - start;
|
|
18
|
+
console.log(`[${name}] totaal=${totalMs}ms ` + steps.map((s) => `${s.step}=${s.ms}`).join(" "));
|
|
19
|
+
try {
|
|
20
|
+
const { setResponseHeader } = await import("@tanstack/react-start/server");
|
|
21
|
+
const parts = [
|
|
22
|
+
`total;dur=${totalMs};desc="${name}"`,
|
|
23
|
+
...steps.map((s, i) => `${s.step.replace(/[^A-Za-z0-9_]/g, "_") || `s${i}`};dur=${s.ms}`),
|
|
24
|
+
];
|
|
25
|
+
setResponseHeader("Server-Timing", parts.join(", "));
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
console.warn(`[${name}] Server-Timing niet gezet:`, e?.message ?? e);
|
|
29
|
+
}
|
|
30
|
+
return { totalMs, steps };
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stock-product-link.server.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3G,MAAM,MAAM,eAAe,GAAG,2BAA2B,GAAG,UAAU,CAAC;AACvE,eAAO,IAAI,mBAAmB,EAAE,eAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"stock-product-link.server.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3G,MAAM,MAAM,eAAe,GAAG,2BAA2B,GAAG,UAAU,CAAC;AACvE,eAAO,IAAI,mBAAmB,EAAE,eAA4B,CAAC;AAgB7D,wBAAsB,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAoC5F"}
|
|
@@ -4,13 +4,15 @@ export let lastCanonicalSource = "terugval";
|
|
|
4
4
|
/** Probeert eerst de functie van Voorraad; ontbreekt die of faalt hij → null (terugval). */
|
|
5
5
|
async function viaVoorraad(sb, ids) {
|
|
6
6
|
const out = new Map();
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
// Alle regels tegelijk (voorheen één ronde per regel); één fout → terugval, zoals voorheen.
|
|
8
|
+
const res = await Promise.all(ids.map((id) => sb.rpc("voorraad_canoniek_artikel", { p_id: id })));
|
|
9
|
+
for (let i = 0; i < ids.length; i++) {
|
|
10
|
+
const { data, error } = res[i];
|
|
9
11
|
if (error)
|
|
10
12
|
return null;
|
|
11
13
|
const v = typeof data === "string" ? data : (data?.product_id ?? data?.id ?? (Array.isArray(data) ? data[0]?.product_id ?? data[0]?.id : null));
|
|
12
14
|
if (v)
|
|
13
|
-
out.set(
|
|
15
|
+
out.set(ids[i], String(v));
|
|
14
16
|
}
|
|
15
17
|
return out;
|
|
16
18
|
}
|
|
@@ -22,11 +24,13 @@ export async function loadStockLinks(sb, ids) {
|
|
|
22
24
|
lastCanonicalSource = canon ? "voorraad_canoniek_artikel" : "terugval";
|
|
23
25
|
if (canon && canon.size) {
|
|
24
26
|
const targets = Array.from(new Set(canon.values()));
|
|
25
|
-
const { data: rows }
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
const [{ data: rows }, { data: packs }] = await Promise.all([
|
|
28
|
+
sb.from("products").select("id, sale_price, floriday_trade_item_id, custom_fields").in("id", targets),
|
|
29
|
+
sb
|
|
30
|
+
.from("product_packings")
|
|
31
|
+
.select("product_id, is_primary, sort_order, vbn_package_code, load_carrier, pieces_per_package, packages_per_layer, layers_per_load_carrier")
|
|
32
|
+
.in("product_id", targets),
|
|
33
|
+
]);
|
|
30
34
|
const prods = (rows ?? []).map((r) => ({ id: r.id, sale_price: r.sale_price, floriday_trade_item_id: null, is_mirror: false }));
|
|
31
35
|
const out = new Map();
|
|
32
36
|
const one = linkStockProducts(targets, prods, (packs ?? []));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBufferEvents.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferEvents.ts"],"names":[],"mappings":"AAWA,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,OAAO,UAAO;;
|
|
1
|
+
{"version":3,"file":"useBufferEvents.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferEvents.ts"],"names":[],"mappings":"AAWA,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,OAAO,UAAO;;UAiE7C"}
|
|
@@ -30,7 +30,8 @@ export function useBufferEvents(enabled = true) {
|
|
|
30
30
|
// Bewust kort: een buffer mag nooit langer gecachet worden dan tot het
|
|
31
31
|
// eerstvolgende seintje.
|
|
32
32
|
staleTime: 0,
|
|
33
|
-
|
|
33
|
+
// Vangnet naast Realtime (logistics_events): hooguit elke 60 s.
|
|
34
|
+
refetchInterval: 60000,
|
|
34
35
|
refetchOnWindowFocus: true,
|
|
35
36
|
queryFn: () => fetchEvents(),
|
|
36
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAsD1E"}
|
|
@@ -15,10 +15,13 @@ export function useLocalSalesOrderDetailQuery(id) {
|
|
|
15
15
|
if (!validRawId)
|
|
16
16
|
return;
|
|
17
17
|
const invalidate = () => void queryClient.invalidateQueries({ queryKey: ["salesorders", "local-detail", validRawId] });
|
|
18
|
+
// Regels (belading, prijs, regelgegevens) delen één sleutel met het DTO-id.
|
|
19
|
+
const invalidateRegels = () => void queryClient.invalidateQueries({ queryKey: ["order-item-packing", `local:${validRawId}`] });
|
|
18
20
|
const channel = supabase
|
|
19
21
|
.channel(`local-order-detail-${validRawId}`)
|
|
20
22
|
.on("postgres_changes", { event: "*", schema: "public", table: "orders", filter: `id=eq.${validRawId}` }, invalidate)
|
|
21
|
-
.on("postgres_changes", { event: "*", schema: "public", table: "order_items", filter: `order_id=eq.${validRawId}` }, invalidate)
|
|
23
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "order_items", filter: `order_id=eq.${validRawId}` }, () => { invalidate(); invalidateRegels(); })
|
|
24
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "verkoop_orderregel_extra", filter: `order_id=eq.${validRawId}` }, invalidateRegels)
|
|
22
25
|
.subscribe();
|
|
23
26
|
return () => {
|
|
24
27
|
void supabase.removeChannel(channel);
|
|
@@ -29,6 +32,9 @@ export function useLocalSalesOrderDetailQuery(id) {
|
|
|
29
32
|
enabled: !!validRawId,
|
|
30
33
|
staleTime: 30000,
|
|
31
34
|
refetchOnWindowFocus: false,
|
|
35
|
+
// Vangnet naast Realtime: hooguit elke 60 s, alleen als het scherm zichtbaar is.
|
|
36
|
+
refetchInterval: 60000,
|
|
37
|
+
refetchIntervalInBackground: false,
|
|
32
38
|
retry: (failureCount, error) => AUTH_RETRY.test(error.message) && failureCount < 5,
|
|
33
39
|
retryDelay: (attempt) => Math.min(500 * 2 ** attempt, 4000),
|
|
34
40
|
queryFn: () => {
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { type SalesCorrection } from "./sales-corrections.js";
|
|
2
|
+
export declare const OPEN_CORRECTIONS_KEY: readonly ["sales-corrections-open"];
|
|
3
|
+
export declare function useOpenCorrections(): {
|
|
4
|
+
items: SalesCorrection[];
|
|
5
|
+
bySalesOrder: Map<string, SalesCorrection[]>;
|
|
6
|
+
failed: boolean;
|
|
7
|
+
error: any;
|
|
8
|
+
isLoading: boolean;
|
|
9
|
+
};
|
|
10
|
+
/** Floriday salesOrderId's van een orderrij. */
|
|
11
|
+
export declare function floridayIdsOf(row: {
|
|
12
|
+
floridayIds?: string[];
|
|
13
|
+
raw?: {
|
|
14
|
+
order?: any;
|
|
15
|
+
};
|
|
16
|
+
}): string[];
|
|
17
|
+
//# sourceMappingURL=useOpenCorrections.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useOpenCorrections.d.ts","sourceRoot":"","sources":["../../src/lib/useOpenCorrections.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEpF,eAAO,MAAM,oBAAoB,qCAAsC,CAAC;AAExE,wBAAgB,kBAAkB;;;;;;EAgBjC;AAED,gDAAgD;AAChD,wBAAgB,aAAa,CAAC,GAAG,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,CAAA;CAAE,GAAG,MAAM,EAAE,CAK9F"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// Open correctieverzoeken: één gedeelde query voor balk, lijstlabel en detail.
|
|
2
|
+
import { useQuery } from "@tanstack/react-query";
|
|
3
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
4
|
+
import { listOpenSalesCorrections } from "./sales-corrections.functions.js";
|
|
5
|
+
import { isOpen, parseCorrection } from "./sales-corrections.js";
|
|
6
|
+
export const OPEN_CORRECTIONS_KEY = ["sales-corrections-open"];
|
|
7
|
+
export function useOpenCorrections() {
|
|
8
|
+
const fetchOpen = useServerFn(listOpenSalesCorrections);
|
|
9
|
+
const q = useQuery({
|
|
10
|
+
queryKey: OPEN_CORRECTIONS_KEY,
|
|
11
|
+
staleTime: 30000,
|
|
12
|
+
refetchInterval: 60000,
|
|
13
|
+
queryFn: async () => {
|
|
14
|
+
const r = await fetchOpen();
|
|
15
|
+
if (!r.ok)
|
|
16
|
+
console.error("[correcties]", r.error);
|
|
17
|
+
return r;
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
const items = (q.data?.items ?? []).map(parseCorrection).filter((c) => !!c && isOpen(c));
|
|
21
|
+
const bySalesOrder = new Map();
|
|
22
|
+
for (const c of items)
|
|
23
|
+
if (c.salesOrderId)
|
|
24
|
+
bySalesOrder.set(c.salesOrderId, [...(bySalesOrder.get(c.salesOrderId) ?? []), c]);
|
|
25
|
+
return { items, bySalesOrder, failed: !!q.data && !q.data.ok, error: q.data?.error ?? null, isLoading: q.isLoading };
|
|
26
|
+
}
|
|
27
|
+
/** Floriday salesOrderId's van een orderrij. */
|
|
28
|
+
export function floridayIdsOf(row) {
|
|
29
|
+
const ids = new Set(row.floridayIds ?? []);
|
|
30
|
+
const own = row.raw?.order?.salesOrderId;
|
|
31
|
+
if (typeof own === "string" && own)
|
|
32
|
+
ids.add(own);
|
|
33
|
+
return [...ids];
|
|
34
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/** Alleen lokale orders ("local:<uuid>"); andere ids → null (niets voorladen). */
|
|
2
|
+
export declare function prefetchIds(salesOrderId: string): {
|
|
3
|
+
dtoId: string;
|
|
4
|
+
uuid: string;
|
|
5
|
+
} | null;
|
|
6
|
+
export declare function useOrderDetailPrefetch(salesOrderId: string, opts?: {
|
|
7
|
+
reservation?: boolean | null;
|
|
8
|
+
}): void;
|
|
9
|
+
//# sourceMappingURL=useOrderDetailPrefetch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useOrderDetailPrefetch.d.ts","sourceRoot":"","sources":["../../src/lib/useOrderDetailPrefetch.ts"],"names":[],"mappings":"AAeA,kFAAkF;AAClF,wBAAgB,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAGxF;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;CAAO,QAwBvG"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
// Orderpagina: de gegevens van de kaarten (karindeling, verpakking, vervoerder,
|
|
2
|
+
// adressen, vervoer) meteen bij het openen ophalen, tegelijk met de order zelf.
|
|
3
|
+
// Voorheen startten die pas als de order binnen was (een tweede ronde wachten).
|
|
4
|
+
// Zelfde sleutels, aanroepen en staleTime als de kaarten: die nemen het lopende
|
|
5
|
+
// of binnengekomen antwoord over. Alleen lezen; een mislukte voorlading doet niets
|
|
6
|
+
// (de kaart vraagt dan zelf opnieuw, zoals voorheen).
|
|
7
|
+
import { useEffect } from "react";
|
|
8
|
+
import { useQueryClient } from "@tanstack/react-query";
|
|
9
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
10
|
+
import { getOrderPlanCoverage } from "./cart-replan.functions.js";
|
|
11
|
+
import { listOrderItemPacking } from "./order-item-packing.functions.js";
|
|
12
|
+
import { getOrderCarrier } from "./order-carrier.functions.js";
|
|
13
|
+
import { getOrderAddresses } from "./order-addresses.functions.js";
|
|
14
|
+
import { getOrderTransport } from "./order-transport.functions.js";
|
|
15
|
+
/** Alleen lokale orders ("local:<uuid>"); andere ids → null (niets voorladen). */
|
|
16
|
+
export function prefetchIds(salesOrderId) {
|
|
17
|
+
const m = /^local:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i.exec(salesOrderId);
|
|
18
|
+
return m ? { dtoId: salesOrderId, uuid: m[1] } : null;
|
|
19
|
+
}
|
|
20
|
+
export function useOrderDetailPrefetch(salesOrderId, opts = {}) {
|
|
21
|
+
const qc = useQueryClient();
|
|
22
|
+
const fetchCoverage = useServerFn(getOrderPlanCoverage);
|
|
23
|
+
const fetchPacking = useServerFn(listOrderItemPacking);
|
|
24
|
+
const fetchCarrier = useServerFn(getOrderCarrier);
|
|
25
|
+
const fetchAddresses = useServerFn(getOrderAddresses);
|
|
26
|
+
const fetchTransport = useServerFn(getOrderTransport);
|
|
27
|
+
const reservation = opts.reservation === true;
|
|
28
|
+
useEffect(() => {
|
|
29
|
+
const ids = prefetchIds(salesOrderId);
|
|
30
|
+
if (!ids)
|
|
31
|
+
return;
|
|
32
|
+
const log = (wat) => (e) => console.warn(`[orderpagina] voorladen ${wat} mislukt:`, e?.message ?? e);
|
|
33
|
+
// OrderKarindelingCard: sleutel met het kale order-id, staleTime 30 s.
|
|
34
|
+
qc.prefetchQuery({ queryKey: ["order-plan-coverage", ids.uuid], staleTime: 30000, queryFn: () => fetchCoverage({ data: { orderId: ids.uuid } }) }).catch(log("karindeling"));
|
|
35
|
+
// OrderLinePackingCard / karindeling: zelfde sleutel met het DTO-id.
|
|
36
|
+
qc.prefetchQuery({ queryKey: ["order-item-packing", ids.dtoId], staleTime: 15000, queryFn: () => fetchPacking({ data: { orderId: ids.dtoId } }) }).catch(log("verpakking"));
|
|
37
|
+
qc.prefetchQuery({ queryKey: ["order-addresses", ids.dtoId], staleTime: 60000, queryFn: () => fetchAddresses({ data: { orderId: ids.dtoId } }) }).catch(log("adressen"));
|
|
38
|
+
// Vervoerder en vervoer vragen de kaarten niet op bij een reservering.
|
|
39
|
+
if (!reservation) {
|
|
40
|
+
qc.prefetchQuery({ queryKey: ["order-carrier", ids.dtoId], staleTime: 30000, queryFn: () => fetchCarrier({ data: { orderId: ids.dtoId } }) }).catch(log("vervoerder"));
|
|
41
|
+
qc.prefetchQuery({ queryKey: ["order-transport", ids.dtoId], staleTime: 30000, queryFn: () => fetchTransport({ data: { orderId: ids.dtoId } }) }).catch(log("vervoer"));
|
|
42
|
+
}
|
|
43
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
44
|
+
}, [salesOrderId, reservation]);
|
|
45
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrderDetailQuery.ts"],"names":[],"mappings":"AASA,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"useSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrderDetailQuery.ts"],"names":[],"mappings":"AASA,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,mHAsDrE"}
|