@flowselections/floriday-verkoop-module 1.0.19 → 1.0.21

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,

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

@@ -4700,6 +4700,8 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 Row: {
                     buyer_organization_id: string | null;
                     connection_id: string;
+                    controlled_at: string | null;
+                    controlled_by: string | null;
                     created_at: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -4711,6 +4713,8 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 Insert: {
                     buyer_organization_id?: string | null;
                     connection_id: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -4722,6 +4726,8 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 Update: {
                     buyer_organization_id?: string | null;
                     connection_id?: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data?: import("../integrations/supabase/types").Json;
                     floriday_id?: string;
@@ -7740,6 +7746,7 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
+                    is_layer: boolean;
                     layers_per_cart: number;
                     location: string;
                     min_quantity: number;
@@ -7767,6 +7774,7 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location: string;
                     min_quantity?: number;
@@ -7794,6 +7802,7 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location?: string;
                     min_quantity?: number;
@@ -11308,6 +11317,13 @@ export declare const getPreferredWarehouseStatus: import("@tanstack/start-client
                 };
                 Returns: undefined;
             };
+            mark_salesorder_controlled: {
+                Args: {
+                    p_controlled: boolean;
+                    p_floriday_id: string;
+                };
+                Returns: undefined;
+            };
             mark_shipment_shipped: {
                 Args: {
                     p_shipment_id: string;
@@ -11786,6 +11802,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;
@@ -16534,6 +16556,8 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 Row: {
                     buyer_organization_id: string | null;
                     connection_id: string;
+                    controlled_at: string | null;
+                    controlled_by: string | null;
                     created_at: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -16545,6 +16569,8 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 Insert: {
                     buyer_organization_id?: string | null;
                     connection_id: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -16556,6 +16582,8 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 Update: {
                     buyer_organization_id?: string | null;
                     connection_id?: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data?: import("../integrations/supabase/types").Json;
                     floriday_id?: string;
@@ -19574,6 +19602,7 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
+                    is_layer: boolean;
                     layers_per_cart: number;
                     location: string;
                     min_quantity: number;
@@ -19601,6 +19630,7 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location: string;
                     min_quantity?: number;
@@ -19628,6 +19658,7 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location?: string;
                     min_quantity?: number;
@@ -23142,6 +23173,13 @@ export declare const getAutoFulfillmentStatus: import("@tanstack/start-client-co
                 };
                 Returns: undefined;
             };
+            mark_salesorder_controlled: {
+                Args: {
+                    p_controlled: boolean;
+                    p_floriday_id: string;
+                };
+                Returns: undefined;
+            };
             mark_shipment_shipped: {
                 Args: {
                     p_shipment_id: string;
@@ -23620,6 +23658,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;
@@ -28377,6 +28421,8 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 Row: {
                     buyer_organization_id: string | null;
                     connection_id: string;
+                    controlled_at: string | null;
+                    controlled_by: string | null;
                     created_at: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -28388,6 +28434,8 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 Insert: {
                     buyer_organization_id?: string | null;
                     connection_id: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data: import("../integrations/supabase/types").Json;
                     floriday_id: string;
@@ -28399,6 +28447,8 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 Update: {
                     buyer_organization_id?: string | null;
                     connection_id?: string;
+                    controlled_at?: string | null;
+                    controlled_by?: string | null;
                     created_at?: string;
                     data?: import("../integrations/supabase/types").Json;
                     floriday_id?: string;
@@ -31417,6 +31467,7 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     id: string;
                     image_url: string | null;
                     incoming_quantity: number;
+                    is_layer: boolean;
                     layers_per_cart: number;
                     location: string;
                     min_quantity: number;
@@ -31444,6 +31495,7 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location: string;
                     min_quantity?: number;
@@ -31471,6 +31523,7 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                     id?: string;
                     image_url?: string | null;
                     incoming_quantity?: number;
+                    is_layer?: boolean;
                     layers_per_cart?: number;
                     location?: string;
                     min_quantity?: number;
@@ -34985,6 +35038,13 @@ export declare const retryAutoFulfillment: import("@tanstack/start-client-core")
                 };
                 Returns: undefined;
             };
+            mark_salesorder_controlled: {
+                Args: {
+                    p_controlled: boolean;
+                    p_floriday_id: string;
+                };
+                Returns: undefined;
+            };
             mark_shipment_shipped: {
                 Args: {
                     p_shipment_id: string;
@@ -35463,6 +35523,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;