@flowselections/floriday-verkoop-module 1.0.129 → 1.0.130
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 +2 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +31 -17
- package/dist-lib/integrations/supabase/types.d.ts +94 -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 +8 -2
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-item-packing.functions.d.ts +34 -4
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +54 -6
- package/dist-lib/lib/plan-coverage.d.ts +22 -1
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +48 -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 +3 -4
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +23 -13
- package/package.json +1 -1
- package/schema/verkoop.sql +265 -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,13 @@ 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" });
|
|
23
|
+
eq("actieUrl buiten de shell genegeerd", parseGeenIndeling({ code: "X", actieUrl: "https://elders.example/x" })?.actieUrl, null);
|
|
24
|
+
eq("actieUrl //host genegeerd", parseGeenIndeling({ code: "X", actieUrl: "//elders/x" })?.actieUrl, null);
|
|
25
|
+
eq("blokkade op kar → Ingedeeld met blokkade", labelWithBlokkade("ingedeeld", "Ingedeeld", true), "Ingedeeld met blokkade");
|
|
26
|
+
eq("Engine-label met blokkade gaat voor", labelWithBlokkade("ingedeeld", "Ingedeeld met blokkade", true), "Ingedeeld met blokkade");
|
|
27
|
+
eq("geen blokkade → Ingedeeld", labelWithBlokkade("ingedeeld", null, false), "Ingedeeld");
|
|
28
|
+
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
29
|
eq("geenIndeling ontbreekt → null", parseGeenIndeling(undefined), null);
|
|
24
30
|
eq("additionalLayers heel getal", parseAdditionalLayers(2), 2);
|
|
25
31
|
eq("additionalLayers ontbreekt/breuk → null", [parseAdditionalLayers(undefined), parseAdditionalLayers(1.5), parseAdditionalLayers("2")], [null, null, null]);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.129";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -30,8 +30,14 @@ export declare const listOrderItemPacking: import("@tanstack/start-client-core")
|
|
|
30
30
|
}, Promise<{
|
|
31
31
|
items: OrderItemPackingRow[];
|
|
32
32
|
}>>;
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
export interface PackingPreview {
|
|
34
|
+
/** false = oudere Engine zonder voorbeeldfunctie. */
|
|
35
|
+
available: boolean;
|
|
36
|
+
tekst: string | null;
|
|
37
|
+
bevestigingNodig: boolean;
|
|
38
|
+
}
|
|
39
|
+
/** Voorbeeld van de Engine: wat het vastzetten doet (fust/karren), en of bevestiging nodig is. */
|
|
40
|
+
export declare const previewOrderItemPacking: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
35
41
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
36
42
|
userId: string;
|
|
37
43
|
claims: import("@supabase/auth-js").User;
|
|
@@ -40,10 +46,34 @@ export declare const setOrderItemPacking: import("@tanstack/start-client-core").
|
|
|
40
46
|
plantsPerCrate: number;
|
|
41
47
|
cratesPerLayer: number;
|
|
42
48
|
layersPerCart: number;
|
|
43
|
-
}, Promise<
|
|
49
|
+
}, Promise<PackingPreview>>;
|
|
50
|
+
export type SetPackingResult = {
|
|
44
51
|
ok: true;
|
|
45
52
|
locked: true;
|
|
46
|
-
|
|
53
|
+
tekst: string | null;
|
|
54
|
+
via: "engine" | "fallback";
|
|
55
|
+
} | {
|
|
56
|
+
ok: false;
|
|
57
|
+
bevestigingNodig: true;
|
|
58
|
+
tekst: string | null;
|
|
59
|
+
};
|
|
60
|
+
/**
|
|
61
|
+
* Zet de belading van één orderregel handmatig vast via de Engine
|
|
62
|
+
* (logistics_packing_set_manual_checked). Vraagt de Engine om bevestiging,
|
|
63
|
+
* dan komt bevestigingNodig terug en roept het scherm opnieuw aan met
|
|
64
|
+
* bevestigd=true. Alleen als de Engine-functie ontbreekt: oude directe schrijfactie.
|
|
65
|
+
*/
|
|
66
|
+
export declare const setOrderItemPacking: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
67
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
68
|
+
userId: string;
|
|
69
|
+
claims: import("@supabase/auth-js").User;
|
|
70
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
71
|
+
orderItemId: string;
|
|
72
|
+
plantsPerCrate: number;
|
|
73
|
+
cratesPerLayer: number;
|
|
74
|
+
layersPerCart: number;
|
|
75
|
+
bevestigd?: boolean | undefined;
|
|
76
|
+
}, Promise<SetPackingResult>>;
|
|
47
77
|
/** Haal de handmatige markering weg; de regel volgt weer de standaardbelading. */
|
|
48
78
|
export declare const clearOrderItemPackingLock: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
49
79
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,0DAA0D;IAC1D,YAAY,EAAE,OAAO,CAAC;IACtB,0EAA0E;IAC1E,eAAe,EAAE;QAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CACxH;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;WAYU,mBAAmB,EAAE;GA2D5D,CAAC;
|
|
1
|
+
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,0DAA0D;IAC1D,YAAY,EAAE,OAAO,CAAC;IACtB,0EAA0E;IAC1E,eAAe,EAAE;QAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CACxH;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;WAYU,mBAAmB,EAAE;GA2D5D,CAAC;AAkBL,MAAM,WAAW,cAAc;IAC7B,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,kGAAkG;AAClG,eAAO,MAAM,uBAAuB;;;;8CAEV,OAAO;;;;;2BAe7B,CAAC;AAEL,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,QAAQ,GAAG,UAAU,CAAA;CAAE,GAC5E;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,gBAAgB,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB;;;;8CAEN,OAAO;;;;;;6BA2B7B,CAAC;AAEL,kFAAkF;AAClF,eAAO,MAAM,yBAAyB;;;;8CAEZ,OAAO;;;;;GAY7B,CAAC"}
|
|
@@ -91,12 +91,60 @@ const packingSchema = z.object({
|
|
|
91
91
|
cratesPerLayer: z.number().int().positive(),
|
|
92
92
|
layersPerCart: z.number().int().positive(),
|
|
93
93
|
});
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
function isMissingFn(err) {
|
|
95
|
+
const code = String(err?.code ?? "");
|
|
96
|
+
return code === "PGRST202" || code === "42883" || /could not find the function/i.test(String(err?.message ?? ""));
|
|
97
|
+
}
|
|
98
|
+
function wijziging(d) {
|
|
99
|
+
return { plants_per_crate: d.plantsPerCrate, crates_per_layer: d.cratesPerLayer, layers_per_cart: d.layersPerCart };
|
|
100
|
+
}
|
|
101
|
+
/** Voorbeeld van de Engine: wat het vastzetten doet (fust/karren), en of bevestiging nodig is. */
|
|
102
|
+
export const previewOrderItemPacking = createServerFn({ method: "POST" })
|
|
96
103
|
.middleware([requireSupabaseAuth])
|
|
97
104
|
.inputValidator((input) => packingSchema.parse(input))
|
|
98
105
|
.handler(async ({ data, context }) => {
|
|
99
|
-
const { error } = await context.supabase.
|
|
106
|
+
const { data: pv, error } = await context.supabase.rpc("logistics_belading_vastzet_preview", {
|
|
107
|
+
p_order_item_id: data.orderItemId,
|
|
108
|
+
p_wijziging: wijziging(data),
|
|
109
|
+
});
|
|
110
|
+
if (error) {
|
|
111
|
+
if (isMissingFn(error))
|
|
112
|
+
return { available: false, tekst: null, bevestigingNodig: false };
|
|
113
|
+
throw new Error(`Voorbeeld van de Engine mislukt: ${error.message}`);
|
|
114
|
+
}
|
|
115
|
+
return {
|
|
116
|
+
available: true,
|
|
117
|
+
tekst: typeof pv?.tekst === "string" ? pv.tekst : null,
|
|
118
|
+
bevestigingNodig: pv?.bevestigingNodig === true,
|
|
119
|
+
};
|
|
120
|
+
});
|
|
121
|
+
/**
|
|
122
|
+
* Zet de belading van één orderregel handmatig vast via de Engine
|
|
123
|
+
* (logistics_packing_set_manual_checked). Vraagt de Engine om bevestiging,
|
|
124
|
+
* dan komt bevestigingNodig terug en roept het scherm opnieuw aan met
|
|
125
|
+
* bevestigd=true. Alleen als de Engine-functie ontbreekt: oude directe schrijfactie.
|
|
126
|
+
*/
|
|
127
|
+
export const setOrderItemPacking = createServerFn({ method: "POST" })
|
|
128
|
+
.middleware([requireSupabaseAuth])
|
|
129
|
+
.inputValidator((input) => packingSchema.extend({ bevestigd: z.boolean().optional() }).parse(input))
|
|
130
|
+
.handler(async ({ data, context }) => {
|
|
131
|
+
const { data: res, error } = await context.supabase.rpc("logistics_packing_set_manual_checked", {
|
|
132
|
+
p_order_item_id: data.orderItemId,
|
|
133
|
+
p_wijziging: wijziging(data),
|
|
134
|
+
p_bevestigd: data.bevestigd === true,
|
|
135
|
+
});
|
|
136
|
+
if (!error) {
|
|
137
|
+
if (res?.ok === false && res?.bevestigingNodig === true) {
|
|
138
|
+
return { ok: false, bevestigingNodig: true, tekst: typeof res?.tekst === "string" ? res.tekst : null };
|
|
139
|
+
}
|
|
140
|
+
if (res?.ok === false)
|
|
141
|
+
throw new Error(`Belading vastzetten geweigerd door de Engine${res?.tekst ? `: ${res.tekst}` : ""}`);
|
|
142
|
+
return { ok: true, locked: true, tekst: typeof res?.tekst === "string" ? res.tekst : null, via: "engine" };
|
|
143
|
+
}
|
|
144
|
+
if (!isMissingFn(error))
|
|
145
|
+
throw new Error(`Belading vastzetten faalde: ${error.message}`);
|
|
146
|
+
console.warn("[verkoop] logistics_packing_set_manual_checked ontbreekt; terugval op directe schrijfactie");
|
|
147
|
+
const { error: upErr } = await context.supabase.from("order_items")
|
|
100
148
|
.update({
|
|
101
149
|
plants_per_crate: data.plantsPerCrate,
|
|
102
150
|
crates_per_layer: data.cratesPerLayer,
|
|
@@ -105,9 +153,9 @@ export const setOrderItemPacking = createServerFn({ method: "POST" })
|
|
|
105
153
|
packing_locked_by: context.userId,
|
|
106
154
|
})
|
|
107
155
|
.eq("id", data.orderItemId);
|
|
108
|
-
if (
|
|
109
|
-
throw new Error(`Belading vastzetten faalde: ${
|
|
110
|
-
return { ok: true, locked: true };
|
|
156
|
+
if (upErr)
|
|
157
|
+
throw new Error(`Belading vastzetten faalde: ${upErr.message}`);
|
|
158
|
+
return { ok: true, locked: true, tekst: null, via: "fallback" };
|
|
111
159
|
});
|
|
112
160
|
/** Haal de handmatige markering weg; de regel volgt weer de standaardbelading. */
|
|
113
161
|
export const clearOrderItemPackingLock = createServerFn({ method: "POST" })
|
|
@@ -22,6 +22,15 @@ export interface PlanCoverageCart {
|
|
|
22
22
|
carrierType: string | null;
|
|
23
23
|
/** Extra platen volgens de Engine (1.0.201+); null/ontbrekend = niet tonen. */
|
|
24
24
|
additionalLayers: number | null;
|
|
25
|
+
/** Leesbare ladingdrager-tekst van de Engine (1.0.201+), bv. "Deense container + 1 plaat (2 lagen, 20 %)". */
|
|
26
|
+
ladingdragerTekst: string | null;
|
|
27
|
+
/** Kar te hoog volgens de Engine (1.0.201+); null = niet geleverd. */
|
|
28
|
+
teHoog: boolean | null;
|
|
29
|
+
/** Blokkade op deze kar volgens de Engine (1.0.201+). */
|
|
30
|
+
blokkade: {
|
|
31
|
+
code: string | null;
|
|
32
|
+
tekst: string | null;
|
|
33
|
+
} | null;
|
|
25
34
|
lines: PlanCoverageLine[];
|
|
26
35
|
}
|
|
27
36
|
export interface PlanCoveragePickRow {
|
|
@@ -63,12 +72,24 @@ export interface PlanCoverage {
|
|
|
63
72
|
}
|
|
64
73
|
export interface GeenIndeling {
|
|
65
74
|
code: string | null;
|
|
75
|
+
soort: string | null;
|
|
66
76
|
tekst: string | null;
|
|
67
77
|
actie: string | null;
|
|
78
|
+
actieLabel: string | null;
|
|
79
|
+
/** Alleen een pad binnen de shell ("/…"); anders null. */
|
|
68
80
|
actieUrl: string | null;
|
|
69
81
|
}
|
|
70
|
-
/**
|
|
82
|
+
/** Alleen interne paden binnen de shell; volledige adressen of "//host" worden genegeerd. */
|
|
83
|
+
export declare function safeShellPath(v: unknown): string | null;
|
|
84
|
+
/** Leest geenIndeling { code, soort, tekst, actie, actieLabel, actieUrl }; leeg/ongeldig = null. */
|
|
71
85
|
export declare function parseGeenIndeling(v: unknown): GeenIndeling | null;
|
|
86
|
+
/** Leest blokkade { code, tekst } van een kar; leeg = null. */
|
|
87
|
+
export declare function parseBlokkade(v: unknown): {
|
|
88
|
+
code: string | null;
|
|
89
|
+
tekst: string | null;
|
|
90
|
+
} | null;
|
|
91
|
+
/** Statuslabel: "Ingedeeld met blokkade" zodra een kar een blokkade heeft (Engine-label gaat voor). */
|
|
92
|
+
export declare function labelWithBlokkade(state: PlanCoverageState, engineLabel: string | null, hasBlokkade: boolean): string;
|
|
72
93
|
/** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
|
|
73
94
|
export declare function parseAdditionalLayers(v: unknown): number | null;
|
|
74
95
|
export declare function defaultLabel(state: PlanCoverageState): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-coverage.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plan-coverage.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,53 @@
|
|
|
1
1
|
// Indelingsstatus per order zoals de Logistiek Engine die levert via
|
|
2
2
|
// public.logistics_order_plan_coverage. Alleen types en een veilige parser —
|
|
3
3
|
// browser-veilig, geen databasecode. Deze module telt nooit zelf karren.
|
|
4
|
-
/**
|
|
4
|
+
/** Alleen interne paden binnen de shell; volledige adressen of "//host" worden genegeerd. */
|
|
5
|
+
export function safeShellPath(v) {
|
|
6
|
+
const p = str(v);
|
|
7
|
+
return p && p.startsWith("/") && !p.startsWith("//") && !/[\s\\]/.test(p) ? p : null;
|
|
8
|
+
}
|
|
9
|
+
/** Leest geenIndeling { code, soort, tekst, actie, actieLabel, actieUrl }; leeg/ongeldig = null. */
|
|
5
10
|
export function parseGeenIndeling(v) {
|
|
11
|
+
let g = v;
|
|
12
|
+
if (typeof g === "string") {
|
|
13
|
+
try {
|
|
14
|
+
g = JSON.parse(g);
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (!g || typeof g !== "object")
|
|
21
|
+
return null;
|
|
22
|
+
const out = {
|
|
23
|
+
code: str(g.code),
|
|
24
|
+
soort: str(g.soort),
|
|
25
|
+
tekst: str(g.tekst),
|
|
26
|
+
actie: str(g.actie),
|
|
27
|
+
actieLabel: str(g.actieLabel ?? g.actie_label),
|
|
28
|
+
actieUrl: safeShellPath(g.actieUrl ?? g.actie_url),
|
|
29
|
+
};
|
|
30
|
+
return out.code || out.tekst ? out : null;
|
|
31
|
+
}
|
|
32
|
+
/** Leest blokkade { code, tekst } van een kar; leeg = null. */
|
|
33
|
+
export function parseBlokkade(v) {
|
|
6
34
|
if (!v || typeof v !== "object")
|
|
7
35
|
return null;
|
|
8
|
-
const
|
|
9
|
-
const out = { code: str(
|
|
36
|
+
const b = v;
|
|
37
|
+
const out = { code: str(b.code), tekst: str(b.tekst) };
|
|
10
38
|
return out.code || out.tekst ? out : null;
|
|
11
39
|
}
|
|
40
|
+
/** Statuslabel: "Ingedeeld met blokkade" zodra een kar een blokkade heeft (Engine-label gaat voor). */
|
|
41
|
+
export function labelWithBlokkade(state, engineLabel, hasBlokkade) {
|
|
42
|
+
if (engineLabel) {
|
|
43
|
+
if (hasBlokkade && state === "ingedeeld" && engineLabel.trim().toLowerCase() === "ingedeeld")
|
|
44
|
+
return "Ingedeeld met blokkade";
|
|
45
|
+
return engineLabel;
|
|
46
|
+
}
|
|
47
|
+
if (hasBlokkade && state === "ingedeeld")
|
|
48
|
+
return "Ingedeeld met blokkade";
|
|
49
|
+
return defaultLabel(state);
|
|
50
|
+
}
|
|
12
51
|
/** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
|
|
13
52
|
export function parseAdditionalLayers(v) {
|
|
14
53
|
return typeof v === "number" && Number.isInteger(v) && v >= 0 ? v : null;
|
|
@@ -64,6 +103,9 @@ export function parsePlanCoverage(raw) {
|
|
|
64
103
|
shared: Boolean(c.shared),
|
|
65
104
|
carrierType: str(c.carrierType),
|
|
66
105
|
additionalLayers: parseAdditionalLayers(c.additionalLayers),
|
|
106
|
+
ladingdragerTekst: str(c.ladingdragerTekst),
|
|
107
|
+
teHoog: typeof c.teHoog === "boolean" ? c.teHoog : null,
|
|
108
|
+
blokkade: parseBlokkade(c.blokkade),
|
|
67
109
|
lines: (Array.isArray(c.lines) ? c.lines : []).map((l) => ({
|
|
68
110
|
orderItemId: str(l?.orderItemId),
|
|
69
111
|
productId: str(l?.productId),
|
|
@@ -81,7 +123,7 @@ export function parsePlanCoverage(raw) {
|
|
|
81
123
|
}));
|
|
82
124
|
return {
|
|
83
125
|
state,
|
|
84
|
-
label: str(d.label)
|
|
126
|
+
label: labelWithBlokkade(state, str(d.label), carts.some((c) => c.blokkade)),
|
|
85
127
|
progressPct: num(d.progressPct),
|
|
86
128
|
reason: str(d.reason),
|
|
87
129
|
carts,
|
|
@@ -113,9 +155,10 @@ export function parsePlanCoverageListRow(r) {
|
|
|
113
155
|
if (!r || typeof r !== "object")
|
|
114
156
|
return unknownCoverage("Leeg antwoord van de Engine");
|
|
115
157
|
const state = STATES.includes(r.state) ? r.state : "onbekend";
|
|
158
|
+
const blok = r.heeft_blokkade === true || r.met_blokkade === true || (num(r.blokkade_count) ?? 0) > 0;
|
|
116
159
|
return {
|
|
117
160
|
state,
|
|
118
|
-
label: str(r.label)
|
|
161
|
+
label: labelWithBlokkade(state, str(r.label), blok),
|
|
119
162
|
progressPct: num(r.progress_pct ?? r.progressPct),
|
|
120
163
|
reason: str(r.reason),
|
|
121
164
|
carts: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-coverage.server.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.server.ts"],"names":[],"mappings":"AASA,OAAO,EAAgE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"plan-coverage.server.d.ts","sourceRoot":"","sources":["../../src/lib/plan-coverage.server.ts"],"names":[],"mappings":"AASA,OAAO,EAAgE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAoDlH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,GAAE,MAAM,GAAG,QAAmB,GACjC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CA6CpC;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAgB5D"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// - Alleen lezen; schrijft nooit iets.
|
|
4
4
|
// - Leest nooit zelf order_carts/order_cart_items.
|
|
5
5
|
// - Lijst (mode "list"): lijstversie logistics_order_plan_coverage_list in één
|
|
6
|
-
// aanroep voor de zichtbare orders; ontbreekt die, dan per order beperkt parallel.
|
|
6
|
+
// aanroep voor de zichtbare orders (eerst _v201 met geen_indeling); ontbreekt die, dan per order beperkt parallel.
|
|
7
7
|
// - Details (mode "detail"): per order, want alleen die geeft karren en pickrijen.
|
|
8
8
|
// - Kort geheugen per order-id zodat opnieuw tekenen geen nieuwe vragen doet.
|
|
9
9
|
// - Fail closed: een fout geeft "Indeling onbekend", nooit "Geen indeling".
|
|
@@ -12,8 +12,11 @@ const TTL_MS = 30000;
|
|
|
12
12
|
const CONCURRENCY = 12;
|
|
13
13
|
const cache = new Map(); // sleutel: mode:orderId
|
|
14
14
|
let listFnMissingUntil = 0;
|
|
15
|
+
let listV201MissingUntil = 0;
|
|
15
16
|
const LIST_CHUNK = 1000;
|
|
16
17
|
const LIST_FN = "logistics_order_plan_coverage_list";
|
|
18
|
+
// Engine 1.0.201+: zelfde rijen plus kolom geen_indeling; ontbreekt hij, dan de oude functie.
|
|
19
|
+
const LIST_FN_V201 = "logistics_order_plan_coverage_list_v201";
|
|
17
20
|
const SINGLE_FN = "logistics_order_plan_coverage";
|
|
18
21
|
function isMissingFunction(err) {
|
|
19
22
|
const code = String(err?.code ?? "");
|
|
@@ -27,7 +30,14 @@ async function tryListVersion(supabase, ids) {
|
|
|
27
30
|
// Maximaal LIST_CHUNK id's per aanroep; een mislukte portie raakt alleen die orders.
|
|
28
31
|
for (let i = 0; i < ids.length; i += LIST_CHUNK) {
|
|
29
32
|
const chunk = ids.slice(i, i + LIST_CHUNK);
|
|
30
|
-
|
|
33
|
+
let { data, error } = Date.now() < listV201MissingUntil
|
|
34
|
+
? { data: null, error: { code: "PGRST202", message: "v201 ontbreekt" } }
|
|
35
|
+
: await supabase.rpc(LIST_FN_V201, { p_order_ids: chunk });
|
|
36
|
+
if (error && isMissingFunction(error)) {
|
|
37
|
+
if (Date.now() >= listV201MissingUntil)
|
|
38
|
+
listV201MissingUntil = Date.now() + 5 * 60000;
|
|
39
|
+
({ data, error } = await supabase.rpc(LIST_FN, { p_order_ids: chunk }));
|
|
40
|
+
}
|
|
31
41
|
if (error) {
|
|
32
42
|
if (isMissingFunction(error)) {
|
|
33
43
|
listFnMissingUntil = Date.now() + 5 * 60000;
|
|
@@ -6,9 +6,8 @@ export declare const getProductPlannability: import("@tanstack/start-client-core
|
|
|
6
6
|
productIds: string[];
|
|
7
7
|
}, Promise<{
|
|
8
8
|
impossible: Record<string, string>;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
available: false;
|
|
9
|
+
missing: Record<string, string>;
|
|
10
|
+
available: boolean;
|
|
11
|
+
oordeelAvailable: boolean;
|
|
13
12
|
}>>;
|
|
14
13
|
//# sourceMappingURL=product-plannable.functions.d.ts.map
|