@flowselections/floriday-verkoop-module 1.0.153 → 1.0.155
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 +56 -30
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts +3 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.js +2 -2
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +44 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/OrderTransportCard.js +96 -0
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +2 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +3 -3
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +8 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +15 -5
- package/dist-lib/components/verkoop/klok/KlokNotice.d.ts +3 -0
- package/dist-lib/components/verkoop/klok/KlokNotice.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/KlokNotice.js +12 -0
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts +2 -0
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +382 -0
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts +10 -0
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +119 -0
- package/dist-lib/components/verkoop/klok/KlokPage.d.ts +2 -0
- package/dist-lib/components/verkoop/klok/KlokPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/KlokPage.js +61 -0
- package/dist-lib/components/verkoop/klok/KlokStatusBadge.d.ts +5 -0
- package/dist-lib/components/verkoop/klok/KlokStatusBadge.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/KlokStatusBadge.js +20 -0
- package/dist-lib/components/verkoop/klok/useKlok.d.ts +17 -0
- package/dist-lib/components/verkoop/klok/useKlok.d.ts.map +1 -0
- package/dist-lib/components/verkoop/klok/useKlok.js +36 -0
- package/dist-lib/index.d.ts +2 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +8 -1
- package/dist-lib/integrations/supabase/types.d.ts +1168 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/all-rows.d.ts +11 -0
- package/dist-lib/lib/all-rows.d.ts.map +1 -0
- package/dist-lib/lib/all-rows.js +20 -0
- package/dist-lib/lib/belading.server.d.ts.map +1 -1
- package/dist-lib/lib/belading.server.js +20 -9
- package/dist-lib/lib/create-order-form.d.ts +22 -0
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +37 -0
- package/dist-lib/lib/create-order.functions.d.ts +20 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +51 -2
- package/dist-lib/lib/floriday-mirror.server.js +1 -1
- package/dist-lib/lib/klok-form.d.ts +47 -0
- package/dist-lib/lib/klok-form.d.ts.map +1 -0
- package/dist-lib/lib/klok-form.js +51 -0
- package/dist-lib/lib/klok-gateway.server.d.ts +35 -0
- package/dist-lib/lib/klok-gateway.server.d.ts.map +1 -0
- package/dist-lib/lib/klok-gateway.server.js +123 -0
- package/dist-lib/lib/klok-labels.d.ts +63 -0
- package/dist-lib/lib/klok-labels.d.ts.map +1 -0
- package/dist-lib/lib/klok-labels.js +153 -0
- package/dist-lib/lib/klok-sales-row.d.ts +2 -0
- package/dist-lib/lib/klok-sales-row.d.ts.map +1 -0
- package/dist-lib/lib/klok-sales-row.js +5 -0
- package/dist-lib/lib/klok-sales.server.d.ts +5 -0
- package/dist-lib/lib/klok-sales.server.d.ts.map +1 -0
- package/dist-lib/lib/klok-sales.server.js +33 -0
- package/dist-lib/lib/klok.functions.d.ts +265 -0
- package/dist-lib/lib/klok.functions.d.ts.map +1 -0
- package/dist-lib/lib/klok.functions.js +355 -0
- package/dist-lib/lib/klok.server.d.ts +76 -0
- package/dist-lib/lib/klok.server.d.ts.map +1 -0
- package/dist-lib/lib/klok.server.js +401 -0
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-search.d.ts +16 -0
- package/dist-lib/lib/order-search.d.ts.map +1 -1
- package/dist-lib/lib/order-search.js +16 -1
- package/dist-lib/lib/order-transport.functions.d.ts +49 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-transport.functions.js +42 -0
- package/dist-lib/lib/order-transport.server.d.ts +16 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -0
- package/dist-lib/lib/order-transport.server.js +43 -0
- package/dist-lib/lib/own-transport.d.ts +16 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +28 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +20 -17
- package/dist-lib/lib/salesorders-mapping.d.ts +5 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +1 -0
- package/package.json +20 -3
- package/schema/verkoop.sql +213 -0
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export declare const ALLE_RIJEN_PORTIE = 1000;
|
|
2
|
+
export declare function alleRijen<T = any>(page: (from: number, to: number) => PromiseLike<{
|
|
3
|
+
data: T[] | null;
|
|
4
|
+
error: {
|
|
5
|
+
message: string;
|
|
6
|
+
} | null;
|
|
7
|
+
}>, opts?: {
|
|
8
|
+
portie?: number;
|
|
9
|
+
max?: number;
|
|
10
|
+
}): Promise<T[]>;
|
|
11
|
+
//# sourceMappingURL=all-rows.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"all-rows.d.ts","sourceRoot":"","sources":["../../src/lib/all-rows.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC,wBAAsB,SAAS,CAAC,CAAC,GAAG,GAAG,EACrC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,WAAW,CAAC;IAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,CAAC,EACxG,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3C,OAAO,CAAC,CAAC,EAAE,CAAC,CAad"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// Alle rijen lezen in porties van 1000 (de server geeft per verzoek nooit meer).
|
|
2
|
+
// Zelfde werkwijze als alleRijen() in de voorraadmodule. Een fout wordt
|
|
3
|
+
// doorgegeven, nooit stil afgekapt; een veiligheidsgrens voorkomt eindeloos lezen.
|
|
4
|
+
export const ALLE_RIJEN_PORTIE = 1000;
|
|
5
|
+
export async function alleRijen(page, opts = {}) {
|
|
6
|
+
const portie = opts.portie ?? ALLE_RIJEN_PORTIE;
|
|
7
|
+
const max = opts.max ?? 100000;
|
|
8
|
+
const out = [];
|
|
9
|
+
for (let from = 0; from < max; from += portie) {
|
|
10
|
+
const { data, error } = await page(from, from + portie - 1);
|
|
11
|
+
if (error)
|
|
12
|
+
throw new Error(error.message);
|
|
13
|
+
const rows = data ?? [];
|
|
14
|
+
out.push(...rows);
|
|
15
|
+
if (rows.length < portie)
|
|
16
|
+
return out;
|
|
17
|
+
}
|
|
18
|
+
console.error(`[alleRijen] veiligheidsgrens van ${max} rijen bereikt; lijst kan onvolledig zijn`);
|
|
19
|
+
return out;
|
|
20
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"belading.server.d.ts","sourceRoot":"","sources":["../../src/lib/belading.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"belading.server.d.ts","sourceRoot":"","sources":["../../src/lib/belading.server.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4EAA4E;IAC5E,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAWD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,GAAG,EACb,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CA+O3C"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Beladingen (packing-configuraties) per product — centrale bron.
|
|
2
2
|
// Geen eigen controle op ladingdragers: alleen de Logistiek Engine beslist
|
|
3
3
|
// of een belading kan (koppelprompt 22).
|
|
4
|
+
import { alleRijen } from "./all-rows.js";
|
|
4
5
|
import { cratePackageName, loadCarrierName } from "./load-carrier-labels.js";
|
|
5
6
|
import { posOrNull } from "./packing-snapshot.js";
|
|
6
7
|
/**
|
|
@@ -13,10 +14,13 @@ export async function computeBeladingByProduct(supabase, productIds) {
|
|
|
13
14
|
const byProduct = {};
|
|
14
15
|
if (!ids.length)
|
|
15
16
|
return byProduct;
|
|
16
|
-
const
|
|
17
|
+
const giRows = await alleRijen((f, t) => supabase
|
|
17
18
|
.from("product_group_items")
|
|
18
19
|
.select("product_group_id, trade_item_id, sort_order")
|
|
19
|
-
.in("product_group_id", ids)
|
|
20
|
+
.in("product_group_id", ids)
|
|
21
|
+
.order("product_group_id")
|
|
22
|
+
.order("trade_item_id")
|
|
23
|
+
.range(f, t)).catch((e) => { console.error("[belading] productgroepen lezen mislukt:", e?.message ?? e); return []; });
|
|
20
24
|
const membersByGroup = new Map();
|
|
21
25
|
for (const gi of giRows ?? []) {
|
|
22
26
|
const gid = gi.product_group_id;
|
|
@@ -25,16 +29,22 @@ export async function computeBeladingByProduct(supabase, productIds) {
|
|
|
25
29
|
membersByGroup.set(gid, arr);
|
|
26
30
|
}
|
|
27
31
|
const lookupIds = Array.from(new Set([...ids, ...Array.from(membersByGroup.values()).flat()]));
|
|
32
|
+
// Zoals voorheen: één bron die faalt maakt de rest niet onbruikbaar, maar wordt wel gelogd.
|
|
33
|
+
const asRes = (p, bron) => p.then((data) => ({ data, error: null }), (e) => { console.error(`[belading] ${bron} lezen mislukt:`, e?.message ?? e); return { data: [], error: e }; });
|
|
28
34
|
const [tiRes, draftRes, prodRes] = await Promise.all([
|
|
29
|
-
supabase
|
|
35
|
+
asRes(alleRijen((f, t) => supabase
|
|
30
36
|
.from("floriday_trade_items_cache")
|
|
31
37
|
.select("floriday_id, data")
|
|
32
|
-
.in("floriday_id", lookupIds)
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
.in("floriday_id", lookupIds)
|
|
39
|
+
.order("floriday_id")
|
|
40
|
+
.range(f, t)), "trade items"),
|
|
41
|
+
asRes(alleRijen((f, t) => supabase.from("trade_item_drafts").select("id, data").in("id", lookupIds).order("id").range(f, t)), "concepten"),
|
|
42
|
+
asRes(alleRijen((f, t) => supabase
|
|
35
43
|
.from("products")
|
|
36
44
|
.select("id, plants_per_crate, crates_per_layer, layers_per_cart, custom_fields, trade_item_key")
|
|
37
|
-
.in("id", lookupIds)
|
|
45
|
+
.in("id", lookupIds)
|
|
46
|
+
.order("id")
|
|
47
|
+
.range(f, t)), "producten"),
|
|
38
48
|
]);
|
|
39
49
|
const packsById = new Map();
|
|
40
50
|
const push = (key, ppc, cpl, lpc, isDefault, crateCode, cartCode) => {
|
|
@@ -126,11 +136,12 @@ export async function computeBeladingByProduct(supabase, productIds) {
|
|
|
126
136
|
// Fust-omschrijvingen (Floricode/VBN) voor de weergave van het type.
|
|
127
137
|
const crateDescriptions = {};
|
|
128
138
|
{
|
|
129
|
-
const
|
|
139
|
+
const floricodeRows = await alleRijen((f, t) => supabase
|
|
130
140
|
.from("floricode_records")
|
|
131
141
|
.select("data")
|
|
132
142
|
.eq("resource", "LoadCarrier")
|
|
133
|
-
.
|
|
143
|
+
.order("record_id")
|
|
144
|
+
.range(f, t)).catch((e) => { console.error("[belading] fustomschrijvingen lezen mislukt:", e?.message ?? e); return []; });
|
|
134
145
|
for (const row of floricodeRows ?? []) {
|
|
135
146
|
const d = row.data ?? {};
|
|
136
147
|
if (d?.code == null)
|
|
@@ -44,6 +44,28 @@ export declare function applyFirstFeasible(s: {
|
|
|
44
44
|
export declare function attentionItems(s: {
|
|
45
45
|
linesWithoutPrice: number;
|
|
46
46
|
linesOverStock: number;
|
|
47
|
+
linesPriceError?: number;
|
|
47
48
|
}): string[];
|
|
49
|
+
export type OrderprijsBron = "klantprijs" | "prijsgroep" | "klantkorting" | "standaardprijs";
|
|
50
|
+
export interface Orderprijs {
|
|
51
|
+
net_price: number;
|
|
52
|
+
currency: string | null;
|
|
53
|
+
bron: string | null;
|
|
54
|
+
price_group_id: string | null;
|
|
55
|
+
price_group_name: string | null;
|
|
56
|
+
}
|
|
57
|
+
export type OrderprijsUitkomst = {
|
|
58
|
+
ok: true;
|
|
59
|
+
prijs: Orderprijs | null;
|
|
60
|
+
} | {
|
|
61
|
+
ok: false;
|
|
62
|
+
};
|
|
63
|
+
export declare const PRIJS_FOUT_TEXT = "Prijs ophalen lukt niet; vul hem zelf in of probeer het opnieuw.";
|
|
64
|
+
/** "Prijsgroep: Groothandel", "Klantprijs", "Klantkorting", "Standaardprijs". */
|
|
65
|
+
export declare function prijsBronLabel(p: Pick<Orderprijs, "bron" | "price_group_name"> | null | undefined): string | null;
|
|
66
|
+
/** Eén rij uit klanten_orderprijs naar een prijs; geen geldige prijs = null (nooit 0 of een gok). */
|
|
67
|
+
export declare function parseOrderprijs(rows: unknown): Orderprijs | null;
|
|
68
|
+
/** Sleutel waarop een automatische prijs opnieuw wordt opgehaald. */
|
|
69
|
+
export declare function prijsSleutel(customerId: string | null, productId: string | null, datum: string, aantal: number | null): string | null;
|
|
48
70
|
export {};
|
|
49
71
|
//# sourceMappingURL=create-order-form.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order-form.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-form.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,+CAA+C;IAC/C,cAAc,EAAE,MAAM,CAAC;IACvB,2DAA2D;IAC3D,oBAAoB,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAcnD;AAED,qFAAqF;AACrF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGhG;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAInF;AAGD,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAQ3E;AAED,eAAO,MAAM,GAAG,GAAI,GAAG,MAAM,WAC6D,CAAC;AAE3F,uEAAuE;AACvE,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAElI;AAED,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAClC,+GAA+G;AAC/G,wBAAgB,sBAAsB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAE5I;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAMjL;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAAC,CAAC,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"create-order-form.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-form.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,+CAA+C;IAC/C,cAAc,EAAE,MAAM,CAAC;IACvB,2DAA2D;IAC3D,oBAAoB,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAcnD;AAED,qFAAqF;AACrF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGhG;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAInF;AAGD,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAQ3E;AAED,eAAO,MAAM,GAAG,GAAI,GAAG,MAAM,WAC6D,CAAC;AAE3F,uEAAuE;AACvE,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAElI;AAED,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAClC,+GAA+G;AAC/G,wBAAgB,sBAAsB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAE5I;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAMjL;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAAC,CAAC,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,EAAE,CAO3H;AAGD,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,YAAY,GAAG,cAAc,GAAG,gBAAgB,CAAC;AAC7F,MAAM,WAAW,UAAU;IAAG,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAC/J,MAAM,MAAM,kBAAkB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC;AAExF,eAAO,MAAM,eAAe,qEAAqE,CAAC;AAElG,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CASjH;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAYhE;AAED,qEAAqE;AACrE,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGrI"}
|
|
@@ -71,9 +71,46 @@ export function applyFirstFeasible(s) {
|
|
|
71
71
|
export function attentionItems(s) {
|
|
72
72
|
const out = [];
|
|
73
73
|
const n = (k) => (k === 1 ? "1 regel" : `${k} regels`);
|
|
74
|
+
if ((s.linesPriceError ?? 0) > 0)
|
|
75
|
+
out.push(`Prijs ophalen lukt niet bij ${n(s.linesPriceError)}`);
|
|
74
76
|
if (s.linesWithoutPrice > 0)
|
|
75
77
|
out.push(`${n(s.linesWithoutPrice)} zonder prijs`);
|
|
76
78
|
if (s.linesOverStock > 0)
|
|
77
79
|
out.push(`${n(s.linesOverStock)} meer dan beschikbaar`);
|
|
78
80
|
return out;
|
|
79
81
|
}
|
|
82
|
+
export const PRIJS_FOUT_TEXT = "Prijs ophalen lukt niet; vul hem zelf in of probeer het opnieuw.";
|
|
83
|
+
/** "Prijsgroep: Groothandel", "Klantprijs", "Klantkorting", "Standaardprijs". */
|
|
84
|
+
export function prijsBronLabel(p) {
|
|
85
|
+
if (!p?.bron)
|
|
86
|
+
return null;
|
|
87
|
+
switch (p.bron) {
|
|
88
|
+
case "klantprijs": return "Klantprijs";
|
|
89
|
+
case "prijsgroep": return p.price_group_name ? `Prijsgroep: ${p.price_group_name}` : "Prijsgroep";
|
|
90
|
+
case "klantkorting": return "Klantkorting";
|
|
91
|
+
case "standaardprijs": return "Standaardprijs";
|
|
92
|
+
default: return null;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
/** Eén rij uit klanten_orderprijs naar een prijs; geen geldige prijs = null (nooit 0 of een gok). */
|
|
96
|
+
export function parseOrderprijs(rows) {
|
|
97
|
+
const r = Array.isArray(rows) ? rows[0] : rows;
|
|
98
|
+
if (!r)
|
|
99
|
+
return null;
|
|
100
|
+
const net = Number(r.net_price);
|
|
101
|
+
if (r.net_price == null || !Number.isFinite(net) || net < 0)
|
|
102
|
+
return null;
|
|
103
|
+
return {
|
|
104
|
+
net_price: net,
|
|
105
|
+
currency: r.currency ?? null,
|
|
106
|
+
bron: r.bron ?? null,
|
|
107
|
+
price_group_id: r.price_group_id ?? null,
|
|
108
|
+
price_group_name: r.price_group_name ?? null,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
/** Sleutel waarop een automatische prijs opnieuw wordt opgehaald. */
|
|
112
|
+
export function prijsSleutel(customerId, productId, datum, aantal) {
|
|
113
|
+
if (!customerId || !productId || customerId.startsWith("twinfield:"))
|
|
114
|
+
return null;
|
|
115
|
+
return `${customerId}|${productId}|${datum}|${aantal ?? ""}`;
|
|
116
|
+
}
|
|
@@ -115,6 +115,7 @@ export declare const listCarriersForCreateOrder: import("@tanstack/start-client-
|
|
|
115
115
|
pickup_weekdays: number[];
|
|
116
116
|
delivery_weekdays: number[];
|
|
117
117
|
pickup_moments: import("../integrations/supabase/types.js").Json;
|
|
118
|
+
carrier_kind: string | null;
|
|
118
119
|
}[];
|
|
119
120
|
}>>;
|
|
120
121
|
export declare const listBeladingOptionsForProducts: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
@@ -185,6 +186,7 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
185
186
|
ownTransport?: boolean | undefined;
|
|
186
187
|
confirmZeroPrice?: boolean | undefined;
|
|
187
188
|
ownTransportPickupAt?: string | null | undefined;
|
|
189
|
+
ownPickupTime?: string | null | undefined;
|
|
188
190
|
}, Promise<{
|
|
189
191
|
ok: true;
|
|
190
192
|
orderId: string;
|
|
@@ -315,6 +317,24 @@ export declare const getEffectivePrices: import("@tanstack/start-client-core").O
|
|
|
315
317
|
price: number;
|
|
316
318
|
source: string | null;
|
|
317
319
|
} | null>>>;
|
|
320
|
+
export declare const getOrderPrices: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
321
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
322
|
+
userId: string;
|
|
323
|
+
claims: import("@supabase/auth-js").User;
|
|
324
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
325
|
+
customerId: string;
|
|
326
|
+
lines: {
|
|
327
|
+
productId: string;
|
|
328
|
+
quantity?: number | undefined;
|
|
329
|
+
}[];
|
|
330
|
+
onDate?: string | undefined;
|
|
331
|
+
}, Promise<({
|
|
332
|
+
ok: false;
|
|
333
|
+
prijs?: undefined;
|
|
334
|
+
} | {
|
|
335
|
+
ok: true;
|
|
336
|
+
prijs: import("./create-order-form.js").Orderprijs | null;
|
|
337
|
+
})[]>>;
|
|
318
338
|
export declare const listCustomerStickerProducts: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
319
339
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
320
340
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,2BAA2B;;;;;;YAwBpB,MAAM;sBACc,MAAM,GAAG,IAAI;yBACG,MAAM,GAAG,IAAI;cACnC,MAAM,GAAG,IAAI;eACX,MAAM,GAAG,IAAI;wBACK,MAAM,GAAG,IAAI;gBACvC,MAAM;;;GAkB9B,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GA6TpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAOL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;GAWzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;;;;;YAuCI,MAAM;;;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,2BAA2B;;;;;;YAwBpB,MAAM;sBACc,MAAM,GAAG,IAAI;yBACG,MAAM,GAAG,IAAI;cACnC,MAAM,GAAG,IAAI;eACX,MAAM,GAAG,IAAI;wBACK,MAAM,GAAG,IAAI;gBACvC,MAAM;;;GAkB9B,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GA6TpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAOL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;GAWzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;;;;;YAuCI,MAAM;;;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AAoFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAgUL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAc7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAkDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;;;YA8B7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;;GAUpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuT7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAmBhE,CAAC;AAML,eAAO,MAAM,cAAc;;;;8CAED,OAAO;;;;;;;;;;;;;MA+B7B,CAAC;AAML,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -624,7 +624,7 @@ export const listCarriersForCreateOrder = createServerFn({ method: "GET" })
|
|
|
624
624
|
.handler(async ({ context }) => {
|
|
625
625
|
const { data, error } = await context.supabase
|
|
626
626
|
.from("carriers")
|
|
627
|
-
.select("id, name, is_default, sort_order, delivery_days, signup_time_1, signup_time_2, signup_days_before_delivery, pickup_weekdays, delivery_weekdays, pickup_moments")
|
|
627
|
+
.select("id, name, is_default, sort_order, delivery_days, signup_time_1, signup_time_2, signup_days_before_delivery, pickup_weekdays, delivery_weekdays, pickup_moments, carrier_kind")
|
|
628
628
|
.order("sort_order", { ascending: true, nullsFirst: false })
|
|
629
629
|
.order("name");
|
|
630
630
|
// Fout niet inslikken: het scherm toont hem.
|
|
@@ -791,6 +791,8 @@ const CreateManualOrderInput = z.object({
|
|
|
791
791
|
// Prijs € 0 op een regel moet uitdrukkelijk bevestigd zijn.
|
|
792
792
|
confirmZeroPrice: z.boolean().optional(),
|
|
793
793
|
ownTransportPickupAt: z.string().regex(/(Z|[+-]\d{2}:\d{2})$/, "Tijd zonder tijdzone").nullable().optional(),
|
|
794
|
+
// Vertrek-/ophaaltijd (HH:MM, Europe/Amsterdam) bij eigen vervoer of klant haalt op.
|
|
795
|
+
ownPickupTime: z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/).nullable().optional(),
|
|
794
796
|
});
|
|
795
797
|
export const createManualOrder = createServerFn({ method: "POST" })
|
|
796
798
|
.middleware([requireSupabaseAuth])
|
|
@@ -829,6 +831,19 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
829
831
|
.order("name", { ascending: true }).limit(1).maybeSingle();
|
|
830
832
|
ownCarrierId = oc?.id ?? null;
|
|
831
833
|
}
|
|
834
|
+
// Eigen vervoer of een handmatig gekozen vervoerder van soort eigen_vervoer/
|
|
835
|
+
// klant_haalt_op: pickup_moment = "YYYY-MM-DD|HH:MM", leeg zonder gekozen tijd.
|
|
836
|
+
let ownPickupKind = ownTransport;
|
|
837
|
+
if (!ownPickupKind && carrierId) {
|
|
838
|
+
const { data: ck } = await context.supabase.from("carriers").select("carrier_kind").eq("id", carrierId).maybeSingle();
|
|
839
|
+
const { isOwnTransportKind } = await import("./own-transport.js");
|
|
840
|
+
ownPickupKind = isOwnTransportKind(ck?.carrier_kind);
|
|
841
|
+
}
|
|
842
|
+
let ownPickupMoment = null;
|
|
843
|
+
if (ownPickupKind && !data.isReservation && data.deliveryDate) {
|
|
844
|
+
const { buildOwnPickupMoment } = await import("./own-transport.js");
|
|
845
|
+
ownPickupMoment = buildOwnPickupMoment(data.deliveryDate, data.ownPickupTime ?? null);
|
|
846
|
+
}
|
|
832
847
|
let momentKey = null;
|
|
833
848
|
let deliveryTime = null;
|
|
834
849
|
let lateSignup = null;
|
|
@@ -1016,7 +1031,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
1016
1031
|
delivery_location: data.deliveryLocationId,
|
|
1017
1032
|
pickup_location: data.pickupLocationId,
|
|
1018
1033
|
delivery_time: deliveryTime,
|
|
1019
|
-
pickup_moment: momentKey,
|
|
1034
|
+
pickup_moment: ownPickupKind ? ownPickupMoment : momentKey,
|
|
1020
1035
|
...(lateSignup ? { late_signup_override: lateSignup } : {}),
|
|
1021
1036
|
...(ownTransportInfo ? { own_transport: ownTransportInfo } : {}),
|
|
1022
1037
|
...(data.customerReference ? { customer_reference: data.customerReference } : {}),
|
|
@@ -1816,6 +1831,40 @@ export const getEffectivePrices = createServerFn({ method: "POST" })
|
|
|
1816
1831
|
}
|
|
1817
1832
|
return out;
|
|
1818
1833
|
});
|
|
1834
|
+
// ─── Orderprijs via klanten_orderprijs (module Klanten) ─────────────────────
|
|
1835
|
+
// Per regel één aanroep. Een fout geeft ok:false voor die regel — het scherm
|
|
1836
|
+
// toont dan een melding en vult nooit stil een andere prijs in.
|
|
1837
|
+
export const getOrderPrices = createServerFn({ method: "POST" })
|
|
1838
|
+
.middleware([requireSupabaseAuth])
|
|
1839
|
+
.inputValidator((input) => z
|
|
1840
|
+
.object({
|
|
1841
|
+
customerId: z.string().uuid(),
|
|
1842
|
+
onDate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/).optional(),
|
|
1843
|
+
lines: z.array(z.object({ productId: z.string().uuid(), quantity: z.number().positive().optional() })).max(200),
|
|
1844
|
+
})
|
|
1845
|
+
.parse(input))
|
|
1846
|
+
.handler(async ({ data, context }) => {
|
|
1847
|
+
const { parseOrderprijs } = await import("./create-order-form.js");
|
|
1848
|
+
return await Promise.all(data.lines.map(async (l) => {
|
|
1849
|
+
try {
|
|
1850
|
+
const { data: rows, error } = await context.supabase.rpc("klanten_orderprijs", {
|
|
1851
|
+
p_customer_id: data.customerId,
|
|
1852
|
+
p_product_id: l.productId,
|
|
1853
|
+
...(data.onDate ? { p_datum: data.onDate } : {}),
|
|
1854
|
+
...(l.quantity ? { p_aantal: l.quantity } : {}),
|
|
1855
|
+
});
|
|
1856
|
+
if (error) {
|
|
1857
|
+
console.error("[orderprijs] klanten_orderprijs mislukt:", error.message);
|
|
1858
|
+
return { ok: false };
|
|
1859
|
+
}
|
|
1860
|
+
return { ok: true, prijs: parseOrderprijs(rows) };
|
|
1861
|
+
}
|
|
1862
|
+
catch (e) {
|
|
1863
|
+
console.error("[orderprijs] klanten_orderprijs mislukt:", e?.message ?? e);
|
|
1864
|
+
return { ok: false };
|
|
1865
|
+
}
|
|
1866
|
+
}));
|
|
1867
|
+
});
|
|
1819
1868
|
// ─── Standaard stickervinkje bij een nieuwe bestelling ──────────────────────
|
|
1820
1869
|
// Vinkje vooraf aan als er voor deze klant + dit product een vaste klantsticker
|
|
1821
1870
|
// bestaat (customer_product_stickers). Alleen lezen; matcht op id/code, nooit
|
|
@@ -234,7 +234,7 @@ async function mirrorUnlocked(limit, since, onlyIds = null) {
|
|
|
234
234
|
cacheRows = cacheRows.concat((more ?? []));
|
|
235
235
|
}
|
|
236
236
|
}
|
|
237
|
-
const rows = (cacheRows ?? []);
|
|
237
|
+
const rows = await (await import("./klok-sales.server.js")).claimKlokVerkopen((cacheRows ?? []));
|
|
238
238
|
if (rows.length === 0) {
|
|
239
239
|
// Ook zonder nieuwe Floriday-gegevens: orders koppelen aan klanten die
|
|
240
240
|
// inmiddels (bijv. door de Klanten-module) zijn aangemaakt.
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
export type KlokVervoer = "geen" | "eigen" | "transporteur";
|
|
2
|
+
export interface KlokKop {
|
|
3
|
+
veillocatie_id: string | null;
|
|
4
|
+
veillocatie_naam: string | null;
|
|
5
|
+
veillocatie_gln: string | null;
|
|
6
|
+
veillocatie_org_id: string | null;
|
|
7
|
+
veildatum: string | null;
|
|
8
|
+
veilgroep: string | null;
|
|
9
|
+
verzendlocatie_id: string | null;
|
|
10
|
+
verzendlocatie_naam: string | null;
|
|
11
|
+
vervoer: KlokVervoer;
|
|
12
|
+
carrier_org_id: string | null;
|
|
13
|
+
}
|
|
14
|
+
export interface KlokKeurcode {
|
|
15
|
+
vbnCode: string;
|
|
16
|
+
vbnValueCode: string;
|
|
17
|
+
}
|
|
18
|
+
export interface KlokRegel {
|
|
19
|
+
key: string;
|
|
20
|
+
product_id: string | null;
|
|
21
|
+
trade_item_id: string | null;
|
|
22
|
+
product_name: string;
|
|
23
|
+
vbn_product_code: string | null;
|
|
24
|
+
fusten: number | null;
|
|
25
|
+
stuks_per_fust: number | null;
|
|
26
|
+
fust_per_laag: number | null;
|
|
27
|
+
lagen_per_kar: number | null;
|
|
28
|
+
vbn_package_code: string | null;
|
|
29
|
+
load_carrier: string | null;
|
|
30
|
+
custom_package_id: string | null;
|
|
31
|
+
min_prijs: number | null;
|
|
32
|
+
voorverkoop_prijs: number | null;
|
|
33
|
+
/** Wanneer de voorgestelde prijs voor het laatst echt is gebruikt. */
|
|
34
|
+
prijs_at: string | null;
|
|
35
|
+
/** false = voorstel (grijs) dat de gebruiker nog moet bevestigen. */
|
|
36
|
+
prijs_bevestigd: boolean;
|
|
37
|
+
kwaliteit: string | null;
|
|
38
|
+
keurcodes: KlokKeurcode[];
|
|
39
|
+
veil_opmerking: string | null;
|
|
40
|
+
aflever_opmerking: string | null;
|
|
41
|
+
}
|
|
42
|
+
export declare const LEGE_KOP: KlokKop;
|
|
43
|
+
/** Wat ontbreekt nog vóór versturen (concept opslaan mag altijd). */
|
|
44
|
+
export declare function klokOntbreekt(kop: KlokKop, regels: KlokRegel[]): string[];
|
|
45
|
+
/** Prijs overnemen uit een eerdere veilbrief/sjabloon: oud = voorstel. */
|
|
46
|
+
export declare function neemPrijsOver(r: KlokRegel, now?: Date): KlokRegel;
|
|
47
|
+
//# sourceMappingURL=klok-form.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"klok-form.d.ts","sourceRoot":"","sources":["../../src/lib/klok-form.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,cAAc,CAAC;AAE5D,MAAM,WAAW,OAAO;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,sEAAsE;IACtE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,qEAAqE;IACrE,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,eAAO,MAAM,QAAQ,EAAE,OAWtB,CAAC;AAEF,qEAAqE;AACrE,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,CAiBzE;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,GAAE,IAAiB,GAAG,SAAS,CAG7E"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
// Klokorder-formulier: gedeelde typen en de lijst "Ontbreekt nog".
|
|
2
|
+
// Client-veilig; de server gebruikt dezelfde controle vóór versturen.
|
|
3
|
+
import { isGeldigeVeilgroep, klokPrijsVerouderd } from "./klok-labels.js";
|
|
4
|
+
export const LEGE_KOP = {
|
|
5
|
+
veillocatie_id: null,
|
|
6
|
+
veillocatie_naam: null,
|
|
7
|
+
veillocatie_gln: null,
|
|
8
|
+
veillocatie_org_id: null,
|
|
9
|
+
veildatum: null,
|
|
10
|
+
veilgroep: null,
|
|
11
|
+
verzendlocatie_id: null,
|
|
12
|
+
verzendlocatie_naam: null,
|
|
13
|
+
vervoer: "geen",
|
|
14
|
+
carrier_org_id: null,
|
|
15
|
+
};
|
|
16
|
+
/** Wat ontbreekt nog vóór versturen (concept opslaan mag altijd). */
|
|
17
|
+
export function klokOntbreekt(kop, regels) {
|
|
18
|
+
const out = [];
|
|
19
|
+
if (!kop.veillocatie_id)
|
|
20
|
+
out.push("Veillocatie");
|
|
21
|
+
if (!kop.veildatum)
|
|
22
|
+
out.push("Veildatum");
|
|
23
|
+
if (!kop.veilgroep)
|
|
24
|
+
out.push("Veilgroep");
|
|
25
|
+
else if (!isGeldigeVeilgroep(kop.veilgroep))
|
|
26
|
+
out.push("Veilgroep (alleen cijfers)");
|
|
27
|
+
if (!kop.verzendlocatie_id)
|
|
28
|
+
out.push("Verzendlocatie");
|
|
29
|
+
if (regels.length === 0)
|
|
30
|
+
out.push("Minimaal één regel");
|
|
31
|
+
regels.forEach((r, i) => {
|
|
32
|
+
const n = `Regel ${i + 1}`;
|
|
33
|
+
if (!r.trade_item_id)
|
|
34
|
+
out.push(`${n}: artikel uit Floriday`);
|
|
35
|
+
if (!(Number(r.fusten) > 0))
|
|
36
|
+
out.push(`${n}: fusten`);
|
|
37
|
+
if (!(Number(r.stuks_per_fust) > 0))
|
|
38
|
+
out.push(`${n}: stuks per fust`);
|
|
39
|
+
if (!(Number(r.min_prijs) > 0))
|
|
40
|
+
out.push(`${n}: minimumprijs`);
|
|
41
|
+
else if (!r.prijs_bevestigd)
|
|
42
|
+
out.push(`${n}: minimumprijs bevestigen`);
|
|
43
|
+
});
|
|
44
|
+
return out;
|
|
45
|
+
}
|
|
46
|
+
/** Prijs overnemen uit een eerdere veilbrief/sjabloon: oud = voorstel. */
|
|
47
|
+
export function neemPrijsOver(r, now = new Date()) {
|
|
48
|
+
if (r.min_prijs == null)
|
|
49
|
+
return { ...r, prijs_bevestigd: false };
|
|
50
|
+
return { ...r, prijs_bevestigd: !klokPrijsVerouderd(r.prijs_at, now) };
|
|
51
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export interface KlokWriteResult {
|
|
2
|
+
ok: boolean;
|
|
3
|
+
code?: string;
|
|
4
|
+
reason?: string;
|
|
5
|
+
errors?: string[];
|
|
6
|
+
deliveryOrderId?: string;
|
|
7
|
+
fulfillmentRequestIds?: string[];
|
|
8
|
+
batchIds?: string[];
|
|
9
|
+
lines?: unknown[];
|
|
10
|
+
status?: string;
|
|
11
|
+
idempotent?: boolean;
|
|
12
|
+
}
|
|
13
|
+
/** Eén zin voor de gebruiker uit een weigering: errors[] of reason, letterlijk. */
|
|
14
|
+
export declare function klokFoutZin(r: KlokWriteResult): string;
|
|
15
|
+
export declare function klokGatewayWrite(environment: string, action: "clock_order_send" | "clock_order_delete", payload: Record<string, unknown>): Promise<KlokWriteResult>;
|
|
16
|
+
export type KlokReadOp = "clock-auction-locations" | "clock-despatch-locations" | "clock-auction-groups" | "clock-quality-codes" | "clock-order-status";
|
|
17
|
+
export interface KlokReadResult {
|
|
18
|
+
ok: boolean;
|
|
19
|
+
items: any[];
|
|
20
|
+
message?: string | null;
|
|
21
|
+
error?: string | null;
|
|
22
|
+
}
|
|
23
|
+
export declare function klokGatewayRead(environment: string, op: KlokReadOp, extra?: Record<string, unknown>): Promise<KlokReadResult>;
|
|
24
|
+
/** Afleverbrief (PDF) via POST /api/public/gateway/pdf, HMAC zoals schrijven. */
|
|
25
|
+
export declare function klokGatewayPdf(environment: string, brief: {
|
|
26
|
+
clockSupplyId: string;
|
|
27
|
+
auctionLetterCode?: string | null;
|
|
28
|
+
}): Promise<{
|
|
29
|
+
ok: true;
|
|
30
|
+
base64: string;
|
|
31
|
+
} | {
|
|
32
|
+
ok: false;
|
|
33
|
+
reason: string;
|
|
34
|
+
}>;
|
|
35
|
+
//# sourceMappingURL=klok-gateway.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"klok-gateway.server.d.ts","sourceRoot":"","sources":["../../src/lib/klok-gateway.server.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAKtD;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,kBAAkB,GAAG,oBAAoB,EACjD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,eAAe,CAAC,CAgC1B;AAED,MAAM,MAAM,UAAU,GAClB,yBAAyB,GACzB,0BAA0B,GAC1B,sBAAsB,GACtB,qBAAqB,GACrB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,UAAU,EACd,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,OAAO,CAAC,cAAc,CAAC,CAuBzB;AAED,iFAAiF;AACjF,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAClE,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAmCvE"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
// Server-only: koppelstuk naar de gateway van de Floriday-authenticatiemodule
|
|
2
|
+
// voor klokorders (veilbrieven).
|
|
3
|
+
// - Schrijven (clock_order_send / clock_order_delete) altijd vanaf de server
|
|
4
|
+
// met HMAC over `${ms}.${body}`, zoals floriday-status.server.ts. Nooit met
|
|
5
|
+
// de login van de gebruiker.
|
|
6
|
+
// - Lezen (clock-read) met de login van de gebruiker (bearer uit het verzoek).
|
|
7
|
+
// - Fail closed: bij een fout een code en een zin, nooit een gok.
|
|
8
|
+
async function hmacHex(secret, payload) {
|
|
9
|
+
const key = await globalThis.crypto.subtle.importKey("raw", new TextEncoder().encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
|
|
10
|
+
const sig = await globalThis.crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload));
|
|
11
|
+
return Array.from(new Uint8Array(sig))
|
|
12
|
+
.map((b) => b.toString(16).padStart(2, "0"))
|
|
13
|
+
.join("");
|
|
14
|
+
}
|
|
15
|
+
/** Eén zin voor de gebruiker uit een weigering: errors[] of reason, letterlijk. */
|
|
16
|
+
export function klokFoutZin(r) {
|
|
17
|
+
const errs = (r.errors ?? []).map((e) => (typeof e === "string" ? e : e?.message ?? e?.reason ?? "")).filter(Boolean);
|
|
18
|
+
if (errs.length)
|
|
19
|
+
return errs.join(" ");
|
|
20
|
+
if (r.reason)
|
|
21
|
+
return r.reason;
|
|
22
|
+
return "Floriday gaf geen reden. Probeer het later opnieuw of neem contact op met de beheerder.";
|
|
23
|
+
}
|
|
24
|
+
export async function klokGatewayWrite(environment, action, payload) {
|
|
25
|
+
try {
|
|
26
|
+
const { getFloridayGatewaySecret, getGatewayBaseUrl } = await import("./central-secrets.server.js");
|
|
27
|
+
const secret = await getFloridayGatewaySecret();
|
|
28
|
+
const base = await getGatewayBaseUrl();
|
|
29
|
+
const body = JSON.stringify({ environment, module: "verkoop", action, payload });
|
|
30
|
+
const timestamp = String(Date.now());
|
|
31
|
+
const signature = await hmacHex(secret, `${timestamp}.${body}`);
|
|
32
|
+
const res = await fetch(`${base}/api/public/gateway/write`, {
|
|
33
|
+
method: "POST",
|
|
34
|
+
headers: {
|
|
35
|
+
"Content-Type": "application/json",
|
|
36
|
+
"x-floriday-timestamp": timestamp,
|
|
37
|
+
"x-floriday-signature": `sha256=${signature}`,
|
|
38
|
+
"x-floriday-caller": "verkoop",
|
|
39
|
+
},
|
|
40
|
+
body,
|
|
41
|
+
signal: AbortSignal.timeout(30000),
|
|
42
|
+
});
|
|
43
|
+
const json = await res.json().catch(() => null);
|
|
44
|
+
if (!json || typeof json !== "object") {
|
|
45
|
+
console.error("[klok-gateway] onleesbaar antwoord", action, res.status);
|
|
46
|
+
return { ok: false, code: "floriday_unavailable", reason: "Floriday is nu niet bereikbaar. Probeer het later opnieuw." };
|
|
47
|
+
}
|
|
48
|
+
if (json.ok !== true) {
|
|
49
|
+
return { ok: false, code: String(json.code ?? `http_${res.status}`), reason: json.reason, errors: json.errors };
|
|
50
|
+
}
|
|
51
|
+
return json;
|
|
52
|
+
}
|
|
53
|
+
catch (e) {
|
|
54
|
+
console.error("[klok-gateway] schrijven mislukt", action, e?.message ?? e);
|
|
55
|
+
return { ok: false, code: "floriday_unavailable", reason: "Floriday is nu niet bereikbaar. Probeer het later opnieuw." };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
export async function klokGatewayRead(environment, op, extra = {}) {
|
|
59
|
+
try {
|
|
60
|
+
const { getRequest } = await import("@tanstack/react-start/server");
|
|
61
|
+
const auth = getRequest()?.headers.get("authorization") ?? "";
|
|
62
|
+
if (!auth.startsWith("Bearer "))
|
|
63
|
+
return { ok: false, items: [], error: "Je sessie is verlopen. Log opnieuw in." };
|
|
64
|
+
const { getGatewayBaseUrl } = await import("./central-secrets.server.js");
|
|
65
|
+
const base = await getGatewayBaseUrl();
|
|
66
|
+
const res = await fetch(`${base}/api/public/gateway/clock-read`, {
|
|
67
|
+
method: "POST",
|
|
68
|
+
headers: { "Content-Type": "application/json", Authorization: auth, "x-floriday-caller": "verkoop" },
|
|
69
|
+
body: JSON.stringify({ environment, op, ...extra }),
|
|
70
|
+
signal: AbortSignal.timeout(10000),
|
|
71
|
+
});
|
|
72
|
+
const json = await res.json().catch(() => null);
|
|
73
|
+
if (!res.ok || !json || json.ok === false) {
|
|
74
|
+
console.error("[klok-gateway] lezen mislukt", op, res.status, json?.code ?? json?.error ?? "");
|
|
75
|
+
return { ok: false, items: [], error: json?.reason ?? json?.message ?? "De lijst kon niet worden opgehaald." };
|
|
76
|
+
}
|
|
77
|
+
return { ok: true, items: Array.isArray(json.items) ? json.items : [], message: json.message ?? null };
|
|
78
|
+
}
|
|
79
|
+
catch (e) {
|
|
80
|
+
console.error("[klok-gateway] lezen mislukt", op, e?.message ?? e);
|
|
81
|
+
return { ok: false, items: [], error: "De lijst kon niet worden opgehaald." };
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
/** Afleverbrief (PDF) via POST /api/public/gateway/pdf, HMAC zoals schrijven. */
|
|
85
|
+
export async function klokGatewayPdf(environment, brief) {
|
|
86
|
+
try {
|
|
87
|
+
const { afleverbriefPdfBody } = await import("./klok-labels.js");
|
|
88
|
+
const { getFloridayGatewaySecret, getGatewayBaseUrl } = await import("./central-secrets.server.js");
|
|
89
|
+
const secret = await getFloridayGatewaySecret();
|
|
90
|
+
const base = await getGatewayBaseUrl();
|
|
91
|
+
const body = JSON.stringify({ environment, module: "verkoop", ...afleverbriefPdfBody(brief) });
|
|
92
|
+
const timestamp = String(Date.now());
|
|
93
|
+
const signature = await hmacHex(secret, `${timestamp}.${body}`);
|
|
94
|
+
const res = await fetch(`${base}/api/public/gateway/pdf`, {
|
|
95
|
+
method: "POST",
|
|
96
|
+
headers: {
|
|
97
|
+
"Content-Type": "application/json",
|
|
98
|
+
"x-floriday-timestamp": timestamp,
|
|
99
|
+
"x-floriday-signature": `sha256=${signature}`,
|
|
100
|
+
"x-floriday-caller": "verkoop",
|
|
101
|
+
},
|
|
102
|
+
body,
|
|
103
|
+
signal: AbortSignal.timeout(30000),
|
|
104
|
+
});
|
|
105
|
+
const type = res.headers.get("content-type") ?? "";
|
|
106
|
+
if (!res.ok || !type.includes("pdf")) {
|
|
107
|
+
const json = await res.json().catch(() => null);
|
|
108
|
+
console.error("[klok-gateway] afleverbrief mislukt", res.status, json?.code ?? "");
|
|
109
|
+
return { ok: false, reason: json?.reason ?? "De afleverbrief kon niet worden opgehaald. Probeer het later opnieuw." };
|
|
110
|
+
}
|
|
111
|
+
const buf = new Uint8Array(await res.arrayBuffer());
|
|
112
|
+
if (!buf.length)
|
|
113
|
+
return { ok: false, reason: "De afleverbrief is leeg. Probeer het later opnieuw." };
|
|
114
|
+
let bin = "";
|
|
115
|
+
for (let i = 0; i < buf.length; i += 0x8000)
|
|
116
|
+
bin += String.fromCharCode(...buf.subarray(i, i + 0x8000));
|
|
117
|
+
return { ok: true, base64: btoa(bin) };
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
console.error("[klok-gateway] afleverbrief mislukt", e?.message ?? e);
|
|
121
|
+
return { ok: false, reason: "Floriday is nu niet bereikbaar. Probeer het later opnieuw." };
|
|
122
|
+
}
|
|
123
|
+
}
|