@flowselections/floriday-verkoop-module 1.0.12 → 1.0.13

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

@@ -49,6 +49,8 @@ export interface TradeItemLookupEntry {
     raw?: any;
 }
 export type TradeItemLookup = Map<string, TradeItemLookupEntry>;
+export declare function isCentralOrderNumber(value: unknown): value is string;
+export declare function centralOrderNumber(value: unknown): string;
 export declare function mapJsonbToSalesOrderDTO(o: any, customerLookup?: CustomerLookup, tradeItemLookup?: TradeItemLookup): SalesOrderDTO;
 export interface SalesOrdersTotals {
     revenue: number;

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

@@ -7,40 +7,66 @@ function toNum(v, d = 0) {
     }
     return d;
 }
+function pickPrimaryPacking(raw) {
+    const configs = raw?.packingConfigurations;
+    if (!Array.isArray(configs) || configs.length === 0)
+        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;
+    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,
+        },
+    };
+}
+const CENTRAL_ORDER_NUMBER_RE = /^(FO|MO|AO|HO)-\d{7}$/;
+export function isCentralOrderNumber(value) {
+    return typeof value === "string" && CENTRAL_ORDER_NUMBER_RE.test(value.trim());
+}
+export function centralOrderNumber(value) {
+    return isCentralOrderNumber(value) ? value.trim() : "";
+}
 export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup) {
     // Floriday suppliers-api-2026v1 levert een vlak sales-order object
     // (geen salesOrderLines-array). Velden staan direct op het object.
-    const numberOfPieces = toNum(o?.numberOfPieces, 0);
-    const piecesPerPackage = Math.max(1, toNum(o?.packingConfiguration?.piecesPerPackage, 1));
+    const tradeItemId = String(o?.tradeItemId ?? "");
+    const tradeItem = tradeItemId ? tradeItemLookup?.get(tradeItemId) : undefined;
+    const livePacking = pickPrimaryPacking(tradeItem?.raw);
+    const orderWithLivePacking = withLivePacking(o, livePacking);
+    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;
-    const packagesPerLayer = Math.max(0, toNum(o?.packingConfiguration?.packagesPerLayer, 0));
-    const layersPerLoadCarrier = Math.max(0, toNum(o?.packingConfiguration?.layersPerLoadCarrier, 0));
+    const packagesPerLayer = Math.max(0, toNum(orderWithLivePacking?.packingConfiguration?.packagesPerLayer, 0));
+    const layersPerLoadCarrier = Math.max(0, toNum(orderWithLivePacking?.packingConfiguration?.layersPerLoadCarrier, 0));
     const packagesPerLoadCarrier = packagesPerLayer * layersPerLoadCarrier;
     const karCount = packagesPerLoadCarrier > 0
         ? Math.ceil(numberOfPackages / packagesPerLoadCarrier)
         : numberOfPackages > 0 ? 1 : 0;
-    const unitPrice = toNum(o?.pricePerPiece?.value);
-    const orderAmount = toNum(o?.calculatedFields?.orderAmount?.value);
+    const unitPrice = toNum(orderWithLivePacking?.pricePerPiece?.value);
+    const orderAmount = toNum(orderWithLivePacking?.calculatedFields?.orderAmount?.value);
     const revenue = orderAmount > 0 ? orderAmount : unitPrice * numberOfPieces;
-    const orderedAt = o?.orderDateTime ?? o?.creationDateTime ?? "";
-    const deliveryAt = o?.delivery?.latestDeliveryDateTime ?? "";
-    const customerOrgId = o?.customerOrganizationId ?? "";
+    const orderedAt = orderWithLivePacking?.orderDateTime ?? orderWithLivePacking?.creationDateTime ?? "";
+    const deliveryAt = orderWithLivePacking?.delivery?.latestDeliveryDateTime ?? "";
+    const customerOrgId = orderWithLivePacking?.customerOrganizationId ?? "";
     const found = customerOrgId ? customerLookup?.get(customerOrgId) : undefined;
-    const status = String(o?.status ?? "").toUpperCase();
-    const isCancelled = status === "CANCELLED" || !!o?.automaticallyCancelledOn;
+    const status = String(orderWithLivePacking?.status ?? "").toUpperCase();
+    const isCancelled = status === "CANCELLED" || !!orderWithLivePacking?.automaticallyCancelledOn;
     const isShipped = status === "SHIPPED" || status === "DELIVERED";
     const isInvoiced = o?.isPaid === true;
     const isConfirmed = status === "COMMITTED" || status === "CONFIRMED";
-    const orderNumber = (typeof o?.customerOrderId === "string" && o.customerOrderId.trim().length > 0
-        ? o.customerOrderId
-        : null) ??
-        (o?.salesChannelOrderId ? String(o.salesChannelOrderId) : null) ??
-        String(o?.salesOrderId ?? "").slice(0, 16);
-    const tradeItemId = String(o?.tradeItemId ?? "");
-    const tradeItem = tradeItemId ? tradeItemLookup?.get(tradeItemId) : undefined;
+    const orderNumber = centralOrderNumber(orderWithLivePacking?.orderNumber ?? orderWithLivePacking?.order_number);
     return {
         id: String(o?.salesOrderId ?? ""),
-        orderNumber: String(orderNumber ?? ""),
+        orderNumber,
         productName: tradeItem?.name ?? "Onbekend artikel",
         sku: tradeItem?.sku ?? tradeItemId,
         imageUrl: tradeItem?.imageUrl ?? null,
@@ -59,7 +85,7 @@ export function mapJsonbToSalesOrderDTO(o, customerLookup, tradeItemLookup) {
         },
         status: { isCancelled, isShipped, isInvoiced, isConfirmed },
         raw: {
-            order: o ?? null,
+            order: orderWithLivePacking ?? null,
             customer: found?.raw ?? null,
             tradeItem: tradeItem?.raw ?? null,
         },