@flowselections/floriday-verkoop-module 1.0.109 → 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 (36) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +37 -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 +128 -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 +8 -0
  20. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  21. package/dist-lib/lib/create-order.functions.js +62 -22
  22. package/dist-lib/lib/customer-stickers.check.js +4 -1
  23. package/dist-lib/lib/customer-stickers.d.ts +10 -0
  24. package/dist-lib/lib/customer-stickers.d.ts.map +1 -1
  25. package/dist-lib/lib/customer-stickers.js +6 -1
  26. package/dist-lib/lib/module-version.d.ts +1 -1
  27. package/dist-lib/lib/module-version.js +1 -1
  28. package/dist-lib/lib/order-carrier.functions.d.ts +10 -4
  29. package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
  30. package/dist-lib/lib/order-carrier.functions.js +64 -40
  31. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  32. package/dist-lib/lib/salesorders-list.server.js +24 -0
  33. package/dist-lib/lib/salesorders-mapping.d.ts +7 -0
  34. package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
  35. package/package.json +1 -1
  36. package/schema/verkoop.sql +106 -0
@@ -1,14 +1,18 @@
1
- // Vervoerder (carrier) van een order of orderbuffer lezen en wijzigen.
1
+ // Vervoerder van een order lezen en (handmatig) kiezen.
2
+ // Contract vervoerder: de Logistiek Engine is eigenaar. Lezen via
3
+ // logistics_resolve_carrier, kiezen alleen via logistics_set_order_carrier
4
+ // (NULL = terug naar automatisch). Alleen bij een oude Engine zonder die
5
+ // functie valt het kiezen terug op de bestaande opslag (custom_fields.carrier).
2
6
  import { createServerFn } from "@tanstack/react-start";
3
7
  import { z } from "zod";
4
8
  import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
5
9
  import { assertRowsAffected, resolveOrderRow } from "./order-row.server.js";
10
+ import { ENGINE_CARRIER_MIN_VERSION_NOTICE, isMissingFunctionError } from "./carrier-resolve.js";
6
11
  async function findOrder(supabase, orderId) {
7
- // DTO-id kan een Floriday salesOrderId zijn; resolveOrderRow vertaalt dat.
8
12
  const row = await resolveOrderRow(supabase, orderId);
9
13
  const { data, error } = await supabase
10
14
  .from("orders")
11
- .select("id, buffer_id, custom_fields, is_reservation")
15
+ .select("id, order_number, buffer_id, custom_fields, is_reservation")
12
16
  .eq("id", row.id)
13
17
  .maybeSingle();
14
18
  if (error)
@@ -20,42 +24,33 @@ export const getOrderCarrier = createServerFn({ method: "GET" })
20
24
  .inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
21
25
  .handler(async ({ data, context }) => {
22
26
  const supabase = context.supabase;
23
- const { data: carrierRows } = await supabase
27
+ const { data: carrierRows, error: cErr } = await supabase
24
28
  .from("carriers")
25
29
  .select("id, name, sort_order")
26
30
  .order("sort_order", { ascending: true, nullsFirst: false })
27
31
  .order("name");
32
+ if (cErr)
33
+ throw new Error(`Vervoerders konden niet worden geladen: ${cErr.message}`);
28
34
  const options = (carrierRows ?? []).map((c) => ({
29
35
  id: String(c.id),
30
36
  name: String(c.name ?? "Onbekend"),
31
37
  }));
32
- let order = null;
33
- try {
34
- order = await findOrder(supabase, data.orderId);
35
- }
36
- catch {
37
- order = null;
38
- }
39
- if (!order) {
40
- return { carrierId: null, carrierName: null, bufferId: null, options };
41
- }
38
+ const order = await findOrder(supabase, data.orderId);
39
+ if (!order)
40
+ throw new Error("Order niet gevonden");
42
41
  const cf = (order.custom_fields ?? {});
43
- const carrierId = cf.carrier ? String(cf.carrier) : null;
44
- const carrierName = carrierId
45
- ? (options.find((o) => o.id === carrierId)?.name ?? null)
46
- : null;
47
- return {
48
- carrierId,
49
- carrierName,
50
- bufferId: order.buffer_id ?? null,
51
- options,
52
- };
42
+ const legacyId = cf.carrier ? String(cf.carrier) : null;
43
+ const legacyName = legacyId ? (options.find((o) => o.id === legacyId)?.name ?? null) : null;
44
+ const { resolveCarrierOne } = await import("./carrier-resolve.server.js");
45
+ const resolved = await resolveCarrierOne(supabase, order.id, { id: legacyId, name: legacyName });
46
+ return { resolved, bufferId: order.buffer_id ?? null, options };
53
47
  });
54
48
  export const setOrderCarrier = createServerFn({ method: "POST" })
55
49
  .middleware([requireSupabaseAuth])
56
50
  .inputValidator((input) => z
57
51
  .object({
58
52
  orderId: z.string().min(1),
53
+ // null = terug naar automatisch
59
54
  carrierId: z.string().uuid().nullable(),
60
55
  applyToBuffer: z.boolean().optional(),
61
56
  })
@@ -69,29 +64,58 @@ export const setOrderCarrier = createServerFn({ method: "POST" })
69
64
  throw new Error("Bij een reservering kan nog geen vervoerder worden gekozen; dat kan pas bij het aanmaken van de verzending.");
70
65
  }
71
66
  let targets = [
72
- { id: order.id, custom_fields: order.custom_fields },
67
+ { id: order.id, order_number: order.order_number, custom_fields: order.custom_fields },
73
68
  ];
74
69
  if (data.applyToBuffer && order.buffer_id) {
75
- const { data: rows } = await supabase
70
+ const { data: rows, error } = await supabase
76
71
  .from("orders")
77
- .select("id, custom_fields")
72
+ .select("id, order_number, custom_fields")
78
73
  .eq("buffer_id", order.buffer_id);
74
+ if (error)
75
+ throw new Error(`Orders in de buffer konden niet worden gelezen: ${error.message}`);
79
76
  if (rows && rows.length > 0)
80
77
  targets = rows;
81
78
  }
79
+ const results = [];
80
+ let legacyMode = false;
82
81
  for (const t of targets) {
83
- const cf = { ...(t.custom_fields ?? {}) };
84
- if (data.carrierId)
85
- cf.carrier = data.carrierId;
86
- else
87
- delete cf.carrier;
88
- const { data: updated, error } = await supabase.from("orders")
89
- .update({ custom_fields: cf })
90
- .eq("id", t.id)
91
- .select("id");
92
- if (error)
93
- throw new Error(error.message);
94
- assertRowsAffected(updated, "Vervoerder opslaan");
82
+ try {
83
+ if (!legacyMode) {
84
+ const { error } = await supabase.rpc("logistics_set_order_carrier", {
85
+ p_order_id: t.id,
86
+ p_carrier_id: data.carrierId,
87
+ });
88
+ if (!error) {
89
+ results.push({ orderId: t.id, orderNumber: t.order_number, ok: true, error: null });
90
+ continue;
91
+ }
92
+ if (!isMissingFunctionError(error.message))
93
+ throw new Error(error.message);
94
+ legacyMode = true;
95
+ }
96
+ // Oude Engine: bestaande opslag als terugval.
97
+ const cf = { ...(t.custom_fields ?? {}) };
98
+ if (data.carrierId)
99
+ cf.carrier = data.carrierId;
100
+ else
101
+ delete cf.carrier;
102
+ const { data: updated, error } = await supabase
103
+ .from("orders")
104
+ .update({ custom_fields: cf })
105
+ .eq("id", t.id)
106
+ .select("id");
107
+ if (error)
108
+ throw new Error(error.message);
109
+ assertRowsAffected(updated, "Vervoerder opslaan");
110
+ results.push({ orderId: t.id, orderNumber: t.order_number, ok: true, error: null });
111
+ }
112
+ catch (e) {
113
+ results.push({ orderId: t.id, orderNumber: t.order_number, ok: false, error: e?.message ?? "Onbekende fout" });
114
+ }
95
115
  }
96
- return { ok: true, updated: targets.length };
116
+ return {
117
+ ok: results.every((r) => r.ok),
118
+ results,
119
+ adminNotice: legacyMode ? ENGINE_CARRIER_MIN_VERSION_NOTICE : null,
120
+ };
97
121
  });
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CA8lCrB"}
1
+ {"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAunCrB"}
@@ -891,6 +891,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
891
891
  crateTypeName: mergeTypeNames(members.map((m) => m.crateTypeName ?? "")),
892
892
  cartTypeName: mergeTypeNames(members.map((m) => m.cartTypeName ?? "")),
893
893
  carrierName: head.carrierName ?? members.find((m) => m.carrierName)?.carrierName ?? null,
894
+ carrierState: head.carrierState ?? null,
895
+ carrierSource: head.carrierSource ?? null,
896
+ carrierReason: head.carrierReason ?? null,
897
+ carrierBadge: head.carrierBadge ?? null,
894
898
  incomplete,
895
899
  engineCounts: members.some((m) => m.engineCounts),
896
900
  planCoverage: mergeSummaries(members.map((m) => m.planCoverage)),
@@ -1062,6 +1066,26 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
1062
1066
  if (idFor(o))
1063
1067
  o.pickupLabel = "onbekend";
1064
1068
  }
1069
+ // Vervoerder + bron uit de Engine (contract vervoerder), één aanroep per blok.
1070
+ {
1071
+ const { resolveCarriersMany } = await import("./carrier-resolve.server.js");
1072
+ const reqs = visible
1073
+ .map((o) => ({ o, id: idFor(o) }))
1074
+ .filter((x) => !!x.id);
1075
+ const res = await resolveCarriersMany(supabase, reqs.map(({ o, id }) => ({ id, legacyCarrierId: o.carrierName ? "oud" : null, legacyCarrierName: o.carrierName ?? null })));
1076
+ for (const { o, id } of reqs) {
1077
+ const c = res.byId.get(id);
1078
+ if (!c)
1079
+ continue;
1080
+ o.carrierName = c.carrierName;
1081
+ o.carrierState = c.state;
1082
+ o.carrierSource = c.source;
1083
+ o.carrierReason = c.reason;
1084
+ o.carrierBadge = c.badge;
1085
+ }
1086
+ if (res.error)
1087
+ warnings.push(`Vervoerder: ${res.error}`);
1088
+ }
1065
1089
  const coverage = await loadPlanCoverage(supabase, ids, "list");
1066
1090
  let failed = 0;
1067
1091
  for (const o of visible) {
@@ -113,6 +113,13 @@ export interface SalesOrderDTO {
113
113
  missingPrice?: boolean;
114
114
  /** Vervoerder van de order (indien bekend). */
115
115
  carrierName?: string | null;
116
+ /** Vervoerder volgens de Logistiek Engine: ok / geen / onbekend. */
117
+ carrierState?: "ok" | "geen" | "onbekend" | null;
118
+ /** Bron volgens het contract (handmatig, afleverlocatie, favoriet, oud, …). */
119
+ carrierSource?: string | null;
120
+ carrierReason?: string | null;
121
+ /** Kleine aanduiding bij bron oud/favoriet. */
122
+ carrierBadge?: string | null;
116
123
  /** Concrete ontbrekende gegevens, bv. "geen klant gekoppeld". */
117
124
  incomplete?: string[];
118
125
  customer: {
@@ -1 +1 @@
1
- {"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowselections/floriday-verkoop-module",
3
- "version": "1.0.109",
3
+ "version": "1.0.113",
4
4
  "private": false,
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -2079,3 +2079,109 @@ REVOKE EXECUTE ON FUNCTION public.verkoop_packing_drift_report() FROM PUBLIC, an
2079
2079
  REVOKE EXECUTE ON FUNCTION public.verkoop_packing_drift_apply(uuid[]) FROM PUBLIC, anon;
2080
2080
  GRANT EXECUTE ON FUNCTION public.verkoop_packing_drift_report() TO authenticated, service_role;
2081
2081
  GRANT EXECUTE ON FUNCTION public.verkoop_packing_drift_apply(uuid[]) TO authenticated, service_role;
2082
+
2083
+ -- 1.0.110: handmatige bestelling atomair (kop + regels in één transactie), idempotent op formulierkenmerk
2084
+ DO $t$ BEGIN
2085
+ 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);
2086
+ EXCEPTION WHEN undefined_table OR undefined_column THEN RAISE NOTICE 'verkoop-schema: index overgeslagen (%)', SQLERRM; END $t$;
2087
+ CREATE OR REPLACE FUNCTION public.verkoop_insert_manual_order(p_order jsonb, p_items jsonb, p_idempotency_key text)
2088
+ RETURNS jsonb
2089
+ LANGUAGE plpgsql
2090
+ SECURITY DEFINER
2091
+ SET search_path TO 'public'
2092
+ AS $function$
2093
+ DECLARE
2094
+ v_uid uuid := auth.uid();
2095
+ v_existing record;
2096
+ v_order_id uuid;
2097
+ v_order_number text;
2098
+ v_item jsonb;
2099
+ v_idx int := 0;
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;
2105
+ BEGIN
2106
+ IF v_uid IS NOT NULL AND NOT (public.has_role(v_uid,'admin') OR public.has_role(v_uid,'sales')
2107
+ OR public.has_role(v_uid,'manager') OR public.has_role(v_uid,'superadmin')) THEN
2108
+ RETURN jsonb_build_object('ok', false, 'reason', 'Je hebt geen rechten om bestellingen aan te maken.');
2109
+ END IF;
2110
+ IF p_idempotency_key IS NULL OR btrim(p_idempotency_key) = '' THEN
2111
+ RETURN jsonb_build_object('ok', false, 'reason', 'De bestelling is niet aangemaakt: het formulier mist een kenmerk. Ververs de pagina en probeer opnieuw.');
2112
+ END IF;
2113
+ IF p_items IS NULL OR jsonb_typeof(p_items) <> 'array' OR jsonb_array_length(p_items) = 0 THEN
2114
+ RETURN jsonb_build_object('ok', false, 'reason', 'De bestelling is niet aangemaakt: voeg minimaal één regel toe.');
2115
+ END IF;
2116
+
2117
+ SELECT id, order_number INTO v_existing FROM public.orders
2118
+ WHERE custom_fields->>'idempotency_key' = p_idempotency_key LIMIT 1;
2119
+ IF FOUND THEN
2120
+ RETURN jsonb_build_object('ok', true, 'order_id', v_existing.id, 'order_number', v_existing.order_number, 'already_existed', true);
2121
+ END IF;
2122
+
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;
2128
+
2129
+ INSERT INTO public.orders (customer_name, customer_id, order_date, delivery_date, is_reservation, status, total, notes, custom_fields)
2130
+ VALUES (
2131
+ p_order->>'customer_name',
2132
+ NULLIF(p_order->>'customer_id','')::uuid,
2133
+ COALESCE(NULLIF(p_order->>'order_date','')::date, current_date),
2134
+ NULLIF(p_order->>'delivery_date','')::date,
2135
+ COALESCE((p_order->>'is_reservation')::boolean, false),
2136
+ p_order->>'status',
2137
+ p_order->>'total',
2138
+ NULLIF(p_order->>'notes',''),
2139
+ v_cf)
2140
+ RETURNING id, order_number INTO v_order_id, v_order_number;
2141
+
2142
+ FOR v_item IN SELECT * FROM jsonb_array_elements(p_items) LOOP
2143
+ v_idx := v_idx + 1;
2144
+ BEGIN
2145
+ INSERT INTO public.order_items (order_id, product_id, product_name, quantity, unit, unit_price, needs_sticker,
2146
+ plants_per_crate, crates_per_layer, layers_per_cart, quantity_crates, vbn_package_code, load_carrier_type, packing_source)
2147
+ VALUES (
2148
+ v_order_id,
2149
+ NULLIF(v_item->>'product_id','')::uuid,
2150
+ v_item->>'product_name',
2151
+ (v_item->>'quantity')::numeric,
2152
+ COALESCE(NULLIF(v_item->>'unit',''), 'stuks'),
2153
+ NULLIF(v_item->>'unit_price','')::numeric,
2154
+ COALESCE((v_item->>'needs_sticker')::boolean, false),
2155
+ NULLIF(v_item->>'plants_per_crate','')::numeric,
2156
+ NULLIF(v_item->>'crates_per_layer','')::numeric,
2157
+ NULLIF(v_item->>'layers_per_cart','')::numeric,
2158
+ NULLIF(v_item->>'quantity_crates','')::numeric,
2159
+ NULLIF(v_item->>'vbn_package_code',''),
2160
+ NULLIF(v_item->>'load_carrier_type',''),
2161
+ NULLIF(v_item->>'packing_source',''));
2162
+ EXCEPTION WHEN others THEN
2163
+ RAISE EXCEPTION 'De bestelling is niet aangemaakt: regel % kon niet worden opgeslagen (%). Er is niets bewaard.', v_idx, SQLERRM
2164
+ USING ERRCODE = 'P0001';
2165
+ END;
2166
+ END LOOP;
2167
+
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);
2183
+ END;
2184
+ $function$;
2185
+
2186
+ REVOKE ALL ON FUNCTION public.verkoop_insert_manual_order(jsonb, jsonb, text) FROM PUBLIC, anon, authenticated;
2187
+ GRANT EXECUTE ON FUNCTION public.verkoop_insert_manual_order(jsonb, jsonb, text) TO service_role;