@flowselections/floriday-verkoop-module 1.0.115 → 1.0.118
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.117";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -1315,6 +1315,10 @@ BEGIN
|
|
|
1315
1315
|
WHERE floriday_id = NEW.floriday_id;
|
|
1316
1316
|
|
|
1317
1317
|
IF v_num IS NULL OR v_num !~ '^FO-[0-9]{7}$' THEN
|
|
1318
|
+
IF to_regprocedure('public.next_order_number_for_date(text,timestamp with time zone)') IS NULL THEN
|
|
1319
|
+
RAISE WARNING 'Ordernummer niet toegekend: next_order_number_for_date ontbreekt';
|
|
1320
|
+
RETURN NEW;
|
|
1321
|
+
END IF;
|
|
1318
1322
|
v_num := public.next_order_number_for_date('FO', NEW.created_at);
|
|
1319
1323
|
INSERT INTO public.floriday_order_number_map(floriday_id, order_number)
|
|
1320
1324
|
VALUES (NEW.floriday_id, v_num)
|
|
@@ -1613,17 +1617,12 @@ DECLARE
|
|
|
1613
1617
|
v_ppc int; v_cpl int; v_lpc int;
|
|
1614
1618
|
v_vbn text; v_lc text; v_psrc text;
|
|
1615
1619
|
v_qty_crates int;
|
|
1620
|
+
v_carrier_warning text := NULL;
|
|
1621
|
+
v_carrier_fallback boolean := false;
|
|
1622
|
+
v_carrier_err text;
|
|
1616
1623
|
BEGIN
|
|
1617
|
-
|
|
1618
|
-
--
|
|
1619
|
-
IF v_uid IS NOT NULL THEN
|
|
1620
|
-
IF NOT (public.has_role(v_uid, 'admin') OR public.has_role(v_uid, 'sales')
|
|
1621
|
-
OR public.has_role(v_uid, 'manager') OR public.has_role(v_uid, 'superadmin')) THEN
|
|
1622
|
-
RAISE EXCEPTION 'Niet toegestaan';
|
|
1623
|
-
END IF;
|
|
1624
|
-
ELSIF coalesce(auth.role(), '') IN ('anon', 'authenticated') THEN
|
|
1625
|
-
RAISE EXCEPTION 'Niet toegestaan';
|
|
1626
|
-
END IF;
|
|
1624
|
+
PERFORM public.verkoop_assert_caller('keten_genest'); -- verkoop-poort
|
|
1625
|
+
-- Toegang: zie verkoop-poort hierboven.
|
|
1627
1626
|
|
|
1628
1627
|
IF v_src = 'actiemail' THEN v_key := 'offer_order_id'; v_cf_source := 'actie-mail';
|
|
1629
1628
|
ELSIF v_src = 'mailbox' THEN v_key := 'mailbox_proposal_id'; v_cf_source := 'mailbox';
|
|
@@ -1633,7 +1632,6 @@ BEGIN
|
|
|
1633
1632
|
RETURN jsonb_build_object('ok', false, 'reason', 'Bron-id ontbreekt.');
|
|
1634
1633
|
END IF;
|
|
1635
1634
|
|
|
1636
|
-
-- Idempotent op bron-id.
|
|
1637
1635
|
PERFORM pg_advisory_xact_lock(hashtext('verkoop_create_order:' || v_key || ':' || p_source_id));
|
|
1638
1636
|
SELECT id, order_number INTO v_existing FROM public.orders
|
|
1639
1637
|
WHERE deleted_at IS NULL AND custom_fields->>v_key = p_source_id LIMIT 1;
|
|
@@ -1654,7 +1652,6 @@ BEGIN
|
|
|
1654
1652
|
RETURN jsonb_build_object('ok', false, 'reason', 'Geen regels.');
|
|
1655
1653
|
END IF;
|
|
1656
1654
|
|
|
1657
|
-
-- Regels: product op id, prijs > 0, belading uit het product.
|
|
1658
1655
|
FOR v_line IN SELECT * FROM jsonb_array_elements(p_lines) LOOP
|
|
1659
1656
|
v_n := v_n + 1;
|
|
1660
1657
|
v_pack := CASE WHEN jsonb_typeof(v_line->'packing') = 'object' THEN v_line->'packing' ELSE NULL END;
|
|
@@ -1671,14 +1668,11 @@ BEGIN
|
|
|
1671
1668
|
IF v_price IS NULL OR v_price <= 0 THEN
|
|
1672
1669
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: prijs moet groter dan 0 zijn.', v_n));
|
|
1673
1670
|
END IF;
|
|
1674
|
-
-- Product op id; als jsonb gelezen zodat een ontbrekende kolom nooit stukloopt.
|
|
1675
1671
|
v_pj := NULL;
|
|
1676
1672
|
SELECT to_jsonb(p.*) INTO v_pj FROM public.products p WHERE p.id = nullif(v_line->>'product_id', '')::uuid;
|
|
1677
1673
|
IF v_pj IS NULL THEN
|
|
1678
1674
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: product niet gevonden.', v_n));
|
|
1679
1675
|
END IF;
|
|
1680
|
-
-- Verpakking-snapshot: eigen keuze per regel, anders de primaire van het product.
|
|
1681
|
-
-- Ontbrekend blijft leeg; nooit stil 1.
|
|
1682
1676
|
IF v_ppc IS NOT NULL OR v_cpl IS NOT NULL OR v_lpc IS NOT NULL THEN
|
|
1683
1677
|
v_vbn := nullif(trim(coalesce(v_pack->>'vbn_package_code', '')), '');
|
|
1684
1678
|
v_lc := nullif(trim(coalesce(v_pack->>'load_carrier_type', '')), '');
|
|
@@ -1697,7 +1691,6 @@ BEGIN
|
|
|
1697
1691
|
v_lc := NULL;
|
|
1698
1692
|
v_psrc := CASE WHEN v_ppc IS NOT NULL OR v_cpl IS NOT NULL OR v_lpc IS NOT NULL THEN 'product_primary' END;
|
|
1699
1693
|
END IF;
|
|
1700
|
-
-- Hoeveelheid: altijd ook in planten. Fust -> planten met de stuks per fust.
|
|
1701
1694
|
IF v_qty IS NULL AND v_qty_crates IS NOT NULL THEN
|
|
1702
1695
|
IF v_qty_crates <= 0 THEN
|
|
1703
1696
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: aantal fust moet groter dan 0 zijn.', v_n));
|
|
@@ -1726,7 +1719,6 @@ BEGIN
|
|
|
1726
1719
|
END IF;
|
|
1727
1720
|
END LOOP;
|
|
1728
1721
|
|
|
1729
|
-
-- Ophaalmoment alleen via de planning; geen eigen rekenwerk.
|
|
1730
1722
|
IF p_own_transport THEN
|
|
1731
1723
|
v_carrier := NULL;
|
|
1732
1724
|
v_moment := NULL;
|
|
@@ -1734,9 +1726,21 @@ BEGIN
|
|
|
1734
1726
|
BEGIN
|
|
1735
1727
|
v_preview := public.logistics_departure_preview(v_carrier, p_delivery_location_id::text, p_delivery_date, p_moment_key);
|
|
1736
1728
|
EXCEPTION WHEN others THEN
|
|
1737
|
-
|
|
1729
|
+
v_preview := NULL;
|
|
1738
1730
|
END;
|
|
1739
|
-
|
|
1731
|
+
-- Een meegegeven vervoerder die de planning niet kent mag de order niet tegenhouden:
|
|
1732
|
+
-- dan het ophaalmoment bepalen zonder die vervoerder (de Engine kiest er zelf een).
|
|
1733
|
+
IF v_carrier IS NOT NULL AND (v_preview IS NULL OR coalesce((v_preview->>'ok')::boolean, false) = false) THEN
|
|
1734
|
+
BEGIN
|
|
1735
|
+
v_preview := public.logistics_departure_preview(NULL, p_delivery_location_id::text, p_delivery_date, p_moment_key);
|
|
1736
|
+
EXCEPTION WHEN others THEN
|
|
1737
|
+
v_preview := NULL;
|
|
1738
|
+
END;
|
|
1739
|
+
END IF;
|
|
1740
|
+
IF v_preview IS NULL THEN
|
|
1741
|
+
RETURN jsonb_build_object('ok', false, 'reason', 'Het ophaalmoment is nu niet bekend. Probeer het over een minuut opnieuw.');
|
|
1742
|
+
END IF;
|
|
1743
|
+
IF coalesce((v_preview->>'ok')::boolean, false) = false THEN
|
|
1740
1744
|
RETURN jsonb_build_object('ok', false, 'reason', coalesce(v_preview->>'reason', 'Voor deze leverdatum is geen ophaalmoment mogelijk.'));
|
|
1741
1745
|
END IF;
|
|
1742
1746
|
v_chosen := v_preview->'chosen';
|
|
@@ -1761,8 +1765,8 @@ BEGIN
|
|
|
1761
1765
|
'delivery_date', p_delivery_date, 'signup_deadline', v_chosen->>'signupDeadline',
|
|
1762
1766
|
'reason', coalesce(v_preview->>'deliveryDateReason', v_preview->>'reason'), 'source', v_src);
|
|
1763
1767
|
END IF;
|
|
1764
|
-
|
|
1765
|
-
IF v_carrier IS NULL THEN
|
|
1768
|
+
-- Vervoerder uit de preview alleen als controle; opslaan doet de Engine (contract).
|
|
1769
|
+
IF coalesce(nullif(v_preview->>'carrierId', '')::uuid, v_carrier) IS NULL THEN
|
|
1766
1770
|
RETURN jsonb_build_object('ok', false, 'reason', 'Er is geen vervoerder bekend voor deze afleverlocatie.');
|
|
1767
1771
|
END IF;
|
|
1768
1772
|
v_moment := v_chosen->>'momentKey';
|
|
@@ -1772,7 +1776,6 @@ BEGIN
|
|
|
1772
1776
|
'source', v_cf_source,
|
|
1773
1777
|
v_key, p_source_id,
|
|
1774
1778
|
'delivery_location', p_delivery_location_id,
|
|
1775
|
-
'carrier', v_carrier,
|
|
1776
1779
|
'pickup_moment', v_moment,
|
|
1777
1780
|
'is_reservation', false);
|
|
1778
1781
|
IF nullif(trim(coalesce(p_customer_reference, '')), '') IS NOT NULL THEN
|
|
@@ -1800,14 +1803,39 @@ BEGIN
|
|
|
1800
1803
|
nullif(i->>'quantity_crates', '')::int, i->>'vbn', i->>'lc', i->>'psrc'
|
|
1801
1804
|
FROM jsonb_array_elements(v_items) i;
|
|
1802
1805
|
|
|
1803
|
-
--
|
|
1806
|
+
-- Vervoerder via het gedeelde contract. Zonder p_carrier_id kiest de Engine zelf.
|
|
1807
|
+
-- Mislukt het instellen, dan blijft de order bewaard met een waarschuwing.
|
|
1808
|
+
IF v_carrier IS NOT NULL AND NOT coalesce(p_own_transport, false) THEN
|
|
1809
|
+
BEGIN
|
|
1810
|
+
IF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NOT NULL THEN
|
|
1811
|
+
EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2, $3)' USING v_order_id, v_carrier, v_uid;
|
|
1812
|
+
ELSIF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid)') IS NOT NULL THEN
|
|
1813
|
+
RAISE LOG 'verkoop_create_order: logistics_set_order_carrier met drie argumenten ontbreekt, variant met twee gebruikt (order %)', v_order_id;
|
|
1814
|
+
EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_carrier;
|
|
1815
|
+
ELSE
|
|
1816
|
+
RAISE LOG 'verkoop_create_order: logistics_set_order_carrier ontbreekt, oude opslag gebruikt (order %)', v_order_id;
|
|
1817
|
+
v_carrier_fallback := true;
|
|
1818
|
+
UPDATE public.orders SET custom_fields = coalesce(custom_fields, '{}'::jsonb) || jsonb_build_object('carrier', v_carrier)
|
|
1819
|
+
WHERE id = v_order_id;
|
|
1820
|
+
END IF;
|
|
1821
|
+
EXCEPTION WHEN others THEN
|
|
1822
|
+
GET STACKED DIAGNOSTICS v_carrier_err = MESSAGE_TEXT;
|
|
1823
|
+
v_carrier_warning := 'De gekozen vervoerder kon niet worden ingesteld; de planning kiest er zelf een. Reden: ' || coalesce(v_carrier_err, 'onbekend');
|
|
1824
|
+
RAISE WARNING 'verkoop_create_order: %', v_carrier_warning;
|
|
1825
|
+
UPDATE public.orders SET custom_fields = coalesce(custom_fields, '{}'::jsonb)
|
|
1826
|
+
|| jsonb_build_object('carrier_warning', jsonb_build_object('message', v_carrier_warning, 'requested_carrier_id', v_carrier, 'at', now()))
|
|
1827
|
+
WHERE id = v_order_id;
|
|
1828
|
+
END;
|
|
1829
|
+
END IF;
|
|
1830
|
+
|
|
1804
1831
|
BEGIN
|
|
1805
1832
|
PERFORM public.logistics_emit_event('verkoop', 'order.received', v_order_id::text,
|
|
1806
1833
|
jsonb_build_object('orderId', v_order_id), NULL, false, 'order-received:' || v_order_id::text, 0);
|
|
1807
1834
|
EXCEPTION WHEN others THEN NULL;
|
|
1808
1835
|
END;
|
|
1809
1836
|
|
|
1810
|
-
RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false
|
|
1837
|
+
RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false,
|
|
1838
|
+
'carrier_warning', v_carrier_warning, 'carrier_fallback', v_carrier_fallback);
|
|
1811
1839
|
END;
|
|
1812
1840
|
$function$
|
|
1813
1841
|
;
|
|
@@ -2170,6 +2198,7 @@ AS $function$
|
|
|
2170
2198
|
DECLARE
|
|
2171
2199
|
v_uid uuid := auth.uid();
|
|
2172
2200
|
v_role public.app_role;
|
|
2201
|
+
v_ctx text;
|
|
2173
2202
|
BEGIN
|
|
2174
2203
|
IF public.verkoop_is_server() THEN RETURN; END IF;
|
|
2175
2204
|
IF p_level = 'server' THEN
|
|
@@ -2178,6 +2207,13 @@ BEGIN
|
|
|
2178
2207
|
IF v_uid IS NOT NULL THEN RETURN; END IF;
|
|
2179
2208
|
ELSIF p_level = 'keten' THEN
|
|
2180
2209
|
IF v_uid IS NOT NULL OR pg_trigger_depth() > 0 THEN RETURN; END IF;
|
|
2210
|
+
ELSIF p_level = 'keten_genest' THEN
|
|
2211
|
+
-- Ingelogd, trigger, of geneste aanroep vanuit een andere databasefunctie.
|
|
2212
|
+
-- Genest = de aanroepstapel (PG_CONTEXT) bevat meer dan deze poort en de
|
|
2213
|
+
-- beschermde functie zelf. Een rechtstreekse API-aanroep heeft er precies twee.
|
|
2214
|
+
IF v_uid IS NOT NULL OR pg_trigger_depth() > 0 THEN RETURN; END IF;
|
|
2215
|
+
GET DIAGNOSTICS v_ctx = PG_CONTEXT;
|
|
2216
|
+
IF (SELECT count(*) FROM regexp_split_to_table(v_ctx, E'\n') l WHERE l ~ '^(PL/pgSQL|SQL) function ') > 2 THEN RETURN; END IF;
|
|
2181
2217
|
ELSIF p_level = 'rol' THEN
|
|
2182
2218
|
IF v_uid IS NOT NULL AND p_roles IS NOT NULL THEN
|
|
2183
2219
|
FOREACH v_role IN ARRAY p_roles LOOP
|
|
@@ -2205,6 +2241,107 @@ BEGIN
|
|
|
2205
2241
|
END;
|
|
2206
2242
|
$function$;
|
|
2207
2243
|
|
|
2244
|
+
-- Verkoop 1.0.117: logboek + correctiefunctie verpakking orderregels (alleen server)
|
|
2245
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_correctie_log (
|
|
2246
|
+
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
2247
|
+
correctie text NOT NULL,
|
|
2248
|
+
uitgevoerd_op timestamptz NOT NULL DEFAULT now(),
|
|
2249
|
+
uitgevoerd_door uuid,
|
|
2250
|
+
door_label text NOT NULL,
|
|
2251
|
+
uitvoeren boolean NOT NULL,
|
|
2252
|
+
aantal_orders integer NOT NULL DEFAULT 0,
|
|
2253
|
+
aantal_orders_gewijzigd integer NOT NULL DEFAULT 0,
|
|
2254
|
+
aantal_regels_gewijzigd integer NOT NULL DEFAULT 0,
|
|
2255
|
+
aantal_overgeslagen integer NOT NULL DEFAULT 0,
|
|
2256
|
+
details jsonb NOT NULL DEFAULT '{}'::jsonb,
|
|
2257
|
+
created_at timestamptz NOT NULL DEFAULT now()
|
|
2258
|
+
);
|
|
2259
|
+
GRANT ALL ON public.verkoop_correctie_log TO service_role;
|
|
2260
|
+
REVOKE ALL ON public.verkoop_correctie_log FROM anon, authenticated;
|
|
2261
|
+
ALTER TABLE public.verkoop_correctie_log ENABLE ROW LEVEL SECURITY;
|
|
2262
|
+
|
|
2263
|
+
CREATE OR REPLACE FUNCTION public.verkoop_correctie_verpakking(p_uitvoeren boolean DEFAULT false)
|
|
2264
|
+
RETURNS jsonb
|
|
2265
|
+
LANGUAGE plpgsql
|
|
2266
|
+
SECURITY DEFINER
|
|
2267
|
+
SET search_path TO 'public'
|
|
2268
|
+
AS $function$
|
|
2269
|
+
DECLARE
|
|
2270
|
+
v_vr jsonb; v_rows jsonb; v_te_doen jsonb; v_over jsonb;
|
|
2271
|
+
v_n_orders int; v_n_over int; v_n_regels int := 0; v_n_ord_gew int := 0; v_uid uuid := auth.uid();
|
|
2272
|
+
BEGIN
|
|
2273
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2274
|
+
RAISE EXCEPTION USING ERRCODE = '42501', MESSAGE = 'Deze correctie mag alleen door de server worden uitgevoerd.';
|
|
2275
|
+
END IF;
|
|
2276
|
+
PERFORM public.verkoop_assert_caller('server'); -- verkoop-poort
|
|
2277
|
+
|
|
2278
|
+
IF to_regprocedure('public.voorraad_correctie_status(text)') IS NULL THEN
|
|
2279
|
+
RAISE EXCEPTION USING ERRCODE = 'P0001', MESSAGE = 'Voorraad-module bijwerken: de controle op Voorraad-correctie 1098 ontbreekt in deze omgeving. Er is niets gewijzigd.';
|
|
2280
|
+
END IF;
|
|
2281
|
+
v_vr := public.voorraad_correctie_status('1098');
|
|
2282
|
+
IF coalesce((v_vr->>'uitgevoerd')::boolean, false) IS NOT TRUE THEN
|
|
2283
|
+
RAISE EXCEPTION USING ERRCODE = 'P0001', MESSAGE = 'Voer eerst Voorraad-correctie 1098 uit in deze omgeving. Er is niets gewijzigd.';
|
|
2284
|
+
END IF;
|
|
2285
|
+
|
|
2286
|
+
SELECT coalesce(jsonb_agg(to_jsonb(d)), '[]'::jsonb) INTO v_rows FROM public.verkoop_packing_drift_report() d;
|
|
2287
|
+
|
|
2288
|
+
SELECT coalesce(jsonb_agg(x ORDER BY x->>'order_number'), '[]'::jsonb) INTO v_te_doen FROM (
|
|
2289
|
+
SELECT jsonb_build_object('order_id', r->>'order_id', 'order_number', min(r->>'order_number'),
|
|
2290
|
+
'regels', jsonb_agg(jsonb_build_object('order_item_id', r->>'order_item_id', 'sales_order_id', r->>'sales_order_id',
|
|
2291
|
+
'oud', jsonb_build_object('planten_per_fust', r->'cur_plants_per_crate', 'fusten_per_laag', r->'cur_crates_per_layer', 'lagen_per_kar', r->'cur_layers_per_cart'),
|
|
2292
|
+
'nieuw', jsonb_build_object('planten_per_fust', r->'fd_plants_per_crate', 'fusten_per_laag', r->'fd_crates_per_layer', 'lagen_per_kar', r->'fd_layers_per_cart')))) x
|
|
2293
|
+
FROM jsonb_array_elements(v_rows) r
|
|
2294
|
+
WHERE NOT (r->>'afgesloten')::boolean AND NOT (r->>'vastgezet')::boolean
|
|
2295
|
+
GROUP BY r->>'order_id') s;
|
|
2296
|
+
|
|
2297
|
+
SELECT coalesce(jsonb_agg(x ORDER BY x->>'order_number'), '[]'::jsonb) INTO v_over FROM (
|
|
2298
|
+
SELECT jsonb_build_object('order_id', r->>'order_id', 'order_number', min(r->>'order_number'), 'status', min(r->>'order_status'),
|
|
2299
|
+
'reden', CASE WHEN bool_or((r->>'afgesloten')::boolean) THEN 'afgesloten' ELSE 'vastgezet' END,
|
|
2300
|
+
'aantal_regels', count(*)) x
|
|
2301
|
+
FROM jsonb_array_elements(v_rows) r
|
|
2302
|
+
WHERE (r->>'afgesloten')::boolean OR (r->>'vastgezet')::boolean
|
|
2303
|
+
GROUP BY r->>'order_id') s;
|
|
2304
|
+
|
|
2305
|
+
v_n_orders := jsonb_array_length(v_te_doen);
|
|
2306
|
+
v_n_over := jsonb_array_length(v_over);
|
|
2307
|
+
|
|
2308
|
+
IF p_uitvoeren THEN
|
|
2309
|
+
UPDATE public.order_items oi SET
|
|
2310
|
+
plants_per_crate = d.fd_plants_per_crate,
|
|
2311
|
+
crates_per_layer = d.fd_crates_per_layer,
|
|
2312
|
+
layers_per_cart = d.fd_layers_per_cart,
|
|
2313
|
+
vbn_package_code = coalesce(d.fd_vbn_package_code, oi.vbn_package_code),
|
|
2314
|
+
load_carrier_type = coalesce(d.fd_load_carrier_type, oi.load_carrier_type),
|
|
2315
|
+
packing_source = 'floriday_order'
|
|
2316
|
+
FROM public.verkoop_packing_drift_report() d
|
|
2317
|
+
WHERE d.order_item_id = oi.id
|
|
2318
|
+
AND NOT d.afgesloten AND NOT d.vastgezet
|
|
2319
|
+
AND oi.packing_locked_at IS NULL
|
|
2320
|
+
AND oi.quarantined_at IS NULL
|
|
2321
|
+
AND (oi.plants_per_crate IS DISTINCT FROM d.fd_plants_per_crate
|
|
2322
|
+
OR oi.crates_per_layer IS DISTINCT FROM d.fd_crates_per_layer
|
|
2323
|
+
OR oi.layers_per_cart IS DISTINCT FROM d.fd_layers_per_cart);
|
|
2324
|
+
GET DIAGNOSTICS v_n_regels = ROW_COUNT;
|
|
2325
|
+
v_n_ord_gew := CASE WHEN v_n_regels > 0 THEN v_n_orders ELSE 0 END;
|
|
2326
|
+
END IF;
|
|
2327
|
+
|
|
2328
|
+
INSERT INTO public.verkoop_correctie_log (correctie, uitgevoerd_door, door_label, uitvoeren, aantal_orders,
|
|
2329
|
+
aantal_orders_gewijzigd, aantal_regels_gewijzigd, aantal_overgeslagen, details)
|
|
2330
|
+
VALUES ('verpakking', v_uid, CASE WHEN v_uid IS NULL THEN 'systeem' ELSE 'gebruiker' END, p_uitvoeren, v_n_orders,
|
|
2331
|
+
v_n_ord_gew, v_n_regels, v_n_over, jsonb_build_object('orders', v_te_doen, 'overgeslagen', v_over, 'voorraad_1098', v_vr));
|
|
2332
|
+
|
|
2333
|
+
RETURN jsonb_build_object(
|
|
2334
|
+
'uitgevoerd', p_uitvoeren,
|
|
2335
|
+
'aantal_orders', v_n_orders,
|
|
2336
|
+
'aantal_regels_gewijzigd', v_n_regels,
|
|
2337
|
+
'aantal_overgeslagen', v_n_over,
|
|
2338
|
+
'orders', v_te_doen,
|
|
2339
|
+
'overgeslagen', v_over,
|
|
2340
|
+
'karindeling', 'De Logistieke Engine plant gewijzigde orders zelf opnieuw in (trigger op orderregels bij wijziging van planten per fust, fusten per laag of lagen per kar).');
|
|
2341
|
+
END $function$;
|
|
2342
|
+
REVOKE ALL ON FUNCTION public.verkoop_correctie_verpakking(boolean) FROM PUBLIC, anon, authenticated;
|
|
2343
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_correctie_verpakking(boolean) TO service_role;
|
|
2344
|
+
|
|
2208
2345
|
-- Lijst: functie → niveau. Ook gebruikt door verkoop_install_check().
|
|
2209
2346
|
CREATE OR REPLACE FUNCTION public.verkoop_guarded_functions()
|
|
2210
2347
|
RETURNS TABLE(sig text, niveau text, rollen text, opmerking text)
|
|
@@ -2214,7 +2351,7 @@ CREATE OR REPLACE FUNCTION public.verkoop_guarded_functions()
|
|
|
2214
2351
|
AS $function$
|
|
2215
2352
|
SELECT * FROM (VALUES
|
|
2216
2353
|
('verkoop_insert_manual_order(jsonb,jsonb,text)', 'server', NULL, NULL),
|
|
2217
|
-
('verkoop_create_order(text,text,uuid,date,uuid,uuid,jsonb,text,text,boolean,text,boolean,text)', '
|
|
2354
|
+
('verkoop_create_order(text,text,uuid,date,uuid,uuid,jsonb,text,text,boolean,text,boolean,text)', 'keten_genest', NULL, 'verkoop_create_order: geneste aanroep toegestaan (Aanbiedingsmail), wacht op ronde Aanbiedingsmail. Let op: elke functie die anon mag uitvoeren en verkoop_create_order aanroept, wordt zo een open deur; de bescherming ligt dan bij die buitenste functie'),
|
|
2218
2355
|
('verkoop_packing_drift_report()', 'rol', 'admin,superadmin', NULL),
|
|
2219
2356
|
('verkoop_packing_drift_apply(uuid[])', 'rol', 'admin,superadmin', NULL),
|
|
2220
2357
|
('assign_floriday_order_numbers(text[])', 'ingelogd', NULL, NULL),
|
|
@@ -2231,6 +2368,7 @@ AS $function$
|
|
|
2231
2368
|
('reset_cart_layer_positions(uuid)', 'ingelogd', NULL, NULL),
|
|
2232
2369
|
('move_cart_layer_position(uuid,integer,numeric,numeric)', 'ingelogd', NULL, NULL),
|
|
2233
2370
|
('swap_cart_layer_positions(uuid,uuid)', 'ingelogd', NULL, NULL),
|
|
2371
|
+
('verkoop_correctie_verpakking(boolean)', 'server', NULL, 'eenmalige correctie verpakking orderregels; vereist Voorraad-correctie 1098'),
|
|
2234
2372
|
('order_number_prefix(text,jsonb)', 'open', NULL, 'bewust open: rekenhulp zonder gegevens')
|
|
2235
2373
|
) v(sig, niveau, rollen, opmerking);
|
|
2236
2374
|
$function$;
|
|
@@ -2272,6 +2410,11 @@ BEGIN
|
|
|
2272
2410
|
END IF;');
|
|
2273
2411
|
END IF;
|
|
2274
2412
|
|
|
2413
|
+
IF r.sig LIKE 'verkoop_create_order(%' THEN
|
|
2414
|
+
v_new := replace(v_new, 'PERFORM public.verkoop_assert_caller(''ingelogd''); -- verkoop-poort',
|
|
2415
|
+
'PERFORM public.verkoop_assert_caller(''keten_genest''); -- verkoop-poort');
|
|
2416
|
+
END IF;
|
|
2417
|
+
|
|
2275
2418
|
IF position('verkoop_assert_caller' IN v_new) = 0 THEN
|
|
2276
2419
|
v_call := format('PERFORM public.verkoop_assert_caller(%L%s); -- verkoop-poort',
|
|
2277
2420
|
r.niveau,
|
|
@@ -2333,6 +2476,17 @@ BEGIN
|
|
|
2333
2476
|
FROM (VALUES
|
|
2334
2477
|
('service role manages replan queue','cart_replan_queue'),('Authenticated can read delivery notes','delivery_notes'),('Ingelogde gebruikers lezen samenvoeglog','floriday_merge_log'),('Ingelogde gebruikers kunnen de statuswachtrij lezen','floriday_status_sync_queue'),('Ingelogde gebruikers kunnen statuswijzigingen aanmelden','floriday_status_sync_queue'),('Authenticated can manage invoice timing settings','invoice_timing_settings'),('job_locks service only','job_locks'),('Ingelogde gebruikers kunnen blokkademeldingen lezen','order_block_notifications'),('Authenticated users can manage order_buffers','order_buffers'),('Authenticated users can read order_buffers','order_buffers'),('authenticated_read_cart_layer_positions','order_cart_layer_positions'),('service_role_manage_cart_layer_positions','order_cart_layer_positions'),('Counters readable by authenticated','order_number_counters'),('Ingelogde gebruikers leggen weggehaalde meldingen vast','order_review_dismissals'),('Ingelogde gebruikers lezen weggehaalde meldingen','order_review_dismissals'),('Authenticated can delete order_shipment_items','order_shipment_items'),('Authenticated can insert order_shipment_items','order_shipment_items'),('Authenticated can read order_shipment_items','order_shipment_items'),('Authenticated can update order_shipment_items','order_shipment_items'),('Authenticated can delete order_shipments','order_shipments'),('Authenticated can insert order_shipments','order_shipments'),('Authenticated can read order_shipments','order_shipments'),('Authenticated can update order_shipments','order_shipments'),('Authenticated can manage stock consumption alerts','stock_consumption_alerts')
|
|
2335
2478
|
) pl(pol, tbl);
|
|
2479
|
+
|
|
2480
|
+
RETURN QUERY
|
|
2481
|
+
SELECT 'tabel'::text, 'verkoop_correctie_log'::text,
|
|
2482
|
+
to_regclass('public.verkoop_correctie_log') IS NOT NULL,
|
|
2483
|
+
NULL::text, NULL::boolean,
|
|
2484
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN NULL ELSE has_table_privilege('anon','public.verkoop_correctie_log','SELECT') END,
|
|
2485
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN NULL ELSE has_table_privilege('authenticated','public.verkoop_correctie_log','SELECT') END,
|
|
2486
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN 'tabel ontbreekt'
|
|
2487
|
+
WHEN NOT (SELECT c.relrowsecurity FROM pg_class c WHERE c.oid = to_regclass('public.verkoop_correctie_log')) THEN 'FOUT: beveiliging per rij staat UIT'
|
|
2488
|
+
WHEN EXISTS (SELECT 1 FROM pg_policies x WHERE x.schemaname='public' AND x.tablename='verkoop_correctie_log' AND (x.roles && ARRAY['anon','authenticated','public']::name[])) THEN 'FOUT: er is een policy voor anon of authenticated'
|
|
2489
|
+
ELSE 'in orde: beveiliging per rij aan, geen policies (alleen de functie schrijft)' END;
|
|
2336
2490
|
END;
|
|
2337
2491
|
$function$;
|
|
2338
2492
|
|