@flowselections/floriday-verkoop-module 1.0.48 → 1.0.50

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

@@ -1,4 +1,4 @@
-import { centralOrderNumber, computeTotals, mapJsonbToSalesOrderDTO, } from "./salesorders-mapping";
+import { centralOrderNumber, computeTotals, mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping";
 import { cratePackageName, loadCarrierName, mergeTypeNames } from "./load-carrier-labels";
 import { normalizeLoadCarrierCode } from "./load-carriers";
 import { normalizeTime, resolveDeliveryTimeForDate } from "./carrier-availability";
@@ -397,8 +397,16 @@ export async function buildSalesOrdersList(supabase, params) {
     }
     // 9) Floriday-orders → DTO (zonder zware raw-payload richting browser).
     const floridayOrders = foRows.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
+        // custom_fields.floriday_packing; pas daarna het trade item (mapping).
+        const mirroredPacking = r.data?.packingConfiguration
+            ? null
+            : packingConfigFromFloridayPacking((localRowForPacking?.custom_fields ?? {})?.floriday_packing);
         const enriched = {
             ...r.data,
+            ...(mirroredPacking ? { packingConfiguration: mirroredPacking } : {}),
             ...(orderNumberByFoId.get(String(r.floriday_id))
                 ? { orderNumber: orderNumberByFoId.get(String(r.floriday_id)) }
                 : {}),
@@ -427,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();
@@ -455,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)
@@ -478,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));
         }
@@ -502,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),
@@ -548,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,
         });
     }

package/dist-lib/lib/salesorders-mapping.d.ts

@@ -21,6 +21,8 @@ export interface SalesOrderDTO {
     cartTypeName?: string | null;
     /** Canonieke Engine-code van de ladingdrager (bijv. "trolley"). */
     loadCarrierType?: string | null;
+    /** Waar de getoonde belading vandaan komt (order | orderregel | product | trade-item). */
+    packingSource?: PackingSource;
     totalPieces: number;
     isLocal?: boolean;
     isReservation?: boolean;
@@ -81,6 +83,21 @@ export interface TradeItemLookupEntry {
     raw?: any;
 }
 export type TradeItemLookup = Map<string, TradeItemLookupEntry>;
+/**
+ * Waar de belading van een rij vandaan komt. Expliciet, zodat in de code en
+ * in de DTO altijd zichtbaar is welke bron een getal heeft geleverd.
+ * - "order"      : packingConfiguration van de sales order zelf (leidend)
+ * - "orderregel" : belading vastgelegd op de orderregel (lokale orders)
+ * - "product"    : belading van het gekoppelde product (lokale orders)
+ * - "trade-item" : terugval op de standaardbelading van het artikel
+ */
+export type PackingSource = "order" | "orderregel" | "product" | "trade-item";
+/**
+ * Zet `orders.custom_fields.floriday_packing` (de gespiegelde belading van de
+ * ORDER) om naar een Floriday-vormige packingConfiguration. Alleen gebruiken
+ * als terugval wanneer de cache-payload er zelf geen heeft.
+ */
+export declare function packingConfigFromFloridayPacking(fp: any): any | null;
 export declare function isCentralOrderNumber(value: unknown): value is string;
 export declare function centralOrderNumber(value: unknown): string;
 /** Rijtype + kale UUID uit een lijst-ID (`local:…`, `mailbox-proposal:…`, Floriday). */

package/dist-lib/lib/salesorders-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}

package/dist-lib/lib/salesorders-mapping.js

@@ -16,19 +16,69 @@ function pickPrimaryPacking(raw) {
         return null;
     return configs.find((c) => c?.primary === true || String(c?.primary).toLowerCase() === "true") ?? configs[0] ?? null;
 }
-function withLivePacking(order, packing) {
-    if (!packing)
-        return order;
+/** Heeft de order zelf een bruikbare beladingconfiguratie? */
+function hasOrderPacking(pc) {
+    if (!pc || typeof pc !== "object")
+        return false;
+    return (toNum(pc.piecesPerPackage, 0) > 0 ||
+        toNum(pc.packagesPerLayer, 0) > 0 ||
+        toNum(pc.layersPerLoadCarrier, 0) > 0 ||
+        pc.package != null ||
+        pc.loadCarrier != null);
+}
+/**
+ * Bepaalt de leidende beladingbron: de ORDER wint altijd. Het trade item is
+ * uitsluitend terugval wanneer de order geen packingConfiguration heeft.
+ * Het trade item blijft wél de bron voor naam/foto/sku (zie mapping onder).
+ */
+function resolvePacking(order, tradeItemRaw) {
+    const orderPacking = order?.packingConfiguration;
+    if (hasOrderPacking(orderPacking)) {
+        return { order, source: "order" };
+    }
+    const fallback = pickPrimaryPacking(tradeItemRaw);
+    if (!fallback)
+        return { order, source: "trade-item" };
     return {
-        ...order,
-        packingConfiguration: {
-            ...(order?.packingConfiguration ?? {}),
-            piecesPerPackage: toNum(packing?.piecesPerPackage, toNum(order?.packingConfiguration?.piecesPerPackage, 1)),
-            packagesPerLayer: toNum(packing?.packagesPerLayer, toNum(order?.packingConfiguration?.packagesPerLayer, 0)),
-            layersPerLoadCarrier: toNum(packing?.layersPerLoadCarrier, toNum(order?.packingConfiguration?.layersPerLoadCarrier, 0)),
-            package: packing?.package ?? order?.packingConfiguration?.package,
-            loadCarrier: packing?.loadCarrier ?? order?.packingConfiguration?.loadCarrier,
+        order: {
+            ...order,
+            packingConfiguration: {
+                ...(orderPacking ?? {}),
+                piecesPerPackage: toNum(fallback?.piecesPerPackage, 1),
+                packagesPerLayer: toNum(fallback?.packagesPerLayer, 0),
+                layersPerLoadCarrier: toNum(fallback?.layersPerLoadCarrier, 0),
+                package: fallback?.package ?? orderPacking?.package ?? null,
+                loadCarrier: fallback?.loadCarrier ?? orderPacking?.loadCarrier ?? null,
+            },
         },
+        source: "trade-item",
+    };
+}
+/**
+ * Zet `orders.custom_fields.floriday_packing` (de gespiegelde belading van de
+ * ORDER) om naar een Floriday-vormige packingConfiguration. Alleen gebruiken
+ * als terugval wanneer de cache-payload er zelf geen heeft.
+ */
+export function packingConfigFromFloridayPacking(fp) {
+    if (!fp || typeof fp !== "object")
+        return null;
+    if (String(fp.source ?? "order") !== "order")
+        return null;
+    const pieces = toNum(fp.pieces_per_package, 0);
+    const perLayer = toNum(fp.packages_per_layer, 0);
+    const layers = toNum(fp.layers_per_load_carrier, 0);
+    const vbn = fp.vbn_package_code ?? null;
+    const custom = fp.custom_package_id ?? null;
+    const carrier = fp.load_carrier ?? null;
+    if (pieces <= 0 && perLayer <= 0 && layers <= 0 && vbn == null && custom == null && carrier == null) {
+        return null;
+    }
+    return {
+        piecesPerPackage: pieces || 1,
+        packagesPerLayer: perLayer,
+        layersPerLoadCarrier: layers,
+        package: vbn != null || custom != null ? { vbnPackageCode: vbn, customPackageId: custom } : null,
+        loadCarrier: carrier,
     };
 }
 const CENTRAL_ORDER_NUMBER_RE = /^(FO|MO|AO|HO)-\d{7}$/;
@@ -60,8 +110,8 @@ export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup, crat
     // (geen salesOrderLines-array). Velden staan direct op het object.
     const tradeItemId = String(o?.tradeItemId ?? "");
     const tradeItem = tradeItemId ? tradeItemLookup?.get(tradeItemId) : undefined;
-    const livePacking = pickPrimaryPacking(tradeItem?.raw);
-    const orderWithLivePacking = withLivePacking(o, livePacking);
+    // De ORDER is leidend voor de belading; het trade item is enkel terugval.
+    const { order: orderWithLivePacking, source: packingSource } = resolvePacking(o, tradeItem?.raw);
     const numberOfPieces = toNum(orderWithLivePacking?.numberOfPieces, 0);
     const piecesPerPackage = Math.max(1, toNum(orderWithLivePacking?.packingConfiguration?.piecesPerPackage, 1));
     const numberOfPackages = piecesPerPackage > 0 ? Math.ceil(numberOfPieces / piecesPerPackage) : 0;
@@ -101,6 +151,7 @@ export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup, crat
         karCount,
         crateTypeName,
         cartTypeName,
+        packingSource,
         totalPieces: numberOfPieces,
         customer: {
             name: found?.name ?? "Onbekende klant",