@flowselections/logistiek-engine 1.0.100 → 1.0.106

package/dist-lib/lib/floridayPush.server.d.ts

@@ -6,6 +6,7 @@ export declare function hashPayload(value: unknown): string;
 export interface FloridayPushPayload {
     deliveryOrderId: string;
     fulfillmentRequestIds: string[];
+    loadCarriers: import("./floridayCartCarriers.js").LoadCarrier[];
 }
 export type BuildResult = {
     ok: true;
@@ -26,6 +27,7 @@ export declare function findDeliveryOrderForSalesOrder(sb: SupabaseClient, sales
     ok: true;
     deliveryOrderId: string;
     fulfillmentRequestIds: string[];
+    requestDetails: import("./floridayCartCarriers.js").DeliveryRequestInput[];
     matches: number;
 } | {
     ok: false;

package/dist-lib/lib/floridayPush.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floridayPush.server.d.ts","sourceRoot":"","sources":["../../src/lib/floridayPush.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAc/C,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUlD;AAcD,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAUnE;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,cAAc,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CACN;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvF;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAC7C,CAqDA;AAED,8CAA8C;AAC9C,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CA+EtB;AAQD,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AA6BD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,OAAO,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAElF,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;CACjB;AAYD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,eAAe,CAAC,CA+K1B;AAQD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F"}
+{"version":3,"file":"floridayPush.server.d.ts","sourceRoot":"","sources":["../../src/lib/floridayPush.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAc/C,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUlD;AAaD,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,YAAY,EAAE,OAAO,2BAA2B,EAAE,WAAW,EAAE,CAAC;CACjE;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAUnE;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,cAAc,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CACN;IACE,EAAE,EAAE,IAAI,CAAC;IACT,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,cAAc,EAAE,OAAO,2BAA2B,EAAE,oBAAoB,EAAE,CAAC;IAC3E,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAC7C,CAoEA;AAED,8CAA8C;AAC9C,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAyHtB;AAQD,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AA6BD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,OAAO,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAElF,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;CACjB;AAYD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,eAAe,CAAC,CA+K1B;AAQD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F"}

package/dist-lib/lib/floridayPush.server.js

@@ -79,10 +79,24 @@ export async function findDeliveryOrderForSalesOrder(sb, salesOrderId) {
             error: `Delivery-order ${String(row["floriday_id"] ?? "")} bevat geen fulfillmentRequests voor sales-order ${salesOrderId}.`,
         };
     }
+    const num = (v) => (typeof v === "number" ? v : v == null || v === "" ? null : Number(v));
+    const str = (v) => (typeof v === "string" && v.trim() ? v : null);
+    const requestDetails = requests
+        .filter((r) => fulfillmentRequestIds.includes(String(r["fulfillmentRequestId"] ?? r["id"] ?? "")))
+        .map((r) => ({
+        fulfillmentRequestId: String(r["fulfillmentRequestId"] ?? r["id"] ?? ""),
+        numberOfPackages: num(r["numberOfPackages"]),
+        serviceCode: num(r["serviceCode"]),
+        packingAgentOrganizationId: str(r["packingAgentOrganizationId"]),
+        deliveryRemarks: str(r["deliveryRemarks"]),
+        commercialInvoiceReference: str(r["commercialInvoiceReference"]),
+        alternativeDisplayName: str(r["alternativeDisplayName"]),
+    }));
     return {
         ok: true,
         deliveryOrderId: String(row["floriday_id"] ?? ""),
         fulfillmentRequestIds,
+        requestDetails,
         matches: rows.length,
     };
 }
@@ -121,7 +135,7 @@ export async function buildFloridayPayload(sb, orderRef) {
     }
     const { data: carts, error: cartsError } = await sb
         .from("order_carts")
-        .select("id, cart_number, carrier_type, total_layers_used, max_layers, occupancy_pct, weight_kg, order_cart_items(product_id, product_name, crates, boxes, plants_per_crate)")
+        .select("id, cart_number, carrier_type, total_layers_used, max_layers, occupancy_pct, weight_kg, order_cart_items(product_id, product_name, crates, boxes, plants_per_crate, order_item_id)")
         .eq("order_id", row["id"])
         .order("cart_number", { ascending: true });
     if (cartsError) {
@@ -132,8 +146,8 @@ export async function buildFloridayPayload(sb, orderRef) {
             permanent: false,
         };
     }
-    const indeling = (Array.isArray(carts) ? carts : []).map((c) => {
-        const cart = c;
+    const cartRows = (Array.isArray(carts) ? carts : []);
+    const indeling = cartRows.map((cart) => {
         const items = Array.isArray(cart["order_cart_items"])
             ? cart["order_cart_items"]
             : [];
@@ -150,9 +164,46 @@ export async function buildFloridayPayload(sb, orderRef) {
                 .sort((a, b) => String(a.productId).localeCompare(String(b.productId))),
         };
     });
+    // Orderregel → Floriday fulfillmentRequest (order_items.source_line_key).
+    const { data: orderItems, error: itemsError } = await sb
+        .from("order_items")
+        .select("id, source_line_key")
+        .eq("order_id", row["id"])
+        // Regels in quarantaine (Verkoop-herstel) gaan niet mee naar Floriday.
+        .is("quarantined_at", null);
+    if (itemsError) {
+        return {
+            ok: false,
+            code: "db_error_order_items",
+            error: `Orderregels niet leesbaar: ${itemsError.message}`,
+            permanent: false,
+        };
+    }
+    const requestByItem = new Map();
+    for (const it of (Array.isArray(orderItems) ? orderItems : [])) {
+        const key = String(it["source_line_key"] ?? "").trim();
+        if (key)
+            requestByItem.set(String(it["id"]), key);
+    }
+    const { buildCartCarriers } = await import("./floridayCartCarriers.js");
+    const carriers = buildCartCarriers(cartRows.map((cart) => ({
+        cartNumber: cart["cart_number"] ?? null,
+        layersUsed: cart["total_layers_used"] ?? null,
+        items: (Array.isArray(cart["order_cart_items"])
+            ? cart["order_cart_items"]
+            : []).map((i) => ({
+            fulfillmentRequestId: requestByItem.get(String(i["order_item_id"] ?? "")) ?? null,
+            crates: i["crates"] ?? null,
+        })),
+    })), found.requestDetails);
+    if (!carriers.ok) {
+        // Geen stille terugval op 0 lagen: zonder kloppende indeling niet versturen.
+        return { ok: false, code: carriers.code, error: carriers.error, permanent: false };
+    }
     const payload = {
         deliveryOrderId: found.deliveryOrderId,
         fulfillmentRequestIds: found.fulfillmentRequestIds,
+        loadCarriers: carriers.loadCarriers,
     };
     // De hash bewaakt ook de karindeling, zodat een herindeling opnieuw pusht.
     return { ok: true, payload, hash: hashPayload({ payload, indeling }) };