@flowselections/floriday-verkoop-module 1.0.165 → 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 +163 -70
- 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/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +31 -7
- 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/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +18 -3
- 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 +16 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +31 -5
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +2 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.js +47 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.js +11 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.js +16 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.js +31 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +7 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.js +17 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +5 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.js +48 -0
- 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/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.js +53 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.js +31 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +11 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.js +17 -0
- package/dist-lib/index.d.ts +1 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +1 -0
- package/dist-lib/integrations/supabase/types.d.ts +2530 -2
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/belading-format.d.ts +3 -2
- package/dist-lib/lib/belading-format.d.ts.map +1 -1
- package/dist-lib/lib/belading-format.js +5 -3
- package/dist-lib/lib/beslis-rollen.server.d.ts +10 -0
- package/dist-lib/lib/beslis-rollen.server.d.ts.map +1 -0
- package/dist-lib/lib/beslis-rollen.server.js +10 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +8 -4
- 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 +163 -56
- 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/engine-tijdlijn.d.ts +69 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.js +47 -0
- package/dist-lib/lib/engine-tijdlijn.js +101 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.server.js +41 -0
- 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 +7 -1
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +24 -2
- package/dist-lib/lib/kar-tekening.d.ts +54 -4
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +92 -8
- package/dist-lib/lib/kar-tekening.server.d.ts +5 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.server.js +18 -0
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +13 -9
- 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 +40 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +95 -9
- 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-row.server.d.ts.map +1 -1
- package/dist-lib/lib/order-row.server.js +9 -6
- 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/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +4 -2
- package/dist-lib/lib/sales-corrections.d.ts +44 -0
- package/dist-lib/lib/sales-corrections.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts +92 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.js +132 -0
- package/dist-lib/lib/sales-corrections.js +129 -0
- package/dist-lib/lib/sales-corrections.server.d.ts +27 -0
- package/dist-lib/lib/sales-corrections.server.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.server.js +68 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +17 -11
- 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/step-timer.server.d.ts +13 -0
- package/dist-lib/lib/step-timer.server.d.ts.map +1 -0
- package/dist-lib/lib/step-timer.server.js +33 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -1
- package/dist-lib/lib/stock-product-link.server.js +12 -8
- 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/useOpenCorrections.d.ts +17 -0
- package/dist-lib/lib/useOpenCorrections.d.ts.map +1 -0
- package/dist-lib/lib/useOpenCorrections.js +34 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts +9 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts.map +1 -0
- package/dist-lib/lib/useOrderDetailPrefetch.js +45 -0
- 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 +9 -4
- package/schema/verkoop.sql +560 -0
|
@@ -19,6 +19,25 @@ export interface OrderItemPackingRow {
|
|
|
19
19
|
cratesPerLayer: number | null;
|
|
20
20
|
layersPerCart: number | null;
|
|
21
21
|
} | null;
|
|
22
|
+
/** Prijs per stuk op de regel (null = geen prijs). */
|
|
23
|
+
unitPrice: number | null;
|
|
24
|
+
/** Regelgegevens (verkoop_orderregel_extra); null = nog niets vastgelegd. */
|
|
25
|
+
lineNote: string | null;
|
|
26
|
+
lineFields: {
|
|
27
|
+
key: string;
|
|
28
|
+
label: string;
|
|
29
|
+
value: string;
|
|
30
|
+
}[];
|
|
31
|
+
productStickerId: string | null;
|
|
32
|
+
fustStickerId: string | null;
|
|
33
|
+
}
|
|
34
|
+
export interface OrderItemPackingOrder {
|
|
35
|
+
id: string;
|
|
36
|
+
customerId: string | null;
|
|
37
|
+
/** Floriday-order: regelgegevens wijzig je in Floriday. */
|
|
38
|
+
floriday: boolean;
|
|
39
|
+
/** false = tabel regelgegevens ontbreekt nog in deze database. */
|
|
40
|
+
extrasAvailable: boolean;
|
|
22
41
|
}
|
|
23
42
|
/**
|
|
24
43
|
* Belading per bestelregel van één order, inclusief de handmatige
|
|
@@ -33,6 +52,7 @@ export declare const listOrderItemPacking: import("@tanstack/start-client-core")
|
|
|
33
52
|
orderId: string;
|
|
34
53
|
}, Promise<{
|
|
35
54
|
items: OrderItemPackingRow[];
|
|
55
|
+
order: OrderItemPackingOrder | null;
|
|
36
56
|
}>>;
|
|
37
57
|
export interface PackingPreview {
|
|
38
58
|
/** false = oudere Engine zonder voorbeeldfunctie. */
|
|
@@ -110,4 +130,24 @@ export declare const herindelenNietGeprint: import("@tanstack/start-client-core"
|
|
|
110
130
|
ok: true;
|
|
111
131
|
tekst: any;
|
|
112
132
|
}>>;
|
|
133
|
+
/**
|
|
134
|
+
* Belading per orderregel-id voor de artikeltabel in Karindeling, voor regels die
|
|
135
|
+
* niet (volledig) uit de eigen orderregels komen (gedeelde kar, onvolledige
|
|
136
|
+
* snapshot). Bron: order_items (de orderregel zelf), anders de Engine-uitleg
|
|
137
|
+
* logistics_belading_uitleg. Alleen lezen; onbekend blijft null. Ontbreekt de
|
|
138
|
+
* Engine-functie, dan alleen de orderregel.
|
|
139
|
+
*/
|
|
140
|
+
export declare const listOrderItemBelading: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
141
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
142
|
+
userId: string;
|
|
143
|
+
claims: import("@supabase/auth-js").User;
|
|
144
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
145
|
+
orderItemIds: string[];
|
|
146
|
+
}, Promise<{
|
|
147
|
+
items: Record<string, {
|
|
148
|
+
plantsPerCrate: number | null;
|
|
149
|
+
cratesPerLayer: number | null;
|
|
150
|
+
layersPerCart: number | null;
|
|
151
|
+
} | null>;
|
|
152
|
+
}>>;
|
|
113
153
|
//# sourceMappingURL=order-item-packing.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"order-item-packing.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-item-packing.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ import { z } from "zod";
|
|
|
14
14
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
15
15
|
import { resolveOrderRow } from "./order-row.server.js";
|
|
16
16
|
import { parseActies } from "./plan-coverage.js";
|
|
17
|
+
import { normRegelVelden } from "./order-line-extras.js";
|
|
17
18
|
/**
|
|
18
19
|
* Belading per bestelregel van één order, inclusief de handmatige
|
|
19
20
|
* "vastgezet"-markering. `orderId` mag een lokale orders.id of een
|
|
@@ -29,23 +30,36 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
|
|
|
29
30
|
const row = await resolveOrderRow(supabase, data.orderId);
|
|
30
31
|
orderRowId = row.id;
|
|
31
32
|
}
|
|
32
|
-
catch {
|
|
33
|
+
catch (e) {
|
|
34
|
+
console.error("[belading] order niet gevonden:", e?.message ?? e);
|
|
33
35
|
orderRowId = null;
|
|
34
36
|
}
|
|
35
37
|
if (!orderRowId)
|
|
36
|
-
return { items: [] };
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
return { items: [], order: null };
|
|
39
|
+
// Regels, order en regelgegevens tegelijk lezen (één ronde; belading in één keer).
|
|
40
|
+
const [{ data: rows, error }, { data: ord }, extrasRes] = await Promise.all([
|
|
41
|
+
supabase
|
|
42
|
+
.from("order_items")
|
|
43
|
+
.select("id, product_name, quantity, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at, packing_locked_by, needs_sticker, source_line_key, packing_source, product_id")
|
|
44
|
+
.eq("order_id", orderRowId)
|
|
45
|
+
.is("quarantined_at", null)
|
|
46
|
+
.order("product_name", { ascending: true }),
|
|
47
|
+
supabase.from("orders").select("custom_fields, customer_id, order_source, floriday_sales_order_id").eq("id", orderRowId).maybeSingle(),
|
|
48
|
+
supabase
|
|
49
|
+
.from("verkoop_orderregel_extra")
|
|
50
|
+
.select("order_item_id, line_note, line_fields, product_sticker_id, fust_sticker_id")
|
|
51
|
+
.eq("order_id", orderRowId),
|
|
52
|
+
]);
|
|
43
53
|
if (error)
|
|
44
54
|
throw new Error(`Bestelregels laden faalde: ${error.message}`);
|
|
55
|
+
const extrasErr = extrasRes?.error;
|
|
56
|
+
const extrasMissing = !!extrasErr && (["42P01", "PGRST205"].includes(String(extrasErr.code ?? "")) || /could not find the table|relation .* does not exist/i.test(String(extrasErr.message ?? "")));
|
|
57
|
+
if (extrasErr && !extrasMissing)
|
|
58
|
+
console.error("[regelgegevens] lezen mislukt:", extrasErr.message);
|
|
59
|
+
const extraById = new Map(((extrasErr ? [] : extrasRes?.data) ?? []).map((x) => [String(x.order_item_id), x]));
|
|
45
60
|
// Floriday-belading per bestelling (custom_fields.floriday_lines).
|
|
46
61
|
const floridayBySid = new Map();
|
|
47
62
|
{
|
|
48
|
-
const { data: ord } = await supabase.from("orders").select("custom_fields").eq("id", orderRowId).maybeSingle();
|
|
49
63
|
const lines = Array.isArray(ord?.custom_fields?.floriday_lines) ? ord.custom_fields.floriday_lines : [];
|
|
50
64
|
const n = (v) => (typeof v === "number" && v > 0 ? v : null);
|
|
51
65
|
for (const l of lines) {
|
|
@@ -85,7 +99,18 @@ export const listOrderItemPacking = createServerFn({ method: "GET" })
|
|
|
85
99
|
packingSource: r.packing_source ?? null,
|
|
86
100
|
productId: r.product_id ?? null,
|
|
87
101
|
floridayPacking: r.source_line_key ? floridayBySid.get(String(r.source_line_key)) ?? null : null,
|
|
102
|
+
unitPrice: r.unit_price == null || !Number.isFinite(Number(r.unit_price)) ? null : Number(r.unit_price),
|
|
103
|
+
lineNote: extraById.get(String(r.id))?.line_note ?? null,
|
|
104
|
+
lineFields: normRegelVelden(extraById.get(String(r.id))?.line_fields),
|
|
105
|
+
productStickerId: extraById.get(String(r.id))?.product_sticker_id ?? null,
|
|
106
|
+
fustStickerId: extraById.get(String(r.id))?.fust_sticker_id ?? null,
|
|
88
107
|
})),
|
|
108
|
+
order: {
|
|
109
|
+
id: orderRowId,
|
|
110
|
+
customerId: ord?.customer_id ? String(ord.customer_id) : null,
|
|
111
|
+
floriday: !!ord?.floriday_sales_order_id || ["floriday", "fo"].includes(String(ord?.order_source ?? "").toLowerCase()),
|
|
112
|
+
extrasAvailable: !extrasMissing,
|
|
113
|
+
},
|
|
89
114
|
};
|
|
90
115
|
});
|
|
91
116
|
const packingSchema = z.object({
|
|
@@ -202,3 +227,64 @@ export const herindelenNietGeprint = createServerFn({ method: "POST" })
|
|
|
202
227
|
throw new Error(`Herindelen geweigerd door de Engine${res?.tekst ? `: ${res.tekst}` : ""}`);
|
|
203
228
|
return { ok: true, tekst: typeof res?.tekst === "string" ? res.tekst : null };
|
|
204
229
|
});
|
|
230
|
+
/**
|
|
231
|
+
* Belading per orderregel-id voor de artikeltabel in Karindeling, voor regels die
|
|
232
|
+
* niet (volledig) uit de eigen orderregels komen (gedeelde kar, onvolledige
|
|
233
|
+
* snapshot). Bron: order_items (de orderregel zelf), anders de Engine-uitleg
|
|
234
|
+
* logistics_belading_uitleg. Alleen lezen; onbekend blijft null. Ontbreekt de
|
|
235
|
+
* Engine-functie, dan alleen de orderregel.
|
|
236
|
+
*/
|
|
237
|
+
export const listOrderItemBelading = createServerFn({ method: "POST" })
|
|
238
|
+
.middleware([requireSupabaseAuth])
|
|
239
|
+
.inputValidator((input) => z.object({ orderItemIds: z.array(z.string().uuid()).max(100) }).parse(input))
|
|
240
|
+
.handler(async ({ data, context }) => {
|
|
241
|
+
const { parseBeladingUitleg } = await import("./kar-tekening.js");
|
|
242
|
+
const ids = Array.from(new Set(data.orderItemIds));
|
|
243
|
+
const out = {};
|
|
244
|
+
if (!ids.length)
|
|
245
|
+
return { items: out };
|
|
246
|
+
const { data: rows, error } = await context.supabase
|
|
247
|
+
.from("order_items")
|
|
248
|
+
.select("id, plants_per_crate, crates_per_layer, layers_per_cart")
|
|
249
|
+
.in("id", ids);
|
|
250
|
+
if (error)
|
|
251
|
+
console.error("[belading] orderregels lezen mislukt:", error.message);
|
|
252
|
+
const pos = (v) => (typeof v === "number" && v > 0 ? v : null);
|
|
253
|
+
for (const r of (rows ?? [])) {
|
|
254
|
+
out[String(r.id)] = { plantsPerCrate: pos(r.plants_per_crate), cratesPerLayer: pos(r.crates_per_layer), layersPerCart: pos(r.layers_per_cart) };
|
|
255
|
+
}
|
|
256
|
+
const vol = (b) => !!b && b.plantsPerCrate != null && b.cratesPerLayer != null && b.layersPerCart != null;
|
|
257
|
+
const todo = ids.filter((id) => !vol(out[id]));
|
|
258
|
+
// Engine-uitleg alleen voor wat nog ontbreekt; beperkt tegelijk.
|
|
259
|
+
let i = 0;
|
|
260
|
+
let ontbreekt = false;
|
|
261
|
+
const worker = async () => {
|
|
262
|
+
while (i < todo.length && !ontbreekt) {
|
|
263
|
+
const id = todo[i++];
|
|
264
|
+
const { data: uitleg, error: uErr } = await context.supabase.rpc("logistics_belading_uitleg", { p_order_item_id: id });
|
|
265
|
+
if (uErr) {
|
|
266
|
+
if (isMissingFn(uErr)) {
|
|
267
|
+
ontbreekt = true;
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
console.error("[belading] Engine-uitleg mislukt:", uErr.message);
|
|
271
|
+
continue;
|
|
272
|
+
}
|
|
273
|
+
const e = parseBeladingUitleg(uitleg);
|
|
274
|
+
if (!e)
|
|
275
|
+
continue;
|
|
276
|
+
const eigen = out[id];
|
|
277
|
+
// Eigen orderregel blijft leidend; de uitleg vult alleen lege delen aan.
|
|
278
|
+
out[id] = {
|
|
279
|
+
plantsPerCrate: eigen?.plantsPerCrate ?? e.plantsPerCrate,
|
|
280
|
+
cratesPerLayer: eigen?.cratesPerLayer ?? e.cratesPerLayer,
|
|
281
|
+
layersPerCart: eigen?.layersPerCart ?? e.layersPerCart,
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
};
|
|
285
|
+
await Promise.all(Array.from({ length: Math.min(6, todo.length) }, worker));
|
|
286
|
+
for (const id of ids)
|
|
287
|
+
if (!(id in out))
|
|
288
|
+
out[id] = null;
|
|
289
|
+
return { items: out };
|
|
290
|
+
});
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
export declare const REGEL_OPMERKING_MAX = 500;
|
|
2
|
+
/** Eén ingevuld extra veld op een orderregel. */
|
|
3
|
+
export interface RegelVeld {
|
|
4
|
+
key: string;
|
|
5
|
+
label: string;
|
|
6
|
+
value: string;
|
|
7
|
+
}
|
|
8
|
+
/** Definitie van een extra regelveld zoals de module Klanten die levert. */
|
|
9
|
+
export interface RegelVeldDefinitie {
|
|
10
|
+
key: string;
|
|
11
|
+
label: string;
|
|
12
|
+
type: "text" | "select";
|
|
13
|
+
opties: string[];
|
|
14
|
+
standaard: string | null;
|
|
15
|
+
}
|
|
16
|
+
/** Stickerkeuze bij een regel (product of fust). */
|
|
17
|
+
export interface StickerOptie {
|
|
18
|
+
id: string;
|
|
19
|
+
naam: string;
|
|
20
|
+
formaat: string | null;
|
|
21
|
+
}
|
|
22
|
+
export interface StickerOptiesPerProduct {
|
|
23
|
+
product: StickerOptie[];
|
|
24
|
+
fust: StickerOptie[];
|
|
25
|
+
standaardProduct: string | null;
|
|
26
|
+
standaardFust: string | null;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Antwoord van klanten_extra_velden_voor_klant(customer_id) lezen (contract
|
|
30
|
+
* Klanten: [{key,label,type,opties,value}], value = klantstandaard). Ook
|
|
31
|
+
* toegestaan: { velden: [...] } en standaard/default. Onbekend → lege lijst.
|
|
32
|
+
*/
|
|
33
|
+
export declare function parseRegelVeldDefinities(raw: unknown): RegelVeldDefinitie[];
|
|
34
|
+
/** Nieuwe regel: elk veld vooraf ingevuld met de klantstandaard (of leeg). */
|
|
35
|
+
export declare function standaardRegelVelden(defs: RegelVeldDefinitie[]): RegelVeld[];
|
|
36
|
+
/**
|
|
37
|
+
* Bestaande ingevulde velden naast de definities leggen: volgorde van de
|
|
38
|
+
* definities, ingevulde waarde blijft staan; velden die niet meer in de
|
|
39
|
+
* definities staan maar wel een waarde hebben blijven zichtbaar.
|
|
40
|
+
*/
|
|
41
|
+
export declare function regelVeldenMetDefinities(huidig: RegelVeld[] | null | undefined, defs: RegelVeldDefinitie[]): RegelVeld[];
|
|
42
|
+
/** Voor opslag: alleen velden met key; waarde ingekort; hooguit 30. */
|
|
43
|
+
export declare function normRegelVelden(v: unknown): RegelVeld[];
|
|
44
|
+
/** "Label: Rood · Pot-inzet: Ja" — alleen ingevulde velden. */
|
|
45
|
+
export declare function regelVeldenTekst(v: RegelVeld[] | null | undefined): string | null;
|
|
46
|
+
export declare function opmerkingNorm(v: unknown): string | null;
|
|
47
|
+
/** "50 × 30 mm" of null. */
|
|
48
|
+
export declare function stickerFormaat(w: unknown, h: unknown): string | null;
|
|
49
|
+
export interface StickerRij {
|
|
50
|
+
id: string;
|
|
51
|
+
customer_key: string | null;
|
|
52
|
+
trade_item_key: string | null;
|
|
53
|
+
file_name?: string | null;
|
|
54
|
+
width_mm?: unknown;
|
|
55
|
+
height_mm?: unknown;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Stickers die bij klant + product horen, in vaste volgorde: eerst op de
|
|
59
|
+
* sterkste klantsleutel (klant-id vóór debiteurcode vóór Floriday-organisatie),
|
|
60
|
+
* dan op de sterkste artikelsleutel (product-id vóór artikelsleutel vóór
|
|
61
|
+
* hoofdproduct). De eerste is de klantstandaard. Nooit op naam.
|
|
62
|
+
*/
|
|
63
|
+
export declare function stickersVoorProduct(productKeys: (string | null | undefined)[], customerKeys: string[], rows: StickerRij[]): StickerOptie[];
|
|
64
|
+
/**
|
|
65
|
+
* Melding voor een regel: sticker nodig aangevinkt, maar er is geen
|
|
66
|
+
* productsticker voor deze klant en dit artikel.
|
|
67
|
+
*/
|
|
68
|
+
export declare function stickerOntbreekt(l: {
|
|
69
|
+
needs_sticker?: boolean;
|
|
70
|
+
product_id: string | null;
|
|
71
|
+
}, opties: StickerOptiesPerProduct | null | undefined): boolean;
|
|
72
|
+
/** Gekozen sticker die niet (meer) bij de opties hoort → terug naar de standaard. */
|
|
73
|
+
export declare function geldigeStickerKeuze(gekozen: string | null | undefined, opties: StickerOptie[], standaard: string | null): string | null;
|
|
74
|
+
/** Time-out of weggevallen verbinding: dan mag aanmaken één keer opnieuw met dezelfde sleutel. */
|
|
75
|
+
export declare function isTimeoutFout(e: unknown): boolean;
|
|
76
|
+
/** Functie of tabel bestaat (nog) niet in deze database. */
|
|
77
|
+
export declare function isFunctieOntbrekend(err: unknown): boolean;
|
|
78
|
+
type RpcAntwoord = PromiseLike<{
|
|
79
|
+
data: unknown;
|
|
80
|
+
error: unknown;
|
|
81
|
+
}>;
|
|
82
|
+
/**
|
|
83
|
+
* Extra velden van één klant uit Klanten (klanten_extra_velden_voor_klant).
|
|
84
|
+
* Parameternaam volgens contract (customer_id); p_customer_id eerst, want zo
|
|
85
|
+
* heten parameters in de andere modules. Ontbreekt de functie → available=false,
|
|
86
|
+
* geen velden. Een andere fout → fout (tekst voor het logboek), geen velden.
|
|
87
|
+
*/
|
|
88
|
+
export declare function leesKlantExtraVelden(rpc: (args: Record<string, string>) => RpcAntwoord, customerId: string): Promise<{
|
|
89
|
+
available: boolean;
|
|
90
|
+
velden: RegelVeldDefinitie[];
|
|
91
|
+
fout: string | null;
|
|
92
|
+
}>;
|
|
93
|
+
export {};
|
|
94
|
+
//# sourceMappingURL=order-line-extras.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-line-extras.d.ts","sourceRoot":"","sources":["../../src/lib/order-line-extras.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { type RegelVeldDefinitie, type StickerOptiesPerProduct } from "./order-line-extras.js";
|
|
2
|
+
/**
|
|
3
|
+
* Product- en fuststickers per artikel voor één klant, met de klantstandaard
|
|
4
|
+
* (eerste in vaste volgorde, zie stickersVoorProduct). Fout → melding, geen gok.
|
|
5
|
+
*/
|
|
6
|
+
export declare const listLineStickerOptions: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
7
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
8
|
+
userId: string;
|
|
9
|
+
claims: import("@supabase/auth-js").User;
|
|
10
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
11
|
+
customerId: string;
|
|
12
|
+
productIds: string[];
|
|
13
|
+
}, Promise<{
|
|
14
|
+
byProduct: Record<string, StickerOptiesPerProduct>;
|
|
15
|
+
error: string | null;
|
|
16
|
+
}>>;
|
|
17
|
+
/**
|
|
18
|
+
* Definities + klantstandaard van extra regelvelden (Label, Pot-inzet …) uit
|
|
19
|
+
* de module Klanten via klanten_extra_velden_voor_klant(customer_id). Bestaat
|
|
20
|
+
* die functie nog niet, dan available=false en geen velden (alles werkt door).
|
|
21
|
+
*/
|
|
22
|
+
export declare const getLineFieldDefinitions: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
23
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
24
|
+
userId: string;
|
|
25
|
+
claims: import("@supabase/auth-js").User;
|
|
26
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
27
|
+
customerId: string;
|
|
28
|
+
}, Promise<{
|
|
29
|
+
available: boolean;
|
|
30
|
+
velden: RegelVeldDefinitie[];
|
|
31
|
+
error: string | null;
|
|
32
|
+
}>>;
|
|
33
|
+
/** Regelgegevens van een bestaande order wijzigen (tot de kar geprint is). */
|
|
34
|
+
export declare const saveOrderLineExtra: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
35
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
36
|
+
userId: string;
|
|
37
|
+
claims: import("@supabase/auth-js").User;
|
|
38
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
39
|
+
orderItemId: string;
|
|
40
|
+
patch: {
|
|
41
|
+
line_note?: string | null | undefined;
|
|
42
|
+
line_fields?: {
|
|
43
|
+
key: string;
|
|
44
|
+
label: string;
|
|
45
|
+
value: string;
|
|
46
|
+
}[] | undefined;
|
|
47
|
+
product_sticker_id?: string | null | undefined;
|
|
48
|
+
fust_sticker_id?: string | null | undefined;
|
|
49
|
+
};
|
|
50
|
+
}, Promise<{
|
|
51
|
+
ok: boolean;
|
|
52
|
+
reden: string | null;
|
|
53
|
+
geprint: boolean;
|
|
54
|
+
}>>;
|
|
55
|
+
//# sourceMappingURL=order-line-extras.functions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-line-extras.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-line-extras.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6C,KAAK,kBAAkB,EAAE,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAYvI;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;eAIG,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;WAAiB,MAAM,GAAG,IAAI;GAkDrG,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,uBAAuB;;;;8CAEV,OAAO;;;eAC0B,OAAO;YAAU,kBAAkB,EAAE;WAAS,MAAM,GAAG,IAAI;GAIlH,CAAC;AASL,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;;;;;;QACmB,OAAO;WAAS,MAAM,GAAG,IAAI;aAAW,OAAO;GAY/F,CAAC"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
// Serverfuncties voor regelgegevens per orderregel (stickerkeuze, opmerking,
|
|
2
|
+
// extra velden). Alleen createServerFn-exports; geen server-only imports
|
|
3
|
+
// bovenaan (zie AGENTS.md, scripts/check-client-graph.mjs).
|
|
4
|
+
import { createServerFn } from "@tanstack/react-start";
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
7
|
+
import { leesKlantExtraVelden, stickersVoorProduct } from "./order-line-extras.js";
|
|
8
|
+
import { stickerCustomerKeys } from "./customer-stickers.js";
|
|
9
|
+
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
10
|
+
function isOntbrekend(err) {
|
|
11
|
+
const code = String(err?.code ?? "");
|
|
12
|
+
const msg = String(err?.message ?? "");
|
|
13
|
+
return code === "PGRST202" || code === "42883" || code === "42P01" || code === "PGRST205"
|
|
14
|
+
|| /could not find the function|could not find the table|relation .* does not exist/i.test(msg);
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Product- en fuststickers per artikel voor één klant, met de klantstandaard
|
|
18
|
+
* (eerste in vaste volgorde, zie stickersVoorProduct). Fout → melding, geen gok.
|
|
19
|
+
*/
|
|
20
|
+
export const listLineStickerOptions = createServerFn({ method: "POST" })
|
|
21
|
+
.middleware([requireSupabaseAuth])
|
|
22
|
+
.inputValidator((input) => z.object({ customerId: z.string().uuid(), productIds: z.array(z.string().min(1).max(100)).max(200) }).parse(input))
|
|
23
|
+
.handler(async ({ data, context }) => {
|
|
24
|
+
const leeg = { byProduct: {}, error: null };
|
|
25
|
+
if (data.productIds.length === 0)
|
|
26
|
+
return leeg;
|
|
27
|
+
const sb = context.supabase;
|
|
28
|
+
const { data: cust, error: custErr } = await sb
|
|
29
|
+
.from("customers")
|
|
30
|
+
.select("id, twinfield_code, floriday_organization_id")
|
|
31
|
+
.eq("id", data.customerId)
|
|
32
|
+
.maybeSingle();
|
|
33
|
+
if (custErr) {
|
|
34
|
+
console.error("[stickers] klant lezen mislukt:", custErr.message);
|
|
35
|
+
return { ...leeg, error: "Stickers van deze klant konden niet worden geladen." };
|
|
36
|
+
}
|
|
37
|
+
if (!cust)
|
|
38
|
+
return leeg;
|
|
39
|
+
const customerKeys = stickerCustomerKeys(cust);
|
|
40
|
+
const uuids = data.productIds.filter((x) => UUID.test(x));
|
|
41
|
+
const [prodsRes, groupsRes] = await Promise.all([
|
|
42
|
+
uuids.length ? sb.from("products").select("id, trade_item_key").in("id", uuids) : Promise.resolve({ data: [], error: null }),
|
|
43
|
+
uuids.length ? sb.from("product_groups").select("id, head_product_id").in("id", uuids) : Promise.resolve({ data: [], error: null }),
|
|
44
|
+
]);
|
|
45
|
+
const keysByProduct = new Map();
|
|
46
|
+
for (const id of data.productIds)
|
|
47
|
+
keysByProduct.set(id, [id]);
|
|
48
|
+
for (const p of (prodsRes.data ?? []))
|
|
49
|
+
keysByProduct.set(p.id, [p.id, p.trade_item_key ?? null]);
|
|
50
|
+
const heads = (groupsRes.data ?? []).filter((g) => g.head_product_id);
|
|
51
|
+
if (heads.length) {
|
|
52
|
+
const { data: hp } = await sb.from("products").select("id, trade_item_key").in("id", heads.map((g) => g.head_product_id));
|
|
53
|
+
const hk = new Map((hp ?? []).map((h) => [h.id, (h.trade_item_key ?? null)]));
|
|
54
|
+
for (const g of heads)
|
|
55
|
+
keysByProduct.set(g.id, [g.id, g.head_product_id, hk.get(g.head_product_id) ?? null]);
|
|
56
|
+
}
|
|
57
|
+
const allKeys = Array.from(new Set(Array.from(keysByProduct.values()).flat().filter((k) => !!k)));
|
|
58
|
+
const cols = "id, customer_key, trade_item_key, file_name, width_mm, height_mm";
|
|
59
|
+
const [prodSt, fustSt] = await Promise.all([
|
|
60
|
+
sb.from("customer_product_stickers").select(cols).in("customer_key", customerKeys).in("trade_item_key", allKeys),
|
|
61
|
+
sb.from("customer_fust_stickers").select(cols).in("customer_key", customerKeys).in("trade_item_key", allKeys),
|
|
62
|
+
]);
|
|
63
|
+
if (prodSt.error) {
|
|
64
|
+
console.error("[stickers] productstickers lezen mislukt:", prodSt.error.message);
|
|
65
|
+
return { ...leeg, error: "Stickers van deze klant konden niet worden geladen." };
|
|
66
|
+
}
|
|
67
|
+
// Fuststickers: ontbrekende tabel (oudere Klanten) → geen fuststickers, verder door.
|
|
68
|
+
if (fustSt.error && !isOntbrekend(fustSt.error)) {
|
|
69
|
+
console.error("[stickers] fuststickers lezen mislukt:", fustSt.error.message);
|
|
70
|
+
return { ...leeg, error: "Stickers van deze klant konden niet worden geladen." };
|
|
71
|
+
}
|
|
72
|
+
const byProduct = {};
|
|
73
|
+
for (const [pid, keys] of keysByProduct) {
|
|
74
|
+
const product = stickersVoorProduct(keys, customerKeys, (prodSt.data ?? []));
|
|
75
|
+
const fust = stickersVoorProduct(keys, customerKeys, ((fustSt.error ? [] : fustSt.data) ?? []));
|
|
76
|
+
byProduct[pid] = { product, fust, standaardProduct: product[0]?.id ?? null, standaardFust: fust[0]?.id ?? null };
|
|
77
|
+
}
|
|
78
|
+
return { byProduct, error: null };
|
|
79
|
+
});
|
|
80
|
+
/**
|
|
81
|
+
* Definities + klantstandaard van extra regelvelden (Label, Pot-inzet …) uit
|
|
82
|
+
* de module Klanten via klanten_extra_velden_voor_klant(customer_id). Bestaat
|
|
83
|
+
* die functie nog niet, dan available=false en geen velden (alles werkt door).
|
|
84
|
+
*/
|
|
85
|
+
export const getLineFieldDefinitions = createServerFn({ method: "POST" })
|
|
86
|
+
.middleware([requireSupabaseAuth])
|
|
87
|
+
.inputValidator((input) => z.object({ customerId: z.string().uuid() }).parse(input))
|
|
88
|
+
.handler(async ({ data, context }) => {
|
|
89
|
+
const r = await leesKlantExtraVelden((args) => context.supabase.rpc("klanten_extra_velden_voor_klant", args), data.customerId);
|
|
90
|
+
if (r.fout)
|
|
91
|
+
console.error("[regelvelden] klanten_extra_velden_voor_klant mislukt:", r.fout);
|
|
92
|
+
return { available: r.available, velden: r.velden, error: r.fout ? "Extra velden van deze klant konden niet worden geladen." : null };
|
|
93
|
+
});
|
|
94
|
+
const patchSchema = z.object({
|
|
95
|
+
line_note: z.string().max(500).nullable().optional(),
|
|
96
|
+
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(),
|
|
97
|
+
product_sticker_id: z.string().uuid().nullable().optional(),
|
|
98
|
+
fust_sticker_id: z.string().uuid().nullable().optional(),
|
|
99
|
+
});
|
|
100
|
+
/** Regelgegevens van een bestaande order wijzigen (tot de kar geprint is). */
|
|
101
|
+
export const saveOrderLineExtra = createServerFn({ method: "POST" })
|
|
102
|
+
.middleware([requireSupabaseAuth])
|
|
103
|
+
.inputValidator((input) => z.object({ orderItemId: z.string().uuid(), patch: patchSchema }).parse(input))
|
|
104
|
+
.handler(async ({ data, context }) => {
|
|
105
|
+
const { data: res, error } = await context.supabase.rpc("verkoop_orderregel_extra_opslaan", {
|
|
106
|
+
p_order_item_id: data.orderItemId,
|
|
107
|
+
p_patch: data.patch,
|
|
108
|
+
});
|
|
109
|
+
if (error) {
|
|
110
|
+
console.error("[regelgegevens] opslaan mislukt:", error.message);
|
|
111
|
+
if (isOntbrekend(error))
|
|
112
|
+
return { ok: false, reden: "Regelgegevens opslaan kan nog niet: de database is nog niet bijgewerkt. Neem contact op met de beheerder.", geprint: false };
|
|
113
|
+
throw new Error("Regelgegevens opslaan lukte niet. Probeer het opnieuw; lukt het niet, neem contact op met de beheerder.");
|
|
114
|
+
}
|
|
115
|
+
const r = (res ?? {});
|
|
116
|
+
return { ok: r.ok === true, reden: typeof r.reden === "string" ? r.reden : null, geprint: r.geprint === true };
|
|
117
|
+
});
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
// Regelgegevens per orderregel: opmerking, extra velden en stickerkeuze.
|
|
2
|
+
// Alleen pure, client-veilige logica; opslag in verkoop_orderregel_extra
|
|
3
|
+
// (via verkoop_insert_manual_order bij aanmaken en
|
|
4
|
+
// verkoop_orderregel_extra_opslaan bij wijzigen). Nooit op order_items zelf:
|
|
5
|
+
// elke update daarop start een herindeling bij de Engine.
|
|
6
|
+
export const REGEL_OPMERKING_MAX = 500;
|
|
7
|
+
const tekst = (v) => {
|
|
8
|
+
if (typeof v === "boolean")
|
|
9
|
+
return v ? "Ja" : "Nee";
|
|
10
|
+
if (typeof v !== "string" && typeof v !== "number")
|
|
11
|
+
return null;
|
|
12
|
+
const s = String(v).trim();
|
|
13
|
+
return s ? s : null;
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Antwoord van klanten_extra_velden_voor_klant(customer_id) lezen (contract
|
|
17
|
+
* Klanten: [{key,label,type,opties,value}], value = klantstandaard). Ook
|
|
18
|
+
* toegestaan: { velden: [...] } en standaard/default. Onbekend → lege lijst.
|
|
19
|
+
*/
|
|
20
|
+
export function parseRegelVeldDefinities(raw) {
|
|
21
|
+
const lijst = Array.isArray(raw)
|
|
22
|
+
? raw
|
|
23
|
+
: raw && typeof raw === "object" && Array.isArray(raw.velden)
|
|
24
|
+
? raw.velden
|
|
25
|
+
: [];
|
|
26
|
+
const gezien = new Set();
|
|
27
|
+
const out = [];
|
|
28
|
+
for (const r of lijst) {
|
|
29
|
+
if (!r || typeof r !== "object")
|
|
30
|
+
continue;
|
|
31
|
+
const o = r;
|
|
32
|
+
const key = tekst(o.key) ?? tekst(o.sleutel);
|
|
33
|
+
if (!key || gezien.has(key))
|
|
34
|
+
continue;
|
|
35
|
+
gezien.add(key);
|
|
36
|
+
const optiesRaw = Array.isArray(o.opties) ? o.opties : Array.isArray(o.options) ? o.options : [];
|
|
37
|
+
const opties = optiesRaw.map(tekst).filter((x) => !!x);
|
|
38
|
+
out.push({
|
|
39
|
+
key,
|
|
40
|
+
label: tekst(o.label) ?? tekst(o.naam) ?? key,
|
|
41
|
+
type: opties.length > 0 || o.type === "select" ? "select" : "text",
|
|
42
|
+
opties,
|
|
43
|
+
standaard: tekst(o.value) ?? tekst(o.standaard) ?? tekst(o.default) ?? tekst(o.klantstandaard),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
return out;
|
|
47
|
+
}
|
|
48
|
+
/** Nieuwe regel: elk veld vooraf ingevuld met de klantstandaard (of leeg). */
|
|
49
|
+
export function standaardRegelVelden(defs) {
|
|
50
|
+
return defs.map((d) => ({ key: d.key, label: d.label, value: d.standaard ?? "" }));
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Bestaande ingevulde velden naast de definities leggen: volgorde van de
|
|
54
|
+
* definities, ingevulde waarde blijft staan; velden die niet meer in de
|
|
55
|
+
* definities staan maar wel een waarde hebben blijven zichtbaar.
|
|
56
|
+
*/
|
|
57
|
+
export function regelVeldenMetDefinities(huidig, defs) {
|
|
58
|
+
const byKey = new Map((huidig ?? []).map((v) => [v.key, v]));
|
|
59
|
+
const out = defs.map((d) => ({ key: d.key, label: d.label, value: byKey.get(d.key)?.value ?? "" }));
|
|
60
|
+
for (const v of huidig ?? [])
|
|
61
|
+
if (!defs.some((d) => d.key === v.key) && v.value.trim())
|
|
62
|
+
out.push(v);
|
|
63
|
+
return out;
|
|
64
|
+
}
|
|
65
|
+
/** Voor opslag: alleen velden met key; waarde ingekort; hooguit 30. */
|
|
66
|
+
export function normRegelVelden(v) {
|
|
67
|
+
if (!Array.isArray(v))
|
|
68
|
+
return [];
|
|
69
|
+
const out = [];
|
|
70
|
+
for (const r of v) {
|
|
71
|
+
if (!r || typeof r !== "object")
|
|
72
|
+
continue;
|
|
73
|
+
const key = tekst(r.key);
|
|
74
|
+
if (!key)
|
|
75
|
+
continue;
|
|
76
|
+
out.push({
|
|
77
|
+
key: key.slice(0, 60),
|
|
78
|
+
label: (tekst(r.label) ?? key).slice(0, 80),
|
|
79
|
+
value: String(r.value ?? "").slice(0, 200),
|
|
80
|
+
});
|
|
81
|
+
if (out.length >= 30)
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
return out;
|
|
85
|
+
}
|
|
86
|
+
/** "Label: Rood · Pot-inzet: Ja" — alleen ingevulde velden. */
|
|
87
|
+
export function regelVeldenTekst(v) {
|
|
88
|
+
const delen = (v ?? []).filter((x) => x.value.trim()).map((x) => `${x.label}: ${x.value.trim()}`);
|
|
89
|
+
return delen.length ? delen.join(" · ") : null;
|
|
90
|
+
}
|
|
91
|
+
export function opmerkingNorm(v) {
|
|
92
|
+
const s = typeof v === "string" ? v.trim() : "";
|
|
93
|
+
return s ? s.slice(0, REGEL_OPMERKING_MAX) : null;
|
|
94
|
+
}
|
|
95
|
+
/** "50 × 30 mm" of null. */
|
|
96
|
+
export function stickerFormaat(w, h) {
|
|
97
|
+
const a = Number(w), b = Number(h);
|
|
98
|
+
if (!(a > 0) || !(b > 0))
|
|
99
|
+
return null;
|
|
100
|
+
const f = (n) => n.toLocaleString("nl-NL", { maximumFractionDigits: 1 });
|
|
101
|
+
return `${f(a)} × ${f(b)} mm`;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Stickers die bij klant + product horen, in vaste volgorde: eerst op de
|
|
105
|
+
* sterkste klantsleutel (klant-id vóór debiteurcode vóór Floriday-organisatie),
|
|
106
|
+
* dan op de sterkste artikelsleutel (product-id vóór artikelsleutel vóór
|
|
107
|
+
* hoofdproduct). De eerste is de klantstandaard. Nooit op naam.
|
|
108
|
+
*/
|
|
109
|
+
export function stickersVoorProduct(productKeys, customerKeys, rows) {
|
|
110
|
+
const pk = productKeys.filter((k) => !!k);
|
|
111
|
+
const rang = (r) => customerKeys.indexOf(String(r.customer_key ?? "")) * 10 + pk.indexOf(String(r.trade_item_key ?? ""));
|
|
112
|
+
return rows
|
|
113
|
+
.filter((r) => customerKeys.includes(String(r.customer_key ?? "")) && pk.includes(String(r.trade_item_key ?? "")))
|
|
114
|
+
.sort((a, b) => rang(a) - rang(b))
|
|
115
|
+
.filter((r, i, arr) => arr.findIndex((x) => x.id === r.id) === i)
|
|
116
|
+
.map((r) => ({ id: r.id, naam: tekst(r.file_name) ?? "Sticker", formaat: stickerFormaat(r.width_mm, r.height_mm) }));
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Melding voor een regel: sticker nodig aangevinkt, maar er is geen
|
|
120
|
+
* productsticker voor deze klant en dit artikel.
|
|
121
|
+
*/
|
|
122
|
+
export function stickerOntbreekt(l, opties) {
|
|
123
|
+
if (!l.product_id || l.needs_sticker !== true)
|
|
124
|
+
return false;
|
|
125
|
+
if (!opties)
|
|
126
|
+
return false; // nog niet bekend: geen valse melding
|
|
127
|
+
return opties.product.length === 0;
|
|
128
|
+
}
|
|
129
|
+
/** Gekozen sticker die niet (meer) bij de opties hoort → terug naar de standaard. */
|
|
130
|
+
export function geldigeStickerKeuze(gekozen, opties, standaard) {
|
|
131
|
+
if (gekozen === "")
|
|
132
|
+
return null; // bewust "geen sticker"
|
|
133
|
+
if (gekozen && opties.some((o) => o.id === gekozen))
|
|
134
|
+
return gekozen;
|
|
135
|
+
return standaard;
|
|
136
|
+
}
|
|
137
|
+
/** Time-out of weggevallen verbinding: dan mag aanmaken één keer opnieuw met dezelfde sleutel. */
|
|
138
|
+
export function isTimeoutFout(e) {
|
|
139
|
+
const msg = String(e?.message ?? e ?? "");
|
|
140
|
+
const status = Number(e?.status ?? e?.response?.status ?? 0);
|
|
141
|
+
if ([408, 502, 503, 504, 522, 524].includes(status))
|
|
142
|
+
return true;
|
|
143
|
+
if (e?.name === "AbortError" || e?.name === "TimeoutError")
|
|
144
|
+
return true;
|
|
145
|
+
return /time-?out|timed out|failed to fetch|networkerror|network error|load failed|verbinding verbroken|\b50[234]\b|\b52[24]\b/i.test(msg);
|
|
146
|
+
}
|
|
147
|
+
/** Functie of tabel bestaat (nog) niet in deze database. */
|
|
148
|
+
export function isFunctieOntbrekend(err) {
|
|
149
|
+
const e = (err ?? {});
|
|
150
|
+
const code = String(e.code ?? "");
|
|
151
|
+
const msg = String(e.message ?? "");
|
|
152
|
+
return code === "PGRST202" || code === "42883" || /could not find the function/i.test(msg);
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Extra velden van één klant uit Klanten (klanten_extra_velden_voor_klant).
|
|
156
|
+
* Parameternaam volgens contract (customer_id); p_customer_id eerst, want zo
|
|
157
|
+
* heten parameters in de andere modules. Ontbreekt de functie → available=false,
|
|
158
|
+
* geen velden. Een andere fout → fout (tekst voor het logboek), geen velden.
|
|
159
|
+
*/
|
|
160
|
+
export async function leesKlantExtraVelden(rpc, customerId) {
|
|
161
|
+
const pogingen = [{ p_customer_id: customerId }, { customer_id: customerId }];
|
|
162
|
+
for (const args of pogingen) {
|
|
163
|
+
const { data, error } = await rpc(args);
|
|
164
|
+
if (!error)
|
|
165
|
+
return { available: true, velden: parseRegelVeldDefinities(data), fout: null };
|
|
166
|
+
if (!isFunctieOntbrekend(error)) {
|
|
167
|
+
return { available: true, velden: [], fout: String(error?.message ?? error) };
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return { available: false, velden: [], fout: null };
|
|
171
|
+
}
|