@flowselections/floriday-verkoop-module 1.0.60 → 1.0.61

package/dist-lib/lib/salesorders-list.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CA60BrB"}
+{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAw4BrB"}

package/dist-lib/lib/salesorders-list.server.js

@@ -188,7 +188,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
         }
     }
     // 3) Lokale orders binnen hetzelfde venster.
-    const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, status_changed_at, total, custom_fields, order_source, created_at, is_reservation, plan_locked_at, buffer_id, floriday_sales_order_id, order_items(id, product_id, product_name, quantity, unit, unit_price, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
+    const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, status_changed_at, total, custom_fields, order_source, created_at, is_reservation, plan_locked_at, buffer_id, floriday_sales_order_id, floriday_order_group_key, order_items(id, product_id, product_name, quantity, unit, unit_price, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
     let localOrderRows = [];
     if (params.localOrderId) {
         const primaryRes = await supabase
@@ -409,9 +409,23 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
     const bufferByFoId = new Map();
     const bufferByLocalId = new Map();
     const localRowByFoId = new Map();
+    // Floriday levert per artikel een aparte verkooporder. Zijn er meerdere
+    // samengevoegd tot één lokale order, dan tonen we die ene lokale order en
+    // niet de losse Floriday-regels.
+    const groupedFoIds = new Set();
     for (const r of localOrderRows) {
+        const cf = r.custom_fields ?? {};
+        const memberIds = Array.isArray(cf?.floriday_sales_order_ids)
+            ? cf.floriday_sales_order_ids.map((v) => String(v)).filter(Boolean)
+            : [];
         if (r.floriday_sales_order_id)
             localRowByFoId.set(String(r.floriday_sales_order_id), r);
+        if (memberIds.length > 1) {
+            for (const fid of memberIds) {
+                groupedFoIds.add(fid);
+                localRowByFoId.set(fid, r);
+            }
+        }
         const bid = r.buffer_id;
         if (!bid)
             continue;
@@ -419,9 +433,51 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
             bufferByFoId.set(String(r.floriday_sales_order_id), bid);
         else
             bufferByLocalId.set(String(r.id), bid);
+        for (const fid of memberIds)
+            bufferByFoId.set(fid, bid);
+    }
+    // 8b) Extra vangnet. Hoort een Floriday-regel bij een bestelling waarvan de
+    // losse order al is opgeruimd (samengevoegd), dan mag die regel nooit meer
+    // als losse rij verschijnen — ook niet als de samenvoeggegevens in
+    // custom_fields ontbreken doordat een oudere spiegelronde ze overschreef.
+    const activeGroupKeys = Array.from(new Set(localOrderRows
+        .map((r) => String(r.floriday_order_group_key ?? ""))
+        .filter((k) => k.length > 0)));
+    if (activeGroupKeys.length > 0) {
+        try {
+            const { data: mergedAway } = await supabase
+                .from("orders")
+                .select("id, floriday_sales_order_id, floriday_order_group_key, buffer_id")
+                .in("floriday_order_group_key", activeGroupKeys)
+                .not("deleted_at", "is", null)
+                .limit(2000);
+            const activeByKey = new Map();
+            for (const r of localOrderRows) {
+                const k = String(r.floriday_order_group_key ?? "");
+                if (k)
+                    activeByKey.set(k, r);
+            }
+            for (const g of (mergedAway ?? [])) {
+                const fid = String(g.floriday_sales_order_id ?? "");
+                if (!fid)
+                    continue;
+                const active = activeByKey.get(String(g.floriday_order_group_key ?? ""));
+                if (!active)
+                    continue;
+                groupedFoIds.add(fid);
+                localRowByFoId.set(fid, active);
+                if (active.buffer_id)
+                    bufferByFoId.set(fid, String(active.buffer_id));
+            }
+        }
+        catch {
+            /* vangnet is best-effort */
+        }
     }
     // 9) Floriday-orders → DTO (zonder zware raw-payload richting browser).
-    const floridayOrders = foRows.map((r) => {
+    const floridayOrders = foRows
+        .filter((r) => !groupedFoIds.has(String(r.floriday_id)))
+        .map((r) => {
         const localRowForPacking = localRowByFoId.get(String(r.floriday_id)) ?? null;
         // De order is leidend voor de belading. Heeft de cache-payload geen
         // packingConfiguration, dan geldt de gespiegelde orderbelading uit
@@ -514,7 +570,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
     // bronnen te verdwijnen.
     const visibleFloridayIds = new Set(foRows.map((row) => String(row?.floriday_id ?? "")).filter(Boolean));
     for (const r of localOrderRows) {
-        if (r.floriday_sales_order_id &&
+        const isGrouped = Array.isArray((r.custom_fields ?? {})?.floriday_sales_order_ids) &&
+            r.custom_fields.floriday_sales_order_ids.length > 1;
+        if (!isGrouped &&
+            r.floriday_sales_order_id &&
             visibleFloridayIds.has(String(r.floriday_sales_order_id)))
             continue;
         const cf = r.custom_fields ?? {};