@flowselections/floriday-verkoop-module 1.0.140 → 1.0.142
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/OrderAfleverbrievenCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderAfleverbrievenCard.js +15 -2
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +3 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +6 -2
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.js +2 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +95 -35
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +6 -0
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +67 -34
- 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 +77 -8
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +7 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +39 -26
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +214 -38
- package/dist-lib/components/verkoop/v3/ArticlesHover.d.ts +8 -0
- package/dist-lib/components/verkoop/v3/ArticlesHover.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/ArticlesHover.js +48 -0
- package/dist-lib/components/verkoop/v3/EmptyState.d.ts +9 -0
- package/dist-lib/components/verkoop/v3/EmptyState.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/EmptyState.js +5 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/HoverTip.js +1 -1
- package/dist-lib/components/verkoop/v3/InfoCard.d.ts +28 -0
- package/dist-lib/components/verkoop/v3/InfoCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/InfoCard.js +21 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +10 -2
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/KpiTile.js +37 -5
- package/dist-lib/components/verkoop/v3/NoticeBar.d.ts +6 -0
- package/dist-lib/components/verkoop/v3/NoticeBar.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/NoticeBar.js +10 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -1
- package/dist-lib/components/verkoop/v3/OrderProgress.js +8 -1
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts +7 -0
- package/dist-lib/components/verkoop/v3/OrderStepper.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/OrderStepper.js +77 -0
- package/dist-lib/components/verkoop/v3/ShortcutHelp.d.ts +5 -0
- package/dist-lib/components/verkoop/v3/ShortcutHelp.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/ShortcutHelp.js +13 -0
- package/dist-lib/lib/delivery-format.check.d.ts +2 -0
- package/dist-lib/lib/delivery-format.check.d.ts.map +1 -0
- package/dist-lib/lib/delivery-format.check.js +28 -0
- package/dist-lib/lib/delivery-format.d.ts +17 -0
- package/dist-lib/lib/delivery-format.d.ts.map +1 -0
- package/dist-lib/lib/delivery-format.js +42 -0
- package/dist-lib/lib/order-articles.functions.d.ts +11 -0
- package/dist-lib/lib/order-articles.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-articles.functions.js +11 -0
- package/dist-lib/lib/order-articles.server.d.ts +11 -0
- package/dist-lib/lib/order-articles.server.d.ts.map +1 -0
- package/dist-lib/lib/order-articles.server.js +89 -0
- package/dist-lib/lib/order-nav.check.d.ts +2 -0
- package/dist-lib/lib/order-nav.check.d.ts.map +1 -0
- package/dist-lib/lib/order-nav.check.js +16 -0
- package/dist-lib/lib/order-nav.d.ts +24 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -0
- package/dist-lib/lib/order-nav.js +62 -0
- package/dist-lib/lib/order-progress.server.d.ts +23 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -1
- package/dist-lib/lib/order-progress.server.js +25 -0
- package/dist-lib/lib/order-search.check.d.ts +2 -0
- package/dist-lib/lib/order-search.check.d.ts.map +1 -0
- package/dist-lib/lib/order-search.check.js +16 -0
- package/dist-lib/lib/order-search.d.ts +18 -0
- package/dist-lib/lib/order-search.d.ts.map +1 -0
- package/dist-lib/lib/order-search.js +37 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +20 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +24 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -3
- package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +1 -0
- package/dist-lib/lib/salesorders.functions.d.ts +8 -0
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +23 -3
- package/dist-lib/lib/useBufferEvents.js +1 -1
- package/dist-lib/lib/useDetailProgressFallback.d.ts +17 -0
- package/dist-lib/lib/useDetailProgressFallback.d.ts.map +1 -0
- package/dist-lib/lib/useDetailProgressFallback.js +28 -0
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +1 -0
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Navigatie tussen orderlijst en orderdetail (alleen browser, sessionStorage).
|
|
3
|
+
* De lijst bewaart haar volledige adres (periode, tabblad, filters, zoekterm),
|
|
4
|
+
* de volgorde van de zichtbare rijen en de scrollpositie. Het detail gebruikt
|
|
5
|
+
* dat voor "Terug", Vorige en Volgende. Zonder bewaarde lijst (directe link)
|
|
6
|
+
* zijn Vorige/Volgende verborgen.
|
|
7
|
+
*/
|
|
8
|
+
const KEY = "verkoop:order-nav";
|
|
9
|
+
function read() {
|
|
10
|
+
if (typeof window === "undefined")
|
|
11
|
+
return null;
|
|
12
|
+
try {
|
|
13
|
+
const raw = window.sessionStorage.getItem(KEY);
|
|
14
|
+
return raw ? JSON.parse(raw) : null;
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
function write(s) {
|
|
21
|
+
try {
|
|
22
|
+
window.sessionStorage.setItem(KEY, JSON.stringify(s));
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
/* opslag vol of uit: navigatie valt terug op de standaardlijst */
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export function saveListNav(href, rows) {
|
|
29
|
+
const prev = read();
|
|
30
|
+
write({ href, rows, scrollY: prev?.href === href ? prev.scrollY : 0 });
|
|
31
|
+
}
|
|
32
|
+
export function saveListScroll(scrollY) {
|
|
33
|
+
const prev = read();
|
|
34
|
+
if (prev)
|
|
35
|
+
write({ ...prev, scrollY });
|
|
36
|
+
}
|
|
37
|
+
export function markRestore() {
|
|
38
|
+
const prev = read();
|
|
39
|
+
if (prev)
|
|
40
|
+
write({ ...prev, restore: true });
|
|
41
|
+
}
|
|
42
|
+
/** Eenmalig: scrollpositie terugzetten als we via "Terug" kwamen. */
|
|
43
|
+
export function takeRestoreScroll(href) {
|
|
44
|
+
const prev = read();
|
|
45
|
+
if (!prev?.restore || prev.href !== href)
|
|
46
|
+
return null;
|
|
47
|
+
write({ ...prev, restore: false });
|
|
48
|
+
return prev.scrollY;
|
|
49
|
+
}
|
|
50
|
+
export function listHref() {
|
|
51
|
+
return read()?.href ?? null;
|
|
52
|
+
}
|
|
53
|
+
/** Vorige/volgende rij rond de geopende order, of null als die niet in de bewaarde lijst staat. */
|
|
54
|
+
export function neighbours(currentId) {
|
|
55
|
+
const s = read();
|
|
56
|
+
if (!s)
|
|
57
|
+
return null;
|
|
58
|
+
const i = s.rows.findIndex((r) => r.id === currentId || r.memberIds.includes(currentId));
|
|
59
|
+
if (i < 0)
|
|
60
|
+
return null;
|
|
61
|
+
return { prev: s.rows[i - 1]?.id ?? null, next: s.rows[i + 1]?.id ?? null };
|
|
62
|
+
}
|
|
@@ -25,6 +25,10 @@ export interface InvoiceResult {
|
|
|
25
25
|
invoices: Map<string, ErpInvoiceInfo>;
|
|
26
26
|
available: boolean;
|
|
27
27
|
warnings: string[];
|
|
28
|
+
/** Tijdslimiet overschreden (stand nog onbekend, niet "niet beschikbaar"). */
|
|
29
|
+
timedOut?: boolean;
|
|
30
|
+
/** Echte fout (geen ontbrekende module of geen recht). */
|
|
31
|
+
failed?: boolean;
|
|
28
32
|
}
|
|
29
33
|
export interface PickResult {
|
|
30
34
|
pick: Map<string, PickProgress>;
|
|
@@ -37,5 +41,24 @@ export declare function loadInvoiceStatuses(client: RpcClient, orderIds: string[
|
|
|
37
41
|
export declare function loadPickProgress(client: RpcClient, orderIds: string[], ms?: number): Promise<PickResult>;
|
|
38
42
|
/** Oude samengestelde aanroep (blijft bestaan voor bestaande gebruikers). */
|
|
39
43
|
export declare function loadInvoiceAndPickProgress(client: RpcClient, orderIds: string[]): Promise<InvoicePickResult>;
|
|
44
|
+
/** Stand van de factuurgegevens voor het orderdetail. */
|
|
45
|
+
export type DetailInvoiceState = "ok" | "pending" | "failed";
|
|
46
|
+
export interface DetailProgress {
|
|
47
|
+
features: {
|
|
48
|
+
erpInvoices: boolean;
|
|
49
|
+
pickProgress: boolean;
|
|
50
|
+
};
|
|
51
|
+
invoice: DetailInvoiceState;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Orderdetail: factuurstand + pickvoortgang voor de order en zijn groepsleden,
|
|
55
|
+
* tegelijk en met dezelfde bronnen als de lijst. Zet erpInvoice/pickProgress
|
|
56
|
+
* direct op de meegegeven orders. Alleen lezen.
|
|
57
|
+
*/
|
|
58
|
+
export declare function attachDetailProgress(client: RpcClient, orders: {
|
|
59
|
+
orderRowId?: string | null;
|
|
60
|
+
erpInvoice?: ErpInvoiceInfo | null;
|
|
61
|
+
pickProgress?: PickProgress | null;
|
|
62
|
+
}[], ms?: number): Promise<DetailProgress>;
|
|
40
63
|
export {};
|
|
41
64
|
//# sourceMappingURL=order-progress.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-progress.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrE,KAAK,SAAS,GAAG;IAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAAE,CAAC;AASvD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA0BD,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvI;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"order-progress.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-progress.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrE,KAAK,SAAS,GAAG;IAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAAE,CAAC;AASvD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA0BD,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvI;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,2EAA2E;AAC3E,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B/H;AAED,6EAA6E;AAC7E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CA6BzH;AAED,6EAA6E;AAC7E,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAS5B;AAED,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,EAAE,EAChH,EAAE,SAAoB,GACrB,OAAO,CAAC,cAAc,CAAC,CAazB"}
|
|
@@ -64,10 +64,12 @@ export async function loadInvoiceStatuses(client, orderIds, ms = ENRICH_TIMEOUT_
|
|
|
64
64
|
const r = await withTimeout(inChunks(client, "erp_invoice_status_for_orders", ids), ms);
|
|
65
65
|
if (r.timedOut) {
|
|
66
66
|
out.warnings.push(`Factuurstand kwam niet binnen ${ms / 1000} s; het factuuricoon toont de gewone weergave.`);
|
|
67
|
+
out.timedOut = true;
|
|
67
68
|
return out;
|
|
68
69
|
}
|
|
69
70
|
const inv = r.value;
|
|
70
71
|
out.available = inv.available;
|
|
72
|
+
out.failed = !inv.available && !!inv.warning && inv.warning !== "missing";
|
|
71
73
|
if (inv.warning === "missing")
|
|
72
74
|
out.warnings.push("Factuurstand is niet beschikbaar (Facturatie-module ontbreekt of is te oud); het factuuricoon is verborgen voor ERP-orders.");
|
|
73
75
|
else if (inv.warning)
|
|
@@ -134,3 +136,26 @@ export async function loadInvoiceAndPickProgress(client, orderIds) {
|
|
|
134
136
|
warnings: [...inv.warnings, ...pick.warnings],
|
|
135
137
|
};
|
|
136
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Orderdetail: factuurstand + pickvoortgang voor de order en zijn groepsleden,
|
|
141
|
+
* tegelijk en met dezelfde bronnen als de lijst. Zet erpInvoice/pickProgress
|
|
142
|
+
* direct op de meegegeven orders. Alleen lezen.
|
|
143
|
+
*/
|
|
144
|
+
export async function attachDetailProgress(client, orders, ms = ENRICH_TIMEOUT_MS) {
|
|
145
|
+
const ids = Array.from(new Set(orders.map((o) => o.orderRowId).filter((v) => !!v)));
|
|
146
|
+
if (!ids.length)
|
|
147
|
+
return { features: { erpInvoices: false, pickProgress: false }, invoice: "ok" };
|
|
148
|
+
const [inv, pick] = await Promise.all([loadInvoiceStatuses(client, ids, ms), loadPickProgress(client, ids, ms)]);
|
|
149
|
+
for (const o of orders) {
|
|
150
|
+
if (!o.orderRowId)
|
|
151
|
+
continue;
|
|
152
|
+
if (inv.available)
|
|
153
|
+
o.erpInvoice = inv.invoices.get(o.orderRowId) ?? null;
|
|
154
|
+
if (pick.available && pick.pick.has(o.orderRowId))
|
|
155
|
+
o.pickProgress = pick.pick.get(o.orderRowId) ?? null;
|
|
156
|
+
}
|
|
157
|
+
return {
|
|
158
|
+
features: { erpInvoices: inv.available, pickProgress: pick.available },
|
|
159
|
+
invoice: inv.timedOut ? "pending" : inv.failed ? "failed" : "ok",
|
|
160
|
+
};
|
|
161
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-search.check.d.ts","sourceRoot":"","sources":["../../src/lib/order-search.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { normalizeSearch, orderMatches, searchTokens } from "./order-search.js";
|
|
2
|
+
const fail = (m) => {
|
|
3
|
+
throw new Error("order-search: " + m);
|
|
4
|
+
};
|
|
5
|
+
if (normalizeSearch(" Café JANSEN ") !== "cafe jansen")
|
|
6
|
+
fail("normalisatie");
|
|
7
|
+
if (searchTokens("a").length !== 0)
|
|
8
|
+
fail("1 letter mag niet zoeken");
|
|
9
|
+
if (searchTokens("7").join() !== "7")
|
|
10
|
+
fail("1 cijfer moet zoeken");
|
|
11
|
+
const o = { orderNumber: "HO-2601412", customer: { name: "Jansen Bloemen" } };
|
|
12
|
+
if (!orderMatches(o, searchTokens("12 jansen")))
|
|
13
|
+
fail("woorden in willekeurige volgorde");
|
|
14
|
+
if (orderMatches(o, searchTokens("jansen 99")))
|
|
15
|
+
fail("alle woorden verplicht");
|
|
16
|
+
console.log("order-search: ok");
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/** Gedeelde zoekregels voor de orderlijst (client en server gelijk). */
|
|
2
|
+
export declare function normalizeSearch(s: string | null | undefined): string;
|
|
3
|
+
/** Zoekwoorden; leeg als de term te kort is (min 2 tekens, cijfers vanaf 1). */
|
|
4
|
+
export declare function searchTokens(term: string | null | undefined): string[];
|
|
5
|
+
/** Alle woorden moeten voorkomen, in willekeurige volgorde. */
|
|
6
|
+
export declare function matchesTokens(haystackNormalized: string, tokens: string[]): boolean;
|
|
7
|
+
export type SearchableOrder = {
|
|
8
|
+
productName?: string | null;
|
|
9
|
+
sku?: string | null;
|
|
10
|
+
orderNumber?: string | null;
|
|
11
|
+
customer?: {
|
|
12
|
+
name?: string | null;
|
|
13
|
+
} | null;
|
|
14
|
+
customerReference?: string | null;
|
|
15
|
+
};
|
|
16
|
+
export declare function orderHaystack(o: SearchableOrder): string;
|
|
17
|
+
export declare function orderMatches(o: SearchableOrder, tokens: string[]): boolean;
|
|
18
|
+
//# sourceMappingURL=order-search.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-search.d.ts","sourceRoot":"","sources":["../../src/lib/order-search.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAOpE;AAED,gFAAgF;AAChF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,EAAE,CAKtE;AAED,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,kBAAkB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAGnF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC,CAAC;AAGF,wBAAgB,aAAa,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAQxD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAE1E"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/** Gedeelde zoekregels voor de orderlijst (client en server gelijk). */
|
|
2
|
+
export function normalizeSearch(s) {
|
|
3
|
+
return (s ?? "")
|
|
4
|
+
.normalize("NFD")
|
|
5
|
+
.replace(/[\u0300-\u036f]/g, "")
|
|
6
|
+
.toLowerCase()
|
|
7
|
+
.replace(/\s+/g, " ")
|
|
8
|
+
.trim();
|
|
9
|
+
}
|
|
10
|
+
/** Zoekwoorden; leeg als de term te kort is (min 2 tekens, cijfers vanaf 1). */
|
|
11
|
+
export function searchTokens(term) {
|
|
12
|
+
const n = normalizeSearch(term);
|
|
13
|
+
if (!n)
|
|
14
|
+
return [];
|
|
15
|
+
if (n.length < 2 && !/^\d$/.test(n))
|
|
16
|
+
return [];
|
|
17
|
+
return n.split(" ").filter(Boolean);
|
|
18
|
+
}
|
|
19
|
+
/** Alle woorden moeten voorkomen, in willekeurige volgorde. */
|
|
20
|
+
export function matchesTokens(haystackNormalized, tokens) {
|
|
21
|
+
for (const t of tokens)
|
|
22
|
+
if (!haystackNormalized.includes(t))
|
|
23
|
+
return false;
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
const cache = new WeakMap();
|
|
27
|
+
export function orderHaystack(o) {
|
|
28
|
+
const hit = cache.get(o);
|
|
29
|
+
if (hit !== undefined)
|
|
30
|
+
return hit;
|
|
31
|
+
const h = normalizeSearch(`${o.productName ?? ""} ${o.sku ?? ""} ${o.orderNumber ?? ""} ${o.customer?.name ?? ""} ${o.customerReference ?? ""}`);
|
|
32
|
+
cache.set(o, h);
|
|
33
|
+
return h;
|
|
34
|
+
}
|
|
35
|
+
export function orderMatches(o, tokens) {
|
|
36
|
+
return tokens.length === 0 || matchesTokens(orderHaystack(o), tokens);
|
|
37
|
+
}
|
|
@@ -24,6 +24,7 @@ export declare const getLocalSalesOrderDetail: import("@tanstack/start-client-co
|
|
|
24
24
|
id: string;
|
|
25
25
|
}, Promise<{
|
|
26
26
|
order: import("./salesorders-mapping.js").SalesOrderDTO | null;
|
|
27
|
+
progress: import("./order-progress.server.js").DetailProgress | undefined;
|
|
27
28
|
bufferId: string | null;
|
|
28
29
|
bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
|
|
29
30
|
sellerFallback: string | null;
|
|
@@ -46,4 +47,23 @@ export declare const getFloridayStatusesForRows: import("@tanstack/start-client-
|
|
|
46
47
|
statuses: Record<string, import("./floriday-status.js").FloridayStatusSummary>;
|
|
47
48
|
error: string | null;
|
|
48
49
|
}>>;
|
|
50
|
+
/**
|
|
51
|
+
* Orderdetail-vangnet: factuurstand + pickvoortgang opnieuw lezen als die in
|
|
52
|
+
* het detailverzoek niet binnen de tijdslimiet kwam. Hooguit 10 s, alleen lezen.
|
|
53
|
+
*/
|
|
54
|
+
export declare const getOrderDetailProgress: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
55
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
56
|
+
userId: string;
|
|
57
|
+
claims: import("@supabase/auth-js").User;
|
|
58
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
59
|
+
orderRowIds: string[];
|
|
60
|
+
}, Promise<{
|
|
61
|
+
progress: import("./order-progress.server.js").DetailProgress;
|
|
62
|
+
byId: {
|
|
63
|
+
[k: string]: {
|
|
64
|
+
erpInvoice: any;
|
|
65
|
+
pickProgress: any;
|
|
66
|
+
};
|
|
67
|
+
};
|
|
68
|
+
}>>;
|
|
49
69
|
//# sourceMappingURL=salesorders-list.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AA4DA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO
|
|
1
|
+
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AA4DA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;;GAuC7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;;GAiB7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;GAW7B,CAAC"}
|
|
@@ -91,8 +91,16 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
91
91
|
order.bufferCartCount = b.count;
|
|
92
92
|
order.bufferCartTypeName = b.typeName;
|
|
93
93
|
}
|
|
94
|
+
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
95
|
+
const progress = order
|
|
96
|
+
? await attachDetailProgress(context.supabase, [order, ...bufferSiblings]).catch(() => ({
|
|
97
|
+
features: { erpInvoices: false, pickProgress: false },
|
|
98
|
+
invoice: "failed",
|
|
99
|
+
}))
|
|
100
|
+
: undefined;
|
|
94
101
|
return {
|
|
95
102
|
order,
|
|
103
|
+
progress,
|
|
96
104
|
bufferId: order?.bufferId ?? null,
|
|
97
105
|
bufferSiblings,
|
|
98
106
|
sellerFallback: result.sellerFallback,
|
|
@@ -122,3 +130,19 @@ export const getFloridayStatusesForRows = createServerFn({ method: "POST" })
|
|
|
122
130
|
out[r.key] = summarizeFloridayStatus(r.ids, res.entries, res.error);
|
|
123
131
|
return { statuses: out, error: res.error };
|
|
124
132
|
});
|
|
133
|
+
/**
|
|
134
|
+
* Orderdetail-vangnet: factuurstand + pickvoortgang opnieuw lezen als die in
|
|
135
|
+
* het detailverzoek niet binnen de tijdslimiet kwam. Hooguit 10 s, alleen lezen.
|
|
136
|
+
*/
|
|
137
|
+
export const getOrderDetailProgress = createServerFn({ method: "POST" })
|
|
138
|
+
.middleware([requireSupabaseAuth])
|
|
139
|
+
.inputValidator((input) => z.object({ orderRowIds: z.array(z.string().uuid()).min(1).max(50) }).parse(input))
|
|
140
|
+
.handler(async ({ data, context }) => {
|
|
141
|
+
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
142
|
+
const rows = data.orderRowIds.map((id) => ({ orderRowId: id, erpInvoice: null, pickProgress: null }));
|
|
143
|
+
const progress = await attachDetailProgress(context.supabase, rows, 10000);
|
|
144
|
+
return {
|
|
145
|
+
progress,
|
|
146
|
+
byId: Object.fromEntries(rows.map((r) => [r.orderRowId, { erpInvoice: r.erpInvoice, pickProgress: r.pickProgress }])),
|
|
147
|
+
};
|
|
148
|
+
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAI1B,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,kEAAkE;IAClE,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AA6GD,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,GAAG,IAAW,QAEjE;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA+BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CA20CrB;AAsDD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,qBAAqB,CAIvB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { orderMatches, searchTokens } from "./order-search.js";
|
|
1
2
|
import { invoiceStateLabel } from "./invoice-timing.js";
|
|
2
3
|
import { cachedRef, invalidateRefCache, refCacheKey } from "./reference-cache.server.js";
|
|
3
4
|
import { loadReviewDismissals, isReviewDismissed } from "./review-dismissals.server.js";
|
|
@@ -862,6 +863,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
862
863
|
imageUrl: null,
|
|
863
864
|
orderedAt,
|
|
864
865
|
deliveryAt,
|
|
866
|
+
deliveryHasTime: rawDeliveryDate.includes("T") || !!(rawDeliveryDate && deliveryTime),
|
|
865
867
|
quantity: {
|
|
866
868
|
multiplier: totalQuantity > 0 ? Math.ceil(totalQuantity / firstPlantsPerCrate) : 1,
|
|
867
869
|
count: firstPlantsPerCrate,
|
|
@@ -1185,9 +1187,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1185
1187
|
t.mark("12_engine");
|
|
1186
1188
|
const membersOf = (g) => g.map((m) => toProgressMember(m));
|
|
1187
1189
|
// 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
|
|
1188
|
-
const
|
|
1189
|
-
const matchesSearch = (members) =>
|
|
1190
|
-
members.some((o) => `${o.productName} ${o.sku} ${o.orderNumber} ${o.customer.name} ${o.customerReference ?? ""}`.toLowerCase().includes(search));
|
|
1190
|
+
const searchToks = searchTokens(params.search);
|
|
1191
|
+
const matchesSearch = (members) => searchToks.length === 0 || members.some((o) => orderMatches(o, searchToks));
|
|
1191
1192
|
const stageOf = (members) => mergeStages(members.map((m) => m.stage ?? "incoming"));
|
|
1192
1193
|
const matchesStatusFilter = (members) => {
|
|
1193
1194
|
const stage = stageOf(members);
|
|
@@ -23,6 +23,8 @@ export interface SalesOrderDTO {
|
|
|
23
23
|
imageUrl: string | null;
|
|
24
24
|
orderedAt: string;
|
|
25
25
|
deliveryAt: string;
|
|
26
|
+
/** Bronveld heeft een tijd (Floriday: altijd; eigen order: alleen met aanlevertijd). */
|
|
27
|
+
deliveryHasTime?: boolean;
|
|
26
28
|
quantity: {
|
|
27
29
|
multiplier: number;
|
|
28
30
|
count: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,6 +146,7 @@ export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup, crat
|
|
|
146
146
|
imageUrl: tradeItem?.imageUrl ?? null,
|
|
147
147
|
orderedAt,
|
|
148
148
|
deliveryAt,
|
|
149
|
+
deliveryHasTime: true,
|
|
149
150
|
quantity: { multiplier: numberOfPackages, count: piecesPerPackage, unitPrice },
|
|
150
151
|
revenue,
|
|
151
152
|
fustCount: numberOfPackages,
|
|
@@ -61,6 +61,14 @@ export type SalesOrderDetailResult = {
|
|
|
61
61
|
environment: "staging" | "live";
|
|
62
62
|
bufferId: string | null;
|
|
63
63
|
bufferSiblings: SalesOrderDTO[];
|
|
64
|
+
/** Factuurstand + pickvoortgang (zelfde bronnen als de lijst), in hetzelfde verzoek. */
|
|
65
|
+
progress?: {
|
|
66
|
+
features: {
|
|
67
|
+
erpInvoices: boolean;
|
|
68
|
+
pickProgress: boolean;
|
|
69
|
+
};
|
|
70
|
+
invoice: "ok" | "pending" | "failed";
|
|
71
|
+
};
|
|
64
72
|
};
|
|
65
73
|
export declare const getSalesOrderDetail: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
66
74
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAiC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;CAChH,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAqbzB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { z } from "zod";
|
|
|
7
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
9
9
|
import { resolveOrderStage } from "./order-status.js";
|
|
10
|
+
import { invoiceRoute } from "./order-progress.js";
|
|
10
11
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
11
12
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
12
13
|
const CANONICAL_ENTITY_TYPE = "sales-orders";
|
|
@@ -291,7 +292,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
291
292
|
try {
|
|
292
293
|
const ownRes = await supabase
|
|
293
294
|
.from("orders")
|
|
294
|
-
.select("id, buffer_id, status, is_reservation, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
295
|
+
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
295
296
|
.eq("floriday_sales_order_id", data.id)
|
|
296
297
|
.maybeSingle();
|
|
297
298
|
const ownRow = ownRes.data ?? null;
|
|
@@ -310,6 +311,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
310
311
|
});
|
|
311
312
|
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
312
313
|
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
314
|
+
// Zelfde factuurroute en ids als de lijst (salesorders-list.server).
|
|
315
|
+
dto.orderRowId = ownRow?.id ? String(ownRow.id) : null;
|
|
316
|
+
dto.invoiceRoute = invoiceRoute({
|
|
317
|
+
floridaySalesOrderId: ownRow?.floriday_sales_order_id ?? String(data.id),
|
|
318
|
+
orderSource: ownRow?.order_source ?? "floriday",
|
|
319
|
+
});
|
|
313
320
|
dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
314
321
|
dto.floridayExternalFulfilledAt = (ownRow?.custom_fields ?? {})?.floriday_external_fulfilled_at ?? null;
|
|
315
322
|
{
|
|
@@ -383,12 +390,13 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
383
390
|
// de stand los na via getFloridayStatusesForRows, net als de lijst.
|
|
384
391
|
if (foIds.length)
|
|
385
392
|
dto.floridayStatusIds = foIds;
|
|
393
|
+
dto.floridayIds = foIds.length ? foIds : [String(data.id)];
|
|
386
394
|
}
|
|
387
395
|
if (bufferId) {
|
|
388
396
|
dto.bufferId = bufferId;
|
|
389
397
|
const sibRes = await supabase
|
|
390
398
|
.from("orders")
|
|
391
|
-
.select("floriday_sales_order_id, status, is_reservation, custom_fields")
|
|
399
|
+
.select("id, floriday_sales_order_id, status, is_reservation, order_source, custom_fields")
|
|
392
400
|
.eq("buffer_id", bufferId)
|
|
393
401
|
.not("floriday_sales_order_id", "is", null);
|
|
394
402
|
const sibLocalByFoId = new Map();
|
|
@@ -503,6 +511,13 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
503
511
|
isReservation: sLocal ? !!sLocal.is_reservation : false,
|
|
504
512
|
});
|
|
505
513
|
sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
|
|
514
|
+
sDto.floridayExternalFulfilledIds = (sLocal?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
|
|
515
|
+
sDto.orderRowId = sLocal?.id ? String(sLocal.id) : null;
|
|
516
|
+
sDto.invoiceRoute = invoiceRoute({
|
|
517
|
+
floridaySalesOrderId: String(sr.floriday_id),
|
|
518
|
+
orderSource: sLocal?.order_source ?? "floriday",
|
|
519
|
+
});
|
|
520
|
+
sDto.floridayIds = [String(sr.floriday_id)];
|
|
506
521
|
bufferSiblings.push(sDto);
|
|
507
522
|
}
|
|
508
523
|
}
|
|
@@ -511,7 +526,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
511
526
|
catch (err) {
|
|
512
527
|
console.warn("[getSalesOrderDetail] buffer-siblings lookup faalde:", err.message);
|
|
513
528
|
}
|
|
514
|
-
|
|
529
|
+
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
530
|
+
const progress = await attachDetailProgress(supabase, [dto, ...bufferSiblings]).catch(() => ({
|
|
531
|
+
features: { erpInvoices: false, pickProgress: false },
|
|
532
|
+
invoice: "failed",
|
|
533
|
+
}));
|
|
534
|
+
return { order: dto, sellerFallback, environment, bufferId, bufferSiblings, progress };
|
|
515
535
|
});
|
|
516
536
|
// ─── Handmatige controle na orderpicken ───────────────────────────────────
|
|
517
537
|
const ControlInputSchema = z.object({
|
|
@@ -54,7 +54,7 @@ export function useBufferEvents(enabled = true) {
|
|
|
54
54
|
if (!enabled)
|
|
55
55
|
return;
|
|
56
56
|
const channel = supabase
|
|
57
|
-
.channel(
|
|
57
|
+
.channel(`logistics-buffer-events-${Math.random().toString(36).slice(2)}`)
|
|
58
58
|
.on("postgres_changes", { event: "INSERT", schema: "public", table: "logistics_events" }, (payload) => {
|
|
59
59
|
if (TYPES.has(String(payload?.new?.event_type)))
|
|
60
60
|
recalc();
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { ErpInvoiceInfo, PickProgress, ProgressFeatures } from "./order-progress.js";
|
|
2
|
+
/**
|
|
3
|
+
* Alleen als de factuurstand in het detailverzoek niet op tijd kwam: één keer
|
|
4
|
+
* opnieuw lezen (server wacht hooguit 10 s). Tot dan "loading"; mislukt of te
|
|
5
|
+
* laat → "unknown". Er flitst dus nooit "Onbekend".
|
|
6
|
+
*/
|
|
7
|
+
export declare function useDetailProgressFallback(orders: {
|
|
8
|
+
orderRowId?: string | null;
|
|
9
|
+
}[] | null): {
|
|
10
|
+
state: "loading" | "ok" | "unknown";
|
|
11
|
+
features: ProgressFeatures | null;
|
|
12
|
+
byId: Record<string, {
|
|
13
|
+
erpInvoice: ErpInvoiceInfo | null;
|
|
14
|
+
pickProgress: PickProgress | null;
|
|
15
|
+
}> | null;
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=useDetailProgressFallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useDetailProgressFallback.d.ts","sourceRoot":"","sources":["../../src/lib/useDetailProgressFallback.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,IAAI,GAAG;IAC1F,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;QAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;CACvG,CAeA"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
3
|
+
import { getOrderDetailProgress } from "./salesorders-list.functions.js";
|
|
4
|
+
/**
|
|
5
|
+
* Alleen als de factuurstand in het detailverzoek niet op tijd kwam: één keer
|
|
6
|
+
* opnieuw lezen (server wacht hooguit 10 s). Tot dan "loading"; mislukt of te
|
|
7
|
+
* laat → "unknown". Er flitst dus nooit "Onbekend".
|
|
8
|
+
*/
|
|
9
|
+
export function useDetailProgressFallback(orders) {
|
|
10
|
+
const fn = useServerFn(getOrderDetailProgress);
|
|
11
|
+
const ids = Array.from(new Set((orders ?? []).map((o) => o.orderRowId).filter((v) => !!v))).slice(0, 50);
|
|
12
|
+
const q = useQuery({
|
|
13
|
+
queryKey: ["salesorders", "detail-progress", ids],
|
|
14
|
+
enabled: !!orders && ids.length > 0,
|
|
15
|
+
retry: false,
|
|
16
|
+
staleTime: 30000,
|
|
17
|
+
queryFn: () => fn({ data: { orderRowIds: ids } }),
|
|
18
|
+
});
|
|
19
|
+
if (!orders)
|
|
20
|
+
return { state: "ok", features: null, byId: null };
|
|
21
|
+
if (!ids.length || q.isError)
|
|
22
|
+
return { state: "unknown", features: null, byId: null };
|
|
23
|
+
if (!q.data)
|
|
24
|
+
return { state: "loading", features: null, byId: null };
|
|
25
|
+
if (q.data.progress.invoice !== "ok")
|
|
26
|
+
return { state: "unknown", features: q.data.progress.features, byId: q.data.byId };
|
|
27
|
+
return { state: "ok", features: q.data.progress.features, byId: q.data.byId };
|
|
28
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare function useLocalSalesOrderDetailQuery(id: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
|
|
2
2
|
order: import("./salesorders-mapping.js").SalesOrderDTO | null;
|
|
3
|
+
progress: import("./order-progress.server.js").DetailProgress | undefined;
|
|
3
4
|
bufferId: string | null;
|
|
4
5
|
bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
|
|
5
6
|
sellerFallback: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS
|
|
1
|
+
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;UA2C1E"}
|
|
@@ -134,7 +134,7 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
134
134
|
if (!enabled)
|
|
135
135
|
return;
|
|
136
136
|
const channel = supabase
|
|
137
|
-
.channel(
|
|
137
|
+
.channel(`salesorders-list-refresh-${Math.random().toString(36).slice(2)}`)
|
|
138
138
|
.on("postgres_changes", { event: "*", schema: "public", table: "floriday_salesorders_cache" }, invalidate)
|
|
139
139
|
.on("postgres_changes", { event: "*", schema: "public", table: "orders" }, invalidate)
|
|
140
140
|
.on("postgres_changes", { event: "*", schema: "public", table: "carriers" }, invalidateRef)
|