@flowselections/floriday-klanten-module 1.0.60 → 1.0.64
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/BulkStickerUploadDialog.d.ts.map +1 -1
- package/dist-lib/components/klanten/BulkStickerUploadDialog.js +4 -0
- package/dist-lib/components/klanten/CustomerStickerCell.d.ts.map +1 -1
- package/dist-lib/components/klanten/CustomerStickerCell.js +11 -5
- package/dist-lib/components/klanten/FloridayAutoPromoteCard.d.ts +1 -1
- package/dist-lib/components/klanten/FloridayAutoPromoteCard.d.ts.map +1 -1
- package/dist-lib/components/klanten/FloridayAutoPromoteCard.js +11 -31
- package/dist-lib/components/klanten/KlantenOverzicht.d.ts.map +1 -1
- package/dist-lib/components/klanten/KlantenOverzicht.js +2 -1
- package/dist-lib/components/klanten/StickerSizeLine.d.ts +14 -0
- package/dist-lib/components/klanten/StickerSizeLine.d.ts.map +1 -0
- package/dist-lib/components/klanten/StickerSizeLine.js +74 -0
- package/dist-lib/components/klanten/StickerSizePreviewCard.d.ts +3 -0
- package/dist-lib/components/klanten/StickerSizePreviewCard.d.ts.map +1 -0
- package/dist-lib/components/klanten/StickerSizePreviewCard.js +27 -0
- package/dist-lib/index.js +1 -1
- package/dist-lib/integrations/supabase/types.d.ts +45 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/auto-promote.d.ts +1 -0
- package/dist-lib/lib/auto-promote.d.ts.map +1 -1
- package/dist-lib/lib/auto-promote.functions.d.ts +1 -13
- package/dist-lib/lib/auto-promote.functions.d.ts.map +1 -1
- package/dist-lib/lib/auto-promote.functions.js +0 -13
- package/dist-lib/lib/customer-stickers.functions.d.ts +55 -0
- package/dist-lib/lib/customer-stickers.functions.d.ts.map +1 -1
- package/dist-lib/lib/customer-stickers.functions.js +137 -5
- package/dist-lib/lib/customers.functions.d.ts.map +1 -1
- package/dist-lib/lib/customers.functions.js +9 -6
- package/dist-lib/lib/external-customers.functions.d.ts.map +1 -1
- package/dist-lib/lib/external-customers.functions.js +7 -1
- package/dist-lib/lib/sticker-size.d.ts +59 -0
- package/dist-lib/lib/sticker-size.d.ts.map +1 -0
- package/dist-lib/lib/sticker-size.js +233 -0
- package/dist-lib/lib/twinfield-enqueue-rule.d.ts +13 -0
- package/dist-lib/lib/twinfield-enqueue-rule.d.ts.map +1 -0
- package/dist-lib/lib/twinfield-enqueue-rule.js +16 -0
- package/package.json +1 -1
- package/schema/klanten.sql +82 -21
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bepaalt de fysieke maat (mm) van een stickerbestand zonder externe libraries.
|
|
3
|
+
* Volgorde: PDF-paginamaat → DPI (PNG pHYs / JPG JFIF / EXIF) → verhouding met
|
|
4
|
+
* een geladen etiket (±3%, alleen voorstel bij precies één maat) → onbekend.
|
|
5
|
+
*/
|
|
6
|
+
export const RATIO_TOLERANCE = 0.03;
|
|
7
|
+
const r1 = (v) => Math.round(v * 10) / 10;
|
|
8
|
+
function latin1(bytes, max = bytes.length) {
|
|
9
|
+
let s = "";
|
|
10
|
+
const n = Math.min(max, bytes.length);
|
|
11
|
+
for (let i = 0; i < n; i += 8192)
|
|
12
|
+
s += String.fromCharCode(...bytes.subarray(i, Math.min(n, i + 8192)));
|
|
13
|
+
return s;
|
|
14
|
+
}
|
|
15
|
+
export function pdfPageSizeMm(bytes) {
|
|
16
|
+
const text = latin1(bytes);
|
|
17
|
+
// Eerste pagina-object met MediaBox; anders de eerste MediaBox (bv. in /Pages)
|
|
18
|
+
const num = "(-?\\d+(?:\\.\\d+)?)";
|
|
19
|
+
const re = new RegExp(`/MediaBox\\s*\\[\\s*${num}\\s+${num}\\s+${num}\\s+${num}\\s*\\]`);
|
|
20
|
+
const pageIdx = text.search(/\/Type\s*\/Page(?![s\w])/);
|
|
21
|
+
let m = null;
|
|
22
|
+
if (pageIdx >= 0) {
|
|
23
|
+
const start = text.lastIndexOf(" obj", pageIdx);
|
|
24
|
+
const end = text.indexOf("endobj", pageIdx);
|
|
25
|
+
if (start >= 0 && end > start)
|
|
26
|
+
m = re.exec(text.slice(start, end));
|
|
27
|
+
}
|
|
28
|
+
if (!m)
|
|
29
|
+
m = re.exec(text);
|
|
30
|
+
if (!m)
|
|
31
|
+
return null;
|
|
32
|
+
const [x0, y0, x1, y1] = m.slice(1, 5).map(Number);
|
|
33
|
+
const w = Math.abs(x1 - x0), h = Math.abs(y1 - y0);
|
|
34
|
+
if (!(w > 0 && h > 0))
|
|
35
|
+
return null;
|
|
36
|
+
// /Rotate 90/270 op de pagina wisselt breedte en hoogte
|
|
37
|
+
const rot = /\/Rotate\s+(-?\d+)/.exec(text);
|
|
38
|
+
const swap = rot && Math.abs(Number(rot[1])) % 180 === 90;
|
|
39
|
+
const wmm = r1((w * 25.4) / 72), hmm = r1((h * 25.4) / 72);
|
|
40
|
+
return swap ? { width_mm: hmm, height_mm: wmm } : { width_mm: wmm, height_mm: hmm };
|
|
41
|
+
}
|
|
42
|
+
export function pngInfo(b) {
|
|
43
|
+
if (b.length < 24 || b[0] !== 0x89 || b[1] !== 0x50 || b[2] !== 0x4e || b[3] !== 0x47)
|
|
44
|
+
return null;
|
|
45
|
+
const dv = new DataView(b.buffer, b.byteOffset, b.byteLength);
|
|
46
|
+
const w = dv.getUint32(16), h = dv.getUint32(20);
|
|
47
|
+
let dpiX = null, dpiY = null;
|
|
48
|
+
let p = 8;
|
|
49
|
+
while (p + 8 <= b.length) {
|
|
50
|
+
const len = dv.getUint32(p);
|
|
51
|
+
const type = String.fromCharCode(b[p + 4], b[p + 5], b[p + 6], b[p + 7]);
|
|
52
|
+
if (type === "pHYs" && p + 17 <= b.length) {
|
|
53
|
+
const px = dv.getUint32(p + 8), py = dv.getUint32(p + 12), unit = b[p + 16];
|
|
54
|
+
if (unit === 1 && px > 0 && py > 0) {
|
|
55
|
+
dpiX = px * 0.0254;
|
|
56
|
+
dpiY = py * 0.0254;
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
if (type === "IDAT" || type === "IEND")
|
|
61
|
+
break;
|
|
62
|
+
p += 12 + len;
|
|
63
|
+
}
|
|
64
|
+
return { w, h, dpiX, dpiY };
|
|
65
|
+
}
|
|
66
|
+
function exifDpi(b, start, len) {
|
|
67
|
+
const t = start; // TIFF-header
|
|
68
|
+
if (t + 8 > b.length)
|
|
69
|
+
return null;
|
|
70
|
+
const le = b[t] === 0x49;
|
|
71
|
+
const dv = new DataView(b.buffer, b.byteOffset, b.byteLength);
|
|
72
|
+
const u16 = (o) => dv.getUint16(t + o, le);
|
|
73
|
+
const u32 = (o) => dv.getUint32(t + o, le);
|
|
74
|
+
const ifd = u32(4);
|
|
75
|
+
if (t + ifd + 2 > start + len)
|
|
76
|
+
return null;
|
|
77
|
+
const n = u16(ifd);
|
|
78
|
+
let x = null, y = null, unit = 2;
|
|
79
|
+
for (let i = 0; i < n; i++) {
|
|
80
|
+
const e = ifd + 2 + i * 12;
|
|
81
|
+
if (t + e + 12 > b.length)
|
|
82
|
+
break;
|
|
83
|
+
const tag = u16(e);
|
|
84
|
+
if (tag === 0x011a || tag === 0x011b) {
|
|
85
|
+
const off = u32(e + 8);
|
|
86
|
+
const den = u32(off + 4);
|
|
87
|
+
const v = den ? u32(off) / den : 0;
|
|
88
|
+
if (tag === 0x011a)
|
|
89
|
+
x = v;
|
|
90
|
+
else
|
|
91
|
+
y = v;
|
|
92
|
+
}
|
|
93
|
+
else if (tag === 0x0128)
|
|
94
|
+
unit = u16(e + 8);
|
|
95
|
+
}
|
|
96
|
+
if (!x || !y || unit === 1)
|
|
97
|
+
return null;
|
|
98
|
+
return unit === 3 ? { x: x * 2.54, y: y * 2.54 } : { x, y };
|
|
99
|
+
}
|
|
100
|
+
export function jpegInfo(b) {
|
|
101
|
+
if (b.length < 4 || b[0] !== 0xff || b[1] !== 0xd8)
|
|
102
|
+
return null;
|
|
103
|
+
let p = 2, w = 0, h = 0;
|
|
104
|
+
let dpiX = null, dpiY = null;
|
|
105
|
+
let exif = null;
|
|
106
|
+
while (p + 4 <= b.length) {
|
|
107
|
+
if (b[p] !== 0xff) {
|
|
108
|
+
p++;
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
const marker = b[p + 1];
|
|
112
|
+
if (marker === 0xd8 || (marker >= 0xd0 && marker <= 0xd7) || marker === 0x01) {
|
|
113
|
+
p += 2;
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
const len = (b[p + 2] << 8) | b[p + 3];
|
|
117
|
+
const seg = p + 4;
|
|
118
|
+
if (marker === 0xe0 && latin1(b.subarray(seg, seg + 5)) === "JFIF\0") {
|
|
119
|
+
const unit = b[seg + 7];
|
|
120
|
+
const xd = (b[seg + 8] << 8) | b[seg + 9], yd = (b[seg + 10] << 8) | b[seg + 11];
|
|
121
|
+
if ((unit === 1 || unit === 2) && xd > 0 && yd > 0) {
|
|
122
|
+
dpiX = unit === 2 ? xd * 2.54 : xd;
|
|
123
|
+
dpiY = unit === 2 ? yd * 2.54 : yd;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
else if (marker === 0xe1 && latin1(b.subarray(seg, seg + 6)) === "Exif\0\0") {
|
|
127
|
+
try {
|
|
128
|
+
exif = exifDpi(b, seg + 6, len - 8);
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
exif = null;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
else if (marker >= 0xc0 && marker <= 0xcf && marker !== 0xc4 && marker !== 0xc8 && marker !== 0xcc) {
|
|
135
|
+
h = (b[seg + 1] << 8) | b[seg + 2];
|
|
136
|
+
w = (b[seg + 3] << 8) | b[seg + 4];
|
|
137
|
+
break;
|
|
138
|
+
}
|
|
139
|
+
p += 2 + len;
|
|
140
|
+
}
|
|
141
|
+
if (!w || !h)
|
|
142
|
+
return null;
|
|
143
|
+
if (dpiX == null && exif) {
|
|
144
|
+
dpiX = exif.x;
|
|
145
|
+
dpiY = exif.y;
|
|
146
|
+
}
|
|
147
|
+
return { w, h, dpiX, dpiY };
|
|
148
|
+
}
|
|
149
|
+
const UNIT_MM = { mm: 1, cm: 10, in: 25.4, pt: 25.4 / 72 };
|
|
150
|
+
export function svgInfo(b) {
|
|
151
|
+
const head = latin1(b, 4096);
|
|
152
|
+
const tag = /<svg\b[^>]*>/i.exec(head)?.[0] ?? "";
|
|
153
|
+
const attr = (n) => new RegExp(`\\b${n}\\s*=\\s*["']\\s*([\\d.]+)\\s*([a-z%]*)`, "i").exec(tag);
|
|
154
|
+
const wa = attr("width"), ha = attr("height");
|
|
155
|
+
if (wa && ha && UNIT_MM[wa[2].toLowerCase()] && UNIT_MM[ha[2].toLowerCase()]) {
|
|
156
|
+
return {
|
|
157
|
+
size: { width_mm: r1(Number(wa[1]) * UNIT_MM[wa[2].toLowerCase()]), height_mm: r1(Number(ha[1]) * UNIT_MM[ha[2].toLowerCase()]) },
|
|
158
|
+
ratio: null,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
const vb = /viewBox\s*=\s*["']\s*[-\d.]+[\s,]+[-\d.]+[\s,]+([\d.]+)[\s,]+([\d.]+)/i.exec(tag);
|
|
162
|
+
if (vb && Number(vb[2]) > 0)
|
|
163
|
+
return { size: null, ratio: Number(vb[1]) / Number(vb[2]) };
|
|
164
|
+
if (wa && ha && Number(ha[1]) > 0)
|
|
165
|
+
return { size: null, ratio: Number(wa[1]) / Number(ha[1]) };
|
|
166
|
+
return { size: null, ratio: null };
|
|
167
|
+
}
|
|
168
|
+
/** Eén unieke etiketmaat met dezelfde verhouding (staand of liggend), anders null. */
|
|
169
|
+
export function matchLabelByRatio(ratio, labels, tolerance = RATIO_TOLERANCE) {
|
|
170
|
+
if (!(ratio > 0))
|
|
171
|
+
return null;
|
|
172
|
+
const hits = new Map();
|
|
173
|
+
for (const l of labels) {
|
|
174
|
+
if (!(l.breedte_mm > 0 && l.hoogte_mm > 0))
|
|
175
|
+
continue;
|
|
176
|
+
const opts = [
|
|
177
|
+
{ w: l.breedte_mm, h: l.hoogte_mm },
|
|
178
|
+
{ w: l.hoogte_mm, h: l.breedte_mm },
|
|
179
|
+
];
|
|
180
|
+
for (const o of opts) {
|
|
181
|
+
if (Math.abs(o.w / o.h - ratio) / ratio <= tolerance) {
|
|
182
|
+
const key = `${r1(o.w)}x${r1(o.h)}`;
|
|
183
|
+
if (!hits.has(key))
|
|
184
|
+
hits.set(key, { width_mm: r1(o.w), height_mm: r1(o.h), label: l.naam?.trim() || null, printer: l.printer });
|
|
185
|
+
break;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return hits.size === 1 ? [...hits.values()][0] : null;
|
|
190
|
+
}
|
|
191
|
+
export function detectStickerSize(bytes, mime, labels) {
|
|
192
|
+
const none = { method: "onbekend", size: null, suggestion: null, pixels: null };
|
|
193
|
+
try {
|
|
194
|
+
if (mime === "application/pdf") {
|
|
195
|
+
const s = pdfPageSizeMm(bytes);
|
|
196
|
+
return s ? { method: "pdf", size: s, suggestion: null } : none;
|
|
197
|
+
}
|
|
198
|
+
if (mime === "image/svg+xml") {
|
|
199
|
+
const s = svgInfo(bytes);
|
|
200
|
+
if (s.size)
|
|
201
|
+
return { method: "svg", size: s.size, suggestion: null };
|
|
202
|
+
const sug = s.ratio ? matchLabelByRatio(s.ratio, labels) : null;
|
|
203
|
+
return sug ? { method: "verhouding", size: null, suggestion: sug } : none;
|
|
204
|
+
}
|
|
205
|
+
const info = mime === "image/png" ? pngInfo(bytes) : mime === "image/jpeg" ? jpegInfo(bytes) : null;
|
|
206
|
+
if (!info)
|
|
207
|
+
return none;
|
|
208
|
+
const pixels = { w: info.w, h: info.h };
|
|
209
|
+
if (info.dpiX && info.dpiY) {
|
|
210
|
+
return {
|
|
211
|
+
method: "dpi",
|
|
212
|
+
size: { width_mm: r1((info.w / info.dpiX) * 25.4), height_mm: r1((info.h / info.dpiY) * 25.4) },
|
|
213
|
+
suggestion: null,
|
|
214
|
+
pixels,
|
|
215
|
+
};
|
|
216
|
+
}
|
|
217
|
+
const sug = matchLabelByRatio(info.w / info.h, labels);
|
|
218
|
+
return sug ? { method: "verhouding", size: null, suggestion: sug, pixels } : { ...none, pixels };
|
|
219
|
+
}
|
|
220
|
+
catch {
|
|
221
|
+
return none;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
/** Zet geladen_etiket-jsonb uit Layouts om; onbruikbare waarden worden genegeerd. */
|
|
225
|
+
export function parseLoadedLabel(raw, printer) {
|
|
226
|
+
if (!raw || typeof raw !== "object")
|
|
227
|
+
return null;
|
|
228
|
+
const o = raw;
|
|
229
|
+
const b = Number(o.breedte_mm), h = Number(o.hoogte_mm);
|
|
230
|
+
if (!(b > 0 && h > 0))
|
|
231
|
+
return null;
|
|
232
|
+
return { naam: typeof o.naam === "string" ? o.naam : null, breedte_mm: b, hoogte_mm: h, printer };
|
|
233
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Spiegel van de beslisregel in enqueue_twinfield_push (supabase/schema/klanten.sql):
|
|
3
|
+
* een automatisch aangemaakte klant (herkomst niet 'local') komt alleen in de Twinfield-wachtrij
|
|
4
|
+
* als iemand bij die klant zelf "Ook als debiteur aanmaken in Twinfield" koos.
|
|
5
|
+
*/
|
|
6
|
+
export declare function mayEnqueueTwinfield(c: {
|
|
7
|
+
source: string | null;
|
|
8
|
+
twinfield_create_on_insert: boolean | null;
|
|
9
|
+
custom_fields: Record<string, unknown> | null;
|
|
10
|
+
}): boolean;
|
|
11
|
+
/** Legt de bewuste keuze vast zonder andere velden te verliezen. */
|
|
12
|
+
export declare function markTwinfieldRequested(customFields: unknown, at: string): Record<string, unknown>;
|
|
13
|
+
//# sourceMappingURL=twinfield-enqueue-rule.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"twinfield-enqueue-rule.d.ts","sourceRoot":"","sources":["../../src/lib/twinfield-enqueue-rule.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE;IACrC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,0BAA0B,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC/C,GAAG,OAAO,CAIV;AAED,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGjG"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Spiegel van de beslisregel in enqueue_twinfield_push (supabase/schema/klanten.sql):
|
|
3
|
+
* een automatisch aangemaakte klant (herkomst niet 'local') komt alleen in de Twinfield-wachtrij
|
|
4
|
+
* als iemand bij die klant zelf "Ook als debiteur aanmaken in Twinfield" koos.
|
|
5
|
+
*/
|
|
6
|
+
export function mayEnqueueTwinfield(c) {
|
|
7
|
+
if ((c.source ?? "local") === "local")
|
|
8
|
+
return true;
|
|
9
|
+
const requested = c.custom_fields?.twinfield_requested_at;
|
|
10
|
+
return c.twinfield_create_on_insert === true && typeof requested === "string" && requested !== "";
|
|
11
|
+
}
|
|
12
|
+
/** Legt de bewuste keuze vast zonder andere velden te verliezen. */
|
|
13
|
+
export function markTwinfieldRequested(customFields, at) {
|
|
14
|
+
const base = customFields && typeof customFields === "object" ? customFields : {};
|
|
15
|
+
return { ...base, twinfield_requested_at: at };
|
|
16
|
+
}
|
package/package.json
CHANGED
package/schema/klanten.sql
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
-- Klanten-module: volledig, idempotent database-schema (gegenereerd uit de catalogus).
|
|
2
2
|
-- Veilig herhaalbaar. Wijzigt geen bestaande RLS-policies: policies worden alleen aangemaakt als ze ontbreken.
|
|
3
|
-
--
|
|
4
|
-
--
|
|
5
|
-
-- SELECT public.floriday_customer_promotion_preview();
|
|
3
|
+
-- Floriday-kopers met een actieve inkooprelatie of een Floriday-order worden altijd automatisch klant
|
|
4
|
+
-- (elke 5 minuten, via promote_floriday_customer); ze gaan nooit vanzelf naar Twinfield.
|
|
6
5
|
-- Leest tabellen van Floriday-auth, Twinfield-auth en Verkoop (orders). Ontbreekt een onderdeel van een andere module,
|
|
7
6
|
-- dan wordt alleen dat stuk overgeslagen met een WARNING; de functies zelf blijven fail closed.
|
|
8
7
|
CREATE OR REPLACE FUNCTION pg_temp.klanten_try(p_sql text, p_label text) RETURNS void LANGUAGE plpgsql AS $f$
|
|
@@ -477,7 +476,8 @@ DECLARE
|
|
|
477
476
|
v_conn_id uuid; v_office text; v_relevant_changed boolean := false; v_payload jsonb;
|
|
478
477
|
BEGIN
|
|
479
478
|
BEGIN
|
|
480
|
-
|
|
479
|
+
IF COALESCE(NEW.source, 'local') <> 'local' AND NOT (COALESCE(NEW.twinfield_create_on_insert, false)
|
|
480
|
+
AND NULLIF(NEW.custom_fields->>'twinfield_requested_at','') IS NOT NULL) THEN RETURN NEW; END IF;
|
|
481
481
|
IF COALESCE(current_setting('app.skip_twinfield_push', true), '') = 'on' THEN RETURN NEW; END IF;
|
|
482
482
|
IF TG_OP = 'INSERT' AND NEW.twinfield_create_on_insert = false THEN RETURN NEW; END IF;
|
|
483
483
|
IF TG_OP = 'UPDATE' THEN
|
|
@@ -485,6 +485,7 @@ BEGIN
|
|
|
485
485
|
AND OLD.twinfield_create_on_insert = false THEN RETURN NEW; END IF;
|
|
486
486
|
v_relevant_changed :=
|
|
487
487
|
(OLD.twinfield_create_on_insert = false AND NEW.twinfield_create_on_insert = true)
|
|
488
|
+
OR (NEW.custom_fields->>'twinfield_requested_at') IS DISTINCT FROM (OLD.custom_fields->>'twinfield_requested_at')
|
|
488
489
|
OR NEW.company_name IS DISTINCT FROM OLD.company_name
|
|
489
490
|
OR NEW.email IS DISTINCT FROM OLD.email
|
|
490
491
|
OR NEW.phone IS DISTINCT FROM OLD.phone
|
|
@@ -739,7 +740,37 @@ BEGIN
|
|
|
739
740
|
RAISE EXCEPTION 'Geen Floriday-organisatienummer opgegeven';
|
|
740
741
|
END IF;
|
|
741
742
|
SELECT id INTO _id FROM customers WHERE floriday_organization_id = _org_id;
|
|
742
|
-
IF _id IS NOT NULL THEN
|
|
743
|
+
IF _id IS NOT NULL THEN
|
|
744
|
+
SELECT * INTO _c FROM floriday_customers_cache
|
|
745
|
+
WHERE organization_id = _org_id AND COALESCE(is_deleted, false) = false
|
|
746
|
+
ORDER BY fetched_at DESC NULLS LAST LIMIT 1;
|
|
747
|
+
IF FOUND THEN
|
|
748
|
+
_addr := COALESCE(_c.data->'physicalAddress', _c.data->'mailingAddress', '{}'::jsonb);
|
|
749
|
+
_gln := COALESCE(NULLIF(btrim(_c.gln_code),''), NULLIF(btrim(_c.data->>'companyGln'),''));
|
|
750
|
+
PERFORM set_config('app.skip_twinfield_push', 'on', true);
|
|
751
|
+
UPDATE customers SET
|
|
752
|
+
commercial_name = COALESCE(NULLIF(commercial_name,''), NULLIF(_c.data->>'commercialName','')),
|
|
753
|
+
street = COALESCE(NULLIF(street,''), NULLIF(_addr->>'addressLine','')),
|
|
754
|
+
postal_code = COALESCE(NULLIF(postal_code,''), NULLIF(_addr->>'postalCode','')),
|
|
755
|
+
city = COALESCE(NULLIF(city,''), NULLIF(_addr->>'city','')),
|
|
756
|
+
country = COALESCE(NULLIF(country,''), NULLIF(_addr->>'countryCode','')),
|
|
757
|
+
gln = COALESCE(NULLIF(gln,''), _gln),
|
|
758
|
+
logo_url = COALESCE(NULLIF(logo_url,''), NULLIF(_c.data->>'logoUrl','')),
|
|
759
|
+
website = COALESCE(NULLIF(website,''), NULLIF(_c.data->>'website','')),
|
|
760
|
+
floriday_connection_id = COALESCE(floriday_connection_id, _c.connection_id),
|
|
761
|
+
floriday_raw = COALESCE(floriday_raw, _c.data)
|
|
762
|
+
WHERE id = _id
|
|
763
|
+
AND (NULLIF(commercial_name,'') IS NULL OR NULLIF(street,'') IS NULL OR NULLIF(postal_code,'') IS NULL
|
|
764
|
+
OR NULLIF(city,'') IS NULL OR NULLIF(country,'') IS NULL OR NULLIF(gln,'') IS NULL
|
|
765
|
+
OR NULLIF(logo_url,'') IS NULL OR NULLIF(website,'') IS NULL
|
|
766
|
+
OR floriday_connection_id IS NULL OR floriday_raw IS NULL);
|
|
767
|
+
PERFORM set_config('app.skip_twinfield_push', '', true);
|
|
768
|
+
IF NOT EXISTS (SELECT 1 FROM customer_delivery_locations WHERE customer_id = _id) THEN
|
|
769
|
+
PERFORM public.import_floriday_delivery_locations(_org_id);
|
|
770
|
+
END IF;
|
|
771
|
+
END IF;
|
|
772
|
+
RETURN _id;
|
|
773
|
+
END IF;
|
|
743
774
|
SELECT * INTO _c FROM floriday_customers_cache
|
|
744
775
|
WHERE organization_id = _org_id AND COALESCE(is_deleted, false) = false
|
|
745
776
|
ORDER BY fetched_at DESC NULLS LAST LIMIT 1;
|
|
@@ -766,7 +797,7 @@ BEGIN
|
|
|
766
797
|
_addr := COALESCE(_c.data->'physicalAddress', _c.data->'mailingAddress', '{}'::jsonb);
|
|
767
798
|
INSERT INTO customers (
|
|
768
799
|
company_name, commercial_name, street, postal_code, city, country, gln, logo_url, website,
|
|
769
|
-
floriday_organization_id, floriday_connection_id, floriday_raw, custom_fields, source
|
|
800
|
+
floriday_organization_id, floriday_connection_id, floriday_raw, custom_fields, source, twinfield_create_on_insert
|
|
770
801
|
) VALUES (
|
|
771
802
|
COALESCE(NULLIF(_c.data->>'name',''), NULLIF(_c.name,''), NULLIF(_c.data->>'commercialName',''), 'Floriday-organisatie ' || left(_org_id, 8)),
|
|
772
803
|
NULLIF(_c.data->>'commercialName',''),
|
|
@@ -782,7 +813,7 @@ BEGIN
|
|
|
782
813
|
'promoted_from_floriday_at', now(),
|
|
783
814
|
'promoted_reason', NULLIF(current_setting('app.promote_reason', true), '')
|
|
784
815
|
)),
|
|
785
|
-
'floriday'
|
|
816
|
+
'floriday', false
|
|
786
817
|
)
|
|
787
818
|
ON CONFLICT (floriday_organization_id) DO NOTHING
|
|
788
819
|
RETURNING id INTO _id;
|
|
@@ -1703,22 +1734,18 @@ AS $function$
|
|
|
1703
1734
|
'koppelen_op_gln', (SELECT count(DISTINCT k.organization_id) FROM k
|
|
1704
1735
|
JOIN floriday_customers_cache f ON f.organization_id = k.organization_id AND COALESCE(f.is_deleted,false)=false
|
|
1705
1736
|
WHERE (SELECT count(*) FROM customers c WHERE c.floriday_organization_id IS NULL
|
|
1706
|
-
AND btrim(c.gln) = COALESCE(NULLIF(btrim(f.gln_code),''), NULLIF(btrim(f.data->>'companyGln'),''))) = 1)
|
|
1707
|
-
'relaties_aan', COALESCE((SELECT value FROM app_settings WHERE key='klanten_auto_promote_relations'),'false') = 'true',
|
|
1708
|
-
'orders_aan', COALESCE((SELECT value FROM app_settings WHERE key='klanten_auto_promote_orders'),'false') = 'true');
|
|
1737
|
+
AND btrim(c.gln) = COALESCE(NULLIF(btrim(f.gln_code),''), NULLIF(btrim(f.data->>'companyGln'),''))) = 1));
|
|
1709
1738
|
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.floriday_customer_promotion_preview() RETURNS jsonb LANGUAGE sql S');
|
|
1710
1739
|
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_promote_round()
|
|
1711
1740
|
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
1712
1741
|
AS $function$
|
|
1713
|
-
DECLARE _r record; _made int := 0; _linked int := 0; _skip int := 0; _fail int := 0;
|
|
1714
|
-
|
|
1715
|
-
_ord boolean := COALESCE((SELECT value FROM app_settings WHERE key='klanten_auto_promote_orders'),'false') = 'true';
|
|
1742
|
+
DECLARE _r record; _made int := 0; _linked int := 0; _skip int := 0; _fail int := 0; _filled int := 0;
|
|
1743
|
+
_before int; _id uuid; _res jsonb;
|
|
1716
1744
|
BEGIN
|
|
1717
1745
|
FOR _r IN
|
|
1718
1746
|
SELECT organization_id, bool_or(in_cache) AS in_cache,
|
|
1719
|
-
CASE WHEN bool_or(reason='inkooprelatie')
|
|
1747
|
+
CASE WHEN bool_or(reason='inkooprelatie') THEN 'inkooprelatie' ELSE 'order' END AS reason
|
|
1720
1748
|
FROM floriday_customer_candidates()
|
|
1721
|
-
WHERE (reason='inkooprelatie' AND _rel) OR (reason='order' AND _ord)
|
|
1722
1749
|
GROUP BY organization_id
|
|
1723
1750
|
LOOP
|
|
1724
1751
|
IF NOT _r.in_cache THEN _skip := _skip + 1; CONTINUE; END IF;
|
|
@@ -1735,8 +1762,29 @@ BEGIN
|
|
|
1735
1762
|
END;
|
|
1736
1763
|
END LOOP;
|
|
1737
1764
|
PERFORM set_config('app.promote_reason', '', true);
|
|
1738
|
-
|
|
1739
|
-
|
|
1765
|
+
FOR _r IN
|
|
1766
|
+
SELECT c.floriday_organization_id AS org FROM customers c
|
|
1767
|
+
WHERE c.floriday_organization_id IS NOT NULL
|
|
1768
|
+
AND EXISTS (SELECT 1 FROM floriday_customers_cache f WHERE f.organization_id = c.floriday_organization_id AND COALESCE(f.is_deleted,false)=false)
|
|
1769
|
+
AND (NULLIF(c.street,'') IS NULL OR NULLIF(c.city,'') IS NULL OR NULLIF(c.country,'') IS NULL
|
|
1770
|
+
OR c.floriday_raw IS NULL OR c.floriday_connection_id IS NULL
|
|
1771
|
+
OR NOT EXISTS (SELECT 1 FROM customer_delivery_locations l WHERE l.customer_id = c.id))
|
|
1772
|
+
LIMIT 200
|
|
1773
|
+
LOOP
|
|
1774
|
+
BEGIN
|
|
1775
|
+
PERFORM promote_floriday_customer(_r.org);
|
|
1776
|
+
_filled := _filled + 1;
|
|
1777
|
+
EXCEPTION WHEN OTHERS THEN
|
|
1778
|
+
RAISE WARNING 'aanvullen Floriday-klant % mislukt: %', _r.org, SQLERRM;
|
|
1779
|
+
END;
|
|
1780
|
+
END LOOP;
|
|
1781
|
+
_res := jsonb_build_object('aangemaakt', _made, 'gekoppeld', _linked, 'overgeslagen', _skip + _fail,
|
|
1782
|
+
'overgeslagen_zonder_gegevens', _skip, 'mislukt', _fail, 'nagelopen', _filled, 'op', now());
|
|
1783
|
+
BEGIN
|
|
1784
|
+
UPDATE app_settings SET value = _res::text, updated_at = now() WHERE key = 'klanten_last_promote_round';
|
|
1785
|
+
IF NOT FOUND THEN INSERT INTO app_settings(key, value) VALUES ('klanten_last_promote_round', _res::text); END IF;
|
|
1786
|
+
EXCEPTION WHEN OTHERS THEN RAISE WARNING 'laatste ronde niet bewaard: %', SQLERRM; END;
|
|
1787
|
+
RETURN _res;
|
|
1740
1788
|
END;
|
|
1741
1789
|
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_promote_round() RETURNS jsonb LANGUAGE plpgsql SECURITY DE');
|
|
1742
1790
|
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.promote_floriday_order_customers()
|
|
@@ -1789,8 +1837,7 @@ BEGIN
|
|
|
1789
1837
|
FROM (SELECT organization_id, reason FROM g WHERE NOT in_cache ORDER BY organization_id LIMIT 5) s
|
|
1790
1838
|
)
|
|
1791
1839
|
SELECT jsonb_build_object(
|
|
1792
|
-
'
|
|
1793
|
-
'orders_aan', COALESCE((SELECT value FROM app_settings WHERE key='klanten_auto_promote_orders'),'false') = 'true',
|
|
1840
|
+
'laatste_ronde', (SELECT value::jsonb FROM app_settings WHERE key='klanten_last_promote_round'),
|
|
1794
1841
|
'inkooprelatie', COALESCE((SELECT t FROM per WHERE reason='inkooprelatie'), '{}'::jsonb),
|
|
1795
1842
|
'order', COALESCE((SELECT t FROM per WHERE reason='order'), '{}'::jsonb),
|
|
1796
1843
|
'order_ook_inkooprelatie', (SELECT count(*) FROM (SELECT organization_id FROM g GROUP BY organization_id HAVING count(DISTINCT reason) = 2) x),
|
|
@@ -1824,8 +1871,22 @@ SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_a
|
|
|
1824
1871
|
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_auto_promote_status() TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_auto_promote_status() TO authenticated, service_role');
|
|
1825
1872
|
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_set_auto_promote(text, boolean) FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_set_auto_promote(text, boolean) FROM PUBLIC, anon');
|
|
1826
1873
|
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_set_auto_promote(text, boolean) TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_set_auto_promote(text, boolean) TO authenticated, service_r');
|
|
1827
|
-
SELECT pg_temp.klanten_try($klanten_stmt$
|
|
1828
|
-
|
|
1874
|
+
SELECT pg_temp.klanten_try($klanten_stmt$CREATE OR REPLACE FUNCTION public.klanten_refresh_grouped_if_stale()
|
|
1875
|
+
RETURNS boolean LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
|
|
1876
|
+
AS $function$
|
|
1877
|
+
BEGIN
|
|
1878
|
+
IF auth.uid() IS NULL THEN RETURN false; END IF;
|
|
1879
|
+
IF EXISTS (SELECT 1 FROM customers c WHERE NOT EXISTS (
|
|
1880
|
+
SELECT 1 FROM external_customers_grouped g
|
|
1881
|
+
WHERE g.sources @> jsonb_build_array(jsonb_build_object('provider','local','external_id',c.id::text)))) THEN
|
|
1882
|
+
PERFORM public.refresh_external_customers_grouped();
|
|
1883
|
+
RETURN true;
|
|
1884
|
+
END IF;
|
|
1885
|
+
RETURN false;
|
|
1886
|
+
END;
|
|
1887
|
+
$function$$klanten_stmt$, 'CREATE OR REPLACE FUNCTION public.klanten_refresh_grouped_if_stale() RETURNS boolean LANGUAGE plpgsq');
|
|
1888
|
+
SELECT pg_temp.klanten_try($klanten_stmt$REVOKE ALL ON FUNCTION public.klanten_refresh_grouped_if_stale() FROM PUBLIC, anon$klanten_stmt$, 'REVOKE ALL ON FUNCTION public.klanten_refresh_grouped_if_stale() FROM PUBLIC, anon');
|
|
1889
|
+
SELECT pg_temp.klanten_try($klanten_stmt$GRANT EXECUTE ON FUNCTION public.klanten_refresh_grouped_if_stale() TO authenticated, service_role$klanten_stmt$, 'GRANT EXECUTE ON FUNCTION public.klanten_refresh_grouped_if_stale() TO authenticated, service_role');
|
|
1829
1890
|
SELECT pg_temp.klanten_try($klanten_stmt$DO $cron$ BEGIN
|
|
1830
1891
|
IF EXISTS (SELECT 1 FROM pg_extension WHERE extname='pg_cron')
|
|
1831
1892
|
AND NOT EXISTS (SELECT 1 FROM cron.job WHERE jobname='promote-floriday-order-customers') THEN
|