@flowselections/floriday-verkoop-module 1.0.127 → 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.
Files changed (66) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +20 -2
  3. package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
  4. package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -2
  5. package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
  6. package/dist-lib/components/verkoop/OrderKarindelingCard.js +5 -2
  7. package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
  8. package/dist-lib/components/verkoop/OrderLinePackingCard.js +37 -17
  9. package/dist-lib/components/verkoop/OrderShipmentsCard.js +1 -1
  10. package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
  11. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  12. package/dist-lib/components/verkoop/SalesOrdersTable.js +2 -1
  13. package/dist-lib/integrations/supabase/types.d.ts +824 -122
  14. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  15. package/dist-lib/integrations/supabase/types.js +1 -0
  16. package/dist-lib/lib/cron/cron-auth.check.d.ts +2 -0
  17. package/dist-lib/lib/cron/cron-auth.check.d.ts.map +1 -0
  18. package/dist-lib/lib/cron/cron-auth.check.js +25 -0
  19. package/dist-lib/lib/cron/cron-auth.server.d.ts +6 -0
  20. package/dist-lib/lib/cron/cron-auth.server.d.ts.map +1 -0
  21. package/dist-lib/lib/cron/cron-auth.server.js +53 -0
  22. package/dist-lib/lib/cron/index.d.ts +1 -0
  23. package/dist-lib/lib/cron/index.d.ts.map +1 -1
  24. package/dist-lib/lib/cron/index.js +1 -0
  25. package/dist-lib/lib/cron/invoice-due.d.ts.map +1 -1
  26. package/dist-lib/lib/cron/invoice-due.js +4 -5
  27. package/dist-lib/lib/cron/sync-salesorders-now.d.ts +10 -0
  28. package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -0
  29. package/dist-lib/lib/cron/sync-salesorders-now.js +79 -0
  30. package/dist-lib/lib/cron/sync-salesorders.d.ts.map +1 -1
  31. package/dist-lib/lib/cron/sync-salesorders.js +4 -5
  32. package/dist-lib/lib/delivery-location.check.d.ts +2 -0
  33. package/dist-lib/lib/delivery-location.check.d.ts.map +1 -0
  34. package/dist-lib/lib/delivery-location.check.js +35 -0
  35. package/dist-lib/lib/delivery-location.server.d.ts +35 -0
  36. package/dist-lib/lib/delivery-location.server.d.ts.map +1 -0
  37. package/dist-lib/lib/delivery-location.server.js +171 -0
  38. package/dist-lib/lib/floriday-mirror.server.d.ts +7 -0
  39. package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
  40. package/dist-lib/lib/floriday-mirror.server.js +38 -5
  41. package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
  42. package/dist-lib/lib/floriday-status.server.js +2 -0
  43. package/dist-lib/lib/module-version.d.ts +1 -1
  44. package/dist-lib/lib/module-version.js +1 -1
  45. package/dist-lib/lib/order-addresses.functions.d.ts +1 -0
  46. package/dist-lib/lib/order-addresses.functions.d.ts.map +1 -1
  47. package/dist-lib/lib/order-addresses.functions.js +28 -29
  48. package/dist-lib/lib/order-item-packing.functions.d.ts +40 -4
  49. package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
  50. package/dist-lib/lib/order-item-packing.functions.js +72 -7
  51. package/dist-lib/lib/plan-coverage.d.ts +36 -0
  52. package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
  53. package/dist-lib/lib/plan-coverage.js +61 -2
  54. package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
  55. package/dist-lib/lib/plan-coverage.server.js +12 -2
  56. package/dist-lib/lib/product-plannable.functions.d.ts +13 -0
  57. package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -0
  58. package/dist-lib/lib/product-plannable.functions.js +34 -0
  59. package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
  60. package/dist-lib/lib/salesorders-list.functions.js +15 -1
  61. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  62. package/dist-lib/lib/salesorders-list.server.js +10 -0
  63. package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
  64. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  65. package/package.json +9 -1
  66. package/schema/verkoop.sql +363 -0
@@ -40,6 +40,7 @@ export const Constants = {
40
40
  "afleverbrief",
41
41
  "veilingbrief",
42
42
  "traysticker",
43
+ "eigen_sticker",
43
44
  ],
44
45
  doc_orientation: ["portrait", "landscape"],
45
46
  exact_env: ["staging", "live"],
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=cron-auth.check.d.ts.map
@@ -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,4 +1,5 @@
1
1
  export { replanCartsCron, replanCartsCronHint } from "./replan-carts.js";
2
2
  export { syncSalesOrdersCron, syncSalesOrdersCronHint } from "./sync-salesorders.js";
3
3
  export { invoiceDueCron, invoiceDueCronHint } from "./invoice-due.js";
4
+ export { syncSalesOrdersNowCron } from "./sync-salesorders-now.js";
4
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/cron/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC"}
@@ -1,3 +1,4 @@
1
1
  export { replanCartsCron, replanCartsCronHint } from "./replan-carts.js";
2
2
  export { syncSalesOrdersCron, syncSalesOrdersCronHint } from "./sync-salesorders.js";
3
3
  export { invoiceDueCron, invoiceDueCronHint } from "./invoice-due.js";
4
+ export { syncSalesOrdersNowCron } from "./sync-salesorders-now.js";
@@ -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,CAYnB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAKnB"}
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 apikey = request.headers.get("apikey") ?? request.headers.get("x-api-key");
4
- const expected = process.env.SUPABASE_PUBLISHABLE_KEY;
5
- if (!expected || !apikey || apikey !== expected) {
6
- return new Response("Unauthorized", { status: 401 });
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 });
@@ -0,0 +1,10 @@
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
+ };
10
+ //# sourceMappingURL=sync-salesorders-now.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,79 @@
1
+ import { z } from "zod";
2
+ // Directe omzetting: de databasetrigger op floriday_salesorders_cache stuurt
3
+ // per statement alle nieuwe of inhoudelijk gewijzigde salesOrderIds in één
4
+ // verzoek hierheen. Toegang alleen met de geheime cron-sleutel (x-verkoop-cron-key). Daarna wordt
5
+ // de Engine gewekt (logistics_plan_enqueue gebeurt in de spiegeling zelf).
6
+ // De minuutronde blijft het vangnet: mislukt dit, dan alleen een logregel.
7
+ const MAX_IDS = 50;
8
+ const RETRIES = 3;
9
+ const RETRY_MS = 1500;
10
+ export async function syncSalesOrdersNowCron(request, _supabase) {
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
+ try {
17
+ body = await request.json();
18
+ }
19
+ catch {
20
+ body = null;
21
+ }
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)
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 });
42
+ const started = Date.now();
43
+ const { mirrorFloridayOrdersByIds } = await import("../floriday-mirror.server.js");
44
+ let result = null;
45
+ // Loopt de minuutronde net, dan kort wachten; anders pakt die ronde het op.
46
+ for (let i = 0; i < RETRIES; i++) {
47
+ result = await mirrorFloridayOrdersByIds(ids);
48
+ if (result?.skipped_reason !== "already-running")
49
+ break;
50
+ await new Promise((r) => setTimeout(r, RETRY_MS));
51
+ }
52
+ const orderIds = Array.isArray(result?.enqueuedOrderIds) ? result.enqueuedOrderIds : [];
53
+ if (orderIds.length) {
54
+ const { wakeEnginePlanNow } = await import("../engine-wake.server.js");
55
+ wakeEnginePlanNow(orderIds, new URL(request.url).origin, "floriday-direct");
56
+ }
57
+ console.log(`[sync-salesorders-now] ids=${ids.length} verwerkt=${result?.processed ?? 0} nieuw=${result?.inserted ?? 0} gewijzigd=${result?.updated ?? 0} aangemeld=${orderIds.length} ${Date.now() - started}ms${result?.skipped_reason ? ` overgeslagen=${result.skipped_reason}` : ""}`);
58
+ return Response.json({
59
+ ok: result?.ok !== false,
60
+ ids: ids.length,
61
+ rejected,
62
+ processed: result?.processed ?? 0,
63
+ inserted: result?.inserted ?? 0,
64
+ updated: result?.updated ?? 0,
65
+ enqueued: orderIds.length,
66
+ skipped: result?.skipped_reason ?? null,
67
+ ms: Date.now() - started,
68
+ });
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,CAyCnB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,QAAQ,CAAC,CAEnB"}
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 apikey = request.headers.get("apikey") ?? request.headers.get("x-api-key");
6
- const expected = process.env.SUPABASE_PUBLISHABLE_KEY;
7
- if (!expected || !apikey || apikey !== expected) {
8
- return new Response("Unauthorized", { status: 401 });
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" });
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=delivery-location.check.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delivery-location.check.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-location.check.ts"],"names":[],"mappings":""}
@@ -0,0 +1,35 @@
1
+ // Draaien: bun src/lib/delivery-location.check.ts
2
+ import { pickDeliveryLocation, deliveryLocationLabel } from "./delivery-location.server.js";
3
+ import { parseGeenIndeling, parseAdditionalLayers, labelWithBlokkade, parsePlanCoverage } from "./plan-coverage.js";
4
+ let fail = 0;
5
+ const eq = (n, got, want) => {
6
+ const ok = JSON.stringify(got) === JSON.stringify(want);
7
+ if (!ok)
8
+ fail++;
9
+ console.log(`${ok ? "ok " : "FOUT"} ${n}: ${JSON.stringify(got)}`);
10
+ };
11
+ const ref = (p) => ({ key: "o", gln: null, locationId: null, floridayAddress: null, floridayName: null, buyerOrgId: null, customerId: null, ...p });
12
+ const addr = { addressLine: "Legmeerdijk 313", city: "AALSMEER", postalCode: "1431 GB", countryCode: "NL" };
13
+ const fl = [
14
+ { gln_code: "8713783885413", floriday_id: "x", is_deleted: true, data: { name: "C046 - 88O", organizationId: "andere", address: addr } },
15
+ { gln_code: "8713783885413", floriday_id: "y", is_deleted: false, data: { name: "C046 - 88", organizationId: "koper", address: addr } },
16
+ ];
17
+ const klant = [{ id: "k", customer_id: "c", gln: "8713783885413", name: "Royal FloraHolland Naaldwijk", city: "Honselersdijk" }];
18
+ eq("FO-2601460: GLN → Floriday-locatie van de koper", deliveryLocationLabel(pickDeliveryLocation(ref({ gln: "8713783885413", buyerOrgId: "koper" }), fl, klant)), "Legmeerdijk 313 (C046 - 88), Aalsmeer");
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
+ eq("geen Floriday-locatie → klantlocatie", pickDeliveryLocation(ref({ gln: "8713783885413" }), [], klant)?.source, "klantlocatie");
21
+ eq("geen afleverlocatie → niets (scherm toont klantadres)", pickDeliveryLocation(ref({}), fl, klant), null);
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"]);
29
+ eq("geenIndeling ontbreekt → null", parseGeenIndeling(undefined), null);
30
+ eq("additionalLayers heel getal", parseAdditionalLayers(2), 2);
31
+ eq("additionalLayers ontbreekt/breuk → null", [parseAdditionalLayers(undefined), parseAdditionalLayers(1.5), parseAdditionalLayers("2")], [null, null, null]);
32
+ if (fail) {
33
+ console.error(`${fail} fout(en)`);
34
+ process.exit(1);
35
+ }
@@ -0,0 +1,35 @@
1
+ export interface DeliveryLocation {
2
+ name: string | null;
3
+ line: string | null;
4
+ postalCode: string | null;
5
+ city: string | null;
6
+ country: string | null;
7
+ gln: string | null;
8
+ source: "floriday_levering" | "floriday_locatie" | "klantlocatie" | "alleen_gln";
9
+ }
10
+ /** Titelcase voor plaatsnamen in hoofdletters ("AALSMEER" → "Aalsmeer"). */
11
+ export declare function niceCity(c: string | null): string | null;
12
+ /** "Legmeerdijk 313 (C046 - 88), Aalsmeer" */
13
+ export declare function deliveryLocationLabel(l: DeliveryLocation | null | undefined): string | null;
14
+ export interface DeliveryRef {
15
+ key: string;
16
+ gln: string | null;
17
+ locationId: string | null;
18
+ floridayAddress: any | null;
19
+ floridayName: string | null;
20
+ buyerOrgId: string | null;
21
+ customerId: string | null;
22
+ }
23
+ /** Kern: refs → locatie. Pure op de aangeleverde rijen (testbaar). */
24
+ export declare function pickDeliveryLocation(ref: DeliveryRef, floridayLocations: {
25
+ gln_code: string | null;
26
+ floriday_id: string | null;
27
+ data: any;
28
+ is_deleted: boolean | null;
29
+ }[], customerLocations: any[]): DeliveryLocation | null;
30
+ /**
31
+ * Afleverlocaties voor lokale order-id's (orders.id). Vier gebundelde reads,
32
+ * ongeacht het aantal orders. Fout → lege map (scherm valt terug).
33
+ */
34
+ export declare function loadDeliveryLocations(supabase: any, orderIds: string[]): Promise<Map<string, DeliveryLocation>>;
35
+ //# sourceMappingURL=delivery-location.server.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delivery-location.server.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-location.server.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,mBAAmB,GAAG,kBAAkB,GAAG,cAAc,GAAG,YAAY,CAAC;CAClF;AAUD,4EAA4E;AAC5E,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGxD;AAED,8CAA8C;AAC9C,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAM3F;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,GAAG,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAcD,sEAAsE;AACtE,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,WAAW,EAChB,iBAAiB,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,EAAE,EACnH,iBAAiB,EAAE,GAAG,EAAE,GACvB,gBAAgB,GAAG,IAAI,CAkDzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAiFxC"}
@@ -0,0 +1,171 @@
1
+ // Afleverlocatie per order: GLN/locatie-id → naam en adres.
2
+ // Volgorde: (1) adres in de Floriday-levering zelf, (2) Floriday-locaties
3
+ // (voorkeur: locatie van de koper, niet verwijderd), (3) klantlocaties
4
+ // (voorkeur: locatie van de gekoppelde klant). Klantadres is nooit een
5
+ // afleverlocatie; dat kiest het scherm alleen als hier niets uitkomt.
6
+ const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
7
+ function s(v) {
8
+ if (v == null)
9
+ return null;
10
+ const t = String(v).trim();
11
+ return t ? t : null;
12
+ }
13
+ /** Titelcase voor plaatsnamen in hoofdletters ("AALSMEER" → "Aalsmeer"). */
14
+ export function niceCity(c) {
15
+ if (!c)
16
+ return c;
17
+ return c === c.toUpperCase() ? c.toLowerCase().replace(/(^|[\s-])\p{L}/gu, (m) => m.toUpperCase()) : c;
18
+ }
19
+ /** "Legmeerdijk 313 (C046 - 88), Aalsmeer" */
20
+ export function deliveryLocationLabel(l) {
21
+ if (!l)
22
+ return null;
23
+ const head = [l.line, l.name ? `(${l.name})` : null].filter(Boolean).join(" ");
24
+ const city = niceCity(l.city);
25
+ const out = [head || null, city].filter(Boolean).join(", ");
26
+ return out || (l.gln ? `GLN ${l.gln}` : null);
27
+ }
28
+ function fromFloridayData(d, gln) {
29
+ const a = d?.address ?? {};
30
+ return {
31
+ name: s(d?.name),
32
+ line: s(a.addressLine),
33
+ postalCode: s(a.postalCode),
34
+ city: s(a.city),
35
+ country: s(a.countryCode ?? a.country),
36
+ gln: s(d?.gln) ?? gln,
37
+ };
38
+ }
39
+ /** Kern: refs → locatie. Pure op de aangeleverde rijen (testbaar). */
40
+ export function pickDeliveryLocation(ref, floridayLocations, customerLocations) {
41
+ const fa = ref.floridayAddress;
42
+ if (fa && (s(fa.addressLine) || s(fa.city))) {
43
+ return {
44
+ ...fromFloridayData({ address: fa, name: ref.floridayName }, ref.gln),
45
+ source: "floriday_levering",
46
+ };
47
+ }
48
+ const fl = floridayLocations
49
+ .filter((r) => (ref.gln && r.gln_code === ref.gln) ||
50
+ (ref.locationId && (r.floriday_id === ref.locationId || r.data?.locationId === ref.locationId)))
51
+ .sort((a, b) => score(b) - score(a));
52
+ function score(r) {
53
+ let n = 0;
54
+ if (!r.is_deleted && r.data?.isDeleted !== true)
55
+ n += 2;
56
+ if (ref.buyerOrgId && r.data?.organizationId === ref.buyerOrgId)
57
+ n += 4;
58
+ if (ref.locationId && (r.floriday_id === ref.locationId || r.data?.locationId === ref.locationId))
59
+ n += 8;
60
+ return n;
61
+ }
62
+ if (fl[0])
63
+ return { ...fromFloridayData(fl[0].data, ref.gln), source: "floriday_locatie" };
64
+ const cl = customerLocations
65
+ .filter((r) => (ref.locationId && (r.id === ref.locationId || r.floriday_location_id === ref.locationId)) ||
66
+ (ref.gln && r.gln === ref.gln))
67
+ .sort((a, b) => Number(b.customer_id === ref.customerId) - Number(a.customer_id === ref.customerId));
68
+ const r = cl[0];
69
+ if (r) {
70
+ return {
71
+ name: s(r.name),
72
+ line: s(r.address_line) ?? s([s(r.street), s(r.house_number)].filter(Boolean).join(" ")),
73
+ postalCode: s(r.postal_code),
74
+ city: s(r.city),
75
+ country: s(r.country),
76
+ gln: s(r.gln) ?? ref.gln,
77
+ source: "klantlocatie",
78
+ };
79
+ }
80
+ if (ref.gln) {
81
+ return { name: null, line: null, postalCode: null, city: null, country: null, gln: ref.gln, source: "alleen_gln" };
82
+ }
83
+ return null;
84
+ }
85
+ /**
86
+ * Afleverlocaties voor lokale order-id's (orders.id). Vier gebundelde reads,
87
+ * ongeacht het aantal orders. Fout → lege map (scherm valt terug).
88
+ */
89
+ export async function loadDeliveryLocations(supabase, orderIds) {
90
+ const out = new Map();
91
+ const ids = Array.from(new Set(orderIds.filter((x) => UUID_RE.test(x))));
92
+ if (!ids.length)
93
+ return out;
94
+ try {
95
+ const { data: orders } = await supabase
96
+ .from("orders")
97
+ .select("id, customer_id, custom_fields")
98
+ .in("id", ids);
99
+ const refs = [];
100
+ const sids = new Set();
101
+ for (const o of (orders ?? [])) {
102
+ const cf = o.custom_fields ?? {};
103
+ const raw = s(cf.delivery_location_gln ?? cf.delivery_location ?? cf.delivery_location_id);
104
+ const sid = s(cf.floriday_sales_order_id);
105
+ if (sid)
106
+ sids.add(sid);
107
+ refs.push({
108
+ key: String(o.id),
109
+ gln: s(cf.delivery_location_gln) ?? (raw && /^\d{13}$/.test(raw) ? raw : null),
110
+ locationId: raw && !/^\d{13}$/.test(raw) ? raw : s(cf.delivery_location_id),
111
+ floridayAddress: null,
112
+ floridayName: null,
113
+ buyerOrgId: s(cf.floriday_customer_id),
114
+ customerId: s(o.customer_id),
115
+ // tijdelijk: sid voor koppeling
116
+ ...(sid ? { _sid: sid } : {}),
117
+ });
118
+ }
119
+ if (sids.size) {
120
+ const { data: so } = await supabase
121
+ .from("floriday_salesorders_cache")
122
+ .select("floriday_id, data")
123
+ .in("floriday_id", Array.from(sids));
124
+ const bySid = new Map();
125
+ for (const r of (so ?? []))
126
+ bySid.set(String(r.floriday_id), r.data?.delivery?.location ?? null);
127
+ for (const r of refs) {
128
+ const loc = r._sid ? bySid.get(r._sid) : null;
129
+ if (loc) {
130
+ r.floridayAddress = loc.address ?? null;
131
+ r.floridayName = s(loc.name);
132
+ r.gln = r.gln ?? s(loc.gln);
133
+ }
134
+ }
135
+ }
136
+ const glns = Array.from(new Set(refs.map((r) => r.gln).filter(Boolean)));
137
+ const locIds = Array.from(new Set(refs.map((r) => r.locationId).filter(Boolean)));
138
+ const [fl, cl] = await Promise.all([
139
+ glns.length || locIds.length
140
+ ? supabase
141
+ .from("floriday_delivery_locations_cache")
142
+ .select("gln_code, floriday_id, data, is_deleted")
143
+ .or([
144
+ glns.length ? `gln_code.in.(${glns.join(",")})` : null,
145
+ locIds.length ? `floriday_id.in.(${locIds.join(",")})` : null,
146
+ ].filter(Boolean).join(","))
147
+ : Promise.resolve({ data: [] }),
148
+ glns.length || locIds.length
149
+ ? supabase
150
+ .from("customer_delivery_locations")
151
+ .select("id, customer_id, floriday_location_id, name, address_line, street, house_number, postal_code, city, country, gln")
152
+ .or([
153
+ glns.length ? `gln.in.(${glns.join(",")})` : null,
154
+ locIds.length ? `floriday_location_id.in.(${locIds.join(",")})` : null,
155
+ locIds.filter((x) => UUID_RE.test(x)).length
156
+ ? `id.in.(${locIds.filter((x) => UUID_RE.test(x)).join(",")})`
157
+ : null,
158
+ ].filter(Boolean).join(","))
159
+ : Promise.resolve({ data: [] }),
160
+ ]);
161
+ for (const r of refs) {
162
+ const l = pickDeliveryLocation(r, (fl.data ?? []), (cl.data ?? []));
163
+ if (l)
164
+ out.set(r.key, l);
165
+ }
166
+ }
167
+ catch (e) {
168
+ console.warn("[delivery-location] opvraging mislukt:", e?.message);
169
+ }
170
+ return out;
171
+ }
@@ -7,6 +7,8 @@ export interface MirrorResult {
7
7
  unchanged?: number;
8
8
  failed: number;
9
9
  enqueued?: number;
10
+ /** Orders die in deze ronde bij de planwachtrij zijn aangemeld. */
11
+ enqueuedOrderIds?: string[];
10
12
  /** Per gewijzigde order welke velden echt veranderden. */
11
13
  changes?: {
12
14
  order_id: string;
@@ -17,4 +19,9 @@ export interface MirrorResult {
17
19
  }
18
20
  export declare const DEFAULT_MIRROR_BATCH = 200;
19
21
  export declare function mirrorFloridayOrdersFromCron(limit?: number, since?: string | null): Promise<MirrorResult>;
22
+ /**
23
+ * Gerichte spiegeling (direct na de cache-upsert): alleen deze salesOrderIds
24
+ * plus echte groepsgenoten. Zelfde logica en slot als de minuutronde.
25
+ */
26
+ export declare function mirrorFloridayOrdersByIds(ids: string[]): Promise<MirrorResult>;
20
27
  //# sourceMappingURL=floriday-mirror.server.d.ts.map
@@ -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,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;AA24CD,eAAO,MAAM,oBAAoB,MAAgB,CAAC;AAElD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,yBAEpG"}
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;AA85CD,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"}