@flowselections/floriday-verkoop-module 1.0.49 → 1.0.51

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

@@ -435,15 +435,51 @@ export async function buildSalesOrdersList(supabase, params) {
         return dto;
     });
     // 10) Lokale orders → DTO.
+    // Leesvolgorde van de belading van een lokale orderregel:
+    //   a. order_items.plants_per_crate/crates_per_layer/layers_per_cart → "orderregel"
+    //   b. groeps-/productrecord (products.*)                            → "product"
+    //   c. niets → geen packing (de orderkop toont "—", geen 1×1×1)
+    // De orderregel wint van het product, net zoals de order wint van het
+    // trade item in de Floriday-tak (resolvePacking, 26-08).
     const resolveLinePacking = (item) => {
+        const ppc = Number(item?.plants_per_crate ?? 0);
+        const cpl = Number(item?.crates_per_layer ?? 0);
+        const lpc = Number(item?.layers_per_cart ?? 0);
+        if (ppc > 0 || cpl > 0 || lpc > 0) {
+            return {
+                plants_per_crate: ppc || null,
+                crates_per_layer: cpl || null,
+                layers_per_cart: lpc || null,
+                __source: "orderregel",
+            };
+        }
         const name = String(item?.product_name ?? "");
         if (name.startsWith("[Groep] ")) {
             const gname = name.slice("[Groep] ".length).trim().toLowerCase();
             const gp = groupPacking.get(gname);
             if (gp)
-                return gp;
+                return { ...gp, __source: "product" };
         }
-        return item?.products ?? null;
+        const prod = item?.products ?? null;
+        return prod ? { ...prod, __source: "product" } : null;
+    };
+    /** Floriday-vormige packingConfiguration uit een lokale regel-packing. */
+    const localPackingConfiguration = (packing, cfg, loadCarrierCode) => {
+        const pieces = Number(packing?.plants_per_crate ?? 0);
+        const perLayer = Number(packing?.crates_per_layer ?? 0);
+        const layers = Number(packing?.layers_per_cart ?? 0);
+        if (pieces <= 0 && perLayer <= 0 && layers <= 0)
+            return null;
+        const vbn = cfg?.package?.vbnPackageCode ?? null;
+        const custom = cfg?.package?.customPackageId ?? null;
+        return {
+            piecesPerPackage: pieces || null,
+            packagesPerLayer: perLayer || null,
+            layersPerLoadCarrier: layers || null,
+            // Geen fustcode-fallback: ontbreekt de vbn-code, dan blijft package null.
+            package: vbn != null || custom != null ? { vbnPackageCode: vbn, customPackageId: custom } : null,
+            loadCarrier: loadCarrierCode ?? null,
+        };
     };
     const localOrders = [];
     const includedOrderIds = new Set();
@@ -463,6 +499,11 @@ export async function buildSalesOrdersList(supabase, params) {
         let karTotalRaw = 0;
         const crateNames = [];
         const cartNames = [];
+        // Belading van de eerste regel: die bepaalt de notatie in de orderkop.
+        // Bij gemengde regels tonen we bewust die eerste configuratie; het
+        // "Gemengd"-signaal komt uit mergeTypeNames (crate-/cartTypeName).
+        let headPacking = null;
+        let headCfg = null;
         for (const item of lineItems) {
             const pieces = toNumber(item?.quantity) || 0;
             if (pieces <= 0)
@@ -486,6 +527,10 @@ export async function buildSalesOrdersList(supabase, params) {
                 return Array.isArray(payload) ? payload : [];
             })();
             const cfg = pickPackingConfigForLine(configs, packing);
+            if (headPacking === null && packing) {
+                headPacking = packing;
+                headCfg = cfg;
+            }
             crateNames.push(cratePackageName(cfg?.package?.vbnPackageCode ?? cfg?.package?.customPackageId ?? null, crateDescriptions));
             cartNames.push(loadCarrierName(cfg?.loadCarrier ?? null));
         }
@@ -510,6 +555,10 @@ export async function buildSalesOrdersList(supabase, params) {
         const firstProduct = pickString(firstLine?.product_name);
         const firstPacking = firstLine ? resolveLinePacking(firstLine) : null;
         const firstPlantsPerCrate = Math.max(1, Number(firstPacking?.plants_per_crate ?? 1));
+        const localPacking = localPackingConfiguration(headPacking ?? firstPacking, headCfg, normalizeLoadCarrierCode(cf.load_carrier_type) ?? null);
+        const localPackingSource = localPacking
+            ? ((headPacking ?? firstPacking)?.__source ?? "product")
+            : undefined;
         localOrders.push({
             id: `local:${r.id}`,
             orderNumber: centralOrderNumber(r.order_number),
@@ -556,7 +605,16 @@ export async function buildSalesOrdersList(supabase, params) {
                 ...(r.customer_id || r.customer_name ? [] : ["geen klant gekoppeld"]),
                 ...(r.delivery_date ? [] : ["geen leverdatum"]),
             ],
-            raw: { order: { status: r.status ?? null }, customer: null, tradeItem: null },
+            packingSource: localPackingSource,
+            raw: {
+                order: {
+                    status: r.status ?? null,
+                    numberOfPieces: totalQuantity,
+                    ...(localPacking ? { packingConfiguration: localPacking } : {}),
+                },
+                customer: null,
+                tradeItem: null,
+            },
             bufferId: bufferByLocalId.get(String(r.id)) ?? null,
         });
     }