@flowselections/floriday-verkoop-module 1.0.109 → 1.0.113

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 (36) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +37 -31
  3. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +4 -4
  4. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
  5. package/dist-lib/components/verkoop/OrderCarrierPicker.js +26 -19
  6. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  7. package/dist-lib/components/verkoop/SalesOrdersTable.js +1 -1
  8. package/dist-lib/integrations/supabase/types.d.ts +128 -6
  9. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  10. package/dist-lib/lib/carrier-resolve.check.d.ts +2 -0
  11. package/dist-lib/lib/carrier-resolve.check.d.ts.map +1 -0
  12. package/dist-lib/lib/carrier-resolve.check.js +38 -0
  13. package/dist-lib/lib/carrier-resolve.d.ts +27 -0
  14. package/dist-lib/lib/carrier-resolve.d.ts.map +1 -0
  15. package/dist-lib/lib/carrier-resolve.js +100 -0
  16. package/dist-lib/lib/carrier-resolve.server.d.ts +15 -0
  17. package/dist-lib/lib/carrier-resolve.server.d.ts.map +1 -0
  18. package/dist-lib/lib/carrier-resolve.server.js +32 -0
  19. package/dist-lib/lib/create-order.functions.d.ts +8 -0
  20. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  21. package/dist-lib/lib/create-order.functions.js +62 -22
  22. package/dist-lib/lib/customer-stickers.check.js +4 -1
  23. package/dist-lib/lib/customer-stickers.d.ts +10 -0
  24. package/dist-lib/lib/customer-stickers.d.ts.map +1 -1
  25. package/dist-lib/lib/customer-stickers.js +6 -1
  26. package/dist-lib/lib/module-version.d.ts +1 -1
  27. package/dist-lib/lib/module-version.js +1 -1
  28. package/dist-lib/lib/order-carrier.functions.d.ts +10 -4
  29. package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
  30. package/dist-lib/lib/order-carrier.functions.js +64 -40
  31. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  32. package/dist-lib/lib/salesorders-list.server.js +24 -0
  33. package/dist-lib/lib/salesorders-mapping.d.ts +7 -0
  34. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  35. package/package.json +1 -1
  36. package/schema/verkoop.sql +106 -0
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=carrier-resolve.check.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"carrier-resolve.check.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.check.ts"],"names":[],"mappings":""}
@@ -0,0 +1,38 @@
1
+ // Losse test: bun src/lib/carrier-resolve.check.ts
2
+ import { badgeFor, isMissingFunctionError, normalizeResolvedCarrier, normalizeResolvedMany, CARRIER_SOURCES, } from "./carrier-resolve.js";
3
+ let fails = 0;
4
+ function eq(name, got, want) {
5
+ const ok = JSON.stringify(got) === JSON.stringify(want);
6
+ if (!ok)
7
+ fails++;
8
+ console.log(`${ok ? "ok " : "FOUT"} ${name}${ok ? "" : ` → ${JSON.stringify(got)} ≠ ${JSON.stringify(want)}`}`);
9
+ }
10
+ const id = "11111111-1111-1111-1111-111111111111";
11
+ eq("acht bronnen uit het contract", CARRIER_SOURCES.length, 8);
12
+ eq("geen 'standaard' als bron", CARRIER_SOURCES.includes("standaard"), false);
13
+ const hand = normalizeResolvedCarrier({ carrier_id: id, carrier_name: "Testvervoerder", bron: "handmatig", reden: "Handmatig gekozen" });
14
+ eq("handmatig: ok", [hand.state, hand.source, hand.carrierName, hand.badge], ["ok", "handmatig", "Testvervoerder", null]);
15
+ for (const s of CARRIER_SOURCES.filter((x) => x !== "geen")) {
16
+ eq(`bron ${s} wordt overgenomen`, normalizeResolvedCarrier({ carrier_id: id, carrier_name: "X", bron: s }).source, s);
17
+ }
18
+ eq("aanduiding oud", badgeFor("oud"), "oude instelling");
19
+ eq("aanduiding favoriet", badgeFor("favoriet"), "favoriet");
20
+ eq("geen aanduiding bij afleverlocatie", badgeFor("afleverlocatie"), null);
21
+ eq("favoriet krijgt aanduiding", normalizeResolvedCarrier({ carrier_id: id, carrier_name: "X", bron: "favoriet" }).badge, "favoriet");
22
+ const geen = normalizeResolvedCarrier({ carrier_id: null, bron: "geen", reden: "Geen vervoerder ingesteld" });
23
+ eq("bron geen: geen vervoerder, geen standaardwaarde", [geen.state, geen.carrierId, geen.carrierName], ["geen", null, null]);
24
+ const zonderId = normalizeResolvedCarrier({ carrier_id: null, bron: "klant" });
25
+ eq("bron zonder vervoerder-id: geen (nooit gokken)", [zonderId.state, zonderId.carrierId], ["geen", null]);
26
+ const raar = normalizeResolvedCarrier({ carrier_id: id, bron: "standaard" });
27
+ eq("onbekende bron: onbekend", [raar.state, raar.carrierId], ["onbekend", null]);
28
+ eq("leeg antwoord: onbekend", normalizeResolvedCarrier(null).state, "onbekend");
29
+ eq("ontbrekende functie (PGRST202)", isMissingFunctionError("PGRST202: Could not find the function public.logistics_resolve_carrier"), true);
30
+ eq("ontbrekende functie (42883)", isMissingFunctionError("42883 function public.logistics_set_order_carrier(uuid, uuid) does not exist"), true);
31
+ eq("andere fout is geen oude Engine", isMissingFunctionError("permission denied for function"), false);
32
+ const many = normalizeResolvedMany([{ order_id: "a", carrier_id: id, carrier_name: "X", bron: "oud" }, { order_id: "b", bron: "geen" }]);
33
+ eq("lijstversie per order-id", [many.get("a")?.source, many.get("b")?.state], ["oud", "geen"]);
34
+ if (fails) {
35
+ console.error(`${fails} controle(s) mislukt`);
36
+ process.exit(1);
37
+ }
38
+ console.log("alle controles geslaagd");
@@ -0,0 +1,27 @@
1
+ export declare const CARRIER_SOURCES: readonly ["handmatig", "afleverlocatie", "afleverlocatie_gln", "klant", "werkgebied", "favoriet", "geen", "oud"];
2
+ export type CarrierSource = (typeof CARRIER_SOURCES)[number];
3
+ export declare const ENGINE_CARRIER_MIN_VERSION_NOTICE = "Logistieke Engine 1.0.184 of hoger nodig";
4
+ export interface ResolvedCarrier {
5
+ state: "ok" | "geen" | "onbekend";
6
+ carrierId: string | null;
7
+ carrierName: string | null;
8
+ carrierKind: string | null;
9
+ source: CarrierSource | null;
10
+ reason: string | null;
11
+ warning: string | null;
12
+ /** Kleine aanduiding voor de planner (bron oud/favoriet). */
13
+ badge: string | null;
14
+ /** Melding voor beheer (oude Engine of fout). */
15
+ adminNotice: string | null;
16
+ }
17
+ export declare function sourceLabel(s: CarrierSource | null): string;
18
+ export declare function badgeFor(s: CarrierSource | null): string | null;
19
+ /** Herkent een ontbrekende Engine-functie (oude Engine). */
20
+ export declare function isMissingFunctionError(msg: string | null | undefined): boolean;
21
+ export declare function unknownCarrier(adminNotice: string | null, legacyName?: string | null, legacyId?: string | null): ResolvedCarrier;
22
+ /** Normaliseert één antwoord van logistics_resolve_carrier. Nooit een standaardwaarde. */
23
+ export declare function normalizeResolvedCarrier(raw: unknown): ResolvedCarrier;
24
+ /** Antwoord van logistics_resolve_carrier_many: array of object per order-id. */
25
+ export declare function normalizeResolvedMany(raw: unknown): Map<string, ResolvedCarrier>;
26
+ export declare function carrierLine(c: ResolvedCarrier): string;
27
+ //# sourceMappingURL=carrier-resolve.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"carrier-resolve.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,kHASlB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iDAAiD;IACjD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAaD,wBAAgB,WAAW,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAE3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9E;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,eAAe,CAc5I;AAED,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,CAkBtE;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAWhF;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAItD"}
@@ -0,0 +1,100 @@
1
+ // Vervoerder per order volgens het gedeelde contract (eigenaar: Logistiek Engine).
2
+ // Alleen lezen/normaliseren; Verkoop kiest zelf nooit een vervoerder.
3
+ export const CARRIER_SOURCES = [
4
+ "handmatig",
5
+ "afleverlocatie",
6
+ "afleverlocatie_gln",
7
+ "klant",
8
+ "werkgebied",
9
+ "favoriet",
10
+ "geen",
11
+ "oud",
12
+ ];
13
+ export const ENGINE_CARRIER_MIN_VERSION_NOTICE = "Logistieke Engine 1.0.184 of hoger nodig";
14
+ const SOURCE_LABEL = {
15
+ handmatig: "handmatig gekozen",
16
+ afleverlocatie: "van de afleverlocatie",
17
+ afleverlocatie_gln: "van de afleverlocatie (GLN)",
18
+ klant: "van de klant",
19
+ werkgebied: "van het werkgebied",
20
+ favoriet: "favoriete vervoerder",
21
+ geen: "geen vervoerder",
22
+ oud: "oude instelling",
23
+ };
24
+ export function sourceLabel(s) {
25
+ return s ? SOURCE_LABEL[s] : "onbekend";
26
+ }
27
+ export function badgeFor(s) {
28
+ if (s === "oud")
29
+ return "oude instelling";
30
+ if (s === "favoriet")
31
+ return "favoriet";
32
+ return null;
33
+ }
34
+ function str(v) {
35
+ return typeof v === "string" && v.trim() ? v.trim() : null;
36
+ }
37
+ /** Herkent een ontbrekende Engine-functie (oude Engine). */
38
+ export function isMissingFunctionError(msg) {
39
+ const m = String(msg ?? "");
40
+ return /PGRST202|42883|could not find the function|function .* does not exist/i.test(m);
41
+ }
42
+ export function unknownCarrier(adminNotice, legacyName = null, legacyId = null) {
43
+ return {
44
+ state: "onbekend",
45
+ carrierId: legacyId,
46
+ carrierName: legacyName,
47
+ carrierKind: null,
48
+ source: null,
49
+ reason: legacyId
50
+ ? "Opgeslagen vervoerder; de Logistiek Engine geeft nog geen vervoerder door."
51
+ : "Vervoerder onbekend – de Logistiek Engine geeft nog geen vervoerder door.",
52
+ warning: null,
53
+ badge: null,
54
+ adminNotice,
55
+ };
56
+ }
57
+ /** Normaliseert één antwoord van logistics_resolve_carrier. Nooit een standaardwaarde. */
58
+ export function normalizeResolvedCarrier(raw) {
59
+ const r = (raw && typeof raw === "object" ? raw : {});
60
+ const bron = str(r.bron);
61
+ const source = bron && CARRIER_SOURCES.includes(bron) ? bron : null;
62
+ if (!source)
63
+ return unknownCarrier(bron ? `Onbekende bron "${bron}" van de Logistiek Engine` : "Leeg antwoord van de Logistiek Engine");
64
+ const carrierId = str(r.carrier_id);
65
+ const state = source === "geen" || !carrierId ? "geen" : "ok";
66
+ return {
67
+ state,
68
+ carrierId: state === "ok" ? carrierId : null,
69
+ carrierName: state === "ok" ? str(r.carrier_name) : null,
70
+ carrierKind: str(r.carrier_kind),
71
+ source: state === "geen" ? "geen" : source,
72
+ reason: str(r.reden),
73
+ warning: str(r.waarschuwing),
74
+ badge: badgeFor(state === "geen" ? "geen" : source),
75
+ adminNotice: null,
76
+ };
77
+ }
78
+ /** Antwoord van logistics_resolve_carrier_many: array of object per order-id. */
79
+ export function normalizeResolvedMany(raw) {
80
+ const out = new Map();
81
+ if (Array.isArray(raw)) {
82
+ for (const row of raw) {
83
+ const id = str(row?.order_id);
84
+ if (id)
85
+ out.set(id, normalizeResolvedCarrier(row));
86
+ }
87
+ }
88
+ else if (raw && typeof raw === "object") {
89
+ for (const [id, row] of Object.entries(raw))
90
+ out.set(id, normalizeResolvedCarrier(row));
91
+ }
92
+ return out;
93
+ }
94
+ export function carrierLine(c) {
95
+ if (c.state === "geen")
96
+ return `Geen vervoerder${c.reason ? ` – ${c.reason}` : ""}`;
97
+ if (c.state === "onbekend")
98
+ return c.carrierName ? `Vervoerder: ${c.carrierName} – ${c.reason}` : (c.reason ?? "Vervoerder onbekend");
99
+ return `Vervoerder: ${c.carrierName ?? "onbekend"} – ${c.reason ?? sourceLabel(c.source)}`;
100
+ }
@@ -0,0 +1,15 @@
1
+ import { type ResolvedCarrier } from "./carrier-resolve.js";
2
+ /** Vervoerder voor veel orders in één aanroep per blok; fout = "onbekend", nooit een standaard. */
3
+ export declare function resolveCarriersMany(supabase: any, orders: {
4
+ id: string;
5
+ legacyCarrierId: string | null;
6
+ legacyCarrierName: string | null;
7
+ }[]): Promise<{
8
+ byId: Map<string, ResolvedCarrier>;
9
+ error: string | null;
10
+ }>;
11
+ export declare function resolveCarrierOne(supabase: any, orderId: string, legacy: {
12
+ id: string | null;
13
+ name: string | null;
14
+ }): Promise<ResolvedCarrier>;
15
+ //# sourceMappingURL=carrier-resolve.server.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"carrier-resolve.server.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.server.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAI3B,mGAAmG;AACnG,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,GAAG,EACb,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACzF,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAkBvE;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjD,OAAO,CAAC,eAAe,CAAC,CAU1B"}
@@ -0,0 +1,32 @@
1
+ // Leest de vervoerder per order bij de Logistiek Engine (contract vervoerder).
2
+ import { ENGINE_CARRIER_MIN_VERSION_NOTICE, isMissingFunctionError, normalizeResolvedCarrier, normalizeResolvedMany, unknownCarrier, } from "./carrier-resolve.js";
3
+ const CHUNK = 500;
4
+ /** Vervoerder voor veel orders in één aanroep per blok; fout = "onbekend", nooit een standaard. */
5
+ export async function resolveCarriersMany(supabase, orders) {
6
+ const byId = new Map();
7
+ let error = null;
8
+ for (let i = 0; i < orders.length; i += CHUNK) {
9
+ const chunk = orders.slice(i, i + CHUNK);
10
+ const { data, error: e } = await supabase.rpc("logistics_resolve_carrier_many", {
11
+ p_order_ids: chunk.map((o) => o.id),
12
+ });
13
+ if (e) {
14
+ const notice = isMissingFunctionError(e.message) ? ENGINE_CARRIER_MIN_VERSION_NOTICE : `Vervoerders konden niet worden opgevraagd: ${e.message}`;
15
+ error = notice;
16
+ for (const o of chunk)
17
+ byId.set(o.id, unknownCarrier(notice, o.legacyCarrierName, o.legacyCarrierId));
18
+ continue;
19
+ }
20
+ const m = normalizeResolvedMany(data);
21
+ for (const o of chunk)
22
+ byId.set(o.id, m.get(o.id) ?? unknownCarrier("Geen antwoord van de Logistiek Engine voor deze order", o.legacyCarrierName, o.legacyCarrierId));
23
+ }
24
+ return { byId, error };
25
+ }
26
+ export async function resolveCarrierOne(supabase, orderId, legacy) {
27
+ const { data, error } = await supabase.rpc("logistics_resolve_carrier", { p_order_id: orderId });
28
+ if (error) {
29
+ return unknownCarrier(isMissingFunctionError(error.message) ? ENGINE_CARRIER_MIN_VERSION_NOTICE : `Vervoerder kon niet worden opgevraagd: ${error.message}`, legacy.name, legacy.id);
30
+ }
31
+ return normalizeResolvedCarrier(data);
32
+ }
@@ -126,6 +126,7 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
126
126
  userId: string;
127
127
  claims: import("@supabase/auth-js").User;
128
128
  }, undefined, undefined, undefined>], (input: unknown) => {
129
+ idempotencyKey: string;
129
130
  customerId: string;
130
131
  customerName: string;
131
132
  deliveryLocationId: string;
@@ -160,6 +161,13 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
160
161
  }, Promise<{
161
162
  ok: true;
162
163
  orderId: string;
164
+ alreadyExisted: true;
165
+ carrierAdminNotice?: undefined;
166
+ } | {
167
+ ok: true;
168
+ orderId: string;
169
+ carrierAdminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
170
+ alreadyExisted?: undefined;
163
171
  }>>;
164
172
  export declare const cancelLocalOrder: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
165
173
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
@@ -1 +1 @@
1
- {"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAWnC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AAuEL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA2PY,MAAM;GAE/C,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAY7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;GAgR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAwBrE,CAAC"}
1
+ {"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AA8EL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA2QL,MAAM;;;GAI9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAY7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;GAgR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
@@ -544,11 +544,14 @@ export const listPickupLocationsCO = createServerFn({ method: "GET" })
544
544
  export const listCarriersForCreateOrder = createServerFn({ method: "GET" })
545
545
  .middleware([requireSupabaseAuth])
546
546
  .handler(async ({ context }) => {
547
- const { data } = await context.supabase
547
+ const { data, error } = await context.supabase
548
548
  .from("carriers")
549
549
  .select("id, name, is_default, sort_order, delivery_days, signup_time_1, signup_time_2, signup_days_before_delivery, pickup_weekdays, delivery_weekdays, pickup_moments")
550
550
  .order("sort_order", { ascending: true, nullsFirst: false })
551
551
  .order("name");
552
+ // Fout niet inslikken: het scherm toont hem.
553
+ if (error)
554
+ throw new Error(`Vervoerders konden niet worden geladen: ${error.message}`);
552
555
  return { items: data ?? [] };
553
556
  });
554
557
  // ─── Beladingen per product ────────────────────────────────────────────────
@@ -672,7 +675,14 @@ function snapshotForLine(l) {
672
675
  packing_source: snap.packing_source,
673
676
  };
674
677
  }
678
+ function friendlyCreateError(msg) {
679
+ if (/De bestelling is niet aangemaakt/.test(msg))
680
+ return msg;
681
+ return `De bestelling is niet aangemaakt (${msg}). Er is niets bewaard; probeer het opnieuw.`;
682
+ }
675
683
  const CreateManualOrderInput = z.object({
684
+ // Kenmerk per formulier: opnieuw versturen geeft dezelfde bestelling terug.
685
+ idempotencyKey: z.string().min(8).max(100),
676
686
  customerId: z.string().uuid(),
677
687
  customerName: z.string().min(1).max(255),
678
688
  deliveryLocationId: z.string().uuid(),
@@ -715,7 +725,10 @@ export const createManualOrder = createServerFn({ method: "POST" })
715
725
  // Ophaalmoment en haalbaarheid komen alleen van de Logistiek Engine
716
726
  // (logistics_departure_preview). Geen eigen berekening of terugval.
717
727
  const ownTransport = !data.isReservation && data.ownTransport === true;
718
- let carrierId = data.isReservation || ownTransport ? null : (data.carrierId ?? null);
728
+ // carrierId = alleen een handmatige keuze ("Automatisch" = null).
729
+ const carrierId = data.isReservation || ownTransport ? null : (data.carrierId ?? null);
730
+ // Alleen voor de terugval bij een oude Engine (custom_fields.carrier).
731
+ let fallbackCarrierId = null;
719
732
  let ownTransportInfo = null;
720
733
  let momentKey = null;
721
734
  let deliveryTime = null;
@@ -766,13 +779,12 @@ export const createManualOrder = createServerFn({ method: "POST" })
766
779
  source: data.source ?? "manual",
767
780
  };
768
781
  }
782
+ // Handmatige keuze blijft leidend; zonder keuze kiest de Engine (voorbeeld).
769
783
  if (!ownTransport)
770
- carrierId = preview?.carrierId ?? carrierId;
771
- if (!ownTransport && !carrierId)
772
- throw new Error("Er is geen vervoerder bekend voor deze afleverlocatie. Kies een vervoerder.");
784
+ fallbackCarrierId = carrierId ?? preview?.carrierId ?? null;
773
785
  momentKey = d.momentKey;
774
- if (!ownTransport)
775
- deliveryTime = await deliveryTimeForMoment(context.supabase, carrierId, momentKey);
786
+ if (!ownTransport && fallbackCarrierId)
787
+ deliveryTime = await deliveryTimeForMoment(context.supabase, fallbackCarrierId, momentKey);
776
788
  }
777
789
  const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
778
790
  // Zorg dat elk product_id (= identiteit uit de voorraadmodule) een rij
@@ -872,7 +884,12 @@ export const createManualOrder = createServerFn({ method: "POST" })
872
884
  }
873
885
  }
874
886
  const total = data.lines.reduce((s, l) => s + (Number(l.unit_price ?? 0) * Number(l.quantity)), 0);
875
- const { data: order, error: orderErr } = await supabaseAdmin.from("orders").insert({
887
+ const orderPayload = {
888
+ // Vervoerder via de Engine in dezelfde transactie (logistics_set_order_carrier);
889
+ // geen custom_fields.carrier meer, behalve als terugval bij een oude Engine.
890
+ manual_carrier_id: carrierId,
891
+ fallback_carrier_id: fallbackCarrierId,
892
+ set_by_user_id: context.userId ?? null,
876
893
  customer_name: data.customerName,
877
894
  customer_id: data.customerId,
878
895
  order_date: new Date().toISOString().slice(0, 10),
@@ -886,7 +903,6 @@ export const createManualOrder = createServerFn({ method: "POST" })
886
903
  source: "manual",
887
904
  delivery_location: data.deliveryLocationId,
888
905
  pickup_location: data.pickupLocationId,
889
- carrier: carrierId,
890
906
  delivery_time: deliveryTime,
891
907
  pickup_moment: momentKey,
892
908
  ...(lateSignup ? { late_signup_override: lateSignup } : {}),
@@ -895,9 +911,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
895
911
  is_reservation: !!data.isReservation,
896
912
  load_carrier_type: loadCarrierType,
897
913
  },
898
- }).select("id, order_number").single();
899
- if (orderErr)
900
- throw new Error(orderErr.message);
914
+ };
901
915
  const items = data.lines.map((l) => {
902
916
  const isGroup = groupById.has(l.product_id);
903
917
  const groupRow = isGroup ? groupById.get(l.product_id) : null;
@@ -906,23 +920,33 @@ export const createManualOrder = createServerFn({ method: "POST" })
906
920
  ? (/^\s*\[Groep\]/i.test(l.product_name) ? l.product_name : `[Groep] ${groupName}`)
907
921
  : l.product_name;
908
922
  return {
909
- order_id: order.id,
910
923
  // Groepen krijgen product_id = null; expand-group-order-items
911
924
  // resolvt hen op naam ("[Groep] <naam>").
912
925
  product_id: isGroup ? null : l.product_id,
913
926
  product_name: productNameForStorage(displayName),
914
927
  quantity: Math.max(1, Math.round(l.quantity)),
915
928
  unit: l.unit ?? "stuks",
916
- // Gekozen belading vastleggen op de regel zelf, zodat de karindeling
917
- // de handmatige keuze gebruikt i.p.v. de standaard van het product.
929
+ // Gekozen belading vastleggen op de regel zelf (snapshot).
918
930
  ...snapshotForLine(l),
919
- unit_price: l.unit_price ?? undefined,
931
+ unit_price: l.unit_price ?? null,
920
932
  needs_sticker: l.needs_sticker === true,
921
933
  };
922
934
  });
923
- const { error: itemsErr } = await supabaseAdmin.from("order_items").insert(items);
924
- if (itemsErr)
925
- throw new Error(itemsErr.message);
935
+ // Kop en alle regels in één databasetransactie; idempotent op het
936
+ // formulierkenmerk. Mislukt één regel, dan wordt niets bewaard.
937
+ const { data: rpcRes, error: rpcErr } = await supabaseAdmin.rpc("verkoop_insert_manual_order", {
938
+ p_order: orderPayload,
939
+ p_items: items,
940
+ p_idempotency_key: data.idempotencyKey,
941
+ });
942
+ if (rpcErr)
943
+ throw new Error(friendlyCreateError(rpcErr.message));
944
+ if (!rpcRes?.ok)
945
+ throw new Error(rpcRes?.reason ?? "De bestelling is niet aangemaakt. Er is niets bewaard.");
946
+ const order = { id: rpcRes.order_id, order_number: rpcRes.order_number };
947
+ if (rpcRes.already_existed) {
948
+ return { ok: true, orderId: order.id, alreadyExisted: true };
949
+ }
926
950
  // Karindeling wordt door de Logistiek Engine gedaan (eigen minuut-cron);
927
951
  // deze module stoot dat niet zelf meer aan.
928
952
  // Logistics Engine informeren (schaduwmodus): Engine plant de keten.
@@ -933,8 +957,11 @@ export const createManualOrder = createServerFn({ method: "POST" })
933
957
  catch (err) {
934
958
  console.warn("[createManualOrder] engine-event faalde:", err);
935
959
  }
936
- void context; // reserveren indien later audit-log nodig is
937
- return { ok: true, orderId: order.id };
960
+ return {
961
+ ok: true,
962
+ orderId: order.id,
963
+ carrierAdminNotice: rpcRes.carrier_fallback ? "Logistieke Engine 1.0.184 of hoger nodig" : null,
964
+ };
938
965
  });
939
966
  // ─── Annuleren van een lokale bestelling ──────────────────────────────────
940
967
  // Annuleren bewaart de order (tabblad "Geannuleerd") maar haalt hem uit de
@@ -1621,7 +1648,20 @@ export const listCustomerStickerProducts = createServerFn({ method: "POST" })
1621
1648
  .select("id, trade_item_key")
1622
1649
  .in("id", data.productIds);
1623
1650
  const productKeyRows = (prods ?? []).map((p) => ({ id: p.id, tradeItemKey: p.trade_item_key ?? null }));
1624
- const keys = Array.from(new Set(productKeyRows.flatMap((p) => [p.id, p.tradeItemKey].filter(Boolean))));
1651
+ // Productgroep: sticker volgt het hoofdproduct van de groep (head_product_id), op id.
1652
+ const { data: groups } = await sb
1653
+ .from("product_groups")
1654
+ .select("id, head_product_id")
1655
+ .in("id", data.productIds);
1656
+ const { groupStickerRows } = await import("./customer-stickers.js");
1657
+ const groupRows = groupStickerRows((groups ?? []));
1658
+ if (groupRows.length) {
1659
+ const { data: heads } = await sb.from("products").select("id, trade_item_key").in("id", groupRows.map((g) => g.headId));
1660
+ const headKey = new Map((heads ?? []).map((h) => [h.id, (h.trade_item_key ?? null)]));
1661
+ for (const g of groupRows)
1662
+ productKeyRows.push({ id: g.groupId, tradeItemKey: null, headId: g.headId, headKey: headKey.get(g.headId) ?? null });
1663
+ }
1664
+ const keys = Array.from(new Set(productKeyRows.flatMap((p) => [p.id, p.tradeItemKey, p.headId, p.headKey].filter(Boolean))));
1625
1665
  if (keys.length === 0)
1626
1666
  return { productIds: [] };
1627
1667
  const { data: rows, error } = await sb
@@ -1,5 +1,5 @@
1
1
  // Draaien met: bun src/lib/customer-stickers.check.ts
2
- import { stickerCustomerKeys, stickerProductIds } from "./customer-stickers.js";
2
+ import { groupStickerRows, stickerCustomerKeys, stickerProductIds } from "./customer-stickers.js";
3
3
  let failed = 0;
4
4
  const eq = (name, a, b) => {
5
5
  const ok = JSON.stringify(a) === JSON.stringify(b);
@@ -12,6 +12,9 @@ eq("klantsleutels zonder codes", stickerCustomerKeys({ id: "c1", twinfield_code:
12
12
  eq("product met vaste sticker op id staat aan", stickerProductIds([{ id: "p1", tradeItemKey: null }, { id: "p2", tradeItemKey: null }], [{ trade_item_key: "p1" }]), ["p1"]);
13
13
  eq("product met vaste sticker op artikelsleutel staat aan", stickerProductIds([{ id: "p1", tradeItemKey: "t1" }], [{ trade_item_key: "t1" }]), ["p1"]);
14
14
  eq("geen vaste sticker: uit", stickerProductIds([{ id: "p1", tradeItemKey: "t1" }], []), []);
15
+ eq("productgroep: vaste sticker op hoofdproduct zet groepregel aan", stickerProductIds([{ id: "g1", tradeItemKey: null, headId: "h1", headKey: null }], [{ trade_item_key: "h1" }]), ["g1"]);
16
+ eq("productgroep zonder sticker op hoofdproduct: uit", stickerProductIds([{ id: "g1", tradeItemKey: null, headId: "h1", headKey: null }], [{ trade_item_key: "h2" }]), []);
17
+ eq("groep zonder hoofdproduct telt niet mee", groupStickerRows([{ id: "g1", head_product_id: null }, { id: "g2", head_product_id: "h2" }]), [{ groupId: "g2", headId: "h2" }]);
15
18
  if (failed) {
16
19
  console.error(`${failed} controle(s) mislukt`);
17
20
  process.exit(1);
@@ -8,7 +8,17 @@ export declare function stickerCustomerKeys(c: {
8
8
  export declare function stickerProductIds(products: {
9
9
  id: string;
10
10
  tradeItemKey: string | null;
11
+ headId?: string | null;
12
+ headKey?: string | null;
11
13
  }[], rows: {
12
14
  trade_item_key: string | null;
13
15
  }[]): string[];
16
+ /** Groepen met een hoofdproduct: de vaste sticker van het hoofdproduct geldt voor de groepregel. */
17
+ export declare function groupStickerRows(groups: {
18
+ id: string;
19
+ head_product_id: string | null;
20
+ }[]): {
21
+ groupId: string;
22
+ headId: string;
23
+ }[];
14
24
  //# sourceMappingURL=customer-stickers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"customer-stickers.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAC3E,wBAAgB,mBAAmB,CAAC,CAAC,EAAE;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,GAAG,MAAM,EAAE,CAOX;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,EACvD,IAAI,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACxC,MAAM,EAAE,CAGV"}
1
+ {"version":3,"file":"customer-stickers.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAC3E,wBAAgB,mBAAmB,CAAC,CAAC,EAAE;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,GAAG,MAAM,EAAE,CAOX;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,EACxG,IAAI,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACxC,MAAM,EAAE,CAIV;AAED,oGAAoG;AACpG,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,CAEhI"}
@@ -15,5 +15,10 @@ export function stickerCustomerKeys(c) {
15
15
  /** Product-id's waarvoor een vaste klantsticker bestaat (op id of artikelsleutel). */
16
16
  export function stickerProductIds(products, rows) {
17
17
  const have = new Set(rows.map((r) => String(r.trade_item_key ?? "")).filter(Boolean));
18
- return products.filter((p) => have.has(p.id) || (!!p.tradeItemKey && have.has(p.tradeItemKey))).map((p) => p.id);
18
+ const hit = (k) => !!k && have.has(k);
19
+ return products.filter((p) => hit(p.id) || hit(p.tradeItemKey) || hit(p.headId) || hit(p.headKey)).map((p) => p.id);
20
+ }
21
+ /** Groepen met een hoofdproduct: de vaste sticker van het hoofdproduct geldt voor de groepregel. */
22
+ export function groupStickerRows(groups) {
23
+ return groups.filter((g) => !!g.head_product_id).map((g) => ({ groupId: g.id, headId: g.head_product_id }));
19
24
  }
@@ -1,2 +1,2 @@
1
- export declare const MODULE_VERSION = "1.0.108";
1
+ export declare const MODULE_VERSION = "1.0.112";
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.108";
3
+ export const MODULE_VERSION = "1.0.112";
@@ -9,11 +9,16 @@ export declare const getOrderCarrier: import("@tanstack/start-client-core").Opti
9
9
  }, undefined, undefined, undefined>], (input: unknown) => {
10
10
  orderId: string;
11
11
  }, Promise<{
12
- carrierId: string | null;
13
- carrierName: string | null;
12
+ resolved: import("./carrier-resolve.js").ResolvedCarrier;
14
13
  bufferId: string | null;
15
14
  options: CarrierOption[];
16
15
  }>>;
16
+ export interface SetCarrierResult {
17
+ orderId: string;
18
+ orderNumber: string | null;
19
+ ok: boolean;
20
+ error: string | null;
21
+ }
17
22
  export declare const setOrderCarrier: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
18
23
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
19
24
  userId: string;
@@ -23,7 +28,8 @@ export declare const setOrderCarrier: import("@tanstack/start-client-core").Opti
23
28
  carrierId: string | null;
24
29
  applyToBuffer?: boolean | undefined;
25
30
  }, Promise<{
26
- ok: true;
27
- updated: number;
31
+ ok: boolean;
32
+ results: SetCarrierResult[];
33
+ adminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
28
34
  }>>;
29
35
  //# sourceMappingURL=order-carrier.functions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAsBD,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;GAmC7B,CAAC;AAEL,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;GA6C7B,CAAC"}
1
+ {"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAqBD,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;GAsB7B,CAAC;AAEL,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;GAsE7B,CAAC"}