@flowselections/floriday-verkoop-module 1.0.141 → 1.0.143

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 (104) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +274 -203
  3. package/dist-lib/components/verkoop/EngineBufferCard.d.ts.map +1 -1
  4. package/dist-lib/components/verkoop/EngineBufferCard.js +2 -4
  5. package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -1
  6. package/dist-lib/components/verkoop/FloridaySyncSettings.js +2 -1
  7. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
  8. package/dist-lib/components/verkoop/OrderCarrierPicker.js +5 -1
  9. package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts.map +1 -1
  10. package/dist-lib/components/verkoop/OrderControlStatusCard.js +2 -10
  11. package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +7 -1
  12. package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
  13. package/dist-lib/components/verkoop/OrderKarindelingCard.js +4 -3
  14. package/dist-lib/components/verkoop/OrderLinePackingCard.js +2 -2
  15. package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts.map +1 -1
  16. package/dist-lib/components/verkoop/OrderPickupMomentPicker.js +4 -8
  17. package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
  18. package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -4
  19. package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
  20. package/dist-lib/components/verkoop/SalesOrderDetailPage.js +34 -9
  21. package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
  22. package/dist-lib/components/verkoop/SalesOrderDetailView.js +37 -11
  23. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  24. package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -14
  25. package/dist-lib/components/verkoop/SearchableSelect.d.ts +10 -1
  26. package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
  27. package/dist-lib/components/verkoop/SearchableSelect.js +13 -4
  28. package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
  29. package/dist-lib/components/verkoop/VerkoopOrdersPage.js +3 -2
  30. package/dist-lib/components/verkoop/v3/InfoCard.js +1 -1
  31. package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -1
  32. package/dist-lib/components/verkoop/v3/OrderProgress.js +3 -8
  33. package/dist-lib/components/verkoop/v3/OrderStepper.d.ts +2 -1
  34. package/dist-lib/components/verkoop/v3/OrderStepper.d.ts.map +1 -1
  35. package/dist-lib/components/verkoop/v3/OrderStepper.js +7 -8
  36. package/dist-lib/integrations/supabase/types.d.ts +16 -0
  37. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  38. package/dist-lib/lib/buffer-carts.d.ts +15 -0
  39. package/dist-lib/lib/buffer-carts.d.ts.map +1 -1
  40. package/dist-lib/lib/buffer-carts.js +21 -0
  41. package/dist-lib/lib/buffer-pick-progress.check.d.ts +2 -0
  42. package/dist-lib/lib/buffer-pick-progress.check.d.ts.map +1 -0
  43. package/dist-lib/lib/buffer-pick-progress.check.js +11 -0
  44. package/dist-lib/lib/create-order-customers.d.ts +8 -0
  45. package/dist-lib/lib/create-order-customers.d.ts.map +1 -0
  46. package/dist-lib/lib/create-order-customers.js +18 -0
  47. package/dist-lib/lib/create-order-form.check.d.ts +2 -0
  48. package/dist-lib/lib/create-order-form.check.d.ts.map +1 -0
  49. package/dist-lib/lib/create-order-form.check.js +27 -0
  50. package/dist-lib/lib/create-order-form.d.ts +22 -0
  51. package/dist-lib/lib/create-order-form.d.ts.map +1 -0
  52. package/dist-lib/lib/create-order-form.js +52 -0
  53. package/dist-lib/lib/create-order.functions.d.ts +21 -1
  54. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  55. package/dist-lib/lib/create-order.functions.js +66 -19
  56. package/dist-lib/lib/delivery-format.check.d.ts +2 -0
  57. package/dist-lib/lib/delivery-format.check.d.ts.map +1 -0
  58. package/dist-lib/lib/delivery-format.check.js +32 -0
  59. package/dist-lib/lib/delivery-format.d.ts +31 -0
  60. package/dist-lib/lib/delivery-format.d.ts.map +1 -0
  61. package/dist-lib/lib/delivery-format.js +70 -0
  62. package/dist-lib/lib/floriday-invoice-line.check.d.ts +2 -0
  63. package/dist-lib/lib/floriday-invoice-line.check.d.ts.map +1 -0
  64. package/dist-lib/lib/floriday-invoice-line.check.js +18 -0
  65. package/dist-lib/lib/floriday-status.d.ts +6 -0
  66. package/dist-lib/lib/floriday-status.d.ts.map +1 -1
  67. package/dist-lib/lib/floriday-status.js +26 -0
  68. package/dist-lib/lib/nl-datetime.check.d.ts +2 -0
  69. package/dist-lib/lib/nl-datetime.check.d.ts.map +1 -0
  70. package/dist-lib/lib/nl-datetime.check.js +14 -0
  71. package/dist-lib/lib/nl-datetime.d.ts +6 -0
  72. package/dist-lib/lib/nl-datetime.d.ts.map +1 -0
  73. package/dist-lib/lib/nl-datetime.js +39 -0
  74. package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
  75. package/dist-lib/lib/order-pickup.functions.js +4 -57
  76. package/dist-lib/lib/order-pickup.server.d.ts +38 -0
  77. package/dist-lib/lib/order-pickup.server.d.ts.map +1 -0
  78. package/dist-lib/lib/order-pickup.server.js +76 -0
  79. package/dist-lib/lib/order-progress.server.d.ts +23 -0
  80. package/dist-lib/lib/order-progress.server.d.ts.map +1 -1
  81. package/dist-lib/lib/order-progress.server.js +25 -0
  82. package/dist-lib/lib/pickup-seed.check.d.ts +2 -0
  83. package/dist-lib/lib/pickup-seed.check.d.ts.map +1 -0
  84. package/dist-lib/lib/pickup-seed.check.js +18 -0
  85. package/dist-lib/lib/salesorders-list.functions.d.ts +43 -0
  86. package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
  87. package/dist-lib/lib/salesorders-list.functions.js +29 -0
  88. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  89. package/dist-lib/lib/salesorders-list.server.js +4 -3
  90. package/dist-lib/lib/salesorders-mapping.d.ts +6 -0
  91. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  92. package/dist-lib/lib/salesorders-mapping.js +1 -0
  93. package/dist-lib/lib/salesorders.functions.d.ts +15 -0
  94. package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
  95. package/dist-lib/lib/salesorders.functions.js +35 -3
  96. package/dist-lib/lib/useDetailProgressFallback.d.ts +17 -0
  97. package/dist-lib/lib/useDetailProgressFallback.d.ts.map +1 -0
  98. package/dist-lib/lib/useDetailProgressFallback.js +28 -0
  99. package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +24 -0
  100. package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
  101. package/dist-lib/lib/usePickupMoment.d.ts +44 -0
  102. package/dist-lib/lib/usePickupMoment.d.ts.map +1 -0
  103. package/dist-lib/lib/usePickupMoment.js +46 -0
  104. package/package.json +1 -1
@@ -61,6 +61,21 @@ export type SalesOrderDetailResult = {
61
61
  environment: "staging" | "live";
62
62
  bufferId: string | null;
63
63
  bufferSiblings: SalesOrderDTO[];
64
+ /** Factuurstand + pickvoortgang (zelfde bronnen als de lijst), in hetzelfde verzoek. */
65
+ progress?: {
66
+ features: {
67
+ erpInvoices: boolean;
68
+ pickProgress: boolean;
69
+ };
70
+ invoice: "ok" | "pending" | "failed";
71
+ };
72
+ /** Ophaalmoment (zelfde bron als de kaart Vervoer), met leestijd; null bij timeout/fout. */
73
+ pickupMoment?: {
74
+ orderId: string;
75
+ fetchedAt: number;
76
+ returnedAt: number;
77
+ data: import("./order-pickup.server.js").PickupMomentData;
78
+ } | null;
64
79
  };
65
80
  export declare const getSalesOrderDetail: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
66
81
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAgC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAkazB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
1
+ {"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAiC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCA2bzB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
@@ -7,6 +7,7 @@ import { z } from "zod";
7
7
  import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
8
8
  import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
9
9
  import { resolveOrderStage } from "./order-status.js";
10
+ import { invoiceRoute } from "./order-progress.js";
10
11
  import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
11
12
  import { resolveOrderNumbers } from "./order-numbers.server.js";
12
13
  const CANONICAL_ENTITY_TYPE = "sales-orders";
@@ -291,7 +292,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
291
292
  try {
292
293
  const ownRes = await supabase
293
294
  .from("orders")
294
- .select("id, buffer_id, status, is_reservation, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
295
+ .select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
295
296
  .eq("floriday_sales_order_id", data.id)
296
297
  .maybeSingle();
297
298
  const ownRow = ownRes.data ?? null;
@@ -310,6 +311,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
310
311
  });
311
312
  dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
312
313
  dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
314
+ // Zelfde factuurroute en ids als de lijst (salesorders-list.server).
315
+ dto.orderRowId = ownRow?.id ? String(ownRow.id) : null;
316
+ dto.invoiceRoute = invoiceRoute({
317
+ floridaySalesOrderId: ownRow?.floriday_sales_order_id ?? String(data.id),
318
+ orderSource: ownRow?.order_source ?? "floriday",
319
+ });
313
320
  dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
314
321
  dto.floridayExternalFulfilledAt = (ownRow?.custom_fields ?? {})?.floriday_external_fulfilled_at ?? null;
315
322
  {
@@ -321,6 +328,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
321
328
  dto.floridayMissingLineKeyNotice = typeof n === "string" ? n : null;
322
329
  }
323
330
  dto.floridayExternalFulfilledIds = (ownRow?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
331
+ {
332
+ const fs = (ownRow?.custom_fields ?? {})?.floriday_status;
333
+ dto.floridayRawStatus = typeof fs === "string" ? fs : null;
334
+ }
324
335
  const reviewCf = (ownRow?.custom_fields ?? {});
325
336
  dto.mixedDeliveryDates = Boolean(reviewCf?.floriday_mixed_delivery_dates);
326
337
  dto.unlinkedProducts = ownRow ? unlinkedFloridayProducts(ownRow) : [];
@@ -383,12 +394,13 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
383
394
  // de stand los na via getFloridayStatusesForRows, net als de lijst.
384
395
  if (foIds.length)
385
396
  dto.floridayStatusIds = foIds;
397
+ dto.floridayIds = foIds.length ? foIds : [String(data.id)];
386
398
  }
387
399
  if (bufferId) {
388
400
  dto.bufferId = bufferId;
389
401
  const sibRes = await supabase
390
402
  .from("orders")
391
- .select("floriday_sales_order_id, status, is_reservation, custom_fields")
403
+ .select("id, floriday_sales_order_id, status, is_reservation, order_source, custom_fields")
392
404
  .eq("buffer_id", bufferId)
393
405
  .not("floriday_sales_order_id", "is", null);
394
406
  const sibLocalByFoId = new Map();
@@ -503,6 +515,17 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
503
515
  isReservation: sLocal ? !!sLocal.is_reservation : false,
504
516
  });
505
517
  sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
518
+ sDto.floridayExternalFulfilledIds = (sLocal?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
519
+ {
520
+ const fs = (sLocal?.custom_fields ?? {})?.floriday_status;
521
+ sDto.floridayRawStatus = typeof fs === "string" ? fs : null;
522
+ }
523
+ sDto.orderRowId = sLocal?.id ? String(sLocal.id) : null;
524
+ sDto.invoiceRoute = invoiceRoute({
525
+ floridaySalesOrderId: String(sr.floriday_id),
526
+ orderSource: sLocal?.order_source ?? "floriday",
527
+ });
528
+ sDto.floridayIds = [String(sr.floriday_id)];
506
529
  bufferSiblings.push(sDto);
507
530
  }
508
531
  }
@@ -511,7 +534,16 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
511
534
  catch (err) {
512
535
  console.warn("[getSalesOrderDetail] buffer-siblings lookup faalde:", err.message);
513
536
  }
514
- return { order: dto, sellerFallback, environment, bufferId, bufferSiblings };
537
+ const { attachDetailProgress } = await import("./order-progress.server.js");
538
+ const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
539
+ const [progress, pickupMoment] = await Promise.all([
540
+ attachDetailProgress(supabase, [dto, ...bufferSiblings]).catch(() => ({
541
+ features: { erpInvoices: false, pickProgress: false },
542
+ invoice: "failed",
543
+ })),
544
+ loadPickupMomentForDetail(supabase, String(dto.id)),
545
+ ]);
546
+ return { order: dto, sellerFallback, environment, bufferId, bufferSiblings, progress, pickupMoment };
515
547
  });
516
548
  // ─── Handmatige controle na orderpicken ───────────────────────────────────
517
549
  const ControlInputSchema = z.object({
@@ -0,0 +1,17 @@
1
+ import type { ErpInvoiceInfo, PickProgress, ProgressFeatures } from "./order-progress.js";
2
+ /**
3
+ * Alleen als de factuurstand in het detailverzoek niet op tijd kwam: één keer
4
+ * opnieuw lezen (server wacht hooguit 10 s). Tot dan "loading"; mislukt of te
5
+ * laat → "unknown". Er flitst dus nooit "Onbekend".
6
+ */
7
+ export declare function useDetailProgressFallback(orders: {
8
+ orderRowId?: string | null;
9
+ }[] | null): {
10
+ state: "loading" | "ok" | "unknown";
11
+ features: ProgressFeatures | null;
12
+ byId: Record<string, {
13
+ erpInvoice: ErpInvoiceInfo | null;
14
+ pickProgress: PickProgress | null;
15
+ }> | null;
16
+ };
17
+ //# sourceMappingURL=useDetailProgressFallback.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useDetailProgressFallback.d.ts","sourceRoot":"","sources":["../../src/lib/useDetailProgressFallback.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,IAAI,GAAG;IAC1F,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;QAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;CACvG,CAeA"}
@@ -0,0 +1,28 @@
1
+ import { useQuery } from "@tanstack/react-query";
2
+ import { useServerFn } from "@tanstack/react-start";
3
+ import { getOrderDetailProgress } from "./salesorders-list.functions.js";
4
+ /**
5
+ * Alleen als de factuurstand in het detailverzoek niet op tijd kwam: één keer
6
+ * opnieuw lezen (server wacht hooguit 10 s). Tot dan "loading"; mislukt of te
7
+ * laat → "unknown". Er flitst dus nooit "Onbekend".
8
+ */
9
+ export function useDetailProgressFallback(orders) {
10
+ const fn = useServerFn(getOrderDetailProgress);
11
+ const ids = Array.from(new Set((orders ?? []).map((o) => o.orderRowId).filter((v) => !!v))).slice(0, 50);
12
+ const q = useQuery({
13
+ queryKey: ["salesorders", "detail-progress", ids],
14
+ enabled: !!orders && ids.length > 0,
15
+ retry: false,
16
+ staleTime: 30000,
17
+ queryFn: () => fn({ data: { orderRowIds: ids } }),
18
+ });
19
+ if (!orders)
20
+ return { state: "ok", features: null, byId: null };
21
+ if (!ids.length || q.isError)
22
+ return { state: "unknown", features: null, byId: null };
23
+ if (!q.data)
24
+ return { state: "loading", features: null, byId: null };
25
+ if (q.data.progress.invoice !== "ok")
26
+ return { state: "unknown", features: q.data.progress.features, byId: q.data.byId };
27
+ return { state: "ok", features: q.data.progress.features, byId: q.data.byId };
28
+ }
@@ -1,5 +1,29 @@
1
1
  export declare function useLocalSalesOrderDetailQuery(id: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
2
2
  order: import("./salesorders-mapping.js").SalesOrderDTO | null;
3
+ progress: import("./order-progress.server.js").DetailProgress | {
4
+ features: {
5
+ erpInvoices: boolean;
6
+ pickProgress: boolean;
7
+ };
8
+ invoice: "failed";
9
+ } | undefined;
10
+ pickupMoment: {
11
+ orderId: string;
12
+ fetchedAt: number;
13
+ returnedAt: number;
14
+ data: {
15
+ view: import("./order-departure.js").DepartureView;
16
+ departure: import("./order-departure.js").OrderDeparture | null;
17
+ selectedKey: string | null;
18
+ options: import("./order-pickup.functions.js").PickupMomentOption[];
19
+ hasCarrier: boolean;
20
+ deliveryTime: string | null;
21
+ lateOverride: {
22
+ by: string | null;
23
+ at: string | null;
24
+ } | null;
25
+ };
26
+ } | null;
3
27
  bufferId: string | null;
4
28
  bufferSiblings: import("./salesorders-mapping.js").SalesOrderDTO[];
5
29
  sellerFallback: string | null;
@@ -1 +1 @@
1
- {"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;UA2C1E"}
1
+ {"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA2C1E"}
@@ -0,0 +1,44 @@
1
+ import { type QueryClient } from "@tanstack/react-query";
2
+ export declare const pickupMomentKey: (orderId: string) => readonly ["order-pickup-moment", string];
3
+ export declare function usePickupMoment(orderId: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
4
+ view: import("./order-departure.js").DepartureView;
5
+ departure: import("./order-departure.js").OrderDeparture | null;
6
+ selectedKey: string | null;
7
+ options: import("./order-pickup.functions.js").PickupMomentOption[];
8
+ hasCarrier: boolean;
9
+ deliveryTime: string | null;
10
+ lateOverride: {
11
+ by: string | null;
12
+ at: string | null;
13
+ } | null;
14
+ }, Error>;
15
+ /**
16
+ * Vult de cache uit het detailantwoord, alleen als die leeg is of ouder dan
17
+ * het moment waarop het detailverzoek het ophaalmoment las. Een detailantwoord
18
+ * dat nog onderweg was na "Ander ophaalmoment kiezen…" overschrijft zo nooit
19
+ * het nieuwe moment.
20
+ */
21
+ export declare function seedPickupMoment(qc: QueryClient, seed: {
22
+ orderId: string;
23
+ fetchedAt: number;
24
+ returnedAt: number;
25
+ data: unknown;
26
+ } | null | undefined,
27
+ /** Klok van de browser bij aankomst van het detailantwoord (dataUpdatedAt). */
28
+ arrivedAt: number): void;
29
+ /**
30
+ * Leesmoment op de klok van de browser, zonder klokverschil met de server:
31
+ * aankomst − (serverduur na het lezen) − ruime marge. Liever te oud dan te
32
+ * nieuw: te oud betekent alleen dat we de cache niet vullen.
33
+ */
34
+ export declare function clientReadAt(seed: {
35
+ fetchedAt: number;
36
+ returnedAt: number;
37
+ }, arrivedAt: number, margin?: number): number;
38
+ export declare function shouldSeed(state: {
39
+ data?: unknown;
40
+ dataUpdatedAt: number;
41
+ fetchStatus: string;
42
+ isInvalidated: boolean;
43
+ } | undefined, fetchedAt: number): boolean;
44
+ //# sourceMappingURL=usePickupMoment.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"usePickupMoment.d.ts","sourceRoot":"","sources":["../../src/lib/usePickupMoment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAInE,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,6CAA8C,CAAC;AAE9F,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;UAQjE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,WAAW,EACf,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS;AAClG,+EAA+E;AAC/E,SAAS,EAAE,MAAM,QAMlB;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAO,GAAG,MAAM,CAEtH;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,EACzG,SAAS,EAAE,MAAM,GAChB,OAAO,CAIT"}
@@ -0,0 +1,46 @@
1
+ // Eén bron voor het ophaalmoment op de orderpagina: de kaart Vervoer en de
2
+ // tegel Leverdatum lezen dezelfde query; opslaan ververst die ene query.
3
+ import { useQuery } from "@tanstack/react-query";
4
+ import { useServerFn } from "@tanstack/react-start";
5
+ import { getOrderPickupMoment } from "./order-pickup.functions.js";
6
+ export const pickupMomentKey = (orderId) => ["order-pickup-moment", orderId];
7
+ export function usePickupMoment(orderId) {
8
+ const fetchMoment = useServerFn(getOrderPickupMoment);
9
+ return useQuery({
10
+ queryKey: pickupMomentKey(orderId ?? ""),
11
+ queryFn: () => fetchMoment({ data: { orderId: orderId } }),
12
+ enabled: !!orderId,
13
+ staleTime: 30000,
14
+ });
15
+ }
16
+ /**
17
+ * Vult de cache uit het detailantwoord, alleen als die leeg is of ouder dan
18
+ * het moment waarop het detailverzoek het ophaalmoment las. Een detailantwoord
19
+ * dat nog onderweg was na "Ander ophaalmoment kiezen…" overschrijft zo nooit
20
+ * het nieuwe moment.
21
+ */
22
+ export function seedPickupMoment(qc, seed,
23
+ /** Klok van de browser bij aankomst van het detailantwoord (dataUpdatedAt). */
24
+ arrivedAt) {
25
+ if (!seed?.orderId || !seed.data)
26
+ return;
27
+ const key = pickupMomentKey(seed.orderId);
28
+ const readAt = clientReadAt(seed, arrivedAt);
29
+ if (shouldSeed(qc.getQueryState(key), readAt))
30
+ qc.setQueryData(key, seed.data, { updatedAt: readAt });
31
+ }
32
+ /**
33
+ * Leesmoment op de klok van de browser, zonder klokverschil met de server:
34
+ * aankomst − (serverduur na het lezen) − ruime marge. Liever te oud dan te
35
+ * nieuw: te oud betekent alleen dat we de cache niet vullen.
36
+ */
37
+ export function clientReadAt(seed, arrivedAt, margin = 2000) {
38
+ return arrivedAt - Math.max(0, seed.returnedAt - seed.fetchedAt) - margin;
39
+ }
40
+ export function shouldSeed(state, fetchedAt) {
41
+ if (!state || state.data === undefined)
42
+ return true;
43
+ if (state.fetchStatus === "fetching" || state.isInvalidated)
44
+ return false;
45
+ return state.dataUpdatedAt < fetchedAt;
46
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowselections/floriday-verkoop-module",
3
- "version": "1.0.141",
3
+ "version": "1.0.143",
4
4
  "private": false,
5
5
  "sideEffects": false,
6
6
  "type": "module",