@flowselections/floriday-verkoop-module 1.0.134 → 1.0.136
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/OrderInvoiceCard.js +9 -14
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +18 -1
- package/dist-lib/lib/erp-invoice-rpc.check.d.ts +2 -0
- package/dist-lib/lib/erp-invoice-rpc.check.d.ts.map +1 -0
- package/dist-lib/lib/erp-invoice-rpc.check.js +47 -0
- package/dist-lib/lib/erp-invoice-view.d.ts +21 -0
- package/dist-lib/lib/erp-invoice-view.d.ts.map +1 -1
- package/dist-lib/lib/erp-invoice-view.js +20 -0
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +15 -5
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +2 -0
- package/dist-lib/lib/stock-product-link.check.d.ts +2 -0
- package/dist-lib/lib/stock-product-link.check.d.ts.map +1 -0
- package/dist-lib/lib/stock-product-link.check.js +32 -0
- package/dist-lib/lib/stock-product-link.d.ts +45 -0
- package/dist-lib/lib/stock-product-link.d.ts.map +1 -0
- package/dist-lib/lib/stock-product-link.js +79 -0
- package/dist-lib/lib/stock-product-link.server.d.ts +3 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -0
- package/dist-lib/lib/stock-product-link.server.js +24 -0
- package/package.json +1 -1
|
@@ -3,10 +3,10 @@ import { useState } from "react";
|
|
|
3
3
|
import { useQuery } from "@tanstack/react-query";
|
|
4
4
|
import { FileText } from "lucide-react";
|
|
5
5
|
import { supabase } from "../../integrations/supabase/client.js";
|
|
6
|
-
import { canOpenPdf, invoiceDisplay, rpcErrorKind } from "../../lib/erp-invoice-view.js";
|
|
6
|
+
import { canOpenPdf, invoiceDisplay, loadInvoicePdfPath, loadOrderInvoices, rpcErrorKind } from "../../lib/erp-invoice-view.js";
|
|
7
7
|
// Factuurblok: leest alleen via de RPC's van Facturatie. Geen Facturatie,
|
|
8
|
-
// geen recht of geen facturen → het blok blijft weg
|
|
9
|
-
|
|
8
|
+
// geen recht of geen facturen → het blok blijft weg. Andere fout → korte melding.
|
|
9
|
+
// supabase.rpc altijd als methode aanroepen (via de helpers), nooit losmaken.
|
|
10
10
|
const money = new Intl.NumberFormat("nl-NL", { style: "currency", currency: "EUR" });
|
|
11
11
|
export function OrderInvoiceCard({ orderId }) {
|
|
12
12
|
const [pdfError, setPdfError] = useState(null);
|
|
@@ -15,17 +15,12 @@ export function OrderInvoiceCard({ orderId }) {
|
|
|
15
15
|
queryKey: ["erp-invoices-for-order", orderId],
|
|
16
16
|
retry: false,
|
|
17
17
|
staleTime: 60000,
|
|
18
|
-
queryFn:
|
|
19
|
-
const { data, error } = await rpc("erp_invoices_for_order", { p_order_id: orderId });
|
|
20
|
-
if (error) {
|
|
21
|
-
if (rpcErrorKind(error) === "other")
|
|
22
|
-
console.warn("Facturen lezen mislukt", error.code ?? "");
|
|
23
|
-
return [];
|
|
24
|
-
}
|
|
25
|
-
return Array.isArray(data) ? data : [];
|
|
26
|
-
},
|
|
18
|
+
queryFn: () => loadOrderInvoices(supabase, orderId),
|
|
27
19
|
});
|
|
28
|
-
|
|
20
|
+
if (q.data?.error) {
|
|
21
|
+
return (_jsxs("div", { className: "rounded-lg border bg-card p-4 text-sm text-muted-foreground", children: [_jsx("span", { className: "font-semibold text-foreground", children: "Factuur" }), " \u2014 facturen konden niet worden geladen."] }));
|
|
22
|
+
}
|
|
23
|
+
const rows = q.data?.rows ?? [];
|
|
29
24
|
if (rows.length === 0)
|
|
30
25
|
return null;
|
|
31
26
|
async function openPdf(r) {
|
|
@@ -33,7 +28,7 @@ export function OrderInvoiceCard({ orderId }) {
|
|
|
33
28
|
setBusy(r.id);
|
|
34
29
|
const win = window.open("", "_blank");
|
|
35
30
|
try {
|
|
36
|
-
const { data, error } = await
|
|
31
|
+
const { data, error } = await loadInvoicePdfPath(supabase, r.id);
|
|
37
32
|
const path = typeof data === "string" ? data : null;
|
|
38
33
|
if (error || !canOpenPdf(r.source, path)) {
|
|
39
34
|
win?.close();
|
|
@@ -168,7 +168,7 @@ function SalesOrderDetailViewInner({ floridayLoading, order, sellerFallback, hid
|
|
|
168
168
|
beladingParts.push(lcShort);
|
|
169
169
|
const belading = beladingParts.length > 0 ? beladingParts.join(" - ") : "—";
|
|
170
170
|
const fsEntry = order.floridayStatus?.entries?.[0] ?? null;
|
|
171
|
-
const klantReferentie = pickStr(o.customerOrderId) ?? pickStr(fsEntry?.customerOrderId) ?? "—";
|
|
171
|
+
const klantReferentie = pickStr(o.customerOrderId) ?? pickStr(fsEntry?.customerOrderId) ?? pickStr(order.customerReference) ?? "—";
|
|
172
172
|
const floridayRef = pickStr(o.salesChannelOrderId) ??
|
|
173
173
|
pickStr(fsEntry?.salesChannelOrderId) ??
|
|
174
174
|
pickStr(o.batchReference) ??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,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;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,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;AAkFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,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;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,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;AAkFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAoSL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAc7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAmBhE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -811,6 +811,14 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
811
811
|
// een niet-misleidend `article_number` en een duidelijke `source` in
|
|
812
812
|
// `custom_fields` (zodat de voorraadmodule ze veilig kan negeren of
|
|
813
813
|
// opruimen).
|
|
814
|
+
// Lege belading aanvullen uit de primaire verpakking van het gekoppelde
|
|
815
|
+
// voorraadartikel (eerst products.id, anders products.floriday_trade_item_id).
|
|
816
|
+
{
|
|
817
|
+
const { loadStockLinks } = await import("./stock-product-link.server.js");
|
|
818
|
+
const { fillLineFromStock } = await import("./stock-product-link.js");
|
|
819
|
+
const links = await loadStockLinks(supabaseAdmin, data.lines.map((l) => l.product_id));
|
|
820
|
+
data.lines = data.lines.map((l) => fillLineFromStock(l, links.get(l.product_id)));
|
|
821
|
+
}
|
|
814
822
|
const productIds = Array.from(new Set(data.lines.map((l) => l.product_id)));
|
|
815
823
|
const [existingProductsRes, draftsRes, floridayRes, groupsRes] = await Promise.all([
|
|
816
824
|
supabaseAdmin.from("products").select("id").in("id", productIds),
|
|
@@ -1648,6 +1656,11 @@ export const getEffectivePrices = createServerFn({ method: "POST" })
|
|
|
1648
1656
|
.parse(input))
|
|
1649
1657
|
.handler(async ({ data, context }) => {
|
|
1650
1658
|
const out = {};
|
|
1659
|
+
// Terugval op de verkoopprijs van het voorraadartikel: dit formulier maakt
|
|
1660
|
+
// alleen handmatige orders (HO/AO/MO); Floriday-orders komen hier nooit.
|
|
1661
|
+
const { loadStockLinks } = await import("./stock-product-link.server.js");
|
|
1662
|
+
const { fallbackPrice } = await import("./stock-product-link.js");
|
|
1663
|
+
const links = await loadStockLinks(context.supabase, data.lines.map((l) => l.productId));
|
|
1651
1664
|
for (const l of data.lines) {
|
|
1652
1665
|
const { data: rows, error } = await context.supabase.rpc("local_effective_price", {
|
|
1653
1666
|
_customer_id: data.customerId,
|
|
@@ -1657,7 +1670,11 @@ export const getEffectivePrices = createServerFn({ method: "POST" })
|
|
|
1657
1670
|
});
|
|
1658
1671
|
const r = Array.isArray(rows) ? rows[0] : rows;
|
|
1659
1672
|
const price = Number(r?.net_price);
|
|
1660
|
-
|
|
1673
|
+
if (!error && Number.isFinite(price) && price > 0) {
|
|
1674
|
+
out[l.productId] = { price, source: r?.source ?? null };
|
|
1675
|
+
continue;
|
|
1676
|
+
}
|
|
1677
|
+
out[l.productId] = fallbackPrice("manual", null, links.get(l.productId));
|
|
1661
1678
|
}
|
|
1662
1679
|
return out;
|
|
1663
1680
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erp-invoice-rpc.check.d.ts","sourceRoot":"","sources":["../../src/lib/erp-invoice-rpc.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
// Draai: bun src/lib/erp-invoice-rpc.check.ts
|
|
2
|
+
// Roept de ECHTE Supabase-client aan (fetch vervangen door een stub), geen losse mock van rpc.
|
|
3
|
+
import { createClient } from "@supabase/supabase-js";
|
|
4
|
+
import { loadOrderInvoices, loadInvoicePdfPath } from "./erp-invoice-view.js";
|
|
5
|
+
let failed = 0;
|
|
6
|
+
function check(name, ok, info = "") {
|
|
7
|
+
if (!ok)
|
|
8
|
+
failed++;
|
|
9
|
+
console.log(`${ok ? "OK " : "FOUT"} ${name}${info ? `: ${info}` : ""}`);
|
|
10
|
+
}
|
|
11
|
+
const calls = [];
|
|
12
|
+
let reply = { status: 200, body: [] };
|
|
13
|
+
const stubFetch = (async (input) => {
|
|
14
|
+
calls.push(String(typeof input === "string" ? input : input.url));
|
|
15
|
+
return new Response(JSON.stringify(reply.body), { status: reply.status, headers: { "content-type": "application/json" } });
|
|
16
|
+
});
|
|
17
|
+
const client = createClient("http://stub.invalid", "stub-key", { global: { fetch: stubFetch }, auth: { persistSession: false } });
|
|
18
|
+
reply = { status: 200, body: [{ id: "12", invoice_number: "FS-2026-00001" }] };
|
|
19
|
+
const a = await loadOrderInvoices(client, "00000000-0000-0000-0000-000000000001");
|
|
20
|
+
check("echte client bereikt /rpc/erp_invoices_for_order", calls.some((u) => u.includes("/rest/v1/rpc/erp_invoices_for_order")), calls.join(","));
|
|
21
|
+
check("rij terug", a.rows.length === 1 && a.error === null, JSON.stringify(a));
|
|
22
|
+
reply = { status: 200, body: "invoices/x.pdf" };
|
|
23
|
+
const p = await loadInvoicePdfPath(client, "12");
|
|
24
|
+
check("pdf-pad via echte client", calls.some((u) => u.includes("/rpc/erp_invoice_pdf_path")) && p.data === "invoices/x.pdf", JSON.stringify(p));
|
|
25
|
+
reply = { status: 404, body: { code: "PGRST202", message: "Could not find the function" } };
|
|
26
|
+
const m = await loadOrderInvoices(client, "x");
|
|
27
|
+
check("functie bestaat niet → verbergen", m.hidden && !m.error);
|
|
28
|
+
reply = { status: 403, body: { code: "42501", message: "permission denied" } };
|
|
29
|
+
const f = await loadOrderInvoices(client, "x");
|
|
30
|
+
check("42501 → verbergen", f.hidden && !f.error);
|
|
31
|
+
reply = { status: 500, body: { code: "XX000", message: "kapot" } };
|
|
32
|
+
const o = await loadOrderInvoices(client, "x");
|
|
33
|
+
check("andere fout → melding", !o.hidden && !!o.error, JSON.stringify(o));
|
|
34
|
+
// Bewijs dat de test kan falen: losgemaakte methode verliest `this`.
|
|
35
|
+
const detached = client.rpc;
|
|
36
|
+
let threw = false;
|
|
37
|
+
try {
|
|
38
|
+
await detached("erp_invoices_for_order", {});
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
threw = true;
|
|
42
|
+
}
|
|
43
|
+
check("losgemaakte rpc faalt (test kan falen)", threw);
|
|
44
|
+
if (failed) {
|
|
45
|
+
console.error(`${failed} fout(en)`);
|
|
46
|
+
process.exit(1);
|
|
47
|
+
}
|
|
@@ -26,4 +26,25 @@ export declare function rpcErrorKind(err: {
|
|
|
26
26
|
export declare function paymentLabel(s: string | null | undefined): string;
|
|
27
27
|
export declare function invoiceDisplay(r: ErpInvoiceRow): InvoiceDisplay;
|
|
28
28
|
export declare function canOpenPdf(source: string | null | undefined, path: string | null | undefined): boolean;
|
|
29
|
+
type RpcResult = {
|
|
30
|
+
data: unknown;
|
|
31
|
+
error: {
|
|
32
|
+
code?: string;
|
|
33
|
+
message?: string;
|
|
34
|
+
status?: number;
|
|
35
|
+
} | null;
|
|
36
|
+
};
|
|
37
|
+
/** Minimaal wat we van de Supabase-client nodig hebben; altijd als methode aanroepen (client.rpc(...)), nooit losmaken. */
|
|
38
|
+
export type RpcClient = {
|
|
39
|
+
rpc: (fn: any, args?: any) => PromiseLike<RpcResult> | any;
|
|
40
|
+
};
|
|
41
|
+
export type InvoiceLoad = {
|
|
42
|
+
rows: ErpInvoiceRow[];
|
|
43
|
+
hidden: boolean;
|
|
44
|
+
error: string | null;
|
|
45
|
+
};
|
|
46
|
+
/** Leest facturen van een order. missing/forbidden → verbergen; andere fout → melding. */
|
|
47
|
+
export declare function loadOrderInvoices(client: RpcClient, orderId: string): Promise<InvoiceLoad>;
|
|
48
|
+
export declare function loadInvoicePdfPath(client: RpcClient, invoiceId: string): Promise<RpcResult>;
|
|
49
|
+
export {};
|
|
29
50
|
//# sourceMappingURL=erp-invoice-view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erp-invoice-view.d.ts","sourceRoot":"","sources":["../../src/lib/erp-invoice-view.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,GAAG,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GACrG,SAAS,GACT,WAAW,GACX,OAAO,CAMV;AAUD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAIjE;AAMD,wBAAgB,cAAc,CAAC,CAAC,EAAE,aAAa,GAAG,cAAc,CAkB/D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAEtG"}
|
|
1
|
+
{"version":3,"file":"erp-invoice-view.d.ts","sourceRoot":"","sources":["../../src/lib/erp-invoice-view.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,GAAG,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GACrG,SAAS,GACT,WAAW,GACX,OAAO,CAMV;AAUD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAIjE;AAMD,wBAAgB,cAAc,CAAC,CAAC,EAAE,aAAa,GAAG,cAAc,CAkB/D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAEtG;AAED,KAAK,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,CAAC;AACvG,2HAA2H;AAC3H,MAAM,MAAM,SAAS,GAAG;IAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,WAAW,CAAC,SAAS,CAAC,GAAG,GAAG,CAAA;CAAE,CAAC;AAEvF,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3F,0FAA0F;AAC1F,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAahG;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAEjG"}
|
|
@@ -51,3 +51,23 @@ export function invoiceDisplay(r) {
|
|
|
51
51
|
export function canOpenPdf(source, path) {
|
|
52
52
|
return source !== "twinfield_klassiek" && !!path && String(path).trim() !== "";
|
|
53
53
|
}
|
|
54
|
+
/** Leest facturen van een order. missing/forbidden → verbergen; andere fout → melding. */
|
|
55
|
+
export async function loadOrderInvoices(client, orderId) {
|
|
56
|
+
let res;
|
|
57
|
+
try {
|
|
58
|
+
res = (await client.rpc("erp_invoices_for_order", { p_order_id: orderId }));
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
return { rows: [], hidden: false, error: e instanceof Error ? e.message : String(e) };
|
|
62
|
+
}
|
|
63
|
+
if (res.error) {
|
|
64
|
+
const k = rpcErrorKind(res.error);
|
|
65
|
+
if (k === "missing" || k === "forbidden")
|
|
66
|
+
return { rows: [], hidden: true, error: null };
|
|
67
|
+
return { rows: [], hidden: false, error: res.error.message ?? res.error.code ?? "onbekende fout" };
|
|
68
|
+
}
|
|
69
|
+
return { rows: Array.isArray(res.data) ? res.data : [], hidden: false, error: null };
|
|
70
|
+
}
|
|
71
|
+
export async function loadInvoicePdfPath(client, invoiceId) {
|
|
72
|
+
return (await client.rpc("erp_invoice_pdf_path", { p_invoice_id: invoiceId }));
|
|
73
|
+
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.135";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;;;;;;;;;;GA2F7B,CAAC"}
|
|
@@ -40,7 +40,17 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
40
40
|
if (!data.productIds.length)
|
|
41
41
|
return { impossible, missing, impossibleByLine, missingByLine, available: true, oordeelAvailable: true, perLine: false };
|
|
42
42
|
const sb = context.supabase;
|
|
43
|
-
|
|
43
|
+
// Engine kent het voorraadartikel; vertaal trade-item-id → products.id
|
|
44
|
+
// (zelfde koppeling als Engine 1.0.215) en zet de uitkomst terug.
|
|
45
|
+
const { loadStockLinks } = await import("./stock-product-link.server.js");
|
|
46
|
+
const links = await loadStockLinks(sb, data.productIds);
|
|
47
|
+
const toStock = (id) => links.get(id)?.stockProductId ?? id;
|
|
48
|
+
const back = new Map();
|
|
49
|
+
for (const id of data.productIds)
|
|
50
|
+
back.set(toStock(id), id);
|
|
51
|
+
const fromStock = (id) => back.get(id) ?? id;
|
|
52
|
+
data = { ...data, productIds: Array.from(new Set(data.productIds.map(toStock))) };
|
|
53
|
+
const regels = (data.regels ?? []).map((r) => ({ ...r, productId: toStock(r.productId) }));
|
|
44
54
|
const [oordeel, maten, perRegel] = await Promise.all([
|
|
45
55
|
sb.rpc("logistics_product_oordeel_many", { p_product_ids: data.productIds }),
|
|
46
56
|
sb.rpc("logistics_product_maten", { p_product_ids: data.productIds }),
|
|
@@ -75,21 +85,21 @@ export const getProductPlannability = createServerFn({ method: "POST" })
|
|
|
75
85
|
if (!oordeel.error) {
|
|
76
86
|
for (const r of (oordeel.data ?? [])) {
|
|
77
87
|
if (r?.product_id && String(r.oordeel ?? "").toLowerCase() === "onmogelijk")
|
|
78
|
-
impossible[String(r.product_id)] = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt dit product onmogelijk.";
|
|
88
|
+
impossible[fromStock(String(r.product_id))] = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt dit product onmogelijk.";
|
|
79
89
|
}
|
|
80
90
|
}
|
|
81
91
|
// Terugval (oudere Engine): het productoordeel gaat over de standaardbelading
|
|
82
92
|
// van het artikel en geldt daarom alleen voor regels die die standaard gebruiken.
|
|
83
93
|
if (!perLine) {
|
|
84
94
|
for (const r of regels) {
|
|
85
|
-
if (r.isDefault && impossible[r.productId])
|
|
86
|
-
impossibleByLine[r.key] = impossible[r.productId];
|
|
95
|
+
if (r.isDefault && impossible[fromStock(r.productId)])
|
|
96
|
+
impossibleByLine[r.key] = impossible[fromStock(r.productId)];
|
|
87
97
|
}
|
|
88
98
|
}
|
|
89
99
|
if (!maten.error) {
|
|
90
100
|
for (const r of (maten.data ?? [])) {
|
|
91
101
|
if (r?.product_id && typeof r.missing_reason === "string" && r.missing_reason.trim())
|
|
92
|
-
missing[String(r.product_id)] = r.missing_reason.trim();
|
|
102
|
+
missing[fromStock(String(r.product_id))] = r.missing_reason.trim();
|
|
93
103
|
}
|
|
94
104
|
}
|
|
95
105
|
return { impossible, missing, impossibleByLine, missingByLine, available: !maten.error, oordeelAvailable: !oordeel.error, perLine };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -288,6 +288,7 @@ export function ordersToCsv(orders) {
|
|
|
288
288
|
"Stuksprijs",
|
|
289
289
|
"Omzet",
|
|
290
290
|
"Klant",
|
|
291
|
+
"Referentie klant",
|
|
291
292
|
"Postcode",
|
|
292
293
|
"Plaats",
|
|
293
294
|
"Levering",
|
|
@@ -305,6 +306,7 @@ export function ordersToCsv(orders) {
|
|
|
305
306
|
o.quantity.unitPrice.toFixed(2),
|
|
306
307
|
o.revenue.toFixed(2),
|
|
307
308
|
o.customer.name,
|
|
309
|
+
o.customerReference ?? "",
|
|
308
310
|
o.customer.postalCode,
|
|
309
311
|
o.customer.city,
|
|
310
312
|
o.deliveryAt,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stock-product-link.check.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Draai: bun src/lib/stock-product-link.check.ts
|
|
2
|
+
import { fallbackPrice, fillLineFromStock, linkStockProducts } from "./stock-product-link.js";
|
|
3
|
+
let failed = 0;
|
|
4
|
+
function check(name, got, want) {
|
|
5
|
+
const g = JSON.stringify(got), w = JSON.stringify(want);
|
|
6
|
+
if (g !== w)
|
|
7
|
+
failed++;
|
|
8
|
+
console.log(`${g === w ? "OK " : "FOUT"} ${name}: ${g}${g === w ? "" : ` (verwacht ${w})`}`);
|
|
9
|
+
}
|
|
10
|
+
const TI = "ea7776dd-0000-0000-0000-000000000000";
|
|
11
|
+
const STOCK = "27612767-0000-0000-0000-000000000000";
|
|
12
|
+
const products = [
|
|
13
|
+
{ id: TI, sale_price: 1.4, floriday_trade_item_id: null, is_mirror: true },
|
|
14
|
+
{ id: STOCK, sale_price: 1.25, floriday_trade_item_id: TI, is_mirror: false },
|
|
15
|
+
];
|
|
16
|
+
const packs = [{ product_id: STOCK, is_primary: true, sort_order: 0, vbn_package_code: 18, load_carrier: "DANISH_TROLLEY", pieces_per_package: 12, packages_per_layer: 5, layers_per_load_carrier: 8 }];
|
|
17
|
+
const link = linkStockProducts([TI], products, packs).get(TI);
|
|
18
|
+
check("trade-item-id → voorraadartikel via floriday_trade_item_id", link?.stockProductId, STOCK);
|
|
19
|
+
check("primaire belading", link?.primary, { vbn_package_code: "18", load_carrier_type: "DANISH_TROLLEY", plants_per_crate: 12, crates_per_layer: 5, layers_per_cart: 8 });
|
|
20
|
+
check("products.id eerst", linkStockProducts([STOCK], products, packs).get(STOCK)?.stockProductId, STOCK);
|
|
21
|
+
const line = fillLineFromStock({ vbn_package_code: null, load_carrier_type: null, packing_source: null }, link);
|
|
22
|
+
check("lege regel krijgt belading", [line.vbn_package_code, line.load_carrier_type, line.plants_per_crate, line.packing_source], ["18", "DANISH_TROLLEY", 12, "product_primary"]);
|
|
23
|
+
const chosen = fillLineFromStock({ vbn_package_code: "575", load_carrier_type: "AUCTION_TROLLEY", plants_per_crate: 6, packing_source: "chosen" }, link);
|
|
24
|
+
check("gekozen belading blijft", [chosen.vbn_package_code, chosen.load_carrier_type, chosen.plants_per_crate], ["575", "AUCTION_TROLLEY", 6]);
|
|
25
|
+
check("handmatig zonder prijsgroep → artikelprijs", fallbackPrice("manual", null, link), { price: 1.25, source: "artikel" });
|
|
26
|
+
check("prijsgroep gaat voor", fallbackPrice("manual", 2, link), { price: 2, source: "prijsgroep" });
|
|
27
|
+
check("Floriday-order nooit artikelprijs", fallbackPrice("floriday", null, link), null);
|
|
28
|
+
if (failed) {
|
|
29
|
+
console.error(`${failed} fout(en)`);
|
|
30
|
+
process.exit(1);
|
|
31
|
+
}
|
|
32
|
+
console.log("Alle controles geslaagd");
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
export type ProductRow = {
|
|
2
|
+
id: string;
|
|
3
|
+
sale_price: number | string | null;
|
|
4
|
+
floriday_trade_item_id: string | null;
|
|
5
|
+
is_mirror: boolean;
|
|
6
|
+
};
|
|
7
|
+
export type PackingRow = {
|
|
8
|
+
product_id: string;
|
|
9
|
+
is_primary: boolean | null;
|
|
10
|
+
sort_order: number | null;
|
|
11
|
+
vbn_package_code: string | number | null;
|
|
12
|
+
load_carrier: string | null;
|
|
13
|
+
pieces_per_package: number | null;
|
|
14
|
+
packages_per_layer: number | null;
|
|
15
|
+
layers_per_load_carrier: number | null;
|
|
16
|
+
};
|
|
17
|
+
export type StockLink = {
|
|
18
|
+
stockProductId: string;
|
|
19
|
+
salePrice: number | null;
|
|
20
|
+
primary: {
|
|
21
|
+
vbn_package_code: string | null;
|
|
22
|
+
load_carrier_type: string | null;
|
|
23
|
+
plants_per_crate: number | null;
|
|
24
|
+
crates_per_layer: number | null;
|
|
25
|
+
layers_per_cart: number | null;
|
|
26
|
+
} | null;
|
|
27
|
+
};
|
|
28
|
+
export declare function primaryPacking(packs: PackingRow[]): StockLink["primary"];
|
|
29
|
+
/** Per gevraagd product_id het voorraadartikel (of niets). */
|
|
30
|
+
export declare function linkStockProducts(ids: string[], products: ProductRow[], packings: PackingRow[]): Map<string, StockLink>;
|
|
31
|
+
/** Vult lege beladingvelden van een regel aan met de primaire verpakking; gekozen waarden blijven. */
|
|
32
|
+
export declare function fillLineFromStock<T extends {
|
|
33
|
+
vbn_package_code?: string | null;
|
|
34
|
+
load_carrier_type?: string | null;
|
|
35
|
+
plants_per_crate?: number;
|
|
36
|
+
crates_per_layer?: number;
|
|
37
|
+
layers_per_cart?: number;
|
|
38
|
+
packing_source?: "product_primary" | "customer" | "chosen" | null;
|
|
39
|
+
}>(line: T, link: StockLink | undefined): T;
|
|
40
|
+
/** Prijs-terugval: alleen voor handmatige orders (HO/AO/MO), nooit Floriday. */
|
|
41
|
+
export declare function fallbackPrice(orderKind: "manual" | "floriday", groupPrice: number | null, link: StockLink | undefined): {
|
|
42
|
+
price: number;
|
|
43
|
+
source: string;
|
|
44
|
+
} | null;
|
|
45
|
+
//# sourceMappingURL=stock-product-link.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stock-product-link.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,CAAC;AACF,MAAM,MAAM,SAAS,GAAG;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE;QACP,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,GAAG,IAAI,CAAC;CACV,CAAC;AAOF,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAWxE;AAED,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAoBvH;AAED,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAC1C,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAC/E,cAAc,CAAC,EAAE,iBAAiB,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;CACnE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,CAAC,CAa1C;AAED,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAIhK"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
// Koppeling orderregel → voorraadartikel (client-safe, pure logica).
|
|
2
|
+
// Contract gelijk aan Engine 1.0.215 (logistics_ladingdrager_voor_regel):
|
|
3
|
+
// 1) products.id = order_items.product_id
|
|
4
|
+
// 2) anders products.floriday_trade_item_id = order_items.product_id
|
|
5
|
+
// Een spiegelrij (custom_fields.source = 'sales-module-*-mirror') zonder
|
|
6
|
+
// primaire verpakking telt niet als voorraadartikel bij stap 1.
|
|
7
|
+
// Verpakkingen hangen aan products.id (product_packings.product_id).
|
|
8
|
+
const pos = (v) => {
|
|
9
|
+
const n = Number(v);
|
|
10
|
+
return Number.isFinite(n) && n > 0 ? n : null;
|
|
11
|
+
};
|
|
12
|
+
export function primaryPacking(packs) {
|
|
13
|
+
if (!packs.length)
|
|
14
|
+
return null;
|
|
15
|
+
const p = [...packs].sort((a, b) => (b.is_primary ? 1 : 0) - (a.is_primary ? 1 : 0) || (a.sort_order ?? 0) - (b.sort_order ?? 0))[0];
|
|
16
|
+
const vbn = p.vbn_package_code == null ? "" : String(p.vbn_package_code).trim();
|
|
17
|
+
return {
|
|
18
|
+
vbn_package_code: vbn || null,
|
|
19
|
+
load_carrier_type: (p.load_carrier ?? "").trim() || null,
|
|
20
|
+
plants_per_crate: pos(p.pieces_per_package),
|
|
21
|
+
crates_per_layer: pos(p.packages_per_layer),
|
|
22
|
+
layers_per_cart: pos(p.layers_per_load_carrier),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** Per gevraagd product_id het voorraadartikel (of niets). */
|
|
26
|
+
export function linkStockProducts(ids, products, packings) {
|
|
27
|
+
const packsBy = new Map();
|
|
28
|
+
for (const p of packings) {
|
|
29
|
+
const l = packsBy.get(p.product_id) ?? [];
|
|
30
|
+
l.push(p);
|
|
31
|
+
packsBy.set(p.product_id, l);
|
|
32
|
+
}
|
|
33
|
+
const byId = new Map(products.map((p) => [p.id, p]));
|
|
34
|
+
const byTradeItem = new Map();
|
|
35
|
+
for (const p of products)
|
|
36
|
+
if (p.floriday_trade_item_id && !p.is_mirror)
|
|
37
|
+
byTradeItem.set(p.floriday_trade_item_id, p);
|
|
38
|
+
const mk = (p) => ({ stockProductId: p.id, salePrice: pos(p.sale_price), primary: primaryPacking(packsBy.get(p.id) ?? []) });
|
|
39
|
+
const out = new Map();
|
|
40
|
+
for (const id of ids) {
|
|
41
|
+
const direct = byId.get(id);
|
|
42
|
+
if (direct && !(direct.is_mirror && !(packsBy.get(direct.id)?.length))) {
|
|
43
|
+
out.set(id, mk(direct));
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
const viaTi = byTradeItem.get(id);
|
|
47
|
+
if (viaTi) {
|
|
48
|
+
out.set(id, mk(viaTi));
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
if (direct)
|
|
52
|
+
out.set(id, mk(direct));
|
|
53
|
+
}
|
|
54
|
+
return out;
|
|
55
|
+
}
|
|
56
|
+
/** Vult lege beladingvelden van een regel aan met de primaire verpakking; gekozen waarden blijven. */
|
|
57
|
+
export function fillLineFromStock(line, link) {
|
|
58
|
+
const p = link?.primary;
|
|
59
|
+
if (!p)
|
|
60
|
+
return line;
|
|
61
|
+
const own = line.packing_source === "chosen" || line.packing_source === "customer";
|
|
62
|
+
return {
|
|
63
|
+
...line,
|
|
64
|
+
vbn_package_code: (line.vbn_package_code ?? "").trim() || p.vbn_package_code,
|
|
65
|
+
load_carrier_type: (line.load_carrier_type ?? "").trim() || p.load_carrier_type,
|
|
66
|
+
plants_per_crate: line.plants_per_crate ?? (own ? undefined : p.plants_per_crate ?? undefined),
|
|
67
|
+
crates_per_layer: line.crates_per_layer ?? (own ? undefined : p.crates_per_layer ?? undefined),
|
|
68
|
+
layers_per_cart: line.layers_per_cart ?? (own ? undefined : p.layers_per_cart ?? undefined),
|
|
69
|
+
packing_source: line.packing_source ?? "product_primary",
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
/** Prijs-terugval: alleen voor handmatige orders (HO/AO/MO), nooit Floriday. */
|
|
73
|
+
export function fallbackPrice(orderKind, groupPrice, link) {
|
|
74
|
+
if (groupPrice != null && groupPrice > 0)
|
|
75
|
+
return { price: groupPrice, source: "prijsgroep" };
|
|
76
|
+
if (orderKind !== "manual")
|
|
77
|
+
return null;
|
|
78
|
+
return link?.salePrice ? { price: link.salePrice, source: "artikel" } : null;
|
|
79
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stock-product-link.server.d.ts","sourceRoot":"","sources":["../../src/lib/stock-product-link.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3G,wBAAsB,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAmB5F"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
// Leest products + product_packings en koppelt via stock-product-link.ts.
|
|
2
|
+
import { linkStockProducts } from "./stock-product-link.js";
|
|
3
|
+
export async function loadStockLinks(sb, ids) {
|
|
4
|
+
const uniq = Array.from(new Set(ids.filter(Boolean)));
|
|
5
|
+
if (!uniq.length)
|
|
6
|
+
return new Map();
|
|
7
|
+
const [a, b] = await Promise.all([
|
|
8
|
+
sb.from("products").select("id, sale_price, floriday_trade_item_id, custom_fields").in("id", uniq),
|
|
9
|
+
sb.from("products").select("id, sale_price, floriday_trade_item_id, custom_fields").in("floriday_trade_item_id", uniq),
|
|
10
|
+
]);
|
|
11
|
+
const seen = new Map();
|
|
12
|
+
for (const r of [...(a.data ?? []), ...(b.data ?? [])]) {
|
|
13
|
+
const src = String(r?.custom_fields?.source ?? "");
|
|
14
|
+
seen.set(r.id, { id: r.id, sale_price: r.sale_price, floriday_trade_item_id: r.floriday_trade_item_id ?? null, is_mirror: /^sales-module-.*-mirror$/.test(src) });
|
|
15
|
+
}
|
|
16
|
+
const products = Array.from(seen.values());
|
|
17
|
+
if (!products.length)
|
|
18
|
+
return new Map();
|
|
19
|
+
const { data: packs } = await sb
|
|
20
|
+
.from("product_packings")
|
|
21
|
+
.select("product_id, is_primary, sort_order, vbn_package_code, load_carrier, pieces_per_package, packages_per_layer, layers_per_load_carrier")
|
|
22
|
+
.in("product_id", products.map((p) => p.id));
|
|
23
|
+
return linkStockProducts(uniq, products, (packs ?? []));
|
|
24
|
+
}
|