@flowselections/floriday-verkoop-module 1.0.14 → 1.0.16

package/dist-lib/lib/create-order.functions.js

@@ -16,30 +16,76 @@ export const listCustomersForCreateOrder = createServerFn({ method: "GET" })
         .range(0, 4999);
     return { items: data ?? [] };
 });
-// ─── Producten (alleen met voorraad — zelfde filter als Mailbox) ────────────
+// ─── Producten (uit voorraadmodule: alle actieve Floriday trade items) ─────
+// Bron = zelfde data als de Voorraad-pagina: floriday_trade_items_cache
+// gejoined met trade_item_stock. Items zonder voorraad worden ook getoond
+// (grijs in de UI, met melding "niet op voorraad"), zodat gebruikers ook
+// vooruit kunnen bestellen op verwachte voorraad.
 export const listProductsForCreateOrder = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .handler(async ({ context }) => {
-    const { data: stockRows } = await context.supabase
-        .from("trade_item_stock")
-        .select("trade_item_key, physical_stock, reserved_stock");
-    const availableKeys = new Set();
+    const [tradeItemsRes, stockRes] = await Promise.all([
+        context.supabase
+            .from("floriday_trade_items_cache")
+            .select("floriday_id, data")
+            .eq("is_deleted", false)
+            .range(0, 4999),
+        context.supabase
+            .from("trade_item_stock")
+            .select("trade_item_key, physical_stock, reserved_stock, incoming_stock"),
+    ]);
+    const tradeItems = tradeItemsRes.data;
+    const stockRows = stockRes.data;
+    const stockByKey = new Map();
     for (const s of Array.isArray(stockRows) ? stockRows : []) {
-        const avail = Number(s.physical_stock ?? 0) - Number(s.reserved_stock ?? 0);
-        if (avail > 0 && typeof s.trade_item_key === "string") {
-            availableKeys.add(s.trade_item_key);
-        }
+        const k = s?.trade_item_key;
+        if (typeof k !== "string")
+            continue;
+        stockByKey.set(k, {
+            physical: Number(s.physical_stock ?? 0),
+            reserved: Number(s.reserved_stock ?? 0),
+            incoming: Number(s.incoming_stock ?? 0),
+        });
     }
-    if (availableKeys.size === 0)
-        return { items: [] };
-    const { data } = await context.supabase
-        .from("products")
-        .select("id, product, unit, sale_price, plants_per_crate, crates_per_layer, layers_per_cart, custom_fields")
-        .order("product")
-        .range(0, 4999);
-    const items = (Array.isArray(data) ? data : []).filter((p) => {
-        const fid = p?.custom_fields?.floriday_id;
-        return typeof fid === "string" && availableKeys.has(fid);
+    const pickName = (n) => {
+        if (!n)
+            return "";
+        if (typeof n === "string")
+            return n;
+        return String(n.nl ?? n.en ?? n.de ?? Object.values(n)[0] ?? "");
+    };
+    const items = (Array.isArray(tradeItems) ? tradeItems : [])
+        .map((r) => {
+        const d = r?.data ?? {};
+        const name = pickName(d.tradeItemName) || d.tradeItemReference || "(naamloos)";
+        const packs = Array.isArray(d.packingConfigurations) ? d.packingConfigurations : [];
+        const primary = packs.find((p) => p?.primary) ?? packs[0] ?? {};
+        const ppc = Math.max(1, Number(primary?.piecesPerPackage ?? 1));
+        const cpl = Math.max(1, Number(primary?.packagesPerLayer ?? 1));
+        const lpc = Math.max(1, Number(primary?.layersPerLoadCarrier ?? 1));
+        const stock = stockByKey.get(r.floriday_id);
+        const physical = stock?.physical ?? 0;
+        const reserved = stock?.reserved ?? 0;
+        const available = Math.max(0, physical - reserved);
+        return {
+            id: r.floriday_id,
+            product: name,
+            article_code: d.supplierArticleCode ?? null,
+            unit: "stuks",
+            sale_price: null,
+            plants_per_crate: ppc,
+            crates_per_layer: cpl,
+            layers_per_cart: lpc,
+            physical_stock: physical,
+            reserved_stock: reserved,
+            available_stock: available,
+            in_stock: available > 0,
+        };
+    })
+        .sort((a, b) => {
+        if (a.in_stock !== b.in_stock)
+            return a.in_stock ? -1 : 1;
+        return a.product.localeCompare(b.product, "nl");
     });
     return { items };
 });
@@ -114,6 +160,11 @@ const LineInput = z.object({
     quantity: z.number().int().positive(), // aantal PLANTEN (== fusten * plants_per_crate)
     unit: z.string().max(50).nullable().optional(),
     unit_price: z.number().nonnegative().optional(),
+    // Packing-info uit voorraadmodule; nodig om ontbrekende products-rij aan te maken
+    plants_per_crate: z.number().int().positive().optional(),
+    crates_per_layer: z.number().int().positive().optional(),
+    layers_per_cart: z.number().int().positive().optional(),
+    article_code: z.string().max(100).nullable().optional(),
 });
 const CreateManualOrderInput = z.object({
     customerId: z.string().uuid(),
@@ -152,6 +203,38 @@ export const createManualOrder = createServerFn({ method: "POST" })
         throw new Error(`Leverdatum (${data.deliveryDate}) ligt voor de eerst mogelijke datum (${earliestISO}) o.b.v. orderpicktijd (${pickDays}d) + levertijd vervoerder (${carrierDeliveryDays}d).`);
     }
     const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    // Zorg dat elk product_id (= trade_item_key uit voorraad) een rij in
+    // `products` heeft — de order_items FK vereist dit én de karindeling
+    // (planAndSaveAutoCarts) joined op products voor de packing-waarden.
+    const productIds = Array.from(new Set(data.lines.map((l) => l.product_id)));
+    const { data: existingProducts } = await supabaseAdmin
+        .from("products").select("id").in("id", productIds);
+    const existingIds = new Set((existingProducts ?? []).map((p) => p.id));
+    const missingLines = data.lines.filter((l) => !existingIds.has(l.product_id));
+    if (missingLines.length > 0) {
+        const seen = new Set();
+        const toInsert = missingLines.filter((l) => {
+            if (seen.has(l.product_id))
+                return false;
+            seen.add(l.product_id);
+            return true;
+        }).map((l) => ({
+            id: l.product_id,
+            product: l.product_name,
+            batch: "",
+            location: "",
+            unit: l.unit ?? "stuks",
+            plants_per_crate: Math.max(1, Number(l.plants_per_crate ?? 1)),
+            crates_per_layer: Math.max(1, Number(l.crates_per_layer ?? 1)),
+            layers_per_cart: Math.max(1, Number(l.layers_per_cart ?? 1)),
+            sale_price: l.unit_price ?? null,
+            trade_item_key: l.product_id,
+            custom_fields: { floriday_id: l.product_id, source: "auto-from-voorraad" },
+        }));
+        const { error: prodErr } = await supabaseAdmin.from("products").insert(toInsert);
+        if (prodErr)
+            throw new Error(`Product aanmaken faalde: ${prodErr.message}`);
+    }
     const total = data.lines.reduce((s, l) => s + (Number(l.unit_price ?? 0) * Number(l.quantity)), 0);
     const { data: order, error: orderErr } = await supabaseAdmin.from("orders").insert({
         customer_name: data.customerName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-verkoop-module",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "private": false,
   "sideEffects": false,
   "type": "module",
@@ -29,7 +29,7 @@
     "lint": "eslint ."
   },
   "peerDependencies": {
-    "@flowselections/core": "^1.0.11",
+    "@flowselections/core": "1.0.12",
     "@tanstack/react-query": "^5.0.0",
     "@tanstack/react-router": "^1.0.0",
     "@tanstack/react-start": "^1.0.0",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
-    "@flowselections/core": "^1.0.11",
+    "@flowselections/core": "1.0.12",
     "@lovable.dev/vite-tanstack-config": "2.6.4",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",