@flowselections/logistiek-engine 1.0.94 → 1.0.99

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

@@ -6,6 +6,8 @@ export interface ControlScanRun {
     failed: number;
     errors: string[];
 }
+/** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
+export declare const CONTROL_SCAN_MAX_ATTEMPTS = 60;
 export declare function runControlScanQueue(sb: SupabaseClient, options?: {
     limit?: number;
 }): Promise<ControlScanRun>;

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

@@ -1 +1 @@
-{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAmCD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAoLzB"}
+{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAwC5C,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAmKzB"}

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

@@ -14,6 +14,9 @@
 // en dubbele scans worden al in de database geblokkeerd. Geen omgevings- of
 // klantwaarden in deze code; de printer komt uit de werkwijze in de database.
 // ============================================================================
+import { printViaLayout } from "./layoutPrint.server.js";
+/** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
+export const CONTROL_SCAN_MAX_ATTEMPTS = 60;
 function pickPdf(result) {
     const base64 = result["pdfBase64"] ??
         result["base64"] ??
@@ -25,12 +28,28 @@ function pickPdf(result) {
         null;
     return { base64: base64 ?? null, url: url ?? null };
 }
-/** Zet de wachtende controle terug in de wachtrij zonder pogingen op te tellen. */
-async function keepWaiting(sb, id) {
+/**
+ * Laat de controle wachten op Floriday. Pogingen blijven meetellen; na het
+ * maximum eindigt de controle als mislukt in plaats van eeuwig te wachten.
+ * Geeft true terug als de controle nu terminaal is afgesloten.
+ */
+async function keepWaiting(sb, row) {
+    const attempts = Number(row.attempts ?? 0);
+    if (attempts >= CONTROL_SCAN_MAX_ATTEMPTS) {
+        await sb.rpc("logistics_control_scan_finish", {
+            _id: row.id,
+            _ok: false,
+            _status: "mislukt",
+            _error_code: "wachtlimiet",
+            _error: `Na ${attempts} pogingen kende Floriday deze order nog steeds niet; de controle is gestopt. Controleer de order in Floriday en scan opnieuw.`,
+        });
+        return true;
+    }
     await sb
         .from("logistics_control_scan")
-        .update({ locked_until: null, attempts: 0, updated_at: new Date().toISOString() })
-        .eq("id", id);
+        .update({ locked_until: null, updated_at: new Date().toISOString() })
+        .eq("id", row.id);
+    return false;
 }
 export async function runControlScanQueue(sb, options = {}) {
     const run = { claimed: 0, printed: 0, waiting: 0, failed: 0, errors: [] };
@@ -88,8 +107,10 @@ export async function runControlScanQueue(sb, options = {}) {
                 continue;
             }
             if (!fulfillmentOrderId) {
-                await keepWaiting(sb, row.id);
-                run.waiting++;
+                if (await keepWaiting(sb, row))
+                    run.failed++;
+                else
+                    run.waiting++;
                 continue;
             }
             const doc = (await getFlorydayDocument(sb, {
@@ -122,54 +143,39 @@ export async function runControlScanQueue(sb, options = {}) {
                 run.failed++;
                 continue;
             }
-            // Idempotent: per controle hooguit een printjob.
-            const idempotentie = `controle-scan:${row.id}`;
-            const { data: bestaand } = await sb
-                .from("print_jobs")
-                .select("id")
-                .eq("idempotentie_sleutel", idempotentie)
-                .maybeSingle();
-            let jobId = bestaand?.["id"] ?? null;
-            if (!jobId) {
-                const { data: job, error: jobError } = await sb
-                    .from("print_jobs")
-                    .insert({
-                    printer_id: row.printer_id,
-                    documenttype: "afleverbrief",
-                    documentnaam: `Afleverbrief ${row.order_number}`,
-                    status: "wachtend",
-                    idempotentie_sleutel: idempotentie,
-                    pdf_base64: base64,
-                    pdf_url: url,
-                    herkomst: "logistiek-engine",
-                    gebruiker_naam: "Controle scan",
-                    payload: {
-                        source: "controle_scan",
-                        is_floriday: true,
-                        order_id: row.order_id,
-                        order_number: row.order_number,
-                        cart_id: row.cart_id,
-                        fulfillment_order_id: fulfillmentOrderId,
-                        printer_id: row.printer_id,
-                        control_scan_id: row.id,
-                    },
-                })
-                    .select("id")
-                    .maybeSingle();
-                if (jobError) {
-                    await sb.rpc("logistics_control_scan_finish", {
-                        _id: row.id,
-                        _ok: false,
-                        _status: "mislukt",
-                        _fulfillment_order_id: fulfillmentOrderId,
-                        _error_code: "printjob",
-                        _error: `De afleverbrief kon niet worden klaargezet om te printen: ${jobError.message}`,
-                    });
-                    run.failed++;
-                    continue;
-                }
-                jobId = job?.["id"] ?? null;
+            // Via de Layout maker; idempotent per controle.
+            const printed = await printViaLayout(sb, {
+                documenttype: "afleverbrief",
+                documentnaam: `Afleverbrief ${row.order_number}`,
+                pdfBase64: base64,
+                pdfUrl: url,
+                printPlekId: null,
+                herkomst: "floriday",
+                idempotentieSleutel: `controle-scan:${row.id}`,
+                payload: {
+                    source: "controle_scan",
+                    is_floriday: true,
+                    order_id: row.order_id,
+                    ordernummer: row.order_number,
+                    order_number: row.order_number,
+                    cart_id: row.cart_id,
+                    fulfillment_order_id: fulfillmentOrderId,
+                    control_scan_id: row.id,
+                },
+            });
+            if (!printed.ok) {
+                await sb.rpc("logistics_control_scan_finish", {
+                    _id: row.id,
+                    _ok: false,
+                    _status: "mislukt",
+                    _fulfillment_order_id: fulfillmentOrderId,
+                    _error_code: printed.errorCode.toLowerCase(),
+                    _error: printed.error,
+                });
+                run.failed++;
+                continue;
             }
+            const jobId = printed.jobId;
             await sb.rpc("logistics_control_scan_finish", {
                 _id: row.id,
                 _ok: true,

package/dist-lib/lib/expandGroups.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=expandGroups.test.d.ts.map

package/dist-lib/lib/expandGroups.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expandGroups.test.d.ts","sourceRoot":"","sources":["../../src/lib/expandGroups.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/expandGroups.test.js

@@ -0,0 +1,80 @@
+import { describe, expect, it } from "vitest";
+import { expandOrderItemsForPlanner } from "./loadCarrierPlanning.server";
+function stub(tables) {
+    return {
+        from(table) {
+            let rows = [...(tables[table] ?? [])];
+            const b = {
+                select: () => b,
+                order: () => b,
+                in: (col, vals) => {
+                    rows = rows.filter((r) => vals.includes(r[col]));
+                    return b;
+                },
+                eq: (col, v) => {
+                    rows = rows.filter((r) => r[col] === v);
+                    return b;
+                },
+                or: (expr) => {
+                    const conds = expr.split(",").map((c) => {
+                        const [col, , ...rest] = c.split(".");
+                        return [col, rest.join(".")];
+                    });
+                    rows = rows.filter((r) => conds.some(([col, v]) => String(r[col]) === v));
+                    return b;
+                },
+                then: (res) => res({ data: rows }),
+            };
+            return b;
+        },
+    };
+}
+const GERBERA = "11111111-1111-4111-8111-111111111111";
+const GROUP = "22222222-2222-4222-8222-222222222222";
+const KOPIE = "33333333-3333-4333-8333-333333333333";
+const ONBEKEND = "44444444-4444-4444-8444-444444444444";
+const products = [
+    { id: GERBERA, product: "Gerbera Red Naomi #9", floriday_trade_item_id: GERBERA, plants_per_crate: 20, crates_per_layer: 8, layers_per_cart: 12 },
+    { id: KOPIE, product: "Flow Selections plant (kopie)", floriday_trade_item_id: KOPIE, plants_per_crate: 6, crates_per_layer: 6, layers_per_cart: 6 },
+];
+describe("expandOrderItemsForPlanner — productgroepen", () => {
+    it("gekoppeld artikel gaat voor een productgroep met dezelfde naam", async () => {
+        const sb = stub({
+            products,
+            product_groups: [{ id: GROUP, name: "Gerbera Red Naomi #9" }],
+            product_group_items: [{ product_group_id: GROUP, trade_item_id: KOPIE, quantity: 1, sort_order: 0 }],
+        });
+        const out = await expandOrderItemsForPlanner(sb, [
+            {
+                id: "regel-1",
+                order_id: "o1",
+                product_id: GERBERA,
+                product_name: "Gerbera Red Naomi #9",
+                quantity: 240,
+                products: products[0],
+            },
+        ]);
+        expect(out).toHaveLength(1);
+        expect(out[0].product_id).toBe(GERBERA);
+        expect(out[0].product_name).toBe("Gerbera Red Naomi #9");
+        expect(out[0].plants).toBe(240);
+    });
+    it("onbekend groepslid krijgt geen id als naam en blokkeert", async () => {
+        const sources = new Map();
+        const sb = stub({
+            products,
+            product_groups: [{ id: GROUP, name: "Mix" }],
+            product_group_items: [
+                { product_group_id: GROUP, trade_item_id: ONBEKEND, quantity: 1, sort_order: 0 },
+                { product_group_id: GROUP, trade_item_id: KOPIE, quantity: 1, sort_order: 1 },
+            ],
+        });
+        const out = await expandOrderItemsForPlanner(sb, [{ id: "regel-2", order_id: "o1", product_id: GROUP, product_name: "Mix", quantity: 12 }], { sources: sources });
+        for (const i of out)
+            expect(i.product_name).not.toContain(ONBEKEND);
+        const onbekend = out.find((i) => i.order_item_id === `regel-2::${ONBEKEND}`);
+        expect(onbekend?.product_id ?? null).toBeNull();
+        expect(onbekend?.product_name).toBe("Mix — onbekend groepslid");
+        expect(sources.get(`regel-2::${ONBEKEND}`)).toBe("geen");
+    });
+});

package/dist-lib/lib/floridayDocuments.functions.d.ts

@@ -16107,18 +16107,24 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 Row: {
                     id: boolean;
                     last_cleanup_at: string | null;
+                    last_error: string | null;
+                    last_error_at: string | null;
                     last_sync_at: string | null;
                     updated_at: string;
                 };
                 Insert: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
                 Update: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
@@ -26392,6 +26398,27 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 };
                 Returns: boolean;
             };
+            layout_print_document: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst?: string;
+                    _idempotentie_sleutel?: string;
+                    _is_herprint?: boolean;
+                    _kopieen?: number;
+                    _layout_id?: string;
+                    _payload?: import("../integrations/supabase/types").Json;
+                    _pdf_base64?: string;
+                    _pdf_url?: string;
+                    _print_plek_id?: string;
+                    _werkplek?: string;
+                };
+                Returns: {
+                    bestaand: boolean;
+                    job_id: string;
+                    printer_id: string;
+                }[];
+            };
             list_medewerkers: {
                 Args: never;
                 Returns: {
@@ -27094,6 +27121,13 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_control_scan_print_own: {
+                Args: {
+                    p_is_herprint?: boolean;
+                    p_scan_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_control_scan_retry: {
                 Args: {
                     _id: string;
@@ -27998,6 +28032,21 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_print_via_layout: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst: string;
+                    _idempotentie_sleutel: string;
+                    _is_herprint: boolean;
+                    _layout_id: string;
+                    _payload: import("../integrations/supabase/types").Json;
+                    _pdf_base64: string;
+                    _pdf_url: string;
+                    _print_plek_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_prune_buffer_member_queue: {
                 Args: never;
                 Returns: number;
@@ -28353,6 +28402,12 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 };
                 Returns: undefined;
             };
+            logistics_slip_note_retry: {
+                Args: {
+                    _id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_sticker_follows_slip: {
                 Args: never;
                 Returns: boolean;
@@ -29097,6 +29152,10 @@ export declare const getFloridayConnection: import("@tanstack/start-client-core"
                 };
                 Returns: string;
             };
+            pick_is_reference_admin: {
+                Args: never;
+                Returns: boolean;
+            };
             pick_mark_printed: {
                 Args: {
                     _queue_item_id: string;
@@ -47264,18 +47323,24 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 Row: {
                     id: boolean;
                     last_cleanup_at: string | null;
+                    last_error: string | null;
+                    last_error_at: string | null;
                     last_sync_at: string | null;
                     updated_at: string;
                 };
                 Insert: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
                 Update: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
@@ -57549,6 +57614,27 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 };
                 Returns: boolean;
             };
+            layout_print_document: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst?: string;
+                    _idempotentie_sleutel?: string;
+                    _is_herprint?: boolean;
+                    _kopieen?: number;
+                    _layout_id?: string;
+                    _payload?: import("../integrations/supabase/types").Json;
+                    _pdf_base64?: string;
+                    _pdf_url?: string;
+                    _print_plek_id?: string;
+                    _werkplek?: string;
+                };
+                Returns: {
+                    bestaand: boolean;
+                    job_id: string;
+                    printer_id: string;
+                }[];
+            };
             list_medewerkers: {
                 Args: never;
                 Returns: {
@@ -58251,6 +58337,13 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_control_scan_print_own: {
+                Args: {
+                    p_is_herprint?: boolean;
+                    p_scan_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_control_scan_retry: {
                 Args: {
                     _id: string;
@@ -59155,6 +59248,21 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_print_via_layout: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst: string;
+                    _idempotentie_sleutel: string;
+                    _is_herprint: boolean;
+                    _layout_id: string;
+                    _payload: import("../integrations/supabase/types").Json;
+                    _pdf_base64: string;
+                    _pdf_url: string;
+                    _print_plek_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_prune_buffer_member_queue: {
                 Args: never;
                 Returns: number;
@@ -59510,6 +59618,12 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 };
                 Returns: undefined;
             };
+            logistics_slip_note_retry: {
+                Args: {
+                    _id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_sticker_follows_slip: {
                 Args: never;
                 Returns: boolean;
@@ -60254,6 +60368,10 @@ export declare const fetchLogisticsDocument: import("@tanstack/start-client-core
                 };
                 Returns: string;
             };
+            pick_is_reference_admin: {
+                Args: never;
+                Returns: boolean;
+            };
             pick_mark_printed: {
                 Args: {
                     _queue_item_id: string;
@@ -78454,18 +78572,24 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 Row: {
                     id: boolean;
                     last_cleanup_at: string | null;
+                    last_error: string | null;
+                    last_error_at: string | null;
                     last_sync_at: string | null;
                     updated_at: string;
                 };
                 Insert: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
                 Update: {
                     id?: boolean;
                     last_cleanup_at?: string | null;
+                    last_error?: string | null;
+                    last_error_at?: string | null;
                     last_sync_at?: string | null;
                     updated_at?: string;
                 };
@@ -88739,6 +88863,27 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 };
                 Returns: boolean;
             };
+            layout_print_document: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst?: string;
+                    _idempotentie_sleutel?: string;
+                    _is_herprint?: boolean;
+                    _kopieen?: number;
+                    _layout_id?: string;
+                    _payload?: import("../integrations/supabase/types").Json;
+                    _pdf_base64?: string;
+                    _pdf_url?: string;
+                    _print_plek_id?: string;
+                    _werkplek?: string;
+                };
+                Returns: {
+                    bestaand: boolean;
+                    job_id: string;
+                    printer_id: string;
+                }[];
+            };
             list_medewerkers: {
                 Args: never;
                 Returns: {
@@ -89441,6 +89586,13 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_control_scan_print_own: {
+                Args: {
+                    p_is_herprint?: boolean;
+                    p_scan_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_control_scan_retry: {
                 Args: {
                     _id: string;
@@ -90345,6 +90497,21 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 };
                 Returns: import("../integrations/supabase/types").Json;
             };
+            logistics_print_via_layout: {
+                Args: {
+                    _documentnaam: string;
+                    _documenttype: string;
+                    _herkomst: string;
+                    _idempotentie_sleutel: string;
+                    _is_herprint: boolean;
+                    _layout_id: string;
+                    _payload: import("../integrations/supabase/types").Json;
+                    _pdf_base64: string;
+                    _pdf_url: string;
+                    _print_plek_id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_prune_buffer_member_queue: {
                 Args: never;
                 Returns: number;
@@ -90700,6 +90867,12 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 };
                 Returns: undefined;
             };
+            logistics_slip_note_retry: {
+                Args: {
+                    _id: string;
+                };
+                Returns: import("../integrations/supabase/types").Json;
+            };
             logistics_sticker_follows_slip: {
                 Args: never;
                 Returns: boolean;
@@ -91444,6 +91617,10 @@ export declare const fetchMergedLogisticsDocuments: import("@tanstack/start-clie
                 };
                 Returns: string;
             };
+            pick_is_reference_admin: {
+                Args: never;
+                Returns: boolean;
+            };
             pick_mark_printed: {
                 Args: {
                     _queue_item_id: string;