@flowselections/floriday-voorraad 1.0.113 → 1.0.117

package/dist-lib/lib/__tests__/floricode-required-features.test.js

@@ -155,7 +155,8 @@ describe("computeVbnRequiredFeatures — VBN 100023", () => {
     });
     it("sorteert verplicht vóór advies", async () => {
         const res = await computeVbnRequiredFeatures(client, "100023");
-        expect(res.features.map((f) => f.code)).toEqual(["S01", "S02", "S05"]);
+        // S62 en S98 eist Floriday altijd (FORCED_REQUIRED), dus ook verplicht.
+        expect(res.features.map((f) => f.code)).toEqual(["S01", "S02", "S62", "S98", "S05"]);
     });
     it("levert toegestane waarden per feature (gededupliceerd, zonder vervallen)", async () => {
         const res = await computeVbnRequiredFeatures(client, "100023");
@@ -163,9 +164,10 @@ describe("computeVbnRequiredFeatures — VBN 100023", () => {
         expect(s01?.values.map((v) => v.code).sort()).toEqual(["003", "004"]);
         expect(s01?.values.some((v) => v.code === "999")).toBe(false);
     });
-    it("geeft lege lijst terug voor onbekende VBN-code", async () => {
+    it("geeft alleen de door Floriday altijd verplichte kenmerken voor onbekende VBN-code", async () => {
         const res = await computeVbnRequiredFeatures(client, "99999");
-        expect(res).toEqual({ vbnCode: "99999", features: [] });
+        expect(res.vbnCode).toBe("99999");
+        expect(res.features.map((f) => f.code)).toEqual(["S62", "S98"]);
     });
     it("vindt regulatory rows via record_id-prefix als data.product_id ontbreekt", async () => {
         const prefixOnlyClient = makeFakeClient({
@@ -180,6 +182,8 @@ describe("computeVbnRequiredFeatures — VBN 100023", () => {
         expect(res.features.map((f) => [f.code, f.regulation])).toEqual([
             ["S01", "required"],
             ["S02", "required"],
+            ["S62", "required"],
+            ["S98", "required"],
             ["S05", "advised"],
         ]);
     });

package/dist-lib/lib/__tests__/publish-114.test.d.ts

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

package/dist-lib/lib/__tests__/publish-114.test.d.ts.map

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

package/dist-lib/lib/__tests__/publish-114.test.js

@@ -0,0 +1,31 @@
+import { describe, it, expect } from "vitest";
+import { translatePublishError } from "../publish-errors.js";
+import { effectiveJobStatus } from "../../components/voorraad/PublishProgressCard.js";
+import { countStock } from "../../components/voorraad/VoorraadPage.js";
+describe("1.0.114 publiceren en telling", () => {
+    it("toont de echte reden als de poort schrijven tegenhoudt", () => {
+        const f = translatePublishError(new Error("publishTradeItem: gateway /api/public/gateway/write → Tegengehouden door poort: in de Floriday-kopie wijkt de verpakking af van Floriday."));
+        expect(f.code).toBe("GATE_BLOCKED");
+        expect(f.message).toContain("wijkt de verpakking af");
+    });
+    it("onbekende fout toont de technische reden", () => {
+        const f = translatePublishError(new Error("stap x → iets raars"));
+        expect(f.message).toContain("iets raars");
+    });
+    it("job blijft niet op bezig na mislukte productstap", () => {
+        expect(effectiveJobStatus("running", [
+            { status: "failed", step_key: "trade-item" },
+            { status: "pending", step_key: "stock" },
+        ])).toBe("failed");
+        expect(effectiveJobStatus("running", [{ status: "running", step_key: "trade-item" }])).toBe("running");
+    });
+    it("volledig gereserveerd telt als op voorraad", () => {
+        const c = countStock([
+            { quantity: 100, availableQuantity: 0, minQuantity: 0 },
+            { quantity: 0, availableQuantity: 0, minQuantity: 0 },
+        ]);
+        expect(c.inStock).toBe(1);
+        expect(c.outOfStock).toBe(1);
+        expect(c.fullyReserved).toBe(1);
+    });
+});

package/dist-lib/lib/__tests__/publish-packing-block.test.d.ts

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

package/dist-lib/lib/__tests__/publish-packing-block.test.d.ts.map

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

package/dist-lib/lib/__tests__/publish-packing-block.test.js

@@ -0,0 +1,14 @@
+import { describe, it, expect } from "vitest";
+import { parsePackingBlock } from "../publish-errors.js";
+describe("parsePackingBlock", () => {
+    it("leest code, data.message en mismatchTradeItemIds", () => {
+        const r = parsePackingBlock('fout: {"code":"packing_mismatch","data":{"message":"Afwijking","mismatchTradeItemIds":["a1"]}}');
+        expect(r).toEqual({ code: "packing_mismatch", message: "Afwijking", ids: ["a1"] });
+    });
+    it("onderscheidt packing_mismatch_connection", () => {
+        expect(parsePackingBlock("packing_mismatch_connection")?.code).toBe("packing_mismatch_connection");
+    });
+    it("geeft null zonder code", () => {
+        expect(parsePackingBlock("iets anders")).toBeNull();
+    });
+});

package/dist-lib/lib/publish-errors.d.ts

@@ -6,7 +6,7 @@
  * Woorden als API, gateway, Floriday-intern jargon en modulenamen komen hier
  * bewust niet in voor.
  */
-export type PublishErrorCode = "MISSING_CHARACTERISTICS" | "NO_CONNECTION" | "WRONG_ENVIRONMENT" | "NOT_LOGGED_IN" | "INVALID_VALUE" | "DUPLICATE" | "NOT_FOUND" | "TEMPORARY" | "TIMEOUT" | "RATE_LIMIT" | "UNKNOWN";
+export type PublishErrorCode = "MISSING_CHARACTERISTICS" | "NO_CONNECTION" | "WRONG_ENVIRONMENT" | "NOT_LOGGED_IN" | "INVALID_VALUE" | "DUPLICATE" | "NOT_FOUND" | "TEMPORARY" | "TIMEOUT" | "RATE_LIMIT" | "GATE_BLOCKED" | "UNKNOWN";
 export interface PublishErrorAction {
     label: string;
     /** Interne route waar de gebruiker het kan oplossen. */
@@ -34,4 +34,18 @@ export declare function translatePublishError(error: unknown, opts?: {
     characteristicLabels?: Record<string, string>;
 }): FriendlyPublishError;
 export declare function friendlyFieldName(field?: string): string;
+/**
+ * Haalt de leesbare reden uit een technische foutketen
+ * ("stap: route → reden") zodat de gebruiker altijd de echte oorzaak ziet.
+ */
+export declare function realReason(raw: string): string;
+declare const PACKING_CODES: readonly ["packing_mismatch_connection", "packing_unverified", "packing_mismatch"];
+type PackingCode = (typeof PACKING_CODES)[number];
+/** Herkent de blokkadecodes van Floriday-auth (1.0.122) in JSON of tekst. */
+export declare function parsePackingBlock(raw: string): {
+    code: PackingCode;
+    message: string | null;
+    ids: string[];
+} | null;
+export {};
 //# sourceMappingURL=publish-errors.d.ts.map

package/dist-lib/lib/publish-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish-errors.d.ts","sourceRoot":"","sources":["../../src/lib/publish-errors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,MAAM,gBAAgB,GACxB,yBAAyB,GACzB,eAAe,GACf,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,YAAY,GACZ,SAAS,CAAC;AAEd,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,gBAAgB,CAAC;IACvB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,iDAAiD;IACjD,SAAS,EAAE,OAAO,CAAC;IACnB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC;CAChB;AAiBD,8EAA8E;AAC9E,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,CAIR;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE;IAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACvD,oBAAoB,CAyItB;AAgBD,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGxD"}
+{"version":3,"file":"publish-errors.d.ts","sourceRoot":"","sources":["../../src/lib/publish-errors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,MAAM,gBAAgB,GACxB,yBAAyB,GACzB,eAAe,GACf,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,YAAY,GACZ,cAAc,GACd,SAAS,CAAC;AAEd,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,gBAAgB,CAAC;IACvB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,iDAAiD;IACjD,SAAS,EAAE,OAAO,CAAC;IACnB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC;CAChB;AAiBD,8EAA8E;AAC9E,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,CAIR;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE;IAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACvD,oBAAoB,CAwKtB;AAgBD,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGxD;AAaD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED,QAAA,MAAM,aAAa,oFAAqF,CAAC;AACzG,KAAK,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAElD,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,GACV;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAI,CAkBrE"}

package/dist-lib/lib/publish-errors.js

@@ -140,10 +140,38 @@ export function translatePublishError(error, opts) {
             detail: raw,
         };
     }
+    // Floriday-auth 1.0.122: packing_mismatch / packing_mismatch_connection / packing_unverified
+    // met data.message en mismatchTradeItemIds.
+    const pm = parsePackingBlock(raw);
+    if (pm) {
+        const ids = pm.ids.length ? ` (artikel${pm.ids.length > 1 ? "en" : ""}: ${pm.ids.join(", ")})` : "";
+        const lead = pm.code === "packing_unverified"
+            ? "Floriday-koppeling kan de verpakking nog niet controleren"
+            : pm.code === "packing_mismatch_connection"
+                ? "Floriday-koppeling houdt versturen tegen: verpakkingsverschil in deze koppeling"
+                : "Floriday-koppeling houdt versturen tegen: verpakking wijkt af";
+        return {
+            code: "GATE_BLOCKED",
+            message: `${lead}${ids}${pm.message ? `: ${pm.message}` : ""}`,
+            hint: "Kijk bij Floriday koppeling → Verpakking en probeer opnieuw. Je ingevoerde gegevens zijn bewaard.",
+            retryable: pm.code === "packing_unverified",
+            detail: raw,
+        };
+    }
+    // Floriday-auth houdt schrijven tegen (floriday_write_mode read_only): toon de echte reden.
+    if (lower.includes("tegengehouden door poort") || lower.includes("blocked_by_gate")) {
+        return {
+            code: "GATE_BLOCKED",
+            message: `Floriday-koppeling houdt versturen tegen: ${realReason(raw)}`,
+            hint: "Los het verschil op bij Floriday koppeling → Verpakking en probeer opnieuw. Je ingevoerde gegevens zijn bewaard.",
+            retryable: false,
+            detail: raw,
+        };
+    }
     return {
         code: "UNKNOWN",
-        message: "Het publiceren is niet gelukt.",
-        hint: "Probeer het opnieuw. Blijft dit gebeuren, geef dan het referentienummer door aan support.",
+        message: raw ? `Het publiceren is niet gelukt: ${realReason(raw)}` : "Het publiceren is niet gelukt.",
+        hint: "Probeer het opnieuw. Je ingevoerde gegevens zijn bewaard.",
         retryable: false,
         detail: raw,
     };
@@ -181,3 +209,37 @@ function stepForFieldName(field) {
         return "vbn";
     return "artikel";
 }
+/**
+ * Haalt de leesbare reden uit een technische foutketen
+ * ("stap: route → reden") zodat de gebruiker altijd de echte oorzaak ziet.
+ */
+export function realReason(raw) {
+    const parts = raw.split("→");
+    const last = (parts[parts.length - 1] ?? raw).trim();
+    const text = last.replace(/^[a-zA-Z]+:\s*/, "").trim() || raw.trim();
+    return text.length > 300 ? `${text.slice(0, 297)}…` : text;
+}
+const PACKING_CODES = ["packing_mismatch_connection", "packing_unverified", "packing_mismatch"];
+/** Herkent de blokkadecodes van Floriday-auth (1.0.122) in JSON of tekst. */
+export function parsePackingBlock(raw) {
+    if (!raw)
+        return null;
+    const code = PACKING_CODES.find((c) => raw.includes(c));
+    if (!code)
+        return null;
+    let message = null;
+    let ids = [];
+    const start = raw.indexOf("{");
+    if (start >= 0) {
+        try {
+            const j = JSON.parse(raw.slice(start, raw.lastIndexOf("}") + 1));
+            const d = j?.data ?? j;
+            message = typeof d?.message === "string" ? d.message : null;
+            ids = Array.isArray(d?.mismatchTradeItemIds) ? d.mismatchTradeItemIds.map(String) : [];
+        }
+        catch {
+            /* geen JSON: alleen de code tonen */
+        }
+    }
+    return { code, message, ids };
+}

package/package.json

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

package/sql/AGENTS.md

@@ -1,3 +1,4 @@
 
 - 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.