@flowselections/floriday-klanten-module 1.0.104 → 1.0.105
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.
- package/dist-lib/components/klanten/CustomerAssortmentTab.d.ts +3 -1
- package/dist-lib/components/klanten/CustomerAssortmentTab.d.ts.map +1 -1
- package/dist-lib/components/klanten/CustomerAssortmentTab.js +37 -9
- package/dist-lib/components/klanten/CustomerStickerCell.d.ts +6 -1
- package/dist-lib/components/klanten/CustomerStickerCell.d.ts.map +1 -1
- package/dist-lib/components/klanten/CustomerStickerCell.js +4 -3
- package/dist-lib/components/klanten/KlantDetail.d.ts.map +1 -1
- package/dist-lib/components/klanten/KlantDetail.js +11 -1
- package/dist-lib/components/klanten/StickerSizeLine.d.ts +6 -1
- package/dist-lib/components/klanten/StickerSizeLine.d.ts.map +1 -1
- package/dist-lib/components/klanten/StickerSizeLine.js +9 -3
- package/dist-lib/integrations/supabase/types.d.ts +211 -1
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/customer-stickers.functions.d.ts +6 -0
- package/dist-lib/lib/customer-stickers.functions.d.ts.map +1 -1
- package/dist-lib/lib/customer-stickers.functions.js +54 -0
- package/package.json +7 -1
- package/schema/klanten.sql +103 -3
|
@@ -37,6 +37,11 @@ export declare const listStickerFormaten: import("@tanstack/start-client-core").
|
|
|
37
37
|
claims: import("@supabase/auth-js").JwtPayload;
|
|
38
38
|
}, undefined, undefined, undefined>], undefined, Promise<StickerFormatenResultaat>>;
|
|
39
39
|
export type StickerUploadSize = Pick<StickerSizeResult, "method" | "size" | "suggestion">;
|
|
40
|
+
/**
|
|
41
|
+
* Stickers staan onder products.id. Een oude sleutel (Floriday-handelsartikel-id of
|
|
42
|
+
* products.trade_item_key) wordt omgezet als er precies 1 product bij hoort; anders weigeren.
|
|
43
|
+
*/
|
|
44
|
+
export declare function stickerProductSleutel(sb: any, key: string): Promise<string>;
|
|
40
45
|
/** Kern van listCustomerStickers (los aanroepbaar voor tests). */
|
|
41
46
|
export declare function listCustomerStickersKern(data: any, context: any): Promise<CustomerStickersResult>;
|
|
42
47
|
export declare const listCustomerStickers: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
@@ -58,6 +63,7 @@ export declare const confirmStickerUpload: import("@tanstack/start-client-core")
|
|
|
58
63
|
fileName: string;
|
|
59
64
|
mimeType: string;
|
|
60
65
|
soort: "product" | "fust";
|
|
66
|
+
oudeSleutel?: string | null | undefined;
|
|
61
67
|
fileSize?: number | null | undefined;
|
|
62
68
|
}, Promise<{
|
|
63
69
|
method: import("./sticker-size.js").SizeMethod;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-stickers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.functions.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAepD,eAAO,MAAM,oBAAoB,0EAKvB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpE,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AA+CF;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAsBpF;AAOD,8EAA8E;AAC9E,eAAO,MAAM,mBAAmB;;;;mFAEoF,CAAC;AAarH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"customer-stickers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.functions.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAepD,eAAO,MAAM,oBAAoB,0EAKvB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpE,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AA+CF;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAsBpF;AAOD,8EAA8E;AAC9E,eAAO,MAAM,mBAAmB;;;;mFAEoF,CAAC;AAarH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC;AAG1F;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBjF;AAOD,kEAAkE;AAClE,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAsCvG;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;mCAG+C,CAAC;AAEjF,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;;;;;;;;;;;;;;GAgF7B,CAAC;AAEL,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;;;GAyB7B,CAAC;AAEL,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;iCAa7B,CAAC;AAEL,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;GAuB7B,CAAC;AAEL;;;GAGG;AACH,gEAAgE;AAChE,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;;eAoBpC,MAAM;eACI,MAAM,GAAG,IAAI;;;UAItD;AAED,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;eATD,MAAM;eACI,MAAM,GAAG,IAAI;;;UAauB,CAAC;AAS/E,eAAO,MAAM,cAAc,GAAI,GAAG,MAAM,WAAuC,CAAC;AAEhF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IACzE,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;CACjH,CAAC;AAEF,gGAAgG;AAChG,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAClC,OAAO,CAAC;IAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAoM7E;AAED,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;;;;;;;;;;;iBAxMP,sBAAsB,EAAE;cAAY,MAAM,GAAG,IAAI;GAoOI,CAAC;AAEhF,gEAAgE;AAChE,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;;;;;kBASxC,MAAM;gBAAU,MAAM;;;kBACtB,MAAM;sBAAgB,MAAM;;GAyEvD;AAED,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;;;;;;;;;;kBA9EL,MAAM;gBAAU,MAAM;;;kBACtB,MAAM;sBAAgB,MAAM;;GAkGsB,CAAC;AAE/E,eAAO,MAAM,mBAAmB;;;;8CAEN,OAAO;;;;;GAU7B,CAAC;AAGL,0EAA0E;AAC1E,eAAO,MAAM,cAAc;;;;8CAED,OAAO;;;;;;;;GAsB7B,CAAC;AAEL,6EAA6E;AAC7E,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;8BAc7B,CAAC;AAEL,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,yGAAyG;AACzG,eAAO,MAAM,mBAAmB;;;;kFA8B5B,CAAC"}
|
|
@@ -125,6 +125,38 @@ async function detectForPath(sb, path, mime, labels) {
|
|
|
125
125
|
return { method: "onbekend", size: null, suggestion: null };
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
* Stickers staan onder products.id. Een oude sleutel (Floriday-handelsartikel-id of
|
|
130
|
+
* products.trade_item_key) wordt omgezet als er precies 1 product bij hoort; anders weigeren.
|
|
131
|
+
*/
|
|
132
|
+
export async function stickerProductSleutel(sb, key) {
|
|
133
|
+
const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(key);
|
|
134
|
+
if (isUuid) {
|
|
135
|
+
const { data, error } = await sb.from("products").select("id").eq("id", key).limit(1);
|
|
136
|
+
if (error) {
|
|
137
|
+
if (isTabelOntbreekt(error))
|
|
138
|
+
return key;
|
|
139
|
+
throw new Error(error.message);
|
|
140
|
+
}
|
|
141
|
+
if ((data ?? []).length > 0)
|
|
142
|
+
return key;
|
|
143
|
+
}
|
|
144
|
+
const { data, error } = await sb
|
|
145
|
+
.from("products")
|
|
146
|
+
.select("id")
|
|
147
|
+
.or(`floriday_trade_item_id.eq.${key},trade_item_key.eq.${key}`)
|
|
148
|
+
.limit(2);
|
|
149
|
+
if (error) {
|
|
150
|
+
if (isTabelOntbreekt(error))
|
|
151
|
+
return key;
|
|
152
|
+
throw new Error(error.message);
|
|
153
|
+
}
|
|
154
|
+
if ((data ?? []).length === 1)
|
|
155
|
+
return String(data[0].id);
|
|
156
|
+
throw new Error((data ?? []).length === 0
|
|
157
|
+
? "Dit artikel staat niet in de voorraad. Kies een artikel uit de lijst."
|
|
158
|
+
: "Bij dit artikel horen meerdere producten. Kies het artikel opnieuw uit de lijst.");
|
|
159
|
+
}
|
|
128
160
|
async function signed(sb, path) {
|
|
129
161
|
const { data } = await sb.storage.from(BUCKET).createSignedUrl(path, SIGNED_TTL);
|
|
130
162
|
return data?.signedUrl ?? null;
|
|
@@ -174,6 +206,8 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
|
|
|
174
206
|
.object({
|
|
175
207
|
customerKey: z.string().min(1),
|
|
176
208
|
tradeItemKey: z.string().min(1),
|
|
209
|
+
/** Oude sleutel van dezelfde sticker (bv. Floriday-id); die rij wordt na opslaan opgeruimd. */
|
|
210
|
+
oudeSleutel: z.string().min(1).nullable().optional(),
|
|
177
211
|
filePath: z.string().min(1),
|
|
178
212
|
fileName: z.string().min(1),
|
|
179
213
|
mimeType: z.string().min(1),
|
|
@@ -184,6 +218,7 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
|
|
|
184
218
|
.handler(async ({ data, context }) => {
|
|
185
219
|
const sb = context.supabase;
|
|
186
220
|
const tabel = stickerTabel(data.soort);
|
|
221
|
+
data = { ...data, tradeItemKey: await stickerProductSleutel(sb, data.tradeItemKey) };
|
|
187
222
|
if (!ALLOWED_STICKER_MIME.includes(data.mimeType)) {
|
|
188
223
|
throw new Error("Dit bestandstype wordt niet ondersteund. Gebruik PDF, PNG, JPG of SVG.");
|
|
189
224
|
}
|
|
@@ -223,6 +258,25 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
|
|
|
223
258
|
if (existing?.file_path && existing.file_path !== data.filePath) {
|
|
224
259
|
await sb.storage.from(BUCKET).remove([existing.file_path]);
|
|
225
260
|
}
|
|
261
|
+
if (data.oudeSleutel && data.oudeSleutel !== data.tradeItemKey) {
|
|
262
|
+
const { data: oud, error: oudErr } = await sb
|
|
263
|
+
.from(tabel)
|
|
264
|
+
.delete()
|
|
265
|
+
.eq("customer_key", data.customerKey)
|
|
266
|
+
.eq("trade_item_key", data.oudeSleutel)
|
|
267
|
+
.select("file_path");
|
|
268
|
+
if (oudErr) {
|
|
269
|
+
console.error("Oude stickerrij niet opgeruimd", oudErr);
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
const paden = (oud ?? []).map((r) => r.file_path).filter((p) => p && p !== data.filePath);
|
|
273
|
+
if (paden.length) {
|
|
274
|
+
const { error: rmErr } = await sb.storage.from(BUCKET).remove(paden);
|
|
275
|
+
if (rmErr)
|
|
276
|
+
console.error("Oud stickerbestand niet verwijderd", rmErr);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
226
280
|
const result = { method: det.method, size: det.size, suggestion: det.suggestion };
|
|
227
281
|
return { ok: true, ...result };
|
|
228
282
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flowselections/floriday-klanten-module",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.105",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -115,6 +115,12 @@
|
|
|
115
115
|
"refresh-external-customers-grouped",
|
|
116
116
|
"promote-floriday-order-customers"
|
|
117
117
|
]
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
"name": "klanten-stickers-gelijkzetten",
|
|
121
|
+
"schedule": "32 3 * * *",
|
|
122
|
+
"kind": "sql",
|
|
123
|
+
"sql": "SELECT public.klanten_stickers_sleutel_gelijkzetten();"
|
|
118
124
|
}
|
|
119
125
|
],
|
|
120
126
|
"requires": {
|
package/schema/klanten.sql
CHANGED
|
@@ -1084,7 +1084,7 @@ BEGIN
|
|
|
1084
1084
|
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'),('klanten_overzicht_rijen','ingelogd'),('klanten_overzicht_pagina','ingelogd'),('klanten_overzicht_tellers','ingelogd'),('klanten_landnaam','open'),('klanten_betaalvorm_label','open'),('klanten_betaalvorm','open'),('klanten_overzicht_plus','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'),('klanten_afronden','open'),('klanten_groepsprijs','open'),('klanten_prijs_sleutels','ingelogd'),('klanten_prijsgroep_voor_klant','ingelogd'),('klanten_orderprijs','ingelogd'),('klanten_ensure_defaults','ingelogd'),('klanten_overzet_lokale_prijsgroepen','server'),('klanten_prijsgroepen_voor_klanten','ingelogd'),('klanten_logistiek_uitzonderingen','ingelogd'),('save_customer_article_alias','ingelogd'),('klanten_logistiek_valideer','trigger'),('klanten_artikel_alias_valideer','trigger'),
|
|
1085
1085
|
('klanten_ververs_klantweergave','ingelogd'),('klanten_klantverversing','server'),('klanten_is_beheerder','open'),
|
|
1086
1086
|
('klanten_is_gearchiveerd','ingelogd'),('klanten_extra_velden_voor_klant','ingelogd'),('klanten_extra_veld_verwijderen','ingelogd'),
|
|
1087
|
-
('klanten_stickerformaten_inventaris','ingelogd'),('klanten_extra_veld_def_valideer','trigger'),('klanten_extra_veld_waarde_valideer','trigger')) v(naam, niveau)
|
|
1087
|
+
('klanten_stickerformaten_inventaris','ingelogd'),('klanten_sticker_voor','ingelogd'),('klanten_stickers_sleutel_gelijkzetten','beheerder'),('klanten_extra_veld_def_valideer','trigger'),('klanten_extra_veld_waarde_valideer','trigger')) v(naam, niveau)
|
|
1088
1088
|
LEFT JOIN pg_proc p ON p.proname = v.naam AND p.pronamespace = 'public'::regnamespace ORDER BY v.niveau, v.naam LOOP
|
|
1089
1089
|
_f := _f || jsonb_build_object('functie', _r.naam, 'niveau',
|
|
1090
1090
|
CASE _r.niveau WHEN 'open' THEN 'bewust open (hulpfunctie zonder gegevens)'
|
|
@@ -3443,7 +3443,7 @@ SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klante
|
|
|
3443
3443
|
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_ensure_defaults()
|
|
3444
3444
|
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
3445
3445
|
AS $function$
|
|
3446
|
-
DECLARE _fid uuid; _klasse text := 'aanwezig'; _overzet jsonb := NULL;
|
|
3446
|
+
DECLARE _fid uuid; _klasse text := 'aanwezig'; _overzet jsonb := NULL; _stickers jsonb := NULL;
|
|
3447
3447
|
BEGIN
|
|
3448
3448
|
PERFORM public.klanten_toegang('ingelogd');
|
|
3449
3449
|
PERFORM pg_advisory_xact_lock(hashtext('klanten_ensure_defaults'));
|
|
@@ -3483,7 +3483,13 @@ BEGIN
|
|
|
3483
3483
|
VALUES ('klanten_overzet_lokale_prijsgroepen (automatisch)', true, COALESCE(auth.uid()::text, current_user), _overzet);
|
|
3484
3484
|
INSERT INTO app_settings (key, value) VALUES ('klanten_overzet_lokale_prijsgroepen_gedaan', now()::text) ON CONFLICT DO NOTHING;
|
|
3485
3485
|
END IF;
|
|
3486
|
-
|
|
3486
|
+
BEGIN
|
|
3487
|
+
_stickers := public.klanten_stickers_sleutel_gelijkzetten();
|
|
3488
|
+
EXCEPTION WHEN OTHERS THEN
|
|
3489
|
+
RAISE WARNING 'Klanten: stickersleutels niet gelijkgezet: %', SQLERRM;
|
|
3490
|
+
_stickers := jsonb_build_object('ok', false, 'fout', SQLERRM);
|
|
3491
|
+
END;
|
|
3492
|
+
RETURN jsonb_build_object('ok', true, 'klantklasse', _klasse, 'overzetting', COALESCE(_overzet, '"al gedaan"'::jsonb), 'stickers', _stickers);
|
|
3487
3493
|
END
|
|
3488
3494
|
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_ensure_defaults() RETURNS jsonb LANGUAGE plpgsql SECURITY ');
|
|
3489
3495
|
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_ensure_defaults() FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_ensure_defaults() FROM PUBLIC, anon');
|
|
@@ -4024,3 +4030,97 @@ END;
|
|
|
4024
4030
|
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_extra_velden_voor_klant(p_customer_id uuid DEFAULT NULL) R');
|
|
4025
4031
|
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_extra_velden_voor_klant(uuid) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_extra_velden_voor_klant(uuid) FROM PUBLIC, anon');
|
|
4026
4032
|
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_extra_velden_voor_klant(uuid) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_extra_velden_voor_klant(uuid) TO authenticated, service_rol');
|
|
4033
|
+
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_sticker_voor(p_customer_id uuid, p_product_id uuid, p_soort text DEFAULT 'product')
|
|
4034
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
|
|
4035
|
+
AS $function$
|
|
4036
|
+
DECLARE _tabel text; _ck text[]; _pk text[]; _r record; _w numeric; _h numeric;
|
|
4037
|
+
BEGIN
|
|
4038
|
+
PERFORM public.klanten_toegang('ingelogd');
|
|
4039
|
+
IF p_customer_id IS NULL OR p_product_id IS NULL THEN RETURN NULL; END IF;
|
|
4040
|
+
IF COALESCE(p_soort, 'product') NOT IN ('product', 'fust') THEN
|
|
4041
|
+
RAISE EXCEPTION 'Onbekende stickersoort: %', p_soort USING ERRCODE = '22023';
|
|
4042
|
+
END IF;
|
|
4043
|
+
_tabel := CASE WHEN p_soort = 'fust' THEN 'customer_fust_stickers' ELSE 'customer_product_stickers' END;
|
|
4044
|
+
IF to_regclass('public.' || _tabel) IS NULL THEN RETURN NULL; END IF;
|
|
4045
|
+
SELECT array_remove(ARRAY[c.id::text,
|
|
4046
|
+
CASE WHEN NULLIF(btrim(c.twinfield_code), '') IS NOT NULL THEN 'tf:' || btrim(c.twinfield_code) END,
|
|
4047
|
+
CASE WHEN NULLIF(btrim(c.customer_number), '') IS NOT NULL THEN 'cn:' || btrim(c.customer_number) END], NULL)
|
|
4048
|
+
INTO _ck FROM customers c WHERE c.id = p_customer_id;
|
|
4049
|
+
IF _ck IS NULL THEN RETURN NULL; END IF;
|
|
4050
|
+
SELECT array_remove(ARRAY[p.id::text, NULLIF(btrim(p.floriday_trade_item_id), ''), NULLIF(btrim(p.trade_item_key), '')], NULL)
|
|
4051
|
+
INTO _pk FROM products p WHERE p.id = p_product_id;
|
|
4052
|
+
IF _pk IS NULL THEN _pk := ARRAY[p_product_id::text]; END IF;
|
|
4053
|
+
EXECUTE format($q$
|
|
4054
|
+
SELECT s.id, s.file_path, s.width_mm, s.height_mm FROM public.%I s
|
|
4055
|
+
WHERE s.customer_key = ANY($1) AND s.trade_item_key = ANY($2)
|
|
4056
|
+
ORDER BY (s.trade_item_key = $3) DESC, (s.customer_key = $4) DESC, s.updated_at DESC
|
|
4057
|
+
LIMIT 1 $q$, _tabel)
|
|
4058
|
+
INTO _r USING _ck, _pk, p_product_id::text, p_customer_id::text;
|
|
4059
|
+
IF _r.id IS NULL THEN RETURN NULL; END IF;
|
|
4060
|
+
_w := _r.width_mm; _h := _r.height_mm;
|
|
4061
|
+
IF (_w IS NULL OR _h IS NULL) AND to_regclass('public.customer_sticker_settings') IS NOT NULL THEN
|
|
4062
|
+
IF p_soort = 'fust' THEN
|
|
4063
|
+
EXECUTE 'SELECT fust_width_mm, fust_height_mm FROM public.customer_sticker_settings WHERE customer_key = ANY($1) AND fust_width_mm IS NOT NULL ORDER BY (customer_key = $2) DESC LIMIT 1'
|
|
4064
|
+
INTO _w, _h USING _ck, p_customer_id::text;
|
|
4065
|
+
ELSE
|
|
4066
|
+
EXECUTE 'SELECT width_mm, height_mm FROM public.customer_sticker_settings WHERE customer_key = ANY($1) AND width_mm IS NOT NULL ORDER BY (customer_key = $2) DESC LIMIT 1'
|
|
4067
|
+
INTO _w, _h USING _ck, p_customer_id::text;
|
|
4068
|
+
END IF;
|
|
4069
|
+
END IF;
|
|
4070
|
+
RETURN jsonb_build_object(
|
|
4071
|
+
'id', _r.id,
|
|
4072
|
+
'bestand_url', _r.file_path,
|
|
4073
|
+
'formaat', CASE WHEN _w IS NOT NULL AND _h IS NOT NULL THEN jsonb_build_object('breedte_mm', _w, 'hoogte_mm', _h) END,
|
|
4074
|
+
'kopie_per', NULL);
|
|
4075
|
+
END
|
|
4076
|
+
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_sticker_voor(p_customer_id uuid, p_product_id uuid, p_soor');
|
|
4077
|
+
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_sticker_voor(uuid, uuid, text) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_sticker_voor(uuid, uuid, text) FROM PUBLIC, anon');
|
|
4078
|
+
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_sticker_voor(uuid, uuid, text) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_sticker_voor(uuid, uuid, text) TO authenticated, service_ro');
|
|
4079
|
+
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_stickers_sleutel_gelijkzetten()
|
|
4080
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
4081
|
+
AS $function$
|
|
4082
|
+
DECLARE _tabel text; _r record; _pid uuid; _n int; _omgezet int := 0; _over int := 0; _dubbel int := 0; _fout int := 0;
|
|
4083
|
+
_vb jsonb := '[]'::jsonb; _res jsonb;
|
|
4084
|
+
BEGIN
|
|
4085
|
+
PERFORM public.klanten_toegang('beheerder');
|
|
4086
|
+
PERFORM pg_advisory_xact_lock(hashtext('klanten_stickers_sleutel_gelijkzetten'));
|
|
4087
|
+
IF to_regclass('public.products') IS NULL THEN
|
|
4088
|
+
RETURN jsonb_build_object('ok', true, 'melding', 'products ontbreekt; niets gedaan');
|
|
4089
|
+
END IF;
|
|
4090
|
+
FOREACH _tabel IN ARRAY ARRAY['customer_product_stickers', 'customer_fust_stickers'] LOOP
|
|
4091
|
+
IF to_regclass('public.' || _tabel) IS NULL THEN CONTINUE; END IF;
|
|
4092
|
+
FOR _r IN EXECUTE format($q$
|
|
4093
|
+
SELECT s.id, s.customer_key, s.trade_item_key FROM public.%I s
|
|
4094
|
+
WHERE NOT EXISTS (SELECT 1 FROM public.products p WHERE p.id::text = s.trade_item_key) $q$, _tabel)
|
|
4095
|
+
LOOP
|
|
4096
|
+
BEGIN
|
|
4097
|
+
SELECT count(*), min(p.id::text)::uuid INTO _n, _pid FROM products p
|
|
4098
|
+
WHERE p.floriday_trade_item_id = _r.trade_item_key OR p.trade_item_key = _r.trade_item_key;
|
|
4099
|
+
IF _n <> 1 THEN
|
|
4100
|
+
_over := _over + 1;
|
|
4101
|
+
IF jsonb_array_length(_vb) < 20 THEN _vb := _vb || jsonb_build_object('tabel', _tabel, 'sleutel', _r.trade_item_key, 'reden', CASE WHEN _n = 0 THEN 'geen product' ELSE _n || ' producten' END); END IF;
|
|
4102
|
+
CONTINUE;
|
|
4103
|
+
END IF;
|
|
4104
|
+
EXECUTE format('SELECT count(*) FROM public.%I WHERE customer_key = $1 AND trade_item_key = $2', _tabel)
|
|
4105
|
+
INTO _n USING _r.customer_key, _pid::text;
|
|
4106
|
+
IF _n > 0 THEN
|
|
4107
|
+
_dubbel := _dubbel + 1;
|
|
4108
|
+
IF jsonb_array_length(_vb) < 20 THEN _vb := _vb || jsonb_build_object('tabel', _tabel, 'sleutel', _r.trade_item_key, 'reden', 'dubbel: product-id bestaat al'); END IF;
|
|
4109
|
+
CONTINUE;
|
|
4110
|
+
END IF;
|
|
4111
|
+
EXECUTE format('UPDATE public.%I SET trade_item_key = $1, updated_at = now() WHERE id = $2', _tabel) USING _pid::text, _r.id;
|
|
4112
|
+
_omgezet := _omgezet + 1;
|
|
4113
|
+
EXCEPTION WHEN OTHERS THEN
|
|
4114
|
+
_fout := _fout + 1;
|
|
4115
|
+
RAISE WARNING 'Klanten: sticker % in % niet gelijkgezet: %', _r.id, _tabel, SQLERRM;
|
|
4116
|
+
END;
|
|
4117
|
+
END LOOP;
|
|
4118
|
+
END LOOP;
|
|
4119
|
+
_res := jsonb_build_object('ok', _fout = 0, 'omgezet', _omgezet, 'overgeslagen', _over, 'dubbel', _dubbel, 'fouten', _fout, 'voorbeelden', _vb);
|
|
4120
|
+
INSERT INTO klanten_correctie_log (functie, uitgevoerd, aanroeper, resultaat)
|
|
4121
|
+
VALUES ('klanten_stickers_sleutel_gelijkzetten', true, COALESCE(auth.uid()::text, current_user), _res);
|
|
4122
|
+
RETURN _res;
|
|
4123
|
+
END
|
|
4124
|
+
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_stickers_sleutel_gelijkzetten() RETURNS jsonb LANGUAGE plp');
|
|
4125
|
+
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_stickers_sleutel_gelijkzetten() FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_stickers_sleutel_gelijkzetten() FROM PUBLIC, anon');
|
|
4126
|
+
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_stickers_sleutel_gelijkzetten() TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_stickers_sleutel_gelijkzetten() TO authenticated, service_r');
|