@flowselections/floriday-klanten-module 1.0.80 → 1.0.82

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.
@@ -55,4 +55,68 @@ export declare function mergeSummary(p: MergePreview): {
55
55
  lines: string[];
56
56
  warnings: string[];
57
57
  };
58
+ export type GlnSource = "floriday" | "removed" | "ignored";
59
+ export type AvailableGln = {
60
+ gln: string;
61
+ name: string | null;
62
+ street?: string | null;
63
+ house_number?: string | null;
64
+ address_line?: string | null;
65
+ postal_code?: string | null;
66
+ city?: string | null;
67
+ country?: string | null;
68
+ floriday_location_id: string | null;
69
+ sources: GlnSource[];
70
+ removed_from_location_name: string | null;
71
+ same_address: boolean;
72
+ };
73
+ /** Ontdubbelen op GLN (voorrang Floriday > verwijderd > genegeerd, alle bronnen bewaard), zelfde adres eerst, dan naam. */
74
+ export declare function normalizeAvailable(rows: AvailableGln[]): AvailableGln[];
75
+ /** Zoeken op GLN, naam en plaats. */
76
+ export declare function filterAvailable(rows: AvailableGln[], query: string): AvailableGln[];
77
+ export declare function sourceLabel(r: AvailableGln): string;
78
+ export declare function shortAddress(r: {
79
+ street?: string | null;
80
+ house_number?: string | null;
81
+ address_line?: string | null;
82
+ postal_code?: string | null;
83
+ city?: string | null;
84
+ }): string;
85
+ export type LinkedGln = {
86
+ id: string;
87
+ gln: string;
88
+ is_primary: boolean;
89
+ source: "manual" | "floriday" | "merge" | "legacy";
90
+ };
91
+ export type GlnAdd = {
92
+ gln: string;
93
+ source: "floriday" | "manual";
94
+ floriday_location_id: string | null;
95
+ };
96
+ export type PendingGlns = {
97
+ add: GlnAdd[];
98
+ remove: string[];
99
+ primary: string | null;
100
+ };
101
+ export type GlnRow = {
102
+ key: string;
103
+ id: string | null;
104
+ gln: string;
105
+ is_primary: boolean;
106
+ source: LinkedGln["source"];
107
+ isNew: boolean;
108
+ };
109
+ export declare const emptyPending: () => PendingGlns;
110
+ export declare function pendingView(current: LinkedGln[], p: PendingGlns): GlnRow[];
111
+ export declare function pendingAdd(p: PendingGlns, current: LinkedGln[], a: GlnAdd): PendingGlns;
112
+ export declare function pendingRemove(p: PendingGlns, row: GlnRow): PendingGlns;
113
+ export declare const pendingSetPrimary: (p: PendingGlns, gln: string) => PendingGlns;
114
+ export declare const hasPending: (p: PendingGlns) => boolean;
115
+ /** GLN's op de kaart: rijen uit de GLN-tabel; zonder rijen de oude waarde in `gln`, zodat een GLN nooit onzichtbaar wordt. */
116
+ export declare function cardGlns<T extends {
117
+ gln: string;
118
+ }>(locationGln: string | null | undefined, rows: T[]): Array<T | {
119
+ legacy: true;
120
+ gln: string;
121
+ }>;
58
122
  //# sourceMappingURL=delivery-gln.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-gln.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-gln.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAErE;AAED,qDAAqD;AACrD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAMpE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMrD;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAIF,wBAAgB,UAAU,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAO3E;AAED,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,CAAC,SAAS,WAAW,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAY5E;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1I,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1I,IAAI,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAIF,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,CAAC,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAgBrF"}
1
+ {"version":3,"file":"delivery-gln.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-gln.ts"],"names":[],"mappings":"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"}
@@ -79,3 +79,77 @@ export function mergeSummary(p) {
79
79
  }
80
80
  return { lines, warnings };
81
81
  }
82
+ const PRIO = { floriday: 1, removed: 2, ignored: 3 };
83
+ /** Ontdubbelen op GLN (voorrang Floriday > verwijderd > genegeerd, alle bronnen bewaard), zelfde adres eerst, dan naam. */
84
+ export function normalizeAvailable(rows) {
85
+ const byGln = new Map();
86
+ for (const r of rows) {
87
+ const gln = normalizeGln(r.gln);
88
+ if (!gln)
89
+ continue;
90
+ const prev = byGln.get(gln);
91
+ const sources = [...new Set([...(prev?.sources ?? []), ...r.sources])].sort((a, b) => PRIO[a] - PRIO[b]);
92
+ const best = !prev || Math.min(...r.sources.map((s) => PRIO[s])) < Math.min(...prev.sources.map((s) => PRIO[s])) ? r : prev;
93
+ byGln.set(gln, {
94
+ ...best, gln, sources,
95
+ same_address: !!(prev?.same_address || r.same_address),
96
+ floriday_location_id: best.floriday_location_id ?? prev?.floriday_location_id ?? r.floriday_location_id ?? null,
97
+ removed_from_location_name: prev?.removed_from_location_name ?? r.removed_from_location_name ?? null,
98
+ });
99
+ }
100
+ return [...byGln.values()].sort((a, b) => Number(b.same_address) - Number(a.same_address)
101
+ || (a.name ?? "\uffff").localeCompare(b.name ?? "\uffff", "nl")
102
+ || a.gln.localeCompare(b.gln));
103
+ }
104
+ /** Zoeken op GLN, naam en plaats. */
105
+ export function filterAvailable(rows, query) {
106
+ const q = query.trim().toLowerCase();
107
+ if (!q)
108
+ return rows;
109
+ const digits = q.replace(/\s/g, "");
110
+ return rows.filter((r) => r.gln.includes(digits) || (r.name ?? "").toLowerCase().includes(q) || (r.city ?? "").toLowerCase().includes(q));
111
+ }
112
+ export function sourceLabel(r) {
113
+ const s = r.sources[0];
114
+ if (s === "floriday")
115
+ return "Floriday";
116
+ if (s === "removed")
117
+ return `Verwijderd bij ${r.removed_from_location_name ?? "een locatie"}`;
118
+ return "Genegeerd";
119
+ }
120
+ export function shortAddress(r) {
121
+ const street = r.street ? `${r.street} ${r.house_number ?? ""}`.trim() : r.address_line ?? "";
122
+ return [street, [r.postal_code, r.city].filter(Boolean).join(" ")].filter(Boolean).join(", ");
123
+ }
124
+ export const emptyPending = () => ({ add: [], remove: [], primary: null });
125
+ export function pendingView(current, p) {
126
+ const rows = [
127
+ ...current.filter((g) => !p.remove.includes(g.id)).map((g) => ({ key: g.id, id: g.id, gln: g.gln, is_primary: g.is_primary, source: g.source, isNew: false })),
128
+ ...p.add.map((a) => ({ key: `new-${a.gln}`, id: null, gln: a.gln, is_primary: false, source: a.source, isNew: true })),
129
+ ];
130
+ const primary = p.primary && rows.some((r) => r.gln === p.primary) ? p.primary
131
+ : rows.find((r) => r.is_primary)?.gln ?? rows[0]?.gln ?? null;
132
+ return rows.map((r) => ({ ...r, is_primary: r.gln === primary }));
133
+ }
134
+ export function pendingAdd(p, current, a) {
135
+ const gln = normalizeGln(a.gln);
136
+ const removed = current.find((g) => g.gln === gln && p.remove.includes(g.id));
137
+ if (removed)
138
+ return { ...p, remove: p.remove.filter((id) => id !== removed.id) };
139
+ if (pendingView(current, p).some((r) => r.gln === gln))
140
+ return p;
141
+ return { ...p, add: [...p.add, { ...a, gln }] };
142
+ }
143
+ export function pendingRemove(p, row) {
144
+ const next = row.isNew ? { ...p, add: p.add.filter((a) => a.gln !== row.gln) } : { ...p, remove: [...p.remove, row.id] };
145
+ return next.primary === row.gln ? { ...next, primary: null } : next;
146
+ }
147
+ export const pendingSetPrimary = (p, gln) => ({ ...p, primary: gln });
148
+ export const hasPending = (p) => p.add.length > 0 || p.remove.length > 0 || p.primary !== null;
149
+ /** GLN's op de kaart: rijen uit de GLN-tabel; zonder rijen de oude waarde in `gln`, zodat een GLN nooit onzichtbaar wordt. */
150
+ export function cardGlns(locationGln, rows) {
151
+ if (rows.length > 0)
152
+ return rows;
153
+ const v = (locationGln ?? "").trim();
154
+ return v ? [{ legacy: true, gln: v }] : [];
155
+ }
@@ -20,6 +20,18 @@ declare const locationSchema: z.ZodObject<{
20
20
  }>>;
21
21
  is_primary: z.ZodOptional<z.ZodBoolean>;
22
22
  self_pickup: z.ZodOptional<z.ZodBoolean>;
23
+ gln_changes: z.ZodOptional<z.ZodObject<{
24
+ add: z.ZodArray<z.ZodObject<{
25
+ gln: z.ZodString;
26
+ source: z.ZodEnum<{
27
+ manual: "manual";
28
+ floriday: "floriday";
29
+ }>;
30
+ floriday_location_id: z.ZodNullable<z.ZodString>;
31
+ }, z.core.$strip>>;
32
+ primary: z.ZodNullable<z.ZodString>;
33
+ remove: z.ZodArray<z.ZodString>;
34
+ }, z.core.$strip>>;
23
35
  }, z.core.$strip>;
24
36
  export type LocationInput = z.infer<typeof locationSchema>;
25
37
  /**
@@ -115,6 +127,15 @@ export declare const upsertDeliveryLocation: import("@tanstack/start-client-core
115
127
  carrier_assignment_source?: "none" | "auto" | "manual" | undefined;
116
128
  is_primary?: boolean | undefined;
117
129
  self_pickup?: boolean | undefined;
130
+ gln_changes?: {
131
+ add: {
132
+ gln: string;
133
+ source: "manual" | "floriday";
134
+ floriday_location_id: string | null;
135
+ }[];
136
+ primary: string | null;
137
+ remove: string[];
138
+ } | undefined;
118
139
  }, Promise<{
119
140
  location: any;
120
141
  }>>;
@@ -184,12 +205,27 @@ export declare const addLocationGln: import("@tanstack/start-client-core").Requi
184
205
  }, undefined, undefined, undefined>], (input: {
185
206
  location_id: string;
186
207
  gln: string;
208
+ source?: "floriday" | "manual";
209
+ floriday_location_id?: string | null;
187
210
  }) => {
188
211
  location_id: string;
189
212
  gln: string;
213
+ source?: "manual" | "floriday" | undefined;
214
+ floriday_location_id?: string | null | undefined;
190
215
  }, Promise<GlnConflict | {
191
216
  ok: true;
192
217
  }>>;
218
+ export declare const listAvailableGlns: import("@tanstack/start-client-core").RequiredFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
219
+ supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
220
+ userId: string;
221
+ claims: import("@supabase/auth-js").JwtPayload;
222
+ }, undefined, undefined, undefined>], (input: {
223
+ customer_id: string;
224
+ location_id?: string | null;
225
+ }) => {
226
+ customer_id: string;
227
+ location_id?: string | null | undefined;
228
+ }, Promise<import("./delivery-gln.js").AvailableGln[]>>;
193
229
  export declare const removeLocationGln: import("@tanstack/start-client-core").RequiredFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
194
230
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
195
231
  userId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-locations.functions.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-locations.functions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delivery-locations.functions.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-locations.functions.ts"],"names":[],"mappings":"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"}
@@ -22,6 +22,16 @@ const locationSchema = z.object({
22
22
  carrier_assignment_source: z.enum(["auto", "manual", "none"]).optional(),
23
23
  is_primary: z.boolean().optional(),
24
24
  self_pickup: z.boolean().optional(),
25
+ // GLN-wijzigingen uit "Locatie bewerken"; samen met de velden in één transactie opgeslagen.
26
+ gln_changes: z.object({
27
+ add: z.array(z.object({
28
+ gln: z.string().trim().min(1).max(32),
29
+ source: z.enum(["floriday", "manual"]),
30
+ floriday_location_id: z.string().max(200).nullable(),
31
+ })).max(50),
32
+ primary: z.string().trim().max(32).nullable(),
33
+ remove: z.array(z.string().uuid()).max(50),
34
+ }).optional(),
25
35
  }).refine((v) => !!v.group_key || !!v.customer_id || (!!v.external_provider && !!v.external_key), { message: "Klantreferentie ontbreekt" });
26
36
  function norm(value) {
27
37
  return (value ?? "").trim().toLowerCase();
@@ -146,6 +156,16 @@ export const upsertDeliveryLocation = createServerFn({ method: "POST" })
146
156
  is_primary: false,
147
157
  self_pickup,
148
158
  };
159
+ if (data.gln_changes) {
160
+ // Alles of niets in één databasefunctie: velden, toevoegen, primair, verwijderen.
161
+ const { data: saved, error } = await supabase.rpc("save_delivery_location_with_glns", {
162
+ p_location_id: data.id ?? null, p_fields: payload, p_make_primary: !!data.is_primary,
163
+ p_add: data.gln_changes.add, p_primary_gln: data.gln_changes.primary, p_remove: data.gln_changes.remove,
164
+ });
165
+ if (error)
166
+ throw new Error(error.message);
167
+ return { location: { ...saved, is_primary: !!data.is_primary } };
168
+ }
149
169
  const makePrimary = async (id) => {
150
170
  const { error } = await supabase.rpc("set_primary_delivery_location", { p_location_id: id });
151
171
  if (error)
@@ -222,9 +242,15 @@ export const locationShipmentCount = createServerFn({ method: "POST" })
222
242
  });
223
243
  export const addLocationGln = createServerFn({ method: "POST" })
224
244
  .middleware([requireSupabaseAuth])
225
- .inputValidator((input) => z.object({ location_id: z.string().uuid(), gln: z.string().trim().min(1).max(32) }).parse(input))
245
+ .inputValidator((input) => z.object({
246
+ location_id: z.string().uuid(), gln: z.string().trim().min(1).max(32),
247
+ source: z.enum(["floriday", "manual"]).optional(), floriday_location_id: z.string().max(200).nullable().optional(),
248
+ }).parse(input))
226
249
  .handler(async ({ data, context }) => {
227
- const { error } = await context.supabase.rpc("add_delivery_location_gln", { p_location_id: data.location_id, p_gln: data.gln });
250
+ const { error } = await context.supabase.rpc("add_delivery_location_gln", {
251
+ p_location_id: data.location_id, p_gln: data.gln,
252
+ p_source: data.source ?? "manual", p_floriday_location_id: data.floriday_location_id ?? null,
253
+ });
228
254
  if (error) {
229
255
  if (error.code === "23505")
230
256
  return { conflict: true, message: error.message, location_id: error.hint ?? null };
@@ -232,6 +258,17 @@ export const addLocationGln = createServerFn({ method: "POST" })
232
258
  }
233
259
  return { ok: true };
234
260
  });
261
+ export const listAvailableGlns = createServerFn({ method: "POST" })
262
+ .middleware([requireSupabaseAuth])
263
+ .inputValidator((input) => z.object({ customer_id: z.string().uuid(), location_id: z.string().uuid().nullable().optional() }).parse(input))
264
+ .handler(async ({ data, context }) => {
265
+ const { data: rows, error } = await context.supabase.rpc("list_available_glns_for_customer", {
266
+ p_customer_id: data.customer_id, p_location_id: data.location_id ?? null,
267
+ });
268
+ if (error)
269
+ throw new Error(error.message);
270
+ return (rows ?? []);
271
+ });
235
272
  export const removeLocationGln = createServerFn({ method: "POST" })
236
273
  .middleware([requireSupabaseAuth])
237
274
  .inputValidator((input) => z.object({ id: z.string().uuid() }).parse(input))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowselections/floriday-klanten-module",
3
- "version": "1.0.80",
3
+ "version": "1.0.82",
4
4
  "private": false,
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -1078,7 +1078,7 @@ BEGIN
1078
1078
  'import_floriday_delivery_locations','refresh_external_customers_grouped','enqueue_twinfield_push'] LOOP
1079
1079
  IF NOT EXISTS (SELECT 1 FROM pg_proc WHERE proname=_o AND pronamespace='public'::regnamespace) THEN _missing := _missing || (_o||'()'); END IF;
1080
1080
  END LOOP;
1081
- FOR _r IN SELECT v.naam, v.niveau, p.oid AS oid, p.prosrc FROM (VALUES ('import_floriday_delivery_locations','ingelogd'),('next_twinfield_code','ingelogd'),('refresh_floriday_delivery_locations','ingelogd'),('reorder_customer_price_groups','ingelogd'),('retry_twinfield_push','ingelogd'),('set_primary_delivery_location','ingelogd'),('sync_floriday_prices_into_price_groups','ingelogd'),('klanten_auto_promote_status','ingelogd'),('klanten_refresh_grouped_if_stale','ingelogd'),('floriday_effective_price','ingelogd'),('has_twinfield_link','ingelogd'),('local_effective_price','ingelogd'),('refresh_external_customers_grouped','ingelogd'),('floriday_customer_candidates','ingelogd'),('floriday_customer_promotion_preview','ingelogd'),('klanten_install_check','ingelogd'),('klanten_gln_backfill_report','ingelogd'),('resolve_delivery_location_by_gln','ingelogd'),('add_delivery_location_gln','ingelogd'),('remove_delivery_location_gln','ingelogd'),('set_primary_delivery_location_gln','ingelogd'),('klanten_locaties_samenvoegen_aan','ingelogd'),('klanten_locatie_zendingen','ingelogd'),('merge_preview','ingelogd'),('merge_customer_delivery_locations','ingelogd'),('delete_customer_delivery_location','ingelogd'),('klanten_set_locaties_samenvoegen','beheerder'),('klanten_gln_norm','open'),('klanten_gln_geldig','open'),('klanten_gln_naar_locatie','trigger'),('klanten_locatie_naar_gln','trigger'),('schedule_floriday_network_sync','beheerder'),('klanten_set_auto_promote','beheerder'),('klanten_promote_round','beheerder'),('promote_floriday_customer','beheerder'),('klanten_ensure_cron','beheerder'),('klanten_set_provider_enabled','beheerder'),('run_twinfield_queue_tick','server'),('twinfield_sync_apply','server'),('twinfield_sync_insert','server'),('twinfield_sync_mark_missing','server'),('promote_floriday_order_customers','server'),('klanten_correctie_landcodes','server'),('customer_soft_key','open'),('server_now','open'),('klanten_is_server','open'),('klanten_toegang','open'),('klanten_landnaam_kandidaten','open'),('enqueue_twinfield_push','trigger'),('log_customer_changes','trigger'),('tg_customer_price_groups_touch','trigger'),('trg_floriday_delivery_location_import','trigger'),('trg_refresh_external_customers_grouped','trigger'),('validate_twinfield_required_fields','trigger')) v(naam, niveau)
1081
+ FOR _r IN SELECT v.naam, v.niveau, p.oid AS oid, p.prosrc FROM (VALUES ('import_floriday_delivery_locations','ingelogd'),('next_twinfield_code','ingelogd'),('refresh_floriday_delivery_locations','ingelogd'),('reorder_customer_price_groups','ingelogd'),('retry_twinfield_push','ingelogd'),('set_primary_delivery_location','ingelogd'),('sync_floriday_prices_into_price_groups','ingelogd'),('klanten_auto_promote_status','ingelogd'),('klanten_refresh_grouped_if_stale','ingelogd'),('floriday_effective_price','ingelogd'),('has_twinfield_link','ingelogd'),('local_effective_price','ingelogd'),('refresh_external_customers_grouped','ingelogd'),('floriday_customer_candidates','ingelogd'),('floriday_customer_promotion_preview','ingelogd'),('klanten_install_check','ingelogd'),('klanten_gln_backfill_report','ingelogd'),('resolve_delivery_location_by_gln','ingelogd'),('add_delivery_location_gln','ingelogd'),('list_available_glns_for_customer','ingelogd'),('save_delivery_location_with_glns','ingelogd'),('klanten_adres_sleutel','open'),('remove_delivery_location_gln','ingelogd'),('set_primary_delivery_location_gln','ingelogd'),('klanten_locaties_samenvoegen_aan','ingelogd'),('klanten_locatie_zendingen','ingelogd'),('merge_preview','ingelogd'),('merge_customer_delivery_locations','ingelogd'),('delete_customer_delivery_location','ingelogd'),('klanten_set_locaties_samenvoegen','beheerder'),('klanten_gln_norm','open'),('klanten_gln_geldig','open'),('klanten_gln_naar_locatie','trigger'),('klanten_locatie_naar_gln','trigger'),('schedule_floriday_network_sync','beheerder'),('klanten_set_auto_promote','beheerder'),('klanten_promote_round','beheerder'),('promote_floriday_customer','beheerder'),('klanten_ensure_cron','beheerder'),('klanten_set_provider_enabled','beheerder'),('run_twinfield_queue_tick','server'),('twinfield_sync_apply','server'),('twinfield_sync_insert','server'),('twinfield_sync_mark_missing','server'),('promote_floriday_order_customers','server'),('klanten_correctie_landcodes','server'),('customer_soft_key','open'),('server_now','open'),('klanten_is_server','open'),('klanten_toegang','open'),('klanten_landnaam_kandidaten','open'),('enqueue_twinfield_push','trigger'),('log_customer_changes','trigger'),('tg_customer_price_groups_touch','trigger'),('trg_floriday_delivery_location_import','trigger'),('trg_refresh_external_customers_grouped','trigger'),('validate_twinfield_required_fields','trigger')) v(naam, niveau)
1082
1082
  LEFT JOIN pg_proc p ON p.proname = v.naam AND p.pronamespace = 'public'::regnamespace ORDER BY v.niveau, v.naam LOOP
1083
1083
  _f := _f || jsonb_build_object('functie', _r.naam, 'niveau',
1084
1084
  CASE _r.niveau WHEN 'open' THEN 'bewust open (hulpfunctie zonder gegevens)'
@@ -2615,9 +2615,10 @@ BEGIN
2615
2615
  END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.resolve_delivery_location_by_gln(p_customer_id uuid, p_gln text) R');
2616
2616
  SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.resolve_delivery_location_by_gln(uuid, text) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.resolve_delivery_location_by_gln(uuid, text) FROM PUBLIC, anon');
2617
2617
  SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.resolve_delivery_location_by_gln(uuid, text) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.resolve_delivery_location_by_gln(uuid, text) TO authenticated, serv');
2618
- SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.add_delivery_location_gln(p_location_id uuid, p_gln text)
2618
+ SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.add_delivery_location_gln(p_location_id uuid, p_gln text, p_source text, p_floriday_location_id text)
2619
2619
  RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public AS $f$
2620
2620
  DECLARE _l record; _v text := klanten_gln_norm(p_gln); _r record; _naam text; _heeft_primair boolean; _id uuid;
2621
+ _fl boolean := p_source = 'floriday'; _flid text := NULLIF(btrim(p_floriday_location_id), '');
2621
2622
  BEGIN
2622
2623
  PERFORM public.klanten_toegang('ingelogd');
2623
2624
  SELECT * INTO _l FROM customer_delivery_locations WHERE id = p_location_id;
@@ -2632,13 +2633,25 @@ BEGIN
2632
2633
  END IF;
2633
2634
  _heeft_primair := EXISTS (SELECT 1 FROM customer_delivery_location_glns WHERE location_id = p_location_id AND is_primary AND removed_at IS NULL);
2634
2635
  IF _r.id IS NOT NULL THEN
2635
- UPDATE customer_delivery_location_glns SET location_id = p_location_id, removed_at = NULL, is_primary = NOT _heeft_primair
2636
+ UPDATE customer_delivery_location_glns SET location_id = p_location_id, removed_at = NULL, is_primary = NOT _heeft_primair,
2637
+ source = CASE WHEN _fl THEN 'floriday' ELSE source END,
2638
+ floriday_location_id = COALESCE(_flid, floriday_location_id)
2636
2639
  WHERE id = _r.id RETURNING id INTO _id;
2637
2640
  ELSE
2638
- INSERT INTO customer_delivery_location_glns (customer_id, location_id, gln, is_primary, source)
2639
- VALUES (_l.customer_id, p_location_id, _v, NOT _heeft_primair, 'manual') RETURNING id INTO _id;
2641
+ INSERT INTO customer_delivery_location_glns (customer_id, location_id, gln, is_primary, source, floriday_location_id)
2642
+ VALUES (_l.customer_id, p_location_id, _v, NOT _heeft_primair, CASE WHEN _fl THEN 'floriday' ELSE 'manual' END, CASE WHEN _fl THEN _flid END)
2643
+ RETURNING id INTO _id;
2640
2644
  END IF;
2645
+ DELETE FROM customer_delivery_location_ignored WHERE customer_id = _l.customer_id AND klanten_gln_norm(gln) = _v;
2641
2646
  RETURN (SELECT to_jsonb(g) FROM customer_delivery_location_glns g WHERE id = _id);
2647
+ END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.add_delivery_location_gln(p_location_id uuid, p_gln text, p_source');
2648
+ SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.add_delivery_location_gln(uuid, text, text, text) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.add_delivery_location_gln(uuid, text, text, text) FROM PUBLIC, anon');
2649
+ SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.add_delivery_location_gln(uuid, text, text, text) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.add_delivery_location_gln(uuid, text, text, text) TO authenticated,');
2650
+ SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.add_delivery_location_gln(p_location_id uuid, p_gln text)
2651
+ RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public AS $f$
2652
+ BEGIN
2653
+ PERFORM public.klanten_toegang('ingelogd');
2654
+ RETURN public.add_delivery_location_gln(p_location_id, p_gln, NULL::text, NULL::text);
2642
2655
  END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.add_delivery_location_gln(p_location_id uuid, p_gln text) RETURNS ');
2643
2656
  SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.add_delivery_location_gln(uuid, text) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.add_delivery_location_gln(uuid, text) FROM PUBLIC, anon');
2644
2657
  SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.add_delivery_location_gln(uuid, text) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.add_delivery_location_gln(uuid, text) TO authenticated, service_rol');
@@ -2678,6 +2691,114 @@ BEGIN
2678
2691
  END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.set_primary_delivery_location_gln(p_gln_id uuid) RETURNS jsonb LAN');
2679
2692
  SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.set_primary_delivery_location_gln(uuid) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.set_primary_delivery_location_gln(uuid) FROM PUBLIC, anon');
2680
2693
  SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.set_primary_delivery_location_gln(uuid) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.set_primary_delivery_location_gln(uuid) TO authenticated, service_r');
2694
+ SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_adres_sleutel(p_street text, p_house text, p_line text, p_postal text, p_country text)
2695
+ RETURNS text LANGUAGE sql IMMUTABLE SET search_path = public AS $f$
2696
+ SELECT CASE WHEN x.s <> '' AND x.p <> '' THEN x.s || '|' || x.p || '|' || x.c END FROM (SELECT
2697
+ regexp_replace(lower(CASE WHEN COALESCE(p_street, '') <> '' THEN p_street || ' ' || COALESCE(p_house, '') ELSE COALESCE(p_line, '') END), '[^a-z0-9]', '', 'g') AS s,
2698
+ regexp_replace(lower(COALESCE(p_postal, '')), '[^a-z0-9]', '', 'g') AS p,
2699
+ regexp_replace(lower(COALESCE(p_country, '')), '[^a-z0-9]', '', 'g') AS c) x
2700
+ $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_adres_sleutel(p_street text, p_house text, p_line text, p_');
2701
+ SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.list_available_glns_for_customer(p_customer_id uuid, p_location_id uuid DEFAULT NULL)
2702
+ RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public AS $f$
2703
+ DECLARE _org text; _key text; _fl jsonb := '[]'::jsonb; _res jsonb;
2704
+ BEGIN
2705
+ PERFORM public.klanten_toegang('ingelogd');
2706
+ IF p_customer_id IS NULL THEN RETURN '[]'::jsonb; END IF;
2707
+ SELECT NULLIF(btrim(floriday_organization_id), '') INTO _org FROM customers WHERE id = p_customer_id;
2708
+ IF p_location_id IS NOT NULL THEN
2709
+ SELECT klanten_adres_sleutel(street, house_number, address_line, postal_code, country) INTO _key
2710
+ FROM customer_delivery_locations WHERE id = p_location_id AND customer_id = p_customer_id;
2711
+ END IF;
2712
+ IF _org IS NOT NULL AND to_regclass('public.floriday_delivery_locations_cache') IS NOT NULL THEN
2713
+ EXECUTE $q$
2714
+ SELECT COALESCE(jsonb_agg(jsonb_build_object(
2715
+ 'gln', klanten_gln_norm(c.gln_code), 'name', COALESCE(NULLIF(c.name, ''), c.data->>'name'),
2716
+ 'address_line', x.a->>'addressLine', 'postal_code', x.a->>'postalCode', 'city', x.a->>'city', 'country', x.a->>'countryCode',
2717
+ 'floriday_location_id', COALESCE(NULLIF(c.floriday_id, ''), c.data->>'locationId', c.id::text))), '[]'::jsonb)
2718
+ FROM public.floriday_delivery_locations_cache c,
2719
+ LATERAL (SELECT COALESCE(c.data->'address', c.data->'physicalAddress', c.data) AS a) x
2720
+ WHERE c.organization_id = $1 AND COALESCE(c.is_deleted, false) = false
2721
+ AND COALESCE(klanten_gln_geldig(klanten_gln_norm(c.gln_code)), false)$q$ INTO _fl USING _org;
2722
+ END IF;
2723
+ WITH b AS (
2724
+ SELECT e->>'gln' AS gln, 1 AS prio, 'floriday' AS src, e->>'name' AS naam, NULL::text AS street, NULL::text AS hn,
2725
+ e->>'address_line' AS line, e->>'postal_code' AS pc, e->>'city' AS city, e->>'country' AS country,
2726
+ e->>'floriday_location_id' AS flid, NULL::text AS van
2727
+ FROM jsonb_array_elements(_fl) e
2728
+ UNION ALL
2729
+ SELECT g.gln, 2, 'removed', l.name, l.street, l.house_number, l.address_line, l.postal_code, l.city, l.country,
2730
+ g.floriday_location_id, COALESCE(NULLIF(l.name, ''), NULLIF(l.address_line, ''), 'een locatie')
2731
+ FROM customer_delivery_location_glns g JOIN customer_delivery_locations l ON l.id = g.location_id
2732
+ WHERE g.customer_id = p_customer_id AND g.removed_at IS NOT NULL
2733
+ UNION ALL
2734
+ SELECT klanten_gln_norm(i.gln), 3, 'ignored', NULL, NULL, NULL, NULL, NULL, NULL, NULL, i.floriday_location_id, NULL
2735
+ FROM customer_delivery_location_ignored i
2736
+ WHERE i.customer_id = p_customer_id AND COALESCE(klanten_gln_geldig(klanten_gln_norm(i.gln)), false)
2737
+ ), vrij AS (
2738
+ SELECT * FROM b WHERE b.gln IS NOT NULL AND NOT EXISTS (
2739
+ SELECT 1 FROM customer_delivery_location_glns a
2740
+ WHERE a.customer_id = p_customer_id AND a.gln = b.gln AND a.removed_at IS NULL)
2741
+ ), per AS (
2742
+ SELECT DISTINCT ON (gln) * FROM vrij ORDER BY gln, prio
2743
+ ), uit AS (
2744
+ SELECT p.*, COALESCE(_key IS NOT NULL AND klanten_adres_sleutel(p.street, p.hn, p.line, p.pc, p.country) = _key, false) AS same
2745
+ FROM per p
2746
+ )
2747
+ SELECT COALESCE(jsonb_agg(jsonb_build_object(
2748
+ 'gln', u.gln, 'name', u.naam, 'street', u.street, 'house_number', u.hn, 'address_line', u.line,
2749
+ 'postal_code', u.pc, 'city', u.city, 'country', u.country,
2750
+ 'floriday_location_id', (SELECT v.flid FROM vrij v WHERE v.gln = u.gln AND v.flid IS NOT NULL ORDER BY v.prio LIMIT 1),
2751
+ 'sources', (SELECT jsonb_agg(s.src ORDER BY s.prio) FROM (SELECT DISTINCT v.src, v.prio FROM vrij v WHERE v.gln = u.gln) s),
2752
+ 'removed_from_location_name', (SELECT v.van FROM vrij v WHERE v.gln = u.gln AND v.src = 'removed' LIMIT 1),
2753
+ 'same_address', u.same)
2754
+ ORDER BY u.same DESC, lower(u.naam) NULLS LAST, u.gln), '[]'::jsonb)
2755
+ INTO _res FROM uit u;
2756
+ RETURN _res;
2757
+ END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.list_available_glns_for_customer(p_customer_id uuid, p_location_id');
2758
+ SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.list_available_glns_for_customer(uuid, uuid) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.list_available_glns_for_customer(uuid, uuid) FROM PUBLIC, anon');
2759
+ SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.list_available_glns_for_customer(uuid, uuid) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.list_available_glns_for_customer(uuid, uuid) TO authenticated, serv');
2760
+ SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.save_delivery_location_with_glns(
2761
+ p_location_id uuid, p_fields jsonb, p_make_primary boolean, p_add jsonb, p_primary_gln text, p_remove uuid[])
2762
+ RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public AS $f$
2763
+ DECLARE _id uuid; _e jsonb; _g uuid; _r uuid;
2764
+ BEGIN
2765
+ PERFORM public.klanten_toegang('ingelogd');
2766
+ IF p_location_id IS NULL THEN
2767
+ INSERT INTO customer_delivery_locations (customer_id, group_key, external_provider, external_key, name, street, house_number,
2768
+ address_line, postal_code, city, province, country, carrier_id, carrier_assignment_source, is_primary, self_pickup)
2769
+ SELECT r.customer_id, r.group_key, r.external_provider, r.external_key, r.name, r.street, r.house_number,
2770
+ r.address_line, r.postal_code, r.city, r.province, r.country, r.carrier_id, r.carrier_assignment_source, false, COALESCE(r.self_pickup, false)
2771
+ FROM jsonb_populate_record(NULL::customer_delivery_locations, p_fields) r
2772
+ RETURNING id INTO _id;
2773
+ ELSE
2774
+ UPDATE customer_delivery_locations l SET name = r.name, street = r.street, house_number = r.house_number,
2775
+ address_line = r.address_line, postal_code = r.postal_code, city = r.city, province = r.province, country = r.country,
2776
+ carrier_id = r.carrier_id, carrier_assignment_source = r.carrier_assignment_source,
2777
+ self_pickup = COALESCE(r.self_pickup, false), updated_at = now()
2778
+ FROM jsonb_populate_record(NULL::customer_delivery_locations, p_fields) r
2779
+ WHERE l.id = p_location_id RETURNING l.id INTO _id;
2780
+ IF _id IS NULL THEN RAISE EXCEPTION 'Locatie niet gevonden'; END IF;
2781
+ END IF;
2782
+ FOR _e IN SELECT * FROM jsonb_array_elements(COALESCE(p_add, '[]'::jsonb)) LOOP
2783
+ PERFORM public.add_delivery_location_gln(_id, _e->>'gln', _e->>'source', _e->>'floriday_location_id');
2784
+ END LOOP;
2785
+ IF NULLIF(btrim(p_primary_gln), '') IS NOT NULL THEN
2786
+ SELECT id INTO _g FROM customer_delivery_location_glns
2787
+ WHERE location_id = _id AND gln = klanten_gln_norm(p_primary_gln) AND removed_at IS NULL;
2788
+ IF _g IS NULL THEN RAISE EXCEPTION 'GLN % staat niet bij deze locatie', p_primary_gln; END IF;
2789
+ PERFORM public.set_primary_delivery_location_gln(_g);
2790
+ END IF;
2791
+ FOREACH _r IN ARRAY COALESCE(p_remove, '{}'::uuid[]) LOOP
2792
+ IF NOT EXISTS (SELECT 1 FROM customer_delivery_location_glns WHERE id = _r AND location_id = _id) THEN
2793
+ RAISE EXCEPTION 'GLN hoort niet bij deze locatie';
2794
+ END IF;
2795
+ PERFORM public.remove_delivery_location_gln(_r);
2796
+ END LOOP;
2797
+ IF p_make_primary THEN PERFORM public.set_primary_delivery_location(_id); END IF;
2798
+ RETURN (SELECT to_jsonb(l) FROM customer_delivery_locations l WHERE id = _id);
2799
+ END $f$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.save_delivery_location_with_glns( p_location_id uuid, p_fields jso');
2800
+ SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.save_delivery_location_with_glns(uuid, jsonb, boolean, jsonb, text, uuid[]) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.save_delivery_location_with_glns(uuid, jsonb, boolean, jsonb, text, uu');
2801
+ SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.save_delivery_location_with_glns(uuid, jsonb, boolean, jsonb, text, uuid[]) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.save_delivery_location_with_glns(uuid, jsonb, boolean, jsonb, text,');
2681
2802
  SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_locaties_samenvoegen_aan()
2682
2803
  RETURNS boolean LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public AS $f$
2683
2804
  DECLARE _aan boolean;