@flowselections/pick-schermen-kwekers 1.0.66 → 1.0.68

package/dist-lib/lib/__tests__/pick167.test.d.ts

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

package/dist-lib/lib/__tests__/pick167.test.d.ts.map

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

package/dist-lib/lib/__tests__/pick167.test.js

@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { stickerLineWithJobs, stickerOpdrachtText } from "../pick161.js";
+import { parseCartStickerBundle } from "../pickStickerBundle.js";
+const tz = "Europe/Amsterdam";
+const now = new Date("2026-10-26T20:50:00Z");
+describe("1.0.67 stickerstatus uit printopdrachten", () => {
+    it("eigen sticker voltooid: nooit 'Geen stickers nodig'", () => {
+        const line = stickerLineWithJobs({ cartId: "c", totaal: 0, inPrintwachtrij: 0, wachtend: 0, geblokkeerd: 0, regels: [] }, [{ id: "j", status: "voltooid", fase: "afleveren", voltooidOp: "2026-10-26T20:45:26Z", geplandOp: null, reden: null }], tz, undefined, now);
+        expect(line).toBe("Sticker geprint 21:45");
+    });
+    it("wacht tot later: Sticker volgt om", () => {
+        expect(stickerOpdrachtText({ id: null, status: "wachtend", fase: null, voltooidOp: null, geplandOp: "2026-10-27T10:15:00Z", reden: null }, tz, now)).toBe("Sticker volgt om 11:15");
+    });
+    it("mislukt: Sticker geweigerd met reden", () => {
+        expect(stickerOpdrachtText({ id: null, status: "mislukt", fase: null, voltooidOp: null, geplandOp: null, reden: "Printer offline" }, tz, now)).toBe("Sticker geweigerd: Printer offline");
+    });
+    it("zonder opdrachten en totaal 0: Geen stickers nodig", () => {
+        expect(stickerLineWithJobs({ cartId: "c", totaal: 0, inPrintwachtrij: 0, wachtend: 0, geblokkeerd: 0, regels: [] }, [], tz)).toBe("Geen stickers nodig voor deze kar");
+    });
+    it("bundel levert opdrachten en tijdzone", () => {
+        const r = parseCartStickerBundle({ toegang: true, tijdzone: tz, karren: [{ cart_id: "c1", toegang: true, stand: { toegang: true, stand: { totaal: 0, regels: [] } }, opdrachten: [{ id: "j1", status: "voltooid" }] }] });
+        expect(r[0].opdrachten?.[0].id).toBe("j1");
+        expect(r[0].tijdzone).toBe(tz);
+    });
+});

package/dist-lib/lib/pick161.d.ts

@@ -24,4 +24,19 @@ export interface StickerPlace {
 export declare function stickerPlaces(s: CartStickerState, uitwijk?: Map<string, Uitwijk>): StickerPlace[];
 /** "6 stickers naar de printer gestuurd op A4-vel (Kantoorprinter)" of "Geen stickers nodig: <reden>". */
 export declare function stickerLine(s: CartStickerState | null, uitwijk?: Map<string, Uitwijk>): string;
+/** 1.0.67: stickerprintopdracht van de kar (ook eigen sticker), uit print_jobs. */
+export interface StickerOpdracht {
+    id: string | null;
+    status: string | null;
+    fase: string | null;
+    voltooidOp: string | null;
+    geplandOp: string | null;
+    reden: string | null;
+}
+export declare function parseStickerOpdrachten(raw: unknown): StickerOpdracht[] | null;
+/** HH:MM in de vestigingstijdzone; zonder bekende tijdzone geen tijd (geen UTC-terugval). */
+export declare function clockText(iso: string | null, tz: string | null): string | null;
+export declare function stickerOpdrachtText(o: StickerOpdracht, tz: string | null, now?: Date): string;
+/** Regel per kar: printopdrachten gaan voor; "Geen stickers nodig" alleen zonder opdracht. */
+export declare function stickerLineWithJobs(s: CartStickerState | null, opdrachten: StickerOpdracht[] | null | undefined, tz: string | null, uitwijk?: Map<string, Uitwijk>, now?: Date): string;
 //# sourceMappingURL=pick161.d.ts.map

package/dist-lib/lib/pick161.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pick161.d.ts","sourceRoot":"","sources":["../../src/lib/pick161.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,YAAY,uCAAuC,CAAC;AAEjE,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAMD,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAE3E;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAG9E;AASD,2FAA2F;AAC3F,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAQlI;AAUD,wBAAgB,cAAc,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,YAAY;IAAG,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAErI,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,EAAE,CAejG;AAMD,0GAA0G;AAC1G,wBAAgB,WAAW,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAY9F"}
+{"version":3,"file":"pick161.d.ts","sourceRoot":"","sources":["../../src/lib/pick161.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,YAAY,uCAAuC,CAAC;AAEjE,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAMD,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAE3E;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAG9E;AASD,2FAA2F;AAC3F,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAQlI;AAUD,wBAAgB,cAAc,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,YAAY;IAAG,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAErI,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,EAAE,CAejG;AAMD,0GAA0G;AAC1G,wBAAgB,WAAW,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAY9F;AAED,mFAAmF;AACnF,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,EAAE,GAAG,IAAI,CAO7E;AAED,6FAA6F;AAC7F,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAS9E;AAID,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,GAAE,IAAiB,GAAG,MAAM,CAazG;AAED,8FAA8F;AAC9F,wBAAgB,mBAAmB,CACjC,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAC1B,UAAU,EAAE,eAAe,EAAE,GAAG,IAAI,GAAG,SAAS,EAChD,EAAE,EAAE,MAAM,GAAG,IAAI,EACjB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,GAAE,IAAiB,GACrB,MAAM,CAOR"}

package/dist-lib/lib/pick161.js

@@ -84,3 +84,54 @@ export function stickerLine(s, uitwijk) {
     })
         .join(" · ");
 }
+export function parseStickerOpdrachten(raw) {
+    if (!Array.isArray(raw))
+        return null;
+    return raw.flatMap((x) => {
+        if (!x || typeof x !== "object")
+            return [];
+        const o = x;
+        return [{ id: str(o["id"]), status: str(o["status"]), fase: str(o["fase"]), voltooidOp: str(o["voltooid_op"]), geplandOp: str(o["gepland_op"]), reden: str(o["reden"]) }];
+    });
+}
+/** HH:MM in de vestigingstijdzone; zonder bekende tijdzone geen tijd (geen UTC-terugval). */
+export function clockText(iso, tz) {
+    if (!iso || !tz)
+        return null;
+    const d = new Date(iso);
+    if (Number.isNaN(d.getTime()))
+        return null;
+    try {
+        return new Intl.DateTimeFormat("nl-NL", { hour: "2-digit", minute: "2-digit", timeZone: tz }).format(d);
+    }
+    catch {
+        return null;
+    }
+}
+const FAILED = new Set(["mislukt", "geweigerd", "fout", "geannuleerd"]);
+export function stickerOpdrachtText(o, tz, now = new Date()) {
+    if (o.status === "voltooid") {
+        const t = clockText(o.voltooidOp, tz);
+        return t ? `Sticker geprint ${t}` : "Sticker geprint";
+    }
+    if (o.status === "geannuleerd" && o.fase === "niet_nodig")
+        return "Sticker niet nodig – de koper wil geen sticker";
+    if (o.status && FAILED.has(o.status))
+        return `Sticker geweigerd: ${o.reden ?? "reden onbekend, meld dit bij kantoor"}`;
+    const plan = o.geplandOp ? new Date(o.geplandOp) : null;
+    if (plan && !Number.isNaN(plan.getTime()) && plan.getTime() > now.getTime()) {
+        const t = clockText(o.geplandOp, tz);
+        if (t)
+            return `Sticker volgt om ${t}`;
+    }
+    return "Sticker wordt geprint";
+}
+/** Regel per kar: printopdrachten gaan voor; "Geen stickers nodig" alleen zonder opdracht. */
+export function stickerLineWithJobs(s, opdrachten, tz, uitwijk, now = new Date()) {
+    const list = Array.isArray(opdrachten) ? opdrachten : [];
+    if (list.length > 0) {
+        const seen = new Set();
+        return list.map((o) => stickerOpdrachtText(o, tz, now)).filter((t) => (seen.has(t) ? false : (seen.add(t), true))).join(" · ");
+    }
+    return stickerLine(s, uitwijk);
+}

package/dist-lib/lib/pickStickerBundle.d.ts

@@ -1,6 +1,7 @@
 import { type CartStickerState, type StickerMelding } from "./pickStickers.js";
 import { type StickerFit } from "./pick150.js";
 import { type Uitwijk } from "./pickUitwijk.js";
+import { type StickerOpdracht } from "./pick161.js";
 export interface CartStickerBundleItem {
     cartId: string;
     toegang: boolean;
@@ -11,6 +12,9 @@ export interface CartStickerBundleItem {
     meldingen: StickerMelding[] | null;
     uitwijk: Map<string, Uitwijk>;
     jobIds: string[];
+    /** null = niet geleverd (oudere functie). */
+    opdrachten: StickerOpdracht[] | null;
+    tijdzone: string | null;
 }
 export declare function parseCartStickerBundle(raw: unknown): CartStickerBundleItem[];
 //# sourceMappingURL=pickStickerBundle.d.ts.map

package/dist-lib/lib/pickStickerBundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pickStickerBundle.d.ts","sourceRoot":"","sources":["../../src/lib/pickStickerBundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0D,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpI,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAMD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,qBAAqB,EAAE,CA0B5E"}
+{"version":3,"file":"pickStickerBundle.d.ts","sourceRoot":"","sources":["../../src/lib/pickStickerBundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0D,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpI,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAEzE,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6CAA6C;IAC7C,UAAU,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAMD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,qBAAqB,EAAE,CA6B5E"}

package/dist-lib/lib/pickStickerBundle.js

@@ -3,19 +3,21 @@
 import { parsePickstationCartSticker, parsePickstationMeldingen } from "./pickStickers.js";
 import { parseStickerFit } from "./pick150.js";
 import { parseUitwijkList } from "./pickUitwijk.js";
+import { parseStickerOpdrachten } from "./pick161.js";
 const rec = (v) => v && typeof v === "object" && !Array.isArray(v) ? v : null;
 const txt = (v) => (typeof v === "string" && v.trim() ? v.trim() : null);
 export function parseCartStickerBundle(raw) {
     const r = rec(raw);
     if (!r || r["toegang"] !== true || !Array.isArray(r["karren"]))
         return [];
+    const tijdzone = txt(r["tijdzone"]);
     return r["karren"].flatMap((x) => {
         const k = rec(x);
         const cartId = txt(k?.["cart_id"]);
         if (!k || !cartId)
             return [];
         if (k["toegang"] !== true) {
-            return [{ cartId, toegang: false, melding: txt(k["melding"]), orderId: null, stand: null, controle: null, meldingen: null, uitwijk: new Map(), jobIds: [] }];
+            return [{ cartId, toegang: false, melding: txt(k["melding"]), orderId: null, stand: null, controle: null, meldingen: null, uitwijk: new Map(), jobIds: [], opdrachten: null, tijdzone }];
         }
         const stand = parsePickstationCartSticker(k["stand"]);
         const jobIds = Array.isArray(stand?.regels)
@@ -31,6 +33,8 @@ export function parseCartStickerBundle(raw) {
                 meldingen: k["meldingen"] == null ? null : parsePickstationMeldingen(k["meldingen"]),
                 uitwijk: parseUitwijkList(k["uitwijk"]),
                 jobIds,
+                opdrachten: parseStickerOpdrachten(k["opdrachten"]),
+                tijdzone,
             }];
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/pick-schermen-kwekers",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "flowselections": {
     "moduleId": "pick-schermen",
     "schema": {

package/schema/pickschermen.sql

@@ -4063,13 +4063,10 @@ BEGIN
 END $function$;
 
 CREATE OR REPLACE FUNCTION public.pickstation_cart_sticker_states(p_slug text, p_cart_ids uuid[])
- RETURNS jsonb
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
+RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public AS $$
 DECLARE v_station uuid; c uuid; v_stand jsonb; v_fit jsonb; v_meld jsonb; v_order uuid;
   v_jobs uuid[]; v_uitwijk jsonb; out jsonb := '[]'::jsonb; v_has_uitwijk boolean;
+  v_opdr jsonb; v_tz text;
 BEGIN
   IF p_slug IS NOT NULL AND btrim(p_slug) <> '' THEN
     SELECT s.id INTO v_station FROM public.pick_stations s WHERE s.slug = p_slug AND s.active IS TRUE LIMIT 1;
@@ -4077,8 +4074,12 @@ BEGIN
   IF v_station IS NULL THEN
     RAISE EXCEPTION 'Dit pickstation is onbekend of niet actief.' USING ERRCODE = '42501';
   END IF;
+  IF to_regprocedure('public.logistics_opening_timezone()') IS NOT NULL THEN
+    BEGIN EXECUTE 'SELECT public.logistics_opening_timezone()::text' INTO v_tz;
+    EXCEPTION WHEN OTHERS THEN v_tz := NULL; END;
+  END IF;
   IF p_cart_ids IS NULL OR cardinality(p_cart_ids) = 0 THEN
-    RETURN jsonb_build_object('toegang', true, 'karren', '[]'::jsonb);
+    RETURN jsonb_build_object('toegang', true, 'tijdzone', v_tz, 'karren', '[]'::jsonb);
   END IF;
   v_has_uitwijk := EXISTS (SELECT 1 FROM information_schema.columns
     WHERE table_schema='public' AND table_name='print_jobs' AND column_name='uitwijk');
@@ -4104,12 +4105,28 @@ BEGIN
         v_meld := public.pickstation_order_sticker_meldingen(p_slug => p_slug, p_order_id => v_order);
       END IF;
     EXCEPTION WHEN OTHERS THEN v_meld := NULL; END;
+    -- Stickerprintopdrachten van deze kar (ook eigen stickers), gekoppeld op cart_id.
+    v_opdr := NULL;
+    BEGIN
+      SELECT coalesce(jsonb_agg(jsonb_build_object(
+          'id', pj.id, 'documenttype', pj.documenttype, 'status', pj.status,
+          'fase', pj.verwerkingsfase, 'voltooid_op', pj.voltooid_op,
+          'gepland_op', coalesce(pj.payload->>'print_op', pj.payload->>'wacht_tot', pj.volgende_poging::text),
+          'reden', coalesce(pj.foutmelding, pj.printnode_bericht),
+          'kopieen', pj.kopieen) ORDER BY pj.created_at), '[]'::jsonb)
+        INTO v_opdr
+        FROM public.print_jobs pj
+       WHERE pj.payload->>'cart_id' = c::text
+         AND pj.documenttype ILIKE '%sticker%';
+    EXCEPTION WHEN OTHERS THEN v_opdr := NULL; END;
     v_uitwijk := '[]'::jsonb;
     IF v_has_uitwijk THEN
       BEGIN
-        SELECT array_agg(DISTINCT (r->>'printJobId')::uuid) INTO v_jobs
-          FROM jsonb_array_elements(coalesce(v_stand->'stand'->'regels', '[]'::jsonb)) r
-         WHERE coalesce(r->>'printJobId', '') ~ '^[0-9a-fA-F-]{36}$';
+        SELECT array_agg(DISTINCT j) INTO v_jobs FROM (
+          SELECT (r->>'printJobId')::uuid j
+            FROM jsonb_array_elements(coalesce(v_stand->'stand'->'regels', '[]'::jsonb)) r
+           WHERE coalesce(r->>'printJobId', '') ~ '^[0-9a-fA-F-]{36}$'
+          UNION SELECT (o->>'id')::uuid FROM jsonb_array_elements(coalesce(v_opdr, '[]'::jsonb)) o) q;
         IF v_jobs IS NOT NULL THEN
           EXECUTE 'SELECT coalesce(jsonb_agg(jsonb_build_object(''id'', id, ''uitwijk'', uitwijk)), ''[]''::jsonb)
                      FROM public.print_jobs WHERE id = ANY($1) AND uitwijk IS NOT NULL'
@@ -4118,10 +4135,10 @@ BEGIN
       EXCEPTION WHEN OTHERS THEN v_uitwijk := '[]'::jsonb; END;
     END IF;
     out := out || jsonb_build_array(jsonb_build_object('cart_id', c, 'toegang', true, 'order_id', v_order,
-      'stand', v_stand, 'controle', v_fit, 'meldingen', v_meld, 'uitwijk', v_uitwijk));
+      'stand', v_stand, 'controle', v_fit, 'meldingen', v_meld, 'uitwijk', v_uitwijk, 'opdrachten', v_opdr));
   END LOOP;
-  RETURN jsonb_build_object('toegang', true, 'karren', out);
-END $function$;
+  RETURN jsonb_build_object('toegang', true, 'tijdzone', v_tz, 'karren', out);
+END $$;
 
 CREATE OR REPLACE FUNCTION public.pickstation_device_status(p_slug text, p_device_key text)
  RETURNS jsonb