@flowselections/floriday-verkoop-module 1.0.129 → 1.0.132
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 +23 -4
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts +7 -0
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts.map +1 -0
- package/dist-lib/components/verkoop/EngineActieButtons.js +22 -0
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts +3 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.js +4 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +4 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +17 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +52 -21
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +25 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +23 -1
- package/dist-lib/integrations/supabase/types.d.ts +402 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/cron/cron-auth.check.d.ts +2 -0
- package/dist-lib/lib/cron/cron-auth.check.d.ts.map +1 -0
- package/dist-lib/lib/cron/cron-auth.check.js +25 -0
- package/dist-lib/lib/cron/cron-auth.server.d.ts +6 -0
- package/dist-lib/lib/cron/cron-auth.server.d.ts.map +1 -0
- package/dist-lib/lib/cron/cron-auth.server.js +53 -0
- package/dist-lib/lib/cron/invoice-due.d.ts.map +1 -1
- package/dist-lib/lib/cron/invoice-due.js +4 -5
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +8 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders-now.js +40 -13
- package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders.js +4 -5
- package/dist-lib/lib/delivery-location.check.js +9 -2
- package/dist-lib/lib/floriday-line-key.check.js +19 -0
- package/dist-lib/lib/floriday-line-key.d.ts +20 -0
- package/dist-lib/lib/floriday-line-key.d.ts.map +1 -1
- package/dist-lib/lib/floriday-line-key.js +24 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +50 -4
- package/dist-lib/lib/floriday-status.server.d.ts +1 -1
- package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.server.js +3 -3
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-fust.check.d.ts +2 -0
- package/dist-lib/lib/order-fust.check.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.check.js +19 -0
- package/dist-lib/lib/order-fust.d.ts +19 -0
- package/dist-lib/lib/order-fust.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.js +21 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +56 -4
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +82 -6
- package/dist-lib/lib/plan-coverage-v204.check.d.ts +2 -0
- package/dist-lib/lib/plan-coverage-v204.check.d.ts.map +1 -0
- package/dist-lib/lib/plan-coverage-v204.check.js +27 -0
- package/dist-lib/lib/plan-coverage.d.ts +52 -1
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +104 -5
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +12 -2
- package/dist-lib/lib/product-plannable.functions.d.ts +13 -4
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +80 -14
- package/dist-lib/lib/salesorders-list.functions.d.ts +17 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +23 -0
- package/dist-lib/lib/salesorders-list.server.d.ts +2 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +41 -12
- package/dist-lib/lib/salesorders-mapping.d.ts +6 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -8
- package/dist-lib/lib/useEngineMelding.d.ts +9 -0
- package/dist-lib/lib/useEngineMelding.d.ts.map +1 -0
- package/dist-lib/lib/useEngineMelding.js +20 -0
- package/package.json +1 -1
- package/schema/verkoop.sql +276 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-auth.check.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/cron-auth.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
// Draaien: bun src/lib/cron/cron-auth.check.ts
|
|
2
|
+
import { safeEqual } from "./cron-auth.server.js";
|
|
3
|
+
import { parseSalesOrderIds } from "./sync-salesorders-now.js";
|
|
4
|
+
let fail = 0;
|
|
5
|
+
const eq = (name, got, want) => {
|
|
6
|
+
const ok = JSON.stringify(got) === JSON.stringify(want);
|
|
7
|
+
if (!ok)
|
|
8
|
+
fail++;
|
|
9
|
+
console.log(`${ok ? "ok " : "FOUT"} ${name}: ${JSON.stringify(got)}`);
|
|
10
|
+
};
|
|
11
|
+
eq("gelijke sleutel", safeEqual("abc123", "abc123"), true);
|
|
12
|
+
eq("andere sleutel", safeEqual("abc123", "abc124"), false);
|
|
13
|
+
eq("korter = geweigerd", safeEqual("abc", "abc123"), false);
|
|
14
|
+
const ids = (n) => Array.from({ length: n }, (_, i) => `11111111-1111-4111-8111-${String(i).padStart(12, "0")}`);
|
|
15
|
+
eq("50 ID's toegestaan", parseSalesOrderIds({ salesOrderIds: ids(50) }).ok, true);
|
|
16
|
+
eq("51 ID's geweigerd", parseSalesOrderIds({ salesOrderIds: ids(51) }).ok, false);
|
|
17
|
+
eq("geen lijst geweigerd", parseSalesOrderIds({}).ok, false);
|
|
18
|
+
eq("vreemde tekens geweigerd", parseSalesOrderIds({ salesOrderIds: ["a;drop"] }).ok, false);
|
|
19
|
+
const d = parseSalesOrderIds({ salesOrderIds: ["x-1", "x-1"] });
|
|
20
|
+
eq("ontdubbeld", d.ok ? d.ids : null, ["x-1"]);
|
|
21
|
+
if (fail) {
|
|
22
|
+
console.error(`${fail} controle(s) mislukt`);
|
|
23
|
+
process.exit(1);
|
|
24
|
+
}
|
|
25
|
+
console.log("cron-auth: alles in orde");
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const CRON_KEY_HEADER = "x-verkoop-cron-key";
|
|
2
|
+
/** Tijd-constante vergelijking van twee strings. */
|
|
3
|
+
export declare function safeEqual(a: string, b: string): boolean;
|
|
4
|
+
/** Geeft null bij toegang, anders een 401-antwoord. */
|
|
5
|
+
export declare function requireCronKey(request: Request, route: string): Promise<Response | null>;
|
|
6
|
+
//# sourceMappingURL=cron-auth.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-auth.server.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/cron-auth.server.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,eAAe,uBAAuB,CAAC;AAIpD,oDAAoD;AACpD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAQvD;AAcD,uDAAuD;AACvD,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAmB9F"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
// Toegang tot de Verkoop-cronroutes: alleen met de geheime sleutel uit de vault
|
|
2
|
+
// van deze database (public.verkoop_cron_key(), alleen service_role). De kop
|
|
3
|
+
// heet x-verkoop-cron-key en wordt meegestuurd door public.verkoop_cron_post.
|
|
4
|
+
// Fail closed: ontbreekt de sleutel of kan hij niet gelezen worden → 401.
|
|
5
|
+
// Nooit terugvallen op de openbare (publishable) sleutel.
|
|
6
|
+
export const CRON_KEY_HEADER = "x-verkoop-cron-key";
|
|
7
|
+
const CACHE_MS = 5 * 60000;
|
|
8
|
+
let cached = null;
|
|
9
|
+
/** Tijd-constante vergelijking van twee strings. */
|
|
10
|
+
export function safeEqual(a, b) {
|
|
11
|
+
const enc = new TextEncoder();
|
|
12
|
+
const x = enc.encode(a);
|
|
13
|
+
const y = enc.encode(b);
|
|
14
|
+
let diff = x.length ^ y.length;
|
|
15
|
+
const n = Math.max(x.length, y.length);
|
|
16
|
+
for (let i = 0; i < n; i++)
|
|
17
|
+
diff |= (x[i] ?? 0) ^ (y[i] ?? 0);
|
|
18
|
+
return diff === 0;
|
|
19
|
+
}
|
|
20
|
+
async function loadKey() {
|
|
21
|
+
if (cached && Date.now() - cached.at < CACHE_MS)
|
|
22
|
+
return cached.key;
|
|
23
|
+
const { supabaseAdmin } = await import("../../integrations/supabase/client.server.js");
|
|
24
|
+
const { data, error } = await supabaseAdmin.rpc("verkoop_cron_key");
|
|
25
|
+
if (error || typeof data !== "string" || data.length < 32) {
|
|
26
|
+
console.warn(`[verkoop-cron] geheime cron-sleutel niet beschikbaar: ${error?.message ?? "leeg"}`);
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
cached = { key: data, at: Date.now() };
|
|
30
|
+
return data;
|
|
31
|
+
}
|
|
32
|
+
/** Geeft null bij toegang, anders een 401-antwoord. */
|
|
33
|
+
export async function requireCronKey(request, route) {
|
|
34
|
+
const given = request.headers.get(CRON_KEY_HEADER) ?? "";
|
|
35
|
+
if (!given) {
|
|
36
|
+
console.warn(`[verkoop-cron] ${route}: geweigerd (geen sleutel)`);
|
|
37
|
+
return new Response("Unauthorized", { status: 401 });
|
|
38
|
+
}
|
|
39
|
+
let key = null;
|
|
40
|
+
try {
|
|
41
|
+
key = await loadKey();
|
|
42
|
+
}
|
|
43
|
+
catch (e) {
|
|
44
|
+
console.warn(`[verkoop-cron] ${route}: sleutel lezen mislukt: ${e.message}`);
|
|
45
|
+
}
|
|
46
|
+
if (!key || !safeEqual(given, key)) {
|
|
47
|
+
// Bij een verkeerde sleutel de cache legen (sleutel kan vernieuwd zijn).
|
|
48
|
+
cached = null;
|
|
49
|
+
console.warn(`[verkoop-cron] ${route}: geweigerd (${key ? "verkeerde sleutel" : "sleutel niet beschikbaar"})`);
|
|
50
|
+
return new Response("Unauthorized", { status: 401 });
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-due.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/invoice-due.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"invoice-due.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/invoice-due.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAUnB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAKnB"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { runInvoiceTimingCycle } from "../invoice-timing.server.js";
|
|
2
2
|
export async function invoiceDueCron(request, _supabase) {
|
|
3
|
-
const
|
|
4
|
-
const
|
|
5
|
-
if (
|
|
6
|
-
return
|
|
7
|
-
}
|
|
3
|
+
const { requireCronKey } = await import("./cron-auth.server.js");
|
|
4
|
+
const denied = await requireCronKey(request, "invoice-due");
|
|
5
|
+
if (denied)
|
|
6
|
+
return denied;
|
|
8
7
|
try {
|
|
9
8
|
const result = await runInvoiceTimingCycle();
|
|
10
9
|
return Response.json({ ok: true, ...result });
|
|
@@ -1,2 +1,10 @@
|
|
|
1
1
|
export declare function syncSalesOrdersNowCron(request: Request, _supabase?: unknown): Promise<Response>;
|
|
2
|
+
/** Zod-controle: tekst-ID's, hooguit 50 per verzoek, ontdubbeld. */
|
|
3
|
+
export declare function parseSalesOrderIds(body: unknown): {
|
|
4
|
+
ok: true;
|
|
5
|
+
ids: string[];
|
|
6
|
+
} | {
|
|
7
|
+
ok: false;
|
|
8
|
+
error: string;
|
|
9
|
+
};
|
|
2
10
|
//# sourceMappingURL=sync-salesorders-now.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-salesorders-now.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-salesorders-now.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync-salesorders-now.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-salesorders-now.ts"],"names":[],"mappings":"AAYA,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyDrG;AAMD,oEAAoE;AACpE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAI5G"}
|
|
@@ -1,28 +1,44 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
1
2
|
// Directe omzetting: de databasetrigger op floriday_salesorders_cache stuurt
|
|
2
3
|
// per statement alle nieuwe of inhoudelijk gewijzigde salesOrderIds in één
|
|
3
|
-
// verzoek hierheen.
|
|
4
|
+
// verzoek hierheen. Toegang alleen met de geheime cron-sleutel (x-verkoop-cron-key). Daarna wordt
|
|
4
5
|
// de Engine gewekt (logistics_plan_enqueue gebeurt in de spiegeling zelf).
|
|
5
6
|
// De minuutronde blijft het vangnet: mislukt dit, dan alleen een logregel.
|
|
6
|
-
const MAX_IDS =
|
|
7
|
+
const MAX_IDS = 50;
|
|
7
8
|
const RETRIES = 3;
|
|
8
9
|
const RETRY_MS = 1500;
|
|
9
10
|
export async function syncSalesOrdersNowCron(request, _supabase) {
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
if (
|
|
13
|
-
return
|
|
14
|
-
|
|
15
|
-
let ids = [];
|
|
11
|
+
const { requireCronKey } = await import("./cron-auth.server.js");
|
|
12
|
+
const denied = await requireCronKey(request, "sync-salesorders-now");
|
|
13
|
+
if (denied)
|
|
14
|
+
return denied;
|
|
15
|
+
let body = null;
|
|
16
16
|
try {
|
|
17
|
-
|
|
18
|
-
ids = Array.isArray(body?.salesOrderIds) ? body.salesOrderIds.map(String).filter(Boolean) : [];
|
|
17
|
+
body = await request.json();
|
|
19
18
|
}
|
|
20
19
|
catch {
|
|
21
|
-
|
|
20
|
+
body = null;
|
|
22
21
|
}
|
|
23
|
-
|
|
24
|
-
if (!
|
|
22
|
+
const parsed = parseSalesOrderIds(body);
|
|
23
|
+
if (!parsed.ok)
|
|
24
|
+
return Response.json({ ok: false, error: parsed.error }, { status: 400 });
|
|
25
|
+
if (!parsed.ids.length)
|
|
25
26
|
return Response.json({ ok: true, skipped: "geen-ids" });
|
|
27
|
+
// Alleen ID's die echt in de Floriday-cache staan (één gerichte read).
|
|
28
|
+
const { supabaseAdmin } = await import("../../integrations/supabase/client.server.js");
|
|
29
|
+
const { data: known, error: knownErr } = await supabaseAdmin
|
|
30
|
+
.from("floriday_salesorders_cache")
|
|
31
|
+
.select("floriday_id")
|
|
32
|
+
.in("floriday_id", parsed.ids);
|
|
33
|
+
if (knownErr) {
|
|
34
|
+
console.warn(`[sync-salesorders-now] cache-controle mislukt: ${knownErr.message}`);
|
|
35
|
+
return Response.json({ ok: false, error: "cache-controle mislukt" }, { status: 503 });
|
|
36
|
+
}
|
|
37
|
+
const knownSet = new Set((known ?? []).map((r) => String(r.floriday_id)));
|
|
38
|
+
const ids = parsed.ids.filter((id) => knownSet.has(id));
|
|
39
|
+
const rejected = parsed.ids.length - ids.length;
|
|
40
|
+
if (!ids.length)
|
|
41
|
+
return Response.json({ ok: true, skipped: "niet-in-cache", rejected });
|
|
26
42
|
const started = Date.now();
|
|
27
43
|
const { mirrorFloridayOrdersByIds } = await import("../floriday-mirror.server.js");
|
|
28
44
|
let result = null;
|
|
@@ -42,6 +58,7 @@ export async function syncSalesOrdersNowCron(request, _supabase) {
|
|
|
42
58
|
return Response.json({
|
|
43
59
|
ok: result?.ok !== false,
|
|
44
60
|
ids: ids.length,
|
|
61
|
+
rejected,
|
|
45
62
|
processed: result?.processed ?? 0,
|
|
46
63
|
inserted: result?.inserted ?? 0,
|
|
47
64
|
updated: result?.updated ?? 0,
|
|
@@ -50,3 +67,13 @@ export async function syncSalesOrdersNowCron(request, _supabase) {
|
|
|
50
67
|
ms: Date.now() - started,
|
|
51
68
|
});
|
|
52
69
|
}
|
|
70
|
+
const IdsSchema = z.object({
|
|
71
|
+
salesOrderIds: z.array(z.string().trim().min(1).max(100).regex(/^[A-Za-z0-9-]+$/)).max(MAX_IDS),
|
|
72
|
+
});
|
|
73
|
+
/** Zod-controle: tekst-ID's, hooguit 50 per verzoek, ontdubbeld. */
|
|
74
|
+
export function parseSalesOrderIds(body) {
|
|
75
|
+
const r = IdsSchema.safeParse(body);
|
|
76
|
+
if (!r.success)
|
|
77
|
+
return { ok: false, error: `ongeldige invoer (hooguit ${MAX_IDS} salesOrderIds)` };
|
|
78
|
+
return { ok: true, ids: Array.from(new Set(r.data.salesOrderIds)) };
|
|
79
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-salesorders.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-salesorders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"sync-salesorders.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/sync-salesorders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAuCnB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAEnB"}
|
|
@@ -2,11 +2,10 @@ import { runSalesOrdersSyncFromCron } from "./salesorders-sync.server.js";
|
|
|
2
2
|
const LOCK_KEY = "verkoop:salesorders-sync";
|
|
3
3
|
const LOCK_SECONDS = 600;
|
|
4
4
|
export async function syncSalesOrdersCron(request, _supabase) {
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
if (
|
|
8
|
-
return
|
|
9
|
-
}
|
|
5
|
+
const { requireCronKey } = await import("./cron-auth.server.js");
|
|
6
|
+
const denied = await requireCronKey(request, "sync-salesorders");
|
|
7
|
+
if (denied)
|
|
8
|
+
return denied;
|
|
10
9
|
const { supabaseAdmin } = await import("../../integrations/supabase/client.server.js");
|
|
11
10
|
// Slot: voorkomt dat twee rondes elkaar overlappen. Faalt gesloten.
|
|
12
11
|
const { data: acquired, error: lockErr } = await supabaseAdmin.rpc("try_acquire_job_lock", { _key: LOCK_KEY, _seconds: LOCK_SECONDS, _owner: "sync-salesorders" });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Draaien: bun src/lib/delivery-location.check.ts
|
|
2
2
|
import { pickDeliveryLocation, deliveryLocationLabel } from "./delivery-location.server.js";
|
|
3
|
-
import { parseGeenIndeling, parseAdditionalLayers } from "./plan-coverage.js";
|
|
3
|
+
import { parseGeenIndeling, parseAdditionalLayers, labelWithBlokkade, parsePlanCoverage } from "./plan-coverage.js";
|
|
4
4
|
let fail = 0;
|
|
5
5
|
const eq = (n, got, want) => {
|
|
6
6
|
const ok = JSON.stringify(got) === JSON.stringify(want);
|
|
@@ -19,7 +19,14 @@ eq("FO-2601460: GLN → Floriday-locatie van de koper", deliveryLocationLabel(pi
|
|
|
19
19
|
eq("adres in de Floriday-levering gaat voor", pickDeliveryLocation(ref({ gln: "8713783885413", floridayAddress: { addressLine: "Elders 1", city: "Rijsenhout" } }), fl, klant)?.source, "floriday_levering");
|
|
20
20
|
eq("geen Floriday-locatie → klantlocatie", pickDeliveryLocation(ref({ gln: "8713783885413" }), [], klant)?.source, "klantlocatie");
|
|
21
21
|
eq("geen afleverlocatie → niets (scherm toont klantadres)", pickDeliveryLocation(ref({}), fl, klant), null);
|
|
22
|
-
eq("geenIndeling gelezen", parseGeenIndeling({ code: "LD01", tekst: "Past niet", actie: "Belading aanpassen", actieUrl: "/x" }), { code: "LD01", tekst: "Past niet", actie: "Belading aanpassen", actieUrl: "/x" });
|
|
22
|
+
eq("geenIndeling gelezen (1.0.201)", parseGeenIndeling({ code: "LD01", soort: "belading", tekst: "Past niet", actie: "belading_aanpassen", actieLabel: "Belading aanpassen", actieUrl: "/x" }), { code: "LD01", soort: "belading", tekst: "Past niet", actie: "belading_aanpassen", actieLabel: "Belading aanpassen", actieUrl: "/x", regels: [] });
|
|
23
|
+
eq("geenIndeling.regels als lijst", parseGeenIndeling({ code: "LD02", regels: ["Fust te hoog", " ", "Laag te vol"] })?.regels, ["Fust te hoog", "Laag te vol"]);
|
|
24
|
+
eq("actieUrl buiten de shell genegeerd", parseGeenIndeling({ code: "X", actieUrl: "https://elders.example/x" })?.actieUrl, null);
|
|
25
|
+
eq("actieUrl //host genegeerd", parseGeenIndeling({ code: "X", actieUrl: "//elders/x" })?.actieUrl, null);
|
|
26
|
+
eq("blokkade op kar → Ingedeeld met blokkade", labelWithBlokkade("ingedeeld", "Ingedeeld", true), "Ingedeeld met blokkade");
|
|
27
|
+
eq("Engine-label met blokkade gaat voor", labelWithBlokkade("ingedeeld", "Ingedeeld met blokkade", true), "Ingedeeld met blokkade");
|
|
28
|
+
eq("geen blokkade → Ingedeeld", labelWithBlokkade("ingedeeld", null, false), "Ingedeeld");
|
|
29
|
+
eq("kar met ladingdragerTekst + blokkade", (() => { const c = parsePlanCoverage({ state: "ingedeeld", carts: [{ cartId: "k1", ladingdragerTekst: "Deense container + 1 plaat (2 lagen, 20 %)", teHoog: true, blokkade: { code: "B1", tekst: "Te hoog voor de vrachtwagen" } }] }); return [c.label, c.carts[0].ladingdragerTekst, c.carts[0].teHoog, c.carts[0].blokkade?.tekst]; })(), ["Ingedeeld met blokkade", "Deense container + 1 plaat (2 lagen, 20 %)", true, "Te hoog voor de vrachtwagen"]);
|
|
23
30
|
eq("geenIndeling ontbreekt → null", parseGeenIndeling(undefined), null);
|
|
24
31
|
eq("additionalLayers heel getal", parseAdditionalLayers(2), 2);
|
|
25
32
|
eq("additionalLayers ontbreekt/breuk → null", [parseAdditionalLayers(undefined), parseAdditionalLayers(1.5), parseAdditionalLayers("2")], [null, null, null]);
|
|
@@ -29,3 +29,22 @@ if (fail) {
|
|
|
29
29
|
process.exit(1);
|
|
30
30
|
}
|
|
31
31
|
console.log("Alle controles geslaagd");
|
|
32
|
+
// Vangnet sleutelloze regels (bun src/lib/floriday-line-key.check.ts)
|
|
33
|
+
{
|
|
34
|
+
const { adoptUnkeyedLines } = await import("./floriday-line-key.js");
|
|
35
|
+
const fail = (m) => { throw new Error(m); };
|
|
36
|
+
const n = [{ foId: "a", productId: "p1", quantity: 48 }];
|
|
37
|
+
const one = adoptUnkeyedLines(n, [{ id: "u1", product_id: "p1", quantity: 48 }]);
|
|
38
|
+
if (one.adopt.get("a")?.id !== "u1" || one.doubt.size)
|
|
39
|
+
fail("precies één match moet worden overgenomen");
|
|
40
|
+
const none = adoptUnkeyedLines(n, [{ id: "u1", product_id: "p1", quantity: 47 }]);
|
|
41
|
+
if (none.adopt.size || none.doubt.size)
|
|
42
|
+
fail("ander aantal mag niet worden overgenomen");
|
|
43
|
+
const two = adoptUnkeyedLines(n, [{ id: "u1", product_id: "p1", quantity: 48 }, { id: "u2", product_id: "p1", quantity: 48 }]);
|
|
44
|
+
if (two.adopt.size || two.doubt.get("a")?.length !== 2)
|
|
45
|
+
fail("twee matches = twijfel, niets overnemen");
|
|
46
|
+
const once = adoptUnkeyedLines([...n, { foId: "b", productId: "p1", quantity: 48 }], [{ id: "u1", product_id: "p1", quantity: 48 }]);
|
|
47
|
+
if (once.adopt.size !== 1 || once.adopt.get("a")?.id !== "u1")
|
|
48
|
+
fail("sleutelloze regel hooguit één keer toewijzen");
|
|
49
|
+
console.log("vangnet sleutelloze regels: ok");
|
|
50
|
+
}
|
|
@@ -9,4 +9,24 @@ export declare function splitByLineKey<T extends {
|
|
|
9
9
|
};
|
|
10
10
|
/** Idempotentiesleutel voor de melding "Afgehandeld in Floriday" (id's gesorteerd). */
|
|
11
11
|
export declare function externalFulfilledIdempotencyKey(orderId: string, salesOrderIds: string[]): string;
|
|
12
|
+
/**
|
|
13
|
+
* Vangnet voor regels zonder herkomstsleutel (restant van de oude overname die
|
|
14
|
+
* wiste en opnieuw toevoegde zonder source_line_key). Per nieuwe Floriday-regel:
|
|
15
|
+
* precies één sleutelloze regel met hetzelfde product én aantal → overnemen
|
|
16
|
+
* (sleutel invullen) in plaats van een tweede regel ernaast. Meerdere kandidaten
|
|
17
|
+
* → "twijfel": niets schrijven, wel loggen. Geen kandidaat → gewoon nieuw.
|
|
18
|
+
* Een sleutelloze regel wordt hooguit één keer toegewezen.
|
|
19
|
+
*/
|
|
20
|
+
export declare function adoptUnkeyedLines<N extends {
|
|
21
|
+
foId: string;
|
|
22
|
+
productId: string | null;
|
|
23
|
+
quantity: number;
|
|
24
|
+
}, U extends {
|
|
25
|
+
id: string;
|
|
26
|
+
product_id: string | null;
|
|
27
|
+
quantity: number | null;
|
|
28
|
+
}>(newLines: N[], unkeyed: U[]): {
|
|
29
|
+
adopt: Map<string, U>;
|
|
30
|
+
doubt: Map<string, U[]>;
|
|
31
|
+
};
|
|
12
32
|
//# sourceMappingURL=floriday-line-key.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-line-key.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-line-key.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,mFAC8C,CAAC;AAEnF,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAE3D;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,CAAC,EAAE,CAAA;CAAE,CAKpG;AAED,uFAAuF;AACvF,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAEhG"}
|
|
1
|
+
{"version":3,"file":"floriday-line-key.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-line-key.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,mFAC8C,CAAC;AAEnF,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAE3D;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG;IAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,CAAC,EAAE,CAAA;CAAE,CAKpG;AAED,uFAAuF;AACvF,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAEhG;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EACtE,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC5E,QAAQ,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG;IAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,CAgBjF"}
|
|
@@ -18,3 +18,27 @@ export function splitByLineKey(lines) {
|
|
|
18
18
|
export function externalFulfilledIdempotencyKey(orderId, salesOrderIds) {
|
|
19
19
|
return `extern-afgehandeld:${orderId}:${[...new Set(salesOrderIds)].sort().join(",")}`;
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Vangnet voor regels zonder herkomstsleutel (restant van de oude overname die
|
|
23
|
+
* wiste en opnieuw toevoegde zonder source_line_key). Per nieuwe Floriday-regel:
|
|
24
|
+
* precies één sleutelloze regel met hetzelfde product én aantal → overnemen
|
|
25
|
+
* (sleutel invullen) in plaats van een tweede regel ernaast. Meerdere kandidaten
|
|
26
|
+
* → "twijfel": niets schrijven, wel loggen. Geen kandidaat → gewoon nieuw.
|
|
27
|
+
* Een sleutelloze regel wordt hooguit één keer toegewezen.
|
|
28
|
+
*/
|
|
29
|
+
export function adoptUnkeyedLines(newLines, unkeyed) {
|
|
30
|
+
const adopt = new Map();
|
|
31
|
+
const doubt = new Map();
|
|
32
|
+
const used = new Set();
|
|
33
|
+
const match = (n) => unkeyed.filter((u) => !used.has(u.id) && String(u.product_id ?? "") === String(n.productId ?? "") && Number(u.quantity ?? NaN) === Number(n.quantity));
|
|
34
|
+
for (const n of newLines) {
|
|
35
|
+
const c = match(n);
|
|
36
|
+
if (c.length === 1) {
|
|
37
|
+
adopt.set(n.foId, c[0]);
|
|
38
|
+
used.add(c[0].id);
|
|
39
|
+
}
|
|
40
|
+
else if (c.length > 1)
|
|
41
|
+
doubt.set(n.foId, c);
|
|
42
|
+
}
|
|
43
|
+
return { adopt, doubt };
|
|
44
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-mirror.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.server.ts"],"names":[],"mappings":"AAuKA,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"floriday-mirror.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.server.ts"],"names":[],"mappings":"AAuKA,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA08CD,eAAO,MAAM,oBAAoB,MAAgB,CAAC;AAElD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,yBAEpG;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,yBAI5D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { diffBuyerChanges } from "./floriday-change-diff.js";
|
|
2
|
-
import { MISSING_LINE_KEY_NOTICE, splitByLineKey } from "./floriday-line-key.js";
|
|
2
|
+
import { MISSING_LINE_KEY_NOTICE, adoptUnkeyedLines, splitByLineKey } from "./floriday-line-key.js";
|
|
3
3
|
import { keepOrSetCustomer, promoteCustomers } from "./floriday-promote-customer.js";
|
|
4
4
|
import { fillOnlyEmpty, snapshotFromFloridayOrder } from "./packing-snapshot.js";
|
|
5
5
|
// Spiegelt Floriday-verkooporders (FO's) uit `floriday_salesorders_cache`
|
|
@@ -1174,21 +1174,67 @@ async function mirrorUnlocked(limit, since, onlyIds = null) {
|
|
|
1174
1174
|
// het Floriday-artikel — dat loopt uitsluitend via de voorraad-module.
|
|
1175
1175
|
const lockedByKey = new Map();
|
|
1176
1176
|
const existingLineByKey = new Map();
|
|
1177
|
+
const unkeyedRows = [];
|
|
1177
1178
|
{
|
|
1178
1179
|
const { data: itemRows, error: lockErr } = await supabaseAdmin.from("order_items")
|
|
1179
|
-
.select("source_line_key, product_id, product_name, quantity, unit, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, vbn_package_code, load_carrier_type, packing_source, packing_locked_at")
|
|
1180
|
+
.select("id, source_line_key, product_id, product_name, quantity, unit, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, vbn_package_code, load_carrier_type, packing_source, packing_locked_at, quarantined_at")
|
|
1180
1181
|
.eq("order_id", orderId);
|
|
1181
1182
|
if (lockErr)
|
|
1182
1183
|
throw new Error(`bestaande orderregels lezen: ${lockErr.message}`);
|
|
1183
1184
|
for (const r of (itemRows ?? [])) {
|
|
1184
1185
|
const k = String(r.source_line_key ?? "");
|
|
1185
|
-
if (!k)
|
|
1186
|
+
if (!k) {
|
|
1187
|
+
if (!r.quarantined_at)
|
|
1188
|
+
unkeyedRows.push(r);
|
|
1186
1189
|
continue;
|
|
1190
|
+
}
|
|
1187
1191
|
existingLineByKey.set(k, r);
|
|
1188
1192
|
if (r.packing_locked_at)
|
|
1189
1193
|
lockedByKey.set(k, r);
|
|
1190
1194
|
}
|
|
1191
1195
|
}
|
|
1196
|
+
// Vangnet: een regel zonder sleutel (oude overname) met precies hetzelfde
|
|
1197
|
+
// product en aantal wordt overgenomen (sleutel invullen) in plaats van er
|
|
1198
|
+
// een tweede regel naast te zetten. Twijfel (meerdere kandidaten): niets
|
|
1199
|
+
// schrijven voor die Floriday-regel, wel een logregel.
|
|
1200
|
+
const doubtFoIds = new Set();
|
|
1201
|
+
if (unkeyedRows.length > 0) {
|
|
1202
|
+
const fresh = splitByLineKey(group)
|
|
1203
|
+
.valid.filter((l) => !existingLineByKey.has(l.foId))
|
|
1204
|
+
.map((l) => ({ foId: l.foId, productId: l.productId ?? null, quantity: Math.max(0, l.numberOfPieces) }));
|
|
1205
|
+
const { adopt, doubt } = adoptUnkeyedLines(fresh, unkeyedRows);
|
|
1206
|
+
for (const [foId, u] of adopt) {
|
|
1207
|
+
const { data: upd, error: adErr } = await supabaseAdmin.from("order_items")
|
|
1208
|
+
.update({ source_line_key: foId })
|
|
1209
|
+
.eq("id", u.id)
|
|
1210
|
+
.is("source_line_key", null)
|
|
1211
|
+
.select("id");
|
|
1212
|
+
if (adErr)
|
|
1213
|
+
throw new Error(`regel zonder sleutel overnemen: ${adErr.message}`);
|
|
1214
|
+
if (!upd?.length)
|
|
1215
|
+
continue;
|
|
1216
|
+
existingLineByKey.set(foId, { ...u, source_line_key: foId });
|
|
1217
|
+
if (u.packing_locked_at)
|
|
1218
|
+
lockedByKey.set(foId, { ...u, source_line_key: foId });
|
|
1219
|
+
await supabaseAdmin.from("floriday_merge_log").insert({
|
|
1220
|
+
action: "line_key_adopted",
|
|
1221
|
+
kept_order_id: orderId,
|
|
1222
|
+
floriday_sales_order_ids: [foId],
|
|
1223
|
+
lines: [{ id: u.id, product_id: u.product_id, quantity: u.quantity }],
|
|
1224
|
+
reason: "Regel zonder Floriday-koppeling overgenomen (zelfde product en aantal)",
|
|
1225
|
+
});
|
|
1226
|
+
}
|
|
1227
|
+
for (const [foId, cands] of doubt) {
|
|
1228
|
+
doubtFoIds.add(foId);
|
|
1229
|
+
await supabaseAdmin.from("floriday_merge_log").insert({
|
|
1230
|
+
action: "line_key_doubt",
|
|
1231
|
+
kept_order_id: orderId,
|
|
1232
|
+
floriday_sales_order_ids: [foId],
|
|
1233
|
+
lines: cands.map((u) => ({ id: u.id, product_id: u.product_id, quantity: u.quantity })),
|
|
1234
|
+
reason: "Meerdere regels zonder koppeling passen; niets geschreven, handmatig beoordelen",
|
|
1235
|
+
});
|
|
1236
|
+
}
|
|
1237
|
+
}
|
|
1192
1238
|
// Eén orderregel per Floriday-verkooporder in deze groep. Bijwerken op
|
|
1193
1239
|
// een vaste herkomstsleutel (source_line_key = Floriday sales order id),
|
|
1194
1240
|
// nooit meer wissen-en-opnieuw-toevoegen: dat veroorzaakte duplicaten
|
|
@@ -1199,7 +1245,7 @@ async function mirrorUnlocked(limit, since, onlyIds = null) {
|
|
|
1199
1245
|
// sales order; een bestaande regel houdt zijn verpakking. Alleen een
|
|
1200
1246
|
// leeg veld wordt aangevuld met een echte waarde (bijv. klokorder
|
|
1201
1247
|
// waarvan de Engine/Floriday later lagen meldt). Nooit overschrijven.
|
|
1202
|
-
const lineRows = splitByLineKey(group).valid.map((l) => {
|
|
1248
|
+
const lineRows = splitByLineKey(group).valid.filter((l) => !doubtFoIds.has(l.foId)).map((l) => {
|
|
1203
1249
|
const locked = lockedByKey.get(l.foId);
|
|
1204
1250
|
const prev = existingLineByKey.get(l.foId);
|
|
1205
1251
|
// Regels van vóór 1.0.105 (geen packing_source) blijven helemaal
|
|
@@ -3,5 +3,5 @@ export interface FloridayStatusResult {
|
|
|
3
3
|
entries: Map<string, FloridayStatusEntry>;
|
|
4
4
|
error: string | null;
|
|
5
5
|
}
|
|
6
|
-
export declare function loadFloridayStatuses(salesOrderIds: string[]): Promise<FloridayStatusResult>;
|
|
6
|
+
export declare function loadFloridayStatuses(salesOrderIds: string[], timeoutMs?: number): Promise<FloridayStatusResult>;
|
|
7
7
|
//# sourceMappingURL=floriday-status.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,EAA4B,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAoBvF,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"floriday-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,EAA4B,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAoBvF,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,SAAS,SAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDlH"}
|
|
@@ -16,7 +16,7 @@ async function hmacHex(secret, payload) {
|
|
|
16
16
|
.map((b) => b.toString(16).padStart(2, "0"))
|
|
17
17
|
.join("");
|
|
18
18
|
}
|
|
19
|
-
export async function loadFloridayStatuses(salesOrderIds) {
|
|
19
|
+
export async function loadFloridayStatuses(salesOrderIds, timeoutMs = 800) {
|
|
20
20
|
const entries = new Map();
|
|
21
21
|
const now = Date.now();
|
|
22
22
|
const wanted = [];
|
|
@@ -48,8 +48,8 @@ export async function loadFloridayStatuses(salesOrderIds) {
|
|
|
48
48
|
"x-floriday-caller": "verkoop",
|
|
49
49
|
},
|
|
50
50
|
body,
|
|
51
|
-
// Weergave
|
|
52
|
-
signal: AbortSignal.timeout(
|
|
51
|
+
// Weergave: begrensde wachttijd, daarna "stand onbekend".
|
|
52
|
+
signal: AbortSignal.timeout(timeoutMs),
|
|
53
53
|
});
|
|
54
54
|
const json = await res.json().catch(() => null);
|
|
55
55
|
if (!res.ok || json?.ok === false) {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.131";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-fust.check.d.ts","sourceRoot":"","sources":["../../src/lib/order-fust.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
// Test: `bun src/lib/order-fust.check.ts`. HO-2601461: 276/12 + 10/2 + 48/6 + 2/2 = 37 fust,
|
|
2
|
+
// niet 60 (de standaard van 6 planten per fust van het eerste artikel).
|
|
3
|
+
import { orderFust } from "./order-fust.js";
|
|
4
|
+
const ho2601461 = [
|
|
5
|
+
{ pieces: 276, line: { plants_per_crate: 12, crates_per_layer: 5, layers_per_cart: 8 }, product: { plants_per_crate: 6 }, articleKey: "a" },
|
|
6
|
+
{ pieces: 10, line: { plants_per_crate: 2, crates_per_layer: 2, layers_per_cart: 8 }, product: { plants_per_crate: 2 }, articleKey: "b" },
|
|
7
|
+
{ pieces: 48, line: { plants_per_crate: 6, crates_per_layer: 4, layers_per_cart: 6 }, product: { plants_per_crate: 6 }, articleKey: "c" },
|
|
8
|
+
{ pieces: 2, line: { plants_per_crate: 2, crates_per_layer: 1, layers_per_cart: 6 }, product: { plants_per_crate: 2 }, articleKey: "d" },
|
|
9
|
+
];
|
|
10
|
+
function check(cond, name) {
|
|
11
|
+
if (!cond)
|
|
12
|
+
throw new Error(`mislukt: ${name}`);
|
|
13
|
+
console.log(`ok: ${name}`);
|
|
14
|
+
}
|
|
15
|
+
const r = orderFust(ho2601461);
|
|
16
|
+
check(r.fust === 37, "HO-2601461 telt 37 fust met de regelbelading");
|
|
17
|
+
check(r.articleCount === 4 && r.mixed, "gemengd met 4 artikelen");
|
|
18
|
+
check(orderFust([{ pieces: 12, line: null, product: { plants_per_crate: 6 }, articleKey: "a" }]).fust === 2, "zonder regelbelading: standaard van het artikel");
|
|
19
|
+
check(!orderFust([{ pieces: 12, line: { plants_per_crate: 6 }, articleKey: "a" }]).mixed, "één artikel met één belading is niet gemengd");
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export interface FustLine {
|
|
2
|
+
pieces: number;
|
|
3
|
+
line: {
|
|
4
|
+
plants_per_crate?: number | null;
|
|
5
|
+
crates_per_layer?: number | null;
|
|
6
|
+
layers_per_cart?: number | null;
|
|
7
|
+
} | null;
|
|
8
|
+
product?: {
|
|
9
|
+
plants_per_crate?: number | null;
|
|
10
|
+
} | null;
|
|
11
|
+
articleKey: string;
|
|
12
|
+
}
|
|
13
|
+
export declare function plantsPerCrateFor(l: FustLine): number;
|
|
14
|
+
export declare function orderFust(lines: FustLine[]): {
|
|
15
|
+
fust: number;
|
|
16
|
+
articleCount: number;
|
|
17
|
+
mixed: boolean;
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=order-fust.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-fust.d.ts","sourceRoot":"","sources":["../../src/lib/order-fust.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACrH,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACtD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAKrD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAYnG"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export function plantsPerCrateFor(l) {
|
|
2
|
+
const own = Number(l.line?.plants_per_crate ?? 0);
|
|
3
|
+
if (own > 0)
|
|
4
|
+
return own;
|
|
5
|
+
const prod = Number(l.product?.plants_per_crate ?? 0);
|
|
6
|
+
return prod > 0 ? prod : 1;
|
|
7
|
+
}
|
|
8
|
+
export function orderFust(lines) {
|
|
9
|
+
let fust = 0;
|
|
10
|
+
const articles = new Set();
|
|
11
|
+
const packings = new Set();
|
|
12
|
+
for (const l of lines) {
|
|
13
|
+
if (!(l.pieces > 0))
|
|
14
|
+
continue;
|
|
15
|
+
const ppc = plantsPerCrateFor(l);
|
|
16
|
+
fust += Math.ceil(l.pieces / ppc);
|
|
17
|
+
articles.add(l.articleKey);
|
|
18
|
+
packings.add(`${ppc}x${Number(l.line?.crates_per_layer ?? 0)}x${Number(l.line?.layers_per_cart ?? 0)}`);
|
|
19
|
+
}
|
|
20
|
+
return { fust, articleCount: articles.size, mixed: articles.size > 1 || packings.size > 1 };
|
|
21
|
+
}
|