@flowselections/logistiek-engine 1.0.240 → 1.0.241

package/db/schema/logistiek-engine.sql

@@ -43510,3 +43510,759 @@ BEGIN
         FROM (SELECT categorie, count(*) n FROM public.logistics_merge_herstel_log GROUP BY 1) h));
 END $$;
 
+-- ===== 2026-11-10c: ophaalmoment, samenvoegen volgens buffergroep =====
+-- 1.0.239 (schema 2026-11-10c): ophaalmoment per order uit de werkwijze, samenvoegen volgens de buffergroep.
+
+ALTER TABLE public.logistics_pickup_moments ADD COLUMN IF NOT EXISTS carrier_id uuid;
+ALTER TABLE public.logistics_pickup_moments ADD COLUMN IF NOT EXISTS pickup_days integer;
+ALTER TABLE public.logistics_pickup_moments ADD COLUMN IF NOT EXISTS signup_days integer;
+ALTER TABLE public.logistics_pickup_moments ADD COLUMN IF NOT EXISTS signup_time time without time zone;
+CREATE INDEX IF NOT EXISTS logistics_pickup_moments_carrier_dag_idx ON public.logistics_pickup_moments (carrier_id, moment_date);
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_carrier_uit_naam(p_naam text)
+RETURNS uuid LANGUAGE sql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+  SELECT CASE WHEN count(*) = 1 THEN (array_agg(c.id))[1] END
+    FROM public.carriers c
+   WHERE c.archived_at IS NULL
+     AND nullif(btrim(p_naam), '') IS NOT NULL
+     AND lower(btrim(c.name)) = lower(btrim(p_naam));
+$$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_carrier_uit_naam(text) FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_carrier_uit_naam(text) TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_moments_koppel_trg()
+RETURNS trigger LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+BEGIN
+  IF NEW.carrier_id IS NULL AND NEW.carrier_ref IS NOT NULL THEN
+    NEW.carrier_id := public.logistics_pickup_carrier_uit_naam(NEW.carrier_ref);
+  END IF;
+  RETURN NEW;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_moments_koppel_trg() FROM PUBLIC, anon, authenticated;
+DROP TRIGGER IF EXISTS trg_logistics_pickup_moments_koppel ON public.logistics_pickup_moments;
+CREATE TRIGGER trg_logistics_pickup_moments_koppel
+  BEFORE INSERT OR UPDATE OF carrier_ref, carrier_id ON public.logistics_pickup_moments
+  FOR EACH ROW EXECUTE FUNCTION public.logistics_pickup_moments_koppel_trg();
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_moments_koppel()
+RETURNS integer LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE n int;
+BEGIN
+  UPDATE public.logistics_pickup_moments p
+     SET carrier_id = public.logistics_pickup_carrier_uit_naam(p.carrier_ref)
+   WHERE p.carrier_id IS NULL AND p.carrier_ref IS NOT NULL
+     AND public.logistics_pickup_carrier_uit_naam(p.carrier_ref) IS NOT NULL;
+  GET DIAGNOSTICS n = ROW_COUNT;
+  RETURN n;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_moments_koppel() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_moments_koppel() TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_regel()
+RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE s jsonb; v_regel text; v_marge numeric;
+BEGIN
+  SELECT c.settings INTO s FROM public.logistics_rule_configs c WHERE c.is_active ORDER BY c.updated_at DESC LIMIT 1;
+  v_regel := public.logistics_rule_text(COALESCE(s, '{}'::jsonb), 'order_verwerking', 'pickup_moment_rule', 'eerste');
+  v_marge := public.logistics_rule_num(COALESCE(s, '{}'::jsonb), 'order_verwerking', 'pickup_moment_marge_uren', 2);
+  IF v_regel NOT IN ('eerste', 'laatste_voor_levertijd') THEN v_regel := 'eerste'; END IF;
+  RETURN jsonb_build_object('regel', v_regel, 'margeUren', COALESCE(v_marge, 2), 'werkwijzeGevonden', s IS NOT NULL);
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_regel() FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_regel() TO authenticated, service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_moment_kies(
+  p_carrier_id uuid, p_leverdag date, p_levertijd timestamptz, p_regel text, p_marge_uren numeric)
+RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE v_tz text; r record; n int;
+BEGIN
+  IF p_carrier_id IS NULL THEN
+    RETURN jsonb_build_object('ok', false, 'redenCode', 'geen_vervoerder', 'reden', 'De order heeft geen vervoerder.');
+  END IF;
+  IF p_leverdag IS NULL THEN
+    RETURN jsonb_build_object('ok', false, 'redenCode', 'geen_leverdag', 'reden', 'De order heeft geen leverdag.');
+  END IF;
+  v_tz := public.logistics_tz();
+  IF v_tz IS NULL THEN
+    RETURN jsonb_build_object('ok', false, 'redenCode', 'geen_tijdzone', 'reden', 'De tijdzone van de vestiging ontbreekt. Stel die in bij Werktijden.');
+  END IF;
+
+  SELECT count(*) INTO n
+    FROM public.logistics_pickup_moments p
+   WHERE p.carrier_id = p_carrier_id AND p.moment_date = p_leverdag AND p.pickup_time IS NOT NULL
+     AND public.logistics_subtract_pick_workdays(p_leverdag, COALESCE(p.pickup_days, 0)) IS NOT NULL;
+  IF n = 0 THEN
+    RETURN jsonb_build_object('ok', false, 'redenCode', 'geen_moment_op_dag',
+      'reden', 'De vervoerder heeft geen ophaalmoment op ' || to_char(p_leverdag, 'DD-MM-YYYY') || '.');
+  END IF;
+
+  IF p_regel = 'laatste_voor_levertijd' AND p_levertijd IS NOT NULL THEN
+    SELECT k2.* INTO r FROM (
+      SELECT p.pickup_time, COALESCE(p.pickup_days, 0) AS pd, p.signup_days AS sd, p.signup_time AS st,
+             public.logistics_subtract_pick_workdays(p_leverdag, COALESCE(p.pickup_days, 0)) AS pdag,
+             ((public.logistics_subtract_pick_workdays(p_leverdag, COALESCE(p.pickup_days, 0))::timestamp + p.pickup_time) AT TIME ZONE v_tz) AS pickup_at
+        FROM public.logistics_pickup_moments p
+       WHERE p.carrier_id = p_carrier_id AND p.moment_date = p_leverdag AND p.pickup_time IS NOT NULL) k2
+     WHERE k2.pdag IS NOT NULL
+       AND k2.pickup_at <= p_levertijd - make_interval(secs => (COALESCE(p_marge_uren, 2) * 3600)::double precision)
+     ORDER BY k2.pickup_at DESC LIMIT 1;
+    IF NOT FOUND THEN
+      RETURN jsonb_build_object('ok', false, 'redenCode', 'geen_moment_voor_levertijd',
+        'reden', 'Er is geen ophaalmoment minstens ' || COALESCE(p_marge_uren, 2) || ' uur vóór de levertijd van de klant ('
+                 || to_char(p_levertijd AT TIME ZONE v_tz, 'DD-MM-YYYY HH24:MI') || ').');
+    END IF;
+  ELSE
+    SELECT k2.* INTO r FROM (
+      SELECT p.pickup_time, COALESCE(p.pickup_days, 0) AS pd, p.signup_days AS sd, p.signup_time AS st,
+             public.logistics_subtract_pick_workdays(p_leverdag, COALESCE(p.pickup_days, 0)) AS pdag,
+             ((public.logistics_subtract_pick_workdays(p_leverdag, COALESCE(p.pickup_days, 0))::timestamp + p.pickup_time) AT TIME ZONE v_tz) AS pickup_at
+        FROM public.logistics_pickup_moments p
+       WHERE p.carrier_id = p_carrier_id AND p.moment_date = p_leverdag AND p.pickup_time IS NOT NULL) k2
+     WHERE k2.pdag IS NOT NULL
+     ORDER BY k2.pickup_at ASC LIMIT 1;
+  END IF;
+
+  RETURN jsonb_build_object('ok', true,
+    'pickupMoment', to_char(r.pdag, 'YYYY-MM-DD') || '|' || to_char(r.pickup_time, 'HH24:MI'),
+    'momentKey', CASE WHEN r.st IS NOT NULL
+                      THEN r.pd::text || '@' || to_char(r.pickup_time, 'HH24:MI') || '|' || COALESCE(r.sd, 0)::text || '@' || to_char(r.st, 'HH24:MI') END,
+    'pickupAt', r.pickup_at,
+    'regel', CASE WHEN p_regel = 'laatste_voor_levertijd' AND p_levertijd IS NOT NULL THEN 'laatste_voor_levertijd' ELSE 'eerste' END);
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_moment_kies(uuid, date, timestamptz, text, numeric) FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_moment_kies(uuid, date, timestamptz, text, numeric) TO authenticated, service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_cf_nieuw(
+  p_cf jsonb, p_carrier_id uuid, p_delivery_date text, p_deleted_at timestamptz, p_cancelled_at timestamptz,
+  p_plan_locked_at timestamptz, p_regel jsonb DEFAULT NULL)
+RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE cf jsonb := COALESCE(p_cf, '{}'::jsonb); v_dag date; v_lt timestamptz; v_regel jsonb; k jsonb; n jsonb;
+BEGIN
+  IF jsonb_typeof(cf) <> 'object' THEN RETURN NULL; END IF;
+  IF p_deleted_at IS NOT NULL OR p_cancelled_at IS NOT NULL OR p_plan_locked_at IS NOT NULL THEN RETURN NULL; END IF;
+  IF (cf->'backfill') IS NOT NULL AND jsonb_typeof(cf->'backfill') <> 'null'
+     AND (CASE WHEN jsonb_typeof(cf->'backfill') = 'boolean' THEN (cf->>'backfill')::boolean
+              ELSE lower(btrim(cf->>'backfill')) NOT IN ('', 'false', '0', 'nee', 'no') END) THEN
+    RETURN NULL;
+  END IF;
+  IF nullif(btrim(COALESCE(cf->>'pickup_moment', '')), '') IS NOT NULL
+     AND COALESCE(cf->>'pickup_moment_bron', '') <> 'auto' THEN
+    RETURN NULL;
+  END IF;
+  BEGIN v_dag := public.logistics_order_date(p_delivery_date); EXCEPTION WHEN OTHERS THEN v_dag := NULL; END;
+  IF v_dag IS NOT NULL AND v_dag < (now() AT TIME ZONE 'Europe/Amsterdam')::date THEN RETURN NULL; END IF;
+  BEGIN v_lt := nullif(btrim(COALESCE(cf->>'floriday_latest_delivery_at', '')), '')::timestamptz;
+  EXCEPTION WHEN OTHERS THEN v_lt := NULL; END;
+  v_regel := COALESCE(p_regel, public.logistics_pickup_regel());
+  k := public.logistics_pickup_moment_kies(p_carrier_id, v_dag, v_lt, v_regel->>'regel', (v_regel->>'margeUren')::numeric);
+  IF COALESCE((k->>'ok')::boolean, false) THEN
+    n := (cf - 'pickup_moment_reden') || jsonb_build_object('pickup_moment', k->>'pickupMoment', 'pickup_moment_bron', 'auto');
+    n := CASE WHEN k->>'momentKey' IS NOT NULL THEN n || jsonb_build_object('pickup_moment_key', k->>'momentKey')
+              ELSE n - 'pickup_moment_key' END;
+  ELSE
+    n := (cf - 'pickup_moment' - 'pickup_moment_key')
+         || jsonb_build_object('pickup_moment_bron', 'auto', 'pickup_moment_reden', k->>'reden');
+  END IF;
+  IF n = cf THEN RETURN NULL; END IF;
+  RETURN n;
+END;
+$$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_cf_nieuw(jsonb, uuid, text, timestamptz, timestamptz, timestamptz, jsonb) FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_cf_nieuw(jsonb, uuid, text, timestamptz, timestamptz, timestamptz, jsonb) TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_orders_pickup_moment()
+RETURNS trigger LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE n jsonb;
+BEGIN
+  IF COALESCE(current_setting('logistics.pickup_writer', true), '') = 'engine' THEN RETURN NEW; END IF;
+  IF TG_OP = 'UPDATE'
+     AND NEW.carrier_id IS NOT DISTINCT FROM OLD.carrier_id
+     AND NEW.delivery_date IS NOT DISTINCT FROM OLD.delivery_date
+     AND (NEW.custom_fields->>'floriday_latest_delivery_at') IS NOT DISTINCT FROM (OLD.custom_fields->>'floriday_latest_delivery_at')
+     AND NEW.deleted_at IS NOT DISTINCT FROM OLD.deleted_at
+     AND (nullif(btrim(COALESCE(NEW.custom_fields->>'pickup_moment', '')), '') IS NOT NULL
+          OR (NEW.custom_fields->'pickup_moment_reden') IS NOT NULL) THEN
+    RETURN NEW;
+  END IF;
+  BEGIN
+    n := public.logistics_pickup_cf_nieuw(NEW.custom_fields, NEW.carrier_id, NEW.delivery_date::text,
+           NEW.deleted_at, NEW.cancelled_at, NEW.plan_locked_at, NULL);
+    IF n IS NOT NULL THEN NEW.custom_fields := n; END IF;
+  EXCEPTION WHEN OTHERS THEN
+    RAISE WARNING 'logistiek-engine: ophaalmoment bepalen mislukt voor order %: %', NEW.id, SQLERRM;
+    BEGIN
+      PERFORM public._logistics_merge_melding('ophaalmoment_fout', NEW.id, NULL, NULL, 'ophaalmoment bepalen: ' || SQLERRM);
+    EXCEPTION WHEN OTHERS THEN RAISE WARNING 'logistiek-engine: melding ophaalmoment mislukt: %', SQLERRM; END;
+  END;
+  RETURN NEW;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_orders_pickup_moment() FROM PUBLIC, anon, authenticated;
+DROP TRIGGER IF EXISTS trg_logistics_orders_zpickup_moment ON public.orders;
+CREATE TRIGGER trg_logistics_orders_zpickup_moment
+  BEFORE INSERT OR UPDATE ON public.orders
+  FOR EACH ROW EXECUTE FUNCTION public.logistics_orders_pickup_moment();
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_herwijs(p_carrier_ids uuid[], p_max integer DEFAULT 5000)
+RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE r record; n jsonb; v_regel jsonb; v_gewijzigd int := 0; v_fouten jsonb := '[]'::jsonb; v_vorig text;
+BEGIN
+  IF p_carrier_ids IS NULL OR cardinality(p_carrier_ids) = 0 THEN RETURN jsonb_build_object('gewijzigd', 0); END IF;
+  v_regel := public.logistics_pickup_regel();
+  v_vorig := current_setting('logistics.pickup_writer', true);
+  FOR r IN
+    SELECT o.id, o.order_number, o.custom_fields, o.carrier_id, o.delivery_date::text AS dd, o.deleted_at, o.cancelled_at, o.plan_locked_at
+      FROM public.orders o
+     WHERE o.carrier_id = ANY (p_carrier_ids) AND o.deleted_at IS NULL AND o.cancelled_at IS NULL
+       AND public.logistics_order_date(o.delivery_date::text) >= (now() AT TIME ZONE 'Europe/Amsterdam')::date
+       AND (nullif(btrim(COALESCE(o.custom_fields->>'pickup_moment', '')), '') IS NULL
+            OR COALESCE(o.custom_fields->>'pickup_moment_bron', '') = 'auto')
+     ORDER BY o.delivery_date LIMIT greatest(COALESCE(p_max, 5000), 1)
+  LOOP
+    BEGIN
+      n := public.logistics_pickup_cf_nieuw(r.custom_fields, r.carrier_id, r.dd, r.deleted_at, r.cancelled_at, r.plan_locked_at, v_regel);
+      IF n IS NOT NULL THEN
+        PERFORM set_config('logistics.pickup_writer', 'engine', true);
+        UPDATE public.orders SET custom_fields = n, updated_at = now() WHERE id = r.id;
+        PERFORM set_config('logistics.pickup_writer', COALESCE(v_vorig, ''), true);
+        v_gewijzigd := v_gewijzigd + 1;
+      END IF;
+    EXCEPTION WHEN OTHERS THEN
+      PERFORM set_config('logistics.pickup_writer', COALESCE(v_vorig, ''), true);
+      v_fouten := v_fouten || jsonb_build_array(jsonb_build_object('order', r.order_number, 'fout', SQLERRM));
+      PERFORM public._logistics_merge_melding('ophaalmoment_fout', r.id, NULL, NULL, 'ophaalmoment herzien: ' || SQLERRM);
+    END;
+  END LOOP;
+  RETURN jsonb_build_object('gewijzigd', v_gewijzigd, 'fouten', v_fouten);
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_herwijs(uuid[], integer) FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_herwijs(uuid[], integer) TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_moments_gewijzigd_trg()
+RETURNS trigger LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE v_ids uuid[];
+BEGIN
+  IF TG_OP = 'DELETE' THEN
+    SELECT array_agg(DISTINCT carrier_id) INTO v_ids FROM oud WHERE carrier_id IS NOT NULL;
+  ELSIF TG_OP = 'INSERT' THEN
+    SELECT array_agg(DISTINCT carrier_id) INTO v_ids FROM nieuw WHERE carrier_id IS NOT NULL;
+  ELSE
+    SELECT array_agg(DISTINCT x) INTO v_ids FROM (
+      SELECT carrier_id x FROM nieuw UNION SELECT carrier_id FROM oud) t WHERE x IS NOT NULL;
+  END IF;
+  BEGIN
+    PERFORM public.logistics_pickup_herwijs(v_ids, 5000);
+  EXCEPTION WHEN OTHERS THEN
+    RAISE WARNING 'logistiek-engine: ophaalmomenten herzien mislukt: %', SQLERRM;
+    PERFORM public._logistics_merge_melding('ophaalmoment_fout', NULL, NULL, NULL, 'ophaalmomenten herzien: ' || SQLERRM);
+  END;
+  RETURN NULL;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_moments_gewijzigd_trg() FROM PUBLIC, anon, authenticated;
+DROP TRIGGER IF EXISTS trg_logistics_pickup_moments_ins ON public.logistics_pickup_moments;
+DROP TRIGGER IF EXISTS trg_logistics_pickup_moments_upd ON public.logistics_pickup_moments;
+DROP TRIGGER IF EXISTS trg_logistics_pickup_moments_del ON public.logistics_pickup_moments;
+CREATE TRIGGER trg_logistics_pickup_moments_ins AFTER INSERT ON public.logistics_pickup_moments
+  REFERENCING NEW TABLE AS nieuw FOR EACH STATEMENT EXECUTE FUNCTION public.logistics_pickup_moments_gewijzigd_trg();
+CREATE TRIGGER trg_logistics_pickup_moments_upd AFTER UPDATE ON public.logistics_pickup_moments
+  REFERENCING NEW TABLE AS nieuw OLD TABLE AS oud FOR EACH STATEMENT EXECUTE FUNCTION public.logistics_pickup_moments_gewijzigd_trg();
+CREATE TRIGGER trg_logistics_pickup_moments_del AFTER DELETE ON public.logistics_pickup_moments
+  REFERENCING OLD TABLE AS oud FOR EACH STATEMENT EXECUTE FUNCTION public.logistics_pickup_moments_gewijzigd_trg();
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_vul_voorbeeld()
+RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE v_regel jsonb := public.logistics_pickup_regel(); v jsonb;
+BEGIN
+  WITH o AS (
+    SELECT o.id, o.order_number, o.carrier_id, public.logistics_order_date(o.delivery_date::text) AS dag,
+           public.logistics_pickup_cf_nieuw(o.custom_fields, o.carrier_id, o.delivery_date::text, o.deleted_at, o.cancelled_at, o.plan_locked_at, v_regel) AS n
+      FROM public.orders o
+     WHERE o.deleted_at IS NULL AND o.cancelled_at IS NULL
+       AND public.logistics_order_date(o.delivery_date::text) >= (now() AT TIME ZONE 'Europe/Amsterdam')::date
+       AND NOT public.logistics_order_is_backfill(o.id)
+       AND (nullif(btrim(COALESCE(o.custom_fields->>'pickup_moment', '')), '') IS NULL
+            OR COALESCE(o.custom_fields->>'pickup_moment_bron', '') = 'auto')
+  ), u AS (
+    SELECT o.*, COALESCE(c.name, '(geen vervoerder)') AS vervoerder,
+           CASE WHEN o.n IS NULL THEN 'ongewijzigd'
+                WHEN (o.n->'pickup_moment') IS NOT NULL THEN 'krijgt moment'
+                ELSE 'geen moment: ' || COALESCE(o.n->>'pickup_moment_reden', '?') END AS uitkomst
+      FROM o LEFT JOIN public.carriers c ON c.id = o.carrier_id
+  )
+  SELECT jsonb_build_object('regel', v_regel,
+    'totaal', (SELECT count(*) FROM u),
+    'krijgtMoment', (SELECT count(*) FROM u WHERE uitkomst = 'krijgt moment'),
+    'ongewijzigd', (SELECT count(*) FROM u WHERE uitkomst = 'ongewijzigd'),
+    'zonderMoment', (SELECT count(*) FROM u WHERE uitkomst LIKE 'geen moment%'),
+    'perVervoerderEnDag', COALESCE((SELECT jsonb_agg(jsonb_build_object('vervoerder', vervoerder, 'leverdag', dag,
+                              'uitkomst', regexp_replace(uitkomst, ' op \d{2}-\d{2}-\d{4}\.$', ''), 'aantal', n, 'voorbeelden', vb)
+                              ORDER BY dag, vervoerder)
+        FROM (SELECT vervoerder, dag, uitkomst, count(*) n, (array_agg(order_number ORDER BY order_number))[1:3] vb
+                FROM u WHERE uitkomst <> 'ongewijzigd' GROUP BY 1, 2, 3) g), '[]'::jsonb))
+    INTO v;
+  RETURN v;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_vul_voorbeeld() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_vul_voorbeeld() TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_vul_uitvoeren(p_max integer DEFAULT 500)
+RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE r record; n jsonb; v_regel jsonb; v_gevuld int := 0; v_zonder int := 0; v_bekeken int := 0;
+        v_fouten jsonb := '[]'::jsonb; v_vorig text; v_rest int;
+BEGIN
+  PERFORM public.logistics_pickup_moments_koppel();
+  v_regel := public.logistics_pickup_regel();
+  v_vorig := current_setting('logistics.pickup_writer', true);
+  FOR r IN
+    SELECT o.id, o.order_number, o.custom_fields, o.carrier_id, o.delivery_date::text AS dd, o.deleted_at, o.cancelled_at, o.plan_locked_at
+      FROM public.orders o
+     WHERE o.deleted_at IS NULL AND o.cancelled_at IS NULL
+       AND public.logistics_order_date(o.delivery_date::text) >= (now() AT TIME ZONE 'Europe/Amsterdam')::date
+       AND NOT public.logistics_order_is_backfill(o.id)
+       AND (nullif(btrim(COALESCE(o.custom_fields->>'pickup_moment', '')), '') IS NULL
+            OR COALESCE(o.custom_fields->>'pickup_moment_bron', '') = 'auto')
+     ORDER BY o.delivery_date, o.order_number
+  LOOP
+    EXIT WHEN v_gevuld + v_zonder >= greatest(COALESCE(p_max, 500), 1);
+    v_bekeken := v_bekeken + 1;
+    BEGIN
+      n := public.logistics_pickup_cf_nieuw(r.custom_fields, r.carrier_id, r.dd, r.deleted_at, r.cancelled_at, r.plan_locked_at, v_regel);
+      IF n IS NOT NULL THEN
+        PERFORM set_config('logistics.pickup_writer', 'engine', true);
+        UPDATE public.orders SET custom_fields = n, updated_at = now() WHERE id = r.id;
+        PERFORM set_config('logistics.pickup_writer', COALESCE(v_vorig, ''), true);
+        IF (n->'pickup_moment') IS NOT NULL THEN v_gevuld := v_gevuld + 1; ELSE v_zonder := v_zonder + 1; END IF;
+      END IF;
+    EXCEPTION WHEN OTHERS THEN
+      PERFORM set_config('logistics.pickup_writer', COALESCE(v_vorig, ''), true);
+      v_fouten := v_fouten || jsonb_build_array(jsonb_build_object('order', r.order_number, 'fout', SQLERRM));
+    END;
+  END LOOP;
+  v_rest := COALESCE((public.logistics_pickup_vul_voorbeeld()->>'krijgtMoment')::int, 0);
+  RETURN jsonb_build_object('gevuld', v_gevuld, 'zonderMomentGemarkeerd', v_zonder, 'bekeken', v_bekeken,
+                            'fouten', v_fouten, 'nogTeDoen', v_rest);
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_vul_uitvoeren(integer) FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_vul_uitvoeren(integer) TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_pickup_status()
+RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE v_vandaag date := (now() AT TIME ZONE 'Europe/Amsterdam')::date; v_tot date; v_heeft boolean; v jsonb; v_regel jsonb;
+BEGIN
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_pickup_status');
+  v_regel := public.logistics_pickup_regel();
+  SELECT max(moment_date) INTO v_tot FROM public.logistics_pickup_moments;
+  SELECT EXISTS (SELECT 1 FROM public.carriers c WHERE c.archived_at IS NULL
+                   AND jsonb_typeof(c.pickup_moments) = 'array' AND jsonb_array_length(c.pickup_moments) > 0) INTO v_heeft;
+  WITH o AS (
+    SELECT o.order_number, o.carrier_id, public.logistics_order_date(o.delivery_date::text) AS dag, o.custom_fields cf
+      FROM public.orders o
+     WHERE o.deleted_at IS NULL AND o.cancelled_at IS NULL
+       AND public.logistics_order_date(o.delivery_date::text) BETWEEN v_vandaag AND v_vandaag + 6
+       AND NOT public.logistics_order_is_backfill(o.id)
+       AND lower(btrim(COALESCE(o.status, ''))) NOT IN ('verzonden', 'afgehandeld', 'geannuleerd', 'cancelled', 'canceled')
+       AND nullif(btrim(COALESCE(o.custom_fields->>'pickup_moment', '')), '') IS NULL
+  ), r AS (
+    SELECT o.*, public.logistics_pickup_moment_kies(o.carrier_id, o.dag,
+             CASE WHEN o.cf->>'floriday_latest_delivery_at' ~ '^\d{4}-' THEN (o.cf->>'floriday_latest_delivery_at')::timestamptz END,
+             v_regel->>'regel', (v_regel->>'margeUren')::numeric) AS k
+      FROM o
+  )
+  SELECT jsonb_build_object(
+    'zonderMoment', (SELECT count(*) FROM r),
+    'redenen', COALESCE((SELECT jsonb_object_agg(code, n) FROM (
+        SELECT COALESCE(CASE WHEN (k->>'ok')::boolean THEN 'nog_niet_gevuld' END, k->>'redenCode', 'onbekend') code, count(*) n
+          FROM r GROUP BY 1) g), '{}'::jsonb),
+    'voorbeelden', COALESCE((SELECT jsonb_agg(order_number) FROM (SELECT order_number FROM r ORDER BY dag, order_number LIMIT 5) x), '[]'::jsonb),
+    'momentenTot', v_tot,
+    'momentenTeKort', v_heeft AND (v_tot IS NULL OR v_tot < v_vandaag + 14),
+    'ongekoppeld', (SELECT count(*) FROM public.logistics_pickup_moments p WHERE p.moment_date >= v_vandaag AND p.carrier_id IS NULL),
+    'regel', v_regel)
+  INTO v;
+  RETURN v;
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_pickup_status() FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.logistics_pickup_status() TO authenticated, service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_refresh_pickup_moments(p_weeks integer DEFAULT 4)
+RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+declare
+  v_weeks integer := greatest(1, least(coalesce(p_weeks, 4), 26));
+  v_from date := current_date;
+  v_to date := current_date + (v_weeks * 7);
+  v_inserted integer := 0;
+  v_updated integer := 0;
+  v_removed integer := 0;
+begin
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_refresh_pickup_moments');
+  create temp table _wanted on commit drop as
+  with dagen as (
+    select d::date as moment_date from generate_series(v_from, v_to, interval '1 day') d
+  ),
+  momenten as (
+    select c.user_id, c.id as carrier_id, c.name as carrier_ref, c.pickup_weekdays,
+           nullif(m->>'pickup_time','')::time as pickup_time,
+           greatest(coalesce(nullif(m->>'pickup_days','')::int, 0), 0) as pickup_days,
+           greatest(coalesce(nullif(m->>'signup_days','')::int, 0), 0) as signup_days,
+           nullif(m->>'signup_time','')::time as signup_time,
+           nullif(m->>'label','') as label
+    from public.carriers c
+    cross join lateral jsonb_array_elements(
+      case when jsonb_typeof(c.pickup_moments) = 'array' then c.pickup_moments else '[]'::jsonb end) m
+    where c.archived_at is null
+  ),
+  geldig as (
+    select d.moment_date, mo.user_id, mo.carrier_id, mo.carrier_ref, mo.pickup_time, mo.pickup_days,
+           mo.signup_days, mo.signup_time, mo.label
+    from dagen d
+    join momenten mo
+      on mo.pickup_time is not null
+     and (mo.pickup_weekdays is null or array_length(mo.pickup_weekdays, 1) is null
+          or extract(isodow from d.moment_date)::int = any(mo.pickup_weekdays))
+  ),
+  uniek as (
+    select distinct on (user_id, moment_date, carrier_id, pickup_time)
+           user_id, moment_date, carrier_id, carrier_ref, pickup_time, pickup_days, signup_days, signup_time, label
+    from geldig
+    order by user_id, moment_date, carrier_id, pickup_time, pickup_days, signup_time
+  )
+  select u.*,
+         row_number() over (partition by user_id, moment_date order by pickup_time, carrier_ref, carrier_id)::int as sequence
+  from uniek u;
+
+  if not exists (select 1 from _wanted) then
+    return jsonb_build_object('ok', true, 'reason', 'geen_ophaalmomenten_ingesteld', 'inserted', 0, 'updated', 0, 'removed', 0);
+  end if;
+
+  with weg as (
+    delete from public.logistics_pickup_moments p
+    where p.moment_date between v_from and v_to
+      and not exists (select 1 from _wanted w
+                      where w.user_id = p.user_id and w.moment_date = p.moment_date and w.sequence = p.sequence)
+    returning 1
+  )
+  select count(*) into v_removed from weg;
+
+  with upd as (
+    update public.logistics_pickup_moments p
+    set pickup_time = w.pickup_time, carrier_ref = w.carrier_ref, carrier_id = w.carrier_id,
+        pickup_days = w.pickup_days, signup_days = w.signup_days, signup_time = w.signup_time,
+        label = w.label, updated_at = now()
+    from _wanted w
+    where p.user_id = w.user_id and p.moment_date = w.moment_date and p.sequence = w.sequence
+      and (p.pickup_time is distinct from w.pickup_time or p.carrier_ref is distinct from w.carrier_ref
+        or p.carrier_id is distinct from w.carrier_id or p.pickup_days is distinct from w.pickup_days
+        or p.signup_days is distinct from w.signup_days or p.signup_time is distinct from w.signup_time
+        or p.label is distinct from w.label)
+    returning 1
+  )
+  select count(*) into v_updated from upd;
+
+  with ins as (
+    insert into public.logistics_pickup_moments
+      (user_id, moment_date, sequence, pickup_time, carrier_ref, carrier_id, pickup_days, signup_days, signup_time, label)
+    select w.user_id, w.moment_date, w.sequence, w.pickup_time, w.carrier_ref, w.carrier_id, w.pickup_days, w.signup_days, w.signup_time, w.label
+    from _wanted w
+    where not exists (select 1 from public.logistics_pickup_moments p
+                      where p.user_id = w.user_id and p.moment_date = w.moment_date and p.sequence = w.sequence)
+    returning 1
+  )
+  select count(*) into v_inserted from ins;
+
+  return jsonb_build_object('ok', true, 'inserted', v_inserted, 'updated', v_updated, 'removed', v_removed,
+                            'from', v_from, 'to', v_to);
+end $$;
+
+CREATE OR REPLACE FUNCTION public.logistics_order_buffer_ref(p_order_id uuid)
+RETURNS text LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE d jsonb;
+BEGIN
+  d := public.logistics_buffer_decision(public.logistics_buffer_payload(p_order_id), NULL);
+  IF COALESCE((d->>'buffer')::boolean, false) IS NOT TRUE OR NOT COALESCE((d->>'complete')::boolean, false) THEN RETURN NULL; END IF;
+  RETURN nullif(d->>'bufferRef', '');
+END $$;
+REVOKE ALL ON FUNCTION public.logistics_order_buffer_ref(uuid) FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.logistics_order_buffer_ref(uuid) TO service_role;
+
+CREATE OR REPLACE FUNCTION public.logistics_merge_floriday_lines(p_order_id uuid)
+RETURNS uuid LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $$
+DECLARE
+  v_ref text; v_key text; v_keep uuid; v_keepnr text; v_cust uuid; v_dag date; r record; v_ids uuid[];
+  v_moved int; v_logged int; v_total int := 0; v_count int := 0; v_groep int; s jsonb;
+  v_lines text[] := ARRAY[]::text[];
+BEGIN
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_merge_floriday_lines');
+  IF p_order_id IS NULL THEN RETURN p_order_id; END IF;
+  IF COALESCE(current_setting('logistics.merge_uit', true), '') = '1' THEN RETURN p_order_id; END IF;
+  IF NOT public.logistics_merge_lines_enabled() THEN RETURN p_order_id; END IF;
+  SELECT c.settings INTO s FROM public.logistics_rule_configs c WHERE c.is_active ORDER BY c.updated_at DESC LIMIT 1;
+  IF NOT public.logistics_rule_bool(COALESCE(s, '{}'::jsonb), 'order_verwerking', 'buffer_enabled', true) THEN RETURN p_order_id; END IF;
+  IF NOT public.logistics_order_mergeable(p_order_id) THEN RETURN p_order_id; END IF;
+  IF NOT EXISTS (SELECT 1 FROM logistics_active.order_items i WHERE i.order_id = p_order_id) THEN RETURN p_order_id; END IF;
+
+  v_ref := public.logistics_order_buffer_ref(p_order_id);
+  IF v_ref IS NULL THEN RETURN p_order_id; END IF;
+  SELECT customer_id, public.logistics_order_date(delivery_date::text) INTO v_cust, v_dag FROM public.orders WHERE id = p_order_id;
+  IF v_cust IS NULL OR v_dag IS NULL THEN RETURN p_order_id; END IF;
+  v_key := 'buf|' || v_ref || '|' || v_cust::text || '|' || v_dag::text;
+  IF NOT pg_try_advisory_xact_lock(hashtext('logistics_merge:' || v_key)) THEN RETURN p_order_id; END IF;
+
+  SELECT array_agg(o.id ORDER BY o.order_number ASC NULLS LAST, o.created_at ASC) INTO v_ids
+    FROM public.orders o
+   WHERE o.customer_id = v_cust AND o.deleted_at IS NULL AND o.order_source = 'floriday'
+     AND public.logistics_order_date(o.delivery_date::text) = v_dag
+     AND EXISTS (SELECT 1 FROM logistics_active.order_items i WHERE i.order_id = o.id)
+     AND public.logistics_order_mergeable(o.id)
+     AND public.logistics_order_buffer_ref(o.id) = v_ref;
+  v_groep := COALESCE(cardinality(v_ids), 0);
+  IF v_groep < 2 THEN RETURN p_order_id; END IF;
+  v_keep := v_ids[1];
+  v_groep := v_groep + (SELECT count(*) FROM public.logistics_order_merges m WHERE m.kept_order_id = v_keep AND m.group_key = v_key);
+  IF v_groep > 20 THEN
+    IF NOT EXISTS (SELECT 1 FROM public.logistics_merge_meldingen m
+                    WHERE m.soort = 'groep_te_groot' AND m.group_key = v_key AND m.created_at > now() - interval '1 day') THEN
+      PERFORM public._logistics_merge_melding('groep_te_groot', p_order_id, v_key, v_groep,
+        v_groep || ' orders in dezelfde buffergroep; niet samengevoegd.');
+    END IF;
+    RETURN p_order_id;
+  END IF;
+
+  SELECT order_number INTO v_keepnr FROM public.orders WHERE id = v_keep;
+  PERFORM set_config('logistics.merge_uit', '1', true);
+
+  FOR r IN SELECT o.id, o.order_number, o.floriday_sales_order_id AS sales, o.created_at
+             FROM public.orders o WHERE o.id = ANY (v_ids) AND o.id <> v_keep
+            ORDER BY o.order_number ASC NULLS LAST LOOP
+    BEGIN
+      INSERT INTO public.logistics_order_merge_lines(
+        group_key, from_order_id, from_order_number, to_order_id, to_order_number,
+        order_item_id, product_id, product_name, quantity, source_line_key,
+        sales_order_id, ordered_at, reason)
+      SELECT v_key, r.id, r.order_number, v_keep, v_keepnr,
+             i.id, i.product_id, i.product_name, i.quantity, i.source_line_key,
+             r.sales, r.created_at, 'Zelfde buffergroep volgens de werkwijze'
+        FROM logistics_active.order_items i WHERE i.order_id = r.id;
+      GET DIAGNOSTICS v_logged = ROW_COUNT;
+      UPDATE public.order_items SET order_id = v_keep WHERE order_id = r.id AND quarantined_at IS NULL;
+      GET DIAGNOSTICS v_moved = ROW_COUNT;
+      IF v_moved <> v_logged THEN RAISE EXCEPTION 'aantal verplaatste regels (%) wijkt af van het logboek (%)', v_moved, v_logged; END IF;
+      IF v_moved = 0 THEN RAISE EXCEPTION 'geen regels verplaatst; order blijft staan'; END IF;
+      INSERT INTO public.logistics_order_merges(group_key, kept_order_id, kept_order_number,
+        merged_order_id, merged_order_number, sales_order_id, items_moved)
+      VALUES (v_key, v_keep, v_keepnr, r.id, r.order_number, r.sales, v_moved)
+      ON CONFLICT (merged_order_id) DO NOTHING;
+      UPDATE public.orders SET deleted_at = now(),
+             notes = COALESCE(NULLIF(notes, ''), '')
+                     || CASE WHEN COALESCE(notes, '') = '' THEN '' ELSE E'\n' END
+                     || 'Samengevoegd met ' || COALESCE(v_keepnr, '') || '.',
+             updated_at = now()
+       WHERE id = r.id;
+      v_total := v_total + v_moved; v_count := v_count + 1;
+      v_lines := v_lines || (COALESCE(r.order_number, '') || ': ' || v_moved::text || ' regel(s)');
+    EXCEPTION WHEN OTHERS THEN
+      PERFORM public._logistics_merge_melding('fout', r.id, v_key, NULL,
+        'samenvoegen ' || COALESCE(r.order_number, '?') || ' met ' || COALESCE(v_keepnr, '?') || ': ' || SQLERRM);
+    END;
+  END LOOP;
+  PERFORM set_config('logistics.merge_uit', '0', true);
+
+  IF v_count > 0 THEN
+    UPDATE public.orders o SET total = to_char(COALESCE((
+             SELECT SUM(COALESCE(i.quantity, 0) * COALESCE(i.unit_price, 0))
+               FROM logistics_active.order_items i WHERE i.order_id = o.id), 0), 'FM9999999990.00'),
+           updated_at = now()
+     WHERE o.id = v_keep;
+    PERFORM public.logistics_trace_order_step(
+      v_keep, 'stap:bestelregels_samenvoegen', 'bestelregels samenvoegen', 'geslaagd',
+      'samengevoegd tot ' || COALESCE(v_keepnr, 'één bestelling'),
+      v_count::text || ' order(s), ' || v_total::text || ' regel(s) verplaatst: ' || array_to_string(v_lines, '; '),
+      'Orders combineren');
+  END IF;
+  IF EXISTS (SELECT 1 FROM public.orders WHERE id = p_order_id AND deleted_at IS NOT NULL) THEN RETURN v_keep; END IF;
+  RETURN p_order_id;
+EXCEPTION WHEN OTHERS THEN
+  PERFORM set_config('logistics.merge_uit', '0', true);
+  PERFORM public._logistics_merge_melding('fout', p_order_id, v_key, NULL, 'samenvoegen: ' || SQLERRM);
+  RETURN p_order_id;
+END $$;
+
+CREATE OR REPLACE FUNCTION public.logistics_install_check_samenvoegen()
+ RETURNS TABLE(onderdeel text, ok boolean, toelichting text)
+ LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
+AS $function$
+DECLARE f text;
+BEGIN
+  FOREACH f IN ARRAY ARRAY['logistics_order_is_backfill(uuid)', 'logistics_order_merge_key_v2(uuid)',
+      'logistics_order_mergeable(uuid)', 'logistics_merge_floriday_lines(uuid)', 'logistics_order_buffer_ref(uuid)',
+      'logistics_merge_herstel_voorbeeld()', 'logistics_merge_herstel_uitvoeren(text,integer)',
+      'logistics_merge_status()', 'logistics_trace_event(uuid,text,text,text)', 'logistics_schema_versie()',
+      'logistics_pickup_regel()', 'logistics_pickup_moment_kies(uuid,date,timestamp with time zone,text,numeric)',
+      'logistics_pickup_vul_voorbeeld()', 'logistics_pickup_vul_uitvoeren(integer)', 'logistics_pickup_status()',
+      'logistics_pickup_herwijs(uuid[],integer)', 'logistics_refresh_pickup_moments(integer)'] LOOP
+    onderdeel := 'functie ' || f;
+    ok := to_regprocedure('public.' || f) IS NOT NULL;
+    toelichting := CASE WHEN ok THEN 'aanwezig' ELSE 'ontbreekt: werk de Engine bij via Supabase bijwerken' END;
+    RETURN NEXT;
+  END LOOP;
+  onderdeel := 'tabel logistics_merge_herstel_log';
+  ok := to_regclass('public.logistics_merge_herstel_log') IS NOT NULL;
+  toelichting := CASE WHEN ok THEN 'aanwezig' ELSE 'ontbreekt: werk de Engine bij via Supabase bijwerken' END;
+  RETURN NEXT;
+  onderdeel := 'kolom logistics_pickup_moments.carrier_id';
+  ok := EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = 'public'
+                  AND table_name = 'logistics_pickup_moments' AND column_name = 'carrier_id');
+  toelichting := CASE WHEN ok THEN 'aanwezig' ELSE 'ontbreekt: werk de Engine bij via Supabase bijwerken' END;
+  RETURN NEXT;
+  onderdeel := 'trigger ophaalmoment op orders';
+  ok := EXISTS (SELECT 1 FROM pg_trigger WHERE tgname = 'trg_logistics_orders_zpickup_moment');
+  toelichting := CASE WHEN ok THEN 'aanwezig' ELSE 'ontbreekt: werk de Engine bij via Supabase bijwerken' END;
+  RETURN NEXT;
+END $function$;
+
+CREATE OR REPLACE FUNCTION public.logistics_schema_versie()
+ RETURNS text LANGUAGE sql IMMUTABLE SET search_path TO 'public'
+AS $function$ SELECT '2026-11-10c'::text $function$;
+
+CREATE OR REPLACE FUNCTION public.logistics_buffer_decision_for_settings(p_order jsonb, p_settings jsonb, p_user_id uuid DEFAULT NULL::uuid)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ STABLE
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_user uuid := p_user_id;
+  v_settings jsonb := COALESCE(p_settings, '{}'::jsonb);
+  v_enabled boolean; v_include_res boolean; v_is_res boolean;
+  v_minutes int; v_reference text; v_release text; v_criteria text[];
+  v_checkin timestamptz; v_pick_start timestamptz; v_close timestamptz;
+  v_key text; v_parts text[] := ARRAY[]::text[]; v_trace jsonb := '[]'::jsonb;
+  v_missing boolean := false; v_missing_list text[] := ARRAY[]::text[];
+  v_day text; v_ref text; c text; eff text; val text;
+  v_is_fd boolean; v_skip text[]; v_skip_raw jsonb;
+BEGIN
+  p_order := COALESCE(p_order, '{}'::jsonb);
+  v_enabled := public.logistics_rule_bool(v_settings, 'order_verwerking', 'buffer_enabled', true);
+  v_include_res := public.logistics_rule_bool(v_settings, 'order_verwerking', 'buffer_include_reservations', false);
+  v_minutes := public.logistics_rule_num(v_settings, 'order_verwerking', 'buffer_close_before_minutes', 60)::int;
+  v_reference := public.logistics_rule_text(v_settings, 'order_verwerking', 'buffer_close_reference', 'checkin');
+  v_release := public.logistics_rule_text(v_settings, 'order_verwerking', 'buffer_release', 'auto');
+  v_criteria := public.logistics_buffer_criteria(v_settings);
+
+  v_skip_raw := public.logistics_rule_value(v_settings, 'order_verwerking', 'buffer_skip_for_floriday');
+  IF v_skip_raw IS NOT NULL AND jsonb_typeof(v_skip_raw) = 'array' THEN
+    v_skip := ARRAY(SELECT jsonb_array_elements_text(v_skip_raw));
+  ELSE
+    -- 1.0.239: geen verborgen standaard meer; alleen overslaan wat de werkwijze zelf aangeeft.
+    v_skip := ARRAY[]::text[];
+  END IF;
+
+  v_is_fd := NULLIF(TRIM(COALESCE(p_order ->> 'floridaySalesOrderRef', p_order ->> 'floriday_sales_order_id', '')), '') IS NOT NULL;
+  v_is_res := COALESCE((p_order ->> 'isReservation')::boolean, (p_order ->> 'is_reservation')::boolean, false);
+  v_ref := COALESCE(NULLIF(p_order ->> 'orderRef', ''), NULLIF(p_order ->> 'order_ref', ''), md5(p_order::text));
+
+  IF NOT v_enabled THEN
+    RETURN jsonb_build_object('buffer', false, 'reason', 'buffering_disabled', 'bufferRef', NULL, 'bufferKey', NULL,
+      'matchCriteria', to_jsonb(v_criteria), 'parts', '[]'::jsonb, 'complete', true, 'missingCriteria', '[]'::jsonb,
+      'isReservation', v_is_res, 'isFloriday', v_is_fd, 'closeBeforeMinutes', NULL, 'closeReference', v_reference,
+      'bufferCloseAt', NULL, 'release', 'none',
+      'trace', jsonb_build_array(jsonb_build_object('rule', 'buffer_enabled', 'result', false,
+        'message', 'Orderbuffer staat uit in de Rule Engine; elke order wordt los verwerkt.')));
+  END IF;
+
+  IF v_is_res AND NOT v_include_res THEN
+    RETURN jsonb_build_object('buffer', false, 'reason', 'reservation_excluded', 'bufferRef', NULL, 'bufferKey', NULL,
+      'matchCriteria', to_jsonb(v_criteria), 'parts', '[]'::jsonb, 'complete', true, 'missingCriteria', '[]'::jsonb,
+      'isReservation', true, 'isFloriday', v_is_fd, 'closeBeforeMinutes', NULL, 'closeReference', v_reference,
+      'bufferCloseAt', NULL, 'release', 'none',
+      'trace', jsonb_build_array(jsonb_build_object('rule', 'buffer_include_reservations', 'result', false,
+        'message', 'Gereserveerde bestellingen worden volgens de instelling buiten de buffers gehouden.')));
+  END IF;
+
+  BEGIN v_checkin := (p_order ->> 'checkinAt')::timestamptz; EXCEPTION WHEN others THEN v_checkin := NULL; END;
+
+  IF v_reference = 'pick_start' THEN
+    v_pick_start := public.logistics_pick_start_estimate(v_settings, p_order);
+    IF v_pick_start IS NOT NULL THEN
+      v_close := v_pick_start - make_interval(mins => v_minutes);
+      v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'buffer_close_reference', 'value', 'pick_start', 'result', true,
+        'message', 'De buffer sluit ' || v_minutes || ' minuten vóór de start van het picken.'));
+    ELSIF v_checkin IS NOT NULL THEN
+      v_close := v_checkin - make_interval(mins => v_minutes);
+      v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'buffer_close_reference', 'value', 'checkin_fallback', 'result', true,
+        'message', 'De pickstart is nog niet te berekenen; er wordt teruggerekend vanaf de aanmeldtijd.'));
+    END IF;
+  ELSIF v_checkin IS NOT NULL THEN
+    v_close := v_checkin - make_interval(mins => v_minutes);
+  END IF;
+
+  v_day := LEFT(COALESCE(p_order ->> 'deliveryDate', p_order ->> 'delivery_date', p_order ->> 'checkinAt', ''), 10);
+  IF v_day <> '' THEN
+    v_parts := v_parts || ('day=' || v_day);
+    v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'day_bucket', 'value', v_day, 'result', true,
+      'message', 'Orders worden alleen binnen dezelfde dag gecombineerd.'));
+  END IF;
+
+  IF array_length(v_criteria, 1) IS NULL THEN
+    val := NULLIF(TRIM(COALESCE(p_order ->> 'customerRef', '')), '');
+    IF val IS NULL THEN
+      v_missing := true; v_missing_list := v_missing_list || 'customer'::text;
+      v_parts := v_parts || ('missing=customer:' || v_ref);
+      v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'no_criteria_selected', 'value', NULL, 'result', false,
+        'message', 'Geen combineercriteria aangevinkt en de klant ontbreekt; deze order wordt niet gecombineerd.'));
+    ELSE
+      v_parts := v_parts || ('customer=' || val);
+      v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'no_criteria_selected', 'result', false,
+        'message', 'Er zijn geen combineercriteria aangevinkt; er wordt teruggevallen op dezelfde klant.'));
+    END IF;
+  ELSE
+    FOREACH c IN ARRAY v_criteria LOOP
+      eff := c;
+      IF v_is_fd AND c = ANY(v_skip) THEN
+        v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', c, 'value', NULL, 'result', true,
+          'message', 'Niet van toepassing bij Floriday-orders; Floriday levert deze waarde niet.'));
+        CONTINUE;
+      END IF;
+      IF v_is_fd AND c = 'customer_bvo' THEN
+        eff := 'customer_floriday';
+        v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', c, 'value', NULL, 'result', true,
+          'message', 'Bij Floriday-orders wordt de Floriday-koper gebruikt in plaats van de BVO-klant.'));
+      END IF;
+      val := public.logistics_buffer_value(p_order, eff);
+      IF val IS NULL THEN
+        v_missing := true; v_missing_list := v_missing_list || eff;
+        v_parts := v_parts || ('missing=' || eff || ':' || v_ref);
+        v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', eff, 'value', NULL, 'result', false,
+          'message', 'Waarde ontbreekt; deze order wordt niet gecombineerd.'));
+      ELSE
+        v_parts := v_parts || (eff || '=' || lower(val));
+        v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', eff, 'value', val, 'result', true,
+          'message', 'Criterium meegenomen in de buffersleutel.'));
+      END IF;
+    END LOOP;
+  END IF;
+
+  IF coalesce(p_order ->> 'transportGroup', 'extern') IN ('eigen_vervoer', 'klant_haalt_op') THEN
+    v_parts := v_parts || ('vervoer=' || (p_order ->> 'transportGroup'));
+    v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'transport_group', 'value', p_order ->> 'transportGroup', 'result', true,
+      'message', CASE p_order ->> 'transportGroup' WHEN 'eigen_vervoer' THEN 'Eigen vervoer wordt alleen samen gebufferd met andere orders met eigen vervoer.'
+                 ELSE 'Klant haalt op wordt alleen samen gebufferd met andere orders die de klant ophaalt.' END));
+  END IF;
+  v_parts := ARRAY(SELECT DISTINCT ON (p) p FROM unnest(v_parts) WITH ORDINALITY AS t(p, n) ORDER BY p, n);
+  v_key := array_to_string(v_parts, '|');
+
+  RETURN jsonb_build_object(
+    'buffer', true,
+    'reason', CASE WHEN v_missing THEN 'buffering_enabled_missing_data' ELSE 'buffering_enabled' END,
+    'bufferRef', md5(COALESCE(v_user::text, 'anon') || '|' || v_key),
+    'bufferKey', v_key, 'parts', to_jsonb(v_parts), 'complete', NOT v_missing,
+    'missingCriteria', to_jsonb(v_missing_list), 'isReservation', v_is_res, 'isFloriday', v_is_fd,
+    'skippedForFloriday', CASE WHEN v_is_fd THEN to_jsonb(v_skip) ELSE '[]'::jsonb END,
+    'matchCriteria', to_jsonb(v_criteria), 'closeBeforeMinutes', v_minutes, 'closeReference', v_reference,
+    'bufferCloseAt', v_close, 'release', v_release, 'trace', v_trace);
+END;
+$function$;
+
+SELECT public.logistics_pickup_moments_koppel();
+
+-- ===== 2026-11-10c: rechten hulponderdelen ophaalmoment =====
+REVOKE EXECUTE ON FUNCTION public.logistics_pickup_regel() FROM authenticated;
+REVOKE EXECUTE ON FUNCTION public.logistics_pickup_moment_kies(uuid, date, timestamptz, text, numeric) FROM authenticated;