npm - @flowselections/floriday-verkoop-module - Versions diffs - 1.0.18 → 1.0.19 - Mend

@flowselections/floriday-verkoop-module 1.0.18 → 1.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

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

@@ -513,7 +513,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 +553,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 +574,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 +600,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 CHANGED Viewed

@@ -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;
@@ -19471,6 +19527,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 +19568,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 +19595,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 +19622,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 +22583,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 +23148,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;
@@ -31258,6 +31370,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 +31411,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 +31438,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 +31465,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 +34426,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 +34991,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;