@flowselections/floriday-voorraad 1.0.121 → 1.0.125

package/dist-lib/lib/__tests__/erp-test-123.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=erp-test-123.test.d.ts.map

package/dist-lib/lib/__tests__/erp-test-123.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"erp-test-123.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__tests__/erp-test-123.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/__tests__/erp-test-123.test.js

@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import { resolveBuyerOrganizations, isMissingFunctionError } from "../buyer-organizations.js";
+import { missingPackingFields, simplePackingToRow, engineOordeelRegel, ENGINE_CARRIER_CODE } from "../simple-packing.js";
+const cache = async () => ["cache-1"];
+describe("kopers: vaste zoekvolgorde", () => {
+    it("expliciete keuze gaat voor alles", async () => {
+        const r = await resolveBuyerOrganizations({ explicit: ["a"], priceGroupCustomers: ["b"], authFunction: ["c"], connectionsCache: cache });
+        expect(r).toMatchObject({ ids: ["a"], source: "keuze" });
+    });
+    it("zonder keuze: klanten van de prijsgroep", async () => {
+        const r = await resolveBuyerOrganizations({ explicit: [], priceGroupCustomers: ["b", "b", "b2"], authFunction: ["c"], connectionsCache: cache });
+        expect(r).toMatchObject({ ids: ["b", "b2"], source: "prijsgroep" });
+    });
+    it("daarna floriday_buyer_organizations, ook als die leeg is (geen terugval op de oude cache)", async () => {
+        const r = await resolveBuyerOrganizations({ explicit: [], priceGroupCustomers: [], authFunction: [], connectionsCache: cache });
+        expect(r.source).toBe("geen");
+        expect(r.ids).toEqual([]);
+    });
+    it("alleen als de functie nog niet bestaat: de oude koppelingscache", async () => {
+        const r = await resolveBuyerOrganizations({ explicit: [], priceGroupCustomers: [], authFunction: null, connectionsCache: cache });
+        expect(r).toMatchObject({ ids: ["cache-1"], source: "floriday_connections_cache" });
+    });
+    it("herkent een ontbrekende functie", () => {
+        expect(isMissingFunctionError({ code: "PGRST202" })).toBe(true);
+        expect(isMissingFunctionError({ code: "42501", message: "geen toegang" })).toBe(false);
+    });
+});
+describe("belading in de eenvoudige route", () => {
+    const full = { vbnPackageCode: "412", piecesPerPackage: "12", packagesPerLayer: "5", layersPerLoadCarrier: "8", loadCarrier: "DANISH_TROLLEY" };
+    it("alle vijf velden verplicht, ook lagen per kar en ladingdrager", () => {
+        expect(missingPackingFields({ ...full, layersPerLoadCarrier: "" })).toEqual(["lagen per kar"]);
+        expect(missingPackingFields({ ...full, loadCarrier: "" })).toEqual(["ladingdrager"]);
+        expect(missingPackingFields(full)).toEqual([]);
+    });
+    it("geen standaardwaarden: onvolledig = fout", () => {
+        expect(() => simplePackingToRow({ ...full, piecesPerPackage: "0" })).toThrow(/planten per fust/);
+    });
+    it("Deense container (DC) gaat als danish_container naar de Engine", () => {
+        expect(ENGINE_CARRIER_CODE.DANISH_TROLLEY).toBe("danish_container");
+        expect(engineOordeelRegel("p1", full)).toEqual({ product_id: "p1", carrier_code: "danish_container", plants_per_crate: 12, crates_per_layer: 5, layers_per_cart: 8 });
+        expect(simplePackingToRow(full)).toMatchObject({ vbn_package_code: 412, pieces_per_package: 12, packages_per_layer: 5, layers_per_load_carrier: 8, is_primary: true });
+    });
+});

package/dist-lib/lib/__tests__/load-carriers.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=load-carriers.test.d.ts.map

package/dist-lib/lib/__tests__/load-carriers.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-carriers.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__tests__/load-carriers.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/__tests__/load-carriers.test.js

@@ -0,0 +1,15 @@
+import { describe, it, expect, vi } from "vitest";
+vi.mock("../../integrations/supabase/client", () => ({ supabase: {} }));
+import { loadCarriersFromRows } from "../../hooks/useLoadCarriers.js";
+describe("gedeelde lijst ladingdragers", () => {
+    it("neemt codes en namen over uit de database, op volgorde", () => {
+        const list = loadCarriersFromRows([
+            { code: "DANISH_TROLLEY", naam: "Deense container", volgorde: 2 },
+            { code: "AUCTION_TROLLEY", naam: "Stapelwagen", volgorde: 1 },
+        ]);
+        expect(list.map((c) => c.code)).toEqual(["AUCTION_TROLLEY", "DANISH_TROLLEY"]);
+    });
+    it("vult niets zelf aan als de database niets geeft", () => {
+        expect(loadCarriersFromRows(null)).toEqual([]);
+    });
+});

package/dist-lib/lib/buyer-organizations.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Kiest de koperorganisaties voor een aanbod, in vaste volgorde:
+ * 1. expliciete keuze, 2. klanten van de prijsgroep(en),
+ * 3. Floriday-auth `floriday_buyer_organizations`, 4. alleen als die functie
+ * nog niet bestaat: `floriday_connections_cache`.
+ */
+export type BuyerSource = "keuze" | "prijsgroep" | "floriday_buyer_organizations" | "floriday_connections_cache" | "geen";
+export declare const BUYER_SOURCE_LABEL: Record<BuyerSource, string>;
+export interface BuyerInputs {
+    explicit: string[];
+    priceGroupCustomers: string[];
+    /** null = functie bestaat nog niet. */
+    authFunction: string[] | null;
+    connectionsCache: () => Promise<string[]>;
+}
+export declare function resolveBuyerOrganizations(inp: BuyerInputs): Promise<{
+    ids: string[];
+    source: BuyerSource;
+    tried: BuyerSource[];
+}>;
+/** Fout die aangeeft dat een database-functie (nog) niet bestaat. */
+export declare function isMissingFunctionError(err: {
+    code?: string;
+    message?: string;
+} | null | undefined): boolean;
+//# sourceMappingURL=buyer-organizations.d.ts.map

package/dist-lib/lib/buyer-organizations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buyer-organizations.d.ts","sourceRoot":"","sources":["../../src/lib/buyer-organizations.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GACnB,OAAO,GACP,YAAY,GACZ,8BAA8B,GAC9B,4BAA4B,GAC5B,MAAM,CAAC;AAEX,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAM1D,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,uCAAuC;IACvC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,gBAAgB,EAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3C;AAWD,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,WAAW,GACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAgBvE;AAED,qEAAqE;AACrE,wBAAgB,sBAAsB,CAAC,GAAG,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG3G"}

package/dist-lib/lib/buyer-organizations.js

@@ -0,0 +1,41 @@
+export const BUYER_SOURCE_LABEL = {
+    keuze: "gekozen klanten",
+    prijsgroep: "klanten van de prijsgroep",
+    floriday_buyer_organizations: "kopers volgens Floriday-koppeling",
+    floriday_connections_cache: "koppelingen in Floriday (oude bron)",
+    geen: "geen bron",
+};
+function uniq(ids) {
+    const out = [];
+    for (const raw of ids) {
+        const id = typeof raw === "string" ? raw.trim() : "";
+        if (id && !out.includes(id))
+            out.push(id);
+    }
+    return out;
+}
+export async function resolveBuyerOrganizations(inp) {
+    const tried = [];
+    const explicit = uniq(inp.explicit);
+    tried.push("keuze");
+    if (explicit.length)
+        return { ids: explicit, source: "keuze", tried };
+    const pg = uniq(inp.priceGroupCustomers);
+    tried.push("prijsgroep");
+    if (pg.length)
+        return { ids: pg, source: "prijsgroep", tried };
+    if (inp.authFunction !== null) {
+        tried.push("floriday_buyer_organizations");
+        const a = uniq(inp.authFunction);
+        return { ids: a, source: a.length ? "floriday_buyer_organizations" : "geen", tried };
+    }
+    tried.push("floriday_connections_cache");
+    const c = uniq(await inp.connectionsCache());
+    return { ids: c, source: c.length ? "floriday_connections_cache" : "geen", tried };
+}
+/** Fout die aangeeft dat een database-functie (nog) niet bestaat. */
+export function isMissingFunctionError(err) {
+    if (!err)
+        return false;
+    return err.code === "PGRST202" || err.code === "42883" || /could not find the function|does not exist/i.test(err.message ?? "");
+}

package/dist-lib/lib/floriday-customer-offer.functions.d.ts

@@ -10,6 +10,7 @@ export declare const CustomerOfferInputSchema: z.ZodObject<{
     despatchWarehouseId: z.ZodString;
     numberOfPieces: z.ZodNumber;
     allowedCustomerOrganizationIds: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    priceGroupIds: z.ZodDefault<z.ZodArray<z.ZodString>>;
     packingConfiguration: z.ZodObject<{
         piecesPerPackage: z.ZodNumber;
         vbnPackageCode: z.ZodNumber;
@@ -41,6 +42,7 @@ export declare const publishCustomerOfferFn: import("@tanstack/start-client-core
     despatchWarehouseId: string;
     numberOfPieces: number;
     allowedCustomerOrganizationIds: string[];
+    priceGroupIds: string[];
     packingConfiguration: {
         piecesPerPackage: number;
         vbnPackageCode: number;
@@ -59,5 +61,7 @@ export declare const publishCustomerOfferFn: import("@tanstack/start-client-core
     customerOfferLineId: `${string}-${string}-${string}-${string}-${string}`;
     attemptId: string;
     status: number;
+    buyerSource: import("./buyer-organizations.js").BuyerSource;
+    buyerCount: number;
 }>>;
 //# sourceMappingURL=floriday-customer-offer.functions.d.ts.map

package/dist-lib/lib/floriday-customer-offer.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-customer-offer.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-customer-offer.functions.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;iBAwCnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAyB1E;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;0CAEb,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqJrC,CAAC"}
+{"version":3,"file":"floriday-customer-offer.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-customer-offer.functions.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;iBA0CnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAyB1E;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;0CAEb,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0LrC,CAAC"}

package/dist-lib/lib/floriday-customer-offer.functions.js

@@ -40,6 +40,8 @@ export const CustomerOfferInputSchema = z.object({
      * uit `floriday_connections_cache`).
      */
     allowedCustomerOrganizationIds: z.array(z.string().uuid()).default([]),
+    /** Prijsgroepen met een prijs; hun klanten zijn de tweede bron van kopers. */
+    priceGroupIds: z.array(z.string()).default([]),
     /**
      * Primaire packing meesturen zodat Floriday de regel goed valideert.
      */
@@ -90,26 +92,60 @@ export const publishCustomerOfferFn = createServerFn({ method: "POST" })
     const { gatewayWrite } = await import("./floriday-gateway.server.js");
     const activeConnection = await resolveActiveFloridayConnection(context.supabase);
     const environment = activeConnection.environment;
-    // Vul allowedCustomerOrganizationIds aan met alle gekoppelde
-    // koperorganisaties als de UI er geen selectie heeft doorgegeven.
-    let allowed = [...data.allowedCustomerOrganizationIds];
-    if (allowed.length === 0) {
-        const { data: rows } = await context.supabase
-            .from("floriday_connections_cache")
-            .select("buyer_organization_id")
-            .eq("connection_id", activeConnection.id)
-            .eq("is_deleted", false);
-        const seen = new Set();
-        for (const r of rows ?? []) {
-            const id = r?.buyer_organization_id;
-            if (id && !seen.has(id)) {
-                seen.add(id);
-                allowed.push(id);
+    // Kopers in vaste volgorde: keuze → prijsgroep → Floriday-auth → oude cache.
+    const { resolveBuyerOrganizations, isMissingFunctionError, BUYER_SOURCE_LABEL } = await import("./buyer-organizations.js");
+    // Floriday-auth 1.0.126: organization_id, organization_name, gln, sources,
+    // in_connections, in_trade_settings, price_group_ids. Match alleen op
+    // organization_id; lege lijst = nog geen kopers bekend (nooit aanvullen).
+    const { data: authRows, error: authErr } = await context.supabase.rpc("floriday_buyer_organizations", { p_connection_id: activeConnection.id });
+    if (authErr && !isMissingFunctionError(authErr)) {
+        throw new Error(`Kopers konden niet worden gelezen: ${authErr.message}`);
+    }
+    const authAvailable = !authErr;
+    const authList = (authRows ?? []).filter((r) => r?.organization_id);
+    const pgCustomers = [];
+    if (data.priceGroupIds.length) {
+        if (authAvailable) {
+            for (const r of authList) {
+                const pgs = Array.isArray(r.price_group_ids) ? r.price_group_ids : [];
+                if (pgs.some((p) => data.priceGroupIds.includes(String(p))))
+                    pgCustomers.push(String(r.organization_id));
+            }
+        }
+        else {
+            const { data: pgRows } = await context.supabase
+                .from("floriday_price_groups_cache")
+                .select("floriday_id,data")
+                .eq("connection_id", activeConnection.id)
+                .eq("is_deleted", false)
+                .in("floriday_id", data.priceGroupIds);
+            for (const r of pgRows ?? []) {
+                const list = r?.data?.customers;
+                if (Array.isArray(list))
+                    for (const c of list)
+                        pgCustomers.push(String(c));
             }
         }
     }
+    const authIds = authAvailable ? authList.map((r) => String(r.organization_id)) : null;
+    const buyers = await resolveBuyerOrganizations({
+        explicit: data.allowedCustomerOrganizationIds,
+        priceGroupCustomers: pgCustomers,
+        authFunction: authIds,
+        connectionsCache: async () => {
+            const { data: rows } = await context.supabase
+                .from("floriday_connections_cache")
+                .select("buyer_organization_id")
+                .eq("connection_id", activeConnection.id)
+                .eq("is_deleted", false);
+            return (rows ?? []).map((r) => r?.buyer_organization_id);
+        },
+    });
+    const allowed = buyers.ids;
     if (allowed.length === 0) {
-        throw new Error("Geen koperorganisaties beschikbaar — koppel eerst klanten in Floriday.");
+        throw new Error(`Geen koperorganisaties gevonden. Gezocht in: ${buyers.tried
+            .map((s) => BUYER_SOURCE_LABEL[s])
+            .join(", ")}. Koppel klanten in Floriday of zet klanten in de prijsgroep.`);
     }
     const orderStart = data.orderStart ?? new Date().toISOString();
     const orderEnd = data.orderEnd ?? addYears(orderStart, 1);
@@ -211,5 +247,7 @@ export const publishCustomerOfferFn = createServerFn({ method: "POST" })
         customerOfferLineId,
         attemptId: res.attemptId,
         status: res.status,
+        buyerSource: buyers.source,
+        buyerCount: allowed.length,
     };
 }));

package/dist-lib/lib/floriday-info.d.ts

@@ -50,5 +50,4 @@ export interface FloridayInfo {
     raw: unknown;
 }
 export declare function floridayInfoFromCache(raw: unknown): FloridayInfo | null;
-export declare const LOAD_CARRIER_LABELS: Record<string, string>;
 //# sourceMappingURL=floriday-info.d.ts.map

package/dist-lib/lib/floriday-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-info.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-info.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,qBAAqB,EAAE,qBAAqB,EAAE,CAAC;IAC/C,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,OAAO,CAAC;CACd;AAaD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI,CA0GvE;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOtD,CAAC"}
+{"version":3,"file":"floriday-info.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-info.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,qBAAqB,EAAE,qBAAqB,EAAE,CAAC;IAC/C,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,OAAO,CAAC;CACd;AAaD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI,CA0GvE"}

package/dist-lib/lib/floriday-info.js

@@ -104,11 +104,3 @@ export function floridayInfoFromCache(raw) {
         raw,
     };
 }
-export const LOAD_CARRIER_LABELS = {
-    AUCTION_TROLLEY: "Stapelwagen",
-    DANISH_TROLLEY: "Deense container",
-    EURO_TROLLEY: "Euro-rolcontainer",
-    PALLET: "Pallet",
-    EURO_PALLET: "Euro-pallet",
-    NONE: "Geen ladingdrager",
-};

package/dist-lib/lib/simple-packing.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Belading in de eenvoudige "Artikel toevoegen"-route. Alle vijf velden zijn
+ * verplicht (fust, planten per fust, fusten per laag, lagen per kar,
+ * ladingdrager); zonder die vijf kan de Engine geen kar plannen.
+ * Er worden nooit standaardwaarden ingevuld.
+ */
+import type { ProductPackingRow } from "./product-packings.js";
+export interface SimplePacking {
+    vbnPackageCode: string;
+    piecesPerPackage: string;
+    packagesPerLayer: string;
+    layersPerLoadCarrier: string;
+    /** Floriday-ladingdrager, bv. DANISH_TROLLEY (DC). */
+    loadCarrier: string;
+}
+export declare const EMPTY_SIMPLE_PACKING: SimplePacking;
+/** Floriday-ladingdrager → code van de Engine (load_carrier_types.code). */
+export declare const ENGINE_CARRIER_CODE: Record<string, string>;
+/** Namen van de velden die nog ontbreken of ongeldig zijn (leeg = compleet). */
+export declare function missingPackingFields(p: SimplePacking): string[];
+/** Hoofdverpakking voor product_packings; gooit als iets ontbreekt. */
+export declare function simplePackingToRow(p: SimplePacking): ProductPackingRow;
+/** Regel voor logistics_product_oordeel_belading (Engine). */
+export declare function engineOordeelRegel(productId: string, p: SimplePacking): {
+    product_id: string;
+    carrier_code: string;
+    plants_per_crate: number | null;
+    crates_per_layer: number | null;
+    layers_per_cart: number | null;
+};
+//# sourceMappingURL=simple-packing.d.ts.map

package/dist-lib/lib/simple-packing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simple-packing.d.ts","sourceRoot":"","sources":["../../src/lib/simple-packing.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,oBAAoB,EAAE,aAMlC,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOtD,CAAC;AAOF,gFAAgF;AAChF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,EAAE,CAQ/D;AAED,uEAAuE;AACvE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,aAAa,GAAG,iBAAiB,CActE;AAED,8DAA8D;AAC9D,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa;;;;;;EAQrE"}

package/dist-lib/lib/simple-packing.js

@@ -0,0 +1,62 @@
+export const EMPTY_SIMPLE_PACKING = {
+    vbnPackageCode: "",
+    piecesPerPackage: "",
+    packagesPerLayer: "",
+    layersPerLoadCarrier: "",
+    loadCarrier: "",
+};
+/** Floriday-ladingdrager → code van de Engine (load_carrier_types.code). */
+export const ENGINE_CARRIER_CODE = {
+    AUCTION_TROLLEY: "trolley",
+    DANISH_TROLLEY: "danish_container",
+    EURO_TROLLEY: "euro_rolcontainer",
+    PALLET: "pallet",
+    EURO_PALLET: "euro_pallet",
+    NONE: "loose",
+};
+function posInt(v) {
+    const n = Number(String(v).trim());
+    return Number.isInteger(n) && n > 0 ? n : null;
+}
+/** Namen van de velden die nog ontbreken of ongeldig zijn (leeg = compleet). */
+export function missingPackingFields(p) {
+    const out = [];
+    if (posInt(p.vbnPackageCode) === null)
+        out.push("fust");
+    if (posInt(p.piecesPerPackage) === null)
+        out.push("planten per fust");
+    if (posInt(p.packagesPerLayer) === null)
+        out.push("fusten per laag");
+    if (posInt(p.layersPerLoadCarrier) === null)
+        out.push("lagen per kar");
+    if (!ENGINE_CARRIER_CODE[p.loadCarrier])
+        out.push("ladingdrager");
+    return out;
+}
+/** Hoofdverpakking voor product_packings; gooit als iets ontbreekt. */
+export function simplePackingToRow(p) {
+    const missing = missingPackingFields(p);
+    if (missing.length)
+        throw new Error(`Belading onvolledig: ${missing.join(", ")} ontbreekt.`);
+    return {
+        floriday_packing_id: null,
+        vbn_package_code: posInt(p.vbnPackageCode),
+        custom_package_id: null,
+        load_carrier: p.loadCarrier,
+        pieces_per_package: posInt(p.piecesPerPackage),
+        packages_per_layer: posInt(p.packagesPerLayer),
+        layers_per_load_carrier: posInt(p.layersPerLoadCarrier),
+        is_primary: true,
+        customer_organization_ids: [],
+    };
+}
+/** Regel voor logistics_product_oordeel_belading (Engine). */
+export function engineOordeelRegel(productId, p) {
+    return {
+        product_id: productId,
+        carrier_code: ENGINE_CARRIER_CODE[p.loadCarrier] ?? null,
+        plants_per_crate: posInt(p.piecesPerPackage),
+        crates_per_layer: posInt(p.packagesPerLayer),
+        layers_per_cart: posInt(p.layersPerLoadCarrier),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-voorraad",
-  "version": "1.0.121",
+  "version": "1.0.125",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",

package/sql/AGENTS.md

@@ -2,4 +2,5 @@
 - Voorraad never creates or replaces functions owned by other modules (Engine `logistics_*`, Floriday-auth, Verkoop; list in `FOREIGN_FUNCS` of `scripts/generate-voorraad-schema.py`); the schema file contains own objects only, because the schema sync would overwrite another module's version.
 - Data corrections only via `voorraad_correctie_<nr>(p_uitvoeren default false)` functions: server-only, match on id, insert/update only (never DELETE), hash-check Floriday cache + queue, log every run in `voorraad_correcties`; `voorraad_correctie_status()` tells other modules whether it ran, because loose SQL per Shell is not repeatable.
 - Fust rows are resolved only via `voorraad_active_fust_id(key, id)` (follows `merged_into`), and an order line books fust once: the ERP line adopts an earlier Floriday-ingest booking and ingest skips lines the ERP already booked, because `fust_key LIMIT 1` hit merged rows and both paths booked the same order.
-- An order line with `order_items.quarantined_at` set counts as cancelled for fust: `sync_order_item_fusten` wants 0 and the update trigger also fires on quarantine on/off, booking the difference against the line's own bookings, because quarantined duplicate orders otherwise kept fust booked.
+- An order line counts as cancelled for fust when `order_items.quarantined_at` is set or its order is cancelled (`voorraad_order_geannuleerd`: status geannuleerd/cancelled case-insensitive, `cancelled_at` or `deleted_at`): `sync_order_item_fusten` wants 0 and triggers on order_items (quarantine on/off) and orders (those three fields) book the difference against the line's own bookings, because quarantined or cancelled orders otherwise kept fust booked.
+- The correct fust count per order line comes only from `voorraad_fust_juist(order_item_id)` (same rule as `sync_order_item_fusten`; removed, quarantined, externally fulfilled or cancelled = 0); fust corrections compare against it, because every hand-built copy of the rule drifted.