@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
@@ -151,7 +151,7 @@ function pickString(value) {
151
151
  // terwijl ze dit spiegelen aanroept). Faalt gesloten: geen slot = geen ronde.
152
152
  const MIRROR_LOCK_KEY = "verkoop:floriday-mirror";
153
153
  const MIRROR_LOCK_SECONDS = 600;
154
- async function mirrorInternal(limit, since = null) {
154
+ async function mirrorInternal(limit, since = null, onlyIds = null) {
155
155
  const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
156
156
  const empty = (reason, ok) => ({
157
157
  ok, processed: 0, inserted: 0, updated: 0, skipped: 0, failed: 0, errors: ok ? [] : [reason], skipped_reason: reason,
@@ -162,7 +162,7 @@ async function mirrorInternal(limit, since = null) {
162
162
  if (acquired !== true)
163
163
  return empty("already-running", true);
164
164
  try {
165
- return await mirrorUnlocked(limit, since);
165
+ return await mirrorUnlocked(limit, since, onlyIds);
166
166
  }
167
167
  finally {
168
168
  try {
@@ -173,7 +173,7 @@ async function mirrorInternal(limit, since = null) {
173
173
  }
174
174
  }
175
175
  }
176
- async function mirrorUnlocked(limit, since) {
176
+ async function mirrorUnlocked(limit, since, onlyIds = null) {
177
177
  const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
178
178
  const { loadFloridayFulfillmentStates, expectedPackagesFromSalesOrder, isFullyFulfilled, } = await import("./floriday-fulfillment-status.server.js");
179
179
  const cutoffIso = new Date(Date.now() - LOOKBACK_DAYS * 24 * 60 * 60 * 1000).toISOString();
@@ -185,7 +185,9 @@ async function mirrorUnlocked(limit, since) {
185
185
  .select("floriday_id, data, updated_at, buyer_organization_id")
186
186
  .eq("is_deleted", false)
187
187
  .gte("data->delivery->>latestDeliveryDateTime", cutoffIso);
188
- if (since)
188
+ if (onlyIds)
189
+ cacheQuery = cacheQuery.in("floriday_id", onlyIds);
190
+ else if (since)
189
191
  cacheQuery = cacheQuery.gt("updated_at", since);
190
192
  const { data: baseRows, error: cacheErr } = await cacheQuery
191
193
  .order("updated_at", { ascending: false })
@@ -193,7 +195,25 @@ async function mirrorUnlocked(limit, since) {
193
195
  if (cacheErr)
194
196
  throw new Error(cacheErr.message);
195
197
  let cacheRows = (baseRows ?? []);
196
- if (since) {
198
+ // Gerichte modus: echte groepsgenoten (salesOrderGroupId) meenemen, zodat een
199
+ // groep nooit half wordt gespiegeld. customerOrderId bundelt nooit.
200
+ if (onlyIds && cacheRows.length) {
201
+ const groups = Array.from(new Set(cacheRows.map((r) => r?.data?.salesOrderGroupId).filter(Boolean).map(String)));
202
+ if (groups.length) {
203
+ const have = new Set(cacheRows.map((r) => String(r.floriday_id)));
204
+ const { data: sib, error: sErr } = await supabaseAdmin
205
+ .from("floriday_salesorders_cache")
206
+ .select("floriday_id, data, updated_at, buyer_organization_id")
207
+ .eq("is_deleted", false)
208
+ .in("data->>salesOrderGroupId", groups);
209
+ if (sErr)
210
+ throw new Error(sErr.message);
211
+ for (const r of (sib ?? []))
212
+ if (!have.has(String(r.floriday_id)))
213
+ cacheRows.push(r);
214
+ }
215
+ }
216
+ if (since && !onlyIds) {
197
217
  const { data: idxRows, error: idxErr } = await supabaseAdmin
198
218
  .from("verkoop_fulfillment_index")
199
219
  .select("sales_order_id")
@@ -1426,6 +1446,7 @@ async function mirrorUnlocked(limit, since) {
1426
1446
  // expliciet aanmelden bij de planwachtrij van de logistiek-engine. Mislukt
1427
1447
  // dat, dan verschijnt het als duidelijke fout in het syncresultaat.
1428
1448
  let enqueued = 0;
1449
+ const enqueuedOrderIds = [];
1429
1450
  const toEnqueue = Array.from(new Set(changedOrderIds)).filter((id) => affectedOrderIds.includes(id));
1430
1451
  for (const oid of toEnqueue) {
1431
1452
  const fields = Array.from(changedFieldsByOrder.get(oid) ?? []).sort();
@@ -1441,6 +1462,7 @@ async function mirrorUnlocked(limit, since) {
1441
1462
  }
1442
1463
  else {
1443
1464
  enqueued++;
1465
+ enqueuedOrderIds.push(oid);
1444
1466
  }
1445
1467
  }
1446
1468
  // Orders zonder karindeling en zonder aanmelding worden door de
@@ -1463,6 +1485,7 @@ async function mirrorUnlocked(limit, since) {
1463
1485
  skipped,
1464
1486
  failed,
1465
1487
  enqueued,
1488
+ enqueuedOrderIds,
1466
1489
  changes: Array.from(changedFieldsByOrder.entries())
1467
1490
  .slice(0, 50)
1468
1491
  .map(([order_id, f]) => ({ order_id, fields: Array.from(f).sort() })),
@@ -1473,3 +1496,13 @@ export const DEFAULT_MIRROR_BATCH = DEFAULT_BATCH;
1473
1496
  export async function mirrorFloridayOrdersFromCron(limit = DEFAULT_BATCH, since = null) {
1474
1497
  return mirrorInternal(limit, since);
1475
1498
  }
1499
+ /**
1500
+ * Gerichte spiegeling (direct na de cache-upsert): alleen deze salesOrderIds
1501
+ * plus echte groepsgenoten. Zelfde logica en slot als de minuutronde.
1502
+ */
1503
+ export async function mirrorFloridayOrdersByIds(ids) {
1504
+ const clean = Array.from(new Set(ids.map((x) => String(x).trim()).filter(Boolean))).slice(0, 200);
1505
+ if (!clean.length)
1506
+ return { ok: true, processed: 0, inserted: 0, updated: 0, skipped: 0, failed: 0, errors: [] };
1507
+ return mirrorInternal(clean.length + 50, null, clean);
1508
+ }
@@ -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,CAmDjG"}
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,CAqDjG"}
@@ -48,6 +48,8 @@ export async function loadFloridayStatuses(salesOrderIds) {
48
48
  "x-floriday-caller": "verkoop",
49
49
  },
50
50
  body,
51
+ // Weergave mag de lijst niet ophouden: na 800 ms "stand onbekend".
52
+ signal: AbortSignal.timeout(800),
51
53
  });
52
54
  const json = await res.json().catch(() => null);
53
55
  if (!res.ok || json?.ok === false) {
@@ -1,2 +1,2 @@
1
- export declare const MODULE_VERSION = "1.0.126";
1
+ export declare const MODULE_VERSION = "1.0.129";
2
2
  //# sourceMappingURL=module-version.d.ts.map
@@ -1,3 +1,3 @@
1
1
  // Versie van deze module, meegestuurd in antwoorden van geplande taken zodat
2
2
  // je ziet welke code echt draait. Bijwerken samen met package.json.
3
- export const MODULE_VERSION = "1.0.126";
3
+ export const MODULE_VERSION = "1.0.129";
@@ -18,6 +18,7 @@ export declare const getOrderAddresses: import("@tanstack/start-client-core").Op
18
18
  }, undefined, undefined, undefined>], (input: unknown) => {
19
19
  orderId: string;
20
20
  }, Promise<{
21
+ buyerGln: string | null;
21
22
  delivery: OrderAddress | null;
22
23
  pickup: OrderAddress | null;
23
24
  }>>;
@@ -1 +1 @@
1
- {"version":3,"file":"order-addresses.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-addresses.functions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,YAAY;IAC3B,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;CACpB;AAUD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;cAmBjB,YAAY,GAAG,IAAI;YACrB,YAAY,GAAG,IAAI;GA0D7B,CAAC"}
1
+ {"version":3,"file":"order-addresses.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-addresses.functions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,YAAY;IAC3B,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;CACpB;AASD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;cAmBjB,MAAM,GAAG,IAAI;cACb,YAAY,GAAG,IAAI;YACrB,YAAY,GAAG,IAAI;GAyD7B,CAAC"}
@@ -3,7 +3,6 @@ import { createServerFn } from "@tanstack/react-start";
3
3
  import { z } from "zod";
4
4
  import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
5
5
  import { resolveOrderRow } from "./order-row.server.js";
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
6
  function s(v) {
8
7
  if (v == null)
9
8
  return null;
@@ -35,36 +34,14 @@ export const getOrderAddresses = createServerFn({ method: "GET" })
35
34
  order = null;
36
35
  }
37
36
  if (!order)
38
- return { delivery: null, pickup: null };
37
+ return { delivery: null, pickup: null, buyerGln: null };
39
38
  const cf = (order.custom_fields ?? {});
40
39
  const deliveryRef = s(cf.delivery_location ?? cf.delivery_location_id ?? cf.delivery_location_gln);
41
40
  const pickupRef = s(cf.pickup_location ?? cf.pickup_location_id);
42
- let delivery = null;
43
- if (deliveryRef) {
44
- const dl = UUID_RE.test(deliveryRef)
45
- ? await supabase
46
- .from("customer_delivery_locations")
47
- .select("name, address_line, street, house_number, postal_code, city, country, gln")
48
- .eq("id", deliveryRef)
49
- .maybeSingle()
50
- : await supabase
51
- .from("customer_delivery_locations")
52
- .select("name, address_line, street, house_number, postal_code, city, country, gln")
53
- .or(`floriday_location_id.eq.${deliveryRef},gln.eq.${deliveryRef}`)
54
- .maybeSingle();
55
- const r = dl.data;
56
- if (r) {
57
- delivery = {
58
- name: s(r.name),
59
- line: s(r.address_line) ??
60
- s([s(r.street), s(r.house_number)].filter(Boolean).join(" ")),
61
- postalCode: s(r.postal_code),
62
- city: s(r.city),
63
- country: s(r.country),
64
- gln: s(r.gln),
65
- };
66
- }
67
- }
41
+ // Afleverlocatie: Floriday-levering → Floriday-locaties → klantlocaties.
42
+ const { loadDeliveryLocations } = await import("./delivery-location.server.js");
43
+ const resolved = deliveryRef ? (await loadDeliveryLocations(supabase, [String(order.id)])).get(String(order.id)) : undefined;
44
+ const delivery = resolved ?? null;
68
45
  let pickup = null;
69
46
  if (pickupRef) {
70
47
  const wh = await supabase
@@ -86,5 +63,27 @@ export const getOrderAddresses = createServerFn({ method: "GET" })
86
63
  };
87
64
  }
88
65
  }
89
- return { delivery, pickup };
66
+ // Koper-GLN: gekoppelde klant, anders de Floriday-koper van de order.
67
+ let buyerGln = null;
68
+ try {
69
+ if (order.customer_id) {
70
+ const { data: cu } = await supabase.from("customers").select("gln").eq("id", order.customer_id).maybeSingle();
71
+ buyerGln = s(cu?.gln);
72
+ }
73
+ const org = s(cf.floriday_customer_id);
74
+ if (!buyerGln && org) {
75
+ const { data: fc } = await supabase
76
+ .from("floriday_customers_cache")
77
+ .select("data")
78
+ .eq("organization_id", org)
79
+ .limit(1)
80
+ .maybeSingle();
81
+ const d = fc?.data ?? {};
82
+ buyerGln = s(d.companyGln ?? d.gln);
83
+ }
84
+ }
85
+ catch {
86
+ buyerGln = null;
87
+ }
88
+ return { delivery, pickup, buyerGln };
90
89
  });
@@ -9,6 +9,12 @@ export interface OrderItemPackingRow {
9
9
  lockedByName: string | null;
10
10
  /** Sticker nodig op deze orderregel (alleen weergave). */
11
11
  needsSticker: boolean;
12
+ /** Belading uit de Floriday-verkooporder (alleen FO; null = onbekend). */
13
+ floridayPacking: {
14
+ plantsPerCrate: number | null;
15
+ cratesPerLayer: number | null;
16
+ layersPerCart: number | null;
17
+ } | null;
12
18
  }
13
19
  /**
14
20
  * Belading per bestelregel van één order, inclusief de handmatige
@@ -24,8 +30,14 @@ export declare const listOrderItemPacking: import("@tanstack/start-client-core")
24
30
  }, Promise<{
25
31
  items: OrderItemPackingRow[];
26
32
  }>>;
27
- /** Zet de belading van één orderregel handmatig vast. */
28
- export declare const setOrderItemPacking: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
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, {
29
41
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
30
42
  userId: string;
31
43
  claims: import("@supabase/auth-js").User;
@@ -34,10 +46,34 @@ export declare const setOrderItemPacking: import("@tanstack/start-client-core").
34
46
  plantsPerCrate: number;
35
47
  cratesPerLayer: number;
36
48
  layersPerCart: number;
37
- }, Promise<{
49
+ }, Promise<PackingPreview>>;
50
+ export type SetPackingResult = {
38
51
  ok: true;
39
52
  locked: true;
40
- }>>;
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>>;
41
77
  /** Haal de handmatige markering weg; de regel volgt weer de standaardbelading. */
42
78
  export declare const clearOrderItemPackingLock: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
43
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;CACvB;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;WAYU,mBAAmB,EAAE;GAyC5D,CAAC;AASL,yDAAyD;AACzD,eAAO,MAAM,mBAAmB;;;;8CAEN,OAAO;;;;;;;;GAa7B,CAAC;AAEL,kFAAkF;AAClF,eAAO,MAAM,yBAAyB;;;;8CAEZ,OAAO;;;;;GAY7B,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"}
@@ -35,12 +35,28 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
35
35
  return { items: [] };
36
36
  const { data: rows, error } = await supabase
37
37
  .from("order_items")
38
- .select("id, product_name, quantity, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at, packing_locked_by, needs_sticker")
38
+ .select("id, product_name, quantity, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at, packing_locked_by, needs_sticker, source_line_key")
39
39
  .eq("order_id", orderRowId)
40
40
  .is("quarantined_at", null)
41
41
  .order("product_name", { ascending: true });
42
42
  if (error)
43
43
  throw new Error(`Bestelregels laden faalde: ${error.message}`);
44
+ // Floriday-belading per bestelling (custom_fields.floriday_lines).
45
+ const floridayBySid = new Map();
46
+ {
47
+ const { data: ord } = await supabase.from("orders").select("custom_fields").eq("id", orderRowId).maybeSingle();
48
+ const lines = Array.isArray(ord?.custom_fields?.floriday_lines) ? ord.custom_fields.floriday_lines : [];
49
+ const n = (v) => (typeof v === "number" && v > 0 ? v : null);
50
+ for (const l of lines) {
51
+ const p = l?.packing ?? {};
52
+ if (l?.sales_order_id)
53
+ floridayBySid.set(String(l.sales_order_id), {
54
+ plantsPerCrate: n(p.pieces_per_package),
55
+ cratesPerLayer: n(p.packages_per_layer),
56
+ layersPerCart: n(p.layers_per_load_carrier),
57
+ });
58
+ }
59
+ }
44
60
  const lockedBy = Array.from(new Set((rows ?? []).map((r) => r.packing_locked_by).filter(Boolean)));
45
61
  const nameById = new Map();
46
62
  if (lockedBy.length > 0) {
@@ -65,6 +81,7 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
65
81
  ? nameById.get(r.packing_locked_by) ?? "Onbekende medewerker"
66
82
  : null,
67
83
  needsSticker: r.needs_sticker === true,
84
+ floridayPacking: r.source_line_key ? floridayBySid.get(String(r.source_line_key)) ?? null : null,
68
85
  })),
69
86
  };
70
87
  });
@@ -74,12 +91,60 @@ const packingSchema = z.object({
74
91
  cratesPerLayer: z.number().int().positive(),
75
92
  layersPerCart: z.number().int().positive(),
76
93
  });
77
- /** Zet de belading van één orderregel handmatig vast. */
78
- export const setOrderItemPacking = createServerFn({ method: "POST" })
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" })
79
103
  .middleware([requireSupabaseAuth])
80
104
  .inputValidator((input) => packingSchema.parse(input))
81
105
  .handler(async ({ data, context }) => {
82
- const { error } = await context.supabase.from("order_items")
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")
83
148
  .update({
84
149
  plants_per_crate: data.plantsPerCrate,
85
150
  crates_per_layer: data.cratesPerLayer,
@@ -88,9 +153,9 @@ export const setOrderItemPacking = createServerFn({ method: "POST" })
88
153
  packing_locked_by: context.userId,
89
154
  })
90
155
  .eq("id", data.orderItemId);
91
- if (error)
92
- throw new Error(`Belading vastzetten faalde: ${error.message}`);
93
- 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" };
94
159
  });
95
160
  /** Haal de handmatige markering weg; de regel volgt weer de standaardbelading. */
96
161
  export const clearOrderItemPackingLock = createServerFn({ method: "POST" })
@@ -20,6 +20,17 @@ export interface PlanCoverageCart {
20
20
  bufferId: string | null;
21
21
  shared: boolean;
22
22
  carrierType: string | null;
23
+ /** Extra platen volgens de Engine (1.0.201+); null/ontbrekend = niet tonen. */
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;
23
34
  lines: PlanCoverageLine[];
24
35
  }
25
36
  export interface PlanCoveragePickRow {
@@ -54,9 +65,33 @@ export interface PlanCoverage {
54
65
  orderNumber?: string | null;
55
66
  /** Afgehandeld in Floriday (Engine); null = niet van toepassing. */
56
67
  externalFulfilled?: PlanCoverageExternal | null;
68
+ /** Reden waarom de Engine niet kan indelen (1.0.201+); null = niet geleverd. */
69
+ geenIndeling?: GeenIndeling | null;
57
70
  /** Gezet als de Engine-vraag mislukte (fail closed: niets geschreven). */
58
71
  error?: string | null;
59
72
  }
73
+ export interface GeenIndeling {
74
+ code: string | null;
75
+ soort: string | null;
76
+ tekst: string | null;
77
+ actie: string | null;
78
+ actieLabel: string | null;
79
+ /** Alleen een pad binnen de shell ("/…"); anders null. */
80
+ actieUrl: string | null;
81
+ }
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. */
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;
93
+ /** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
94
+ export declare function parseAdditionalLayers(v: unknown): number | null;
60
95
  export declare function defaultLabel(state: PlanCoverageState): string;
61
96
  export declare function unknownCoverage(error: string): PlanCoverage;
62
97
  /** Leest het jsonb-antwoord defensief in; ontbrekende velden worden leeg. */
@@ -76,6 +111,7 @@ export interface PlanCoverageSummary {
76
111
  cartCount?: number | null;
77
112
  pickRowCount?: number | null;
78
113
  pickStatus?: PlanCoverage["pickStatus"];
114
+ geenIndeling?: GeenIndeling | null;
79
115
  }
80
116
  export declare function summarize(c: PlanCoverage): PlanCoverageSummary;
81
117
  /** Tooltiptekst voor de badge; ontbrekende waarden worden "onbekend", nooit "0". */
@@ -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,6 +1,57 @@
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
+ /** 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. */
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) {
34
+ if (!v || typeof v !== "object")
35
+ return null;
36
+ const b = v;
37
+ const out = { code: str(b.code), tekst: str(b.tekst) };
38
+ return out.code || out.tekst ? out : null;
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
+ }
51
+ /** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
52
+ export function parseAdditionalLayers(v) {
53
+ return typeof v === "number" && Number.isInteger(v) && v >= 0 ? v : null;
54
+ }
4
55
  const STATES = ["ingedeeld", "deels", "geen_indeling", "geen_regels", "afgehandeld_extern"];
5
56
  const PICK = ["geen_pickrij", "open", "bezig", "gepickt"];
6
57
  const str = (v) => typeof v === "string" && v.trim() !== "" ? v : typeof v === "number" ? String(v) : null;
@@ -51,6 +102,10 @@ export function parsePlanCoverage(raw) {
51
102
  bufferId: str(c.bufferId),
52
103
  shared: Boolean(c.shared),
53
104
  carrierType: str(c.carrierType),
105
+ additionalLayers: parseAdditionalLayers(c.additionalLayers),
106
+ ladingdragerTekst: str(c.ladingdragerTekst),
107
+ teHoog: typeof c.teHoog === "boolean" ? c.teHoog : null,
108
+ blokkade: parseBlokkade(c.blokkade),
54
109
  lines: (Array.isArray(c.lines) ? c.lines : []).map((l) => ({
55
110
  orderItemId: str(l?.orderItemId),
56
111
  productId: str(l?.productId),
@@ -68,7 +123,7 @@ export function parsePlanCoverage(raw) {
68
123
  }));
69
124
  return {
70
125
  state,
71
- label: str(d.label) ?? defaultLabel(state),
126
+ label: labelWithBlokkade(state, str(d.label), carts.some((c) => c.blokkade)),
72
127
  progressPct: num(d.progressPct),
73
128
  reason: str(d.reason),
74
129
  carts,
@@ -76,6 +131,7 @@ export function parsePlanCoverage(raw) {
76
131
  pickStatus: PICK.includes(d.pickStatus) ? d.pickStatus : null,
77
132
  pickedAt: str(d.pickedAt),
78
133
  externalFulfilled: parseExternal(d.externalFulfilled),
134
+ geenIndeling: parseGeenIndeling(d.geenIndeling),
79
135
  error: state === "onbekend" ? "Onbekende indelingsstatus van de Engine" : null,
80
136
  };
81
137
  }
@@ -99,9 +155,10 @@ export function parsePlanCoverageListRow(r) {
99
155
  if (!r || typeof r !== "object")
100
156
  return unknownCoverage("Leeg antwoord van de Engine");
101
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;
102
159
  return {
103
160
  state,
104
- label: str(r.label) ?? defaultLabel(state),
161
+ label: labelWithBlokkade(state, str(r.label), blok),
105
162
  progressPct: num(r.progress_pct ?? r.progressPct),
106
163
  reason: str(r.reason),
107
164
  carts: [],
@@ -116,6 +173,7 @@ export function parsePlanCoverageListRow(r) {
116
173
  bufferCartCount: num(r.buffer_cart_count),
117
174
  // Een buffer-id alleen zegt niets: elke order heeft er één. Gedeeld pas bij >1 order.
118
175
  shared: num(r.buffer_order_count) != null ? num(r.buffer_order_count) > 1 : false,
176
+ geenIndeling: parseGeenIndeling(r.geenIndeling ?? r.geen_indeling),
119
177
  error: state === "onbekend" ? "Onbekende indelingsstatus van de Engine" : null,
120
178
  };
121
179
  }
@@ -138,6 +196,7 @@ export function summarize(c) {
138
196
  cartCount: c.cartCount !== undefined ? c.cartCount : c.state === "onbekend" ? null : c.carts.length,
139
197
  pickRowCount: c.pickRowCount !== undefined ? c.pickRowCount : c.state === "onbekend" ? null : c.pickRows.length,
140
198
  pickStatus: c.pickStatus,
199
+ geenIndeling: c.geenIndeling ?? null,
141
200
  };
142
201
  }
143
202
  const PICK_LABEL = {
@@ -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;AA2ClH,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"}
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
- const { data, error } = await supabase.rpc(LIST_FN, { p_order_ids: chunk });
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;