@flowselections/floriday-klanten-module 1.0.64 → 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/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/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 +7 -3
- 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/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/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
|
@@ -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.
|
|
@@ -105,6 +105,7 @@ export declare const adoptTwinfieldCustomer: import("@tanstack/start-client-core
|
|
|
105
105
|
}) => {
|
|
106
106
|
code: string;
|
|
107
107
|
values: {
|
|
108
|
+
country: string | undefined;
|
|
108
109
|
is_active: boolean;
|
|
109
110
|
force: boolean;
|
|
110
111
|
twinfield_create: boolean;
|
|
@@ -129,7 +130,6 @@ export declare const adoptTwinfieldCustomer: import("@tanstack/start-client-core
|
|
|
129
130
|
street?: string | undefined;
|
|
130
131
|
house_number?: string | undefined;
|
|
131
132
|
city?: string | undefined;
|
|
132
|
-
country?: string | undefined;
|
|
133
133
|
customer_class?: string | undefined;
|
|
134
134
|
notes?: string | undefined;
|
|
135
135
|
customer_number?: string | undefined;
|
|
@@ -204,6 +204,7 @@ export declare const adoptTwinfieldCustomer: import("@tanstack/start-client-core
|
|
|
204
204
|
custom_fields: import("../integrations/supabase/types.js").Json;
|
|
205
205
|
customer_class: string | null;
|
|
206
206
|
customer_number: string | null;
|
|
207
|
+
default_carrier_id: string | null;
|
|
207
208
|
discount_days: number | null;
|
|
208
209
|
discount_percentage: number | null;
|
|
209
210
|
discount_surcharge: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"twinfield-adopt.functions.d.ts","sourceRoot":"","sources":["../../src/lib/twinfield-adopt.functions.ts"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oFAAoF;IACpF,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,GAAG,IAAI,CAAC;IACnD,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,wBAAwB,EAAE,MAAM,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAwEF;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAkExE;AAgDD;;;;GAIG;AACH,eAAO,MAAM,wBAAwB;;;;8CAEX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE;;;;aAYjB,MAAM;;;;;;;;;GAelD,CAAC;AAQL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE
|
|
1
|
+
{"version":3,"file":"twinfield-adopt.functions.d.ts","sourceRoot":"","sources":["../../src/lib/twinfield-adopt.functions.ts"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oFAAoF;IACpF,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,GAAG,IAAI,CAAC;IACnD,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,wBAAwB,EAAE,MAAM,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAwEF;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAkExE;AAgDD;;;;GAIG;AACH,eAAO,MAAM,wBAAwB;;;;8CAEX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE;;;;aAYjB,MAAM;;;;;;;;;GAelD,CAAC;AAQL;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsF9E,CAAC"}
|
|
@@ -101,7 +101,7 @@ export function toPrefill(row) {
|
|
|
101
101
|
house_number,
|
|
102
102
|
postal_code: pick(addr.postcode, data.postcode, data.postal_code),
|
|
103
103
|
city: pick(addr.city, data.city),
|
|
104
|
-
country: countryCode ?
|
|
104
|
+
country: countryCode ? countryCode : "",
|
|
105
105
|
vat_number: pick(row.vat_number, data.vat_number, data.vatnumber, addr.field4, addr.vat_number),
|
|
106
106
|
website: pick(data.website),
|
|
107
107
|
contact_person: pick(addr.contact, data.contact_person, attention),
|
|
@@ -125,7 +125,7 @@ export function toPrefill(row) {
|
|
|
125
125
|
bank_bic: pick(bank.biccode, bank.bicode),
|
|
126
126
|
bank_city: pick(bank.city),
|
|
127
127
|
bank_postal_code: pick(bank.postcode),
|
|
128
|
-
bank_country: pick(bank.country) ?
|
|
128
|
+
bank_country: pick(bank.country) ? pick(bank.country).toUpperCase() : "",
|
|
129
129
|
bank_address_line1: pick(bank.address),
|
|
130
130
|
ledger_account: pick(fin.substitutewith, data.grootboekrekening) || null,
|
|
131
131
|
credit_limit: numOrNull(cm.basecreditlimit),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { toIsoCountry } from "./countries.js";
|
|
2
2
|
export const EMPTY_CUSTOMER_DEFAULTS = {
|
|
3
3
|
ledger_account: null, country: null, language: null, payment_term_days: null,
|
|
4
4
|
missing: ["ledger_account", "country", "language", "payment_term_days"],
|
|
@@ -19,7 +19,7 @@ export function toCustomerDefaults(s) {
|
|
|
19
19
|
const txt = (v) => (v === null || v === undefined || String(v).trim() === "" ? null : String(v).trim());
|
|
20
20
|
const ledger = txt(s?.customer_gl_account);
|
|
21
21
|
const iso = toIsoCountry(txt(s?.default_country));
|
|
22
|
-
const country = iso
|
|
22
|
+
const country = iso ?? null;
|
|
23
23
|
const language = txt(s?.default_language)?.toLowerCase() ?? null;
|
|
24
24
|
const n = Number(s?.sales_payment_term_days);
|
|
25
25
|
const term = Number.isFinite(n) && n > 0 ? n : null;
|
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.67",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -73,7 +73,14 @@
|
|
|
73
73
|
"schema": {
|
|
74
74
|
"file": "schema/klanten.sql",
|
|
75
75
|
"order": 40
|
|
76
|
-
}
|
|
76
|
+
},
|
|
77
|
+
"ai": [
|
|
78
|
+
{
|
|
79
|
+
"moduleKey": "klanten-stickers",
|
|
80
|
+
"name": "Klantstickers",
|
|
81
|
+
"description": "Leest klantstickers met AI"
|
|
82
|
+
}
|
|
83
|
+
]
|
|
77
84
|
},
|
|
78
85
|
"files": [
|
|
79
86
|
"dist-lib",
|
|
@@ -113,8 +120,9 @@
|
|
|
113
120
|
},
|
|
114
121
|
"devDependencies": {
|
|
115
122
|
"@cloudflare/vite-plugin": "^1.25.5",
|
|
123
|
+
"@electric-sql/pglite": "^0.5.11",
|
|
116
124
|
"@eslint/js": "^9.32.0",
|
|
117
|
-
"@flowselections/core": "1.0.
|
|
125
|
+
"@flowselections/core": "1.0.30",
|
|
118
126
|
"@lovable.dev/vite-tanstack-config": "2.26.5",
|
|
119
127
|
"@rsbuild/core": "^1.0.0",
|
|
120
128
|
"@tailwindcss/vite": "^4.2.1",
|