@flowselections/floriday-verkoop-module 1.0.111 → 1.0.113

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 (32) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +31 -31
  3. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +4 -4
  4. package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
  5. package/dist-lib/components/verkoop/OrderCarrierPicker.js +26 -19
  6. package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
  7. package/dist-lib/components/verkoop/SalesOrdersTable.js +1 -1
  8. package/dist-lib/integrations/supabase/types.d.ts +120 -6
  9. package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
  10. package/dist-lib/lib/carrier-resolve.check.d.ts +2 -0
  11. package/dist-lib/lib/carrier-resolve.check.d.ts.map +1 -0
  12. package/dist-lib/lib/carrier-resolve.check.js +38 -0
  13. package/dist-lib/lib/carrier-resolve.d.ts +27 -0
  14. package/dist-lib/lib/carrier-resolve.d.ts.map +1 -0
  15. package/dist-lib/lib/carrier-resolve.js +100 -0
  16. package/dist-lib/lib/carrier-resolve.server.d.ts +15 -0
  17. package/dist-lib/lib/carrier-resolve.server.d.ts.map +1 -0
  18. package/dist-lib/lib/carrier-resolve.server.js +32 -0
  19. package/dist-lib/lib/create-order.functions.d.ts +2 -0
  20. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  21. package/dist-lib/lib/create-order.functions.js +22 -10
  22. package/dist-lib/lib/module-version.d.ts +1 -1
  23. package/dist-lib/lib/module-version.js +1 -1
  24. package/dist-lib/lib/order-carrier.functions.d.ts +10 -4
  25. package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
  26. package/dist-lib/lib/order-carrier.functions.js +64 -40
  27. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  28. package/dist-lib/lib/salesorders-list.server.js +24 -0
  29. package/dist-lib/lib/salesorders-mapping.d.ts +7 -0
  30. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  31. package/package.json +1 -1
  32. package/schema/verkoop.sql +25 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowselections/floriday-verkoop-module",
3
- "version": "1.0.111",
3
+ "version": "1.0.113",
4
4
  "private": false,
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -2098,6 +2098,10 @@ DECLARE
2098
2098
  v_item jsonb;
2099
2099
  v_idx int := 0;
2100
2100
  v_cf jsonb;
2101
+ v_manual_carrier uuid := NULLIF(p_order->>'manual_carrier_id','')::uuid;
2102
+ v_fallback_carrier uuid := NULLIF(p_order->>'fallback_carrier_id','')::uuid;
2103
+ v_set_by uuid := NULLIF(p_order->>'set_by_user_id','')::uuid;
2104
+ v_engine_has_set boolean := to_regprocedure('public.logistics_set_order_carrier(uuid,uuid)') IS NOT NULL;
2101
2105
  BEGIN
2102
2106
  IF v_uid IS NOT NULL AND NOT (public.has_role(v_uid,'admin') OR public.has_role(v_uid,'sales')
2103
2107
  OR public.has_role(v_uid,'manager') OR public.has_role(v_uid,'superadmin')) THEN
@@ -2116,7 +2120,11 @@ BEGIN
2116
2120
  RETURN jsonb_build_object('ok', true, 'order_id', v_existing.id, 'order_number', v_existing.order_number, 'already_existed', true);
2117
2121
  END IF;
2118
2122
 
2119
- v_cf := COALESCE(p_order->'custom_fields', '{}'::jsonb) || jsonb_build_object('idempotency_key', p_idempotency_key);
2123
+ v_cf := (COALESCE(p_order->'custom_fields', '{}'::jsonb) - 'carrier') || jsonb_build_object('idempotency_key', p_idempotency_key);
2124
+ -- Oude Engine (zonder logistics_set_order_carrier): bestaande opslag als terugval.
2125
+ IF NOT v_engine_has_set AND v_fallback_carrier IS NOT NULL THEN
2126
+ v_cf := v_cf || jsonb_build_object('carrier', v_fallback_carrier);
2127
+ END IF;
2120
2128
 
2121
2129
  INSERT INTO public.orders (customer_name, customer_id, order_date, delivery_date, is_reservation, status, total, notes, custom_fields)
2122
2130
  VALUES (
@@ -2152,15 +2160,28 @@ BEGIN
2152
2160
  NULLIF(v_item->>'load_carrier_type',''),
2153
2161
  NULLIF(v_item->>'packing_source',''));
2154
2162
  EXCEPTION WHEN others THEN
2155
- -- Fout doorgeven: de hele transactie (kop en eerdere regels) wordt teruggedraaid.
2156
2163
  RAISE EXCEPTION 'De bestelling is niet aangemaakt: regel % kon niet worden opgeslagen (%). Er is niets bewaard.', v_idx, SQLERRM
2157
2164
  USING ERRCODE = 'P0001';
2158
2165
  END;
2159
2166
  END LOOP;
2160
2167
 
2161
- RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false);
2168
+ -- Handmatige vervoerder in dezelfde transactie via de Engine (eigenaar).
2169
+ IF v_engine_has_set AND v_manual_carrier IS NOT NULL THEN
2170
+ IF v_uid IS NULL AND v_set_by IS NOT NULL THEN
2171
+ PERFORM set_config('request.jwt.claims', jsonb_build_object('sub', v_set_by, 'role', 'authenticated')::text, true);
2172
+ END IF;
2173
+ BEGIN
2174
+ EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_manual_carrier;
2175
+ EXCEPTION WHEN others THEN
2176
+ RAISE EXCEPTION 'De bestelling is niet aangemaakt: de vervoerder kon niet worden vastgelegd (%). Er is niets bewaard.', SQLERRM
2177
+ USING ERRCODE = 'P0001';
2178
+ END;
2179
+ END IF;
2180
+
2181
+ RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false,
2182
+ 'carrier_fallback', NOT v_engine_has_set);
2162
2183
  END;
2163
2184
  $function$;
2164
- ;
2185
+
2165
2186
  REVOKE ALL ON FUNCTION public.verkoop_insert_manual_order(jsonb, jsonb, text) FROM PUBLIC, anon, authenticated;
2166
2187
  GRANT EXECUTE ON FUNCTION public.verkoop_insert_manual_order(jsonb, jsonb, text) TO service_role;