@flowselections/floriday-voorraad 1.0.84 → 1.0.86

package/dist-lib/lib/floriday-takeover.functions.d.ts

@@ -0,0 +1,49 @@
+export type TakeoverRow = {
+    tradeItemId: string;
+    name: string;
+    articleCode: string | null;
+    gtin: string | null;
+    vbnCode: string | null;
+    productId: string | null;
+    productName: string | null;
+    action: "bijwerken" | "aanmaken" | "niet";
+    reason: string | null;
+    suggestion: string | null;
+    erpStock: number | null;
+    erpPrice: number | null;
+    floridayStock: number | null;
+    stockSource: string | null;
+    supplyLinePrice: number | null;
+    catalogPrice: number | null;
+    floridayPrice: number | null;
+    priceSource: string | null;
+    priceDiffers: boolean;
+    forms: {
+        continuous: boolean;
+        continuousAvailable: boolean | null;
+        weekly: boolean;
+        weeks: Array<{
+            year: number;
+            week: number;
+            pieces: number;
+            available: boolean;
+        }>;
+        supply_lines: number;
+        customer_offers: number;
+    };
+};
+export declare const getFloridayTakeoverPreview: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
+    supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
+    userId: string;
+    claims: import("@supabase/auth-js").JwtPayload;
+}, undefined, undefined, undefined>], undefined, Promise<{
+    connectionId: string;
+    environment: any;
+    weeks: {
+        year: number;
+        week: number;
+    }[];
+    weekError: string | null;
+    rows: TakeoverRow[];
+}>>;
+//# sourceMappingURL=floriday-takeover.functions.d.ts.map

package/dist-lib/lib/floriday-takeover.functions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-takeover.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-takeover.functions.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE;QACL,UAAU,EAAE,OAAO,CAAC;QACpB,mBAAmB,EAAE,OAAO,GAAG,IAAI,CAAC;QACpC,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACjF,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAmBF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;GA8InC,CAAC"}

package/dist-lib/lib/floriday-takeover.functions.js

@@ -0,0 +1,185 @@
+/**
+ * Proefrapport "Overnemen uit Floriday". Leest alleen: niets wordt geschreven
+ * en niets gaat naar Floriday. Het daadwerkelijk overnemen gebeurt via de
+ * databasefunctie `floriday_takeover_apply` (één transactie, terug te draaien).
+ *
+ * Floriday (Suppliers API 2026v1), alleen lezen via de leesroute van de
+ * Floriday-authenticatiemodule:
+ *  - GET /trade-items/base-supply?year&week  → WeeklyBaseSupply { tradeItemId, numberOfPieces, isAvailable, basePricePerPiece { currency, value } }
+ * Daarnaast de lokaal bijgehouden Floriday-gegevens van deze koppeling:
+ *  - trade items (TradeItemBase: tradeItemId, supplierArticleCode, articleGtin, vbnProductCode, tradeItemName)
+ *  - doorlopende voorraad (GET /trade-items/{id}/continuous-stock, door de ophaaltaak bewaard)
+ *  - catalogusprijzen en aanbodregels (supply lines), incl. klantspecifieke aanbiedingen (alleen tonen)
+ */
+import { createServerFn } from "@tanstack/react-start";
+import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
+function isoWeek(d) {
+    const t = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()));
+    const day = t.getUTCDay() || 7;
+    t.setUTCDate(t.getUTCDate() + 4 - day);
+    const y = t.getUTCFullYear();
+    const w = Math.ceil(((t.getTime() - Date.UTC(y, 0, 1)) / 86400000 + 1) / 7);
+    return { year: y, week: w };
+}
+function nameOf(data) {
+    const n = data?.tradeItemName;
+    if (typeof n === "string")
+        return n;
+    return String(n?.nl ?? n?.en ?? Object.values(n ?? {})[0] ?? "").trim();
+}
+const norm = (v) => String(v ?? "").trim().toLowerCase();
+export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .handler(async ({ context }) => {
+    const { data: canWrite } = await context.supabase.rpc("voorraad_can_write");
+    if (canWrite !== true)
+        throw new Error("Je hebt geen rechten om voorraad over te nemen.");
+    const { resolveActiveFloridayConnection } = await import("./floriday-env.server.js");
+    const conn = await resolveActiveFloridayConnection(context.supabase);
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
+    const admin = supabaseAdmin;
+    const [items, products, stock, cont, catalog, lines] = await Promise.all([
+        admin.from("floriday_trade_items_cache").select("floriday_id, data").eq("connection_id", conn.id).eq("is_deleted", false).limit(5000),
+        admin.from("products").select("id, product, barcode, article_number, floriday_trade_item_id, sale_price").limit(10000),
+        admin.from("trade_item_stock").select("trade_item_key, physical_stock").eq("connection_id", conn.id).limit(20000),
+        admin.from("floriday_continuous_stock_cache").select("trade_item_id, number_of_pieces").eq("connection_id", conn.id).limit(5000),
+        admin.from("floriday_catalog_prices_cache").select("trade_item_id, price, updated_at").eq("connection_id", conn.id).eq("is_deleted", false).order("updated_at", { ascending: false }).limit(20000),
+        admin.from("trade_item_supply_lines").select("trade_item_id, supply_type, price_per_piece, updated_at").eq("connection_id", conn.id).order("updated_at", { ascending: false }).limit(20000),
+    ]);
+    for (const r of [items, products, stock, cont, catalog, lines])
+        if (r.error)
+            throw new Error(r.error.message);
+    // Weekaanbod: huidige en twee komende weken, live gelezen (1 per seconde).
+    const now = new Date();
+    const weeks = [0, 1, 2].map((i) => isoWeek(new Date(now.getTime() + i * 7 * 86400000)));
+    let weekError = null;
+    const weekly = new Map();
+    try {
+        const { readBaseSupplyWeeks } = await import("./base-supply-reader.server.js");
+        const out = await readBaseSupplyWeeks(weeks);
+        if (out.error)
+            weekError = out.error;
+        for (const w of out.results) {
+            if (!w.ok) {
+                weekError = weekError ?? w.error;
+                continue;
+            }
+            for (const r of w.rows) {
+                const arr = weekly.get(r.tradeItemId) ?? [];
+                arr.push({ year: w.year, week: w.week, pieces: r.numberOfPieces, available: r.isAvailable, price: r.basePricePerPiece });
+                weekly.set(r.tradeItemId, arr);
+            }
+        }
+    }
+    catch (e) {
+        weekError = e?.message ?? String(e);
+    }
+    const byFid = new Map();
+    const unlinked = [];
+    for (const p of products.data ?? []) {
+        if (p.floriday_trade_item_id)
+            byFid.set(String(p.floriday_trade_item_id).toLowerCase(), p);
+        else
+            unlinked.push(p);
+    }
+    const stockBy = new Map();
+    for (const s of stock.data ?? [])
+        stockBy.set(String(s.trade_item_key), Number(s.physical_stock ?? 0));
+    const contBy = new Map();
+    for (const c of cont.data ?? [])
+        contBy.set(String(c.trade_item_id), Number(c.number_of_pieces ?? 0));
+    const catBy = new Map();
+    for (const c of catalog.data ?? []) {
+        const k = String(c.trade_item_id);
+        if (!catBy.has(k) && Number(c.price) > 0)
+            catBy.set(k, Number(c.price));
+    }
+    const lineBy = new Map();
+    for (const l of lines.data ?? []) {
+        const k = String(l.trade_item_id);
+        const cur = lineBy.get(k) ?? { price: null, count: 0, customer: 0 };
+        const isCustomer = /customer/i.test(String(l.supply_type ?? ""));
+        if (isCustomer)
+            cur.customer++;
+        else {
+            cur.count++;
+            if (cur.price == null && Number(l.price_per_piece) > 0)
+                cur.price = Number(l.price_per_piece);
+        }
+        lineBy.set(k, cur);
+    }
+    const cur = weeks[0];
+    const rows = (items.data ?? []).map((it) => {
+        const fid = String(it.floriday_id).toLowerCase();
+        const d = it.data ?? {};
+        const p = byFid.get(fid) ?? null;
+        const w = (weekly.get(fid) ?? []).sort((a, b) => a.year - b.year || a.week - b.week);
+        const contRaw = contBy.has(fid) ? contBy.get(fid) : null;
+        const line = lineBy.get(fid) ?? { price: null, count: 0, customer: 0 };
+        // Aanbodvorm uit Floriday zelf: staat er een doorlopende-voorraadrecord, dan is dat de vorm; anders weekaanbod huidige week.
+        let floridayStock = null;
+        let stockSource = null;
+        if (contRaw != null) {
+            floridayStock = contRaw;
+            stockSource = "Doorlopende voorraad";
+        }
+        else {
+            const now = w.find((x) => x.year === cur.year && x.week === cur.week);
+            if (now) {
+                floridayStock = now.pieces;
+                stockSource = `Weekaanbod week ${now.week}`;
+            }
+        }
+        // Prijs: aanbodregel gaat voor op catalogusprijs.
+        const weekPrice = w.find((x) => x.price != null && x.price > 0)?.price ?? null;
+        const supplyLinePrice = line.price ?? weekPrice;
+        const catalogPrice = catBy.get(fid) ?? null;
+        const floridayPrice = supplyLinePrice ?? catalogPrice;
+        const priceSource = supplyLinePrice != null ? "Aanbodregel" : catalogPrice != null ? "Catalogusprijs" : null;
+        let suggestion = null;
+        if (!p) {
+            const gtin = norm(d.articleGtin), code = norm(d.supplierArticleCode), nm = norm(nameOf(d));
+            const hit = unlinked.find((u) => (gtin && norm(u.barcode) === gtin) || (code && norm(u.article_number) === code) || (nm && norm(u.product) === nm));
+            if (hit)
+                suggestion = `Lijkt op bestaand artikel "${hit.product}" (niet automatisch gekoppeld)`;
+        }
+        const erpStock = p
+            ? stockBy.get(fid) ?? stockBy.get(`product:${p.id}`) ?? stockBy.get(String(p.id)) ?? null
+            : null;
+        const name = nameOf(d) || String(d.supplierArticleCode ?? fid);
+        let action = p ? "bijwerken" : "aanmaken";
+        let reason = null;
+        if (floridayStock == null && floridayPrice == null) {
+            action = p ? "niet" : "aanmaken";
+            reason = "Geen aantal en geen prijs gevonden in Floriday";
+        }
+        return {
+            tradeItemId: fid, name,
+            articleCode: d.supplierArticleCode ?? null,
+            gtin: d.articleGtin ?? null,
+            vbnCode: d.vbnProductCode != null ? String(d.vbnProductCode) : null,
+            productId: p?.id ?? null, productName: p?.product ?? null,
+            action, reason, suggestion,
+            erpStock, erpPrice: p?.sale_price != null ? Number(p.sale_price) : null,
+            floridayStock, stockSource,
+            supplyLinePrice, catalogPrice, floridayPrice, priceSource,
+            priceDiffers: supplyLinePrice != null && catalogPrice != null && Math.abs(supplyLinePrice - catalogPrice) > 0.0001,
+            forms: {
+                continuous: contRaw != null && contRaw > 0,
+                continuousAvailable: contRaw == null ? null : contRaw > 0,
+                weekly: w.length > 0,
+                weeks: w.map(({ year, week, pieces, available }) => ({ year, week, pieces, available })),
+                supply_lines: line.count,
+                customer_offers: line.customer,
+            },
+        };
+    });
+    rows.sort((a, b) => a.name.localeCompare(b.name, "nl"));
+    return {
+        connectionId: conn.id,
+        environment: conn.environment ?? null,
+        weeks,
+        weekError,
+        rows,
+    };
+});

package/dist-lib/server-hooks/floriday-stock-reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-stock-reconcile.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-stock-reconcile.ts"],"names":[],"mappings":"AAwPA,wHAAwH;AACxH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAEtF"}
+{"version":3,"file":"floriday-stock-reconcile.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-stock-reconcile.ts"],"names":[],"mappings":"AA2PA,wHAAwH;AACxH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAEtF"}

package/dist-lib/server-hooks/floriday-stock-reconcile.js

@@ -117,7 +117,7 @@ async function handle(request) {
     }
     const { data: settings, error: setErr } = await admin
         .from("floriday_inventory_settings")
-        .select("id, connection_id, product_id, floriday_trade_item_id, desired_quantity, desired_availability, stock_mode, sync_status")
+        .select("id, connection_id, product_id, floriday_trade_item_id, desired_quantity, desired_availability, stock_mode, sync_status, erp_leading")
         .eq("connection_id", connection.id)
         .not("floriday_trade_item_id", "is", null);
     if (setErr)
@@ -180,6 +180,10 @@ async function handle(request) {
             .eq("id", s.id);
         if (status === "DRIFT") {
             drift++;
+            // Alleen melden, tenzij het ERP leidend is (erp_leading true, of NULL =
+            // artikel van vóór 1.0.84). Floriday-leidende artikelen nooit corrigeren.
+            if (s.erp_leading === false)
+                continue;
             await admin.rpc("floriday_recompute_inventory", {
                 p_connection_id: s.connection_id,
                 p_product_id: s.product_id,

package/dist-lib/server-hooks/guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../src/server-hooks/guard.ts"],"names":[],"mappings":"AAuCA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC/C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB"}
+{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../src/server-hooks/guard.ts"],"names":[],"mappings":"AA4DA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC/C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB"}

package/dist-lib/server-hooks/guard.js

@@ -13,8 +13,31 @@ const CORS = {
     "Access-Control-Allow-Methods": "POST, OPTIONS",
     "Access-Control-Allow-Headers": "content-type, apikey, x-api-key, authorization",
 };
-/** Standaard als de instelling (nog) niet bestaat. Gelijk aan de migratie. */
-const DEFAULT_ON = new Set(["floriday_base_supply", "logistics_tasks"]);
+/**
+ * Deze verwerkers staan zonder expliciete instelling alleen aan zolang er
+ * minstens één ERP-leidend artikel is (erp_leading = true, of een artikel van
+ * vóór 1.0.84 met een andere modus dan Uit). Anders uit: een Shell die alles
+ * uit Floriday overneemt, verstuurt dan niets.
+ */
+const DEFAULT_ON_IF_ERP_LEADING = new Set(["floriday_base_supply", "logistics_tasks"]);
+async function hasErpLeadingArticle(admin) {
+    const lead = await admin
+        .from("floriday_inventory_settings")
+        .select("id", { count: "exact", head: true })
+        .eq("erp_leading", true);
+    if (lead.error)
+        return false; // fail closed
+    if ((lead.count ?? 0) > 0)
+        return true;
+    const legacy = await admin
+        .from("floriday_inventory_settings")
+        .select("id", { count: "exact", head: true })
+        .is("erp_leading", null)
+        .neq("stock_mode", "DISABLED");
+    if (legacy.error)
+        return false;
+    return (legacy.count ?? 0) > 0;
+}
 function json(body, status = 200) {
     return new Response(JSON.stringify(body), {
         status,
@@ -40,7 +63,7 @@ export async function hookEnabled(name) {
         .eq("key", `voorraad_hook_enabled.${name}`)
         .maybeSingle();
     if (!data)
-        return DEFAULT_ON.has(name);
+        return DEFAULT_ON_IF_ERP_LEADING.has(name) && (await hasErpLeadingArticle(admin));
     return String(data.value).trim().toLowerCase() === "true";
 }
 export async function runGuardedHook(request, name, handle, label) {

package/package.json

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