@flowselections/floriday-verkoop-module 1.0.18 → 1.0.20

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

@@ -49,7 +49,7 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
             .range(0, 9999),
         context.supabase
             .from("products")
-            .select("id, product, unit, sale_price, plants_per_crate, crates_per_layer, layers_per_cart, quantity, custom_fields")
+            .select("id, product, unit, sale_price, plants_per_crate, crates_per_layer, layers_per_cart, quantity, custom_fields, trade_item_key")
             .range(0, 4999),
     ]);
     // Supabase geeft standaard max. 1000 rijen terug. Voor productgroepen kan de
@@ -242,6 +242,13 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
     for (const p of Array.isArray(productsRes.data) ? productsRes.data : []) {
         productsById.set(p.id, p);
     }
+    const productsByGroupId = new Map();
+    for (const p of Array.isArray(productsRes.data) ? productsRes.data : []) {
+        const key = p.trade_item_key;
+        if (typeof key === "string" && key.startsWith("group:")) {
+            productsByGroupId.set(key.slice("group:".length), p);
+        }
+    }
     const packingFromProductRow = (p) => ({
         plants_per_crate: Math.max(1, Number(p?.plants_per_crate ?? 1)),
         crates_per_layer: Math.max(1, Number(p?.crates_per_layer ?? 1)),
@@ -277,32 +284,34 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
             reserved = resSum;
             available = Math.max(0, physical - reserved);
         }
-        // Probeer belading van de bovenste member; val terug op head_trade_item /
-        // head_product_id als de member niet in byId of products staat.
+        // Head eerst — belading van de groep = belading van het hoofdproduct.
+        // Volgorde: head_trade_item_floriday_id → head_product_id → group-mirror
+        // products-rij (`trade_item_key = 'group:<id>'`) → eerste member.
         let packing = { plants_per_crate: 1, crates_per_layer: 1, layers_per_cart: 1 };
-        const candidates = [
-            members[0]?.trade_item_id ?? null,
-            r.head_trade_item_floriday_id ?? null,
-            r.head_product_id ?? null,
-        ];
-        for (const cand of candidates) {
+        const headFloriday = r.head_trade_item_floriday_id;
+        const headProduct = r.head_product_id;
+        const groupMirror = productsByGroupId.get(id);
+        const firstMemberId = members[0]?.trade_item_id ?? null;
+        const tryFromById = (cand) => {
             if (!cand)
-                continue;
-            const fromBy = byId.get(cand);
-            if (fromBy) {
-                packing = {
-                    plants_per_crate: fromBy.plants_per_crate,
-                    crates_per_layer: fromBy.crates_per_layer,
-                    layers_per_cart: fromBy.layers_per_cart,
-                };
-                break;
-            }
-            const fromProd = productsById.get(cand);
-            if (fromProd) {
-                packing = packingFromProductRow(fromProd);
-                break;
-            }
-        }
+                return null;
+            const hit = byId.get(cand);
+            if (!hit)
+                return null;
+            return {
+                plants_per_crate: hit.plants_per_crate,
+                crates_per_layer: hit.crates_per_layer,
+                layers_per_cart: hit.layers_per_cart,
+            };
+        };
+        const tryFromProductRow = (row) => (row ? packingFromProductRow(row) : null);
+        packing =
+            tryFromById(headFloriday) ??
+                tryFromProductRow(headProduct ? productsById.get(headProduct) : null) ??
+                tryFromProductRow(groupMirror) ??
+                tryFromById(firstMemberId) ??
+                tryFromProductRow(firstMemberId ? productsById.get(firstMemberId) : null) ??
+                packing;
         byId.set(id, {
             id,
             product: displayName,
@@ -513,7 +522,12 @@ export const createManualOrder = createServerFn({ method: "POST" })
     const groupById = new Map();
     for (const r of groupsRes.data ?? [])
         groupById.set(r.id, r);
-    const missingLines = data.lines.filter((l) => !existingIds.has(l.product_id));
+    // Groepen krijgen GEEN spiegelrij in `products`: de database heeft een
+    // trigger die id-botsingen tussen products en product_groups tegenhoudt.
+    // De order-regel wordt daarom met product_id = null én naamprefix
+    // "[Groep] <naam>" opgeslagen; expand-group-order-items resolvt de groep
+    // dan op naam en splitst hem in members.
+    const missingLines = data.lines.filter((l) => !existingIds.has(l.product_id) && !groupById.has(l.product_id));
     if (missingLines.length > 0) {
         const shortRand = () => Array.from({ length: 6 }, () => Math.floor(Math.random() * 16).toString(16).toUpperCase()).join("");
         const seen = new Set();
@@ -548,13 +562,6 @@ export const createManualOrder = createServerFn({ method: "POST" })
                 customFields.floriday_id = id;
                 customFields.source = "sales-module-floriday-mirror";
             }
-            else if (groupById.has(id)) {
-                source = "group";
-                tradeItemKey = `group:${id}`;
-                articleNumber = l.article_code?.trim() || `GRP-${shortRand()}`;
-                customFields.group_id = id;
-                customFields.source = "sales-module-group-mirror";
-            }
             else {
                 source = "unknown";
                 tradeItemKey = `product:${id}`;
@@ -576,9 +583,11 @@ export const createManualOrder = createServerFn({ method: "POST" })
                 custom_fields: { ...customFields, mirror_kind: source },
             };
         });
-        const { error: prodErr } = await supabaseAdmin.from("products").insert(toInsert);
-        if (prodErr)
-            throw new Error(`Product aanmaken faalde: ${prodErr.message}`);
+        if (toInsert.length > 0) {
+            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({
@@ -600,14 +609,24 @@ export const createManualOrder = createServerFn({ method: "POST" })
     }).select("id, order_number").single();
     if (orderErr)
         throw new Error(orderErr.message);
-    const items = data.lines.map((l) => ({
-        order_id: order.id,
-        product_id: l.product_id,
-        product_name: l.product_name,
-        quantity: Math.max(1, Math.round(l.quantity)),
-        unit: l.unit ?? "stuks",
-        unit_price: l.unit_price ?? undefined,
-    }));
+    const items = data.lines.map((l) => {
+        const isGroup = groupById.has(l.product_id);
+        const groupRow = isGroup ? groupById.get(l.product_id) : null;
+        const groupName = groupRow?.name ?? l.product_name;
+        const displayName = isGroup
+            ? (/^\s*\[Groep\]/i.test(l.product_name) ? l.product_name : `[Groep] ${groupName}`)
+            : l.product_name;
+        return {
+            order_id: order.id,
+            // Groepen krijgen product_id = null; expand-group-order-items
+            // resolvt hen op naam ("[Groep] <naam>").
+            product_id: isGroup ? null : l.product_id,
+            product_name: displayName,
+            quantity: Math.max(1, Math.round(l.quantity)),
+            unit: l.unit ?? "stuks",
+            unit_price: l.unit_price ?? undefined,
+        };
+    });
     const { error: itemsErr } = await supabaseAdmin.from("order_items").insert(items);
     if (itemsErr)
         throw new Error(itemsErr.message);

package/dist-lib/lib/floriday-auto-fulfillment.functions.d.ts

@@ -7693,6 +7693,39 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     referencedColumns: ["id"];
                 }];
             };
+            product_merge_log: {
+                Row: {
+                    canonical_product_id: string | null;
+                    id: string;
+                    merged_at: string;
+                    merged_from_id: string;
+                    notes: string | null;
+                    snapshot: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status: string;
+                };
+                Insert: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status?: string;
+                };
+                Update: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id?: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table?: string;
+                    status?: string;
+                };
+                Relationships: [];
+            };
             products: {
                 Row: {
                     article_number: string | null;
@@ -7701,6 +7734,9 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     crates_per_layer: number;
                     created_at: string;
                     custom_fields: import("../integrations/supabase/types").Json;
+                    floriday_active: boolean;
+                    floriday_payload: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id: string | null;
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
@@ -7725,6 +7761,9 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -7749,6 +7788,9 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -10707,6 +10749,13 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 };
                 Returns: number;
             };
+            _migrate_rewrite_stock_key: {
+                Args: {
+                    _from_key: string;
+                    _to_key: string;
+                };
+                Returns: undefined;
+            };
             afh_city_code: {
                 Args: {
                     _city: string;
@@ -11265,6 +11314,13 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 };
                 Returns: undefined;
             };
+            merge_products: {
+                Args: {
+                    _canonical: string;
+                    _loser: string;
+                };
+                Returns: undefined;
+            };
             next_manufacture_partij: {
                 Args: {
                     _tenant_id: string;
@@ -11730,6 +11786,12 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 };
                 Returns: undefined;
             };
+            sync_product_group_belading: {
+                Args: {
+                    _group_id: string;
+                };
+                Returns: undefined;
+            };
             sync_product_packing_from_floriday_cache: {
                 Args: {
                     p_floriday_id: string;
@@ -19471,6 +19533,39 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     referencedColumns: ["id"];
                 }];
             };
+            product_merge_log: {
+                Row: {
+                    canonical_product_id: string | null;
+                    id: string;
+                    merged_at: string;
+                    merged_from_id: string;
+                    notes: string | null;
+                    snapshot: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status: string;
+                };
+                Insert: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status?: string;
+                };
+                Update: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id?: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table?: string;
+                    status?: string;
+                };
+                Relationships: [];
+            };
             products: {
                 Row: {
                     article_number: string | null;
@@ -19479,6 +19574,9 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     crates_per_layer: number;
                     created_at: string;
                     custom_fields: import("../integrations/supabase/types").Json;
+                    floriday_active: boolean;
+                    floriday_payload: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id: string | null;
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
@@ -19503,6 +19601,9 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -19527,6 +19628,9 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -22485,6 +22589,13 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 };
                 Returns: number;
             };
+            _migrate_rewrite_stock_key: {
+                Args: {
+                    _from_key: string;
+                    _to_key: string;
+                };
+                Returns: undefined;
+            };
             afh_city_code: {
                 Args: {
                     _city: string;
@@ -23043,6 +23154,13 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 };
                 Returns: undefined;
             };
+            merge_products: {
+                Args: {
+                    _canonical: string;
+                    _loser: string;
+                };
+                Returns: undefined;
+            };
             next_manufacture_partij: {
                 Args: {
                     _tenant_id: string;
@@ -23508,6 +23626,12 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 };
                 Returns: undefined;
             };
+            sync_product_group_belading: {
+                Args: {
+                    _group_id: string;
+                };
+                Returns: undefined;
+            };
             sync_product_packing_from_floriday_cache: {
                 Args: {
                     p_floriday_id: string;
@@ -31258,6 +31382,39 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     referencedColumns: ["id"];
                 }];
             };
+            product_merge_log: {
+                Row: {
+                    canonical_product_id: string | null;
+                    id: string;
+                    merged_at: string;
+                    merged_from_id: string;
+                    notes: string | null;
+                    snapshot: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status: string;
+                };
+                Insert: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table: string;
+                    status?: string;
+                };
+                Update: {
+                    canonical_product_id?: string | null;
+                    id?: string;
+                    merged_at?: string;
+                    merged_from_id?: string;
+                    notes?: string | null;
+                    snapshot?: import("../integrations/supabase/types").Json;
+                    source_table?: string;
+                    status?: string;
+                };
+                Relationships: [];
+            };
             products: {
                 Row: {
                     article_number: string | null;
@@ -31266,6 +31423,9 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     crates_per_layer: number;
                     created_at: string;
                     custom_fields: import("../integrations/supabase/types").Json;
+                    floriday_active: boolean;
+                    floriday_payload: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id: string | null;
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
@@ -31290,6 +31450,9 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -31314,6 +31477,9 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     crates_per_layer?: number;
                     created_at?: string;
                     custom_fields?: import("../integrations/supabase/types").Json;
+                    floriday_active?: boolean;
+                    floriday_payload?: import("../integrations/supabase/types").Json;
+                    floriday_trade_item_id?: string | null;
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
@@ -34272,6 +34438,13 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 };
                 Returns: number;
             };
+            _migrate_rewrite_stock_key: {
+                Args: {
+                    _from_key: string;
+                    _to_key: string;
+                };
+                Returns: undefined;
+            };
             afh_city_code: {
                 Args: {
                     _city: string;
@@ -34830,6 +35003,13 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 };
                 Returns: undefined;
             };
+            merge_products: {
+                Args: {
+                    _canonical: string;
+                    _loser: string;
+                };
+                Returns: undefined;
+            };
             next_manufacture_partij: {
                 Args: {
                     _tenant_id: string;
@@ -35295,6 +35475,12 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 };
                 Returns: undefined;
             };
+            sync_product_group_belading: {
+                Args: {
+                    _group_id: string;
+                };
+                Returns: undefined;
+            };
             sync_product_packing_from_floriday_cache: {
                 Args: {
                     p_floriday_id: string;