@flowselections/floriday-authenticatie-module 1.0.40 → 1.0.42

package/dist-lib/lib/floriday-auto-process.server.js

@@ -18,6 +18,7 @@
 // ============================================================================
 import { florydayWrite, getActiveFlorydayCredentials, getActiveFlorydayEnvironment, } from "./floriday.functions.js";
 import { computeAutoProcessDate, isPickdayToday } from "./planning-helpers.js";
+import { buildFulfillmentOrderBody, detectFulfillmentState, } from "./gateway/fulfillment-order-body.js";
 // ─── Helpers ────────────────────────────────────────────────────────────────
 async function readSalesOrderFromCache(supabase, connectionId, salesOrderId) {
     const { data } = await supabase
@@ -90,24 +91,6 @@ async function logPhase(supabase, connectionId, salesOrderId, status, extra = {}
         p_fulfillment_order_id: extra.fulfillmentOrderId ?? null,
     });
 }
-/**
- * Haal `numberOfPackages` uit een fulfillmentRequest, met een reeks
- * fallbacks voor licht afwijkende schema-varianten.
- */
-function extractPackageCount(req) {
-    const candidates = [
-        req?.numberOfPackages,
-        req?.packageCount,
-        req?.numberOfLoadCarriers,
-        req?.quantity,
-    ];
-    for (const c of candidates) {
-        const n = Number(c);
-        if (Number.isFinite(n) && n > 0)
-            return n;
-    }
-    return 1;
-}
 // ─── Publieke API ───────────────────────────────────────────────────────────
 /**
  * Voert de state-machine één stap uit voor een enkele sales-order. Idempotent
@@ -233,33 +216,81 @@ export async function runAutoProcess(supabase, input) {
     }
     // ─ Actie: POST /fulfillment-orders ───────────────────────────────────────
     await logPhase(supabase, conn.id, salesOrderId, "sending_fulfillment");
-    const fulfillmentRequests = doMatch.fulfillmentRequests
-        .map((r) => {
-        const fulfillmentRequestId = r?.fulfillmentRequestId ?? r?.id ?? r?.requestId;
-        if (!fulfillmentRequestId)
-            return null;
+    const requestIds = doMatch.fulfillmentRequests
+        .map((r) => r?.fulfillmentRequestId ?? r?.id)
+        .filter(Boolean)
+        .map((id) => String(id));
+    // Zelfde detectie als de gateway: één functie, twee bronnen, één uitkomst.
+    const detection = await detectFulfillmentState(supabase, {
+        connectionId: conn.id,
+        deliveryOrderId,
+        deliveryOrderData: doMatch.data,
+        fulfillmentRequestIds: requestIds,
+    });
+    if (detection.code === "already_fulfilled") {
+        await logPhase(supabase, conn.id, salesOrderId, "done", {
+            code: "already_fulfilled",
+            source: detection.source,
+            fulfillmentOrderId: detection.fulfillmentOrderId,
+        });
         return {
+            ok: true,
+            status: "done",
+            salesOrderId,
             deliveryOrderId,
-            fulfillmentRequestId,
-            numberOfPackages: extractPackageCount(r),
+            code: "already_fulfilled",
+            reason: "already_fulfilled_at_floriday",
+            fulfillmentOrderId: detection.fulfillmentOrderId,
         };
-    })
-        .filter(Boolean);
-    if (fulfillmentRequests.length === 0) {
+    }
+    if (detection.code === "delivery_order_not_cached") {
         await logPhase(supabase, conn.id, salesOrderId, "error", {
-            error: "Delivery-order bevat geen fulfillmentRequests voor deze sales-order",
+            code: "delivery_order_not_cached",
         });
         return {
             ok: false,
             status: "error",
             salesOrderId,
             deliveryOrderId,
-            error: "Geen fulfillmentRequests gevonden in delivery-order",
+            code: "delivery_order_not_cached",
+            error: detection.message,
         };
     }
-    const body = {
-        loadCarrierItems: [{ fulfillmentRequests }],
-    };
+    const built = await buildFulfillmentOrderBody(supabase, {
+        connectionId: conn.id,
+        deliveryOrderId,
+        deliveryOrderData: doMatch.data,
+        fulfillmentRequestIds: requestIds,
+    });
+    if (built.kind === "already_fulfilled") {
+        await logPhase(supabase, conn.id, salesOrderId, "done", {
+            code: "already_fulfilled",
+            source: built.source,
+            fulfillmentOrderId: built.fulfillmentOrderId,
+        });
+        return {
+            ok: true,
+            status: "done",
+            salesOrderId,
+            deliveryOrderId,
+            code: "already_fulfilled",
+            reason: "already_fulfilled_at_floriday",
+            fulfillmentOrderId: built.fulfillmentOrderId,
+        };
+    }
+    if (built.kind === "error") {
+        await logPhase(supabase, conn.id, salesOrderId, "error", {
+            error: built.error,
+        });
+        return {
+            ok: false,
+            status: "error",
+            salesOrderId,
+            deliveryOrderId,
+            error: built.error,
+        };
+    }
+    const body = built.body;
     const foResult = await florydayWrite(supabase, env, {
         module: "auto-process",
         action: "send-fulfillment-order",

package/dist-lib/lib/floriday-labels.functions.d.ts

@@ -687,6 +687,99 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                 };
                 Relationships: [];
             };
+            artikelen_cache: {
+                Row: {
+                    artikelcode: string;
+                    bron: string;
+                    bruto_prijs_cent: number | null;
+                    created_at: string;
+                    eenheid: string;
+                    fabrikant: string | null;
+                    fetched_at: string;
+                    gtin: string | null;
+                    id: string;
+                    naam: string;
+                    netto_prijs_cent: number | null;
+                    omschrijving: string | null;
+                    raw: import("../integrations/supabase/types.js").Json;
+                    updated_at: string;
+                    valuta: string;
+                };
+                Insert: {
+                    artikelcode: string;
+                    bron?: string;
+                    bruto_prijs_cent?: number | null;
+                    created_at?: string;
+                    eenheid?: string;
+                    fabrikant?: string | null;
+                    fetched_at?: string;
+                    gtin?: string | null;
+                    id?: string;
+                    naam: string;
+                    netto_prijs_cent?: number | null;
+                    omschrijving?: string | null;
+                    raw?: import("../integrations/supabase/types.js").Json;
+                    updated_at?: string;
+                    valuta?: string;
+                };
+                Update: {
+                    artikelcode?: string;
+                    bron?: string;
+                    bruto_prijs_cent?: number | null;
+                    created_at?: string;
+                    eenheid?: string;
+                    fabrikant?: string | null;
+                    fetched_at?: string;
+                    gtin?: string | null;
+                    id?: string;
+                    naam?: string;
+                    netto_prijs_cent?: number | null;
+                    omschrijving?: string | null;
+                    raw?: import("../integrations/supabase/types.js").Json;
+                    updated_at?: string;
+                    valuta?: string;
+                };
+                Relationships: [];
+            };
+            artikelen_veldconfig: {
+                Row: {
+                    bron_pad: string;
+                    created_at: string;
+                    id: string;
+                    label: string;
+                    sort_order: number;
+                    type: string;
+                    updated_at: string;
+                    veld_key: string;
+                    zichtbaar_in_detail: boolean;
+                    zichtbaar_in_lijst: boolean;
+                };
+                Insert: {
+                    bron_pad: string;
+                    created_at?: string;
+                    id?: string;
+                    label: string;
+                    sort_order?: number;
+                    type?: string;
+                    updated_at?: string;
+                    veld_key: string;
+                    zichtbaar_in_detail?: boolean;
+                    zichtbaar_in_lijst?: boolean;
+                };
+                Update: {
+                    bron_pad?: string;
+                    created_at?: string;
+                    id?: string;
+                    label?: string;
+                    sort_order?: number;
+                    type?: string;
+                    updated_at?: string;
+                    veld_key?: string;
+                    zichtbaar_in_detail?: boolean;
+                    zichtbaar_in_lijst?: boolean;
+                };
+                Relationships: [];
+            };
             booking_items: {
                 Row: {
                     booking_id: string;
@@ -3159,6 +3252,48 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                 };
                 Relationships: [];
             };
+            document_printplek_printers: {
+                Row: {
+                    created_at: string;
+                    documenttype: string;
+                    id: string;
+                    papierformaat: string | null;
+                    print_plek_id: string;
+                    printer_id: string | null;
+                    updated_at: string;
+                };
+                Insert: {
+                    created_at?: string;
+                    documenttype: string;
+                    id?: string;
+                    papierformaat?: string | null;
+                    print_plek_id: string;
+                    printer_id?: string | null;
+                    updated_at?: string;
+                };
+                Update: {
+                    created_at?: string;
+                    documenttype?: string;
+                    id?: string;
+                    papierformaat?: string | null;
+                    print_plek_id?: string;
+                    printer_id?: string | null;
+                    updated_at?: string;
+                };
+                Relationships: [{
+                    foreignKeyName: "document_printplek_printers_print_plek_id_fkey";
+                    columns: ["print_plek_id"];
+                    isOneToOne: false;
+                    referencedRelation: "print_plekken";
+                    referencedColumns: ["id"];
+                }, {
+                    foreignKeyName: "document_printplek_printers_printer_id_fkey";
+                    columns: ["printer_id"];
+                    isOneToOne: false;
+                    referencedRelation: "printers";
+                    referencedColumns: ["id"];
+                }];
+            };
             document_werkplek_printers: {
                 Row: {
                     created_at: string;
@@ -9140,6 +9275,7 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     last_error_at: string | null;
                     last_error_code: string | null;
                     last_gateway_status: number | null;
+                    last_queued_at: string | null;
                     last_response: import("../integrations/supabase/types.js").Json | null;
                     last_sent_hash: string | null;
                     locked_by: string | null;
@@ -9163,6 +9299,7 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     last_error_at?: string | null;
                     last_error_code?: string | null;
                     last_gateway_status?: number | null;
+                    last_queued_at?: string | null;
                     last_response?: import("../integrations/supabase/types.js").Json | null;
                     last_sent_hash?: string | null;
                     locked_by?: string | null;
@@ -9186,6 +9323,7 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     last_error_at?: string | null;
                     last_error_code?: string | null;
                     last_gateway_status?: number | null;
+                    last_queued_at?: string | null;
                     last_response?: import("../integrations/supabase/types.js").Json | null;
                     last_sent_hash?: string | null;
                     locked_by?: string | null;
@@ -13356,6 +13494,99 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     referencedColumns: ["id"];
                 }];
             };
+            print_plek_computers: {
+                Row: {
+                    computer_naam: string;
+                    created_at: string;
+                    id: string;
+                    print_plek_id: string;
+                    updated_at: string;
+                };
+                Insert: {
+                    computer_naam: string;
+                    created_at?: string;
+                    id?: string;
+                    print_plek_id: string;
+                    updated_at?: string;
+                };
+                Update: {
+                    computer_naam?: string;
+                    created_at?: string;
+                    id?: string;
+                    print_plek_id?: string;
+                    updated_at?: string;
+                };
+                Relationships: [{
+                    foreignKeyName: "print_plek_computers_print_plek_id_fkey";
+                    columns: ["print_plek_id"];
+                    isOneToOne: false;
+                    referencedRelation: "print_plekken";
+                    referencedColumns: ["id"];
+                }];
+            };
+            print_plek_koppelingen: {
+                Row: {
+                    bron: string;
+                    bron_id: string;
+                    created_at: string;
+                    id: string;
+                    label: string | null;
+                    print_plek_id: string;
+                    updated_at: string;
+                };
+                Insert: {
+                    bron: string;
+                    bron_id: string;
+                    created_at?: string;
+                    id?: string;
+                    label?: string | null;
+                    print_plek_id: string;
+                    updated_at?: string;
+                };
+                Update: {
+                    bron?: string;
+                    bron_id?: string;
+                    created_at?: string;
+                    id?: string;
+                    label?: string | null;
+                    print_plek_id?: string;
+                    updated_at?: string;
+                };
+                Relationships: [{
+                    foreignKeyName: "print_plek_koppelingen_print_plek_id_fkey";
+                    columns: ["print_plek_id"];
+                    isOneToOne: false;
+                    referencedRelation: "print_plekken";
+                    referencedColumns: ["id"];
+                }];
+            };
+            print_plekken: {
+                Row: {
+                    actief: boolean;
+                    created_at: string;
+                    id: string;
+                    naam: string;
+                    omschrijving: string | null;
+                    updated_at: string;
+                };
+                Insert: {
+                    actief?: boolean;
+                    created_at?: string;
+                    id?: string;
+                    naam: string;
+                    omschrijving?: string | null;
+                    updated_at?: string;
+                };
+                Update: {
+                    actief?: boolean;
+                    created_at?: string;
+                    id?: string;
+                    naam?: string;
+                    omschrijving?: string | null;
+                    updated_at?: string;
+                };
+                Relationships: [];
+            };
             print_queue_runners: {
                 Row: {
                     actief: boolean;
@@ -21104,6 +21335,24 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                 };
                 Returns: string;
             };
+            logistics_floriday_finish_push_v3: {
+                Args: {
+                    _error?: string;
+                    _error_code?: string;
+                    _fulfillment_order_id?: string;
+                    _gateway_status?: number;
+                    _id: string;
+                    _max_age_hours?: number;
+                    _max_attempts?: number;
+                    _outcome: string;
+                    _permanent?: boolean;
+                    _response?: import("../integrations/supabase/types.js").Json;
+                    _revision: number;
+                    _sent_hash?: string;
+                    _wait_max_age_hours?: number;
+                };
+                Returns: string;
+            };
             logistics_floriday_prune_pushes: {
                 Args: {
                     _days?: number;
@@ -21739,6 +21988,14 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                 };
                 Returns: import("../integrations/supabase/types.js").Json;
             };
+            pick_print_plekken: {
+                Args: never;
+                Returns: {
+                    id: string;
+                    naam: string;
+                    omschrijving: string;
+                }[];
+            };
             pick_release_expired_locks: {
                 Args: never;
                 Returns: number;
@@ -21803,6 +22060,13 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     isSetofReturn: false;
                 };
             };
+            pick_set_station_print_plek: {
+                Args: {
+                    _print_plek_id: string;
+                    _station_id: string;
+                };
+                Returns: string;
+            };
             pick_station_dashboard: {
                 Args: never;
                 Returns: {
@@ -21815,6 +22079,25 @@ export declare const getFlorydayLogisticLabel: import("@tanstack/start-client-co
                     waiting: number;
                 }[];
             };
+            pick_station_print_plek: {
+                Args: {
+                    _station_id: string;
+                };
+                Returns: {
+                    naam: string;
+                    omschrijving: string;
+                    print_plek_id: string;
+                }[];
+            };
+            pick_station_print_plekken: {
+                Args: never;
+                Returns: {
+                    naam: string;
+                    omschrijving: string;
+                    print_plek_id: string;
+                    station_id: string;
+                }[];
+            };
             pick_station_slugify: {
                 Args: {
                     _id: string;