@flowselections/floriday-verkoop-module 1.0.142 → 1.0.143
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 +274 -203
- package/dist-lib/components/verkoop/EngineBufferCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EngineBufferCard.js +2 -4
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridaySyncSettings.js +2 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.js +2 -10
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +7 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +4 -3
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +2 -2
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.js +4 -8
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -4
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +15 -7
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +24 -15
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -3
- package/dist-lib/components/verkoop/SearchableSelect.d.ts +10 -1
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.js +13 -4
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +3 -2
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderProgress.js +3 -8
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.js +2 -4
- package/dist-lib/integrations/supabase/types.d.ts +16 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.d.ts +15 -0
- package/dist-lib/lib/buffer-carts.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.js +21 -0
- package/dist-lib/lib/buffer-pick-progress.check.d.ts +2 -0
- package/dist-lib/lib/buffer-pick-progress.check.d.ts.map +1 -0
- package/dist-lib/lib/buffer-pick-progress.check.js +11 -0
- package/dist-lib/lib/create-order-customers.d.ts +8 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -0
- package/dist-lib/lib/create-order-customers.js +18 -0
- package/dist-lib/lib/create-order-form.check.d.ts +2 -0
- package/dist-lib/lib/create-order-form.check.d.ts.map +1 -0
- package/dist-lib/lib/create-order-form.check.js +27 -0
- package/dist-lib/lib/create-order-form.d.ts +22 -0
- package/dist-lib/lib/create-order-form.d.ts.map +1 -0
- package/dist-lib/lib/create-order-form.js +52 -0
- package/dist-lib/lib/create-order.functions.d.ts +21 -1
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +66 -19
- package/dist-lib/lib/delivery-format.check.js +6 -2
- package/dist-lib/lib/delivery-format.d.ts +14 -0
- package/dist-lib/lib/delivery-format.d.ts.map +1 -1
- package/dist-lib/lib/delivery-format.js +28 -0
- package/dist-lib/lib/floriday-invoice-line.check.d.ts +2 -0
- package/dist-lib/lib/floriday-invoice-line.check.d.ts.map +1 -0
- package/dist-lib/lib/floriday-invoice-line.check.js +18 -0
- package/dist-lib/lib/floriday-status.d.ts +6 -0
- package/dist-lib/lib/floriday-status.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.js +26 -0
- package/dist-lib/lib/nl-datetime.check.d.ts +2 -0
- package/dist-lib/lib/nl-datetime.check.d.ts.map +1 -0
- package/dist-lib/lib/nl-datetime.check.js +14 -0
- package/dist-lib/lib/nl-datetime.d.ts +6 -0
- package/dist-lib/lib/nl-datetime.d.ts.map +1 -0
- package/dist-lib/lib/nl-datetime.js +39 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +4 -57
- package/dist-lib/lib/order-pickup.server.d.ts +38 -0
- package/dist-lib/lib/order-pickup.server.d.ts.map +1 -0
- package/dist-lib/lib/order-pickup.server.js +76 -0
- package/dist-lib/lib/pickup-seed.check.d.ts +2 -0
- package/dist-lib/lib/pickup-seed.check.d.ts.map +1 -0
- package/dist-lib/lib/pickup-seed.check.js +18 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +24 -1
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +11 -6
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -4
- package/dist-lib/lib/salesorders-mapping.d.ts +4 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts +7 -0
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +17 -5
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +24 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/usePickupMoment.d.ts +44 -0
- package/dist-lib/lib/usePickupMoment.d.ts.map +1 -0
- package/dist-lib/lib/usePickupMoment.js +46 -0
- package/package.json +1 -1
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Datums en tijden altijd in Europe/Amsterdam, ongeacht de tijdzone van de
|
|
3
|
+
* computer of server. Client-safe, puur.
|
|
4
|
+
* - Tijdstip met tijdzone (Z / +01:00, zoals timestamptz): omgerekend naar NL.
|
|
5
|
+
* - Kale datum (YYYY-MM-DD): getoond zoals hij is, nooit verschoven; tijdopties vervallen.
|
|
6
|
+
* - Tijdstip zonder tijdzone: wordt getoond zoals geschreven (geen omrekening,
|
|
7
|
+
* geen computertijd). Zulke velden horen hier niet te komen; zie AGENTS.md.
|
|
8
|
+
*/
|
|
9
|
+
const TZ = "Europe/Amsterdam";
|
|
10
|
+
const DATE_ONLY = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
11
|
+
const NO_ZONE = /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?$/;
|
|
12
|
+
const TIME_KEYS = ["hour", "minute", "second", "timeStyle"];
|
|
13
|
+
export function fmtNL(value, opts = {}) {
|
|
14
|
+
if (value == null || value === "")
|
|
15
|
+
return null;
|
|
16
|
+
if (typeof value === "string") {
|
|
17
|
+
const v = value.trim();
|
|
18
|
+
const dOnly = DATE_ONLY.exec(v);
|
|
19
|
+
if (dOnly) {
|
|
20
|
+
const o = { ...opts };
|
|
21
|
+
for (const k of TIME_KEYS)
|
|
22
|
+
delete o[k];
|
|
23
|
+
if (!o.day && !o.month && !o.year && !o.weekday && !o.dateStyle)
|
|
24
|
+
Object.assign(o, { day: "numeric", month: "numeric", year: "numeric" });
|
|
25
|
+
return new Date(Date.UTC(+dOnly[1], +dOnly[2] - 1, +dOnly[3], 12)).toLocaleString("nl-NL", { ...o, timeZone: "UTC" });
|
|
26
|
+
}
|
|
27
|
+
const nz = NO_ZONE.exec(v);
|
|
28
|
+
if (nz) {
|
|
29
|
+
const d = new Date(Date.UTC(+nz[1], +nz[2] - 1, +nz[3], +nz[4], +nz[5], +(nz[6] ?? 0)));
|
|
30
|
+
return d.toLocaleString("nl-NL", { ...opts, timeZone: "UTC" });
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
const d = value instanceof Date ? value : new Date(value);
|
|
34
|
+
if (Number.isNaN(d.getTime()))
|
|
35
|
+
return null;
|
|
36
|
+
return d.toLocaleString("nl-NL", { ...opts, timeZone: TZ });
|
|
37
|
+
}
|
|
38
|
+
/** Standaard: "27-10-2026, 12:37:50" (gelijk aan toLocaleString("nl-NL")). */
|
|
39
|
+
export const fmtNLDefault = (v) => fmtNL(v, { day: "numeric", month: "numeric", year: "numeric", hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"order-pickup.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE3F,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,GAAG,kBAAkB,EAAE,CAoB9E;AAGD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;;;;;GAI7B,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;GAsB7B,CAAC"}
|
|
@@ -4,8 +4,6 @@ import { createServerFn } from "@tanstack/react-start";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
6
6
|
import { normalizeTime } from "./carrier-availability.js";
|
|
7
|
-
import { departureView } from "./order-departure.js";
|
|
8
|
-
import { assertRowsAffected, resolveOrderRow } from "./order-row.server.js";
|
|
9
7
|
function daysText(n, what) {
|
|
10
8
|
if (n <= 0)
|
|
11
9
|
return `${what} op de leverdag`;
|
|
@@ -37,71 +35,20 @@ export function carrierMomentOptions(carrier) {
|
|
|
37
35
|
}
|
|
38
36
|
return out;
|
|
39
37
|
}
|
|
40
|
-
async function findOrder(supabase, orderId) {
|
|
41
|
-
const row = await resolveOrderRow(supabase, orderId);
|
|
42
|
-
const { data, error } = await supabase
|
|
43
|
-
.from("orders")
|
|
44
|
-
.select("id, custom_fields")
|
|
45
|
-
.eq("id", row.id)
|
|
46
|
-
.maybeSingle();
|
|
47
|
-
if (error)
|
|
48
|
-
throw new Error(error.message);
|
|
49
|
-
return (data ?? null);
|
|
50
|
-
}
|
|
51
38
|
export const getOrderPickupMoment = createServerFn({ method: "GET" })
|
|
52
39
|
.middleware([requireSupabaseAuth])
|
|
53
40
|
.inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
|
|
54
41
|
.handler(async ({ data, context }) => {
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
try {
|
|
58
|
-
order = await findOrder(supabase, data.orderId);
|
|
59
|
-
}
|
|
60
|
-
catch {
|
|
61
|
-
order = null;
|
|
62
|
-
}
|
|
63
|
-
if (!order) {
|
|
64
|
-
return {
|
|
65
|
-
view: departureView(null),
|
|
66
|
-
departure: null,
|
|
67
|
-
selectedKey: null,
|
|
68
|
-
options: [],
|
|
69
|
-
hasCarrier: false,
|
|
70
|
-
deliveryTime: null,
|
|
71
|
-
lateOverride: null,
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
const cf = (order.custom_fields ?? {});
|
|
75
|
-
const carrierId = cf.carrier ? String(cf.carrier) : null;
|
|
76
|
-
let carrier = null;
|
|
77
|
-
if (carrierId) {
|
|
78
|
-
const { data: c } = await supabase.from("carriers").select("pickup_moments").eq("id", carrierId).maybeSingle();
|
|
79
|
-
carrier = c ?? null;
|
|
80
|
-
}
|
|
81
|
-
const { loadOrderDepartures } = await import("./order-departure.server.js");
|
|
82
|
-
const departure = (await loadOrderDepartures(supabase, [order.id])).get(order.id) ?? null;
|
|
83
|
-
const options = carrierMomentOptions(carrier);
|
|
84
|
-
const selectedKey = departure?.momentKey ?? (cf.pickup_moment ? String(cf.pickup_moment) : null);
|
|
85
|
-
return {
|
|
86
|
-
view: departureView(departure),
|
|
87
|
-
departure,
|
|
88
|
-
selectedKey: options.some((o) => o.key === selectedKey) ? selectedKey : null,
|
|
89
|
-
options,
|
|
90
|
-
hasCarrier: !!carrier,
|
|
91
|
-
deliveryTime: normalizeTime(cf.delivery_time),
|
|
92
|
-
lateOverride: cf.late_signup_override
|
|
93
|
-
? {
|
|
94
|
-
by: (cf.late_signup_override.by_name ?? cf.late_signup_override.by_email ?? null),
|
|
95
|
-
at: (cf.late_signup_override.at ?? null),
|
|
96
|
-
}
|
|
97
|
-
: null,
|
|
98
|
-
};
|
|
42
|
+
const { loadPickupMoment } = await import("./order-pickup.server.js");
|
|
43
|
+
return loadPickupMoment(context.supabase, data.orderId);
|
|
99
44
|
});
|
|
100
45
|
export const setOrderPickupMoment = createServerFn({ method: "POST" })
|
|
101
46
|
.middleware([requireSupabaseAuth])
|
|
102
47
|
.inputValidator((input) => z.object({ orderId: z.string().min(1), key: z.string().min(1).max(64) }).parse(input))
|
|
103
48
|
.handler(async ({ data, context }) => {
|
|
104
49
|
const supabase = context.supabase;
|
|
50
|
+
const { findOrder } = await import("./order-pickup.server.js");
|
|
51
|
+
const { assertRowsAffected } = await import("./order-row.server.js");
|
|
105
52
|
const order = await findOrder(supabase, data.orderId);
|
|
106
53
|
if (!order)
|
|
107
54
|
throw new Error("Order niet gevonden");
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type DepartureView, type OrderDeparture } from "./order-departure.js";
|
|
2
|
+
import { type PickupMomentOption } from "./order-pickup.functions.js";
|
|
3
|
+
export declare function findOrder(supabase: any, orderId: string): Promise<{
|
|
4
|
+
id: string;
|
|
5
|
+
custom_fields: Record<string, any> | null;
|
|
6
|
+
} | null>;
|
|
7
|
+
export declare function loadPickupMoment(supabase: any, orderId: string): Promise<{
|
|
8
|
+
view: DepartureView;
|
|
9
|
+
departure: OrderDeparture | null;
|
|
10
|
+
selectedKey: string | null;
|
|
11
|
+
options: PickupMomentOption[];
|
|
12
|
+
hasCarrier: boolean;
|
|
13
|
+
deliveryTime: string | null;
|
|
14
|
+
lateOverride: {
|
|
15
|
+
by: string | null;
|
|
16
|
+
at: string | null;
|
|
17
|
+
} | null;
|
|
18
|
+
}>;
|
|
19
|
+
export type PickupMomentData = Awaited<ReturnType<typeof loadPickupMoment>>;
|
|
20
|
+
/** Voor het detailverzoek: alleen ophalen, met tijdslimiet; bij timeout/fout null. */
|
|
21
|
+
export declare function loadPickupMomentForDetail(supabase: any, orderId: string, ms?: number): Promise<{
|
|
22
|
+
orderId: string;
|
|
23
|
+
fetchedAt: number;
|
|
24
|
+
returnedAt: number;
|
|
25
|
+
data: {
|
|
26
|
+
view: DepartureView;
|
|
27
|
+
departure: OrderDeparture | null;
|
|
28
|
+
selectedKey: string | null;
|
|
29
|
+
options: PickupMomentOption[];
|
|
30
|
+
hasCarrier: boolean;
|
|
31
|
+
deliveryTime: string | null;
|
|
32
|
+
lateOverride: {
|
|
33
|
+
by: string | null;
|
|
34
|
+
at: string | null;
|
|
35
|
+
} | null;
|
|
36
|
+
};
|
|
37
|
+
} | null>;
|
|
38
|
+
//# sourceMappingURL=order-pickup.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-pickup.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-pickup.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAGzF,wBAAsB,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;QAQ7B,MAAM;mBAAiB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;UACjF;AAGD,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;UAShC,aAAa;eACvB,cAAc,GAAG,IAAI;iBACnB,MAAM,GAAG,IAAI;aACnB,kBAAkB,EAAE;;kBAEb,MAAM,GAAG,IAAI;kBACb;QAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;GA+B5E;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC;AAE5E,sFAAsF;AACtF,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,SAAO;;;;;cA1CpD,aAAa;mBACvB,cAAc,GAAG,IAAI;qBACnB,MAAM,GAAG,IAAI;iBACnB,kBAAkB,EAAE;;sBAEb,MAAM,GAAG,IAAI;sBACb;YAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,GAAG,IAAI;;UA+C5E"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
// Ophaalmoment van een order (Logistiek Engine + vervoerdersmomenten).
|
|
2
|
+
// Eén bron voor de kaart Vervoer en de tegel Leverdatum; rekent zelf niets.
|
|
3
|
+
import { normalizeTime } from "./carrier-availability.js";
|
|
4
|
+
import { departureView } from "./order-departure.js";
|
|
5
|
+
import { carrierMomentOptions } from "./order-pickup.functions.js";
|
|
6
|
+
import { resolveOrderRow } from "./order-row.server.js";
|
|
7
|
+
export async function findOrder(supabase, orderId) {
|
|
8
|
+
const row = await resolveOrderRow(supabase, orderId);
|
|
9
|
+
const { data, error } = await supabase
|
|
10
|
+
.from("orders")
|
|
11
|
+
.select("id, custom_fields")
|
|
12
|
+
.eq("id", row.id)
|
|
13
|
+
.maybeSingle();
|
|
14
|
+
if (error)
|
|
15
|
+
throw new Error(error.message);
|
|
16
|
+
return (data ?? null);
|
|
17
|
+
}
|
|
18
|
+
export async function loadPickupMoment(supabase, orderId) {
|
|
19
|
+
let order = null;
|
|
20
|
+
try {
|
|
21
|
+
order = await findOrder(supabase, orderId);
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
order = null;
|
|
25
|
+
}
|
|
26
|
+
if (!order) {
|
|
27
|
+
return {
|
|
28
|
+
view: departureView(null),
|
|
29
|
+
departure: null,
|
|
30
|
+
selectedKey: null,
|
|
31
|
+
options: [],
|
|
32
|
+
hasCarrier: false,
|
|
33
|
+
deliveryTime: null,
|
|
34
|
+
lateOverride: null,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
const cf = (order.custom_fields ?? {});
|
|
38
|
+
const carrierId = cf.carrier ? String(cf.carrier) : null;
|
|
39
|
+
let carrier = null;
|
|
40
|
+
if (carrierId) {
|
|
41
|
+
const { data: c } = await supabase.from("carriers").select("pickup_moments").eq("id", carrierId).maybeSingle();
|
|
42
|
+
carrier = c ?? null;
|
|
43
|
+
}
|
|
44
|
+
const { loadOrderDepartures } = await import("./order-departure.server.js");
|
|
45
|
+
const departure = (await loadOrderDepartures(supabase, [order.id])).get(order.id) ?? null;
|
|
46
|
+
const options = carrierMomentOptions(carrier);
|
|
47
|
+
const selectedKey = departure?.momentKey ?? (cf.pickup_moment ? String(cf.pickup_moment) : null);
|
|
48
|
+
return {
|
|
49
|
+
view: departureView(departure),
|
|
50
|
+
departure,
|
|
51
|
+
selectedKey: options.some((o) => o.key === selectedKey) ? selectedKey : null,
|
|
52
|
+
options,
|
|
53
|
+
hasCarrier: !!carrier,
|
|
54
|
+
deliveryTime: normalizeTime(cf.delivery_time),
|
|
55
|
+
lateOverride: cf.late_signup_override
|
|
56
|
+
? {
|
|
57
|
+
by: (cf.late_signup_override.by_name ?? cf.late_signup_override.by_email ?? null),
|
|
58
|
+
at: (cf.late_signup_override.at ?? null),
|
|
59
|
+
}
|
|
60
|
+
: null,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
/** Voor het detailverzoek: alleen ophalen, met tijdslimiet; bij timeout/fout null. */
|
|
64
|
+
export async function loadPickupMomentForDetail(supabase, orderId, ms = 1500) {
|
|
65
|
+
const fetchedAt = Date.now();
|
|
66
|
+
try {
|
|
67
|
+
const data = await Promise.race([
|
|
68
|
+
loadPickupMoment(supabase, orderId),
|
|
69
|
+
new Promise((r) => setTimeout(() => r(null), ms)),
|
|
70
|
+
]);
|
|
71
|
+
return data ? { orderId, fetchedAt, returnedAt: Date.now(), data } : null;
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pickup-seed.check.d.ts","sourceRoot":"","sources":["../../src/lib/pickup-seed.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { shouldSeed } from "./usePickupMoment.js";
|
|
2
|
+
let fail = 0;
|
|
3
|
+
const eq = (n, a, b) => { const ok = a === b; if (!ok)
|
|
4
|
+
fail++; console.log(`${ok ? "OK " : "FOUT"} ${n}`); };
|
|
5
|
+
eq("lege cache → vullen", shouldSeed(undefined, 100), true);
|
|
6
|
+
eq("cache ouder → vullen", shouldSeed({ data: 1, dataUpdatedAt: 50, fetchStatus: "idle", isInvalidated: false }, 100), true);
|
|
7
|
+
eq("nieuw moment na keuze (nieuwer) → niet overschrijven", shouldSeed({ data: 1, dataUpdatedAt: 200, fetchStatus: "idle", isInvalidated: false }, 100), false);
|
|
8
|
+
eq("net opgeslagen, ververst nog → niet overschrijven", shouldSeed({ data: 1, dataUpdatedAt: 50, fetchStatus: "fetching", isInvalidated: true }, 100), false);
|
|
9
|
+
if (fail)
|
|
10
|
+
process.exit(1);
|
|
11
|
+
import { clientReadAt } from "./usePickupMoment.js";
|
|
12
|
+
const v = clientReadAt({ fetchedAt: 1000000, returnedAt: 1000300 }, 5000);
|
|
13
|
+
if (v !== 5000 - 300 - 2000) {
|
|
14
|
+
console.log("FOUT clientReadAt", v);
|
|
15
|
+
process.exit(1);
|
|
16
|
+
}
|
|
17
|
+
else
|
|
18
|
+
console.log("OK clientReadAt zonder klokverschil");
|
|
@@ -24,7 +24,30 @@ export declare const getLocalSalesOrderDetail: import("@tanstack/start-client-co
|
|
|
24
24
|
id: string;
|
|
25
25
|
}, Promise<{
|
|
26
26
|
order: import("./salesorders-mapping.js").SalesOrderDTO | null;
|
|
27
|
-
progress: import("./order-progress.server.js").DetailProgress |
|
|
27
|
+
progress: import("./order-progress.server.js").DetailProgress | {
|
|
28
|
+
features: {
|
|
29
|
+
erpInvoices: boolean;
|
|
30
|
+
pickProgress: boolean;
|
|
31
|
+
};
|
|
32
|
+
invoice: "failed";
|
|
33
|
+
} | undefined;
|
|
34
|
+
pickupMoment: {
|
|
35
|
+
orderId: string;
|
|
36
|
+
fetchedAt: number;
|
|
37
|
+
returnedAt: number;
|
|
38
|
+
data: {
|
|
39
|
+
view: import("./order-departure.js").DepartureView;
|
|
40
|
+
departure: import("./order-departure.js").OrderDeparture | null;
|
|
41
|
+
selectedKey: string | null;
|
|
42
|
+
options: import("./order-pickup.functions.js").PickupMomentOption[];
|
|
43
|
+
hasCarrier: boolean;
|
|
44
|
+
deliveryTime: string | null;
|
|
45
|
+
lateOverride: {
|
|
46
|
+
by: string | null;
|
|
47
|
+
at: string | null;
|
|
48
|
+
} | null;
|
|
49
|
+
};
|
|
50
|
+
} | null;
|
|
28
51
|
bufferId: string | null;
|
|
29
52
|
bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
|
|
30
53
|
sellerFallback: string | null;
|
|
@@ -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;;;;;;;;;;;;;2DAQ7B,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;;;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4C7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;;GAiB7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;GAW7B,CAAC"}
|
|
@@ -92,15 +92,20 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
92
92
|
order.bufferCartTypeName = b.typeName;
|
|
93
93
|
}
|
|
94
94
|
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
|
|
96
|
+
const [progress, pickupMoment] = order
|
|
97
|
+
? await Promise.all([
|
|
98
|
+
attachDetailProgress(context.supabase, [order, ...bufferSiblings]).catch(() => ({
|
|
99
|
+
features: { erpInvoices: false, pickProgress: false },
|
|
100
|
+
invoice: "failed",
|
|
101
|
+
})),
|
|
102
|
+
loadPickupMomentForDetail(context.supabase, String(order.id)),
|
|
103
|
+
])
|
|
104
|
+
: [undefined, null];
|
|
101
105
|
return {
|
|
102
106
|
order,
|
|
103
107
|
progress,
|
|
108
|
+
pickupMoment,
|
|
104
109
|
bufferId: order?.bufferId ?? null,
|
|
105
110
|
bufferSiblings,
|
|
106
111
|
sellerFallback: result.sellerFallback,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAoBA,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,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjF,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,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;AAkBD,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,CAy0CrB;AAsDD,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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { composeLocalDelivery } from "./delivery-format.js";
|
|
1
2
|
import { orderMatches, searchTokens } from "./order-search.js";
|
|
2
3
|
import { invoiceStateLabel } from "./invoice-timing.js";
|
|
3
4
|
import { cachedRef, invalidateRefCache, refCacheKey } from "./reference-cache.server.js";
|
|
@@ -830,9 +831,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
830
831
|
const rawDeliveryDate = String(r.delivery_date ?? "");
|
|
831
832
|
// Aanlevertijd alleen zoals vastgelegd; geen eigen berekening.
|
|
832
833
|
const deliveryTime = normalizeTime(cf.delivery_time);
|
|
833
|
-
const deliveryAt
|
|
834
|
-
? `${rawDeliveryDate.slice(0, 10)}T${deliveryTime}:00`
|
|
835
|
-
: rawDeliveryDate;
|
|
834
|
+
const { deliveryAt, deliveryHasTime, deliveryIsWallClock } = composeLocalDelivery(rawDeliveryDate, deliveryTime);
|
|
836
835
|
const customerId = r.customer_id ? String(r.customer_id) : "";
|
|
837
836
|
const localCustomer = customerId ? localCustomerLookup.get(customerId) : undefined;
|
|
838
837
|
const firstProduct = resolveProductName(firstLine?.product_name) ?? "";
|
|
@@ -863,7 +862,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
863
862
|
imageUrl: null,
|
|
864
863
|
orderedAt,
|
|
865
864
|
deliveryAt,
|
|
866
|
-
deliveryHasTime
|
|
865
|
+
deliveryHasTime,
|
|
866
|
+
deliveryIsWallClock,
|
|
867
867
|
quantity: {
|
|
868
868
|
multiplier: totalQuantity > 0 ? Math.ceil(totalQuantity / firstPlantsPerCrate) : 1,
|
|
869
869
|
count: firstPlantsPerCrate,
|
|
@@ -25,6 +25,8 @@ export interface SalesOrderDTO {
|
|
|
25
25
|
deliveryAt: string;
|
|
26
26
|
/** Bronveld heeft een tijd (Floriday: altijd; eigen order: alleen met aanlevertijd). */
|
|
27
27
|
deliveryHasTime?: boolean;
|
|
28
|
+
/** deliveryAt is een ingevulde NL-kloktijd (leverdatum + aanlevertijd), zonder tijdzone. */
|
|
29
|
+
deliveryIsWallClock?: boolean;
|
|
28
30
|
quantity: {
|
|
29
31
|
multiplier: number;
|
|
30
32
|
count: number;
|
|
@@ -132,6 +134,8 @@ export interface SalesOrderDTO {
|
|
|
132
134
|
backlogUnknown?: boolean;
|
|
133
135
|
/** Floriday salesOrderId's op deze order (voor het statusoverzicht). */
|
|
134
136
|
floridayIds?: string[];
|
|
137
|
+
/** Echte Floriday-status van de order (custom_fields.floriday_status), alleen weergave. */
|
|
138
|
+
floridayRawStatus?: string | null;
|
|
135
139
|
/** Floriday-stand uit het statusoverzicht; alleen weergave. */
|
|
136
140
|
floridayStatus?: import("./floriday-status.js").FloridayStatusSummary | null;
|
|
137
141
|
/** Lijst: ids waarvoor het scherm de Floriday-stand los nalaadt. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,13 @@ export type SalesOrderDetailResult = {
|
|
|
69
69
|
};
|
|
70
70
|
invoice: "ok" | "pending" | "failed";
|
|
71
71
|
};
|
|
72
|
+
/** Ophaalmoment (zelfde bron als de kaart Vervoer), met leestijd; null bij timeout/fout. */
|
|
73
|
+
pickupMoment?: {
|
|
74
|
+
orderId: string;
|
|
75
|
+
fetchedAt: number;
|
|
76
|
+
returnedAt: number;
|
|
77
|
+
data: import("./order-pickup.server.js").PickupMomentData;
|
|
78
|
+
} | null;
|
|
72
79
|
};
|
|
73
80
|
export declare const getSalesOrderDetail: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
74
81
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -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;AAiC/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;
|
|
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;AAiC/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;;mCA2bzB,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"}
|
|
@@ -328,6 +328,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
328
328
|
dto.floridayMissingLineKeyNotice = typeof n === "string" ? n : null;
|
|
329
329
|
}
|
|
330
330
|
dto.floridayExternalFulfilledIds = (ownRow?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
|
|
331
|
+
{
|
|
332
|
+
const fs = (ownRow?.custom_fields ?? {})?.floriday_status;
|
|
333
|
+
dto.floridayRawStatus = typeof fs === "string" ? fs : null;
|
|
334
|
+
}
|
|
331
335
|
const reviewCf = (ownRow?.custom_fields ?? {});
|
|
332
336
|
dto.mixedDeliveryDates = Boolean(reviewCf?.floriday_mixed_delivery_dates);
|
|
333
337
|
dto.unlinkedProducts = ownRow ? unlinkedFloridayProducts(ownRow) : [];
|
|
@@ -512,6 +516,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
512
516
|
});
|
|
513
517
|
sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
|
|
514
518
|
sDto.floridayExternalFulfilledIds = (sLocal?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
|
|
519
|
+
{
|
|
520
|
+
const fs = (sLocal?.custom_fields ?? {})?.floriday_status;
|
|
521
|
+
sDto.floridayRawStatus = typeof fs === "string" ? fs : null;
|
|
522
|
+
}
|
|
515
523
|
sDto.orderRowId = sLocal?.id ? String(sLocal.id) : null;
|
|
516
524
|
sDto.invoiceRoute = invoiceRoute({
|
|
517
525
|
floridaySalesOrderId: String(sr.floriday_id),
|
|
@@ -527,11 +535,15 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
527
535
|
console.warn("[getSalesOrderDetail] buffer-siblings lookup faalde:", err.message);
|
|
528
536
|
}
|
|
529
537
|
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
530
|
-
const
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
538
|
+
const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
|
|
539
|
+
const [progress, pickupMoment] = await Promise.all([
|
|
540
|
+
attachDetailProgress(supabase, [dto, ...bufferSiblings]).catch(() => ({
|
|
541
|
+
features: { erpInvoices: false, pickProgress: false },
|
|
542
|
+
invoice: "failed",
|
|
543
|
+
})),
|
|
544
|
+
loadPickupMomentForDetail(supabase, String(dto.id)),
|
|
545
|
+
]);
|
|
546
|
+
return { order: dto, sellerFallback, environment, bufferId, bufferSiblings, progress, pickupMoment };
|
|
535
547
|
});
|
|
536
548
|
// ─── Handmatige controle na orderpicken ───────────────────────────────────
|
|
537
549
|
const ControlInputSchema = z.object({
|
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
export declare function useLocalSalesOrderDetailQuery(id: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
|
|
2
2
|
order: import("./salesorders-mapping.js").SalesOrderDTO | null;
|
|
3
|
-
progress: import("./order-progress.server.js").DetailProgress |
|
|
3
|
+
progress: import("./order-progress.server.js").DetailProgress | {
|
|
4
|
+
features: {
|
|
5
|
+
erpInvoices: boolean;
|
|
6
|
+
pickProgress: boolean;
|
|
7
|
+
};
|
|
8
|
+
invoice: "failed";
|
|
9
|
+
} | undefined;
|
|
10
|
+
pickupMoment: {
|
|
11
|
+
orderId: string;
|
|
12
|
+
fetchedAt: number;
|
|
13
|
+
returnedAt: number;
|
|
14
|
+
data: {
|
|
15
|
+
view: import("./order-departure.js").DepartureView;
|
|
16
|
+
departure: import("./order-departure.js").OrderDeparture | null;
|
|
17
|
+
selectedKey: string | null;
|
|
18
|
+
options: import("./order-pickup.functions.js").PickupMomentOption[];
|
|
19
|
+
hasCarrier: boolean;
|
|
20
|
+
deliveryTime: string | null;
|
|
21
|
+
lateOverride: {
|
|
22
|
+
by: string | null;
|
|
23
|
+
at: string | null;
|
|
24
|
+
} | null;
|
|
25
|
+
};
|
|
26
|
+
} | null;
|
|
4
27
|
bufferId: string | null;
|
|
5
28
|
bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
|
|
6
29
|
sellerFallback: string | null;
|
|
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA2C1E"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { type QueryClient } from "@tanstack/react-query";
|
|
2
|
+
export declare const pickupMomentKey: (orderId: string) => readonly ["order-pickup-moment", string];
|
|
3
|
+
export declare function usePickupMoment(orderId: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
|
|
4
|
+
view: import("./order-departure.js").DepartureView;
|
|
5
|
+
departure: import("./order-departure.js").OrderDeparture | null;
|
|
6
|
+
selectedKey: string | null;
|
|
7
|
+
options: import("./order-pickup.functions.js").PickupMomentOption[];
|
|
8
|
+
hasCarrier: boolean;
|
|
9
|
+
deliveryTime: string | null;
|
|
10
|
+
lateOverride: {
|
|
11
|
+
by: string | null;
|
|
12
|
+
at: string | null;
|
|
13
|
+
} | null;
|
|
14
|
+
}, Error>;
|
|
15
|
+
/**
|
|
16
|
+
* Vult de cache uit het detailantwoord, alleen als die leeg is of ouder dan
|
|
17
|
+
* het moment waarop het detailverzoek het ophaalmoment las. Een detailantwoord
|
|
18
|
+
* dat nog onderweg was na "Ander ophaalmoment kiezen…" overschrijft zo nooit
|
|
19
|
+
* het nieuwe moment.
|
|
20
|
+
*/
|
|
21
|
+
export declare function seedPickupMoment(qc: QueryClient, seed: {
|
|
22
|
+
orderId: string;
|
|
23
|
+
fetchedAt: number;
|
|
24
|
+
returnedAt: number;
|
|
25
|
+
data: unknown;
|
|
26
|
+
} | null | undefined,
|
|
27
|
+
/** Klok van de browser bij aankomst van het detailantwoord (dataUpdatedAt). */
|
|
28
|
+
arrivedAt: number): void;
|
|
29
|
+
/**
|
|
30
|
+
* Leesmoment op de klok van de browser, zonder klokverschil met de server:
|
|
31
|
+
* aankomst − (serverduur na het lezen) − ruime marge. Liever te oud dan te
|
|
32
|
+
* nieuw: te oud betekent alleen dat we de cache niet vullen.
|
|
33
|
+
*/
|
|
34
|
+
export declare function clientReadAt(seed: {
|
|
35
|
+
fetchedAt: number;
|
|
36
|
+
returnedAt: number;
|
|
37
|
+
}, arrivedAt: number, margin?: number): number;
|
|
38
|
+
export declare function shouldSeed(state: {
|
|
39
|
+
data?: unknown;
|
|
40
|
+
dataUpdatedAt: number;
|
|
41
|
+
fetchStatus: string;
|
|
42
|
+
isInvalidated: boolean;
|
|
43
|
+
} | undefined, fetchedAt: number): boolean;
|
|
44
|
+
//# sourceMappingURL=usePickupMoment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usePickupMoment.d.ts","sourceRoot":"","sources":["../../src/lib/usePickupMoment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAInE,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,6CAA8C,CAAC;AAE9F,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;UAQjE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,WAAW,EACf,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS;AAClG,+EAA+E;AAC/E,SAAS,EAAE,MAAM,QAMlB;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAO,GAAG,MAAM,CAEtH;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,EACzG,SAAS,EAAE,MAAM,GAChB,OAAO,CAIT"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
// Eén bron voor het ophaalmoment op de orderpagina: de kaart Vervoer en de
|
|
2
|
+
// tegel Leverdatum lezen dezelfde query; opslaan ververst die ene query.
|
|
3
|
+
import { useQuery } from "@tanstack/react-query";
|
|
4
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
5
|
+
import { getOrderPickupMoment } from "./order-pickup.functions.js";
|
|
6
|
+
export const pickupMomentKey = (orderId) => ["order-pickup-moment", orderId];
|
|
7
|
+
export function usePickupMoment(orderId) {
|
|
8
|
+
const fetchMoment = useServerFn(getOrderPickupMoment);
|
|
9
|
+
return useQuery({
|
|
10
|
+
queryKey: pickupMomentKey(orderId ?? ""),
|
|
11
|
+
queryFn: () => fetchMoment({ data: { orderId: orderId } }),
|
|
12
|
+
enabled: !!orderId,
|
|
13
|
+
staleTime: 30000,
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Vult de cache uit het detailantwoord, alleen als die leeg is of ouder dan
|
|
18
|
+
* het moment waarop het detailverzoek het ophaalmoment las. Een detailantwoord
|
|
19
|
+
* dat nog onderweg was na "Ander ophaalmoment kiezen…" overschrijft zo nooit
|
|
20
|
+
* het nieuwe moment.
|
|
21
|
+
*/
|
|
22
|
+
export function seedPickupMoment(qc, seed,
|
|
23
|
+
/** Klok van de browser bij aankomst van het detailantwoord (dataUpdatedAt). */
|
|
24
|
+
arrivedAt) {
|
|
25
|
+
if (!seed?.orderId || !seed.data)
|
|
26
|
+
return;
|
|
27
|
+
const key = pickupMomentKey(seed.orderId);
|
|
28
|
+
const readAt = clientReadAt(seed, arrivedAt);
|
|
29
|
+
if (shouldSeed(qc.getQueryState(key), readAt))
|
|
30
|
+
qc.setQueryData(key, seed.data, { updatedAt: readAt });
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Leesmoment op de klok van de browser, zonder klokverschil met de server:
|
|
34
|
+
* aankomst − (serverduur na het lezen) − ruime marge. Liever te oud dan te
|
|
35
|
+
* nieuw: te oud betekent alleen dat we de cache niet vullen.
|
|
36
|
+
*/
|
|
37
|
+
export function clientReadAt(seed, arrivedAt, margin = 2000) {
|
|
38
|
+
return arrivedAt - Math.max(0, seed.returnedAt - seed.fetchedAt) - margin;
|
|
39
|
+
}
|
|
40
|
+
export function shouldSeed(state, fetchedAt) {
|
|
41
|
+
if (!state || state.data === undefined)
|
|
42
|
+
return true;
|
|
43
|
+
if (state.fetchStatus === "fetching" || state.isInvalidated)
|
|
44
|
+
return false;
|
|
45
|
+
return state.dataUpdatedAt < fetchedAt;
|
|
46
|
+
}
|