@flowselections/floriday-verkoop-module 1.0.168 → 1.0.169

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.
Files changed (30) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +33 -10
  3. package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
  4. package/dist-lib/components/verkoop/EditLocalOrderDialog.js +21 -8
  5. package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
  6. package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +3 -1
  7. package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -1
  8. package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +34 -15
  9. package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +12 -2
  10. package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -1
  11. package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +14 -7
  12. package/dist-lib/components/verkoop/regel/StickerKeuzeRegels.d.ts +19 -0
  13. package/dist-lib/components/verkoop/regel/StickerKeuzeRegels.d.ts.map +1 -0
  14. package/dist-lib/components/verkoop/regel/StickerKeuzeRegels.js +30 -0
  15. package/dist-lib/integrations/supabase/types.d.ts +186 -0
  16. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  17. package/dist-lib/lib/create-order.functions.d.ts +3 -0
  18. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  19. package/dist-lib/lib/create-order.functions.js +12 -1
  20. package/dist-lib/lib/order-item-packing.functions.d.ts +3 -0
  21. package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
  22. package/dist-lib/lib/order-item-packing.functions.js +9 -1
  23. package/dist-lib/lib/order-line-extras.d.ts +31 -0
  24. package/dist-lib/lib/order-line-extras.d.ts.map +1 -1
  25. package/dist-lib/lib/order-line-extras.functions.d.ts +20 -1
  26. package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -1
  27. package/dist-lib/lib/order-line-extras.functions.js +47 -1
  28. package/dist-lib/lib/order-line-extras.js +67 -0
  29. package/package.json +2 -2
  30. package/schema/verkoop.sql +85 -150
@@ -2080,10 +2080,10 @@ DO $t$ BEGIN
2080
2080
  CREATE UNIQUE INDEX IF NOT EXISTS orders_manual_idempotency_uniq ON public.orders ((custom_fields->>'idempotency_key')) WHERE ((custom_fields->>'idempotency_key') IS NOT NULL);
2081
2081
  EXCEPTION WHEN undefined_table OR undefined_column THEN RAISE NOTICE 'verkoop-schema: index overgeslagen (%)', SQLERRM; END $t$;
2082
2082
  CREATE OR REPLACE FUNCTION public.verkoop_insert_manual_order(p_order jsonb, p_items jsonb, p_idempotency_key text)
2083
- RETURNS jsonb
2084
- LANGUAGE plpgsql
2085
- SECURITY DEFINER
2086
- SET search_path TO 'public'
2083
+ RETURNS jsonb
2084
+ LANGUAGE plpgsql
2085
+ SECURITY DEFINER
2086
+ SET search_path TO 'public'
2087
2087
  AS $function$
2088
2088
  DECLARE
2089
2089
  v_uid uuid := auth.uid();
@@ -2091,13 +2091,16 @@ DECLARE
2091
2091
  v_order_id uuid;
2092
2092
  v_order_number text;
2093
2093
  v_item jsonb;
2094
+ v_item_id uuid;
2094
2095
  v_idx int := 0;
2095
2096
  v_cf jsonb;
2096
2097
  v_manual_carrier uuid := NULLIF(p_order->>'manual_carrier_id','')::uuid;
2097
2098
  v_fallback_carrier uuid := NULLIF(p_order->>'fallback_carrier_id','')::uuid;
2098
2099
  v_set_by uuid := NULLIF(p_order->>'set_by_user_id','')::uuid;
2099
2100
  v_engine_has_set boolean := to_regprocedure('public.logistics_set_order_carrier(uuid,uuid)') IS NOT NULL;
2101
+ v_note text; v_fields jsonb; v_ps uuid; v_fs uuid; v_pm text; v_fm text; v_reden text;
2100
2102
  BEGIN
2103
+ PERFORM public.verkoop_assert_caller('server'); -- verkoop-poort
2101
2104
  IF v_uid IS NOT NULL AND NOT (public.has_role(v_uid,'admin') OR public.has_role(v_uid,'sales')
2102
2105
  OR public.has_role(v_uid,'manager') OR public.has_role(v_uid,'superadmin')) THEN
2103
2106
  RETURN jsonb_build_object('ok', false, 'reason', 'Je hebt geen rechten om bestellingen aan te maken.');
@@ -2116,7 +2119,6 @@ BEGIN
2116
2119
  END IF;
2117
2120
 
2118
2121
  v_cf := (COALESCE(p_order->'custom_fields', '{}'::jsonb) - 'carrier') || jsonb_build_object('idempotency_key', p_idempotency_key);
2119
- -- Oude Engine (zonder logistics_set_order_carrier): bestaande opslag als terugval.
2120
2122
  IF NOT v_engine_has_set AND v_fallback_carrier IS NOT NULL THEN
2121
2123
  v_cf := v_cf || jsonb_build_object('carrier', v_fallback_carrier);
2122
2124
  END IF;
@@ -2146,27 +2148,45 @@ BEGIN
2146
2148
  (v_item->>'quantity')::numeric,
2147
2149
  COALESCE(NULLIF(v_item->>'unit',''), 'stuks'),
2148
2150
  NULLIF(v_item->>'unit_price','')::numeric,
2149
- COALESCE((v_item->>'needs_sticker')::boolean, false),
2151
+ COALESCE((v_item->>'needs_sticker')::boolean, false) AND COALESCE(v_item->>'pot_sticker_modus','auto') <> 'uit',
2150
2152
  NULLIF(v_item->>'plants_per_crate','')::numeric,
2151
2153
  NULLIF(v_item->>'crates_per_layer','')::numeric,
2152
2154
  NULLIF(v_item->>'layers_per_cart','')::numeric,
2153
2155
  NULLIF(v_item->>'quantity_crates','')::numeric,
2154
2156
  NULLIF(v_item->>'vbn_package_code',''),
2155
2157
  NULLIF(v_item->>'load_carrier_type',''),
2156
- NULLIF(v_item->>'packing_source',''));
2158
+ NULLIF(v_item->>'packing_source',''))
2159
+ RETURNING id INTO v_item_id;
2160
+
2161
+ v_note := NULLIF(left(btrim(COALESCE(v_item->>'line_note','')), 500), '');
2162
+ v_fields := public.verkoop_regelvelden_norm(v_item->'line_fields');
2163
+ v_ps := NULLIF(v_item->>'product_sticker_id','')::uuid;
2164
+ v_fs := NULLIF(v_item->>'fust_sticker_id','')::uuid;
2165
+ v_pm := COALESCE(NULLIF(v_item->>'pot_sticker_modus',''), CASE WHEN v_ps IS NOT NULL THEN 'handmatig' ELSE 'auto' END);
2166
+ v_fm := COALESCE(NULLIF(v_item->>'fust_sticker_modus',''), CASE WHEN v_fs IS NOT NULL THEN 'handmatig' ELSE 'auto' END);
2167
+ v_reden := NULLIF(left(btrim(COALESCE(v_item->>'sticker_reden','')), 300), '');
2168
+ IF v_pm <> 'handmatig' THEN v_ps := NULL; END IF;
2169
+ IF v_fm <> 'handmatig' THEN v_fs := NULL; END IF;
2170
+ IF v_note IS NOT NULL OR v_fields <> '[]'::jsonb OR v_ps IS NOT NULL OR v_fs IS NOT NULL OR v_pm <> 'auto' OR v_fm <> 'auto' THEN
2171
+ INSERT INTO public.verkoop_orderregel_extra (order_item_id, order_id, line_note, line_fields, product_sticker_id, fust_sticker_id, pot_sticker_modus, fust_sticker_modus, sticker_reden, updated_by)
2172
+ VALUES (v_item_id, v_order_id, v_note, v_fields, v_ps, v_fs, v_pm, v_fm, v_reden, COALESCE(v_uid, v_set_by));
2173
+ END IF;
2157
2174
  EXCEPTION WHEN others THEN
2158
2175
  RAISE EXCEPTION 'De bestelling is niet aangemaakt: regel % kon niet worden opgeslagen (%). Er is niets bewaard.', v_idx, SQLERRM
2159
2176
  USING ERRCODE = 'P0001';
2160
2177
  END;
2161
2178
  END LOOP;
2162
2179
 
2163
- -- Handmatige vervoerder in dezelfde transactie via de Engine (eigenaar).
2164
2180
  IF v_engine_has_set AND v_manual_carrier IS NOT NULL THEN
2165
- IF v_uid IS NULL AND v_set_by IS NOT NULL THEN
2181
+ IF v_uid IS NULL AND v_set_by IS NOT NULL AND to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NULL THEN
2166
2182
  PERFORM set_config('request.jwt.claims', jsonb_build_object('sub', v_set_by, 'role', 'authenticated')::text, true);
2167
2183
  END IF;
2168
2184
  BEGIN
2169
- EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_manual_carrier;
2185
+ IF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NOT NULL THEN
2186
+ EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2, $3)' USING v_order_id, v_manual_carrier, v_set_by;
2187
+ ELSE
2188
+ EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_manual_carrier;
2189
+ END IF;
2170
2190
  EXCEPTION WHEN others THEN
2171
2191
  RAISE EXCEPTION 'De bestelling is niet aangemaakt: de vervoerder kon niet worden vastgelegd (%). Er is niets bewaard.', SQLERRM
2172
2192
  USING ERRCODE = 'P0001';
@@ -5135,11 +5155,13 @@ GRANT EXECUTE ON FUNCTION public.verkoop_regelvelden_norm(jsonb) TO authenticate
5135
5155
 
5136
5156
  -- Wijzigen van regelgegevens bij een bestaande order: rol + nog niet geprint/gepickt.
5137
5157
  CREATE OR REPLACE FUNCTION public.verkoop_orderregel_extra_opslaan(p_order_item_id uuid, p_patch jsonb)
5138
- RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public' AS $f$
5158
+ RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
5159
+ AS $function$
5139
5160
  DECLARE
5140
5161
  v_uid uuid := auth.uid();
5141
5162
  v_order uuid; v_src text; v_cf jsonb; v_printed int; v_scanned int; v_known boolean := false;
5142
- v_note text; v_fields jsonb; v_ps uuid; v_fs uuid;
5163
+ v_note text; v_fields jsonb; v_ps uuid; v_fs uuid; v_pm text; v_fm text; v_reden text;
5164
+ v_alleen_sticker boolean; v_pot_nu text;
5143
5165
  BEGIN
5144
5166
  IF v_uid IS NULL THEN
5145
5167
  RETURN jsonb_build_object('ok', false, 'reden', 'Je bent niet ingelogd.');
@@ -5155,7 +5177,9 @@ BEGIN
5155
5177
  IF v_order IS NULL THEN
5156
5178
  RETURN jsonb_build_object('ok', false, 'reden', 'Deze bestelregel bestaat niet meer.');
5157
5179
  END IF;
5158
- IF v_src IN ('floriday', 'fo') THEN
5180
+ -- Floriday-orders: alleen de stickerkeuze mag hier (de rest wijzig je in Floriday).
5181
+ v_alleen_sticker := NOT (p_patch ?| ARRAY['line_note','line_fields']);
5182
+ IF v_src IN ('floriday', 'fo') AND NOT v_alleen_sticker THEN
5159
5183
  RETURN jsonb_build_object('ok', false, 'reden', 'Floriday-orders wijzig je in Floriday.');
5160
5184
  END IF;
5161
5185
  IF to_regprocedure('public.logistics_order_pick_progress(uuid[])') IS NOT NULL THEN
@@ -5180,148 +5204,35 @@ BEGIN
5180
5204
  v_fields := CASE WHEN p_patch ? 'line_fields' THEN public.verkoop_regelvelden_norm(p_patch->'line_fields') END;
5181
5205
  v_ps := CASE WHEN p_patch ? 'product_sticker_id' THEN NULLIF(p_patch->>'product_sticker_id','')::uuid END;
5182
5206
  v_fs := CASE WHEN p_patch ? 'fust_sticker_id' THEN NULLIF(p_patch->>'fust_sticker_id','')::uuid END;
5183
-
5184
- INSERT INTO public.verkoop_orderregel_extra AS x (order_item_id, order_id, line_note, line_fields, product_sticker_id, fust_sticker_id, updated_by)
5185
- VALUES (p_order_item_id, v_order, v_note, COALESCE(v_fields, '[]'::jsonb), v_ps, v_fs, v_uid)
5207
+ v_pm := NULLIF(p_patch->>'pot_sticker_modus','');
5208
+ v_fm := NULLIF(p_patch->>'fust_sticker_modus','');
5209
+ v_reden := CASE WHEN p_patch ? 'sticker_reden' THEN NULLIF(left(btrim(COALESCE(p_patch->>'sticker_reden','')), 300), '') END;
5210
+ IF (v_pm = 'uit' OR v_fm = 'uit') AND v_reden IS NULL AND NOT EXISTS (
5211
+ SELECT 1 FROM public.verkoop_orderregel_extra WHERE order_item_id = p_order_item_id AND sticker_reden IS NOT NULL) THEN
5212
+ RETURN jsonb_build_object('ok', false, 'reden', 'Geef een reden op voor niet printen.');
5213
+ END IF;
5214
+
5215
+ INSERT INTO public.verkoop_orderregel_extra AS x (order_item_id, order_id, line_note, line_fields, product_sticker_id, fust_sticker_id,
5216
+ pot_sticker_modus, fust_sticker_modus, sticker_reden, updated_by)
5217
+ VALUES (p_order_item_id, v_order, v_note, COALESCE(v_fields, '[]'::jsonb), v_ps, v_fs,
5218
+ COALESCE(v_pm, CASE WHEN v_ps IS NOT NULL THEN 'handmatig' ELSE 'auto' END),
5219
+ COALESCE(v_fm, CASE WHEN v_fs IS NOT NULL THEN 'handmatig' ELSE 'auto' END), v_reden, v_uid)
5186
5220
  ON CONFLICT (order_item_id) DO UPDATE SET
5187
5221
  line_note = CASE WHEN p_patch ? 'line_note' THEN EXCLUDED.line_note ELSE x.line_note END,
5188
5222
  line_fields = CASE WHEN p_patch ? 'line_fields' THEN EXCLUDED.line_fields ELSE x.line_fields END,
5189
5223
  product_sticker_id = CASE WHEN p_patch ? 'product_sticker_id' THEN EXCLUDED.product_sticker_id ELSE x.product_sticker_id END,
5190
5224
  fust_sticker_id = CASE WHEN p_patch ? 'fust_sticker_id' THEN EXCLUDED.fust_sticker_id ELSE x.fust_sticker_id END,
5191
- updated_by = v_uid;
5225
+ pot_sticker_modus = COALESCE(v_pm, CASE WHEN p_patch ? 'product_sticker_id' THEN CASE WHEN v_ps IS NOT NULL THEN 'handmatig' ELSE 'auto' END ELSE x.pot_sticker_modus END),
5226
+ fust_sticker_modus = COALESCE(v_fm, CASE WHEN p_patch ? 'fust_sticker_id' THEN CASE WHEN v_fs IS NOT NULL THEN 'handmatig' ELSE 'auto' END ELSE x.fust_sticker_modus END),
5227
+ sticker_reden = CASE WHEN p_patch ? 'sticker_reden' THEN EXCLUDED.sticker_reden ELSE x.sticker_reden END,
5228
+ updated_by = v_uid
5229
+ RETURNING pot_sticker_modus INTO v_pot_nu;
5230
+
5231
+ -- Voor oudere modules: needs_sticker gelijk aan "potsticker niet uit"; alleen schrijven bij verschil.
5232
+ UPDATE public.order_items SET needs_sticker = (v_pot_nu <> 'uit')
5233
+ WHERE id = p_order_item_id AND v_pm IS NOT NULL AND needs_sticker IS DISTINCT FROM (v_pot_nu <> 'uit');
5192
5234
  RETURN jsonb_build_object('ok', true);
5193
- END $f$;
5194
- REVOKE EXECUTE ON FUNCTION public.verkoop_orderregel_extra_opslaan(uuid, jsonb) FROM PUBLIC, anon;
5195
- GRANT EXECUTE ON FUNCTION public.verkoop_orderregel_extra_opslaan(uuid, jsonb) TO authenticated, service_role;
5196
-
5197
- -- Leesfunctie voor pakbon/andere modules: regelgegevens van één order.
5198
- CREATE OR REPLACE FUNCTION public.verkoop_orderregel_extra_voor_order(p_order_id uuid)
5199
- RETURNS jsonb LANGUAGE sql STABLE SECURITY INVOKER SET search_path TO 'public' AS $f$
5200
- SELECT COALESCE(jsonb_agg(jsonb_build_object(
5201
- 'order_item_id', x.order_item_id,
5202
- 'opmerking', x.line_note,
5203
- 'extra_velden', x.line_fields,
5204
- 'productsticker_id', x.product_sticker_id,
5205
- 'fuststicker_id', x.fust_sticker_id) ORDER BY x.created_at), '[]'::jsonb)
5206
- FROM public.verkoop_orderregel_extra x WHERE x.order_id = p_order_id
5207
- $f$;
5208
- REVOKE EXECUTE ON FUNCTION public.verkoop_orderregel_extra_voor_order(uuid) FROM PUBLIC, anon;
5209
- GRANT EXECUTE ON FUNCTION public.verkoop_orderregel_extra_voor_order(uuid) TO authenticated, service_role;
5210
-
5211
- -- 2. Handmatige order: regelgegevens in dezelfde transactie (zelfde signatuur).
5212
- CREATE OR REPLACE FUNCTION public.verkoop_insert_manual_order(p_order jsonb, p_items jsonb, p_idempotency_key text)
5213
- RETURNS jsonb
5214
- LANGUAGE plpgsql
5215
- SECURITY DEFINER
5216
- SET search_path TO 'public'
5217
- AS $function$
5218
- DECLARE
5219
- v_uid uuid := auth.uid();
5220
- v_existing record;
5221
- v_order_id uuid;
5222
- v_order_number text;
5223
- v_item jsonb;
5224
- v_item_id uuid;
5225
- v_idx int := 0;
5226
- v_cf jsonb;
5227
- v_manual_carrier uuid := NULLIF(p_order->>'manual_carrier_id','')::uuid;
5228
- v_fallback_carrier uuid := NULLIF(p_order->>'fallback_carrier_id','')::uuid;
5229
- v_set_by uuid := NULLIF(p_order->>'set_by_user_id','')::uuid;
5230
- v_engine_has_set boolean := to_regprocedure('public.logistics_set_order_carrier(uuid,uuid)') IS NOT NULL;
5231
- v_note text; v_fields jsonb; v_ps uuid; v_fs uuid;
5232
- BEGIN
5233
- PERFORM public.verkoop_assert_caller('server'); -- verkoop-poort
5234
- IF v_uid IS NOT NULL AND NOT (public.has_role(v_uid,'admin') OR public.has_role(v_uid,'sales')
5235
- OR public.has_role(v_uid,'manager') OR public.has_role(v_uid,'superadmin')) THEN
5236
- RETURN jsonb_build_object('ok', false, 'reason', 'Je hebt geen rechten om bestellingen aan te maken.');
5237
- END IF;
5238
- IF p_idempotency_key IS NULL OR btrim(p_idempotency_key) = '' THEN
5239
- RETURN jsonb_build_object('ok', false, 'reason', 'De bestelling is niet aangemaakt: het formulier mist een kenmerk. Ververs de pagina en probeer opnieuw.');
5240
- END IF;
5241
- IF p_items IS NULL OR jsonb_typeof(p_items) <> 'array' OR jsonb_array_length(p_items) = 0 THEN
5242
- RETURN jsonb_build_object('ok', false, 'reason', 'De bestelling is niet aangemaakt: voeg minimaal één regel toe.');
5243
- END IF;
5244
-
5245
- SELECT id, order_number INTO v_existing FROM public.orders
5246
- WHERE custom_fields->>'idempotency_key' = p_idempotency_key LIMIT 1;
5247
- IF FOUND THEN
5248
- RETURN jsonb_build_object('ok', true, 'order_id', v_existing.id, 'order_number', v_existing.order_number, 'already_existed', true);
5249
- END IF;
5250
-
5251
- v_cf := (COALESCE(p_order->'custom_fields', '{}'::jsonb) - 'carrier') || jsonb_build_object('idempotency_key', p_idempotency_key);
5252
- IF NOT v_engine_has_set AND v_fallback_carrier IS NOT NULL THEN
5253
- v_cf := v_cf || jsonb_build_object('carrier', v_fallback_carrier);
5254
- END IF;
5255
-
5256
- INSERT INTO public.orders (customer_name, customer_id, order_date, delivery_date, is_reservation, status, total, notes, custom_fields)
5257
- VALUES (
5258
- p_order->>'customer_name',
5259
- NULLIF(p_order->>'customer_id','')::uuid,
5260
- COALESCE(NULLIF(p_order->>'order_date','')::date, current_date),
5261
- NULLIF(p_order->>'delivery_date','')::date,
5262
- COALESCE((p_order->>'is_reservation')::boolean, false),
5263
- p_order->>'status',
5264
- p_order->>'total',
5265
- NULLIF(p_order->>'notes',''),
5266
- v_cf)
5267
- RETURNING id, order_number INTO v_order_id, v_order_number;
5268
-
5269
- FOR v_item IN SELECT * FROM jsonb_array_elements(p_items) LOOP
5270
- v_idx := v_idx + 1;
5271
- BEGIN
5272
- INSERT INTO public.order_items (order_id, product_id, product_name, quantity, unit, unit_price, needs_sticker,
5273
- plants_per_crate, crates_per_layer, layers_per_cart, quantity_crates, vbn_package_code, load_carrier_type, packing_source)
5274
- VALUES (
5275
- v_order_id,
5276
- NULLIF(v_item->>'product_id','')::uuid,
5277
- v_item->>'product_name',
5278
- (v_item->>'quantity')::numeric,
5279
- COALESCE(NULLIF(v_item->>'unit',''), 'stuks'),
5280
- NULLIF(v_item->>'unit_price','')::numeric,
5281
- COALESCE((v_item->>'needs_sticker')::boolean, false),
5282
- NULLIF(v_item->>'plants_per_crate','')::numeric,
5283
- NULLIF(v_item->>'crates_per_layer','')::numeric,
5284
- NULLIF(v_item->>'layers_per_cart','')::numeric,
5285
- NULLIF(v_item->>'quantity_crates','')::numeric,
5286
- NULLIF(v_item->>'vbn_package_code',''),
5287
- NULLIF(v_item->>'load_carrier_type',''),
5288
- NULLIF(v_item->>'packing_source',''))
5289
- RETURNING id INTO v_item_id;
5290
-
5291
- v_note := NULLIF(left(btrim(COALESCE(v_item->>'line_note','')), 500), '');
5292
- v_fields := public.verkoop_regelvelden_norm(v_item->'line_fields');
5293
- v_ps := NULLIF(v_item->>'product_sticker_id','')::uuid;
5294
- v_fs := NULLIF(v_item->>'fust_sticker_id','')::uuid;
5295
- IF v_note IS NOT NULL OR v_fields <> '[]'::jsonb OR v_ps IS NOT NULL OR v_fs IS NOT NULL THEN
5296
- INSERT INTO public.verkoop_orderregel_extra (order_item_id, order_id, line_note, line_fields, product_sticker_id, fust_sticker_id, updated_by)
5297
- VALUES (v_item_id, v_order_id, v_note, v_fields, v_ps, v_fs, COALESCE(v_uid, v_set_by));
5298
- END IF;
5299
- EXCEPTION WHEN others THEN
5300
- RAISE EXCEPTION 'De bestelling is niet aangemaakt: regel % kon niet worden opgeslagen (%). Er is niets bewaard.', v_idx, SQLERRM
5301
- USING ERRCODE = 'P0001';
5302
- END;
5303
- END LOOP;
5304
-
5305
- IF v_engine_has_set AND v_manual_carrier IS NOT NULL THEN
5306
- IF v_uid IS NULL AND v_set_by IS NOT NULL AND to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NULL THEN
5307
- PERFORM set_config('request.jwt.claims', jsonb_build_object('sub', v_set_by, 'role', 'authenticated')::text, true);
5308
- END IF;
5309
- BEGIN
5310
- IF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NOT NULL THEN
5311
- EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2, $3)' USING v_order_id, v_manual_carrier, v_set_by;
5312
- ELSE
5313
- EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_manual_carrier;
5314
- END IF;
5315
- EXCEPTION WHEN others THEN
5316
- RAISE EXCEPTION 'De bestelling is niet aangemaakt: de vervoerder kon niet worden vastgelegd (%). Er is niets bewaard.', SQLERRM
5317
- USING ERRCODE = 'P0001';
5318
- END;
5319
- END IF;
5320
-
5321
- RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false,
5322
- 'carrier_fallback', NOT v_engine_has_set);
5323
- END;
5324
- $function$;
5235
+ END $function$;
5325
5236
 
5326
5237
  -- 3. Cronafspraken (vak 2): alleen de definitie in verkoop_ensure_cron; hier wordt niets ingepland.
5327
5238
  CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron()
@@ -5709,4 +5620,28 @@ BEGIN
5709
5620
  END
5710
5621
  $f$;
5711
5622
  REVOKE EXECUTE ON FUNCTION public.verkoop_stickers_voor(uuid, jsonb) FROM PUBLIC, anon;
5712
- GRANT EXECUTE ON FUNCTION public.verkoop_stickers_voor(uuid, jsonb) TO authenticated, service_role;
5623
+ GRANT EXECUTE ON FUNCTION public.verkoop_stickers_voor(uuid, jsonb) TO authenticated, service_role;
5624
+
5625
+ -- Pot- en fuststicker per orderregel: modus + reden (additief). De Engine leest deze velden zelf.
5626
+ ALTER TABLE public.verkoop_orderregel_extra ADD COLUMN IF NOT EXISTS pot_sticker_modus text NOT NULL DEFAULT 'auto';
5627
+ ALTER TABLE public.verkoop_orderregel_extra ADD COLUMN IF NOT EXISTS fust_sticker_modus text NOT NULL DEFAULT 'auto';
5628
+ ALTER TABLE public.verkoop_orderregel_extra ADD COLUMN IF NOT EXISTS sticker_reden text;
5629
+
5630
+ CREATE OR REPLACE FUNCTION public.verkoop_orderregel_extra_sticker_check()
5631
+ RETURNS trigger LANGUAGE plpgsql SET search_path TO 'public' AS $$
5632
+ BEGIN
5633
+ IF NEW.pot_sticker_modus NOT IN ('auto','handmatig','uit') OR NEW.fust_sticker_modus NOT IN ('auto','handmatig','uit') THEN
5634
+ RAISE EXCEPTION 'Ongeldige stickerkeuze.' USING ERRCODE = '22023';
5635
+ END IF;
5636
+ IF (NEW.pot_sticker_modus = 'uit' OR NEW.fust_sticker_modus = 'uit') AND NULLIF(btrim(COALESCE(NEW.sticker_reden,'')),'') IS NULL THEN
5637
+ RAISE EXCEPTION 'Geef een reden op voor niet printen.' USING ERRCODE = '22023';
5638
+ END IF;
5639
+ IF NEW.pot_sticker_modus <> 'handmatig' THEN NEW.product_sticker_id := NULL; END IF;
5640
+ IF NEW.fust_sticker_modus <> 'handmatig' THEN NEW.fust_sticker_id := NULL; END IF;
5641
+ IF NEW.pot_sticker_modus <> 'uit' AND NEW.fust_sticker_modus <> 'uit' THEN NEW.sticker_reden := NULL; END IF;
5642
+ RETURN NEW;
5643
+ END $$;
5644
+ REVOKE ALL ON FUNCTION public.verkoop_orderregel_extra_sticker_check() FROM PUBLIC, anon;
5645
+ DROP TRIGGER IF EXISTS verkoop_orderregel_extra_sticker_check ON public.verkoop_orderregel_extra;
5646
+ CREATE TRIGGER verkoop_orderregel_extra_sticker_check BEFORE INSERT OR UPDATE ON public.verkoop_orderregel_extra
5647
+ FOR EACH ROW EXECUTE FUNCTION public.verkoop_orderregel_extra_sticker_check();