@flowselections/floriday-verkoop-module 1.0.166 → 1.0.167
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/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +132 -25
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +1 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +9 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +21 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +13 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +26 -4
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +8 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +107 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +19 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +26 -0
- package/dist-lib/integrations/supabase/types.d.ts +1139 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.d.ts +13 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +41 -0
- package/dist-lib/lib/create-order-form.d.ts +7 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +17 -1
- package/dist-lib/lib/create-order.functions.d.ts +10 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +88 -16
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +5 -0
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +21 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts +20 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts.map +1 -0
- package/dist-lib/lib/order-bijwerken.server.js +31 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +33 -23
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +4 -13
- package/dist-lib/lib/order-cf-merge.d.ts +17 -0
- package/dist-lib/lib/order-cf-merge.d.ts.map +1 -0
- package/dist-lib/lib/order-cf-merge.js +51 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +20 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +26 -5
- package/dist-lib/lib/order-line-extras.d.ts +94 -0
- package/dist-lib/lib/order-line-extras.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts +55 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.js +117 -0
- package/dist-lib/lib/order-line-extras.js +171 -0
- package/dist-lib/lib/order-nav.d.ts +8 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -1
- package/dist-lib/lib/order-nav.js +13 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +5 -9
- package/dist-lib/lib/order-status.d.ts +9 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -0
- package/dist-lib/lib/order-transport.functions.d.ts +9 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +21 -3
- package/dist-lib/lib/order-transport.server.d.ts +1 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.server.js +15 -1
- package/dist-lib/lib/own-transport.d.ts +6 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +12 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -2
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +7 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.js +2 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.js +7 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.js +5 -0
- package/dist-lib/lib/voorraad-vrij.d.ts +19 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +34 -0
- package/package.json +4 -4
- package/schema/verkoop.sql +560 -0
|
@@ -17,4 +17,17 @@ export declare function leesGearchiveerdeKlanten(haalPortie: (van: number, tot:
|
|
|
17
17
|
export declare function zonderGearchiveerd<T extends {
|
|
18
18
|
id: string;
|
|
19
19
|
}>(rows: T[], gearchiveerd: Set<string>): T[];
|
|
20
|
+
/**
|
|
21
|
+
* Leest alle klant-ids uit klanten_selecteerbaar in porties van 1000.
|
|
22
|
+
* null = view ontbreekt (dan het archief gebruiken). Kolom eerst "id",
|
|
23
|
+
* bij een kolomfout (42703) "customer_id". Andere fouten worden gegooid.
|
|
24
|
+
*/
|
|
25
|
+
export declare function leesSelecteerbareKlanten(haalPortie: (kolom: "id" | "customer_id", van: number, tot: number) => PromiseLike<{
|
|
26
|
+
data: Array<Record<string, unknown>> | null;
|
|
27
|
+
error: unknown;
|
|
28
|
+
}>): Promise<Set<string> | null>;
|
|
29
|
+
/** Klantkeuze: met view alleen kiesbare klanten, zonder view alles behalve het archief. */
|
|
30
|
+
export declare function kiesbareKlanten<T extends {
|
|
31
|
+
id: string;
|
|
32
|
+
}>(rows: T[], selecteerbaar: Set<string> | null, gearchiveerd: Set<string>): T[];
|
|
20
33
|
//# sourceMappingURL=create-order-customers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order-customers.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-customers.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EACtF,YAAY,EAAE,KAAK,CAAC;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACzE,MAAM,EAAE,CAAC,EAAE,GACV,CAAC,EAAE,CAiBL;AAMD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAO1D;AAED,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,+EAA+E;AAC/E,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC;IAAE,IAAI,EAAE,KAAK,CAAC;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GACvH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAYtB;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAEtG"}
|
|
1
|
+
{"version":3,"file":"create-order-customers.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-customers.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EACtF,YAAY,EAAE,KAAK,CAAC;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACzE,MAAM,EAAE,CAAC,EAAE,GACV,CAAC,EAAE,CAiBL;AAMD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAO1D;AAED,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,+EAA+E;AAC/E,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC;IAAE,IAAI,EAAE,KAAK,CAAC;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GACvH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAYtB;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAEtG;AAMD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,CAAC,KAAK,EAAE,IAAI,GAAG,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC;IAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GAClJ,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAkB7B;AAED,2FAA2F;AAC3F,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAGtI"}
|
|
@@ -52,3 +52,44 @@ export async function leesGearchiveerdeKlanten(haalPortie) {
|
|
|
52
52
|
export function zonderGearchiveerd(rows, gearchiveerd) {
|
|
53
53
|
return gearchiveerd.size ? rows.filter((r) => !gearchiveerd.has(r.id)) : rows;
|
|
54
54
|
}
|
|
55
|
+
// ─── Kiesbare klanten (view klanten_selecteerbaar, Klanten-module) ─────────
|
|
56
|
+
// Bestaat de view, dan bepaalt die wie kiesbaar is; anders het archief.
|
|
57
|
+
// Alleen voor de klantkeuze: bestaande orders tonen hun klant altijd.
|
|
58
|
+
/**
|
|
59
|
+
* Leest alle klant-ids uit klanten_selecteerbaar in porties van 1000.
|
|
60
|
+
* null = view ontbreekt (dan het archief gebruiken). Kolom eerst "id",
|
|
61
|
+
* bij een kolomfout (42703) "customer_id". Andere fouten worden gegooid.
|
|
62
|
+
*/
|
|
63
|
+
export async function leesSelecteerbareKlanten(haalPortie) {
|
|
64
|
+
for (const kolom of ["id", "customer_id"]) {
|
|
65
|
+
const ids = new Set();
|
|
66
|
+
let kolomFout = false;
|
|
67
|
+
for (let van = 0;; van += ARCHIEF_PORTIE) {
|
|
68
|
+
const { data, error } = await haalPortie(kolom, van, van + ARCHIEF_PORTIE - 1);
|
|
69
|
+
if (error) {
|
|
70
|
+
if (isArchiefOntbreekt(error))
|
|
71
|
+
return null;
|
|
72
|
+
if (String(error?.code ?? "") === "42703") {
|
|
73
|
+
kolomFout = true;
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
throw error;
|
|
77
|
+
}
|
|
78
|
+
const rows = data ?? [];
|
|
79
|
+
for (const r of rows)
|
|
80
|
+
if (r[kolom])
|
|
81
|
+
ids.add(String(r[kolom]));
|
|
82
|
+
if (rows.length < ARCHIEF_PORTIE)
|
|
83
|
+
return ids;
|
|
84
|
+
}
|
|
85
|
+
if (!kolomFout)
|
|
86
|
+
return ids;
|
|
87
|
+
}
|
|
88
|
+
throw new Error("klanten_selecteerbaar heeft geen kolom id of customer_id");
|
|
89
|
+
}
|
|
90
|
+
/** Klantkeuze: met view alleen kiesbare klanten, zonder view alles behalve het archief. */
|
|
91
|
+
export function kiesbareKlanten(rows, selecteerbaar, gearchiveerd) {
|
|
92
|
+
if (selecteerbaar)
|
|
93
|
+
return rows.filter((r) => selecteerbaar.has(r.id));
|
|
94
|
+
return zonderGearchiveerd(rows, gearchiveerd);
|
|
95
|
+
}
|
|
@@ -66,7 +66,7 @@ export type OrderprijsUitkomst = {
|
|
|
66
66
|
} | {
|
|
67
67
|
ok: false;
|
|
68
68
|
};
|
|
69
|
-
export declare const PRIJS_ONBEKEND_TEXT = "Geen prijs
|
|
69
|
+
export declare const PRIJS_ONBEKEND_TEXT = "Geen prijs gevonden; vul zelf een prijs in";
|
|
70
70
|
/** Prijs uit klanten_orderprijs die echt bekend is: net_price 0 betekent "geen prijs bekend" (artikel zonder verkoopprijs). */
|
|
71
71
|
export declare function bekendePrijs(p: Orderprijs | null | undefined): {
|
|
72
72
|
unit_price: number | null;
|
|
@@ -78,6 +78,12 @@ export declare function regelMistPrijs(l: {
|
|
|
78
78
|
unit_price: number | null;
|
|
79
79
|
price_zero_ok?: boolean;
|
|
80
80
|
}): boolean;
|
|
81
|
+
/**
|
|
82
|
+
* Volgorde: prijs uit klanten_orderprijs (prijsgroep/klantprijs) → verkoopprijs
|
|
83
|
+
* van het artikel → geen prijs. Alleen bij een geslaagde aanroep zonder
|
|
84
|
+
* bekende prijs; een mislukte aanroep krijgt nooit een andere prijs.
|
|
85
|
+
*/
|
|
86
|
+
export declare function metVerkoopprijs(uit: OrderprijsUitkomst, verkoopprijs: number | null | undefined): OrderprijsUitkomst;
|
|
81
87
|
export declare const PRIJS_FOUT_TEXT = "Prijs ophalen lukt niet; vul hem zelf in of probeer het opnieuw.";
|
|
82
88
|
/** "Prijsgroep: Groothandel", "Klantprijs", "Klantkorting", "Standaardprijs". */
|
|
83
89
|
export declare function prijsBronLabel(p: Pick<Orderprijs, "bron" | "price_group_name"> | null | undefined): string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order-form.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-form.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create-order-form.d.ts","sourceRoot":"","sources":["../../src/lib/create-order-form.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export function attentionItems(s) {
|
|
|
86
86
|
out.push(`${n(s.linesOverStock)} meer dan beschikbaar`);
|
|
87
87
|
return out;
|
|
88
88
|
}
|
|
89
|
-
export const PRIJS_ONBEKEND_TEXT = "Geen prijs
|
|
89
|
+
export const PRIJS_ONBEKEND_TEXT = "Geen prijs gevonden; vul zelf een prijs in";
|
|
90
90
|
/** Prijs uit klanten_orderprijs die echt bekend is: net_price 0 betekent "geen prijs bekend" (artikel zonder verkoopprijs). */
|
|
91
91
|
export function bekendePrijs(p) {
|
|
92
92
|
if (!p || !(p.net_price > 0))
|
|
@@ -102,6 +102,21 @@ export function regelMistPrijs(l) {
|
|
|
102
102
|
return false;
|
|
103
103
|
return !(l.price_zero_ok && l.unit_price != null && p === 0);
|
|
104
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* Volgorde: prijs uit klanten_orderprijs (prijsgroep/klantprijs) → verkoopprijs
|
|
107
|
+
* van het artikel → geen prijs. Alleen bij een geslaagde aanroep zonder
|
|
108
|
+
* bekende prijs; een mislukte aanroep krijgt nooit een andere prijs.
|
|
109
|
+
*/
|
|
110
|
+
export function metVerkoopprijs(uit, verkoopprijs) {
|
|
111
|
+
if (!uit.ok)
|
|
112
|
+
return uit;
|
|
113
|
+
if (uit.prijs && uit.prijs.net_price > 0)
|
|
114
|
+
return uit;
|
|
115
|
+
const v = Number(verkoopprijs);
|
|
116
|
+
if (!(v > 0))
|
|
117
|
+
return uit;
|
|
118
|
+
return { ok: true, prijs: { net_price: v, currency: uit.prijs?.currency ?? null, bron: "verkoopprijs", price_group_id: null, price_group_name: null } };
|
|
119
|
+
}
|
|
105
120
|
export const PRIJS_FOUT_TEXT = "Prijs ophalen lukt niet; vul hem zelf in of probeer het opnieuw.";
|
|
106
121
|
/** "Prijsgroep: Groothandel", "Klantprijs", "Klantkorting", "Standaardprijs". */
|
|
107
122
|
export function prijsBronLabel(p) {
|
|
@@ -112,6 +127,7 @@ export function prijsBronLabel(p) {
|
|
|
112
127
|
case "prijsgroep": return p.price_group_name ? `Prijsgroep: ${p.price_group_name}` : "Prijsgroep";
|
|
113
128
|
case "klantkorting": return "Klantkorting";
|
|
114
129
|
case "standaardprijs": return "Standaardprijs";
|
|
130
|
+
case "verkoopprijs": return "Verkoopprijs artikel";
|
|
115
131
|
default: return null;
|
|
116
132
|
}
|
|
117
133
|
}
|
|
@@ -175,6 +175,14 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
175
175
|
vbn_package_code?: string | null | undefined;
|
|
176
176
|
load_carrier_type?: string | null | undefined;
|
|
177
177
|
packing_source?: "product_primary" | "customer" | "chosen" | null | undefined;
|
|
178
|
+
line_note?: string | null | undefined;
|
|
179
|
+
line_fields?: {
|
|
180
|
+
key: string;
|
|
181
|
+
label: string;
|
|
182
|
+
value: string;
|
|
183
|
+
}[] | undefined;
|
|
184
|
+
product_sticker_id?: string | null | undefined;
|
|
185
|
+
fust_sticker_id?: string | null | undefined;
|
|
178
186
|
}[];
|
|
179
187
|
deliveryLocationId?: string | null | undefined;
|
|
180
188
|
carrierId?: string | null | undefined;
|
|
@@ -256,6 +264,7 @@ export declare const getLocalOrderForEdit: import("@tanstack/start-client-core")
|
|
|
256
264
|
canEditProducts: boolean;
|
|
257
265
|
shippedLock: string | null;
|
|
258
266
|
vervoerSoort: import("./own-transport.js").VervoerSoort;
|
|
267
|
+
floridayCarrierNotice: string | null;
|
|
259
268
|
priceLock: string | null;
|
|
260
269
|
items: {
|
|
261
270
|
id: string;
|
|
@@ -333,13 +342,7 @@ export declare const getOrderPrices: import("@tanstack/start-client-core").Optio
|
|
|
333
342
|
quantity?: number | undefined;
|
|
334
343
|
}[];
|
|
335
344
|
onDate?: string | undefined;
|
|
336
|
-
}, Promise<(
|
|
337
|
-
ok: false;
|
|
338
|
-
prijs?: undefined;
|
|
339
|
-
} | {
|
|
340
|
-
ok: true;
|
|
341
|
-
prijs: import("./create-order-form.js").Orderprijs | null;
|
|
342
|
-
})[]>>;
|
|
345
|
+
}, Promise<import("./create-order-form.js").OrderprijsUitkomst[]>>;
|
|
343
346
|
export declare const listCustomerStickerProducts: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
344
347
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
345
348
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,2BAA2B;;;;;;YAqCpB,MAAM;sBACc,MAAM,GAAG,IAAI;yBACG,MAAM,GAAG,IAAI;cACnC,MAAM,GAAG,IAAI;eACX,MAAM,GAAG,IAAI;wBACK,MAAM,GAAG,IAAI;gBACvC,MAAM;;;GAkB9B,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;;;YAuE7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;QAClD,mFAAmF;qBACtE,MAAM,EAAE;;GA0VvB,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAOL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;GAWzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;;;;;YAuCI,MAAM;;;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AA4FL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAiYL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;GAe7B,CAAC;AAOL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;GAkC7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAkDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;;;;;YAgD7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;;GAUpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmV7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAmBhE,CAAC;AAML,eAAO,MAAM,cAAc;;;;8CAED,OAAO;;;;;;;+DA0C7B,CAAC;AAML,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
// Server functions voor de handmatige "Nieuwe bestelling" flow.
|
|
2
2
|
// Deelt DB-queries met de Mailbox-module zodat beide manieren van
|
|
3
3
|
// orderinvoer identieke lijsten, validaties en berekeningen gebruiken.
|
|
4
|
+
import { normRegelVelden, opmerkingNorm } from "./order-line-extras.js";
|
|
4
5
|
import { stockError, stockErrorText } from "./stock-errors.js";
|
|
5
6
|
import { posOrNull, choosePacking } from "./packing-snapshot.js";
|
|
6
7
|
import { createServerFn } from "@tanstack/react-start";
|
|
7
8
|
import { shippedLockReason } from "./order-price-lock.js";
|
|
8
9
|
import { productNameForStorage } from "./product-name.js";
|
|
9
|
-
import { twinfieldOnlyRows, leesGearchiveerdeKlanten,
|
|
10
|
+
import { twinfieldOnlyRows, leesGearchiveerdeKlanten, leesSelecteerbareKlanten, kiesbareKlanten } from "./create-order-customers.js";
|
|
10
11
|
import { isGroepArtikel } from "./create-order-form.js";
|
|
11
12
|
import { z } from "zod";
|
|
12
13
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
@@ -20,7 +21,7 @@ export const listCustomersForCreateOrder = createServerFn({ method: "GET" })
|
|
|
20
21
|
.handler(async ({ context }) => {
|
|
21
22
|
// Alle klanten (ook inactieve) laden voor de ontdubbeling van boekhoudregels;
|
|
22
23
|
// alleen actieve klanten komen in de lijst.
|
|
23
|
-
const [localRes, twRes, gearchiveerd] = await Promise.all([
|
|
24
|
+
const [localRes, twRes, gearchiveerd, selecteerbaar] = await Promise.all([
|
|
24
25
|
context.supabase
|
|
25
26
|
.from("customers")
|
|
26
27
|
.select("id, company_name, commercial_name, city, email, twinfield_code, source, is_active, blocked")
|
|
@@ -36,9 +37,14 @@ export const listCustomersForCreateOrder = createServerFn({ method: "GET" })
|
|
|
36
37
|
console.error("[nieuwe bestelling] archief lezen mislukt:", e);
|
|
37
38
|
throw new Error("De klantenlijst kon niet worden geladen. Probeer het opnieuw of neem contact op met de beheerder.");
|
|
38
39
|
}),
|
|
40
|
+
// Kiesbare klanten (view van Klanten). Ontbreekt de view → null → archief hierboven.
|
|
41
|
+
leesSelecteerbareKlanten((kolom, van, tot) => context.supabase.from("klanten_selecteerbaar").select(kolom).order(kolom).range(van, tot)).catch((e) => {
|
|
42
|
+
console.error("[nieuwe bestelling] klanten_selecteerbaar lezen mislukt:", e);
|
|
43
|
+
throw new Error("De klantenlijst kon niet worden geladen. Probeer het opnieuw of neem contact op met de beheerder.");
|
|
44
|
+
}),
|
|
39
45
|
]);
|
|
40
46
|
const all = (localRes.data ?? []);
|
|
41
|
-
const local =
|
|
47
|
+
const local = kiesbareKlanten(all.filter((c) => c.is_active !== false), selecteerbaar, gearchiveerd)
|
|
42
48
|
.map((c) => ({
|
|
43
49
|
id: c.id,
|
|
44
50
|
company_name: c.company_name,
|
|
@@ -517,6 +523,28 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
517
523
|
if (typeof k === "string" && k && !visualByKey.has(k))
|
|
518
524
|
visualByKey.set(k, v);
|
|
519
525
|
}
|
|
526
|
+
// Beschikbaar: zelfde bron als de voorraadlijst (voorraad_lijst_v2_rijen.vrij).
|
|
527
|
+
// Ontbreekt die functie of faalt hij, dan blijft de eigen telling staan (met logregel).
|
|
528
|
+
let vrijIndex = null;
|
|
529
|
+
try {
|
|
530
|
+
const { alleRijen } = await import("./all-rows.js");
|
|
531
|
+
const { voorraadIndex } = await import("./voorraad-vrij.js");
|
|
532
|
+
const rijen = await alleRijen((from, to) => context.supabase.rpc("voorraad_lijst_v2_rijen", { p_zoek: null }).select("id, floriday_id, voorraad_sleutel, vrij, liggend, gereserveerd").order("id").range(from, to));
|
|
533
|
+
vrijIndex = voorraadIndex(rijen, (Array.isArray(productsRes.data) ? productsRes.data : []));
|
|
534
|
+
}
|
|
535
|
+
catch (e) {
|
|
536
|
+
console.error("[listProducts] voorraadlijst (voorraad_lijst_v2_rijen) niet beschikbaar; eigen telling gebruikt:", e?.message ?? e);
|
|
537
|
+
}
|
|
538
|
+
if (vrijIndex) {
|
|
539
|
+
const { vrijVoor } = await import("./voorraad-vrij.js");
|
|
540
|
+
for (const it of byId.values()) {
|
|
541
|
+
const v = vrijVoor(vrijIndex, it.id);
|
|
542
|
+
if (v === null)
|
|
543
|
+
continue;
|
|
544
|
+
it.available_stock = v;
|
|
545
|
+
it.in_stock = v > 0;
|
|
546
|
+
}
|
|
547
|
+
}
|
|
520
548
|
const items = Array.from(byId.values()).map((it) => ({
|
|
521
549
|
...it,
|
|
522
550
|
image_url: visualByKey.get(it.id)?.image_url ?? null,
|
|
@@ -760,6 +788,11 @@ const LineInput = z.object({
|
|
|
760
788
|
vbn_package_code: z.string().max(50).nullable().optional(),
|
|
761
789
|
load_carrier_type: z.string().max(50).nullable().optional(),
|
|
762
790
|
packing_source: z.enum(["product_primary", "customer", "chosen"]).nullable().optional(),
|
|
791
|
+
// Regelgegevens (verkoop_orderregel_extra): opmerking, extra velden, stickerkeuze.
|
|
792
|
+
line_note: z.string().max(500).nullable().optional(),
|
|
793
|
+
line_fields: z.array(z.object({ key: z.string().min(1).max(60), label: z.string().max(80), value: z.string().max(200) })).max(30).optional(),
|
|
794
|
+
product_sticker_id: z.string().uuid().nullable().optional(),
|
|
795
|
+
fust_sticker_id: z.string().uuid().nullable().optional(),
|
|
763
796
|
});
|
|
764
797
|
/** Vaste verpakking-snapshot voor een nieuwe handmatige regel (HO). */
|
|
765
798
|
function snapshotForLine(l) {
|
|
@@ -1157,6 +1190,11 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
1157
1190
|
...snapshotForLine(l),
|
|
1158
1191
|
unit_price: l.unit_price ?? null,
|
|
1159
1192
|
needs_sticker: l.needs_sticker === true,
|
|
1193
|
+
// In dezelfde transactie naar verkoop_orderregel_extra (oudere database negeert ze).
|
|
1194
|
+
line_note: opmerkingNorm(l.line_note),
|
|
1195
|
+
line_fields: normRegelVelden(l.line_fields),
|
|
1196
|
+
product_sticker_id: l.product_sticker_id ?? null,
|
|
1197
|
+
fust_sticker_id: l.fust_sticker_id ?? null,
|
|
1160
1198
|
};
|
|
1161
1199
|
});
|
|
1162
1200
|
// Kop en alle regels in één databasetransactie; idempotent op het
|
|
@@ -1499,6 +1537,18 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1499
1537
|
const r = await resolveCarrierOne(context.supabase, order.id, { id: cf?.carrier ?? null, name: null });
|
|
1500
1538
|
return vervoerSoort({ ownTransport: !!cf?.own_transport, carrierKind: r.carrierKind });
|
|
1501
1539
|
})(),
|
|
1540
|
+
// Transporteur in Floriday wijkt af van de gekozen vervoerder: alleen melden (ERP wijzigt Floriday nooit).
|
|
1541
|
+
floridayCarrierNotice: await (async () => {
|
|
1542
|
+
try {
|
|
1543
|
+
const { loadFloridayCarrierNotices } = await import("./floriday-carrier-notice.server.js");
|
|
1544
|
+
const n = await loadFloridayCarrierNotices(context.supabase, [order.id]);
|
|
1545
|
+
return n[0]?.melding ?? null;
|
|
1546
|
+
}
|
|
1547
|
+
catch (e) {
|
|
1548
|
+
console.error("[bewerken] Floriday-transporteur vergelijken mislukt:", e?.message ?? e);
|
|
1549
|
+
return null;
|
|
1550
|
+
}
|
|
1551
|
+
})(),
|
|
1502
1552
|
// Prijs wijzigen: null = mag; anders de reden (definitieve factuur / Twinfield).
|
|
1503
1553
|
priceLock: await (async () => {
|
|
1504
1554
|
try {
|
|
@@ -1779,18 +1829,27 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1779
1829
|
newDeliveryTime = await deliveryTimeForMoment(context.supabase, resolved.carrierId ?? cf?.carrier ?? null, newMoment);
|
|
1780
1830
|
}
|
|
1781
1831
|
}
|
|
1782
|
-
|
|
1783
|
-
|
|
1784
|
-
|
|
1785
|
-
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
|
|
1789
|
-
|
|
1790
|
-
|
|
1791
|
-
|
|
1832
|
+
// Zelf ingevulde tijd met bron "handmatig" (metEigenOphaalmoment), zodat de Engine hem niet vervangt.
|
|
1833
|
+
const nieuweCf = eigenMoment
|
|
1834
|
+
? { ...metEigenOphaalmoment({ ...(cf ?? {}) }, newMoment), delivery_time: newDeliveryTime, ...(lateOverride ? { late_signup_override: lateOverride } : {}) }
|
|
1835
|
+
: { ...(cf ?? {}), delivery_time: newDeliveryTime, pickup_moment: newMoment, ...(lateOverride ? { late_signup_override: lateOverride } : {}) };
|
|
1836
|
+
// custom_fields samenvoegen in de database (jsonb ||), nooit vervangen.
|
|
1837
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
1838
|
+
let uErr = null;
|
|
1839
|
+
try {
|
|
1840
|
+
const r = await orderBijwerken(supabaseAdmin, data.orderId, {
|
|
1841
|
+
kolommen: { delivery_date: data.deliveryDate, updated_at: new Date().toISOString() },
|
|
1842
|
+
vorigeCf: cf ?? {},
|
|
1843
|
+
nieuweCf,
|
|
1844
|
+
});
|
|
1845
|
+
if (!r.ok)
|
|
1846
|
+
uErr = r.fout;
|
|
1847
|
+
}
|
|
1848
|
+
catch (e) {
|
|
1849
|
+
uErr = e.message;
|
|
1850
|
+
}
|
|
1792
1851
|
if (uErr)
|
|
1793
|
-
throw stockError(`Leverdatum bijwerken faalde: ${uErr
|
|
1852
|
+
throw stockError(`Leverdatum bijwerken faalde: ${uErr}`);
|
|
1794
1853
|
}
|
|
1795
1854
|
if (data.items && data.items.length > 0) {
|
|
1796
1855
|
for (const it of data.items) {
|
|
@@ -1905,8 +1964,8 @@ export const getOrderPrices = createServerFn({ method: "POST" })
|
|
|
1905
1964
|
})
|
|
1906
1965
|
.parse(input))
|
|
1907
1966
|
.handler(async ({ data, context }) => {
|
|
1908
|
-
const { parseOrderprijs } = await import("./create-order-form.js");
|
|
1909
|
-
|
|
1967
|
+
const { parseOrderprijs, metVerkoopprijs } = await import("./create-order-form.js");
|
|
1968
|
+
const uitkomsten = await Promise.all(data.lines.map(async (l) => {
|
|
1910
1969
|
try {
|
|
1911
1970
|
const { data: rows, error } = await context.supabase.rpc("klanten_orderprijs", {
|
|
1912
1971
|
p_customer_id: data.customerId,
|
|
@@ -1925,6 +1984,19 @@ export const getOrderPrices = createServerFn({ method: "POST" })
|
|
|
1925
1984
|
return { ok: false };
|
|
1926
1985
|
}
|
|
1927
1986
|
}));
|
|
1987
|
+
// Geen prijs uit de prijsgroep: verkoopprijs van het artikel (zelfde koppeling als Voorraad).
|
|
1988
|
+
const zonder = data.lines.filter((l, i) => { const u = uitkomsten[i]; return u.ok && !(u.prijs && u.prijs.net_price > 0); });
|
|
1989
|
+
if (zonder.length === 0)
|
|
1990
|
+
return uitkomsten;
|
|
1991
|
+
try {
|
|
1992
|
+
const { loadStockLinks } = await import("./stock-product-link.server.js");
|
|
1993
|
+
const links = await loadStockLinks(context.supabase, zonder.map((l) => l.productId));
|
|
1994
|
+
return uitkomsten.map((u, i) => metVerkoopprijs(u, links.get(data.lines[i].productId)?.salePrice ?? null));
|
|
1995
|
+
}
|
|
1996
|
+
catch (e) {
|
|
1997
|
+
console.error("[orderprijs] verkoopprijs artikel lezen mislukt:", e?.message ?? e);
|
|
1998
|
+
return uitkomsten;
|
|
1999
|
+
}
|
|
1928
2000
|
});
|
|
1929
2001
|
// ─── Standaard stickervinkje bij een nieuwe bestelling ──────────────────────
|
|
1930
2002
|
// Vinkje vooraf aan als er voor deze klant + dit product een vaste klantsticker
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"departure-preview.functions.d.ts","sourceRoot":"","sources":["../../src/lib/departure-preview.functions.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;;8CAEN,OAAO;;;;;;;;
|
|
1
|
+
{"version":3,"file":"departure-preview.functions.d.ts","sourceRoot":"","sources":["../../src/lib/departure-preview.functions.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;;8CAEN,OAAO;;;;;;;;GAgB7B,CAAC"}
|
|
@@ -6,11 +6,13 @@ export const getDeparturePreview = createServerFn({ method: "GET" })
|
|
|
6
6
|
.inputValidator((input) => z
|
|
7
7
|
.object({
|
|
8
8
|
carrierId: z.string().uuid().nullable(),
|
|
9
|
-
|
|
9
|
+
// Leeg mag alleen bij eigen vervoer / klant haalt op (geen afleveradres nodig).
|
|
10
|
+
deliveryLocation: z.string().max(100),
|
|
10
11
|
deliveryDate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
|
|
11
12
|
momentKey: z.string().max(64).nullable().optional(),
|
|
12
13
|
ownTransport: z.boolean().optional(),
|
|
13
14
|
})
|
|
15
|
+
.refine((d) => d.ownTransport === true || d.deliveryLocation.length > 0, { message: "Afleverlocatie ontbreekt." })
|
|
14
16
|
.parse(input))
|
|
15
17
|
.handler(async ({ data, context }) => {
|
|
16
18
|
const { loadDeparturePreview } = await import("./departure-preview.server.js");
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export type FloridayCarrier = {
|
|
2
|
+
name: string;
|
|
3
|
+
gln: string | null;
|
|
4
|
+
organizationId: string | null;
|
|
5
|
+
};
|
|
6
|
+
/** Transporteur uit custom_fields; zonder naam geen transporteur. */
|
|
7
|
+
export declare function floridayCarrierUitCf(cf: Record<string, unknown> | null | undefined): FloridayCarrier | null;
|
|
8
|
+
/** Floriday-order: bron floriday of een Floriday-verkoopordernummer. */
|
|
9
|
+
export declare function isFloridayOrderRij(r: {
|
|
10
|
+
order_source?: unknown;
|
|
11
|
+
floriday_sales_order_id?: unknown;
|
|
12
|
+
}): boolean;
|
|
13
|
+
export declare const floridayCarrierTekst: (naam: string) => string;
|
|
14
|
+
/**
|
|
15
|
+
* Melding als de gekozen vervoerder afwijkt van de transporteur in Floriday.
|
|
16
|
+
* Vergelijkt op GLN als beide bekend zijn, anders op naam. Geen gekozen
|
|
17
|
+
* vervoerder (of onbekend) → geen melding: er valt niets te vergelijken.
|
|
18
|
+
*/
|
|
19
|
+
export declare function floridayCarrierMelding(input: {
|
|
20
|
+
isFloriday: boolean;
|
|
21
|
+
floriday: FloridayCarrier | null;
|
|
22
|
+
gekozen: {
|
|
23
|
+
state: string | null | undefined;
|
|
24
|
+
name: string | null | undefined;
|
|
25
|
+
gln?: string | null;
|
|
26
|
+
};
|
|
27
|
+
}): string | null;
|
|
28
|
+
//# sourceMappingURL=floriday-carrier-notice.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"floriday-carrier-notice.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-carrier-notice.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAQlG,qEAAqE;AACrE,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,GAAG,IAAI,CAQ3G;AAED,wEAAwE;AACxE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAE5G;AAKD,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,WAAwC,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACrG,GAAG,MAAM,GAAG,IAAI,CAQhB"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
// Transporteur in Floriday vs. gekozen vervoerder (alleen weergave).
|
|
2
|
+
// De Floriday-koppeling schrijft floriday_carrier_* in orders.custom_fields;
|
|
3
|
+
// Verkoop leest ze alleen en wijzigt de transporteur in Floriday nooit.
|
|
4
|
+
// Pure code, veilig voor scherm en server.
|
|
5
|
+
const tekst = (v) => {
|
|
6
|
+
if (v === null || v === undefined)
|
|
7
|
+
return null;
|
|
8
|
+
const s = String(v).trim();
|
|
9
|
+
return s ? s : null;
|
|
10
|
+
};
|
|
11
|
+
/** Transporteur uit custom_fields; zonder naam geen transporteur. */
|
|
12
|
+
export function floridayCarrierUitCf(cf) {
|
|
13
|
+
const name = tekst(cf?.floriday_carrier_name);
|
|
14
|
+
if (!name)
|
|
15
|
+
return null;
|
|
16
|
+
return {
|
|
17
|
+
name,
|
|
18
|
+
gln: tekst(cf?.floriday_carrier_gln),
|
|
19
|
+
organizationId: tekst(cf?.floriday_carrier_organization_id),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
/** Floriday-order: bron floriday of een Floriday-verkoopordernummer. */
|
|
23
|
+
export function isFloridayOrderRij(r) {
|
|
24
|
+
return String(r.order_source ?? "").toLowerCase() === "floriday" || !!tekst(r.floriday_sales_order_id);
|
|
25
|
+
}
|
|
26
|
+
const naamSleutel = (s) => s.toLocaleLowerCase("nl").replace(/\s+/g, " ").trim();
|
|
27
|
+
const glnSleutel = (s) => s.replace(/\D/g, "");
|
|
28
|
+
export const floridayCarrierTekst = (naam) => `Let op: in Floriday staat ${naam}`;
|
|
29
|
+
/**
|
|
30
|
+
* Melding als de gekozen vervoerder afwijkt van de transporteur in Floriday.
|
|
31
|
+
* Vergelijkt op GLN als beide bekend zijn, anders op naam. Geen gekozen
|
|
32
|
+
* vervoerder (of onbekend) → geen melding: er valt niets te vergelijken.
|
|
33
|
+
*/
|
|
34
|
+
export function floridayCarrierMelding(input) {
|
|
35
|
+
const f = input.floriday;
|
|
36
|
+
if (!input.isFloriday || !f)
|
|
37
|
+
return null;
|
|
38
|
+
const naam = tekst(input.gekozen.name);
|
|
39
|
+
if (input.gekozen.state !== "ok" || !naam)
|
|
40
|
+
return null;
|
|
41
|
+
const gGln = tekst(input.gekozen.gln);
|
|
42
|
+
const verschilt = f.gln && gGln ? glnSleutel(f.gln) !== glnSleutel(gGln) : naamSleutel(f.name) !== naamSleutel(naam);
|
|
43
|
+
return verschilt ? floridayCarrierTekst(f.name) : null;
|
|
44
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare function carrierGlnsById(supabase: any, ids: string[]): Promise<Map<string, string>>;
|
|
2
|
+
export type FloridayCarrierNotice = {
|
|
3
|
+
orderId: string;
|
|
4
|
+
orderNumber: string | null;
|
|
5
|
+
melding: string;
|
|
6
|
+
};
|
|
7
|
+
export declare function loadFloridayCarrierNotices(supabase: any, orderIds: string[]): Promise<FloridayCarrierNotice[]>;
|
|
8
|
+
//# sourceMappingURL=floriday-carrier-notice.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"floriday-carrier-notice.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-carrier-notice.server.ts"],"names":[],"mappings":"AAKA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWhG;AAED,MAAM,MAAM,qBAAqB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErG,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAkCpH"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
// Server-only: melding "Let op: in Floriday staat <naam>" per order.
|
|
2
|
+
// Gekozen vervoerder via de Engine (logistics_resolve_carrier_many), GLN van de
|
|
3
|
+
// vervoerder uit carriers.floriday_carrier_gln. Alleen lezen.
|
|
4
|
+
import { floridayCarrierMelding, floridayCarrierUitCf, isFloridayOrderRij } from "./floriday-carrier-notice.js";
|
|
5
|
+
export async function carrierGlnsById(supabase, ids) {
|
|
6
|
+
const out = new Map();
|
|
7
|
+
const uniek = Array.from(new Set(ids.filter(Boolean)));
|
|
8
|
+
if (uniek.length === 0)
|
|
9
|
+
return out;
|
|
10
|
+
const { data, error } = await supabase.from("carriers").select("id, floriday_carrier_gln").in("id", uniek);
|
|
11
|
+
if (error) {
|
|
12
|
+
console.error("[floriday-carrier] GLN van vervoerders lezen mislukt:", error.message);
|
|
13
|
+
return out;
|
|
14
|
+
}
|
|
15
|
+
for (const r of data ?? [])
|
|
16
|
+
if (r?.floriday_carrier_gln)
|
|
17
|
+
out.set(String(r.id), String(r.floriday_carrier_gln));
|
|
18
|
+
return out;
|
|
19
|
+
}
|
|
20
|
+
export async function loadFloridayCarrierNotices(supabase, orderIds) {
|
|
21
|
+
// Id uit de UI: orders.id of (Floriday) floriday_sales_order_id, eventueel met prefix.
|
|
22
|
+
const { stripOrderIdPrefix } = await import("./order-row.server.js");
|
|
23
|
+
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
24
|
+
const ids = Array.from(new Set(orderIds.map(stripOrderIdPrefix).filter((id) => UUID.test(id)))).slice(0, 200);
|
|
25
|
+
if (ids.length === 0)
|
|
26
|
+
return [];
|
|
27
|
+
const lijst = ids.join(",");
|
|
28
|
+
const { data: rows, error } = await supabase
|
|
29
|
+
.from("orders")
|
|
30
|
+
.select("id, order_number, order_source, floriday_sales_order_id, custom_fields")
|
|
31
|
+
.or(`id.in.(${lijst}),floriday_sales_order_id.in.(${lijst})`);
|
|
32
|
+
if (error)
|
|
33
|
+
throw new Error(`Orders lezen mislukt: ${error.message}`);
|
|
34
|
+
const uniek = new Map();
|
|
35
|
+
for (const r of rows ?? [])
|
|
36
|
+
uniek.set(String(r.id), r);
|
|
37
|
+
const kandidaten = Array.from(uniek.values()).filter((r) => isFloridayOrderRij(r) && floridayCarrierUitCf(r.custom_fields));
|
|
38
|
+
if (kandidaten.length === 0)
|
|
39
|
+
return [];
|
|
40
|
+
const { resolveCarriersMany } = await import("./carrier-resolve.server.js");
|
|
41
|
+
const { byId, error: rErr } = await resolveCarriersMany(supabase, kandidaten.map((r) => ({ id: String(r.id), legacyCarrierId: r.custom_fields?.carrier ? String(r.custom_fields.carrier) : null, legacyCarrierName: null })));
|
|
42
|
+
if (rErr)
|
|
43
|
+
console.error("[floriday-carrier] vervoerder lezen mislukt:", rErr);
|
|
44
|
+
const glns = await carrierGlnsById(supabase, Array.from(byId.values()).map((c) => c.carrierId ?? ""));
|
|
45
|
+
const out = [];
|
|
46
|
+
for (const r of kandidaten) {
|
|
47
|
+
const c = byId.get(String(r.id));
|
|
48
|
+
const melding = floridayCarrierMelding({
|
|
49
|
+
isFloriday: true,
|
|
50
|
+
floriday: floridayCarrierUitCf(r.custom_fields),
|
|
51
|
+
gekozen: { state: c?.state, name: c?.carrierName, gln: c?.carrierId ? glns.get(c.carrierId) ?? null : null },
|
|
52
|
+
});
|
|
53
|
+
if (melding)
|
|
54
|
+
out.push({ orderId: String(r.id), orderNumber: r.order_number ?? null, melding });
|
|
55
|
+
}
|
|
56
|
+
return out;
|
|
57
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAmFzC;AAED,qGAAqG;AACrG,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ3D"}
|
|
@@ -41,18 +41,17 @@ export async function handleFloridayExternalFulfillment(orderId, states) {
|
|
|
41
41
|
return "none";
|
|
42
42
|
const now = new Date().toISOString();
|
|
43
43
|
const nextCf = { ...cf, floriday_external_fulfilled_sales_order_ids: decision.fulfilledIds };
|
|
44
|
-
let
|
|
44
|
+
let kolommen = {};
|
|
45
45
|
if (decision.kind === "full") {
|
|
46
46
|
nextCf.floriday_external_fulfilled_at = now;
|
|
47
47
|
nextCf.floriday_external_fulfilled_notice = FLORIDAY_EXTERNAL_REASON;
|
|
48
|
-
|
|
48
|
+
kolommen = { status: SHIPPED_STATUS, status_sync_token: globalThis.crypto.randomUUID() };
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
throw new Error(uErr.message);
|
|
50
|
+
// custom_fields samenvoegen in de database (jsonb ||), nooit vervangen.
|
|
51
|
+
const { orderBijwerken } = await import("./order-bijwerken.server.js");
|
|
52
|
+
const upd = await orderBijwerken(supabaseAdmin, orderId, { kolommen, vorigeCf: cf, nieuweCf: nextCf });
|
|
53
|
+
if (!upd.ok)
|
|
54
|
+
throw new Error(`order ${orderId} niet bijgewerkt (${upd.fout})`);
|
|
56
55
|
// Engine melden via logistics_emit_event (idempotent); event-id of fout op de order bewaren.
|
|
57
56
|
const ids = [...new Set(decision.fulfilledIds.map(String))].sort();
|
|
58
57
|
let eventId = null;
|
|
@@ -87,9 +86,14 @@ export async function handleFloridayExternalFulfillment(orderId, states) {
|
|
|
87
86
|
afterCf.floriday_external_engine_error = emitError.slice(0, 300);
|
|
88
87
|
else
|
|
89
88
|
delete afterCf.floriday_external_engine_error;
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
89
|
+
try {
|
|
90
|
+
const ev = await orderBijwerken(supabaseAdmin, orderId, { vorigeCf: nextCf, nieuweCf: afterCf });
|
|
91
|
+
if (!ev.ok)
|
|
92
|
+
console.warn("[floriday-external] event-id bewaren faalde:", ev.fout);
|
|
93
|
+
}
|
|
94
|
+
catch (e) {
|
|
95
|
+
console.warn("[floriday-external] event-id bewaren faalde:", e.message);
|
|
96
|
+
}
|
|
93
97
|
if (emitError)
|
|
94
98
|
console.warn("[floriday-external] engine-melding faalde:", emitError);
|
|
95
99
|
console.info(`[floriday-external] order ${orderId}: ${decision.kind} (${decision.fulfilledIds.length}/${soIds.length})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-mirror.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAwJ9E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"floriday-mirror.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAwJ9E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAs7CD,eAAO,MAAM,oBAAoB,MAAgB,CAAC;AAElD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,yBAEpG;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAW,yBAI/G"}
|