@flowselections/floriday-verkoop-module 1.0.138 → 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 +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 +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/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 +81 -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
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
import type { OrderStage } from "./order-status.js";
|
|
2
|
+
/** Bronsleutel voor het broniconen-overzicht (SOURCE_META). */
|
|
3
|
+
export type SourceKey = "mailbox" | "manual" | "offer" | "floriday" | (string & {});
|
|
4
|
+
/**
|
|
5
|
+
* Bron van een order uit de bestaande gegevens, nooit uit het voorvoegsel
|
|
6
|
+
* van het ordernummer:
|
|
7
|
+
* - rijtype "mailbox-proposal" of custom_fields.source/order_source in de
|
|
8
|
+
* mailboxlijst → "mailbox";
|
|
9
|
+
* - een Floriday-rij of order_source 'floriday' → "floriday";
|
|
10
|
+
* - anders order_source zoals vastgelegd ('manual', 'offer', …).
|
|
11
|
+
*/
|
|
12
|
+
export declare function detectSource(input: {
|
|
13
|
+
rowKind?: "order" | "proposal" | "floriday" | null;
|
|
14
|
+
orderSource?: string | null;
|
|
15
|
+
cfSource?: string | null;
|
|
16
|
+
}): SourceKey;
|
|
17
|
+
export type InvoiceRoute = "floriday" | "erp";
|
|
18
|
+
/**
|
|
19
|
+
* Factuurroute, gelijk aan de regel van Facturatie (autoInvoice):
|
|
20
|
+
* floriday_sales_order_id gevuld of order_source = 'floriday' → Floriday
|
|
21
|
+
* (factuur via Royal FloraHolland), anders → ERP.
|
|
22
|
+
*/
|
|
23
|
+
export declare function invoiceRoute(input: {
|
|
24
|
+
floridaySalesOrderId?: string | null;
|
|
25
|
+
orderSource?: string | null;
|
|
26
|
+
}): InvoiceRoute;
|
|
27
|
+
export interface PickProgress {
|
|
28
|
+
cartsTotal: number | null;
|
|
29
|
+
cartsPrinted: number | null;
|
|
30
|
+
cartsScanned: number | null;
|
|
31
|
+
firstPrintedAt: string | null;
|
|
32
|
+
lastScannedAt: string | null;
|
|
33
|
+
pickDate: string | null;
|
|
34
|
+
blocked: boolean;
|
|
35
|
+
blockedReason: string | null;
|
|
36
|
+
archived: boolean;
|
|
37
|
+
}
|
|
38
|
+
export interface ErpInvoiceInfo {
|
|
39
|
+
number: string | null;
|
|
40
|
+
status: string | null;
|
|
41
|
+
statusGroup: string | null;
|
|
42
|
+
sentAt: string | null;
|
|
43
|
+
sentTo: string | null;
|
|
44
|
+
total: number | null;
|
|
45
|
+
lastError: string | null;
|
|
46
|
+
}
|
|
47
|
+
/** Eén order zoals de statusiconen hem nodig hebben (ook binnen een buffer). */
|
|
48
|
+
export interface ProgressMember {
|
|
49
|
+
orderNumber: string;
|
|
50
|
+
source: SourceKey;
|
|
51
|
+
customerName: string;
|
|
52
|
+
customerId: string | null;
|
|
53
|
+
cancelled: boolean;
|
|
54
|
+
stage: OrderStage;
|
|
55
|
+
isReservation: boolean;
|
|
56
|
+
isProposal: boolean;
|
|
57
|
+
orderedAt: string | null;
|
|
58
|
+
customerReference: string | null;
|
|
59
|
+
backlog: boolean;
|
|
60
|
+
problems: string[];
|
|
61
|
+
/** Prijs ontbreekt (hoort bij het factuuricoon, alleen route ERP). */
|
|
62
|
+
missingPrice: boolean;
|
|
63
|
+
controlledAt: string | null;
|
|
64
|
+
pickDate: string | null;
|
|
65
|
+
pickProgress: PickProgress | null;
|
|
66
|
+
carrierName: string | null;
|
|
67
|
+
shippedAt: string | null;
|
|
68
|
+
invoiceRoute: InvoiceRoute;
|
|
69
|
+
erpInvoice: ErpInvoiceInfo | null;
|
|
70
|
+
invoiceState: string | null;
|
|
71
|
+
floridayTotal: number;
|
|
72
|
+
floridayDone: number;
|
|
73
|
+
isPaid: boolean;
|
|
74
|
+
}
|
|
75
|
+
/** Welke leesfuncties van andere modules beschikbaar waren. */
|
|
76
|
+
export interface ProgressFeatures {
|
|
77
|
+
erpInvoices: boolean;
|
|
78
|
+
pickProgress: boolean;
|
|
79
|
+
}
|
|
80
|
+
/** Minimale vorm van een lijstrij waaruit een ProgressMember wordt opgebouwd. */
|
|
81
|
+
export interface ProgressSourceRow {
|
|
82
|
+
orderNumber?: string;
|
|
83
|
+
source?: SourceKey | null;
|
|
84
|
+
customer?: {
|
|
85
|
+
name?: string;
|
|
86
|
+
} | null;
|
|
87
|
+
customerId?: string | null;
|
|
88
|
+
stage?: OrderStage;
|
|
89
|
+
isReservation?: boolean;
|
|
90
|
+
orderedAt?: string;
|
|
91
|
+
customerReference?: string | null;
|
|
92
|
+
backlog?: boolean;
|
|
93
|
+
karUnknown?: boolean;
|
|
94
|
+
needsManualReview?: {
|
|
95
|
+
reason: string;
|
|
96
|
+
} | null;
|
|
97
|
+
missingPrice?: boolean;
|
|
98
|
+
unlinkedProducts?: {
|
|
99
|
+
name: string;
|
|
100
|
+
}[];
|
|
101
|
+
status?: {
|
|
102
|
+
controlledAt?: string | null;
|
|
103
|
+
isInvoiced?: boolean;
|
|
104
|
+
} | null;
|
|
105
|
+
pickDate?: string | null;
|
|
106
|
+
pickProgress?: PickProgress | null;
|
|
107
|
+
carrierName?: string | null;
|
|
108
|
+
shippedAt?: string | null;
|
|
109
|
+
invoiceRoute?: InvoiceRoute;
|
|
110
|
+
erpInvoice?: ErpInvoiceInfo | null;
|
|
111
|
+
invoiceState?: string | null;
|
|
112
|
+
floridayIds?: string[];
|
|
113
|
+
floridayFulfilled?: boolean;
|
|
114
|
+
floridayExternalFulfilledIds?: string[];
|
|
115
|
+
id?: string;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Blokkades voor het Gepickt-icoon ("fout"), alleen deze vlaggen:
|
|
119
|
+
* karUnknown, needsManualReview, unlinkedProducts, en blocked
|
|
120
|
+
* uit logistics_order_pick_progress (zodra de Engine die levert).
|
|
121
|
+
*/
|
|
122
|
+
export declare function memberProblems(row: ProgressSourceRow): string[];
|
|
123
|
+
export declare function toProgressMember(row: ProgressSourceRow): ProgressMember;
|
|
124
|
+
export type StepState = "done" | "todo" | "late" | "error" | "attention" | "hidden";
|
|
125
|
+
export declare const memberReceived: (m: ProgressMember) => boolean;
|
|
126
|
+
export declare const memberPicked: (m: ProgressMember) => boolean;
|
|
127
|
+
export declare const memberShipped: (m: ProgressMember) => boolean;
|
|
128
|
+
/** Factuurstand per order volgens zijn eigen route. */
|
|
129
|
+
export declare function memberInvoice(m: ProgressMember, f: ProgressFeatures): StepState;
|
|
130
|
+
/** Telt mee voor het tabblad "Gefactureerd": elke order klaar volgens zijn route. */
|
|
131
|
+
export declare function isInvoicedDone(members: ProgressMember[], f: ProgressFeatures): boolean;
|
|
132
|
+
export interface RowSteps {
|
|
133
|
+
received: StepState;
|
|
134
|
+
picked: StepState;
|
|
135
|
+
shipped: StepState;
|
|
136
|
+
invoiced: StepState;
|
|
137
|
+
}
|
|
138
|
+
/** De vier iconen van één rij: pas "gedaan" als het voor álle orders gedaan is. */
|
|
139
|
+
export declare function rowSteps(members: ProgressMember[], f: ProgressFeatures): RowSteps;
|
|
140
|
+
/** Open order: niet verzonden en niet geannuleerd. */
|
|
141
|
+
export declare const memberOpen: (m: ProgressMember) => boolean;
|
|
142
|
+
/**
|
|
143
|
+
* Rij met een probleem (KPI "probleem"): alleen open orders, met een
|
|
144
|
+
* blokkade vóór het picken of een ontbrekende prijs op route ERP.
|
|
145
|
+
*/
|
|
146
|
+
export declare const hasProblem: (members: ProgressMember[]) => boolean;
|
|
147
|
+
/** Tooltipregels per order: eerste 5 en "+n meer" bij meer dan 6. */
|
|
148
|
+
export declare function limitMembers<T>(list: T[]): {
|
|
149
|
+
shown: T[];
|
|
150
|
+
more: number;
|
|
151
|
+
};
|
|
152
|
+
/** "1 artikel" / "2 artikelen". */
|
|
153
|
+
export declare const articlesLabel: (n: number) => string;
|
|
154
|
+
//# sourceMappingURL=order-progress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-progress.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
const MAILBOX_SOURCES = new Set([
|
|
2
|
+
"mailbox",
|
|
3
|
+
"mailbox_order",
|
|
4
|
+
"mailbox-bestellingen",
|
|
5
|
+
"mailbox_bestellingen",
|
|
6
|
+
"mail",
|
|
7
|
+
"email",
|
|
8
|
+
"email_order",
|
|
9
|
+
]);
|
|
10
|
+
/**
|
|
11
|
+
* Bron van een order uit de bestaande gegevens, nooit uit het voorvoegsel
|
|
12
|
+
* van het ordernummer:
|
|
13
|
+
* - rijtype "mailbox-proposal" of custom_fields.source/order_source in de
|
|
14
|
+
* mailboxlijst → "mailbox";
|
|
15
|
+
* - een Floriday-rij of order_source 'floriday' → "floriday";
|
|
16
|
+
* - anders order_source zoals vastgelegd ('manual', 'offer', …).
|
|
17
|
+
*/
|
|
18
|
+
export function detectSource(input) {
|
|
19
|
+
if (input.rowKind === "proposal")
|
|
20
|
+
return "mailbox";
|
|
21
|
+
const cf = String(input.cfSource ?? "").trim().toLowerCase();
|
|
22
|
+
const os = String(input.orderSource ?? "").trim().toLowerCase();
|
|
23
|
+
if (MAILBOX_SOURCES.has(cf) || MAILBOX_SOURCES.has(os))
|
|
24
|
+
return "mailbox";
|
|
25
|
+
if (input.rowKind === "floriday" || os === "floriday")
|
|
26
|
+
return "floriday";
|
|
27
|
+
if (os)
|
|
28
|
+
return os;
|
|
29
|
+
return "manual";
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Factuurroute, gelijk aan de regel van Facturatie (autoInvoice):
|
|
33
|
+
* floriday_sales_order_id gevuld of order_source = 'floriday' → Floriday
|
|
34
|
+
* (factuur via Royal FloraHolland), anders → ERP.
|
|
35
|
+
*/
|
|
36
|
+
export function invoiceRoute(input) {
|
|
37
|
+
if (input.floridaySalesOrderId && String(input.floridaySalesOrderId).trim())
|
|
38
|
+
return "floriday";
|
|
39
|
+
if (String(input.orderSource ?? "").trim().toLowerCase() === "floriday")
|
|
40
|
+
return "floriday";
|
|
41
|
+
return "erp";
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Blokkades voor het Gepickt-icoon ("fout"), alleen deze vlaggen:
|
|
45
|
+
* karUnknown, needsManualReview, unlinkedProducts, en blocked
|
|
46
|
+
* uit logistics_order_pick_progress (zodra de Engine die levert).
|
|
47
|
+
*/
|
|
48
|
+
export function memberProblems(row) {
|
|
49
|
+
if (row.stage === "cancelled")
|
|
50
|
+
return [];
|
|
51
|
+
const out = [];
|
|
52
|
+
if (row.pickProgress?.blocked)
|
|
53
|
+
out.push(row.pickProgress.blockedReason || "Kan niet worden ingedeeld");
|
|
54
|
+
if (row.karUnknown)
|
|
55
|
+
out.push("Karren nog niet bekend");
|
|
56
|
+
if (row.needsManualReview)
|
|
57
|
+
out.push(row.needsManualReview.reason || "Handmatige beoordeling nodig");
|
|
58
|
+
if ((row.unlinkedProducts?.length ?? 0) > 0) {
|
|
59
|
+
out.push(`Artikel niet gekoppeld: ${row.unlinkedProducts.map((u) => u.name).join(", ")}`);
|
|
60
|
+
}
|
|
61
|
+
return out;
|
|
62
|
+
}
|
|
63
|
+
export function toProgressMember(row) {
|
|
64
|
+
const stage = row.stage ?? "incoming";
|
|
65
|
+
const route = row.invoiceRoute ?? "erp";
|
|
66
|
+
const ids = row.floridayIds ?? [];
|
|
67
|
+
const floridayTotal = route === "floriday" ? Math.max(1, ids.length) : 0;
|
|
68
|
+
const external = new Set(row.floridayExternalFulfilledIds ?? []);
|
|
69
|
+
const floridayDone = route !== "floriday"
|
|
70
|
+
? 0
|
|
71
|
+
: row.floridayFulfilled
|
|
72
|
+
? floridayTotal
|
|
73
|
+
: Math.min(floridayTotal, ids.filter((id) => external.has(id)).length);
|
|
74
|
+
return {
|
|
75
|
+
orderNumber: row.orderNumber || "—",
|
|
76
|
+
source: row.source ?? "manual",
|
|
77
|
+
customerName: row.customer?.name ?? "",
|
|
78
|
+
customerId: row.customerId ?? null,
|
|
79
|
+
cancelled: stage === "cancelled",
|
|
80
|
+
stage,
|
|
81
|
+
isReservation: !!row.isReservation,
|
|
82
|
+
isProposal: !!row.id?.startsWith("mailbox-proposal:"),
|
|
83
|
+
orderedAt: row.orderedAt || null,
|
|
84
|
+
customerReference: row.customerReference ?? null,
|
|
85
|
+
backlog: !!row.backlog,
|
|
86
|
+
problems: memberProblems(row),
|
|
87
|
+
missingPrice: stage !== "cancelled" && !!row.missingPrice,
|
|
88
|
+
controlledAt: row.status?.controlledAt ?? null,
|
|
89
|
+
pickDate: row.pickProgress?.pickDate ?? row.pickDate ?? null,
|
|
90
|
+
pickProgress: row.pickProgress ?? null,
|
|
91
|
+
carrierName: row.carrierName ?? null,
|
|
92
|
+
shippedAt: row.shippedAt ?? null,
|
|
93
|
+
invoiceRoute: route,
|
|
94
|
+
erpInvoice: row.erpInvoice ?? null,
|
|
95
|
+
invoiceState: row.invoiceState ?? null,
|
|
96
|
+
floridayTotal,
|
|
97
|
+
floridayDone,
|
|
98
|
+
isPaid: route === "floriday" && row.status?.isInvoiced === true,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
export const memberReceived = (m) => !m.isReservation && !m.isProposal;
|
|
102
|
+
export const memberPicked = (m) => !!m.controlledAt || m.stage === "picked" || m.stage === "shipped";
|
|
103
|
+
export const memberShipped = (m) => m.stage === "shipped";
|
|
104
|
+
/** Factuurstand per order volgens zijn eigen route. */
|
|
105
|
+
export function memberInvoice(m, f) {
|
|
106
|
+
if (m.invoiceRoute === "floriday") {
|
|
107
|
+
if (m.floridayTotal > 0 && m.floridayDone >= m.floridayTotal)
|
|
108
|
+
return "done";
|
|
109
|
+
if (m.stage === "shipped")
|
|
110
|
+
return "attention";
|
|
111
|
+
return "todo";
|
|
112
|
+
}
|
|
113
|
+
if (!f.erpInvoices)
|
|
114
|
+
return m.missingPrice ? "attention" : "hidden";
|
|
115
|
+
const g = m.erpInvoice?.statusGroup ?? null;
|
|
116
|
+
if (g === "verstuurd")
|
|
117
|
+
return "done";
|
|
118
|
+
if (g === "aandacht")
|
|
119
|
+
return "attention";
|
|
120
|
+
if (m.missingPrice)
|
|
121
|
+
return "attention";
|
|
122
|
+
return "todo";
|
|
123
|
+
}
|
|
124
|
+
/** Telt mee voor het tabblad "Gefactureerd": elke order klaar volgens zijn route. */
|
|
125
|
+
export function isInvoicedDone(members, f) {
|
|
126
|
+
const active = members.filter((m) => !m.cancelled);
|
|
127
|
+
return active.length > 0 && active.every((m) => memberInvoice(m, f) === "done");
|
|
128
|
+
}
|
|
129
|
+
/** De vier iconen van één rij: pas "gedaan" als het voor álle orders gedaan is. */
|
|
130
|
+
export function rowSteps(members, f) {
|
|
131
|
+
const list = members.filter((m) => !m.cancelled);
|
|
132
|
+
const all = (fn) => list.length > 0 && list.every(fn);
|
|
133
|
+
const received = all(memberReceived) ? "done" : "todo";
|
|
134
|
+
// "Fout" alleen zolang een order nog niet gepickt is; gepickt/verzonden is
|
|
135
|
+
// gewoon gedaan. Deels gepickt in een buffer = "nog niet" (geen stip).
|
|
136
|
+
let picked = all(memberPicked) ? "done" : "todo";
|
|
137
|
+
if (picked !== "done") {
|
|
138
|
+
if (list.some((m) => !memberPicked(m) && m.problems.length > 0))
|
|
139
|
+
picked = "error";
|
|
140
|
+
else if (list.some((m) => m.backlog && !memberPicked(m)))
|
|
141
|
+
picked = "late";
|
|
142
|
+
}
|
|
143
|
+
const shipped = all(memberShipped) ? "done" : "todo";
|
|
144
|
+
const inv = list.map((m) => memberInvoice(m, f));
|
|
145
|
+
let invoiced;
|
|
146
|
+
if (inv.length === 0 || inv.every((s) => s === "hidden"))
|
|
147
|
+
invoiced = "hidden";
|
|
148
|
+
else if (inv.every((s) => s === "done"))
|
|
149
|
+
invoiced = "done";
|
|
150
|
+
else if (inv.some((s) => s === "attention"))
|
|
151
|
+
invoiced = "attention";
|
|
152
|
+
else
|
|
153
|
+
invoiced = "todo";
|
|
154
|
+
return { received, picked, shipped, invoiced };
|
|
155
|
+
}
|
|
156
|
+
/** Open order: niet verzonden en niet geannuleerd. */
|
|
157
|
+
export const memberOpen = (m) => !m.cancelled && m.stage !== "shipped";
|
|
158
|
+
/**
|
|
159
|
+
* Rij met een probleem (KPI "probleem"): alleen open orders, met een
|
|
160
|
+
* blokkade vóór het picken of een ontbrekende prijs op route ERP.
|
|
161
|
+
*/
|
|
162
|
+
export const hasProblem = (members) => members.some((m) => memberOpen(m) &&
|
|
163
|
+
((m.problems.length > 0 && !memberPicked(m)) || (m.missingPrice && m.invoiceRoute === "erp")));
|
|
164
|
+
/** Tooltipregels per order: eerste 5 en "+n meer" bij meer dan 6. */
|
|
165
|
+
export function limitMembers(list) {
|
|
166
|
+
if (list.length <= 6)
|
|
167
|
+
return { shown: list, more: 0 };
|
|
168
|
+
return { shown: list.slice(0, 5), more: list.length - 5 };
|
|
169
|
+
}
|
|
170
|
+
/** "1 artikel" / "2 artikelen". */
|
|
171
|
+
export const articlesLabel = (n) => `${n} ${n === 1 ? "artikel" : "artikelen"}`;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { ErpInvoiceInfo, PickProgress } from "./order-progress.js";
|
|
2
|
+
type RpcClient = {
|
|
3
|
+
rpc: (fn: any, args?: any) => any;
|
|
4
|
+
};
|
|
5
|
+
export interface InvoicePickResult {
|
|
6
|
+
invoices: Map<string, ErpInvoiceInfo>;
|
|
7
|
+
pick: Map<string, PickProgress>;
|
|
8
|
+
erpAvailable: boolean;
|
|
9
|
+
pickAvailable: boolean;
|
|
10
|
+
warnings: string[];
|
|
11
|
+
}
|
|
12
|
+
/** Tijdslimiet per verrijkingsstap: daarna valt dat onderdeel terug. */
|
|
13
|
+
export declare const ENRICH_TIMEOUT_MS = 1500;
|
|
14
|
+
/**
|
|
15
|
+
* Wacht hooguit `ms` op `p`. Te laat → `{ timedOut: true }`; het verzoek
|
|
16
|
+
* loopt op de achtergrond af, maar de lijst wacht er niet meer op.
|
|
17
|
+
*/
|
|
18
|
+
export declare function withTimeout<T>(p: Promise<T>, ms?: number): Promise<{
|
|
19
|
+
value: T;
|
|
20
|
+
timedOut: false;
|
|
21
|
+
} | {
|
|
22
|
+
timedOut: true;
|
|
23
|
+
}>;
|
|
24
|
+
export interface InvoiceResult {
|
|
25
|
+
invoices: Map<string, ErpInvoiceInfo>;
|
|
26
|
+
available: boolean;
|
|
27
|
+
warnings: string[];
|
|
28
|
+
}
|
|
29
|
+
export interface PickResult {
|
|
30
|
+
pick: Map<string, PickProgress>;
|
|
31
|
+
available: boolean;
|
|
32
|
+
warnings: string[];
|
|
33
|
+
}
|
|
34
|
+
/** Factuurstand (Facturatie) voor de opgegeven orders, met tijdslimiet. */
|
|
35
|
+
export declare function loadInvoiceStatuses(client: RpcClient, orderIds: string[], ms?: number): Promise<InvoiceResult>;
|
|
36
|
+
/** Pickvoortgang (Engine) — alleen voor de zichtbare rijen + bufferleden. */
|
|
37
|
+
export declare function loadPickProgress(client: RpcClient, orderIds: string[], ms?: number): Promise<PickResult>;
|
|
38
|
+
/** Oude samengestelde aanroep (blijft bestaan voor bestaande gebruikers). */
|
|
39
|
+
export declare function loadInvoiceAndPickProgress(client: RpcClient, orderIds: string[]): Promise<InvoicePickResult>;
|
|
40
|
+
export {};
|
|
41
|
+
//# sourceMappingURL=order-progress.server.d.ts.map
|
|
@@ -0,0 +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;CACpB;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,CA2B/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"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
// Leest per order de factuurstand (Facturatie: erp_invoice_status_for_orders)
|
|
2
|
+
// en de pickvoortgang (Engine: logistics_order_pick_progress), elk per 500
|
|
3
|
+
// id's en tegelijk. Alleen lezen. Ontbreekt een functie (module niet
|
|
4
|
+
// geïnstalleerd) of mag de gebruiker hem niet aanroepen, dan is dat onderdeel
|
|
5
|
+
// "niet beschikbaar": ontbrekende functie geeft een korte melding, geen recht geeft geen melding; andere fouten geven een melding en het
|
|
6
|
+
// onderdeel verdwijnt. De lijst laadt altijd door.
|
|
7
|
+
import { rpcErrorKind } from "./erp-invoice-view.js";
|
|
8
|
+
const CHUNK = 500;
|
|
9
|
+
const num = (v) => {
|
|
10
|
+
if (v == null || v === "")
|
|
11
|
+
return null;
|
|
12
|
+
const n = Number(v);
|
|
13
|
+
return Number.isFinite(n) ? n : null;
|
|
14
|
+
};
|
|
15
|
+
const str = (v) => (v == null || v === "" ? null : String(v));
|
|
16
|
+
async function inChunks(client, fn, ids) {
|
|
17
|
+
const rows = [];
|
|
18
|
+
for (let i = 0; i < ids.length; i += CHUNK) {
|
|
19
|
+
let res;
|
|
20
|
+
try {
|
|
21
|
+
res = await client.rpc(fn, { p_order_ids: ids.slice(i, i + CHUNK) });
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
return { rows: [], available: false, warning: e?.message ?? String(e) };
|
|
25
|
+
}
|
|
26
|
+
if (res.error) {
|
|
27
|
+
const kind = rpcErrorKind(res.error);
|
|
28
|
+
if (kind === "forbidden")
|
|
29
|
+
return { rows: [], available: false, warning: null };
|
|
30
|
+
if (kind === "missing")
|
|
31
|
+
return { rows: [], available: false, warning: "missing" };
|
|
32
|
+
return { rows: [], available: false, warning: String(res.error.message ?? res.error.code ?? "onbekende fout") };
|
|
33
|
+
}
|
|
34
|
+
if (Array.isArray(res.data))
|
|
35
|
+
rows.push(...res.data);
|
|
36
|
+
}
|
|
37
|
+
return { rows, available: true, warning: null };
|
|
38
|
+
}
|
|
39
|
+
/** Tijdslimiet per verrijkingsstap: daarna valt dat onderdeel terug. */
|
|
40
|
+
export const ENRICH_TIMEOUT_MS = 1500;
|
|
41
|
+
/**
|
|
42
|
+
* Wacht hooguit `ms` op `p`. Te laat → `{ timedOut: true }`; het verzoek
|
|
43
|
+
* loopt op de achtergrond af, maar de lijst wacht er niet meer op.
|
|
44
|
+
*/
|
|
45
|
+
export async function withTimeout(p, ms = ENRICH_TIMEOUT_MS) {
|
|
46
|
+
let timer;
|
|
47
|
+
const timeout = new Promise((resolve) => {
|
|
48
|
+
timer = setTimeout(() => resolve({ timedOut: true }), ms);
|
|
49
|
+
});
|
|
50
|
+
try {
|
|
51
|
+
return await Promise.race([p.then((value) => ({ value, timedOut: false })), timeout]);
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
if (timer)
|
|
55
|
+
clearTimeout(timer);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
/** Factuurstand (Facturatie) voor de opgegeven orders, met tijdslimiet. */
|
|
59
|
+
export async function loadInvoiceStatuses(client, orderIds, ms = ENRICH_TIMEOUT_MS) {
|
|
60
|
+
const ids = Array.from(new Set(orderIds.filter(Boolean)));
|
|
61
|
+
const out = { invoices: new Map(), available: false, warnings: [] };
|
|
62
|
+
if (!ids.length)
|
|
63
|
+
return out;
|
|
64
|
+
const r = await withTimeout(inChunks(client, "erp_invoice_status_for_orders", ids), ms);
|
|
65
|
+
if (r.timedOut) {
|
|
66
|
+
out.warnings.push(`Factuurstand kwam niet binnen ${ms / 1000} s; het factuuricoon toont de gewone weergave.`);
|
|
67
|
+
return out;
|
|
68
|
+
}
|
|
69
|
+
const inv = r.value;
|
|
70
|
+
out.available = inv.available;
|
|
71
|
+
if (inv.warning === "missing")
|
|
72
|
+
out.warnings.push("Factuurstand is niet beschikbaar (Facturatie-module ontbreekt of is te oud); het factuuricoon is verborgen voor ERP-orders.");
|
|
73
|
+
else if (inv.warning)
|
|
74
|
+
out.warnings.push(`Factuurstand niet geladen: ${inv.warning}`);
|
|
75
|
+
for (const row of inv.rows) {
|
|
76
|
+
const id = str(row?.order_id);
|
|
77
|
+
if (!id || !row?.invoice_id)
|
|
78
|
+
continue;
|
|
79
|
+
out.invoices.set(id, {
|
|
80
|
+
number: str(row.invoice_number),
|
|
81
|
+
status: str(row.status),
|
|
82
|
+
statusGroup: str(row.status_group),
|
|
83
|
+
sentAt: str(row.sent_at),
|
|
84
|
+
sentTo: str(row.sent_to),
|
|
85
|
+
total: num(row.total_incl),
|
|
86
|
+
lastError: str(row.last_error_plain),
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
return out;
|
|
90
|
+
}
|
|
91
|
+
/** Pickvoortgang (Engine) — alleen voor de zichtbare rijen + bufferleden. */
|
|
92
|
+
export async function loadPickProgress(client, orderIds, ms = ENRICH_TIMEOUT_MS) {
|
|
93
|
+
const ids = Array.from(new Set(orderIds.filter(Boolean)));
|
|
94
|
+
const out = { pick: new Map(), available: false, warnings: [] };
|
|
95
|
+
if (!ids.length)
|
|
96
|
+
return out;
|
|
97
|
+
const r = await withTimeout(inChunks(client, "logistics_order_pick_progress", ids), ms);
|
|
98
|
+
if (r.timedOut) {
|
|
99
|
+
out.warnings.push(`Pickvoortgang kwam niet binnen ${ms / 1000} s; het Gepickt-icoon toont de gewone weergave.`);
|
|
100
|
+
return out;
|
|
101
|
+
}
|
|
102
|
+
const pick = r.value;
|
|
103
|
+
out.available = pick.available;
|
|
104
|
+
if (pick.warning === "missing")
|
|
105
|
+
out.warnings.push("Pickvoortgang is nog niet beschikbaar (Logistiek Engine 1.0.222 nodig); karren in de tooltip worden niet getoond.");
|
|
106
|
+
else if (pick.warning)
|
|
107
|
+
out.warnings.push(`Pickvoortgang niet geladen: ${pick.warning}`);
|
|
108
|
+
for (const row of pick.rows) {
|
|
109
|
+
const id = str(row?.order_uuid ?? row?.order_id);
|
|
110
|
+
if (!id)
|
|
111
|
+
continue;
|
|
112
|
+
out.pick.set(id, {
|
|
113
|
+
cartsTotal: num(row.carts_total),
|
|
114
|
+
cartsPrinted: num(row.carts_printed),
|
|
115
|
+
cartsScanned: num(row.carts_scanned),
|
|
116
|
+
firstPrintedAt: str(row.first_printed_at),
|
|
117
|
+
lastScannedAt: str(row.last_scanned_at),
|
|
118
|
+
pickDate: str(row.pick_date),
|
|
119
|
+
blocked: row.blocked === true,
|
|
120
|
+
blockedReason: str(row.blocked_reason_plain),
|
|
121
|
+
archived: row.carts_archived === true,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
return out;
|
|
125
|
+
}
|
|
126
|
+
/** Oude samengestelde aanroep (blijft bestaan voor bestaande gebruikers). */
|
|
127
|
+
export async function loadInvoiceAndPickProgress(client, orderIds) {
|
|
128
|
+
const [inv, pick] = await Promise.all([loadInvoiceStatuses(client, orderIds), loadPickProgress(client, orderIds)]);
|
|
129
|
+
return {
|
|
130
|
+
invoices: inv.invoices,
|
|
131
|
+
pick: pick.pick,
|
|
132
|
+
erpAvailable: inv.available,
|
|
133
|
+
pickAvailable: pick.available,
|
|
134
|
+
warnings: [...inv.warnings, ...pick.warnings],
|
|
135
|
+
};
|
|
136
|
+
}
|
|
@@ -19,9 +19,9 @@ export function orderStageBadgeClass(stage) {
|
|
|
19
19
|
case "shipped":
|
|
20
20
|
return "bg-primary/10 text-primary";
|
|
21
21
|
case "picked":
|
|
22
|
-
return "bg-
|
|
22
|
+
return "bg-success-soft text-success-soft-foreground";
|
|
23
23
|
case "topick":
|
|
24
|
-
return "bg-
|
|
24
|
+
return "bg-warning-soft text-warning-soft-foreground";
|
|
25
25
|
default:
|
|
26
26
|
return "bg-muted text-muted-foreground";
|
|
27
27
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"period-range.check.d.ts","sourceRoot":"","sources":["../../src/lib/period-range.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
// Draai: bun src/lib/period-range.check.ts
|
|
2
|
+
import { amsterdamYmd, isoWeekOf, periodFromSearch, periodRange, periodToSearch, shiftPeriod, weekRange, dayRange, monthRangeAms, } from "./period-range.js";
|
|
3
|
+
let failed = 0;
|
|
4
|
+
function check(name, got, want) {
|
|
5
|
+
const g = JSON.stringify(got), w = JSON.stringify(want);
|
|
6
|
+
const ok = g === w;
|
|
7
|
+
if (!ok)
|
|
8
|
+
failed++;
|
|
9
|
+
console.log(`${ok ? "OK " : "FOUT"} ${name}: ${g}${ok ? "" : ` (verwacht ${w})`}`);
|
|
10
|
+
}
|
|
11
|
+
/** Valt tijdstip `iso` in [since, until)? */
|
|
12
|
+
const inRange = (iso, r) => {
|
|
13
|
+
const t = new Date(iso).getTime();
|
|
14
|
+
return t >= new Date(r.since).getTime() && t < new Date(r.until).getTime();
|
|
15
|
+
};
|
|
16
|
+
// Week 43 van 2026: ma 19 t/m zo 25 okt, eind = ma 26 okt 00:00 (exclusief).
|
|
17
|
+
const w43 = weekRange(43, 2026);
|
|
18
|
+
check("week 43 startdatum", w43.startDate, "2026-10-19");
|
|
19
|
+
check("week 43 einddatum (exclusief)", w43.endDate, "2026-10-26");
|
|
20
|
+
check("week 43 since = ma 00:00 zomertijd", w43.since, "2026-10-18T22:00:00.000Z");
|
|
21
|
+
check("week 43 until = ma 26 00:00 wintertijd", w43.until, "2026-10-25T23:00:00.000Z");
|
|
22
|
+
check("ma 19 okt 00:00 hoort erbij", inRange("2026-10-18T22:00:00.000Z", w43), true);
|
|
23
|
+
check("zo 25 okt 23:59 hoort erbij", inRange("2026-10-25T22:59:00.000Z", w43), true);
|
|
24
|
+
check("ma 26 okt 00:00 hoort er niet bij", inRange("2026-10-25T23:00:00.000Z", w43), false);
|
|
25
|
+
check("ma 26 okt 10:20 (HO-2601456) hoort er niet bij", inRange("2026-10-26T10:20:27Z", w43), false);
|
|
26
|
+
// Tekstdatums (order_date 'YYYY-MM-DD'): vergelijken met startDate/endDate.
|
|
27
|
+
check("order_date 2026-10-26 < endDate is onwaar", "2026-10-26" < w43.endDate, false);
|
|
28
|
+
check("order_date 2026-10-25 < endDate is waar", "2026-10-25" < w43.endDate, true);
|
|
29
|
+
// Jaarwisseling: 2026 heeft 53 weken; 1 jan 2027 valt in week 53 van 2026.
|
|
30
|
+
check("28 dec 2026 → week 53", isoWeekOf({ y: 2026, m: 12, d: 28 }), { week: 53, year: 2026 });
|
|
31
|
+
check("1 jan 2027 → week 53 van 2026", isoWeekOf({ y: 2027, m: 1, d: 1 }), { week: 53, year: 2026 });
|
|
32
|
+
check("4 jan 2027 → week 1 van 2027", isoWeekOf({ y: 2027, m: 1, d: 4 }), { week: 1, year: 2027 });
|
|
33
|
+
check("29 dec 2025 → week 1 van 2026", isoWeekOf({ y: 2025, m: 12, d: 29 }), { week: 1, year: 2026 });
|
|
34
|
+
check("week 53 → volgende is week 1", shiftPeriod({ period: "week", week: 53, year: 2026 }, 1), { period: "week", week: 1, year: 2027 });
|
|
35
|
+
check("week 1 → vorige is week 53", shiftPeriod({ period: "week", week: 1, year: 2027 }, -1), { period: "week", week: 53, year: 2026 });
|
|
36
|
+
check("week 53/2026 loopt tot ma 4 jan 2027", weekRange(53, 2026).endDate, "2027-01-04");
|
|
37
|
+
// Klokwisseling: dag met 23 uur (29 mrt 2026) en 25 uur (25 okt 2026).
|
|
38
|
+
const spring = dayRange({ y: 2026, m: 3, d: 29 });
|
|
39
|
+
check("29 mrt: 23 uur", (new Date(spring.until).getTime() - new Date(spring.since).getTime()) / 3600000, 23);
|
|
40
|
+
const autumn = dayRange({ y: 2026, m: 10, d: 25 });
|
|
41
|
+
check("25 okt: 25 uur", (new Date(autumn.until).getTime() - new Date(autumn.since).getTime()) / 3600000, 25);
|
|
42
|
+
check("maand okt 2026 since", monthRangeAms(9, 2026).since, "2026-09-30T22:00:00.000Z");
|
|
43
|
+
check("maand okt 2026 until", monthRangeAms(9, 2026).until, "2026-10-31T23:00:00.000Z");
|
|
44
|
+
check("maand dec → jan volgend jaar", monthRangeAms(11, 2026).endDate, "2027-01-01");
|
|
45
|
+
check("Amsterdamse datum vlak na middernacht", amsterdamYmd(new Date("2026-10-25T23:30:00Z")), { y: 2026, m: 10, d: 26 });
|
|
46
|
+
// Pijltjes bij dag en maand.
|
|
47
|
+
check("dag vooruit over maandgrens", shiftPeriod({ period: "day", day: "2026-10-31" }, 1).day, "2026-11-01");
|
|
48
|
+
check("maand terug over jaargrens", shiftPeriod({ period: "month", month: 0, monthYear: 2027 }, -1), { period: "month", month: 11, monthYear: 2026 });
|
|
49
|
+
// URL: standaard, terugval en heen-en-terug.
|
|
50
|
+
const now = new Date("2026-10-29T16:00:00Z");
|
|
51
|
+
check("standaard = huidige week op leverdatum", periodFromSearch({}, now), { period: "week", week: 44, year: 2026, dateField: "delivery" });
|
|
52
|
+
check("onleesbare week → standaard", periodFromSearch({ periode: "week", week: "abc" }, now), { period: "week", week: 44, year: 2026, dateField: "delivery" });
|
|
53
|
+
check("week 54 bestaat niet → standaard", periodFromSearch({ periode: "week", week: "2026-W54" }, now).week, 44);
|
|
54
|
+
check("ongeldige dag → standaard", periodFromSearch({ periode: "dag", dag: "2026-02-31" }, now).period, "week");
|
|
55
|
+
check("onbekende periode → standaard", periodFromSearch({ periode: "xyz" }, now).period, "week");
|
|
56
|
+
const roundTrip = periodFromSearch(periodToSearch({ period: "month", month: 9, monthYear: 2026, dateField: "ordered" }), now);
|
|
57
|
+
check("maand heen-en-terug", roundTrip, { period: "month", month: 9, monthYear: 2026, dateField: "ordered" });
|
|
58
|
+
check("periodRange zonder week → null", periodRange({ period: "week" }), null);
|
|
59
|
+
if (failed) {
|
|
60
|
+
console.error(`${failed} controle(s) mislukt`);
|
|
61
|
+
process.exit(1);
|
|
62
|
+
}
|
|
63
|
+
console.log("Alle periodecontroles geslaagd");
|