@flowselections/floriday-verkoop-module 1.0.165 → 1.0.166
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +31 -45
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +31 -7
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +18 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +3 -0
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +6 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +2 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.js +47 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.js +11 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.js +16 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.js +31 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +7 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.js +17 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +5 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.js +48 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.js +53 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.js +31 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +11 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.js +17 -0
- package/dist-lib/index.d.ts +1 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +1 -0
- package/dist-lib/integrations/supabase/types.d.ts +1391 -2
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/belading-format.d.ts +3 -2
- package/dist-lib/lib/belading-format.d.ts.map +1 -1
- package/dist-lib/lib/belading-format.js +5 -3
- package/dist-lib/lib/beslis-rollen.server.d.ts +10 -0
- package/dist-lib/lib/beslis-rollen.server.d.ts.map +1 -0
- package/dist-lib/lib/beslis-rollen.server.js +10 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +8 -4
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +75 -40
- package/dist-lib/lib/engine-tijdlijn.d.ts +69 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.js +47 -0
- package/dist-lib/lib/engine-tijdlijn.js +101 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.server.js +41 -0
- package/dist-lib/lib/kar-handmatig.d.ts +2 -1
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +3 -2
- package/dist-lib/lib/kar-tekening.d.ts +54 -4
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +92 -8
- package/dist-lib/lib/kar-tekening.server.d.ts +5 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.server.js +18 -0
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +13 -9
- package/dist-lib/lib/order-item-packing.functions.d.ts +20 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +73 -8
- package/dist-lib/lib/order-row.server.d.ts.map +1 -1
- package/dist-lib/lib/order-row.server.js +9 -6
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +4 -2
- package/dist-lib/lib/sales-corrections.d.ts +44 -0
- package/dist-lib/lib/sales-corrections.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts +92 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.js +132 -0
- package/dist-lib/lib/sales-corrections.js +129 -0
- package/dist-lib/lib/sales-corrections.server.d.ts +27 -0
- package/dist-lib/lib/sales-corrections.server.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.server.js +68 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +17 -11
- package/dist-lib/lib/step-timer.server.d.ts +13 -0
- package/dist-lib/lib/step-timer.server.d.ts.map +1 -0
- package/dist-lib/lib/step-timer.server.js +33 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -1
- package/dist-lib/lib/stock-product-link.server.js +12 -8
- package/dist-lib/lib/useOpenCorrections.d.ts +17 -0
- package/dist-lib/lib/useOpenCorrections.d.ts.map +1 -0
- package/dist-lib/lib/useOpenCorrections.js +34 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts +9 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts.map +1 -0
- package/dist-lib/lib/useOrderDetailPrefetch.js +45 -0
- package/package.json +6 -1
|
@@ -106,8 +106,10 @@ export async function loadPlanCoverage(supabase, orderIds, mode = "detail") {
|
|
|
106
106
|
}
|
|
107
107
|
for (const [id, v] of fetched) {
|
|
108
108
|
out.set(id, v);
|
|
109
|
-
// Fouten niet bewaren: de volgende keer opnieuw
|
|
110
|
-
|
|
109
|
+
// Fouten en "nog geen indeling" niet bewaren: de volgende keer opnieuw vragen.
|
|
110
|
+
// (Direct na aanmaken bewaarde de Engine-melding anders 30 s lang "geen indeling",
|
|
111
|
+
// waardoor de orderpagina de net gemaakte kar pas veel later liet zien.)
|
|
112
|
+
if (v.state !== "onbekend" && v.state !== "geen_indeling")
|
|
111
113
|
cache.set(`${mode}:${id}`, { at: Date.now(), value: v });
|
|
112
114
|
}
|
|
113
115
|
return out;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
export interface SalesCorrection {
|
|
2
|
+
id: string;
|
|
3
|
+
salesOrderId: string | null;
|
|
4
|
+
status: string;
|
|
5
|
+
isCancelRequest: boolean;
|
|
6
|
+
expiresAt: string | null;
|
|
7
|
+
numberOfPieces: unknown;
|
|
8
|
+
pricePerPiece: unknown;
|
|
9
|
+
package: unknown;
|
|
10
|
+
piecesPerPackage: unknown;
|
|
11
|
+
latestDeliveryDateTime: unknown;
|
|
12
|
+
deliveryLocation: unknown;
|
|
13
|
+
reason: string | null;
|
|
14
|
+
besluit: string | null;
|
|
15
|
+
besluitDoor: string | null;
|
|
16
|
+
besluitAt: string | null;
|
|
17
|
+
besluitFout: string | null;
|
|
18
|
+
}
|
|
19
|
+
export declare function parseCorrection(x: any): SalesCorrection | null;
|
|
20
|
+
export declare function isOpen(c: Pick<SalesCorrection, "status" | "expiresAt">, now?: Date): boolean;
|
|
21
|
+
/** "vandaag 18:00", "morgen 18:00" of "do 14 nov 18:00" (Europe/Amsterdam). */
|
|
22
|
+
export declare function deadlineMoment(expiresAt: string, now?: Date): string;
|
|
23
|
+
/** "Reageren vóór morgen 18:00" / "Verlopen" / "Geen deadline bekend". */
|
|
24
|
+
export declare function deadlineTekst(c: Pick<SalesCorrection, "status" | "expiresAt">, now?: Date): string;
|
|
25
|
+
/** Bijna verlopen: minder dan 2 uur over (zelfde grens als de koppeling). */
|
|
26
|
+
export declare function bijnaVerlopen(c: Pick<SalesCorrection, "status" | "expiresAt">, now?: Date): boolean;
|
|
27
|
+
/** Balk bovenaan Verkoop. null = geen open verzoeken. */
|
|
28
|
+
export declare function balkTekst(open: Pick<SalesCorrection, "status" | "expiresAt">[], now?: Date): string | null;
|
|
29
|
+
/** Foutcodes uit het koppelcontract → één rustige zin. */
|
|
30
|
+
export declare function foutTekst(code: string | null | undefined, reden?: string | null): string;
|
|
31
|
+
export interface Verschil {
|
|
32
|
+
veld: string;
|
|
33
|
+
oud: string;
|
|
34
|
+
nieuw: string;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Gevraagde wijzigingen naast de huidige Floriday-order (o = salesorder-data).
|
|
38
|
+
* Alleen velden die de koper meestuurt en die echt anders zijn.
|
|
39
|
+
*/
|
|
40
|
+
export declare function verschillen(o: any, c: SalesCorrection): Verschil[];
|
|
41
|
+
/** Vraag bij accepteren: is er al iets geprint? Onbekend telt als geprint (fail closed). */
|
|
42
|
+
export type PrintStand = "niet" | "geprint" | "onbekend";
|
|
43
|
+
export declare function printVraag(stand: PrintStand): string | null;
|
|
44
|
+
//# sourceMappingURL=sales-corrections.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sales-corrections.d.ts","sourceRoot":"","sources":["../../src/lib/sales-corrections.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAID,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,GAAG,eAAe,GAAG,IAAI,CAqB9D;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAGxG;AAID,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,GAAE,IAAiB,GAAG,MAAM,CAOhF;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,EAAE,GAAG,GAAE,IAAiB,GAAG,MAAM,CAO9G;AAED,6EAA6E;AAC7E,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAG/G;AAED,yDAAyD;AACzD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,EAAE,EAAE,GAAG,GAAE,IAAiB,GAAG,MAAM,GAAG,IAAI,CAMtH;AAED,0DAA0D;AAC1D,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAYxF;AAaD,MAAM,WAAW,QAAQ;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAEtE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,eAAe,GAAG,QAAQ,EAAE,CAiBlE;AAED,4FAA4F;AAC5F,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;AACzD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAI3D"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
/** Lijst "Correctieverzoeken": per 25, zoeken en status in de database van de koppeling. */
|
|
2
|
+
export declare const listSalesCorrections: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
3
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
4
|
+
userId: string;
|
|
5
|
+
claims: import("@supabase/auth-js").User;
|
|
6
|
+
}, undefined, undefined, undefined>], (i: unknown) => {
|
|
7
|
+
offset: number;
|
|
8
|
+
status?: "EXPIRED" | "ACCEPTED" | "PENDING" | "DECLINED" | null | undefined;
|
|
9
|
+
zoek?: string | undefined;
|
|
10
|
+
}, Promise<import("./sales-corrections.server.js").CorrectionsList>>;
|
|
11
|
+
/** Open verzoeken (voor balk bovenaan, label in lijst en detail). */
|
|
12
|
+
export declare const listOpenSalesCorrections: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
13
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
14
|
+
userId: string;
|
|
15
|
+
claims: import("@supabase/auth-js").User;
|
|
16
|
+
}, undefined, undefined, undefined>], undefined, Promise<{
|
|
17
|
+
ok: true;
|
|
18
|
+
available: false;
|
|
19
|
+
items: any[];
|
|
20
|
+
error?: undefined;
|
|
21
|
+
} | {
|
|
22
|
+
ok: boolean;
|
|
23
|
+
available: true;
|
|
24
|
+
items: any[];
|
|
25
|
+
error: string | undefined;
|
|
26
|
+
}>>;
|
|
27
|
+
/**
|
|
28
|
+
* Accepteren of afwijzen. Accepteren met al geprinte karren vraagt eerst een
|
|
29
|
+
* keuze ("Kar aanpassen" of "Laten zo"); zonder keuze gebeurt er niets.
|
|
30
|
+
* De order zelf wordt niet hier aangepast: na accepteren past Floriday de
|
|
31
|
+
* verkooporder aan, de spiegelronde neemt die over en de Engine deelt opnieuw in.
|
|
32
|
+
*/
|
|
33
|
+
export declare const decideSalesCorrection: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
34
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
35
|
+
userId: string;
|
|
36
|
+
claims: import("@supabase/auth-js").User;
|
|
37
|
+
}, undefined, undefined, undefined>], (i: unknown) => {
|
|
38
|
+
id: string;
|
|
39
|
+
besluit: "accept" | "decline";
|
|
40
|
+
orderRowId?: string | null | undefined;
|
|
41
|
+
keuzeNaPrint?: "kar_aanpassen" | "laten_zo" | null | undefined;
|
|
42
|
+
}, Promise<{
|
|
43
|
+
ok: false;
|
|
44
|
+
code: "confirm_print";
|
|
45
|
+
vraag: string;
|
|
46
|
+
melding: string;
|
|
47
|
+
status?: undefined;
|
|
48
|
+
} | {
|
|
49
|
+
ok: false;
|
|
50
|
+
code: string;
|
|
51
|
+
melding: string;
|
|
52
|
+
vraag?: undefined;
|
|
53
|
+
status?: undefined;
|
|
54
|
+
} | {
|
|
55
|
+
ok: true;
|
|
56
|
+
status: string | null;
|
|
57
|
+
melding: "Het correctieverzoek is afgewezen." | "Geaccepteerd. Zodra Floriday de order bijwerkt deelt de planning opnieuw in; pas de kar aan via Karindeling en print daarna een nieuwe pakbon." | "Geaccepteerd. De geprinte kar blijft zoals hij is." | "Geaccepteerd. Zodra Floriday de order bijwerkt deelt de planning opnieuw in.";
|
|
58
|
+
code?: undefined;
|
|
59
|
+
vraag?: undefined;
|
|
60
|
+
}>>;
|
|
61
|
+
/** "Oude order, niet ingedeeld": ingehaalde order zonder uitzondering, met reden van de Engine. */
|
|
62
|
+
export declare const getBackfillIndeelStand: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
63
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
64
|
+
userId: string;
|
|
65
|
+
claims: import("@supabase/auth-js").User;
|
|
66
|
+
}, undefined, undefined, undefined>], (i: unknown) => {
|
|
67
|
+
orderRowId: string;
|
|
68
|
+
}, Promise<{
|
|
69
|
+
oud: false;
|
|
70
|
+
reden: null;
|
|
71
|
+
fout: "De indeelstand kon niet worden gelezen.";
|
|
72
|
+
} | {
|
|
73
|
+
oud: false;
|
|
74
|
+
reden: null;
|
|
75
|
+
fout: null;
|
|
76
|
+
} | {
|
|
77
|
+
oud: true;
|
|
78
|
+
reden: string | null;
|
|
79
|
+
fout: "De reden kon niet worden gelezen." | null;
|
|
80
|
+
}>>;
|
|
81
|
+
export declare const tochIndelen: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
82
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
83
|
+
userId: string;
|
|
84
|
+
claims: import("@supabase/auth-js").User;
|
|
85
|
+
}, undefined, undefined, undefined>], (i: unknown) => {
|
|
86
|
+
orderRowId: string;
|
|
87
|
+
reden?: string | undefined;
|
|
88
|
+
}, Promise<{
|
|
89
|
+
ok: boolean;
|
|
90
|
+
melding: string;
|
|
91
|
+
}>>;
|
|
92
|
+
//# sourceMappingURL=sales-corrections.functions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sales-corrections.functions.d.ts","sourceRoot":"","sources":["../../src/lib/sales-corrections.functions.ts"],"names":[],"mappings":"AAQA,4FAA4F;AAC5F,eAAO,MAAM,oBAAoB;;;;0CAEX,OAAO;;;;iEAUzB,CAAC;AAEL,qEAAqE;AACrE,eAAO,MAAM,wBAAwB;;;;;;;WAK2B,GAAG,EAAE;;;;;;;GAGjE,CAAC;AAYL;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB;;;;0CAEZ,OAAO;;;;;;;;;;;;;;;;;;;;;;;GA8BzB,CAAC;AAEL,mGAAmG;AACnG,eAAO,MAAM,sBAAsB;;;;0CAEb,OAAO;;;;;;;;;;;;;;GAiBzB,CAAC;AAEL,eAAO,MAAM,WAAW;;;;0CAEF,OAAO;;;;;;GAUzB,CAAC"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
// Correctieverzoeken van kopers + "Oude order, niet ingedeeld" (golf 3).
|
|
2
|
+
// Alleen createServerFn-exports; serverhulp via dynamische import.
|
|
3
|
+
import { createServerFn } from "@tanstack/react-start";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
6
|
+
const GEEN_KOPPELING = "Er is geen actieve Floriday-koppeling; correctieverzoeken zijn niet te lezen.";
|
|
7
|
+
/** Lijst "Correctieverzoeken": per 25, zoeken en status in de database van de koppeling. */
|
|
8
|
+
export const listSalesCorrections = createServerFn({ method: "POST" })
|
|
9
|
+
.middleware([requireSupabaseAuth])
|
|
10
|
+
.inputValidator((i) => z.object({
|
|
11
|
+
status: z.enum(["PENDING", "ACCEPTED", "DECLINED", "EXPIRED"]).nullable().optional(),
|
|
12
|
+
zoek: z.string().trim().max(100).optional(),
|
|
13
|
+
offset: z.number().int().min(0).max(100000).default(0),
|
|
14
|
+
}).parse(i))
|
|
15
|
+
.handler(async ({ data, context }) => {
|
|
16
|
+
const m = await import("./sales-corrections.server.js");
|
|
17
|
+
const env = await m.actieveOmgeving(context.supabase);
|
|
18
|
+
if (!env)
|
|
19
|
+
return { ok: false, totaal: 0, items: [], error: GEEN_KOPPELING };
|
|
20
|
+
return m.leesCorrecties(env, { p_status: data.status ?? null, p_zoek: data.zoek || null, p_limit: 25, p_offset: data.offset });
|
|
21
|
+
});
|
|
22
|
+
/** Open verzoeken (voor balk bovenaan, label in lijst en detail). */
|
|
23
|
+
export const listOpenSalesCorrections = createServerFn({ method: "POST" })
|
|
24
|
+
.middleware([requireSupabaseAuth])
|
|
25
|
+
.handler(async ({ context }) => {
|
|
26
|
+
const m = await import("./sales-corrections.server.js");
|
|
27
|
+
const env = await m.actieveOmgeving(context.supabase);
|
|
28
|
+
if (!env)
|
|
29
|
+
return { ok: true, available: false, items: [] };
|
|
30
|
+
const r = await m.leesCorrecties(env, { p_status: "PENDING", p_zoek: null, p_limit: 200, p_offset: 0 });
|
|
31
|
+
return { ok: r.ok, available: true, items: r.items, error: r.error };
|
|
32
|
+
});
|
|
33
|
+
/** Printstand van een order (Engine-pickvoortgang); onbekend telt als geprint. */
|
|
34
|
+
async function printStand(sb, orderRowId) {
|
|
35
|
+
if (!orderRowId)
|
|
36
|
+
return "onbekend";
|
|
37
|
+
const { loadPickProgress } = await import("./order-progress.server.js");
|
|
38
|
+
const r = await loadPickProgress(sb, [orderRowId]);
|
|
39
|
+
if (!r.available)
|
|
40
|
+
return "onbekend";
|
|
41
|
+
const p = r.pick.get(orderRowId);
|
|
42
|
+
return (Number(p?.cartsPrinted ?? 0) > 0 || Number(p?.cartsScanned ?? 0) > 0) ? "geprint" : "niet";
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Accepteren of afwijzen. Accepteren met al geprinte karren vraagt eerst een
|
|
46
|
+
* keuze ("Kar aanpassen" of "Laten zo"); zonder keuze gebeurt er niets.
|
|
47
|
+
* De order zelf wordt niet hier aangepast: na accepteren past Floriday de
|
|
48
|
+
* verkooporder aan, de spiegelronde neemt die over en de Engine deelt opnieuw in.
|
|
49
|
+
*/
|
|
50
|
+
export const decideSalesCorrection = createServerFn({ method: "POST" })
|
|
51
|
+
.middleware([requireSupabaseAuth])
|
|
52
|
+
.inputValidator((i) => z.object({
|
|
53
|
+
id: z.string().uuid(),
|
|
54
|
+
besluit: z.enum(["accept", "decline"]),
|
|
55
|
+
orderRowId: z.string().uuid().nullable().optional(),
|
|
56
|
+
keuzeNaPrint: z.enum(["kar_aanpassen", "laten_zo"]).nullable().optional(),
|
|
57
|
+
}).parse(i))
|
|
58
|
+
.handler(async ({ data, context }) => {
|
|
59
|
+
const { foutTekst, printVraag } = await import("./sales-corrections.js");
|
|
60
|
+
const rollen = await import("./beslis-rollen.server.js");
|
|
61
|
+
if (!(await rollen.magBeslissen(context.supabase, context.userId)))
|
|
62
|
+
return { ok: false, code: "no_permission", melding: foutTekst("no_permission") };
|
|
63
|
+
if (data.besluit === "accept" && !data.keuzeNaPrint) {
|
|
64
|
+
const stand = await printStand(context.supabase, data.orderRowId);
|
|
65
|
+
const vraag = printVraag(stand);
|
|
66
|
+
if (vraag)
|
|
67
|
+
return { ok: false, code: "confirm_print", vraag, melding: vraag };
|
|
68
|
+
}
|
|
69
|
+
const m = await import("./sales-corrections.server.js");
|
|
70
|
+
const env = await m.actieveOmgeving(context.supabase);
|
|
71
|
+
if (!env)
|
|
72
|
+
return { ok: false, code: "no_connection", melding: GEEN_KOPPELING };
|
|
73
|
+
const claims = context.claims ?? {};
|
|
74
|
+
const door = String(claims.user_metadata?.full_name ?? claims.user_metadata?.name ?? claims.email ?? context.userId).slice(0, 100);
|
|
75
|
+
const r = await m.besluitVersturen(env, { salesOrderCorrectionRequestId: data.id, besluit: data.besluit, door });
|
|
76
|
+
if (!r.ok)
|
|
77
|
+
return { ok: false, code: r.code ?? "unknown", melding: foutTekst(r.code, r.reason) };
|
|
78
|
+
const melding = data.besluit === "decline"
|
|
79
|
+
? "Het correctieverzoek is afgewezen."
|
|
80
|
+
: data.keuzeNaPrint === "kar_aanpassen"
|
|
81
|
+
? "Geaccepteerd. Zodra Floriday de order bijwerkt deelt de planning opnieuw in; pas de kar aan via Karindeling en print daarna een nieuwe pakbon."
|
|
82
|
+
: data.keuzeNaPrint === "laten_zo"
|
|
83
|
+
? "Geaccepteerd. De geprinte kar blijft zoals hij is."
|
|
84
|
+
: "Geaccepteerd. Zodra Floriday de order bijwerkt deelt de planning opnieuw in.";
|
|
85
|
+
return { ok: true, status: r.status ?? null, melding };
|
|
86
|
+
});
|
|
87
|
+
/** "Oude order, niet ingedeeld": ingehaalde order zonder uitzondering, met reden van de Engine. */
|
|
88
|
+
export const getBackfillIndeelStand = createServerFn({ method: "POST" })
|
|
89
|
+
.middleware([requireSupabaseAuth])
|
|
90
|
+
.inputValidator((i) => z.object({ orderRowId: z.string().uuid() }).parse(i))
|
|
91
|
+
.handler(async ({ data, context }) => {
|
|
92
|
+
const sb = context.supabase;
|
|
93
|
+
const { data: o, error } = await sb.from("orders").select("id, custom_fields, order_source").eq("id", data.orderRowId).maybeSingle();
|
|
94
|
+
if (error) {
|
|
95
|
+
console.error("[toch-indelen] order lezen:", error.message);
|
|
96
|
+
return { oud: false, reden: null, fout: "De indeelstand kon niet worden gelezen." };
|
|
97
|
+
}
|
|
98
|
+
if (!o)
|
|
99
|
+
return { oud: false, reden: null, fout: null };
|
|
100
|
+
const { isBackfillMarked } = await import("./backfill-flag.js");
|
|
101
|
+
if (!isBackfillMarked(o.custom_fields))
|
|
102
|
+
return { oud: false, reden: null, fout: null };
|
|
103
|
+
const { data: uitz, error: uErr } = await sb.from("logistics_backfill_uitzondering").select("order_id").eq("order_id", o.id).maybeSingle();
|
|
104
|
+
if (uErr) {
|
|
105
|
+
const missing = uErr.code === "42P01" || uErr.code === "PGRST205";
|
|
106
|
+
if (!missing) {
|
|
107
|
+
console.error("[toch-indelen] uitzondering lezen:", uErr.message);
|
|
108
|
+
return { oud: false, reden: null, fout: "De indeelstand kon niet worden gelezen." };
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (uitz)
|
|
112
|
+
return { oud: false, reden: null, fout: null };
|
|
113
|
+
const { data: reden, error: rErr } = await sb.rpc("logistics_backfill_reden_cf", { p_cf: o.custom_fields, p_bron: o.order_source ?? null });
|
|
114
|
+
if (rErr)
|
|
115
|
+
console.error("[toch-indelen] reden lezen:", rErr.message);
|
|
116
|
+
return { oud: true, reden: typeof reden === "string" ? reden : null, fout: rErr ? "De reden kon niet worden gelezen." : null };
|
|
117
|
+
});
|
|
118
|
+
export const tochIndelen = createServerFn({ method: "POST" })
|
|
119
|
+
.middleware([requireSupabaseAuth])
|
|
120
|
+
.inputValidator((i) => z.object({ orderRowId: z.string().uuid(), reden: z.string().trim().max(300).optional() }).parse(i))
|
|
121
|
+
.handler(async ({ data, context }) => {
|
|
122
|
+
const { data: r, error } = await context.supabase.rpc("logistics_backfill_toch_indelen", { p_order_id: data.orderRowId, p_reden: data.reden || null });
|
|
123
|
+
if (error) {
|
|
124
|
+
console.error("[toch-indelen]", error.code, error.message);
|
|
125
|
+
if (error.code === "42883" || error.code === "PGRST202")
|
|
126
|
+
return { ok: false, melding: "Toch indelen is nog niet beschikbaar; de Logistiek Engine moet eerst worden bijgewerkt." };
|
|
127
|
+
if (error.code === "42501" || /recht|permission/i.test(error.message))
|
|
128
|
+
return { ok: false, melding: "Je hebt geen recht om deze order toch in te delen." };
|
|
129
|
+
return { ok: false, melding: "Toch indelen lukte niet. Probeer het opnieuw of neem contact op met de beheerder." };
|
|
130
|
+
}
|
|
131
|
+
return { ok: r?.ok === true, melding: String(r?.tekst ?? (r?.ok ? "De order wordt alsnog ingedeeld." : "Toch indelen lukte niet.")) };
|
|
132
|
+
});
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
// Correctieverzoeken van kopers (Floriday sales-order-correction-requests).
|
|
2
|
+
// Alleen weergave- en teksthulp; lezen/beslissen loopt via de gateway van de
|
|
3
|
+
// Floriday-koppeling (sales-corrections.server.ts). Client-veilig.
|
|
4
|
+
import { fmtNL } from "./nl-datetime.js";
|
|
5
|
+
const s = (v) => (typeof v === "string" && v.trim() ? v : null);
|
|
6
|
+
export function parseCorrection(x) {
|
|
7
|
+
const id = s(x?.id);
|
|
8
|
+
if (!id)
|
|
9
|
+
return null;
|
|
10
|
+
return {
|
|
11
|
+
id,
|
|
12
|
+
salesOrderId: s(x.salesOrderId),
|
|
13
|
+
status: String(x.status ?? "").toUpperCase(),
|
|
14
|
+
isCancelRequest: x.isCancelRequest === true,
|
|
15
|
+
expiresAt: s(x.expiresAt),
|
|
16
|
+
numberOfPieces: x.numberOfPieces ?? null,
|
|
17
|
+
pricePerPiece: x.pricePerPiece ?? null,
|
|
18
|
+
package: x.package ?? null,
|
|
19
|
+
piecesPerPackage: x.piecesPerPackage ?? null,
|
|
20
|
+
latestDeliveryDateTime: x.latestDeliveryDateTime ?? null,
|
|
21
|
+
deliveryLocation: x.deliveryLocation ?? null,
|
|
22
|
+
reason: s(typeof x.reason === "object" ? x.reason?.text : x.reason),
|
|
23
|
+
besluit: s(x.besluit),
|
|
24
|
+
besluitDoor: s(x.besluitDoor),
|
|
25
|
+
besluitAt: s(x.besluitAt),
|
|
26
|
+
besluitFout: s(x.besluitFout),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export function isOpen(c, now = new Date()) {
|
|
30
|
+
if (c.status !== "PENDING")
|
|
31
|
+
return false;
|
|
32
|
+
return !c.expiresAt || Date.parse(c.expiresAt) > now.getTime();
|
|
33
|
+
}
|
|
34
|
+
const AMS_DAY = (d) => new Intl.DateTimeFormat("en-CA", { timeZone: "Europe/Amsterdam" }).format(d);
|
|
35
|
+
/** "vandaag 18:00", "morgen 18:00" of "do 14 nov 18:00" (Europe/Amsterdam). */
|
|
36
|
+
export function deadlineMoment(expiresAt, now = new Date()) {
|
|
37
|
+
const d = new Date(expiresAt);
|
|
38
|
+
const tijd = fmtNL(d, { hour: "2-digit", minute: "2-digit" }) ?? "";
|
|
39
|
+
const dag = AMS_DAY(d);
|
|
40
|
+
if (dag === AMS_DAY(now))
|
|
41
|
+
return `vandaag ${tijd}`;
|
|
42
|
+
if (dag === AMS_DAY(new Date(now.getTime() + 86400000)))
|
|
43
|
+
return `morgen ${tijd}`;
|
|
44
|
+
return `${fmtNL(d, { weekday: "short", day: "numeric", month: "short" }) ?? ""} ${tijd}`;
|
|
45
|
+
}
|
|
46
|
+
/** "Reageren vóór morgen 18:00" / "Verlopen" / "Geen deadline bekend". */
|
|
47
|
+
export function deadlineTekst(c, now = new Date()) {
|
|
48
|
+
if (c.status === "ACCEPTED")
|
|
49
|
+
return "Geaccepteerd";
|
|
50
|
+
if (c.status === "DECLINED")
|
|
51
|
+
return "Afgewezen";
|
|
52
|
+
if (!c.expiresAt)
|
|
53
|
+
return "Geen deadline bekend";
|
|
54
|
+
if (Date.parse(c.expiresAt) <= now.getTime() || c.status === "EXPIRED")
|
|
55
|
+
return "Verlopen";
|
|
56
|
+
if (c.status !== "PENDING")
|
|
57
|
+
return "Afgehandeld";
|
|
58
|
+
return `Reageren vóór ${deadlineMoment(c.expiresAt, now)}`;
|
|
59
|
+
}
|
|
60
|
+
/** Bijna verlopen: minder dan 2 uur over (zelfde grens als de koppeling). */
|
|
61
|
+
export function bijnaVerlopen(c, now = new Date()) {
|
|
62
|
+
if (!isOpen(c, now) || !c.expiresAt)
|
|
63
|
+
return false;
|
|
64
|
+
return Date.parse(c.expiresAt) - now.getTime() <= 2 * 3600000;
|
|
65
|
+
}
|
|
66
|
+
/** Balk bovenaan Verkoop. null = geen open verzoeken. */
|
|
67
|
+
export function balkTekst(open, now = new Date()) {
|
|
68
|
+
const lijst = open.filter((c) => isOpen(c, now));
|
|
69
|
+
if (!lijst.length)
|
|
70
|
+
return null;
|
|
71
|
+
const eerst = lijst.map((c) => c.expiresAt).filter((v) => !!v).sort()[0];
|
|
72
|
+
const wie = lijst.length === 1 ? "1 correctieverzoek wacht" : `${lijst.length} correctieverzoeken wachten`;
|
|
73
|
+
return eerst ? `${wie} op je reactie, uiterlijk ${deadlineMoment(eerst, now)}.` : `${wie} op je reactie.`;
|
|
74
|
+
}
|
|
75
|
+
/** Foutcodes uit het koppelcontract → één rustige zin. */
|
|
76
|
+
export function foutTekst(code, reden) {
|
|
77
|
+
switch (code) {
|
|
78
|
+
case "validation": return "Het verzoek is niet compleet. Vernieuw de pagina en probeer het opnieuw.";
|
|
79
|
+
case "unknown_request": return "Dit correctieverzoek is nog niet binnen. Probeer het over een minuut opnieuw.";
|
|
80
|
+
case "already_decided": return "Over dit correctieverzoek is al beslist.";
|
|
81
|
+
case "expired": return "De deadline van dit correctieverzoek is voorbij; je kunt niet meer reageren.";
|
|
82
|
+
case "read_only": return "De Floriday-koppeling staat op alleen lezen. Vraag de beheerder om schrijven aan te zetten.";
|
|
83
|
+
case "no_permission": return "Je hebt geen recht om correctieverzoeken te beantwoorden.";
|
|
84
|
+
case "floriday_rejected": return reden ? `Floriday wees het besluit af: ${reden}` : "Floriday wees het besluit af. Probeer het opnieuw of neem contact op met de beheerder.";
|
|
85
|
+
case "floriday_unavailable": return "Floriday is nu niet bereikbaar. Probeer het later opnieuw.";
|
|
86
|
+
default: return "Het besluit kon niet worden verstuurd. Probeer het opnieuw of neem contact op met de beheerder.";
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// ── Oud → nieuw ──────────────────────────────────────────────────────────
|
|
90
|
+
const num = (v) => {
|
|
91
|
+
const x = typeof v === "object" && v !== null ? v.value : v;
|
|
92
|
+
const n = typeof x === "string" ? Number(x) : x;
|
|
93
|
+
return typeof n === "number" && Number.isFinite(n) ? n : null;
|
|
94
|
+
};
|
|
95
|
+
const eur = (n) => new Intl.NumberFormat("nl-NL", { style: "currency", currency: "EUR", minimumFractionDigits: 2, maximumFractionDigits: 3 }).format(n);
|
|
96
|
+
const fust = (v) => s(v?.vbnPackageCode != null ? String(v.vbnPackageCode) : v?.code != null ? String(v.code) : typeof v === "string" || typeof v === "number" ? String(v) : null);
|
|
97
|
+
const datum = (v) => { const t = s(v); return t ? fmtNL(new Date(t), { weekday: "short", day: "numeric", month: "short" }) : null; };
|
|
98
|
+
const locatie = (v) => s(v?.name) ?? s(v?.gln) ?? s(v?.locationId) ?? s(v?.deliveryLocationId) ?? (typeof v === "string" ? v : null);
|
|
99
|
+
/**
|
|
100
|
+
* Gevraagde wijzigingen naast de huidige Floriday-order (o = salesorder-data).
|
|
101
|
+
* Alleen velden die de koper meestuurt en die echt anders zijn.
|
|
102
|
+
*/
|
|
103
|
+
export function verschillen(o, c) {
|
|
104
|
+
if (c.isCancelRequest)
|
|
105
|
+
return [{ veld: "Order", oud: "Actief", nieuw: "Annuleren" }];
|
|
106
|
+
const out = [];
|
|
107
|
+
const add = (veld, oud, nieuw) => {
|
|
108
|
+
if (nieuw == null || oud === nieuw)
|
|
109
|
+
return;
|
|
110
|
+
out.push({ veld, oud: oud ?? "—", nieuw });
|
|
111
|
+
};
|
|
112
|
+
const n = num(c.numberOfPieces), on = num(o?.numberOfPieces);
|
|
113
|
+
add("Aantal stuks", on == null ? null : String(on), n == null ? null : String(n));
|
|
114
|
+
const p = num(c.pricePerPiece), op = num(o?.pricePerPiece);
|
|
115
|
+
add("Prijs per stuk", op == null ? null : eur(op), p == null ? null : eur(p));
|
|
116
|
+
add("Fust", fust(o?.packingConfiguration?.package ?? o?.package), fust(c.package));
|
|
117
|
+
const ppp = num(c.piecesPerPackage), oppp = num(o?.packingConfiguration?.piecesPerPackage ?? o?.piecesPerPackage);
|
|
118
|
+
add("Stuks per fust", oppp == null ? null : String(oppp), ppp == null ? null : String(ppp));
|
|
119
|
+
add("Leverdag", datum(o?.delivery?.latestDeliveryDateTime), datum(c.latestDeliveryDateTime));
|
|
120
|
+
add("Afleverlocatie", locatie(o?.delivery?.location ?? o?.delivery?.deliveryLocation), locatie(c.deliveryLocation));
|
|
121
|
+
return out;
|
|
122
|
+
}
|
|
123
|
+
export function printVraag(stand) {
|
|
124
|
+
if (stand === "niet")
|
|
125
|
+
return null;
|
|
126
|
+
if (stand === "onbekend")
|
|
127
|
+
return "De pickstand is nu niet bekend. Er kan al een pakbon of karlabel geprint zijn.";
|
|
128
|
+
return "Voor deze order is al een pakbon of karlabel geprint.";
|
|
129
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** Omgeving van de actieve Floriday-koppeling; null = geen koppeling. */
|
|
2
|
+
export declare function actieveOmgeving(sb: any): Promise<string | null>;
|
|
3
|
+
export interface CorrectionsList {
|
|
4
|
+
ok: boolean;
|
|
5
|
+
totaal: number;
|
|
6
|
+
items: any[];
|
|
7
|
+
error?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function leesCorrecties(environment: string, args: {
|
|
10
|
+
p_status?: string | null;
|
|
11
|
+
p_zoek?: string | null;
|
|
12
|
+
p_limit: number;
|
|
13
|
+
p_offset: number;
|
|
14
|
+
}): Promise<CorrectionsList>;
|
|
15
|
+
export interface DecideResult {
|
|
16
|
+
ok: boolean;
|
|
17
|
+
code?: string;
|
|
18
|
+
reason?: string;
|
|
19
|
+
status?: string;
|
|
20
|
+
}
|
|
21
|
+
export declare function besluitVersturen(environment: string, payload: {
|
|
22
|
+
salesOrderCorrectionRequestId: string;
|
|
23
|
+
besluit: "accept" | "decline";
|
|
24
|
+
door: string;
|
|
25
|
+
stockApplication?: "DIRECT" | "NEVER";
|
|
26
|
+
}): Promise<DecideResult>;
|
|
27
|
+
//# sourceMappingURL=sales-corrections.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sales-corrections.server.d.ts","sourceRoot":"","sources":["../../src/lib/sales-corrections.server.ts"],"names":[],"mappings":"AA4BA,yEAAyE;AACzE,wBAAsB,eAAe,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASrE;AAED,MAAM,WAAW,eAAe;IAAG,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE;AAE9F,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAajL;AAED,MAAM,WAAW,YAAY;IAAG,EAAE,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;AAE9F,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,6BAA6B,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAazN"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
// Server-only: correctieverzoeken via de gateway van de Floriday-koppeling.
|
|
2
|
+
// Lezen: POST /api/public/gateway/corrections-read { environment, op:"sales-corrections-list", args }
|
|
3
|
+
// Schrijven: POST /api/public/gateway/write action "sales_correction_decide".
|
|
4
|
+
// Beide met HMAC over `${ms}.${body}` (zoals klok-gateway.server.ts); geheim en adres
|
|
5
|
+
// uit central-secrets.server.ts. Fail closed: fout = code + zin, nooit een gok.
|
|
6
|
+
async function hmacHex(secret, payload) {
|
|
7
|
+
const key = await globalThis.crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
|
|
8
|
+
const sig = await globalThis.crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload));
|
|
9
|
+
return Array.from(new Uint8Array(sig)).map((b) => b.toString(16).padStart(2, "0")).join("");
|
|
10
|
+
}
|
|
11
|
+
async function signedPost(path, bodyObj, timeoutMs) {
|
|
12
|
+
const { getFloridayGatewaySecret, getGatewayBaseUrl } = await import("./central-secrets.server.js");
|
|
13
|
+
const secret = await getFloridayGatewaySecret();
|
|
14
|
+
const base = await getGatewayBaseUrl();
|
|
15
|
+
const body = JSON.stringify(bodyObj);
|
|
16
|
+
const timestamp = String(Date.now());
|
|
17
|
+
const signature = await hmacHex(secret, `${timestamp}.${body}`);
|
|
18
|
+
const res = await fetch(`${base}${path}`, {
|
|
19
|
+
method: "POST",
|
|
20
|
+
headers: { "Content-Type": "application/json", "x-floriday-timestamp": timestamp, "x-floriday-signature": `sha256=${signature}`, "x-floriday-caller": "verkoop" },
|
|
21
|
+
body,
|
|
22
|
+
signal: AbortSignal.timeout(timeoutMs),
|
|
23
|
+
});
|
|
24
|
+
return { status: res.status, json: await res.json().catch(() => null) };
|
|
25
|
+
}
|
|
26
|
+
/** Omgeving van de actieve Floriday-koppeling; null = geen koppeling. */
|
|
27
|
+
export async function actieveOmgeving(sb) {
|
|
28
|
+
const { data, error } = await sb.rpc("get_active_floriday_connection_public");
|
|
29
|
+
if (error) {
|
|
30
|
+
if (error.code === "42883" || error.code === "PGRST202")
|
|
31
|
+
return null;
|
|
32
|
+
throw new Error(`Floriday-koppeling kon niet worden gecontroleerd: ${error.message}`);
|
|
33
|
+
}
|
|
34
|
+
const rows = Array.isArray(data) ? data : data ? [data] : [];
|
|
35
|
+
const r = rows.find((x) => typeof x?.id === "string");
|
|
36
|
+
return r ? String(r.active_environment ?? r.environment ?? "") || null : null;
|
|
37
|
+
}
|
|
38
|
+
export async function leesCorrecties(environment, args) {
|
|
39
|
+
try {
|
|
40
|
+
const { status, json } = await signedPost("/api/public/gateway/corrections-read", { environment, op: "sales-corrections-list", args }, 10000);
|
|
41
|
+
if (!json || json.ok !== true) {
|
|
42
|
+
console.error("[correcties] lezen mislukt", status, json?.code ?? json?.error ?? "");
|
|
43
|
+
return { ok: false, totaal: 0, items: [], error: "De correctieverzoeken konden niet worden opgehaald. Probeer het opnieuw." };
|
|
44
|
+
}
|
|
45
|
+
const d = json.data ?? {};
|
|
46
|
+
return { ok: true, totaal: Number(d.totaal ?? 0) || 0, items: Array.isArray(d.items) ? d.items : [] };
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
console.error("[correcties] lezen mislukt", e?.message ?? e);
|
|
50
|
+
return { ok: false, totaal: 0, items: [], error: "Floriday is nu niet bereikbaar. Probeer het later opnieuw." };
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
export async function besluitVersturen(environment, payload) {
|
|
54
|
+
try {
|
|
55
|
+
const { status, json } = await signedPost("/api/public/gateway/write", { environment, module: "verkoop", action: "sales_correction_decide", payload }, 30000);
|
|
56
|
+
if (!json || typeof json !== "object") {
|
|
57
|
+
console.error("[correcties] onleesbaar antwoord", status);
|
|
58
|
+
return { ok: false, code: "floriday_unavailable" };
|
|
59
|
+
}
|
|
60
|
+
if (json.ok !== true)
|
|
61
|
+
return { ok: false, code: String(json.code ?? `http_${status}`), reason: json.reason ?? json.error ?? undefined };
|
|
62
|
+
return { ok: true, status: json.status };
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
console.error("[correcties] besluit mislukt", e?.message ?? e);
|
|
66
|
+
return { ok: false, code: "floriday_unavailable" };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -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;;;;;;;;;;;;;2DAU7B,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;;;;;;;;;;;;;2DAU7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkD7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;;GAiB7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;GAW7B,CAAC"}
|
|
@@ -73,6 +73,11 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
73
73
|
.handler(async ({ data, context }) => {
|
|
74
74
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
75
75
|
const { buildSalesOrdersList } = await import("./salesorders-list.server.js");
|
|
76
|
+
const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
|
|
77
|
+
const orderId = `local:${data.id}`;
|
|
78
|
+
// Ophaalmoment hangt alleen van het order-id af: tegelijk met de order starten
|
|
79
|
+
// (gooit nooit; eigen tijdslimiet). Zonder order wordt de uitkomst genegeerd.
|
|
80
|
+
const pickupTask = loadPickupMomentForDetail(context.supabase, orderId);
|
|
76
81
|
const result = await buildSalesOrdersList(context.supabase, {
|
|
77
82
|
dateField: "ordered",
|
|
78
83
|
tab: "all",
|
|
@@ -82,28 +87,29 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
82
87
|
}, supabaseAdmin);
|
|
83
88
|
const { setResponseHeader } = await import("@tanstack/react-start/server");
|
|
84
89
|
setServerTiming(setResponseHeader, result.timing, "getLocalSalesOrderDetail");
|
|
85
|
-
const orderId = `local:${data.id}`;
|
|
86
90
|
const order = result.rows.find((row) => row.id === orderId) ?? null;
|
|
87
91
|
const bufferSiblings = order?.bufferId
|
|
88
92
|
? result.rows.filter((row) => row.bufferId === order.bufferId && row.id !== order.id)
|
|
89
93
|
: [];
|
|
90
|
-
if (order && order.bufferId && bufferSiblings.length > 0) {
|
|
91
|
-
const { loadBufferCarts } = await import("./plan-coverage.server.js");
|
|
92
|
-
const b = await loadBufferCarts(context.supabase, data.id);
|
|
93
|
-
order.bufferCartCount = b.count;
|
|
94
|
-
order.bufferCartTypeName = b.typeName;
|
|
95
|
-
}
|
|
96
94
|
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
97
|
-
|
|
98
|
-
const
|
|
95
|
+
// Buffertelling, factuur/pickstand en ophaalmoment tegelijk (voorheen na elkaar).
|
|
96
|
+
const bufferTask = order && order.bufferId && bufferSiblings.length > 0
|
|
97
|
+
? import("./plan-coverage.server.js").then(({ loadBufferCarts }) => loadBufferCarts(context.supabase, data.id))
|
|
98
|
+
: Promise.resolve(null);
|
|
99
|
+
const [progress, pickupMoment, b] = order
|
|
99
100
|
? await Promise.all([
|
|
100
101
|
attachDetailProgress(context.supabase, [order, ...bufferSiblings]).catch(() => ({
|
|
101
102
|
features: { erpInvoices: false, pickProgress: false },
|
|
102
103
|
invoice: "failed",
|
|
103
104
|
})),
|
|
104
|
-
|
|
105
|
+
pickupTask,
|
|
106
|
+
bufferTask,
|
|
105
107
|
])
|
|
106
|
-
: [undefined, null];
|
|
108
|
+
: [undefined, null, null];
|
|
109
|
+
if (order && b) {
|
|
110
|
+
order.bufferCartCount = b.count;
|
|
111
|
+
order.bufferCartTypeName = b.typeName;
|
|
112
|
+
}
|
|
107
113
|
return {
|
|
108
114
|
order,
|
|
109
115
|
progress,
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface StepTimer {
|
|
2
|
+
time<T>(step: string, fn: () => Promise<T>): Promise<T>;
|
|
3
|
+
/** Logt de meting en zet de Server-Timing-header (fouten bij de header worden genegeerd: alleen meting). */
|
|
4
|
+
finish(): Promise<{
|
|
5
|
+
totalMs: number;
|
|
6
|
+
steps: {
|
|
7
|
+
step: string;
|
|
8
|
+
ms: number;
|
|
9
|
+
}[];
|
|
10
|
+
}>;
|
|
11
|
+
}
|
|
12
|
+
export declare function makeStepTimer(name: string): StepTimer;
|
|
13
|
+
//# sourceMappingURL=step-timer.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-timer.server.d.ts","sourceRoot":"","sources":["../../src/lib/step-timer.server.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxD,4GAA4G;IAC5G,MAAM,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAAE,CAAC,CAAC;CAC/E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CA4BrD"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
// Meting per stap van één serververzoek: console-regel plus Server-Timing-header.
|
|
2
|
+
// Alleen meten; verandert niets aan de uitkomst van het verzoek.
|
|
3
|
+
export function makeStepTimer(name) {
|
|
4
|
+
const start = Date.now();
|
|
5
|
+
const steps = [];
|
|
6
|
+
return {
|
|
7
|
+
async time(step, fn) {
|
|
8
|
+
const s = Date.now();
|
|
9
|
+
try {
|
|
10
|
+
return await fn();
|
|
11
|
+
}
|
|
12
|
+
finally {
|
|
13
|
+
steps.push({ step, ms: Date.now() - s });
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
async finish() {
|
|
17
|
+
const totalMs = Date.now() - start;
|
|
18
|
+
console.log(`[${name}] totaal=${totalMs}ms ` + steps.map((s) => `${s.step}=${s.ms}`).join(" "));
|
|
19
|
+
try {
|
|
20
|
+
const { setResponseHeader } = await import("@tanstack/react-start/server");
|
|
21
|
+
const parts = [
|
|
22
|
+
`total;dur=${totalMs};desc="${name}"`,
|
|
23
|
+
...steps.map((s, i) => `${s.step.replace(/[^A-Za-z0-9_]/g, "_") || `s${i}`};dur=${s.ms}`),
|
|
24
|
+
];
|
|
25
|
+
setResponseHeader("Server-Timing", parts.join(", "));
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
console.warn(`[${name}] Server-Timing niet gezet:`, e?.message ?? e);
|
|
29
|
+
}
|
|
30
|
+
return { totalMs, steps };
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stock-product-link.server.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3G,MAAM,MAAM,eAAe,GAAG,2BAA2B,GAAG,UAAU,CAAC;AACvE,eAAO,IAAI,mBAAmB,EAAE,eAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"stock-product-link.server.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3G,MAAM,MAAM,eAAe,GAAG,2BAA2B,GAAG,UAAU,CAAC;AACvE,eAAO,IAAI,mBAAmB,EAAE,eAA4B,CAAC;AAgB7D,wBAAsB,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAoC5F"}
|