@flowselections/floriday-verkoop-module 1.0.141 → 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/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +5 -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 +34 -9
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +37 -11
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -14
- 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/InfoCard.js +1 -1
- 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 +2 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.js +7 -8
- 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.d.ts +2 -0
- package/dist-lib/lib/delivery-format.check.d.ts.map +1 -0
- package/dist-lib/lib/delivery-format.check.js +32 -0
- package/dist-lib/lib/delivery-format.d.ts +31 -0
- package/dist-lib/lib/delivery-format.d.ts.map +1 -0
- package/dist-lib/lib/delivery-format.js +70 -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/order-progress.server.d.ts +23 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -1
- package/dist-lib/lib/order-progress.server.js +25 -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 +43 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +29 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -3
- package/dist-lib/lib/salesorders-mapping.d.ts +6 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +1 -0
- package/dist-lib/lib/salesorders.functions.d.ts +15 -0
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +35 -3
- package/dist-lib/lib/useDetailProgressFallback.d.ts +17 -0
- package/dist-lib/lib/useDetailProgressFallback.d.ts.map +1 -0
- package/dist-lib/lib/useDetailProgressFallback.js +28 -0
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +24 -0
- 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
|
@@ -97,3 +97,29 @@ export function notReportedState(erp, floriday, floridayFulfilled) {
|
|
|
97
97
|
return null;
|
|
98
98
|
return floridayFulfilled ? null : "waarschuwing_onbekend";
|
|
99
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* Floriday-regel in de factuurkaart: alleen uit de echte Floriday-status
|
|
102
|
+
* van de order (custom_fields.floriday_status), nooit afgeleid van onze
|
|
103
|
+
* eigen stand. null = niets extra's ten opzichte van "Afgemeld x van y".
|
|
104
|
+
*/
|
|
105
|
+
export function floridayInvoiceLine(raw, done, total) {
|
|
106
|
+
if (!raw || typeof raw !== "string")
|
|
107
|
+
return null;
|
|
108
|
+
const parts = raw.toUpperCase().split(/[^A-Z_]+/).filter(Boolean);
|
|
109
|
+
if (parts.length === 0)
|
|
110
|
+
return null;
|
|
111
|
+
const cancelled = (s) => s === "CANCELLED" || s === "CANCELED" || s === "EXPIRED" || s === "REJECTED";
|
|
112
|
+
const delivered = (s) => s === "DELIVERED" || s === "FULFILLED" || s === "COMPLETED";
|
|
113
|
+
if (parts.every(cancelled))
|
|
114
|
+
return "Geannuleerd in Floriday";
|
|
115
|
+
if (parts.some(cancelled))
|
|
116
|
+
return "Deels geannuleerd in Floriday";
|
|
117
|
+
const allDelivered = parts.every(delivered);
|
|
118
|
+
const someDelivered = parts.some(delivered);
|
|
119
|
+
// Zegt hetzelfde als "Afgemeld x van y" → weglaten.
|
|
120
|
+
if (allDelivered)
|
|
121
|
+
return total > 0 && done >= total ? null : "Afgemeld in Floriday";
|
|
122
|
+
if (someDelivered)
|
|
123
|
+
return total > 0 && done > 0 && done < total ? null : "Deels afgemeld in Floriday";
|
|
124
|
+
return total > 0 && done === 0 ? null : "Nog niet afgemeld in Floriday";
|
|
125
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nl-datetime.check.d.ts","sourceRoot":"","sources":["../../src/lib/nl-datetime.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { fmtNL, fmtNLDefault } from "./nl-datetime.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}: ${JSON.stringify(a)}${ok ? "" : ` ≠ ${JSON.stringify(b)}`}`); };
|
|
5
|
+
// FO-2601462: order_date 2026-10-27T11:37:45Z → "Ontvangen op 27 okt 2026, 12:37"
|
|
6
|
+
eq("Ontvangen op", fmtNL("2026-10-27T11:37:45.874858Z", { day: "numeric", month: "short", year: "numeric", hour: "2-digit", minute: "2-digit" }), "27 okt 2026, 12:37");
|
|
7
|
+
// Gepickt 27 okt, 12:43 (timestamptz +00)
|
|
8
|
+
eq("Gepickt", fmtNL("2026-10-27T11:43:10+00:00", { day: "numeric", month: "short", hour: "2-digit", minute: "2-digit" }), "27 okt, 12:43");
|
|
9
|
+
eq("Bijgewerkt hh:mm", fmtNL("2026-10-30T12:05:00Z", { hour: "2-digit", minute: "2-digit" }), "13:05");
|
|
10
|
+
eq("zomertijd", fmtNL("2026-10-24T10:00:00Z", { hour: "2-digit", minute: "2-digit" }), "12:00");
|
|
11
|
+
eq("kale datum", fmtNL("2026-10-26", { weekday: "short", day: "numeric", month: "short" }), "ma 26 okt");
|
|
12
|
+
eq("standaard", fmtNLDefault("2026-10-27T11:37:50Z"), "27-10-2026, 12:37:50");
|
|
13
|
+
if (fail)
|
|
14
|
+
process.exit(1);
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
type Opts = Intl.DateTimeFormatOptions;
|
|
2
|
+
export declare function fmtNL(value: string | number | Date | null | undefined, opts?: Opts): string | null;
|
|
3
|
+
/** Standaard: "27-10-2026, 12:37:50" (gelijk aan toLocaleString("nl-NL")). */
|
|
4
|
+
export declare const fmtNLDefault: (v: string | number | Date | null | undefined) => string | null;
|
|
5
|
+
export {};
|
|
6
|
+
//# sourceMappingURL=nl-datetime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nl-datetime.d.ts","sourceRoot":"","sources":["../../src/lib/nl-datetime.ts"],"names":[],"mappings":"AAaA,KAAK,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC;AAEvC,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,GAAE,IAAS,GAAG,MAAM,GAAG,IAAI,CAoBtG;AAED,8EAA8E;AAC9E,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,kBAC+C,CAAC"}
|
|
@@ -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
|
+
}
|
|
@@ -25,6 +25,10 @@ export interface InvoiceResult {
|
|
|
25
25
|
invoices: Map<string, ErpInvoiceInfo>;
|
|
26
26
|
available: boolean;
|
|
27
27
|
warnings: string[];
|
|
28
|
+
/** Tijdslimiet overschreden (stand nog onbekend, niet "niet beschikbaar"). */
|
|
29
|
+
timedOut?: boolean;
|
|
30
|
+
/** Echte fout (geen ontbrekende module of geen recht). */
|
|
31
|
+
failed?: boolean;
|
|
28
32
|
}
|
|
29
33
|
export interface PickResult {
|
|
30
34
|
pick: Map<string, PickProgress>;
|
|
@@ -37,5 +41,24 @@ export declare function loadInvoiceStatuses(client: RpcClient, orderIds: string[
|
|
|
37
41
|
export declare function loadPickProgress(client: RpcClient, orderIds: string[], ms?: number): Promise<PickResult>;
|
|
38
42
|
/** Oude samengestelde aanroep (blijft bestaan voor bestaande gebruikers). */
|
|
39
43
|
export declare function loadInvoiceAndPickProgress(client: RpcClient, orderIds: string[]): Promise<InvoicePickResult>;
|
|
44
|
+
/** Stand van de factuurgegevens voor het orderdetail. */
|
|
45
|
+
export type DetailInvoiceState = "ok" | "pending" | "failed";
|
|
46
|
+
export interface DetailProgress {
|
|
47
|
+
features: {
|
|
48
|
+
erpInvoices: boolean;
|
|
49
|
+
pickProgress: boolean;
|
|
50
|
+
};
|
|
51
|
+
invoice: DetailInvoiceState;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Orderdetail: factuurstand + pickvoortgang voor de order en zijn groepsleden,
|
|
55
|
+
* tegelijk en met dezelfde bronnen als de lijst. Zet erpInvoice/pickProgress
|
|
56
|
+
* direct op de meegegeven orders. Alleen lezen.
|
|
57
|
+
*/
|
|
58
|
+
export declare function attachDetailProgress(client: RpcClient, orders: {
|
|
59
|
+
orderRowId?: string | null;
|
|
60
|
+
erpInvoice?: ErpInvoiceInfo | null;
|
|
61
|
+
pickProgress?: PickProgress | null;
|
|
62
|
+
}[], ms?: number): Promise<DetailProgress>;
|
|
40
63
|
export {};
|
|
41
64
|
//# sourceMappingURL=order-progress.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-progress.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrE,KAAK,SAAS,GAAG;IAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAAE,CAAC;AASvD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA0BD,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvI;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"order-progress.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrE,KAAK,SAAS,GAAG;IAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAAE,CAAC;AASvD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA0BD,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvI;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,2EAA2E;AAC3E,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B/H;AAED,6EAA6E;AAC7E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CA6BzH;AAED,6EAA6E;AAC7E,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAS5B;AAED,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,EAAE,EAChH,EAAE,SAAoB,GACrB,OAAO,CAAC,cAAc,CAAC,CAazB"}
|
|
@@ -64,10 +64,12 @@ export async function loadInvoiceStatuses(client, orderIds, ms = ENRICH_TIMEOUT_
|
|
|
64
64
|
const r = await withTimeout(inChunks(client, "erp_invoice_status_for_orders", ids), ms);
|
|
65
65
|
if (r.timedOut) {
|
|
66
66
|
out.warnings.push(`Factuurstand kwam niet binnen ${ms / 1000} s; het factuuricoon toont de gewone weergave.`);
|
|
67
|
+
out.timedOut = true;
|
|
67
68
|
return out;
|
|
68
69
|
}
|
|
69
70
|
const inv = r.value;
|
|
70
71
|
out.available = inv.available;
|
|
72
|
+
out.failed = !inv.available && !!inv.warning && inv.warning !== "missing";
|
|
71
73
|
if (inv.warning === "missing")
|
|
72
74
|
out.warnings.push("Factuurstand is niet beschikbaar (Facturatie-module ontbreekt of is te oud); het factuuricoon is verborgen voor ERP-orders.");
|
|
73
75
|
else if (inv.warning)
|
|
@@ -134,3 +136,26 @@ export async function loadInvoiceAndPickProgress(client, orderIds) {
|
|
|
134
136
|
warnings: [...inv.warnings, ...pick.warnings],
|
|
135
137
|
};
|
|
136
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Orderdetail: factuurstand + pickvoortgang voor de order en zijn groepsleden,
|
|
141
|
+
* tegelijk en met dezelfde bronnen als de lijst. Zet erpInvoice/pickProgress
|
|
142
|
+
* direct op de meegegeven orders. Alleen lezen.
|
|
143
|
+
*/
|
|
144
|
+
export async function attachDetailProgress(client, orders, ms = ENRICH_TIMEOUT_MS) {
|
|
145
|
+
const ids = Array.from(new Set(orders.map((o) => o.orderRowId).filter((v) => !!v)));
|
|
146
|
+
if (!ids.length)
|
|
147
|
+
return { features: { erpInvoices: false, pickProgress: false }, invoice: "ok" };
|
|
148
|
+
const [inv, pick] = await Promise.all([loadInvoiceStatuses(client, ids, ms), loadPickProgress(client, ids, ms)]);
|
|
149
|
+
for (const o of orders) {
|
|
150
|
+
if (!o.orderRowId)
|
|
151
|
+
continue;
|
|
152
|
+
if (inv.available)
|
|
153
|
+
o.erpInvoice = inv.invoices.get(o.orderRowId) ?? null;
|
|
154
|
+
if (pick.available && pick.pick.has(o.orderRowId))
|
|
155
|
+
o.pickProgress = pick.pick.get(o.orderRowId) ?? null;
|
|
156
|
+
}
|
|
157
|
+
return {
|
|
158
|
+
features: { erpInvoices: inv.available, pickProgress: pick.available },
|
|
159
|
+
invoice: inv.timedOut ? "pending" : inv.failed ? "failed" : "ok",
|
|
160
|
+
};
|
|
161
|
+
}
|
|
@@ -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,6 +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 | {
|
|
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;
|
|
27
51
|
bufferId: string | null;
|
|
28
52
|
bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
|
|
29
53
|
sellerFallback: string | null;
|
|
@@ -46,4 +70,23 @@ export declare const getFloridayStatusesForRows: import("@tanstack/start-client-
|
|
|
46
70
|
statuses: Record<string, import("./floriday-status.js").FloridayStatusSummary>;
|
|
47
71
|
error: string | null;
|
|
48
72
|
}>>;
|
|
73
|
+
/**
|
|
74
|
+
* Orderdetail-vangnet: factuurstand + pickvoortgang opnieuw lezen als die in
|
|
75
|
+
* het detailverzoek niet binnen de tijdslimiet kwam. Hooguit 10 s, alleen lezen.
|
|
76
|
+
*/
|
|
77
|
+
export declare const getOrderDetailProgress: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
78
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
79
|
+
userId: string;
|
|
80
|
+
claims: import("@supabase/auth-js").User;
|
|
81
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
82
|
+
orderRowIds: string[];
|
|
83
|
+
}, Promise<{
|
|
84
|
+
progress: import("./order-progress.server.js").DetailProgress;
|
|
85
|
+
byId: {
|
|
86
|
+
[k: string]: {
|
|
87
|
+
erpInvoice: any;
|
|
88
|
+
pickProgress: any;
|
|
89
|
+
};
|
|
90
|
+
};
|
|
91
|
+
}>>;
|
|
49
92
|
//# sourceMappingURL=salesorders-list.functions.d.ts.map
|
|
@@ -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"}
|
|
@@ -91,8 +91,21 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
91
91
|
order.bufferCartCount = b.count;
|
|
92
92
|
order.bufferCartTypeName = b.typeName;
|
|
93
93
|
}
|
|
94
|
+
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
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];
|
|
94
105
|
return {
|
|
95
106
|
order,
|
|
107
|
+
progress,
|
|
108
|
+
pickupMoment,
|
|
96
109
|
bufferId: order?.bufferId ?? null,
|
|
97
110
|
bufferSiblings,
|
|
98
111
|
sellerFallback: result.sellerFallback,
|
|
@@ -122,3 +135,19 @@ export const getFloridayStatusesForRows = createServerFn({ method: "POST" })
|
|
|
122
135
|
out[r.key] = summarizeFloridayStatus(r.ids, res.entries, res.error);
|
|
123
136
|
return { statuses: out, error: res.error };
|
|
124
137
|
});
|
|
138
|
+
/**
|
|
139
|
+
* Orderdetail-vangnet: factuurstand + pickvoortgang opnieuw lezen als die in
|
|
140
|
+
* het detailverzoek niet binnen de tijdslimiet kwam. Hooguit 10 s, alleen lezen.
|
|
141
|
+
*/
|
|
142
|
+
export const getOrderDetailProgress = createServerFn({ method: "POST" })
|
|
143
|
+
.middleware([requireSupabaseAuth])
|
|
144
|
+
.inputValidator((input) => z.object({ orderRowIds: z.array(z.string().uuid()).min(1).max(50) }).parse(input))
|
|
145
|
+
.handler(async ({ data, context }) => {
|
|
146
|
+
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
147
|
+
const rows = data.orderRowIds.map((id) => ({ orderRowId: id, erpInvoice: null, pickProgress: null }));
|
|
148
|
+
const progress = await attachDetailProgress(context.supabase, rows, 10000);
|
|
149
|
+
return {
|
|
150
|
+
progress,
|
|
151
|
+
byId: Object.fromEntries(rows.map((r) => [r.orderRowId, { erpInvoice: r.erpInvoice, pickProgress: r.pickProgress }])),
|
|
152
|
+
};
|
|
153
|
+
});
|
|
@@ -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,6 +862,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
863
862
|
imageUrl: null,
|
|
864
863
|
orderedAt,
|
|
865
864
|
deliveryAt,
|
|
865
|
+
deliveryHasTime,
|
|
866
|
+
deliveryIsWallClock,
|
|
866
867
|
quantity: {
|
|
867
868
|
multiplier: totalQuantity > 0 ? Math.ceil(totalQuantity / firstPlantsPerCrate) : 1,
|
|
868
869
|
count: firstPlantsPerCrate,
|
|
@@ -23,6 +23,10 @@ export interface SalesOrderDTO {
|
|
|
23
23
|
imageUrl: string | null;
|
|
24
24
|
orderedAt: string;
|
|
25
25
|
deliveryAt: string;
|
|
26
|
+
/** Bronveld heeft een tijd (Floriday: altijd; eigen order: alleen met aanlevertijd). */
|
|
27
|
+
deliveryHasTime?: boolean;
|
|
28
|
+
/** deliveryAt is een ingevulde NL-kloktijd (leverdatum + aanlevertijd), zonder tijdzone. */
|
|
29
|
+
deliveryIsWallClock?: boolean;
|
|
26
30
|
quantity: {
|
|
27
31
|
multiplier: number;
|
|
28
32
|
count: number;
|
|
@@ -130,6 +134,8 @@ export interface SalesOrderDTO {
|
|
|
130
134
|
backlogUnknown?: boolean;
|
|
131
135
|
/** Floriday salesOrderId's op deze order (voor het statusoverzicht). */
|
|
132
136
|
floridayIds?: string[];
|
|
137
|
+
/** Echte Floriday-status van de order (custom_fields.floriday_status), alleen weergave. */
|
|
138
|
+
floridayRawStatus?: string | null;
|
|
133
139
|
/** Floriday-stand uit het statusoverzicht; alleen weergave. */
|
|
134
140
|
floridayStatus?: import("./floriday-status.js").FloridayStatusSummary | null;
|
|
135
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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"}
|
|
@@ -146,6 +146,7 @@ export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup, crat
|
|
|
146
146
|
imageUrl: tradeItem?.imageUrl ?? null,
|
|
147
147
|
orderedAt,
|
|
148
148
|
deliveryAt,
|
|
149
|
+
deliveryHasTime: true,
|
|
149
150
|
quantity: { multiplier: numberOfPackages, count: piecesPerPackage, unitPrice },
|
|
150
151
|
revenue,
|
|
151
152
|
fustCount: numberOfPackages,
|