@flowselections/floriday-klanten-module 1.0.62 → 1.0.67
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/CarrierAdminCard.d.ts +3 -0
- package/dist-lib/components/klanten/CarrierAdminCard.d.ts.map +1 -0
- package/dist-lib/components/klanten/CarrierAdminCard.js +23 -0
- package/dist-lib/components/klanten/CarrierPicker.d.ts +221 -0
- package/dist-lib/components/klanten/CarrierPicker.d.ts.map +1 -0
- package/dist-lib/components/klanten/CarrierPicker.js +74 -0
- package/dist-lib/components/klanten/CustomerCarrierCard.d.ts +5 -0
- package/dist-lib/components/klanten/CustomerCarrierCard.d.ts.map +1 -0
- package/dist-lib/components/klanten/CustomerCarrierCard.js +36 -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/DeliveryLocationsTab.d.ts.map +1 -1
- package/dist-lib/components/klanten/DeliveryLocationsTab.js +38 -45
- package/dist-lib/components/klanten/KlantDetail.d.ts.map +1 -1
- package/dist-lib/components/klanten/KlantDetail.js +2 -1
- package/dist-lib/components/klanten/KlantFormulier.d.ts.map +1 -1
- package/dist-lib/components/klanten/KlantFormulier.js +8 -12
- package/dist-lib/components/klanten/KlantenOverzicht.d.ts.map +1 -1
- package/dist-lib/components/klanten/KlantenOverzicht.js +8 -3
- 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/integrations/supabase/types.d.ts +1357 -28
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/carrier-choice.d.ts +60 -0
- package/dist-lib/lib/carrier-choice.d.ts.map +1 -0
- package/dist-lib/lib/carrier-choice.js +68 -0
- package/dist-lib/lib/carriers.functions.d.ts +82 -0
- package/dist-lib/lib/carriers.functions.d.ts.map +1 -0
- package/dist-lib/lib/carriers.functions.js +180 -0
- package/dist-lib/lib/countries.d.ts +2 -0
- package/dist-lib/lib/countries.d.ts.map +1 -1
- package/dist-lib/lib/countries.js +2 -0
- package/dist-lib/lib/customer-schemas.d.ts +108 -2
- package/dist-lib/lib/customer-schemas.d.ts.map +1 -1
- package/dist-lib/lib/customer-schemas.js +15 -1
- 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 +4 -1
- package/dist-lib/lib/customers.functions.d.ts.map +1 -1
- package/dist-lib/lib/customers.functions.js +7 -0
- package/dist-lib/lib/delivery-locations.functions.d.ts +2 -2
- package/dist-lib/lib/delivery-locations.functions.d.ts.map +1 -1
- package/dist-lib/lib/delivery-locations.functions.js +31 -38
- package/dist-lib/lib/price-groups-local.functions.d.ts.map +1 -1
- package/dist-lib/lib/price-groups-local.functions.js +4 -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-adopt.functions.d.ts +2 -1
- package/dist-lib/lib/twinfield-adopt.functions.d.ts.map +1 -1
- package/dist-lib/lib/twinfield-adopt.functions.js +2 -2
- package/dist-lib/lib/twinfield-customer-defaults.server.js +2 -2
- package/package.json +11 -3
- package/schema/klanten.sql +514 -48
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type StickerSizeResult } from "./sticker-size.js";
|
|
1
2
|
export declare const ALLOWED_STICKER_MIME: readonly ["application/pdf", "image/png", "image/jpeg", "image/svg+xml"];
|
|
2
3
|
export type CustomerSticker = {
|
|
3
4
|
trade_item_key: string;
|
|
@@ -19,6 +20,7 @@ export type CustomerStickersResult = {
|
|
|
19
20
|
stickers: CustomerSticker[];
|
|
20
21
|
format: StickerFormat | null;
|
|
21
22
|
};
|
|
23
|
+
export type StickerUploadSize = Pick<StickerSizeResult, "method" | "size" | "suggestion">;
|
|
22
24
|
export declare const listCustomerStickers: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
23
25
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
24
26
|
userId: string;
|
|
@@ -38,6 +40,17 @@ export declare const confirmStickerUpload: import("@tanstack/start-client-core")
|
|
|
38
40
|
mimeType: string;
|
|
39
41
|
fileSize?: number | null | undefined;
|
|
40
42
|
}, Promise<{
|
|
43
|
+
method: import("./sticker-size.js").SizeMethod;
|
|
44
|
+
size: {
|
|
45
|
+
width_mm: number;
|
|
46
|
+
height_mm: number;
|
|
47
|
+
} | null;
|
|
48
|
+
suggestion: {
|
|
49
|
+
width_mm: number;
|
|
50
|
+
height_mm: number;
|
|
51
|
+
label: string | null;
|
|
52
|
+
printer: string | null;
|
|
53
|
+
} | null;
|
|
41
54
|
ok: true;
|
|
42
55
|
}>>;
|
|
43
56
|
export declare const deleteCustomerSticker: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
@@ -137,6 +150,10 @@ export declare const commitStickerBatch: import("@tanstack/start-client-core").O
|
|
|
137
150
|
fileName: string;
|
|
138
151
|
reason: string;
|
|
139
152
|
}[];
|
|
153
|
+
sizes: ({
|
|
154
|
+
fileName: string;
|
|
155
|
+
tradeItemKey: string;
|
|
156
|
+
} & StickerUploadSize)[];
|
|
140
157
|
}>>;
|
|
141
158
|
export declare const discardStickerBatch: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
142
159
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -148,4 +165,42 @@ export declare const discardStickerBatch: import("@tanstack/start-client-core").
|
|
|
148
165
|
}, Promise<{
|
|
149
166
|
removed: any;
|
|
150
167
|
}>>;
|
|
168
|
+
/** Maat van één sticker vastleggen (bevestigd voorstel of "wijzigen"). */
|
|
169
|
+
export declare const setStickerSize: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
170
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
171
|
+
userId: string;
|
|
172
|
+
claims: import("@supabase/auth-js").JwtPayload;
|
|
173
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
174
|
+
customerKey: string;
|
|
175
|
+
tradeItemKey: string;
|
|
176
|
+
widthMm: number;
|
|
177
|
+
heightMm: number;
|
|
178
|
+
}, Promise<{
|
|
179
|
+
ok: true;
|
|
180
|
+
}>>;
|
|
181
|
+
/** Voorstel voor één sticker zonder maat (voor de knop in de stickercel). */
|
|
182
|
+
export declare const suggestStickerSize: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
183
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
184
|
+
userId: string;
|
|
185
|
+
claims: import("@supabase/auth-js").JwtPayload;
|
|
186
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
187
|
+
customerKey: string;
|
|
188
|
+
tradeItemKey: string;
|
|
189
|
+
}, Promise<StickerUploadSize>>;
|
|
190
|
+
export type StickerSizePreviewRow = {
|
|
191
|
+
customer_key: string;
|
|
192
|
+
trade_item_key: string;
|
|
193
|
+
file_name: string;
|
|
194
|
+
method: StickerUploadSize["method"];
|
|
195
|
+
width_mm: number | null;
|
|
196
|
+
height_mm: number | null;
|
|
197
|
+
label: string | null;
|
|
198
|
+
printer: string | null;
|
|
199
|
+
};
|
|
200
|
+
/** Alleen lezen: welke maat we bij bestaande stickers zonder maat zouden invullen. Alleen beheerders. */
|
|
201
|
+
export declare const previewStickerSizes: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
202
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
203
|
+
userId: string;
|
|
204
|
+
claims: import("@supabase/auth-js").JwtPayload;
|
|
205
|
+
}, undefined, undefined, undefined>], undefined, Promise<StickerSizePreviewRow[]>>;
|
|
151
206
|
//# sourceMappingURL=customer-stickers.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-stickers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"customer-stickers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customer-stickers.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createServerFn } from "@tanstack/react-start";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
4
|
+
import { detectStickerSize, parseLoadedLabel, } from "./sticker-size.js";
|
|
4
5
|
const BUCKET = "customer-stickers";
|
|
5
6
|
const SIGNED_TTL = 60 * 60; // 1 uur
|
|
6
7
|
export const ALLOWED_STICKER_MIME = [
|
|
@@ -9,6 +10,52 @@ export const ALLOWED_STICKER_MIME = [
|
|
|
9
10
|
"image/jpeg",
|
|
10
11
|
"image/svg+xml",
|
|
11
12
|
];
|
|
13
|
+
/** Geladen etiketten uit Layouts (printers + routes). Ontbreekt iets: lege lijst, geen fout. */
|
|
14
|
+
async function loadLabels(sb) {
|
|
15
|
+
const out = [];
|
|
16
|
+
try {
|
|
17
|
+
const { data: printers, error } = await sb
|
|
18
|
+
.from("printers")
|
|
19
|
+
.select("id, naam, weergavenaam, geladen_etiket")
|
|
20
|
+
.not("geladen_etiket", "is", null);
|
|
21
|
+
if (error)
|
|
22
|
+
return out;
|
|
23
|
+
const names = new Map();
|
|
24
|
+
for (const p of printers ?? []) {
|
|
25
|
+
const name = (p.weergavenaam || p.naam || null);
|
|
26
|
+
if (name)
|
|
27
|
+
names.set(p.id, name);
|
|
28
|
+
const l = parseLoadedLabel(p.geladen_etiket, name);
|
|
29
|
+
if (l)
|
|
30
|
+
out.push(l);
|
|
31
|
+
}
|
|
32
|
+
const { data: routes } = await sb
|
|
33
|
+
.from("printer_routes")
|
|
34
|
+
.select("printer_id, geladen_etiket")
|
|
35
|
+
.not("geladen_etiket", "is", null);
|
|
36
|
+
for (const r of routes ?? []) {
|
|
37
|
+
const l = parseLoadedLabel(r.geladen_etiket, names.get(r.printer_id) ?? null);
|
|
38
|
+
if (l)
|
|
39
|
+
out.push(l);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
/* Layouts niet geïnstalleerd: stap verhouding overslaan */
|
|
44
|
+
}
|
|
45
|
+
return out;
|
|
46
|
+
}
|
|
47
|
+
async function detectForPath(sb, path, mime, labels) {
|
|
48
|
+
try {
|
|
49
|
+
const { data: blob, error } = await sb.storage.from(BUCKET).download(path);
|
|
50
|
+
if (error || !blob)
|
|
51
|
+
return { method: "onbekend", size: null, suggestion: null };
|
|
52
|
+
const bytes = new Uint8Array(await blob.arrayBuffer());
|
|
53
|
+
return detectStickerSize(bytes, mime, labels);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return { method: "onbekend", size: null, suggestion: null };
|
|
57
|
+
}
|
|
58
|
+
}
|
|
12
59
|
async function signed(sb, path) {
|
|
13
60
|
const { data } = await sb.storage.from(BUCKET).createSignedUrl(path, SIGNED_TTL);
|
|
14
61
|
return data?.signedUrl ?? null;
|
|
@@ -77,9 +124,12 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
|
|
|
77
124
|
.eq("customer_key", data.customerKey)
|
|
78
125
|
.eq("trade_item_key", data.tradeItemKey)
|
|
79
126
|
.maybeSingle();
|
|
127
|
+
const det = await detectForPath(sb, data.filePath, data.mimeType, await loadLabels(sb));
|
|
80
128
|
const { error } = await sb.from("customer_product_stickers").upsert({
|
|
81
129
|
customer_key: data.customerKey,
|
|
82
130
|
trade_item_key: data.tradeItemKey,
|
|
131
|
+
width_mm: det.size?.width_mm ?? null,
|
|
132
|
+
height_mm: det.size?.height_mm ?? null,
|
|
83
133
|
file_path: data.filePath,
|
|
84
134
|
file_name: data.fileName,
|
|
85
135
|
mime_type: data.mimeType,
|
|
@@ -95,7 +145,8 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
|
|
|
95
145
|
if (existing?.file_path && existing.file_path !== data.filePath) {
|
|
96
146
|
await sb.storage.from(BUCKET).remove([existing.file_path]);
|
|
97
147
|
}
|
|
98
|
-
|
|
148
|
+
const result = { method: det.method, size: det.size, suggestion: det.suggestion };
|
|
149
|
+
return { ok: true, ...result };
|
|
99
150
|
});
|
|
100
151
|
export const deleteCustomerSticker = createServerFn({ method: "POST" })
|
|
101
152
|
.middleware([requireSupabaseAuth])
|
|
@@ -169,12 +220,13 @@ export const getStickerForPrint = createServerFn({ method: "POST" })
|
|
|
169
220
|
const sb = context.supabase;
|
|
170
221
|
const { data: row } = await sb
|
|
171
222
|
.from("customer_product_stickers")
|
|
172
|
-
.select("file_path, file_name, mime_type")
|
|
223
|
+
.select("file_path, file_name, mime_type, width_mm, height_mm")
|
|
173
224
|
.eq("customer_key", data.customerKey)
|
|
174
225
|
.eq("trade_item_key", data.tradeItemKey)
|
|
175
226
|
.maybeSingle();
|
|
176
227
|
if (!row?.file_path)
|
|
177
228
|
return null;
|
|
229
|
+
const own = row.width_mm != null && row.height_mm != null;
|
|
178
230
|
const { data: fmt } = await sb
|
|
179
231
|
.from("customer_sticker_settings")
|
|
180
232
|
.select("width_mm, height_mm")
|
|
@@ -184,8 +236,8 @@ export const getStickerForPrint = createServerFn({ method: "POST" })
|
|
|
184
236
|
url: await signed(sb, row.file_path),
|
|
185
237
|
file_name: row.file_name,
|
|
186
238
|
mime_type: (row.mime_type ?? null),
|
|
187
|
-
width_mm: fmt ? Number(fmt.width_mm) : null,
|
|
188
|
-
height_mm: fmt ? Number(fmt.height_mm) : null,
|
|
239
|
+
width_mm: own ? Number(row.width_mm) : fmt ? Number(fmt.width_mm) : null,
|
|
240
|
+
height_mm: own ? Number(row.height_mm) : fmt ? Number(fmt.height_mm) : null,
|
|
189
241
|
};
|
|
190
242
|
});
|
|
191
243
|
// ---------------------------------------------------------------------------
|
|
@@ -442,6 +494,8 @@ export const commitStickerBatch = createServerFn({ method: "POST" })
|
|
|
442
494
|
let replaced = 0;
|
|
443
495
|
let skipped = 0;
|
|
444
496
|
const failed = [];
|
|
497
|
+
const sizes = [];
|
|
498
|
+
const labels = await loadLabels(sb);
|
|
445
499
|
for (const it of data.items) {
|
|
446
500
|
try {
|
|
447
501
|
if (!it.inboxPath.startsWith(prefix))
|
|
@@ -466,10 +520,14 @@ export const commitStickerBatch = createServerFn({ method: "POST" })
|
|
|
466
520
|
const { error: moveErr } = await sb.storage.from(BUCKET).move(it.inboxPath, target);
|
|
467
521
|
if (moveErr)
|
|
468
522
|
throw new Error(moveErr.message);
|
|
523
|
+
const det = await detectForPath(sb, target, it.mimeType, labels);
|
|
524
|
+
sizes.push({ fileName: it.fileName, tradeItemKey: it.tradeItemKey, method: det.method, size: det.size, suggestion: det.suggestion });
|
|
469
525
|
const { error: upErr } = await sb.from("customer_product_stickers").upsert({
|
|
470
526
|
customer_key: data.customerKey,
|
|
471
527
|
trade_item_key: it.tradeItemKey,
|
|
472
528
|
file_path: target,
|
|
529
|
+
width_mm: det.size?.width_mm ?? null,
|
|
530
|
+
height_mm: det.size?.height_mm ?? null,
|
|
473
531
|
file_name: it.fileName,
|
|
474
532
|
mime_type: it.mimeType,
|
|
475
533
|
file_size: it.fileSize ?? null,
|
|
@@ -498,7 +556,7 @@ export const commitStickerBatch = createServerFn({ method: "POST" })
|
|
|
498
556
|
const paths = (leftovers ?? []).map((o) => `${prefix}${o.name}`);
|
|
499
557
|
if (paths.length)
|
|
500
558
|
await sb.storage.from(BUCKET).remove(paths);
|
|
501
|
-
return { linked, replaced, skipped, failed };
|
|
559
|
+
return { linked, replaced, skipped, failed, sizes };
|
|
502
560
|
});
|
|
503
561
|
export const discardStickerBatch = createServerFn({ method: "POST" })
|
|
504
562
|
.middleware([requireSupabaseAuth])
|
|
@@ -512,3 +570,77 @@ export const discardStickerBatch = createServerFn({ method: "POST" })
|
|
|
512
570
|
await sb.storage.from(BUCKET).remove(paths);
|
|
513
571
|
return { removed: paths.length };
|
|
514
572
|
});
|
|
573
|
+
/** Maat van één sticker vastleggen (bevestigd voorstel of "wijzigen"). */
|
|
574
|
+
export const setStickerSize = createServerFn({ method: "POST" })
|
|
575
|
+
.middleware([requireSupabaseAuth])
|
|
576
|
+
.inputValidator((input) => z
|
|
577
|
+
.object({
|
|
578
|
+
customerKey: z.string().min(1),
|
|
579
|
+
tradeItemKey: z.string().min(1),
|
|
580
|
+
widthMm: z.number().positive().max(1000),
|
|
581
|
+
heightMm: z.number().positive().max(1000),
|
|
582
|
+
})
|
|
583
|
+
.parse(input))
|
|
584
|
+
.handler(async ({ data, context }) => {
|
|
585
|
+
const sb = context.supabase;
|
|
586
|
+
const r = (v) => Math.round(v * 10) / 10;
|
|
587
|
+
const { error } = await sb
|
|
588
|
+
.from("customer_product_stickers")
|
|
589
|
+
.update({ width_mm: r(data.widthMm), height_mm: r(data.heightMm), updated_at: new Date().toISOString() })
|
|
590
|
+
.eq("customer_key", data.customerKey)
|
|
591
|
+
.eq("trade_item_key", data.tradeItemKey);
|
|
592
|
+
if (error)
|
|
593
|
+
throw new Error(error.message);
|
|
594
|
+
return { ok: true };
|
|
595
|
+
});
|
|
596
|
+
/** Voorstel voor één sticker zonder maat (voor de knop in de stickercel). */
|
|
597
|
+
export const suggestStickerSize = createServerFn({ method: "POST" })
|
|
598
|
+
.middleware([requireSupabaseAuth])
|
|
599
|
+
.inputValidator((input) => z.object({ customerKey: z.string().min(1), tradeItemKey: z.string().min(1) }).parse(input))
|
|
600
|
+
.handler(async ({ data, context }) => {
|
|
601
|
+
const sb = context.supabase;
|
|
602
|
+
const { data: row } = await sb
|
|
603
|
+
.from("customer_product_stickers")
|
|
604
|
+
.select("file_path, mime_type")
|
|
605
|
+
.eq("customer_key", data.customerKey)
|
|
606
|
+
.eq("trade_item_key", data.tradeItemKey)
|
|
607
|
+
.maybeSingle();
|
|
608
|
+
if (!row?.file_path)
|
|
609
|
+
return { method: "onbekend", size: null, suggestion: null };
|
|
610
|
+
const d = await detectForPath(sb, row.file_path, row.mime_type, await loadLabels(sb));
|
|
611
|
+
return { method: d.method, size: d.size, suggestion: d.suggestion };
|
|
612
|
+
});
|
|
613
|
+
/** Alleen lezen: welke maat we bij bestaande stickers zonder maat zouden invullen. Alleen beheerders. */
|
|
614
|
+
export const previewStickerSizes = createServerFn({ method: "POST" })
|
|
615
|
+
.middleware([requireSupabaseAuth])
|
|
616
|
+
.handler(async ({ context }) => {
|
|
617
|
+
const sb = context.supabase;
|
|
618
|
+
const { data: isAdmin } = await sb.rpc("has_role", { _user_id: context.userId, _role: "admin" });
|
|
619
|
+
if (isAdmin !== true)
|
|
620
|
+
throw new Error("Alleen voor beheerders.");
|
|
621
|
+
const { data: rows, error } = await sb
|
|
622
|
+
.from("customer_product_stickers")
|
|
623
|
+
.select("customer_key, trade_item_key, file_name, file_path, mime_type")
|
|
624
|
+
.or("width_mm.is.null,height_mm.is.null")
|
|
625
|
+
.order("customer_key")
|
|
626
|
+
.limit(500);
|
|
627
|
+
if (error)
|
|
628
|
+
throw new Error(error.message);
|
|
629
|
+
const labels = await loadLabels(sb);
|
|
630
|
+
const out = [];
|
|
631
|
+
for (const r of rows ?? []) {
|
|
632
|
+
const d = await detectForPath(sb, r.file_path, r.mime_type, labels);
|
|
633
|
+
const v = d.size ?? d.suggestion;
|
|
634
|
+
out.push({
|
|
635
|
+
customer_key: r.customer_key,
|
|
636
|
+
trade_item_key: r.trade_item_key,
|
|
637
|
+
file_name: r.file_name,
|
|
638
|
+
method: d.method,
|
|
639
|
+
width_mm: v?.width_mm ?? null,
|
|
640
|
+
height_mm: v?.height_mm ?? null,
|
|
641
|
+
label: d.suggestion?.label ?? null,
|
|
642
|
+
printer: d.suggestion?.printer ?? null,
|
|
643
|
+
});
|
|
644
|
+
}
|
|
645
|
+
return out;
|
|
646
|
+
});
|
|
@@ -117,6 +117,7 @@ export declare const getCustomer: import("@tanstack/start-client-core").Required
|
|
|
117
117
|
custom_fields: import("../integrations/supabase/types.js").Json;
|
|
118
118
|
customer_class: string | null;
|
|
119
119
|
customer_number: string | null;
|
|
120
|
+
default_carrier_id: string | null;
|
|
120
121
|
discount_days: number | null;
|
|
121
122
|
discount_percentage: number | null;
|
|
122
123
|
discount_surcharge: string;
|
|
@@ -249,6 +250,7 @@ export declare const createCustomer: import("@tanstack/start-client-core").Requi
|
|
|
249
250
|
userId: string;
|
|
250
251
|
claims: import("@supabase/auth-js").JwtPayload;
|
|
251
252
|
}, undefined, undefined, undefined>], (input: CustomerCreateInput) => {
|
|
253
|
+
country: string | undefined;
|
|
252
254
|
is_active: boolean;
|
|
253
255
|
force: boolean;
|
|
254
256
|
twinfield_create: boolean;
|
|
@@ -273,7 +275,6 @@ export declare const createCustomer: import("@tanstack/start-client-core").Requi
|
|
|
273
275
|
street?: string | undefined;
|
|
274
276
|
house_number?: string | undefined;
|
|
275
277
|
city?: string | undefined;
|
|
276
|
-
country?: string | undefined;
|
|
277
278
|
customer_class?: string | undefined;
|
|
278
279
|
notes?: string | undefined;
|
|
279
280
|
customer_number?: string | undefined;
|
|
@@ -348,6 +349,7 @@ export declare const createCustomer: import("@tanstack/start-client-core").Requi
|
|
|
348
349
|
custom_fields: import("../integrations/supabase/types.js").Json;
|
|
349
350
|
customer_class: string | null;
|
|
350
351
|
customer_number: string | null;
|
|
352
|
+
default_carrier_id: string | null;
|
|
351
353
|
discount_days: number | null;
|
|
352
354
|
discount_percentage: number | null;
|
|
353
355
|
discount_surcharge: string;
|
|
@@ -503,6 +505,7 @@ export declare const updateCustomer: import("@tanstack/start-client-core").Optio
|
|
|
503
505
|
custom_fields: import("../integrations/supabase/types.js").Json;
|
|
504
506
|
customer_class: string | null;
|
|
505
507
|
customer_number: string | null;
|
|
508
|
+
default_carrier_id: string | null;
|
|
506
509
|
discount_days: number | null;
|
|
507
510
|
discount_percentage: number | null;
|
|
508
511
|
discount_surcharge: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customers.functions.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAM5B,KAAK,cAAc,GAAG;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAqCF,gFAAgF;AAChF,eAAO,MAAM,gCAAgC;;;;;;;;;;;;GAQzC,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,wBAAwB;;;;8CAEX;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;;;;GAgBpC,CAAC;AAEL,eAAO,MAAM,qBAAqB;;;;8CAER;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,KACiD;IAC9F,KAAK,EAAE,cAAc,CAAC;CACvB;;;;;;GAaD,CAAC;AAGL,eAAO,MAAM,aAAa;;;;8CAEA,gBAAgB;;;;;;;;;;GA+CtC,CAAC;AAEL,eAAO,MAAM,WAAW;;;;8CAEE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE
|
|
1
|
+
{"version":3,"file":"customers.functions.d.ts","sourceRoot":"","sources":["../../src/lib/customers.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -328,6 +328,13 @@ export const updateCustomer = createServerFn({ method: "POST" })
|
|
|
328
328
|
const { supabase } = context;
|
|
329
329
|
const { id, force: _force, base, base_updated_at, ...patch } = data;
|
|
330
330
|
const { ACCOUNTING_DEFAULTS } = await import("./customer-insert.js");
|
|
331
|
+
if (typeof patch.country === "string" && patch.country.trim() && patch.country !== base?.country) {
|
|
332
|
+
const { normalizeCustomerCountry } = await import("./customer-schemas.js");
|
|
333
|
+
const iso = normalizeCustomerCountry(patch.country);
|
|
334
|
+
if (!iso)
|
|
335
|
+
throw new Error(`Onbekend land: ${patch.country}. Kies een land uit de lijst.`);
|
|
336
|
+
patch.country = iso;
|
|
337
|
+
}
|
|
331
338
|
const cleaned = {};
|
|
332
339
|
for (const [k, v] of Object.entries(patch)) {
|
|
333
340
|
if (v === undefined)
|
|
@@ -23,8 +23,8 @@ declare const locationSchema: z.ZodObject<{
|
|
|
23
23
|
}, z.core.$strip>;
|
|
24
24
|
export type LocationInput = z.infer<typeof locationSchema>;
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
27
|
-
*
|
|
26
|
+
* VEROUDERD: niet meer gebruiken. De vervoerderkeuze is van de Logistieke Engine
|
|
27
|
+
* (logistics_resolve_carrier_for_location). Blijft alleen staan voor oudere aanroepers.
|
|
28
28
|
*/
|
|
29
29
|
export declare function pickCarrierForLocation(location: {
|
|
30
30
|
country?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-locations.functions.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-locations.functions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"delivery-locations.functions.d.ts","sourceRoot":"","sources":["../../src/lib/delivery-locations.functions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;iBAoBnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAa3D;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EACrF,QAAQ,EAAE,KAAK,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACnC,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACnC,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC,GACD;IAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,CAgBnF;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;GAUrB,CAAC;AAEL,eAAO,MAAM,qBAAqB;;;;8CAGtB;IACN,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;kBAJe,MAAM,GAAG,IAAI;gBACf,MAAM,GAAG,IAAI;wBACL,MAAM,GAAG,IAAI;mBAClB,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;GAwB9B,CAAC;AAEL,eAAO,MAAM,sBAAsB;;;;8CAET,aAAa;;;;;;;;;;;;;;;;;;;GAoEnC,CAAC;AAEL,eAAO,MAAM,0BAA0B;;;;8CAEb;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;QAAR,MAAM;;;GAKlC,CAAC;AAEL,eAAO,MAAM,sBAAsB;;;;8CAET;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;QAAR,MAAM;;;GAQlC,CAAC;AAGL,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,2BAA2B,EAAE,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AA4BF,eAAO,MAAM,+BAA+B;;;;8CAElB,OAAO;;yCAmI7B,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { createServerFn } from "@tanstack/react-start";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
4
4
|
import { regionAliases } from "./eu-regions.js";
|
|
5
|
+
import { toIsoCountry } from "./countries.js";
|
|
6
|
+
import { locationCarrierFields } from "./carrier-choice.js";
|
|
5
7
|
const locationSchema = z.object({
|
|
6
8
|
id: z.string().uuid().optional(),
|
|
7
9
|
customer_id: z.string().uuid().nullable().optional(),
|
|
@@ -31,8 +33,8 @@ function matchesAny(list, value) {
|
|
|
31
33
|
return aliases.some((a) => entries.includes(a));
|
|
32
34
|
}
|
|
33
35
|
/**
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
+
* VEROUDERD: niet meer gebruiken. De vervoerderkeuze is van de Logistieke Engine
|
|
37
|
+
* (logistics_resolve_carrier_for_location). Blijft alleen staan voor oudere aanroepers.
|
|
36
38
|
*/
|
|
37
39
|
export function pickCarrierForLocation(location, carriers) {
|
|
38
40
|
// Carriers worden vooraf op sort_order (asc) gesorteerd; .find() pakt
|
|
@@ -102,22 +104,24 @@ export const upsertDeliveryLocation = createServerFn({ method: "POST" })
|
|
|
102
104
|
.inputValidator((input) => locationSchema.parse(input))
|
|
103
105
|
.handler(async ({ data, context }) => {
|
|
104
106
|
const { supabase } = context;
|
|
105
|
-
//
|
|
106
|
-
|
|
107
|
-
let
|
|
108
|
-
if (data.self_pickup)
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
.from("carriers")
|
|
115
|
-
.select("id, service_countries, service_provinces, service_cities, sort_order")
|
|
116
|
-
.order("sort_order", { ascending: true });
|
|
117
|
-
const picked = pickCarrierForLocation({ country: data.country, province: data.province, city: data.city }, carriers ?? []);
|
|
118
|
-
carrier_id = picked.carrier_id;
|
|
119
|
-
source = picked.carrier_id ? "auto" : "none";
|
|
107
|
+
// Vervoerder: Klanten kiest niet zelf. "Automatisch" bewaart geen voorstel (carrier_id leeg);
|
|
108
|
+
// de Logistieke Engine bepaalt het voorstel altijd live.
|
|
109
|
+
let choice;
|
|
110
|
+
if (data.self_pickup)
|
|
111
|
+
choice = { kind: "self_pickup" };
|
|
112
|
+
else if (data.carrier_assignment_source === "manual") {
|
|
113
|
+
if (!data.carrier_id)
|
|
114
|
+
throw new Error("Kies een vervoerder of zet de keuze op Automatisch.");
|
|
115
|
+
choice = { kind: "carrier", carrier_id: data.carrier_id };
|
|
120
116
|
}
|
|
117
|
+
else
|
|
118
|
+
choice = { kind: "auto" };
|
|
119
|
+
const { carrier_id, carrier_assignment_source: source, self_pickup } = locationCarrierFields(choice);
|
|
120
|
+
// Land altijd als ISO-code; een onbekend land wordt nooit geraden.
|
|
121
|
+
const rawCountry = (data.country ?? "").trim();
|
|
122
|
+
const country = rawCountry ? toIsoCountry(rawCountry) : null;
|
|
123
|
+
if (rawCountry && !country)
|
|
124
|
+
throw new Error(`Onbekend land "${rawCountry}". Kies het land uit de lijst.`);
|
|
121
125
|
const addressParts = [
|
|
122
126
|
[data.street, data.house_number].filter(Boolean).join(" "),
|
|
123
127
|
[data.postal_code, data.city].filter(Boolean).join(" "),
|
|
@@ -134,12 +138,12 @@ export const upsertDeliveryLocation = createServerFn({ method: "POST" })
|
|
|
134
138
|
postal_code: data.postal_code || null,
|
|
135
139
|
city: data.city || null,
|
|
136
140
|
province: data.province || null,
|
|
137
|
-
country
|
|
141
|
+
country,
|
|
138
142
|
carrier_id,
|
|
139
143
|
carrier_assignment_source: source,
|
|
140
144
|
// Vast maken loopt via set_primary_delivery_location (precies één per klant).
|
|
141
145
|
is_primary: false,
|
|
142
|
-
self_pickup
|
|
146
|
+
self_pickup,
|
|
143
147
|
};
|
|
144
148
|
const makePrimary = async (id) => {
|
|
145
149
|
const { error } = await supabase.rpc("set_primary_delivery_location", { p_location_id: id });
|
|
@@ -246,10 +250,6 @@ export const importFloridayDeliveryLocations = createServerFn({ method: "POST" }
|
|
|
246
250
|
if (r.floriday_location_id)
|
|
247
251
|
existing.set(String(r.floriday_location_id), String(r.id));
|
|
248
252
|
}
|
|
249
|
-
const { data: carriers } = await sb
|
|
250
|
-
.from("carriers")
|
|
251
|
-
.select("id, service_countries, service_provinces, service_cities, sort_order")
|
|
252
|
-
.order("sort_order", { ascending: true });
|
|
253
253
|
const items = [];
|
|
254
254
|
let created = 0;
|
|
255
255
|
let updated = 0;
|
|
@@ -279,7 +279,6 @@ export const importFloridayDeliveryLocations = createServerFn({ method: "POST" }
|
|
|
279
279
|
items.push(item);
|
|
280
280
|
continue;
|
|
281
281
|
}
|
|
282
|
-
const picked = pickCarrierForLocation({ country: addr.country, province: addr.province, city: addr.city }, carriers ?? []);
|
|
283
282
|
const payload = {
|
|
284
283
|
customer_id: null,
|
|
285
284
|
group_key: group.group_key,
|
|
@@ -293,29 +292,23 @@ export const importFloridayDeliveryLocations = createServerFn({ method: "POST" }
|
|
|
293
292
|
postal_code: addr.postalCode,
|
|
294
293
|
city: addr.city,
|
|
295
294
|
province: addr.province,
|
|
296
|
-
|
|
295
|
+
// ISO-code als die bekend is; anders de Floriday-waarde ongewijzigd (verschijnt in de landenlijst).
|
|
296
|
+
country: toIsoCountry(addr.country) ?? addr.country,
|
|
297
297
|
gln: row.gln_code ?? null,
|
|
298
298
|
raw: row.data ?? null,
|
|
299
|
-
|
|
300
|
-
|
|
299
|
+
// Nieuwe locatie: Automatisch (geen opgeslagen voorstel).
|
|
300
|
+
carrier_id: null,
|
|
301
|
+
carrier_assignment_source: "auto",
|
|
301
302
|
self_pickup: false,
|
|
302
303
|
};
|
|
303
304
|
const existingId = existing.get(floridayId);
|
|
304
305
|
if (existingId) {
|
|
305
306
|
updated++;
|
|
306
307
|
if (!data.preview) {
|
|
307
|
-
// Alleen Floriday-bronvelden bijwerken; is_primary en
|
|
308
|
-
// vervoerderkeuze (manual) blijven ongemoeid.
|
|
308
|
+
// Alleen Floriday-bronvelden bijwerken; is_primary en de vervoerderkeuze blijven ongemoeid.
|
|
309
309
|
const { carrier_id: _c, carrier_assignment_source: _s, ...rest } = payload;
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
.select("carrier_assignment_source, carrier_id")
|
|
313
|
-
.eq("id", existingId)
|
|
314
|
-
.maybeSingle();
|
|
315
|
-
const keepCarrier = cur?.carrier_assignment_source === "manual";
|
|
316
|
-
const updatePayload = keepCarrier
|
|
317
|
-
? rest
|
|
318
|
-
: { ...rest, carrier_id: payload.carrier_id, carrier_assignment_source: payload.carrier_assignment_source };
|
|
310
|
+
// Bestaande vervoerderkeuze (ook Automatisch en zelf ophalen) blijft altijd ongemoeid.
|
|
311
|
+
const { self_pickup: _p, ...updatePayload } = rest;
|
|
319
312
|
const { error } = await sb
|
|
320
313
|
.from("customer_delivery_locations")
|
|
321
314
|
.update(updatePayload)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"price-groups-local.functions.d.ts","sourceRoot":"","sources":["../../src/lib/price-groups-local.functions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"price-groups-local.functions.d.ts","sourceRoot":"","sources":["../../src/lib/price-groups-local.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -484,7 +484,10 @@ export const addFloridayMemberToPriceGroup = createServerFn({ method: "POST" })
|
|
|
484
484
|
.inputValidator((input) => z.object({ organizationId: z.string().min(1).max(64), priceGroupId: z.string().uuid() }).parse(input))
|
|
485
485
|
.handler(async ({ data, context }) => {
|
|
486
486
|
const sb = context.supabase;
|
|
487
|
-
|
|
487
|
+
// promote_floriday_customer is "beheerder of server"; de ingelogde gebruiker is al gecontroleerd,
|
|
488
|
+
// dus de server roept hem aan met de service-client.
|
|
489
|
+
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
490
|
+
const { data: customerId, error } = await supabaseAdmin.rpc("promote_floriday_customer", { _org_id: data.organizationId });
|
|
488
491
|
if (error)
|
|
489
492
|
throw new Error(error.message);
|
|
490
493
|
// Debiteur alleen na bewuste bevestiging: kenmerk uit, zodat ook latere wijzigingen niets versturen.
|
|
@@ -0,0 +1,59 @@
|
|
|
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 type LoadedLabel = {
|
|
7
|
+
naam: string | null;
|
|
8
|
+
breedte_mm: number;
|
|
9
|
+
hoogte_mm: number;
|
|
10
|
+
printer: string | null;
|
|
11
|
+
};
|
|
12
|
+
export type SizeMethod = "pdf" | "dpi" | "svg" | "verhouding" | "onbekend";
|
|
13
|
+
export type StickerSizeResult = {
|
|
14
|
+
method: SizeMethod;
|
|
15
|
+
/** Zeker gevonden maat (pdf/dpi/svg) – direct op te slaan. */
|
|
16
|
+
size: {
|
|
17
|
+
width_mm: number;
|
|
18
|
+
height_mm: number;
|
|
19
|
+
} | null;
|
|
20
|
+
/** Voorstel via verhouding – pas opslaan na bevestiging. */
|
|
21
|
+
suggestion: {
|
|
22
|
+
width_mm: number;
|
|
23
|
+
height_mm: number;
|
|
24
|
+
label: string | null;
|
|
25
|
+
printer: string | null;
|
|
26
|
+
} | null;
|
|
27
|
+
/** Pixelmaat als bekend (voor verhouding). */
|
|
28
|
+
pixels?: {
|
|
29
|
+
w: number;
|
|
30
|
+
h: number;
|
|
31
|
+
} | null;
|
|
32
|
+
};
|
|
33
|
+
export declare const RATIO_TOLERANCE = 0.03;
|
|
34
|
+
export declare function pdfPageSizeMm(bytes: Uint8Array): {
|
|
35
|
+
width_mm: number;
|
|
36
|
+
height_mm: number;
|
|
37
|
+
} | null;
|
|
38
|
+
type ImgInfo = {
|
|
39
|
+
w: number;
|
|
40
|
+
h: number;
|
|
41
|
+
dpiX: number | null;
|
|
42
|
+
dpiY: number | null;
|
|
43
|
+
};
|
|
44
|
+
export declare function pngInfo(b: Uint8Array): ImgInfo | null;
|
|
45
|
+
export declare function jpegInfo(b: Uint8Array): ImgInfo | null;
|
|
46
|
+
export declare function svgInfo(b: Uint8Array): {
|
|
47
|
+
size: {
|
|
48
|
+
width_mm: number;
|
|
49
|
+
height_mm: number;
|
|
50
|
+
} | null;
|
|
51
|
+
ratio: number | null;
|
|
52
|
+
};
|
|
53
|
+
/** Eén unieke etiketmaat met dezelfde verhouding (staand of liggend), anders null. */
|
|
54
|
+
export declare function matchLabelByRatio(ratio: number, labels: LoadedLabel[], tolerance?: number): StickerSizeResult["suggestion"];
|
|
55
|
+
export declare function detectStickerSize(bytes: Uint8Array, mime: string | null, labels: LoadedLabel[]): StickerSizeResult;
|
|
56
|
+
/** Zet geladen_etiket-jsonb uit Layouts om; onbruikbare waarden worden genegeerd. */
|
|
57
|
+
export declare function parseLoadedLabel(raw: unknown, printer: string | null): LoadedLabel | null;
|
|
58
|
+
export {};
|
|
59
|
+
//# sourceMappingURL=sticker-size.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sticker-size.d.ts","sourceRoot":"","sources":["../../src/lib/sticker-size.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AACjH,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,CAAC;AAC3E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,8DAA8D;IAC9D,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACrD,4DAA4D;IAC5D,UAAU,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACzG,8CAA8C;IAC9C,MAAM,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,eAAe,OAAO,CAAC;AAUpC,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAsB/F;AAED,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAElF,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,IAAI,CAkBrD;AA4BD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,IAAI,CA8BtD;AAID,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,GAAG;IAAE,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAerH;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,WAAW,EAAE,EACrB,SAAS,SAAkB,GAC1B,iBAAiB,CAAC,YAAY,CAAC,CAkBjC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,iBAAiB,CA6BlH;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,CAMzF"}
|