@flowselections/floriday-verkoop-module 1.0.137 → 1.0.139
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 +32 -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.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +7 -2
- 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 +7 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +87 -30
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +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.d.ts +2 -0
- package/dist-lib/lib/order-price-lock.check.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.check.js +43 -0
- package/dist-lib/lib/order-price-lock.d.ts +29 -0
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.js +60 -0
- package/dist-lib/lib/order-price-lock.server.d.ts +2 -0
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.server.js +31 -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 +83 -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/own-transport.d.ts +11 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -0
- package/dist-lib/lib/own-transport.js +10 -0
- 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/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 +6 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +84 -18
- 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
|
@@ -16,6 +16,8 @@ import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js
|
|
|
16
16
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
17
17
|
import { mergeStages, resolveOrderStage } from "./order-status.js";
|
|
18
18
|
import { loadBacklogFlags } from "./order-backlog.server.js";
|
|
19
|
+
import { detectSource, hasProblem, invoiceRoute, isInvoicedDone, toProgressMember, } from "./order-progress.js";
|
|
20
|
+
import { loadInvoiceStatuses, loadPickProgress } from "./order-progress.server.js";
|
|
19
21
|
const FO_CAP = 20000;
|
|
20
22
|
const LOCAL_CAP = 5000;
|
|
21
23
|
const PROPOSAL_CAP = 2000;
|
|
@@ -339,14 +341,14 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
339
341
|
.order("created_at", { ascending: false })
|
|
340
342
|
.limit(LOCAL_CAP);
|
|
341
343
|
if (params.since && params.until) {
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
344
|
+
// order_date/delivery_date zijn tekst 'JJJJ-MM-DD': vergelijk met
|
|
345
|
+
// kalenderdagen (Amsterdam), halfopen. Een volledige ISO-tijd als grens
|
|
346
|
+
// liet '2026-10-26' toch door ('2026-10-26' < '2026-10-26T…').
|
|
347
|
+
const from = params.sinceDate ?? params.since.slice(0, 10);
|
|
348
|
+
const to = params.untilDate ?? params.until.slice(0, 10);
|
|
349
|
+
localQ = localQ
|
|
350
|
+
.gte(params.dateField === "delivery" ? "delivery_date" : "order_date", from)
|
|
351
|
+
.lt(params.dateField === "delivery" ? "delivery_date" : "order_date", to);
|
|
350
352
|
}
|
|
351
353
|
const localRes = await localQ;
|
|
352
354
|
if (localRes.error)
|
|
@@ -374,10 +376,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
374
376
|
.in("order_id", localIds.slice(0, 1000));
|
|
375
377
|
for (const s of (shipRows ?? [])) {
|
|
376
378
|
const key = String(s.order_id);
|
|
377
|
-
const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false };
|
|
379
|
+
const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false, shippedAt: null };
|
|
378
380
|
const st = String(s.status ?? "").toLowerCase();
|
|
379
381
|
if (s.shipped_at || st === "verzonden" || st === "shipped")
|
|
380
382
|
prev.shipped = true;
|
|
383
|
+
if (s.shipped_at && (!prev.shippedAt || String(s.shipped_at) > prev.shippedAt))
|
|
384
|
+
prev.shippedAt = String(s.shipped_at);
|
|
381
385
|
if (st === "gepickt" || st === "picked" || st === "gecontroleerd")
|
|
382
386
|
prev.picked = true;
|
|
383
387
|
shipmentStateByOrder.set(key, prev);
|
|
@@ -638,6 +642,19 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
638
642
|
isReservation: localRow ? !!localRow.is_reservation : false,
|
|
639
643
|
});
|
|
640
644
|
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
645
|
+
// Weergave: bron, klant-id, orders.id, factuurroute en verzendmoment.
|
|
646
|
+
dto.source = detectSource({
|
|
647
|
+
rowKind: "floriday",
|
|
648
|
+
orderSource: localRow?.order_source ?? "floriday",
|
|
649
|
+
cfSource: (localRow?.custom_fields ?? {})?.source ?? null,
|
|
650
|
+
});
|
|
651
|
+
dto.customerId = localRow?.customer_id ? String(localRow.customer_id) : null;
|
|
652
|
+
dto.orderRowId = localRow?.id ? String(localRow.id) : null;
|
|
653
|
+
dto.invoiceRoute = invoiceRoute({
|
|
654
|
+
floridaySalesOrderId: localRow?.floriday_sales_order_id ?? String(r.floriday_id ?? ""),
|
|
655
|
+
orderSource: localRow?.order_source ?? "floriday",
|
|
656
|
+
});
|
|
657
|
+
dto.shippedAt = shipState?.shippedAt ?? null;
|
|
641
658
|
dto.invoiceNote = localRow?.invoice_ready_note ?? null;
|
|
642
659
|
dto.floridayFulfilled = Boolean((localRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
643
660
|
dto.notReportedToFloriday = isNotReportedLocally(dto.stage, dto.floridayFulfilled);
|
|
@@ -800,6 +817,11 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
800
817
|
: undefined;
|
|
801
818
|
localOrders.push({
|
|
802
819
|
id: `local:${r.id}`,
|
|
820
|
+
source: detectSource({ rowKind: "order", orderSource: r.order_source ?? null, cfSource: cf?.source ?? null }),
|
|
821
|
+
customerId: customerId || null,
|
|
822
|
+
orderRowId: String(r.id),
|
|
823
|
+
invoiceRoute: invoiceRoute({ floridaySalesOrderId: r.floriday_sales_order_id ?? null, orderSource: r.order_source ?? null }),
|
|
824
|
+
shippedAt: shipmentStateByOrder.get(String(r.id))?.shippedAt ?? null,
|
|
803
825
|
mixedDeliveryDates: Boolean(r.custom_fields?.floriday_mixed_delivery_dates),
|
|
804
826
|
unlinkedProducts: unlinkedFloridayProducts(r),
|
|
805
827
|
orderNumber: centralOrderNumber(r.order_number),
|
|
@@ -1120,6 +1142,23 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1120
1142
|
});
|
|
1121
1143
|
await Promise.all([overviewTask, dismissalsTask, backlogTask]);
|
|
1122
1144
|
t.mark("12_engine");
|
|
1145
|
+
// 12i) Factuurstand (Facturatie) voor alle orders in de periode (nodig voor
|
|
1146
|
+
// de telling "Gefactureerd"), per 500 id's, hooguit 1,5 s. Pickvoortgang
|
|
1147
|
+
// komt pas na het pagineren, alleen voor de zichtbare rijen (14e).
|
|
1148
|
+
const features = { erpInvoices: false, pickProgress: false };
|
|
1149
|
+
if (!params.all && !params.localOrderId && all.length) {
|
|
1150
|
+
await t.time("12i_factuur", async () => {
|
|
1151
|
+
const ids = Array.from(new Set(all.map((o) => o.orderRowId).filter((v) => !!v)));
|
|
1152
|
+
const res = await loadInvoiceStatuses(supabase, ids);
|
|
1153
|
+
features.erpInvoices = res.available;
|
|
1154
|
+
warnings.push(...res.warnings);
|
|
1155
|
+
if (res.available)
|
|
1156
|
+
for (const o of all)
|
|
1157
|
+
if (o.orderRowId)
|
|
1158
|
+
o.erpInvoice = res.invoices.get(o.orderRowId) ?? null;
|
|
1159
|
+
});
|
|
1160
|
+
}
|
|
1161
|
+
const membersOf = (g) => g.map((m) => toProgressMember(m));
|
|
1123
1162
|
// 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
|
|
1124
1163
|
const search = (params.search ?? "").trim().toLowerCase();
|
|
1125
1164
|
const matchesSearch = (members) => !search ||
|
|
@@ -1142,6 +1181,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1142
1181
|
const isBacklogGroup = (members) => stageOf(members) === "topick" && members.some((m) => m.backlog);
|
|
1143
1182
|
// Verzonden in het ERP, nog niet afgemeld bij Floriday (eigen kenmerk).
|
|
1144
1183
|
const isNotReportedGroup = (members) => members.some((m) => m.notReportedToFloriday);
|
|
1184
|
+
// Gefactureerd: elke order klaar volgens zijn eigen route (ERP "verstuurd",
|
|
1185
|
+
// Floriday volledig afgemeld). Probleem: een blokkade (zie memberProblems).
|
|
1186
|
+
const isInvoicedGroup = (members) => stageOf(members) !== "cancelled" && isInvoicedDone(membersOf(members), features);
|
|
1187
|
+
const isProblemGroup = (members) => stageOf(members) !== "cancelled" && hasProblem(membersOf(members));
|
|
1145
1188
|
const matchesTab = (members) => {
|
|
1146
1189
|
if (params.tab === "all")
|
|
1147
1190
|
return true;
|
|
@@ -1149,12 +1192,12 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1149
1192
|
return isBacklogGroup(members);
|
|
1150
1193
|
if (params.tab === "not_reported")
|
|
1151
1194
|
return isNotReportedGroup(members);
|
|
1152
|
-
if (
|
|
1153
|
-
return
|
|
1154
|
-
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
return
|
|
1195
|
+
if (params.tab === "invoiced")
|
|
1196
|
+
return isInvoicedGroup(members);
|
|
1197
|
+
if (params.tab === "problem")
|
|
1198
|
+
return isProblemGroup(members);
|
|
1199
|
+
// "Te picken" toont alle te picken orders, ook te laat.
|
|
1200
|
+
return stageOf(members) === params.tab;
|
|
1158
1201
|
};
|
|
1159
1202
|
const withoutTab = groups.filter((g) => matchesSearch(g) && matchesStatusFilter(g));
|
|
1160
1203
|
const filteredGroups = withoutTab.filter(matchesTab);
|
|
@@ -1167,14 +1210,18 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1167
1210
|
shipped: 0,
|
|
1168
1211
|
cancelled: 0,
|
|
1169
1212
|
not_reported: 0,
|
|
1213
|
+
invoiced: 0,
|
|
1214
|
+
problem: 0,
|
|
1170
1215
|
};
|
|
1171
1216
|
for (const g of withoutTab) {
|
|
1172
1217
|
if (isNotReportedGroup(g))
|
|
1173
1218
|
statusCounts.not_reported++;
|
|
1174
|
-
if (isBacklogGroup(g))
|
|
1219
|
+
if (isBacklogGroup(g))
|
|
1175
1220
|
statusCounts.backlog++;
|
|
1176
|
-
|
|
1177
|
-
|
|
1221
|
+
if (isInvoicedGroup(g))
|
|
1222
|
+
statusCounts.invoiced++;
|
|
1223
|
+
if (isProblemGroup(g))
|
|
1224
|
+
statusCounts.problem++;
|
|
1178
1225
|
// Onbekende achterstand valt hier vanzelf terug onder "Te picken".
|
|
1179
1226
|
statusCounts[stageOf(g)]++;
|
|
1180
1227
|
}
|
|
@@ -1194,8 +1241,24 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1194
1241
|
const idFor = (o) => o.id.startsWith("local:")
|
|
1195
1242
|
? o.id.slice("local:".length)
|
|
1196
1243
|
: (localRowByFoId.get(o.id)?.id ? String(localRowByFoId.get(o.id).id) : null);
|
|
1244
|
+
// orders.id per zichtbare order (ook bij Floriday-orders), voor het factuurblok.
|
|
1245
|
+
for (const o of visible)
|
|
1246
|
+
o.orderRowId = idFor(o);
|
|
1197
1247
|
const ids = visible.map(idFor).filter((v) => !!v);
|
|
1198
1248
|
if (ids.length) {
|
|
1249
|
+
// Pickvoortgang alleen voor de zichtbare rijen (incl. bufferleden), max 1,5 s.
|
|
1250
|
+
if (!params.localOrderId)
|
|
1251
|
+
enrichTasks.push(t.time("14e_pickvoortgang", async () => {
|
|
1252
|
+
const res = await loadPickProgress(supabase, ids);
|
|
1253
|
+
features.pickProgress = res.available;
|
|
1254
|
+
warnings.push(...res.warnings);
|
|
1255
|
+
if (res.available)
|
|
1256
|
+
for (const o of visible) {
|
|
1257
|
+
const oid = idFor(o);
|
|
1258
|
+
if (oid)
|
|
1259
|
+
o.pickProgress = res.pick.get(oid) ?? null;
|
|
1260
|
+
}
|
|
1261
|
+
}));
|
|
1199
1262
|
// Ophaalmoment uit de Engine (nooit zelf rekenen).
|
|
1200
1263
|
enrichTasks.push(t.time("14a_vertrek", async () => {
|
|
1201
1264
|
try {
|
|
@@ -1344,6 +1407,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1344
1407
|
const ids = Array.from(new Set(g.flatMap((m) => m.floridayStatusIds ?? [])));
|
|
1345
1408
|
if (ids.length)
|
|
1346
1409
|
row.floridayStatusIds = ids;
|
|
1410
|
+
// Statusiconen: per order in de rij (na de verrijking, dus met vervoerder).
|
|
1411
|
+
row.progressMembers = membersOf(g);
|
|
1347
1412
|
return row;
|
|
1348
1413
|
});
|
|
1349
1414
|
// Totalen over de volledige gefilterde set (alle orders in elke buffer).
|
|
@@ -1360,6 +1425,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1360
1425
|
warnings,
|
|
1361
1426
|
truncated,
|
|
1362
1427
|
timing,
|
|
1428
|
+
features,
|
|
1363
1429
|
};
|
|
1364
1430
|
}
|
|
1365
1431
|
// Belading per productgroep: vaste referentiedata, 10 min in het servergeheugen.
|
|
@@ -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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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { monthRangeAms, periodRange, weekRange } from "./period-range.js";
|
|
1
2
|
// Client-safe mapping: jsonb cache row -> SalesOrderDTO used by the UI.
|
|
2
3
|
import { cratePackageName, loadCarrierName } from "./load-carrier-labels.js";
|
|
3
4
|
import { orderStageLabel } from "./order-status.js";
|
|
@@ -184,74 +185,34 @@ export function computeTotals(orders) {
|
|
|
184
185
|
return { revenue, avgPrice, fustCount, karCount, orderCount: orders.length };
|
|
185
186
|
}
|
|
186
187
|
// ISO-8601 weekbereik (maandag 00:00 t/m maandag erop 00:00, UTC).
|
|
188
|
+
/** ISO-week als halfopen [ma 00:00, volgende ma 00:00) in Europe/Amsterdam. */
|
|
187
189
|
export function isoWeekRange(week, year) {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
const jan4Dow = (jan4.getUTCDay() + 6) % 7; // ma=0..zo=6
|
|
191
|
-
const week1Monday = new Date(jan4);
|
|
192
|
-
week1Monday.setUTCDate(jan4.getUTCDate() - jan4Dow);
|
|
193
|
-
const start = new Date(week1Monday);
|
|
194
|
-
start.setUTCDate(week1Monday.getUTCDate() + (week - 1) * 7);
|
|
195
|
-
const end = new Date(start);
|
|
196
|
-
end.setUTCDate(start.getUTCDate() + 7);
|
|
197
|
-
return { start, end };
|
|
190
|
+
const r = weekRange(week, year);
|
|
191
|
+
return { start: new Date(r.since), end: new Date(r.until) };
|
|
198
192
|
}
|
|
193
|
+
/** Maand als halfopen interval in Europe/Amsterdam. */
|
|
199
194
|
export function monthRange(month, year) {
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
return { start, end };
|
|
203
|
-
}
|
|
204
|
-
function ymdToUtc(ymd) {
|
|
205
|
-
const [y, m, d] = ymd.split("-").map(Number);
|
|
206
|
-
return new Date(Date.UTC(y, (m ?? 1) - 1, d ?? 1));
|
|
207
|
-
}
|
|
208
|
-
function startOfTodayUtc() {
|
|
209
|
-
const now = new Date();
|
|
210
|
-
return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
|
|
195
|
+
const r = monthRangeAms(month, year);
|
|
196
|
+
return { start: new Date(r.since), end: new Date(r.until) };
|
|
211
197
|
}
|
|
212
198
|
export function applyFilters(orders, f) {
|
|
213
199
|
const dateField = f.dateField ?? "ordered";
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
const end = new Date(start);
|
|
224
|
-
end.setUTCDate(start.getUTCDate() + 1);
|
|
225
|
-
rangeStartIso = start.toISOString();
|
|
226
|
-
rangeEndIso = end.toISOString();
|
|
227
|
-
}
|
|
228
|
-
else if (f.period === "last7" || f.period === "last30") {
|
|
229
|
-
const days = f.period === "last7" ? 7 : 30;
|
|
230
|
-
const end = startOfTodayUtc();
|
|
231
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
232
|
-
const start = new Date(end);
|
|
233
|
-
start.setUTCDate(end.getUTCDate() - days);
|
|
234
|
-
rangeStartIso = start.toISOString();
|
|
235
|
-
rangeEndIso = end.toISOString();
|
|
236
|
-
}
|
|
237
|
-
else if (f.period === "custom" && f.customFrom && f.customTo) {
|
|
238
|
-
const start = ymdToUtc(f.customFrom);
|
|
239
|
-
const end = ymdToUtc(f.customTo);
|
|
240
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
241
|
-
rangeStartIso = start.toISOString();
|
|
242
|
-
rangeEndIso = end.toISOString();
|
|
243
|
-
}
|
|
244
|
-
else if (f.week && f.year) {
|
|
245
|
-
const { start, end } = isoWeekRange(f.week, f.year);
|
|
246
|
-
rangeStartIso = start.toISOString();
|
|
247
|
-
rangeEndIso = end.toISOString();
|
|
248
|
-
}
|
|
200
|
+
// Halfopen [start, eind) in Europe/Amsterdam (period-range.ts).
|
|
201
|
+
const range = periodRange(f);
|
|
202
|
+
const rangeStartMs = range ? new Date(range.since).getTime() : null;
|
|
203
|
+
const rangeEndMs = range ? new Date(range.until).getTime() : null;
|
|
204
|
+
/** Tijdstip van een datum of datum-tijd; een losse datum telt als 12:00 Amsterdam. */
|
|
205
|
+
const msOf = (v) => {
|
|
206
|
+
const t = /^\d{4}-\d{2}-\d{2}$/.test(v) ? new Date(`${v}T12:00:00Z`).getTime() : new Date(v).getTime();
|
|
207
|
+
return Number.isNaN(t) ? null : t;
|
|
208
|
+
};
|
|
249
209
|
return orders.filter((o) => {
|
|
250
210
|
const refDate = dateField === "delivery" ? o.deliveryAt : o.orderedAt;
|
|
251
|
-
if (
|
|
211
|
+
if (rangeStartMs != null && rangeEndMs != null) {
|
|
252
212
|
if (!refDate)
|
|
253
213
|
return false;
|
|
254
|
-
|
|
214
|
+
const ms = msOf(refDate);
|
|
215
|
+
if (ms == null || ms < rangeStartMs || ms >= rangeEndMs)
|
|
255
216
|
return false;
|
|
256
217
|
}
|
|
257
218
|
if (f.from && refDate < f.from)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-error.check.d.ts","sourceRoot":"","sources":["../../src/lib/session-error.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { isSessionError } from "./session-error.js";
|
|
2
|
+
const cases = [
|
|
3
|
+
[new Error("Ongeldig token: Auth session missing!"), true],
|
|
4
|
+
[{ status: 401, message: "x" }, true],
|
|
5
|
+
[new Error("Sessie nog niet beschikbaar"), true],
|
|
6
|
+
[new Error("statement timeout"), false],
|
|
7
|
+
[null, false],
|
|
8
|
+
];
|
|
9
|
+
let failed = 0;
|
|
10
|
+
for (const [e, want] of cases)
|
|
11
|
+
if (isSessionError(e) !== want) {
|
|
12
|
+
failed++;
|
|
13
|
+
console.error("FOUT", e, want);
|
|
14
|
+
}
|
|
15
|
+
if (failed)
|
|
16
|
+
process.exit(1);
|
|
17
|
+
console.log("Alle sessiecontroles geslaagd");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-error.d.ts","sourceRoot":"","sources":["../../src/lib/session-error.ts"],"names":[],"mappings":"AACA,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAMpD"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
// Herkent een verlopen of afgesloten inlogsessie in een foutmelding van de server.
|
|
2
|
+
export function isSessionError(err) {
|
|
3
|
+
const e = err;
|
|
4
|
+
if (!e)
|
|
5
|
+
return false;
|
|
6
|
+
if (e.status === 401)
|
|
7
|
+
return true;
|
|
8
|
+
const msg = typeof e.message === "string" ? e.message : String(err ?? "");
|
|
9
|
+
return /auth session missing|ongeldig token|sessie nog niet beschikbaar|geen authorization header|unauthorized|jwt expired/i.test(msg);
|
|
10
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/** Buffertelling van de Engine; null zolang onbekend of bij een oudere Engine. */
|
|
2
|
+
export declare function useBufferCarts(bufferId: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
|
|
3
|
+
carts: import("./buffer-carts.js").BufferCarts | null;
|
|
4
|
+
error: string | null;
|
|
5
|
+
}, Error>;
|
|
6
|
+
//# sourceMappingURL=useBufferCarts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useBufferCarts.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferCarts.ts"],"names":[],"mappings":"AAMA,kFAAkF;AAClF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;UASjE"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
3
|
+
import { getBufferCarts } from "./buffer-carts.functions.js";
|
|
4
|
+
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
5
|
+
/** Buffertelling van de Engine; null zolang onbekend of bij een oudere Engine. */
|
|
6
|
+
export function useBufferCarts(bufferId) {
|
|
7
|
+
const fetchFn = useServerFn(getBufferCarts);
|
|
8
|
+
const enabled = !!bufferId && UUID_RE.test(bufferId);
|
|
9
|
+
return useQuery({
|
|
10
|
+
queryKey: ["buffer-carts", bufferId],
|
|
11
|
+
enabled,
|
|
12
|
+
staleTime: 30000,
|
|
13
|
+
queryFn: () => fetchFn({ data: { bufferId: bufferId } }),
|
|
14
|
+
});
|
|
15
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type SalesOrderDTO, type SalesOrderFilters, type SalesOrdersTotals } from "./salesorders-mapping.js";
|
|
2
2
|
import type { OrderStage } from "./order-status.js";
|
|
3
|
-
|
|
3
|
+
import type { ProgressFeatures } from "./order-progress.js";
|
|
4
|
+
export type StatusTab = "all" | OrderStage | "backlog" | "not_reported" | "invoiced" | "problem";
|
|
4
5
|
export interface SalesOrdersPage {
|
|
5
6
|
orders: SalesOrderDTO[];
|
|
6
7
|
totalCount: number;
|
|
@@ -10,12 +11,15 @@ export interface SalesOrdersPage {
|
|
|
10
11
|
environment: "staging" | "live";
|
|
11
12
|
warnings: string[];
|
|
12
13
|
truncated: boolean;
|
|
14
|
+
features?: ProgressFeatures;
|
|
13
15
|
}
|
|
14
16
|
export interface SalesOrdersQueryOptions {
|
|
15
17
|
tab?: StatusTab;
|
|
16
18
|
page?: number;
|
|
17
19
|
pageSize?: number;
|
|
18
20
|
enabled?: boolean;
|
|
21
|
+
/** Automatisch verversen (ms), alleen bij zichtbaar tabblad. */
|
|
22
|
+
autoRefreshMs?: number;
|
|
19
23
|
}
|
|
20
24
|
/**
|
|
21
25
|
* Bepaal het serverside periode-venster op basis van de UI-filters.
|
|
@@ -24,7 +28,12 @@ export interface SalesOrdersQueryOptions {
|
|
|
24
28
|
export declare function derivePeriodWindow(filters?: SalesOrderFilters): {
|
|
25
29
|
since?: string;
|
|
26
30
|
until?: string;
|
|
31
|
+
sinceDate?: string;
|
|
32
|
+
untilDate?: string;
|
|
27
33
|
dateField: "ordered" | "delivery";
|
|
28
34
|
};
|
|
29
|
-
export declare function useSalesOrdersQuery(filters?: SalesOrderFilters, options?: SalesOrdersQueryOptions): import("@tanstack/react-query").UseQueryResult<SalesOrdersPage, Error
|
|
35
|
+
export declare function useSalesOrdersQuery(filters?: SalesOrderFilters, options?: SalesOrdersQueryOptions): import("@tanstack/react-query").UseQueryResult<SalesOrdersPage, Error> & {
|
|
36
|
+
stale: boolean;
|
|
37
|
+
lastSuccessAt: number | null;
|
|
38
|
+
};
|
|
30
39
|
//# sourceMappingURL=useSalesOrdersQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,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,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG;IAC/D,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;CACnC,CAOA;AAED,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,uBAAuB;;;EA+HlC"}
|