@flowselections/floriday-voorraad 1.0.22 → 1.0.26

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

@@ -24,6 +24,36 @@ const DEFAULT_VALIDATE_ENUMS = [
     { field: "loadCarrierType", listName: "SupplyLoadCarrierType" },
     { field: "country", listName: "Country" },
 ];
+/**
+ * Parseer Floriday's "Missing characteristics" 400 detail naar een lijst
+ * VBN characteristic-codes (S01, A02, L11, …). Ondersteunt beide vormen:
+ *   "Missing characteristics are: Potmaat (S01), Min planthoogte (S02)"
+ *   "Missing characteristics are: S01, S02"
+ * Retourneert lege array als er geen match is.
+ */
+function parseMissingCharacteristicCodes(message) {
+    const idx = message.toLowerCase().indexOf("missing characteristics are:");
+    if (idx < 0)
+        return [];
+    const tail = message.slice(idx + "missing characteristics are:".length);
+    const codes = new Set();
+    const re = /\b([A-Z]\d{1,4})\b/g;
+    let m;
+    while ((m = re.exec(tail)) !== null)
+        codes.add(m[1].toUpperCase());
+    return Array.from(codes);
+}
+/**
+ * Prefix waar de wizard op parseert om exact te weten welke codes Floriday
+ * miste. Formaat: `MISSING_CHARACTERISTICS:S01,S02:<originele detail>`.
+ */
+const MISSING_PREFIX = "MISSING_CHARACTERISTICS";
+export function isMissingCharacteristicsError(msg) {
+    const m = msg.match(new RegExp(`${MISSING_PREFIX}:([A-Z0-9,]+):`));
+    if (!m)
+        return [];
+    return m[1].split(",").filter(Boolean);
+}
 async function safe(label, fn) {
     try {
         return await fn();
@@ -33,8 +63,13 @@ async function safe(label, fn) {
             const text = await e.text().catch(() => "");
             throw new Error(`${label}: ${e.status} ${text || e.statusText}`);
         }
-        if (e instanceof Error)
+        if (e instanceof Error) {
+            const codes = parseMissingCharacteristicCodes(e.message);
+            if (codes.length > 0) {
+                throw new Error(`${label}: ${MISSING_PREFIX}:${codes.join(",")}: ${e.message}`);
+            }
             throw new Error(`${label}: ${e.message}`);
+        }
         throw new Error(`${label}: ${String(e)}`);
     }
 }

package/dist-lib/lib/trade-item-prices.d.ts

@@ -0,0 +1,43 @@
+import type { FloridayPriceGroup } from "../hooks/useFloridayPriceGroups";
+export interface TradeItemPriceRow {
+    price_group_id: string | null;
+    price_per_piece: number;
+    currency: string;
+    supply_line_id: string | null;
+    last_pushed_at: string | null;
+    last_push_error: string | null;
+}
+export declare function readTradeItemPrices(tradeItemKey: string): Promise<TradeItemPriceRow[]>;
+export declare function readTradeItemPricesBulk(tradeItemKeys: string[]): Promise<Map<string, TradeItemPriceRow[]>>;
+export interface SyncPricesInput {
+    tradeItemId: string;
+    tradeItemKey: string;
+    availableQuantity: number;
+    currency?: string;
+    periodStart?: string;
+    /** Basisprijs (0 of leeg = geen basisprijs pushen). */
+    basePricePerPiece: number;
+    /** Prijs per Floriday-prijsgroepId. Leeg / 0 = niet publiceren voor die groep. */
+    pricesByGroupId: Record<string, number>;
+    /** Lijst van beschikbare prijsgroepen (voor customerOrganizationIds). */
+    priceGroups: FloridayPriceGroup[];
+    packingConfigurationId?: string;
+}
+export interface SyncPricesResult {
+    basePriceOk: boolean;
+    baseError?: string;
+    groupResults: Array<{
+        priceGroupId: string;
+        name: string;
+        ok: boolean;
+        error?: string;
+        supplyLineId?: string;
+    }>;
+}
+/**
+ * Push basisprijs + alle prijsgroep-prijzen naar Floriday en spiegel het
+ * resultaat naar `trade_item_prices`. Werkt best-effort: één falende call
+ * blokkeert de andere niet.
+ */
+export declare function syncTradeItemPrices(input: SyncPricesInput): Promise<SyncPricesResult>;
+//# sourceMappingURL=trade-item-prices.d.ts.map

package/dist-lib/lib/trade-item-prices.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trade-item-prices.d.ts","sourceRoot":"","sources":["../../src/lib/trade-item-prices.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAU9B;AAED,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAiB3C;AA6DD,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uDAAuD;IACvD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kFAAkF;IAClF,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,yEAAyE;IACzE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAClC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,KAAK,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,OAAO,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,CAAC;CACJ;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,CAwI3B"}

package/dist-lib/lib/trade-item-prices.js

@@ -0,0 +1,229 @@
+/**
+ * Lokale spiegel + Floriday-sync voor de basisprijs en prijzen per prijsgroep
+ * van een trade-item. `price_group_id = NULL` betekent basisprijs.
+ *
+ * De push naar Floriday loopt via:
+ *  - Basisprijs → `weekly-base-supply` (via `gatewaySupplyLineFn` met
+ *    supplyType `CATALOG_PRICE`).
+ *  - Prijs per prijsgroep → `weekly-supply-lines` (supplyType
+ *    `WEEKLY_SUPPLY_LINE`, met de `customerOrganizationIds` van de groep).
+ *
+ * Elk succesvolle push updatet `last_pushed_at`; falen zet `last_push_error`
+ * maar rollt de lokale rij niet terug.
+ */
+import { supabase } from "../integrations/supabase/client";
+import { postSupplyLine } from "./floriday-supply-line";
+export async function readTradeItemPrices(tradeItemKey) {
+    const userRes = await supabase.auth.getUser();
+    const userId = userRes.data.user?.id;
+    if (!userId)
+        return [];
+    const { data } = await supabase
+        .from("trade_item_prices")
+        .select("price_group_id,price_per_piece,currency,supply_line_id,last_pushed_at,last_push_error")
+        .eq("user_id", userId)
+        .eq("trade_item_key", tradeItemKey);
+    return (data ?? []);
+}
+export async function readTradeItemPricesBulk(tradeItemKeys) {
+    const map = new Map();
+    if (tradeItemKeys.length === 0)
+        return map;
+    const userRes = await supabase.auth.getUser();
+    const userId = userRes.data.user?.id;
+    if (!userId)
+        return map;
+    const { data } = await supabase
+        .from("trade_item_prices")
+        .select("trade_item_key,price_group_id,price_per_piece,currency,supply_line_id,last_pushed_at,last_push_error")
+        .eq("user_id", userId)
+        .in("trade_item_key", tradeItemKeys);
+    for (const row of (data ?? [])) {
+        const arr = map.get(row.trade_item_key) ?? [];
+        arr.push(row);
+        map.set(row.trade_item_key, arr);
+    }
+    return map;
+}
+async function upsertLocalPrice(params) {
+    const row = {
+        user_id: params.userId,
+        trade_item_key: params.tradeItemKey,
+        price_group_id: params.priceGroupId,
+        price_per_piece: params.pricePerPiece,
+        currency: params.currency ?? "EUR",
+        supply_line_id: params.supplyLineId ?? null,
+        last_pushed_at: params.lastPushedAt ?? null,
+        last_push_error: params.lastPushError ?? null,
+    };
+    // Er zijn twee partial unique indexes (base vs. groep) — geen combined onConflict.
+    // Doe dus expliciet find-or-insert.
+    const query = supabase
+        .from("trade_item_prices")
+        .select("id")
+        .eq("user_id", params.userId)
+        .eq("trade_item_key", params.tradeItemKey);
+    const filtered = params.priceGroupId === null
+        ? query.is("price_group_id", null)
+        : query.eq("price_group_id", params.priceGroupId);
+    const { data: existing } = await filtered.maybeSingle();
+    if (existing?.id) {
+        await supabase
+            .from("trade_item_prices")
+            .update(row)
+            .eq("id", existing.id);
+    }
+    else {
+        await supabase.from("trade_item_prices").insert(row);
+    }
+}
+async function deleteLocalPrice(userId, tradeItemKey, priceGroupId) {
+    const query = supabase
+        .from("trade_item_prices")
+        .delete()
+        .eq("user_id", userId)
+        .eq("trade_item_key", tradeItemKey);
+    const filtered = priceGroupId === null
+        ? query.is("price_group_id", null)
+        : query.eq("price_group_id", priceGroupId);
+    await filtered;
+}
+/**
+ * Push basisprijs + alle prijsgroep-prijzen naar Floriday en spiegel het
+ * resultaat naar `trade_item_prices`. Werkt best-effort: één falende call
+ * blokkeert de andere niet.
+ */
+export async function syncTradeItemPrices(input) {
+    const userRes = await supabase.auth.getUser();
+    const userId = userRes.data.user?.id;
+    if (!userId)
+        throw new Error("Niet ingelogd");
+    const result = { basePriceOk: false, groupResults: [] };
+    // -------- Basisprijs -----------------------------------------------------
+    if (input.basePricePerPiece > 0) {
+        try {
+            await postSupplyLine({
+                tradeItemId: input.tradeItemId,
+                pricePerPiece: input.basePricePerPiece,
+                availableQuantity: input.availableQuantity,
+                packingConfigurationId: input.packingConfigurationId,
+                supplyType: "CATALOG_PRICE",
+                currency: input.currency,
+                periodStart: input.periodStart,
+            });
+            await upsertLocalPrice({
+                userId,
+                tradeItemKey: input.tradeItemKey,
+                priceGroupId: null,
+                pricePerPiece: input.basePricePerPiece,
+                currency: input.currency,
+                lastPushedAt: new Date().toISOString(),
+            });
+            result.basePriceOk = true;
+        }
+        catch (e) {
+            const msg = String(e?.message ?? e);
+            result.baseError = msg;
+            await upsertLocalPrice({
+                userId,
+                tradeItemKey: input.tradeItemKey,
+                priceGroupId: null,
+                pricePerPiece: input.basePricePerPiece,
+                currency: input.currency,
+                lastPushError: msg,
+            });
+        }
+    }
+    else {
+        // Basisprijs verwijderd — lokaal opruimen (Floriday zelf laat je niet
+        // ongedaan maken zonder aparte "remove"-call; die is niet in scope).
+        await deleteLocalPrice(userId, input.tradeItemKey, null);
+    }
+    // -------- Per prijsgroep -------------------------------------------------
+    const existingRows = await readTradeItemPrices(input.tradeItemKey);
+    const existingByGroup = new Map();
+    for (const row of existingRows) {
+        if (row.price_group_id)
+            existingByGroup.set(row.price_group_id, row);
+    }
+    for (const group of input.priceGroups) {
+        const nextPrice = Number(input.pricesByGroupId[group.id] ?? 0);
+        const existing = existingByGroup.get(group.id);
+        if (!(nextPrice > 0)) {
+            // Was gezet, nu leeggemaakt → lokaal opruimen.
+            // (De weekly-supply-line in Floriday zelf blijft staan tot de gebruiker
+            // via de Floriday-UI de regel verwijdert; dat is een bewuste keuze
+            // omdat DELETE via de API buiten scope van deze wijziging valt.)
+            if (existing) {
+                await deleteLocalPrice(userId, input.tradeItemKey, group.id);
+            }
+            continue;
+        }
+        if (group.customerOrganizationIds.length === 0) {
+            const msg = "Prijsgroep heeft geen gekoppelde klanten in Floriday";
+            result.groupResults.push({
+                priceGroupId: group.id,
+                name: group.name,
+                ok: false,
+                error: msg,
+            });
+            await upsertLocalPrice({
+                userId,
+                tradeItemKey: input.tradeItemKey,
+                priceGroupId: group.id,
+                pricePerPiece: nextPrice,
+                currency: group.currency,
+                supplyLineId: existing?.supply_line_id ?? null,
+                lastPushError: msg,
+            });
+            continue;
+        }
+        try {
+            const supplyRes = await postSupplyLine({
+                tradeItemId: input.tradeItemId,
+                pricePerPiece: nextPrice,
+                availableQuantity: input.availableQuantity,
+                packingConfigurationId: input.packingConfigurationId,
+                supplyType: "WEEKLY_SUPPLY_LINE",
+                currency: group.currency,
+                periodStart: input.periodStart,
+                supplyLineId: existing?.supply_line_id ?? undefined,
+                customerOrganizationIds: group.customerOrganizationIds,
+            });
+            await upsertLocalPrice({
+                userId,
+                tradeItemKey: input.tradeItemKey,
+                priceGroupId: group.id,
+                pricePerPiece: nextPrice,
+                currency: group.currency,
+                supplyLineId: supplyRes.supplyLineId ?? existing?.supply_line_id ?? null,
+                lastPushedAt: new Date().toISOString(),
+            });
+            result.groupResults.push({
+                priceGroupId: group.id,
+                name: group.name,
+                ok: true,
+                supplyLineId: supplyRes.supplyLineId,
+            });
+        }
+        catch (e) {
+            const msg = String(e?.message ?? e);
+            await upsertLocalPrice({
+                userId,
+                tradeItemKey: input.tradeItemKey,
+                priceGroupId: group.id,
+                pricePerPiece: nextPrice,
+                currency: group.currency,
+                supplyLineId: existing?.supply_line_id ?? null,
+                lastPushError: msg,
+            });
+            result.groupResults.push({
+                priceGroupId: group.id,
+                name: group.name,
+                ok: false,
+                error: msg,
+            });
+        }
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-voorraad",
-  "version": "1.0.22",
+  "version": "1.0.26",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",
@@ -44,8 +44,8 @@
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
-    "@flowselections/core": "1.0.12",
-    "@lovable.dev/vite-tanstack-config": "2.7.1",
+    "@flowselections/core": "1.0.16",
+    "@lovable.dev/vite-tanstack-config": "2.7.7",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",
     "@tanstack/router-plugin": "^1.167.10",