@flowselections/floriday-verkoop-module 1.0.127 → 1.0.129

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 (54) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +19 -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 +7 -1
  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 +730 -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/index.d.ts +1 -0
  17. package/dist-lib/lib/cron/index.d.ts.map +1 -1
  18. package/dist-lib/lib/cron/index.js +1 -0
  19. package/dist-lib/lib/cron/sync-salesorders-now.d.ts +2 -0
  20. package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -0
  21. package/dist-lib/lib/cron/sync-salesorders-now.js +52 -0
  22. package/dist-lib/lib/delivery-location.check.d.ts +2 -0
  23. package/dist-lib/lib/delivery-location.check.d.ts.map +1 -0
  24. package/dist-lib/lib/delivery-location.check.js +29 -0
  25. package/dist-lib/lib/delivery-location.server.d.ts +35 -0
  26. package/dist-lib/lib/delivery-location.server.d.ts.map +1 -0
  27. package/dist-lib/lib/delivery-location.server.js +171 -0
  28. package/dist-lib/lib/floriday-mirror.server.d.ts +7 -0
  29. package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
  30. package/dist-lib/lib/floriday-mirror.server.js +38 -5
  31. package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
  32. package/dist-lib/lib/floriday-status.server.js +2 -0
  33. package/dist-lib/lib/module-version.d.ts +1 -1
  34. package/dist-lib/lib/module-version.js +1 -1
  35. package/dist-lib/lib/order-addresses.functions.d.ts +1 -0
  36. package/dist-lib/lib/order-addresses.functions.d.ts.map +1 -1
  37. package/dist-lib/lib/order-addresses.functions.js +28 -29
  38. package/dist-lib/lib/order-item-packing.functions.d.ts +6 -0
  39. package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
  40. package/dist-lib/lib/order-item-packing.functions.js +18 -1
  41. package/dist-lib/lib/plan-coverage.d.ts +15 -0
  42. package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
  43. package/dist-lib/lib/plan-coverage.js +16 -0
  44. package/dist-lib/lib/product-plannable.functions.d.ts +14 -0
  45. package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -0
  46. package/dist-lib/lib/product-plannable.functions.js +24 -0
  47. package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
  48. package/dist-lib/lib/salesorders-list.functions.js +15 -1
  49. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  50. package/dist-lib/lib/salesorders-list.server.js +10 -0
  51. package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
  52. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  53. package/package.json +9 -1
  54. package/schema/verkoop.sql +98 -0
@@ -20,6 +20,8 @@ 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;
23
25
  lines: PlanCoverageLine[];
24
26
  }
25
27
  export interface PlanCoveragePickRow {
@@ -54,9 +56,21 @@ export interface PlanCoverage {
54
56
  orderNumber?: string | null;
55
57
  /** Afgehandeld in Floriday (Engine); null = niet van toepassing. */
56
58
  externalFulfilled?: PlanCoverageExternal | null;
59
+ /** Reden waarom de Engine niet kan indelen (1.0.201+); null = niet geleverd. */
60
+ geenIndeling?: GeenIndeling | null;
57
61
  /** Gezet als de Engine-vraag mislukte (fail closed: niets geschreven). */
58
62
  error?: string | null;
59
63
  }
64
+ export interface GeenIndeling {
65
+ code: string | null;
66
+ tekst: string | null;
67
+ actie: string | null;
68
+ actieUrl: string | null;
69
+ }
70
+ /** Leest geenIndeling { code, tekst, actie, actieUrl }; leeg/ongeldig = null. */
71
+ export declare function parseGeenIndeling(v: unknown): GeenIndeling | null;
72
+ /** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
73
+ export declare function parseAdditionalLayers(v: unknown): number | null;
60
74
  export declare function defaultLabel(state: PlanCoverageState): string;
61
75
  export declare function unknownCoverage(error: string): PlanCoverage;
62
76
  /** Leest het jsonb-antwoord defensief in; ontbrekende velden worden leeg. */
@@ -76,6 +90,7 @@ export interface PlanCoverageSummary {
76
90
  cartCount?: number | null;
77
91
  pickRowCount?: number | null;
78
92
  pickStatus?: PlanCoverage["pickStatus"];
93
+ geenIndeling?: GeenIndeling | null;
79
94
  }
80
95
  export declare function summarize(c: PlanCoverage): PlanCoverageSummary;
81
96
  /** 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,18 @@
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
+ /** Leest geenIndeling { code, tekst, actie, actieUrl }; leeg/ongeldig = null. */
5
+ export function parseGeenIndeling(v) {
6
+ if (!v || typeof v !== "object")
7
+ return null;
8
+ const g = v;
9
+ const out = { code: str(g.code), tekst: str(g.tekst), actie: str(g.actie), actieUrl: str(g.actieUrl ?? g.actie_url) };
10
+ return out.code || out.tekst ? out : null;
11
+ }
12
+ /** Heel getal of null; alles anders (ontbrekend, tekst, breuk) = null. */
13
+ export function parseAdditionalLayers(v) {
14
+ return typeof v === "number" && Number.isInteger(v) && v >= 0 ? v : null;
15
+ }
4
16
  const STATES = ["ingedeeld", "deels", "geen_indeling", "geen_regels", "afgehandeld_extern"];
5
17
  const PICK = ["geen_pickrij", "open", "bezig", "gepickt"];
6
18
  const str = (v) => typeof v === "string" && v.trim() !== "" ? v : typeof v === "number" ? String(v) : null;
@@ -51,6 +63,7 @@ export function parsePlanCoverage(raw) {
51
63
  bufferId: str(c.bufferId),
52
64
  shared: Boolean(c.shared),
53
65
  carrierType: str(c.carrierType),
66
+ additionalLayers: parseAdditionalLayers(c.additionalLayers),
54
67
  lines: (Array.isArray(c.lines) ? c.lines : []).map((l) => ({
55
68
  orderItemId: str(l?.orderItemId),
56
69
  productId: str(l?.productId),
@@ -76,6 +89,7 @@ export function parsePlanCoverage(raw) {
76
89
  pickStatus: PICK.includes(d.pickStatus) ? d.pickStatus : null,
77
90
  pickedAt: str(d.pickedAt),
78
91
  externalFulfilled: parseExternal(d.externalFulfilled),
92
+ geenIndeling: parseGeenIndeling(d.geenIndeling),
79
93
  error: state === "onbekend" ? "Onbekende indelingsstatus van de Engine" : null,
80
94
  };
81
95
  }
@@ -116,6 +130,7 @@ export function parsePlanCoverageListRow(r) {
116
130
  bufferCartCount: num(r.buffer_cart_count),
117
131
  // Een buffer-id alleen zegt niets: elke order heeft er één. Gedeeld pas bij >1 order.
118
132
  shared: num(r.buffer_order_count) != null ? num(r.buffer_order_count) > 1 : false,
133
+ geenIndeling: parseGeenIndeling(r.geenIndeling ?? r.geen_indeling),
119
134
  error: state === "onbekend" ? "Onbekende indelingsstatus van de Engine" : null,
120
135
  };
121
136
  }
@@ -138,6 +153,7 @@ export function summarize(c) {
138
153
  cartCount: c.cartCount !== undefined ? c.cartCount : c.state === "onbekend" ? null : c.carts.length,
139
154
  pickRowCount: c.pickRowCount !== undefined ? c.pickRowCount : c.state === "onbekend" ? null : c.pickRows.length,
140
155
  pickStatus: c.pickStatus,
156
+ geenIndeling: c.geenIndeling ?? null,
141
157
  };
142
158
  }
143
159
  const PICK_LABEL = {
@@ -0,0 +1,14 @@
1
+ export declare const getProductPlannability: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
2
+ supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
3
+ userId: string;
4
+ claims: import("@supabase/auth-js").User;
5
+ }, undefined, undefined, undefined>], (input: unknown) => {
6
+ productIds: string[];
7
+ }, Promise<{
8
+ impossible: Record<string, string>;
9
+ available: true;
10
+ } | {
11
+ impossible: Record<string, string>;
12
+ available: false;
13
+ }>>;
14
+ //# sourceMappingURL=product-plannable.functions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;GAe7B,CAAC"}
@@ -0,0 +1,24 @@
1
+ // Oordeel van de Logistiek Engine per product (logistics_product_maten.missing_reason):
2
+ // kan de Engine dit product indelen? Alleen lezen, nooit zelf beoordelen.
3
+ // Ontbreekt de Engine-functie: geen oordeel (geen waarschuwing).
4
+ import { createServerFn } from "@tanstack/react-start";
5
+ import { z } from "zod";
6
+ import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
7
+ export const getProductPlannability = createServerFn({ method: "POST" })
8
+ .middleware([requireSupabaseAuth])
9
+ .inputValidator((input) => z.object({ productIds: z.array(z.string().uuid()).max(200) }).parse(input))
10
+ .handler(async ({ data, context }) => {
11
+ const impossible = {};
12
+ if (!data.productIds.length)
13
+ return { impossible, available: true };
14
+ const { data: rows, error } = await context.supabase.rpc("logistics_product_maten", {
15
+ p_product_ids: data.productIds,
16
+ });
17
+ if (error)
18
+ return { impossible, available: false };
19
+ for (const r of (rows ?? [])) {
20
+ if (r?.product_id && typeof r.missing_reason === "string" && r.missing_reason.trim())
21
+ impossible[String(r.product_id)] = r.missing_reason.trim();
22
+ }
23
+ return { impossible, available: true };
24
+ });
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;GA+B7B,CAAC"}
1
+ {"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AAwDA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;GA+B7B,CAAC"}
@@ -17,6 +17,20 @@ const listInput = z.object({
17
17
  all: z.boolean().optional(),
18
18
  refreshReference: z.boolean().optional(),
19
19
  });
20
+ const STEP_DESC = {
21
+ "1_3_bronnen": "Floriday- en lokale orders lezen",
22
+ "3b_5_referentie": "verzendmomenten en referentiedata",
23
+ "9_12_dto": "rijen opbouwen",
24
+ "12_engine": "Engine-overzicht, achterstand, beoordelingen",
25
+ "13_filter": "filteren en pagina kiezen",
26
+ "14a_vertrek": "ophaalmoment (Engine)",
27
+ "14b_vervoerder": "vervoerder (Engine)",
28
+ "14c_dekking": "karren en indeling (Engine)",
29
+ "14d_afleverlocatie": "afleverlocatie",
30
+ "15_floriday_stand": "Floriday-stand (gateway)",
31
+ "14_15_verrijking": "verrijking zichtbare rijen (wachten op traagste)",
32
+ "16_samenvoegen": "samenvoegen en totalen",
33
+ };
20
34
  /** Meting als Server-Timing-header (zichtbaar in de netwerktab). */
21
35
  function setServerTiming(setResponseHeader, timing, fn) {
22
36
  if (!timing)
@@ -25,7 +39,7 @@ function setServerTiming(setResponseHeader, timing, fn) {
25
39
  const parts = [
26
40
  `total;dur=${timing.totalMs};desc="${fn}"`,
27
41
  `db;desc="calls=${timing.dbCalls}"`,
28
- ...timing.steps.map((s, i) => `s${i};dur=${s.ms};desc="${s.step.trim()}"`),
42
+ ...timing.steps.map((s, i) => `${(s.step.trim().replace(/[^A-Za-z0-9_]/g, "_") || `s${i}`)};dur=${s.ms};desc="${STEP_DESC[s.step.trim()] ?? s.step.trim()}"`),
29
43
  ];
30
44
  setResponseHeader("Server-Timing", parts.join(", "));
31
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAqHD,wBAAgB,wBAAwB,SAIvC;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA8BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CA6qCrB"}
1
+ {"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAqHD,wBAAgB,wBAAwB,SAIvC;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA8BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAurCrB"}
@@ -1221,6 +1221,16 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
1221
1221
  if (res.error)
1222
1222
  warnings.push(`Vervoerder: ${res.error}`);
1223
1223
  }));
1224
+ // Afleverlocatie (GLN → naam + adres); klantadres blijft alleen terugval.
1225
+ enrichTasks.push(t.time("14d_afleverlocatie", async () => {
1226
+ const { loadDeliveryLocations, deliveryLocationLabel } = await import("./delivery-location.server.js");
1227
+ const locs = await loadDeliveryLocations(supabase, ids);
1228
+ for (const o of visible) {
1229
+ const oid = idFor(o);
1230
+ const l = oid ? locs.get(oid) : undefined;
1231
+ o.deliveryLocationLabel = deliveryLocationLabel(l) ?? null;
1232
+ }
1233
+ }));
1224
1234
  enrichTasks.push(t.time("14c_dekking", async () => {
1225
1235
  const coverage = await loadPlanCoverage(supabase, ids, "list");
1226
1236
  let failed = 0;
@@ -126,6 +126,8 @@ export interface SalesOrderDTO {
126
126
  carrierBadge?: string | null;
127
127
  /** Concrete ontbrekende gegevens, bv. "geen klant gekoppeld". */
128
128
  incomplete?: string[];
129
+ /** Afleverlocatie (Floriday-levering → Floriday-locatie → klantlocatie), alleen zichtbare rijen. */
130
+ deliveryLocationLabel?: string | null;
129
131
  customer: {
130
132
  name: string;
131
133
  /** Bedrijfsnaam (company_name) als die afwijkt van de getoonde handelsnaam. */
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowselections/floriday-verkoop-module",
3
- "version": "1.0.127",
3
+ "version": "1.0.129",
4
4
  "private": false,
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -127,6 +127,14 @@
127
127
  "methods": [
128
128
  "POST"
129
129
  ]
130
+ },
131
+ {
132
+ "routePath": "/api/public/cron/sync-salesorders-now",
133
+ "import": "@flowselections/floriday-verkoop-module/cron",
134
+ "handler": "syncSalesOrdersNowCron",
135
+ "methods": [
136
+ "POST"
137
+ ]
130
138
  }
131
139
  ],
132
140
  "schema": {
@@ -2750,3 +2750,101 @@ DO $$ BEGIN
2750
2750
  FOR EACH ROW EXECUTE FUNCTION public.verkoop_fulfillment_index_trg();
2751
2751
  END IF;
2752
2752
  END $$;
2753
+
2754
+ -- ===== 1.0.128: directe omzetting Floriday-verkooporders =====
2755
+ CREATE OR REPLACE FUNCTION public.verkoop_salesorder_content_hash(p_data jsonb, p_deleted boolean)
2756
+ RETURNS text
2757
+ LANGUAGE sql
2758
+ IMMUTABLE
2759
+ SET search_path = public
2760
+ AS $$
2761
+ SELECT md5(concat_ws('|',
2762
+ coalesce(p_deleted, false)::text,
2763
+ p_data->>'status',
2764
+ p_data->>'numberOfPieces',
2765
+ p_data->>'tradeItemId',
2766
+ p_data->>'salesOrderGroupId',
2767
+ (p_data->'delivery')::text,
2768
+ (p_data->'packingConfiguration')::text,
2769
+ p_data->>'pricePerPiece'
2770
+ ))
2771
+ $$;
2772
+
2773
+ CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_post(p_ids text[])
2774
+ RETURNS void
2775
+ LANGUAGE plpgsql
2776
+ SECURITY DEFINER
2777
+ SET search_path = public
2778
+ AS $$
2779
+ BEGIN
2780
+ IF p_ids IS NULL OR cardinality(p_ids) = 0 THEN RETURN; END IF;
2781
+ IF to_regprocedure('public.flowselections_cron_post(text,jsonb,integer,text)') IS NULL THEN RETURN; END IF;
2782
+ PERFORM public.flowselections_cron_post(
2783
+ '/api/public/cron/sync-salesorders-now',
2784
+ jsonb_build_object('salesOrderIds', to_jsonb(p_ids[1:200])),
2785
+ 15000,
2786
+ 'anon'
2787
+ );
2788
+ EXCEPTION WHEN OTHERS THEN
2789
+ RAISE WARNING '[verkoop] directe omzetting niet verstuurd: %', SQLERRM;
2790
+ END
2791
+ $$;
2792
+
2793
+ CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_ins_trg()
2794
+ RETURNS trigger
2795
+ LANGUAGE plpgsql
2796
+ SECURITY DEFINER
2797
+ SET search_path = public
2798
+ AS $$
2799
+ DECLARE v_ids text[];
2800
+ BEGIN
2801
+ SELECT array_agg(DISTINCT n.floriday_id) INTO v_ids
2802
+ FROM new_rows n
2803
+ WHERE n.floriday_id IS NOT NULL
2804
+ AND coalesce(n.is_deleted, false) = false
2805
+ AND NOT EXISTS (SELECT 1 FROM public.orders o WHERE o.floriday_sales_order_id = n.floriday_id AND o.deleted_at IS NULL);
2806
+ PERFORM public.verkoop_salesorders_direct_post(v_ids);
2807
+ RETURN NULL;
2808
+ EXCEPTION WHEN OTHERS THEN
2809
+ RAISE WARNING '[verkoop] directe omzetting (insert) overgeslagen: %', SQLERRM;
2810
+ RETURN NULL;
2811
+ END
2812
+ $$;
2813
+
2814
+ CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_upd_trg()
2815
+ RETURNS trigger
2816
+ LANGUAGE plpgsql
2817
+ SECURITY DEFINER
2818
+ SET search_path = public
2819
+ AS $$
2820
+ DECLARE v_ids text[];
2821
+ BEGIN
2822
+ SELECT array_agg(DISTINCT n.floriday_id) INTO v_ids
2823
+ FROM new_rows n
2824
+ JOIN old_rows o ON o.floriday_id = n.floriday_id AND o.connection_id IS NOT DISTINCT FROM n.connection_id
2825
+ WHERE n.floriday_id IS NOT NULL
2826
+ AND public.verkoop_salesorder_content_hash(n.data, n.is_deleted)
2827
+ IS DISTINCT FROM public.verkoop_salesorder_content_hash(o.data, o.is_deleted);
2828
+ PERFORM public.verkoop_salesorders_direct_post(v_ids);
2829
+ RETURN NULL;
2830
+ EXCEPTION WHEN OTHERS THEN
2831
+ RAISE WARNING '[verkoop] directe omzetting (update) overgeslagen: %', SQLERRM;
2832
+ RETURN NULL;
2833
+ END
2834
+ $$;
2835
+
2836
+ REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_post(text[]) FROM PUBLIC, anon, authenticated;
2837
+ REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_ins_trg() FROM PUBLIC, anon, authenticated;
2838
+ REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_upd_trg() FROM PUBLIC, anon, authenticated;
2839
+
2840
+ DO $$
2841
+ BEGIN
2842
+ IF to_regclass('public.floriday_salesorders_cache') IS NOT NULL THEN
2843
+ EXECUTE 'DROP TRIGGER IF EXISTS verkoop_salesorders_direct_ins ON public.floriday_salesorders_cache';
2844
+ EXECUTE 'DROP TRIGGER IF EXISTS verkoop_salesorders_direct_upd ON public.floriday_salesorders_cache';
2845
+ EXECUTE $q$CREATE TRIGGER verkoop_salesorders_direct_ins AFTER INSERT ON public.floriday_salesorders_cache
2846
+ REFERENCING NEW TABLE AS new_rows FOR EACH STATEMENT EXECUTE FUNCTION public.verkoop_salesorders_direct_ins_trg()$q$;
2847
+ EXECUTE $q$CREATE TRIGGER verkoop_salesorders_direct_upd AFTER UPDATE ON public.floriday_salesorders_cache
2848
+ REFERENCING OLD TABLE AS old_rows NEW TABLE AS new_rows FOR EACH STATEMENT EXECUTE FUNCTION public.verkoop_salesorders_direct_upd_trg()$q$;
2849
+ END IF;
2850
+ END $$;