@flowselections/floriday-verkoop-module 1.0.138 → 1.0.140
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/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +24 -22
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts +2 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.js +48 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +32 -5
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +12 -2
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +3 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.js +13 -51
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +17 -3
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +168 -116
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +203 -89
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts +9 -0
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/CustomerName.js +16 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts +15 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/HoverTip.js +24 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/KpiTile.js +8 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts +7 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.js +127 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/RowMenu.js +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.js +45 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts +2 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.js +2 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +2 -0
- package/dist-lib/integrations/supabase/types.d.ts +431 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.check.d.ts +2 -0
- package/dist-lib/lib/buffer-carts.check.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.check.js +23 -0
- package/dist-lib/lib/buffer-carts.d.ts +35 -0
- package/dist-lib/lib/buffer-carts.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts +12 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.js +18 -0
- package/dist-lib/lib/buffer-carts.js +41 -0
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +8 -1
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/motion.d.ts +13 -0
- package/dist-lib/lib/motion.d.ts.map +1 -0
- package/dist-lib/lib/motion.js +36 -0
- package/dist-lib/lib/order-price-lock.check.js +21 -5
- package/dist-lib/lib/order-price-lock.d.ts +14 -6
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.js +40 -8
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.server.js +10 -0
- package/dist-lib/lib/order-progress.check.d.ts +2 -0
- package/dist-lib/lib/order-progress.check.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.check.js +90 -0
- package/dist-lib/lib/order-progress.d.ts +154 -0
- package/dist-lib/lib/order-progress.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.js +171 -0
- package/dist-lib/lib/order-progress.server.d.ts +41 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.server.js +136 -0
- package/dist-lib/lib/order-status.js +2 -2
- package/dist-lib/lib/period-range.check.d.ts +2 -0
- package/dist-lib/lib/period-range.check.d.ts.map +1 -0
- package/dist-lib/lib/period-range.check.js +63 -0
- package/dist-lib/lib/period-range.d.ts +66 -0
- package/dist-lib/lib/period-range.d.ts.map +1 -0
- package/dist-lib/lib/period-range.js +213 -0
- package/dist-lib/lib/plan-coverage.d.ts +17 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +24 -0
- package/dist-lib/lib/reference-cache.check.d.ts +2 -0
- package/dist-lib/lib/reference-cache.check.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.check.js +31 -0
- package/dist-lib/lib/reference-cache.server.d.ts +17 -0
- package/dist-lib/lib/reference-cache.server.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.server.js +65 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +4 -2
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +5 -1
- package/dist-lib/lib/salesorders-list.server.d.ts +7 -2
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +228 -119
- package/dist-lib/lib/salesorders-mapping.d.ts +18 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +19 -58
- package/dist-lib/lib/session-error.check.d.ts +2 -0
- package/dist-lib/lib/session-error.check.d.ts.map +1 -0
- package/dist-lib/lib/session-error.check.js +17 -0
- package/dist-lib/lib/session-error.d.ts +2 -0
- package/dist-lib/lib/session-error.d.ts.map +1 -0
- package/dist-lib/lib/session-error.js +10 -0
- package/dist-lib/lib/useBufferCarts.d.ts +6 -0
- package/dist-lib/lib/useBufferCarts.d.ts.map +1 -0
- package/dist-lib/lib/useBufferCarts.js +15 -0
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +11 -2
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +75 -52
- package/package.json +3 -3
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { invoiceStateLabel } from "./invoice-timing.js";
|
|
2
|
+
import { cachedRef, invalidateRefCache, refCacheKey } from "./reference-cache.server.js";
|
|
2
3
|
import { loadReviewDismissals, isReviewDismissed } from "./review-dismissals.server.js";
|
|
3
4
|
import { orderFust } from "./order-fust.js";
|
|
4
5
|
import { posOrNull } from "./packing-snapshot.js";
|
|
@@ -16,6 +17,8 @@ import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js
|
|
|
16
17
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
17
18
|
import { mergeStages, resolveOrderStage } from "./order-status.js";
|
|
18
19
|
import { loadBacklogFlags } from "./order-backlog.server.js";
|
|
20
|
+
import { detectSource, hasProblem, invoiceRoute, isInvoicedDone, toProgressMember, } from "./order-progress.js";
|
|
21
|
+
import { loadInvoiceStatuses, loadPickProgress } from "./order-progress.server.js";
|
|
19
22
|
const FO_CAP = 20000;
|
|
20
23
|
const LOCAL_CAP = 5000;
|
|
21
24
|
const PROPOSAL_CAP = 2000;
|
|
@@ -110,34 +113,28 @@ async function chunked(ids, size, fn) {
|
|
|
110
113
|
}
|
|
111
114
|
return out;
|
|
112
115
|
}
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
export function invalidateReferenceCache() {
|
|
119
|
-
crateDescCache = null;
|
|
120
|
-
carrierNamesCache = null;
|
|
121
|
-
groupPackingCache = null;
|
|
116
|
+
// ── korte servercache voor stabiele referentiedata ────────────────────────
|
|
117
|
+
// Per Supabase-project (+ versiesleutel), 60 s; zie reference-cache.server.ts.
|
|
118
|
+
// Realtime-seintjes in de lijst sturen refreshReference mee.
|
|
119
|
+
export function invalidateReferenceCache(key = null) {
|
|
120
|
+
invalidateRefCache(key);
|
|
122
121
|
}
|
|
123
|
-
async function loadCarrierNames(supabase) {
|
|
124
|
-
if (carrierNamesCache && Date.now() - carrierNamesCache.at < TTL_MS)
|
|
125
|
-
return carrierNamesCache.value;
|
|
126
|
-
const map = new Map();
|
|
122
|
+
async function loadCarrierNames(supabase, cacheKey) {
|
|
127
123
|
try {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
124
|
+
return await cachedRef(cacheKey, "carrierNames", async () => {
|
|
125
|
+
const map = new Map();
|
|
126
|
+
const { data, error } = await supabase.from("carriers").select("id, name").limit(2000);
|
|
127
|
+
if (error)
|
|
128
|
+
throw new Error(error.message);
|
|
129
|
+
for (const c of (data ?? []))
|
|
130
|
+
map.set(String(c.id), String(c.name ?? ""));
|
|
131
|
+
return map;
|
|
132
|
+
});
|
|
134
133
|
}
|
|
135
134
|
catch {
|
|
136
135
|
/* vervoerdernamen zijn optioneel */
|
|
137
|
-
|
|
138
|
-
return carrierNamesCache.value;
|
|
136
|
+
return new Map();
|
|
139
137
|
}
|
|
140
|
-
return map;
|
|
141
138
|
}
|
|
142
139
|
function makeTimer() {
|
|
143
140
|
const start = Date.now();
|
|
@@ -211,44 +208,44 @@ export function overviewWindowFor(deliveries) {
|
|
|
211
208
|
};
|
|
212
209
|
return { from: shift(min, -60), to: shift(max, 14) };
|
|
213
210
|
}
|
|
214
|
-
async function loadCrateDescriptions(supabase, warnings) {
|
|
215
|
-
if (crateDescCache && Date.now() - crateDescCache.at < TTL_MS)
|
|
216
|
-
return crateDescCache.value;
|
|
217
|
-
const map = new Map();
|
|
211
|
+
async function loadCrateDescriptions(supabase, warnings, cacheKey) {
|
|
218
212
|
try {
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
213
|
+
return await cachedRef(cacheKey, "crateDescriptions", async () => {
|
|
214
|
+
const map = new Map();
|
|
215
|
+
const { data, error } = await supabase
|
|
216
|
+
.from("floricode_records")
|
|
217
|
+
.select("data")
|
|
218
|
+
.eq("resource", "LoadCarrier")
|
|
219
|
+
.limit(5000);
|
|
220
|
+
if (error)
|
|
221
|
+
throw new Error(error.message);
|
|
222
|
+
for (const row of data ?? []) {
|
|
223
|
+
const d = row.data ?? {};
|
|
224
|
+
if (d?.code == null)
|
|
225
|
+
continue;
|
|
226
|
+
const desc = typeof d.description === "string" ? d.description.trim() : "";
|
|
227
|
+
if (desc)
|
|
228
|
+
map.set(String(d.code), desc);
|
|
229
|
+
}
|
|
230
|
+
return map;
|
|
231
|
+
});
|
|
235
232
|
}
|
|
236
233
|
catch (e) {
|
|
237
234
|
warnings.push(`Fustomschrijvingen niet geladen: ${e.message}`);
|
|
238
|
-
|
|
239
|
-
return crateDescCache.value;
|
|
235
|
+
return new Map();
|
|
240
236
|
}
|
|
241
|
-
return map;
|
|
242
237
|
}
|
|
243
238
|
// ── hoofdfunctie ──────────────────────────────────────────────────────────
|
|
244
239
|
export async function buildSalesOrdersList(supabase, params, connectionSupabase = supabase) {
|
|
245
240
|
const warnings = [];
|
|
246
241
|
const t = makeTimer();
|
|
242
|
+
// Cachesleutel = projectadres van dit verzoek + versie (vóór het omwikkelen).
|
|
243
|
+
const cacheKey = refCacheKey(supabase);
|
|
247
244
|
// Teller van database-aanroepen per lading (meting).
|
|
248
245
|
supabase = countingClient(supabase, t.db);
|
|
249
246
|
connectionSupabase = countingClient(connectionSupabase, t.db);
|
|
250
247
|
if (params.refreshReference)
|
|
251
|
-
invalidateReferenceCache();
|
|
248
|
+
invalidateReferenceCache(cacheKey);
|
|
252
249
|
const pageSize = Math.min(PAGE_SIZE_MAX, Math.max(1, Math.floor(params.pageSize || 20)));
|
|
253
250
|
const page = Math.max(1, Math.floor(params.page || 1));
|
|
254
251
|
const dateColumn = params.dateField === "delivery"
|
|
@@ -256,23 +253,34 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
256
253
|
: "data->>orderDateTime";
|
|
257
254
|
// 1 + 2) Omgeving, connectie en Floriday-orders — tegelijk met 3 (lokale orders).
|
|
258
255
|
const floridayTask = t.time("1_2_floriday", async () => {
|
|
259
|
-
const
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
.
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
256
|
+
const settings = await cachedRef(cacheKey, "floridaySettings", async () => {
|
|
257
|
+
const envRes = await supabase
|
|
258
|
+
.from("floriday_settings")
|
|
259
|
+
.select("active_environment")
|
|
260
|
+
.eq("id", 1)
|
|
261
|
+
.maybeSingle();
|
|
262
|
+
if (envRes.error)
|
|
263
|
+
throw new Error(envRes.error.message);
|
|
264
|
+
const rawEnv = String(envRes.data?.active_environment ?? "staging");
|
|
265
|
+
const environment = rawEnv === "production" || rawEnv === "prod" || rawEnv === "live" ? "live" : "staging";
|
|
266
|
+
// De connectietabel bevat ook gevoelige velden en is daarom bewust niet
|
|
267
|
+
// rechtstreeks leesbaar voor browsers. Alleen deze veilige selectie loopt
|
|
268
|
+
// via de serverclient; alle orderdata blijft onder de rechten van de gebruiker.
|
|
269
|
+
const connRes = await connectionSupabase
|
|
270
|
+
.from("floriday_connections")
|
|
271
|
+
.select("id, organization_name, label")
|
|
272
|
+
.eq("is_active", true)
|
|
273
|
+
.eq("environment", environment)
|
|
274
|
+
.limit(1);
|
|
275
|
+
if (connRes.error)
|
|
276
|
+
throw new Error(connRes.error.message);
|
|
277
|
+
return { environment, conn: (connRes.data ?? [])[0] };
|
|
278
|
+
}).catch((e) => {
|
|
279
|
+
warnings.push(`Floriday-koppeling niet gelezen: ${e.message}`);
|
|
280
|
+
return { environment: "staging", conn: undefined };
|
|
281
|
+
});
|
|
282
|
+
const environment = settings.environment;
|
|
283
|
+
const conn = settings.conn;
|
|
276
284
|
const sellerFallback = conn?.organization_name ?? conn?.label ?? null;
|
|
277
285
|
let truncated = false;
|
|
278
286
|
const foRows = [];
|
|
@@ -339,14 +347,14 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
339
347
|
.order("created_at", { ascending: false })
|
|
340
348
|
.limit(LOCAL_CAP);
|
|
341
349
|
if (params.since && params.until) {
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
+
// order_date/delivery_date zijn tekst 'JJJJ-MM-DD': vergelijk met
|
|
351
|
+
// kalenderdagen (Amsterdam), halfopen. Een volledige ISO-tijd als grens
|
|
352
|
+
// liet '2026-10-26' toch door ('2026-10-26' < '2026-10-26T…').
|
|
353
|
+
const from = params.sinceDate ?? params.since.slice(0, 10);
|
|
354
|
+
const to = params.untilDate ?? params.until.slice(0, 10);
|
|
355
|
+
localQ = localQ
|
|
356
|
+
.gte(params.dateField === "delivery" ? "delivery_date" : "order_date", from)
|
|
357
|
+
.lt(params.dateField === "delivery" ? "delivery_date" : "order_date", to);
|
|
350
358
|
}
|
|
351
359
|
const localRes = await localQ;
|
|
352
360
|
if (localRes.error)
|
|
@@ -354,12 +362,32 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
354
362
|
return (localRes.data ?? []);
|
|
355
363
|
});
|
|
356
364
|
// Vervoerdernamen: vaste referentiedata, 10 min in het servergeheugen.
|
|
357
|
-
const carrierNamesTask = loadCarrierNames(supabase);
|
|
365
|
+
const carrierNamesTask = loadCarrierNames(supabase, cacheKey);
|
|
358
366
|
const [{ environment, sellerFallback, foRows, truncated }, localOrderRows] = await Promise.all([
|
|
359
367
|
floridayTask,
|
|
360
368
|
localTask,
|
|
361
369
|
]);
|
|
362
370
|
t.mark("1_3_bronnen");
|
|
371
|
+
// 12a-ophalen) Engine-overzicht start direct na de bronnen, tegelijk met de
|
|
372
|
+
// referentiegegevens (stap 5). Venster uit de ruwe leverdatums; toepassen
|
|
373
|
+
// gebeurt later (12a) op de DTO's.
|
|
374
|
+
const earlyOverviewWindow = overviewWindowFor([
|
|
375
|
+
...localOrderRows.map((r) => (r?.delivery_date ? String(r.delivery_date) : null)),
|
|
376
|
+
...foRows.map((r) => r?.data?.delivery?.latestDeliveryDateTime ? String(r.data.delivery.latestDeliveryDateTime) : null),
|
|
377
|
+
]);
|
|
378
|
+
const overviewFetch = localOrderRows.length || foRows.length
|
|
379
|
+
? t.time("12a_overzicht", async () => {
|
|
380
|
+
try {
|
|
381
|
+
const { data, error } = await supabase.rpc("logistics_order_overview", { p_from: earlyOverviewWindow.from, p_to: earlyOverviewWindow.to });
|
|
382
|
+
if (error)
|
|
383
|
+
return { rows: [], error: String(error.message) };
|
|
384
|
+
return { rows: Array.isArray(data) ? data : [], error: null };
|
|
385
|
+
}
|
|
386
|
+
catch (e) {
|
|
387
|
+
return { rows: [], error: e?.message ?? String(e) };
|
|
388
|
+
}
|
|
389
|
+
})
|
|
390
|
+
: Promise.resolve({ rows: [], error: null });
|
|
363
391
|
// 3b) Vervoerders + verzendmomenten (best-effort, alleen voor deze orders).
|
|
364
392
|
// Loopt tegelijk met stap 5 (zie Promise.all hieronder).
|
|
365
393
|
const carrierNameById = await carrierNamesTask;
|
|
@@ -374,10 +402,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
374
402
|
.in("order_id", localIds.slice(0, 1000));
|
|
375
403
|
for (const s of (shipRows ?? [])) {
|
|
376
404
|
const key = String(s.order_id);
|
|
377
|
-
const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false };
|
|
405
|
+
const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false, shippedAt: null };
|
|
378
406
|
const st = String(s.status ?? "").toLowerCase();
|
|
379
407
|
if (s.shipped_at || st === "verzonden" || st === "shipped")
|
|
380
408
|
prev.shipped = true;
|
|
409
|
+
if (s.shipped_at && (!prev.shippedAt || String(s.shipped_at) > prev.shippedAt))
|
|
410
|
+
prev.shippedAt = String(s.shipped_at);
|
|
381
411
|
if (st === "gepickt" || st === "picked" || st === "gecontroleerd")
|
|
382
412
|
prev.picked = true;
|
|
383
413
|
shipmentStateByOrder.set(key, prev);
|
|
@@ -472,8 +502,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
472
502
|
throw new Error(error.message);
|
|
473
503
|
return (data ?? []);
|
|
474
504
|
}, []),
|
|
475
|
-
loadCrateDescriptions(supabase, warnings),
|
|
476
|
-
safe("Productgroepen", () => loadGroupPacking(supabase), new Map()),
|
|
505
|
+
loadCrateDescriptions(supabase, warnings, cacheKey),
|
|
506
|
+
safe("Productgroepen", () => loadGroupPacking(supabase, cacheKey), new Map()),
|
|
477
507
|
]);
|
|
478
508
|
t.mark("3b_5_referentie");
|
|
479
509
|
const orderNumberByFoId = orderNumberRows;
|
|
@@ -638,6 +668,19 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
638
668
|
isReservation: localRow ? !!localRow.is_reservation : false,
|
|
639
669
|
});
|
|
640
670
|
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
671
|
+
// Weergave: bron, klant-id, orders.id, factuurroute en verzendmoment.
|
|
672
|
+
dto.source = detectSource({
|
|
673
|
+
rowKind: "floriday",
|
|
674
|
+
orderSource: localRow?.order_source ?? "floriday",
|
|
675
|
+
cfSource: (localRow?.custom_fields ?? {})?.source ?? null,
|
|
676
|
+
});
|
|
677
|
+
dto.customerId = localRow?.customer_id ? String(localRow.customer_id) : null;
|
|
678
|
+
dto.orderRowId = localRow?.id ? String(localRow.id) : null;
|
|
679
|
+
dto.invoiceRoute = invoiceRoute({
|
|
680
|
+
floridaySalesOrderId: localRow?.floriday_sales_order_id ?? String(r.floriday_id ?? ""),
|
|
681
|
+
orderSource: localRow?.order_source ?? "floriday",
|
|
682
|
+
});
|
|
683
|
+
dto.shippedAt = shipState?.shippedAt ?? null;
|
|
641
684
|
dto.invoiceNote = localRow?.invoice_ready_note ?? null;
|
|
642
685
|
dto.floridayFulfilled = Boolean((localRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
643
686
|
dto.notReportedToFloriday = isNotReportedLocally(dto.stage, dto.floridayFulfilled);
|
|
@@ -800,6 +843,11 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
800
843
|
: undefined;
|
|
801
844
|
localOrders.push({
|
|
802
845
|
id: `local:${r.id}`,
|
|
846
|
+
source: detectSource({ rowKind: "order", orderSource: r.order_source ?? null, cfSource: cf?.source ?? null }),
|
|
847
|
+
customerId: customerId || null,
|
|
848
|
+
orderRowId: String(r.id),
|
|
849
|
+
invoiceRoute: invoiceRoute({ floridaySalesOrderId: r.floriday_sales_order_id ?? null, orderSource: r.order_source ?? null }),
|
|
850
|
+
shippedAt: shipmentStateByOrder.get(String(r.id))?.shippedAt ?? null,
|
|
803
851
|
mixedDeliveryDates: Boolean(r.custom_fields?.floriday_mixed_delivery_dates),
|
|
804
852
|
unlinkedProducts: unlinkedFloridayProducts(r),
|
|
805
853
|
orderNumber: centralOrderNumber(r.order_number),
|
|
@@ -901,15 +949,14 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
901
949
|
// en Pick — we tellen hier niets zelf meer voor de weergave.
|
|
902
950
|
// Alleen het venster van de getoonde orders (leverdatums, met marge voor de
|
|
903
951
|
// pickdag) i.p.v. de hele historie. Ontbreekt een leverdatum: geen venster.
|
|
904
|
-
const
|
|
905
|
-
const overviewTask = t.time("12a_overzicht", async () => {
|
|
952
|
+
const overviewTask = (async () => {
|
|
906
953
|
if (all.length === 0)
|
|
907
954
|
return;
|
|
908
955
|
try {
|
|
909
|
-
const
|
|
910
|
-
if (
|
|
911
|
-
throw new Error(
|
|
912
|
-
const overview =
|
|
956
|
+
const fetched = await overviewFetch;
|
|
957
|
+
if (fetched.error)
|
|
958
|
+
throw new Error(fetched.error);
|
|
959
|
+
const overview = fetched.rows;
|
|
913
960
|
const engineByOrderId = new Map();
|
|
914
961
|
for (const row of overview) {
|
|
915
962
|
if (row?.order_uuid)
|
|
@@ -941,7 +988,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
941
988
|
catch (e) {
|
|
942
989
|
warnings.push(`Engine-orderoverzicht niet beschikbaar: ${e?.message ?? e}`);
|
|
943
990
|
}
|
|
944
|
-
});
|
|
991
|
+
})();
|
|
945
992
|
// 12a-ter) Ladingdragers en indelingsstatus komen uit de Engine
|
|
946
993
|
// (logistics_order_plan_coverage), alleen voor de zichtbare rijen — zie stap 14.
|
|
947
994
|
// 12a-bis) Ophaalmoment komt uit de Engine, alleen voor zichtbare rijen (stap 14).
|
|
@@ -1118,8 +1165,25 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1118
1165
|
}
|
|
1119
1166
|
}
|
|
1120
1167
|
});
|
|
1121
|
-
|
|
1168
|
+
// 12i) Factuurstand (Facturatie) voor alle orders in de periode (nodig voor
|
|
1169
|
+
// de telling "Gefactureerd"), per 500 id's, hooguit 1,5 s — tegelijk met
|
|
1170
|
+
// de Engine-stappen hierboven.
|
|
1171
|
+
const features = { erpInvoices: false, pickProgress: false };
|
|
1172
|
+
const invoiceTask = !params.all && !params.localOrderId && all.length
|
|
1173
|
+
? t.time("12i_factuur", async () => {
|
|
1174
|
+
const ids = Array.from(new Set(all.map((o) => o.orderRowId).filter((v) => !!v)));
|
|
1175
|
+
const res = await loadInvoiceStatuses(supabase, ids);
|
|
1176
|
+
features.erpInvoices = res.available;
|
|
1177
|
+
warnings.push(...res.warnings);
|
|
1178
|
+
if (res.available)
|
|
1179
|
+
for (const o of all)
|
|
1180
|
+
if (o.orderRowId)
|
|
1181
|
+
o.erpInvoice = res.invoices.get(o.orderRowId) ?? null;
|
|
1182
|
+
})
|
|
1183
|
+
: Promise.resolve();
|
|
1184
|
+
await Promise.all([overviewTask, dismissalsTask, backlogTask, invoiceTask]);
|
|
1122
1185
|
t.mark("12_engine");
|
|
1186
|
+
const membersOf = (g) => g.map((m) => toProgressMember(m));
|
|
1123
1187
|
// 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
|
|
1124
1188
|
const search = (params.search ?? "").trim().toLowerCase();
|
|
1125
1189
|
const matchesSearch = (members) => !search ||
|
|
@@ -1142,6 +1206,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1142
1206
|
const isBacklogGroup = (members) => stageOf(members) === "topick" && members.some((m) => m.backlog);
|
|
1143
1207
|
// Verzonden in het ERP, nog niet afgemeld bij Floriday (eigen kenmerk).
|
|
1144
1208
|
const isNotReportedGroup = (members) => members.some((m) => m.notReportedToFloriday);
|
|
1209
|
+
// Gefactureerd: elke order klaar volgens zijn eigen route (ERP "verstuurd",
|
|
1210
|
+
// Floriday volledig afgemeld). Probleem: een blokkade (zie memberProblems).
|
|
1211
|
+
const isInvoicedGroup = (members) => stageOf(members) !== "cancelled" && isInvoicedDone(membersOf(members), features);
|
|
1212
|
+
const isProblemGroup = (members) => stageOf(members) !== "cancelled" && hasProblem(membersOf(members));
|
|
1145
1213
|
const matchesTab = (members) => {
|
|
1146
1214
|
if (params.tab === "all")
|
|
1147
1215
|
return true;
|
|
@@ -1149,39 +1217,56 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1149
1217
|
return isBacklogGroup(members);
|
|
1150
1218
|
if (params.tab === "not_reported")
|
|
1151
1219
|
return isNotReportedGroup(members);
|
|
1152
|
-
if (
|
|
1153
|
-
return
|
|
1154
|
-
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
return
|
|
1220
|
+
if (params.tab === "invoiced")
|
|
1221
|
+
return isInvoicedGroup(members);
|
|
1222
|
+
if (params.tab === "problem")
|
|
1223
|
+
return isProblemGroup(members);
|
|
1224
|
+
// "Te picken" toont alle te picken orders, ook te laat.
|
|
1225
|
+
return stageOf(members) === params.tab;
|
|
1158
1226
|
};
|
|
1159
1227
|
const withoutTab = groups.filter((g) => matchesSearch(g) && matchesStatusFilter(g));
|
|
1160
|
-
const
|
|
1161
|
-
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
|
|
1173
|
-
|
|
1174
|
-
|
|
1175
|
-
|
|
1176
|
-
|
|
1228
|
+
const rowIdOf = (o) => o.id.startsWith("local:")
|
|
1229
|
+
? o.id.slice("local:".length)
|
|
1230
|
+
: (localRowByFoId.get(o.id)?.id ? String(localRowByFoId.get(o.id).id) : null);
|
|
1231
|
+
const pageOf = (list) => params.all ? list.slice(0, EXPORT_CAP) : list.slice((page - 1) * pageSize, page * pageSize);
|
|
1232
|
+
// 13p) Pickvoortgang (Engine): precies één aanroep per lijstverzoek, voor de
|
|
1233
|
+
// zichtbare rijen (incl. bufferleden) plus alle OPEN orders in de periode
|
|
1234
|
+
// (incoming/topick), zodat de telling "probleem" dezelfde blokkades ziet
|
|
1235
|
+
// als de iconen. Ontdubbeld, hooguit 500 id's (zichtbare rijen eerst),
|
|
1236
|
+
// hooguit 1,5 s; te laat → onderdeel valt terug, lijst laadt door.
|
|
1237
|
+
let pickTask = Promise.resolve();
|
|
1238
|
+
const pickProgressFor = !params.all && !params.localOrderId;
|
|
1239
|
+
if (pickProgressFor) {
|
|
1240
|
+
const openIds = withoutTab
|
|
1241
|
+
.filter((g) => { const st = stageOf(g); return st === "incoming" || st === "topick"; })
|
|
1242
|
+
.flat()
|
|
1243
|
+
.map(rowIdOf);
|
|
1244
|
+
const pageIds = params.tab === "problem" ? [] : pageOf(withoutTab.filter(matchesTab)).flat().map(rowIdOf);
|
|
1245
|
+
const pickIds = Array.from(new Set([...pageIds, ...openIds].filter((v) => !!v))).slice(0, 500);
|
|
1246
|
+
if (pickIds.length) {
|
|
1247
|
+
pickTask = t.time("13p_pickvoortgang", async () => {
|
|
1248
|
+
const res = await loadPickProgress(supabase, pickIds);
|
|
1249
|
+
features.pickProgress = res.available;
|
|
1250
|
+
warnings.push(...res.warnings);
|
|
1251
|
+
if (res.available)
|
|
1252
|
+
for (const g of withoutTab)
|
|
1253
|
+
for (const o of g) {
|
|
1254
|
+
const oid = rowIdOf(o);
|
|
1255
|
+
if (oid && res.pick.has(oid))
|
|
1256
|
+
o.pickProgress = res.pick.get(oid) ?? null;
|
|
1257
|
+
}
|
|
1258
|
+
});
|
|
1259
|
+
}
|
|
1260
|
+
else {
|
|
1261
|
+
features.pickProgress = true;
|
|
1177
1262
|
}
|
|
1178
|
-
// Onbekende achterstand valt hier vanzelf terug onder "Te picken".
|
|
1179
|
-
statusCounts[stageOf(g)]++;
|
|
1180
1263
|
}
|
|
1264
|
+
// Tabblad "Probleem" hangt van de blokkades af: dan eerst de pickvoortgang.
|
|
1265
|
+
if (params.tab === "problem")
|
|
1266
|
+
await pickTask;
|
|
1267
|
+
const filteredGroups = withoutTab.filter(matchesTab);
|
|
1181
1268
|
const totalCount = filteredGroups.length;
|
|
1182
|
-
const pageGroups =
|
|
1183
|
-
? filteredGroups.slice(0, EXPORT_CAP)
|
|
1184
|
-
: filteredGroups.slice((page - 1) * pageSize, page * pageSize);
|
|
1269
|
+
const pageGroups = pageOf(filteredGroups);
|
|
1185
1270
|
t.mark("13_filter");
|
|
1186
1271
|
// 14) Indelingsstatus + karren uit de Engine (logistics_order_plan_coverage),
|
|
1187
1272
|
// alleen voor de zichtbare rijen, in één keer opgehaald. Deze module telt
|
|
@@ -1340,13 +1425,41 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1340
1425
|
}));
|
|
1341
1426
|
}
|
|
1342
1427
|
}
|
|
1343
|
-
await Promise.all(enrichTasks);
|
|
1428
|
+
await Promise.all([...enrichTasks, pickTask]);
|
|
1344
1429
|
t.mark("14_15_verrijking");
|
|
1430
|
+
// Tellingen na de pickvoortgang: KPI en iconen gebruiken dezelfde regel
|
|
1431
|
+
// (hasProblem in order-progress.ts).
|
|
1432
|
+
const statusCounts = {
|
|
1433
|
+
all: withoutTab.length,
|
|
1434
|
+
incoming: 0,
|
|
1435
|
+
topick: 0,
|
|
1436
|
+
backlog: 0,
|
|
1437
|
+
picked: 0,
|
|
1438
|
+
shipped: 0,
|
|
1439
|
+
cancelled: 0,
|
|
1440
|
+
not_reported: 0,
|
|
1441
|
+
invoiced: 0,
|
|
1442
|
+
problem: 0,
|
|
1443
|
+
};
|
|
1444
|
+
for (const g of withoutTab) {
|
|
1445
|
+
if (isNotReportedGroup(g))
|
|
1446
|
+
statusCounts.not_reported++;
|
|
1447
|
+
if (isBacklogGroup(g))
|
|
1448
|
+
statusCounts.backlog++;
|
|
1449
|
+
if (isInvoicedGroup(g))
|
|
1450
|
+
statusCounts.invoiced++;
|
|
1451
|
+
if (isProblemGroup(g))
|
|
1452
|
+
statusCounts.problem++;
|
|
1453
|
+
// Onbekende achterstand valt hier vanzelf terug onder "Te picken".
|
|
1454
|
+
statusCounts[stageOf(g)]++;
|
|
1455
|
+
}
|
|
1345
1456
|
const rows = pageGroups.map((g) => {
|
|
1346
1457
|
const row = mergeGroup(g);
|
|
1347
1458
|
const ids = Array.from(new Set(g.flatMap((m) => m.floridayStatusIds ?? [])));
|
|
1348
1459
|
if (ids.length)
|
|
1349
1460
|
row.floridayStatusIds = ids;
|
|
1461
|
+
// Statusiconen: per order in de rij (na de verrijking, dus met vervoerder).
|
|
1462
|
+
row.progressMembers = membersOf(g);
|
|
1350
1463
|
return row;
|
|
1351
1464
|
});
|
|
1352
1465
|
// Totalen over de volledige gefilterde set (alle orders in elke buffer).
|
|
@@ -1363,16 +1476,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1363
1476
|
warnings,
|
|
1364
1477
|
truncated,
|
|
1365
1478
|
timing,
|
|
1479
|
+
features,
|
|
1366
1480
|
};
|
|
1367
1481
|
}
|
|
1368
1482
|
// Belading per productgroep: vaste referentiedata, 10 min in het servergeheugen.
|
|
1369
|
-
|
|
1370
|
-
|
|
1371
|
-
if (groupPackingCache && Date.now() - groupPackingCache.at < TTL_MS)
|
|
1372
|
-
return groupPackingCache.value;
|
|
1373
|
-
const value = await loadGroupPackingUncached(supabase);
|
|
1374
|
-
groupPackingCache = { at: Date.now(), value };
|
|
1375
|
-
return value;
|
|
1483
|
+
async function loadGroupPacking(supabase, cacheKey) {
|
|
1484
|
+
return cachedRef(cacheKey, "groupPacking", () => loadGroupPackingUncached(supabase));
|
|
1376
1485
|
}
|
|
1377
1486
|
// Belading per productgroep (op naam), gebruikt voor "[Groep] X"-regels.
|
|
1378
1487
|
async function loadGroupPackingUncached(supabase) {
|
|
@@ -1,6 +1,22 @@
|
|
|
1
1
|
import { type OrderStage } from "./order-status.js";
|
|
2
2
|
export interface SalesOrderDTO {
|
|
3
3
|
id: string;
|
|
4
|
+
/** Bron voor de weergave (detectSource in order-progress.ts). */
|
|
5
|
+
source?: import("./order-progress.js").SourceKey | null;
|
|
6
|
+
/** customers.id (= orders.customer_id), voor de klantlink. */
|
|
7
|
+
customerId?: string | null;
|
|
8
|
+
/** orders.id (uuid) van deze order, ook bij een Floriday-rij. */
|
|
9
|
+
orderRowId?: string | null;
|
|
10
|
+
/** Factuurroute volgens de regel van Facturatie (invoiceRoute). */
|
|
11
|
+
invoiceRoute?: import("./order-progress.js").InvoiceRoute;
|
|
12
|
+
/** Factuurstand uit erp_invoice_status_for_orders (Facturatie), alleen lezen. */
|
|
13
|
+
erpInvoice?: import("./order-progress.js").ErpInvoiceInfo | null;
|
|
14
|
+
/** Pickvoortgang uit logistics_order_pick_progress (Engine), alleen lezen. */
|
|
15
|
+
pickProgress?: import("./order-progress.js").PickProgress | null;
|
|
16
|
+
/** Bestaand verzendmoment (order_shipments.shipped_at). */
|
|
17
|
+
shippedAt?: string | null;
|
|
18
|
+
/** Per order in deze rij (één, of alle orders van een buffer) voor de statusiconen. */
|
|
19
|
+
progressMembers?: import("./order-progress.js").ProgressMember[];
|
|
4
20
|
orderNumber: string;
|
|
5
21
|
productName: string;
|
|
6
22
|
sku: string;
|
|
@@ -223,10 +239,12 @@ export interface SalesOrderFilters {
|
|
|
223
239
|
dateField?: "ordered" | "delivery";
|
|
224
240
|
period?: "week" | "month" | "day" | "last7" | "last30" | "custom";
|
|
225
241
|
}
|
|
242
|
+
/** ISO-week als halfopen [ma 00:00, volgende ma 00:00) in Europe/Amsterdam. */
|
|
226
243
|
export declare function isoWeekRange(week: number, year: number): {
|
|
227
244
|
start: Date;
|
|
228
245
|
end: Date;
|
|
229
246
|
};
|
|
247
|
+
/** Maand als halfopen interval in Europe/Amsterdam. */
|
|
230
248
|
export declare function monthRange(month: number, year: number): {
|
|
231
249
|
start: Date;
|
|
232
250
|
end: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|