@flowselections/floriday-verkoop-module 1.0.116 → 1.0.121
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.
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +39 -26
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.js +4 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +9 -3
- package/dist-lib/components/verkoop/SearchableSelect.d.ts +2 -0
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.js +1 -1
- package/dist-lib/integrations/supabase/types.d.ts +2187 -132
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/carrier-resolve.d.ts.map +1 -1
- package/dist-lib/lib/carrier-resolve.js +4 -1
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +44 -29
- package/dist-lib/lib/floriday-write-mode.d.ts +2 -0
- package/dist-lib/lib/floriday-write-mode.d.ts.map +1 -0
- package/dist-lib/lib/floriday-write-mode.functions.d.ts +9 -0
- package/dist-lib/lib/floriday-write-mode.functions.d.ts.map +1 -0
- package/dist-lib/lib/floriday-write-mode.functions.js +17 -0
- package/dist-lib/lib/floriday-write-mode.js +11 -0
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +11 -10
- package/dist-lib/lib/order-shipments.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-shipments.functions.js +2 -1
- package/dist-lib/lib/plan-coverage.server.d.ts +9 -0
- package/dist-lib/lib/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +20 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +6 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +4 -0
- package/dist-lib/lib/salesorders-mapping.d.ts +4 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +6 -0
- package/dist-lib/lib/stock-errors.check.d.ts +2 -0
- package/dist-lib/lib/stock-errors.check.d.ts.map +1 -0
- package/dist-lib/lib/stock-errors.check.js +15 -0
- package/dist-lib/lib/stock-errors.d.ts +6 -0
- package/dist-lib/lib/stock-errors.d.ts.map +1 -0
- package/dist-lib/lib/stock-errors.js +15 -0
- package/dist-lib/lib/testronde-1119.check.d.ts +2 -0
- package/dist-lib/lib/testronde-1119.check.d.ts.map +1 -0
- package/dist-lib/lib/testronde-1119.check.js +20 -0
- package/dist-lib/lib/useFloridayWriteMode.d.ts +3 -0
- package/dist-lib/lib/useFloridayWriteMode.d.ts.map +1 -0
- package/dist-lib/lib/useFloridayWriteMode.js +15 -0
- package/dist-lib/lib/zero-price-write-mode.check.d.ts +2 -0
- package/dist-lib/lib/zero-price-write-mode.check.d.ts.map +1 -0
- package/dist-lib/lib/zero-price-write-mode.check.js +18 -0
- package/dist-lib/lib/zero-price.d.ts +9 -0
- package/dist-lib/lib/zero-price.d.ts.map +1 -0
- package/dist-lib/lib/zero-price.js +9 -0
- package/package.json +1 -1
- package/schema/verkoop.sql +175 -27
|
@@ -381,6 +381,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
381
381
|
}
|
|
382
382
|
}
|
|
383
383
|
bufferId = ownRow?.buffer_id ?? null;
|
|
384
|
+
if (bufferId && ownRow?.id) {
|
|
385
|
+
const { loadBufferCarts } = await import("./plan-coverage.server.js");
|
|
386
|
+
const b = await loadBufferCarts(supabase, String(ownRow.id));
|
|
387
|
+
dto.bufferCartCount = b.count;
|
|
388
|
+
dto.bufferCartTypeName = b.typeName;
|
|
389
|
+
}
|
|
384
390
|
// Totaalregel: actieve orderregels (stuks × prijs per stuk).
|
|
385
391
|
const activeItems = (ownRow?.order_items ?? []).filter((it) => !it?.quarantined_at);
|
|
386
392
|
if (activeItems.length) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stock-errors.check.d.ts","sourceRoot":"","sources":["../../src/lib/stock-errors.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
// Draaien: bun src/lib/stock-errors.check.ts
|
|
2
|
+
import { stockError, stockErrorText } from "./stock-errors.js";
|
|
3
|
+
let fail = 0;
|
|
4
|
+
const eq = (name, got, want) => {
|
|
5
|
+
const ok = got === want;
|
|
6
|
+
if (!ok)
|
|
7
|
+
fail++;
|
|
8
|
+
console.log(`${ok ? "ok " : "FOUT"} ${name}: ${JSON.stringify(got)}`);
|
|
9
|
+
};
|
|
10
|
+
eq("VR001", stockError("VR001: multiple active connections").message, "Er zijn meerdere actieve Floriday-koppelingen; kies er één in de instellingen.");
|
|
11
|
+
eq("VR002", stockError("ERROR: VR002 no active connection").message, "De gekozen Floriday-omgeving heeft geen actieve koppeling.");
|
|
12
|
+
eq("onbekende fout ongewijzigd", stockError("iets anders").message, "iets anders");
|
|
13
|
+
eq("geen valse treffer VR0012", stockErrorText("VR0012"), null);
|
|
14
|
+
if (fail)
|
|
15
|
+
process.exit(1);
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const STOCK_ERROR_TEXT: Record<string, string>;
|
|
2
|
+
/** Geeft de gewone tekst voor VR001/VR002 terug, anders null. */
|
|
3
|
+
export declare function stockErrorText(msgOrCode: string | null | undefined): string | null;
|
|
4
|
+
/** Maakt een Error; bij VR001/VR002 met de gewone tekst. */
|
|
5
|
+
export declare function stockError(msg: string): Error;
|
|
6
|
+
//# sourceMappingURL=stock-errors.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stock-errors.d.ts","sourceRoot":"","sources":["../../src/lib/stock-errors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGnD,CAAC;AAEF,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAGlF;AAED,4DAA4D;AAC5D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAE7C"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
// Foutcodes van Voorraad (1.0.107+) in gewone taal. Alleen weergave: verandert
|
|
2
|
+
// niets aan voorraad of orders. Onbekende fouten blijven ongewijzigd.
|
|
3
|
+
export const STOCK_ERROR_TEXT = {
|
|
4
|
+
VR001: "Er zijn meerdere actieve Floriday-koppelingen; kies er één in de instellingen.",
|
|
5
|
+
VR002: "De gekozen Floriday-omgeving heeft geen actieve koppeling.",
|
|
6
|
+
};
|
|
7
|
+
/** Geeft de gewone tekst voor VR001/VR002 terug, anders null. */
|
|
8
|
+
export function stockErrorText(msgOrCode) {
|
|
9
|
+
const m = String(msgOrCode ?? "").match(/\bVR00[12]\b/);
|
|
10
|
+
return m ? STOCK_ERROR_TEXT[m[0]] : null;
|
|
11
|
+
}
|
|
12
|
+
/** Maakt een Error; bij VR001/VR002 met de gewone tekst. */
|
|
13
|
+
export function stockError(msg) {
|
|
14
|
+
return new Error(stockErrorText(msg) ?? msg);
|
|
15
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testronde-1119.check.d.ts","sourceRoot":"","sources":["../../src/lib/testronde-1119.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// Controles 1.0.119: vervoerder uit Engine-antwoord, prijs € 0, bufferkarren.
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { normalizeResolvedMany } from "./carrier-resolve.js";
|
|
4
|
+
import { zeroPriceRefusal } from "./zero-price.js";
|
|
5
|
+
import { combinedCartCount } from "./plan-coverage.js";
|
|
6
|
+
const m = normalizeResolvedMany([
|
|
7
|
+
{ order_id: "a", resultaat: { carrier_id: "c1", carrier_name: "Houtman", bron: "handmatig", reden: "Handmatig gekozen" } },
|
|
8
|
+
{ order_id: "b", resultaat: { carrier_id: "c2", carrier_name: "Testvervoerder", bron: "favoriet" } },
|
|
9
|
+
]);
|
|
10
|
+
assert.equal(m.get("a")?.state, "ok");
|
|
11
|
+
assert.equal(m.get("a")?.carrierName, "Houtman");
|
|
12
|
+
assert.equal(m.get("a")?.source, "handmatig");
|
|
13
|
+
assert.equal(m.get("b")?.badge, "favoriet");
|
|
14
|
+
assert.ok(zeroPriceRefusal([{ unit_price: 0 }], false));
|
|
15
|
+
assert.ok(zeroPriceRefusal([{ unit_price: null }], undefined));
|
|
16
|
+
assert.equal(zeroPriceRefusal([{ unit_price: 0 }], true), null);
|
|
17
|
+
assert.equal(zeroPriceRefusal([{ unit_price: 0.5 }], false), null);
|
|
18
|
+
const cov = (n) => ({ state: "ingedeeld", carts: [], pickRows: [], bufferCartCount: n, cartCount: 3, shared: true });
|
|
19
|
+
assert.equal(combinedCartCount([cov(3), cov(3), cov(3)]), 3);
|
|
20
|
+
console.log("testronde 1.0.119: ok");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useFloridayWriteMode.d.ts","sourceRoot":"","sources":["../../src/lib/useFloridayWriteMode.ts"],"names":[],"mappings":"AAIA,8EAA8E;AAC9E,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAUzE"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
3
|
+
import { getFloridayWriteMode } from "./floriday-write-mode.functions.js";
|
|
4
|
+
/** Eén gedeelde opvraag per scherm; alleen nodig als er een melding staat. */
|
|
5
|
+
export function useFloridayReadOnlyReason(enabled) {
|
|
6
|
+
const fn = useServerFn(getFloridayWriteMode);
|
|
7
|
+
const q = useQuery({
|
|
8
|
+
queryKey: ["floriday-write-mode"],
|
|
9
|
+
queryFn: () => fn(),
|
|
10
|
+
enabled,
|
|
11
|
+
staleTime: 60000,
|
|
12
|
+
retry: false,
|
|
13
|
+
});
|
|
14
|
+
return q.data?.reason ?? null;
|
|
15
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zero-price-write-mode.check.d.ts","sourceRoot":"","sources":["../../src/lib/zero-price-write-mode.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// Draaien: bun src/lib/zero-price-write-mode.check.ts
|
|
2
|
+
import { zeroPriceRefusal } from "./zero-price.js";
|
|
3
|
+
import { readOnlyReason } from "./floriday-write-mode.js";
|
|
4
|
+
let fail = 0;
|
|
5
|
+
const eq = (name, got, want) => {
|
|
6
|
+
const ok = JSON.stringify(got) === JSON.stringify(want);
|
|
7
|
+
if (!ok)
|
|
8
|
+
fail++;
|
|
9
|
+
console.log(`${ok ? "ok " : "FOUT"} ${name}: ${JSON.stringify(got)}`);
|
|
10
|
+
};
|
|
11
|
+
eq("€ 0 zonder bevestiging geweigerd", zeroPriceRefusal([{ unit_price: 0 }], false) !== null, true);
|
|
12
|
+
eq("€ 0 met bevestiging toegestaan", zeroPriceRefusal([{ unit_price: 0 }], true), null);
|
|
13
|
+
eq("prijs > 0 zonder bevestiging toegestaan", zeroPriceRefusal([{ unit_price: 0.5 }], false), null);
|
|
14
|
+
eq("alleen-lezen toont reden", readOnlyReason({ read_only: true, reason: "Onderhoud" }), "Onderhoud");
|
|
15
|
+
eq("niet alleen-lezen: geen oorzaak", readOnlyReason({ read_only: false, reason: "x" }), null);
|
|
16
|
+
eq("onbekend antwoord: geen oorzaak", readOnlyReason(null), null);
|
|
17
|
+
if (fail)
|
|
18
|
+
process.exit(1);
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare const ZERO_PRICE_REFUSAL = "Er staan regels met prijs \u20AC 0. Bevestig eerst dat \u20AC 0 klopt, of vul de prijs in. Er is niets bewaard.";
|
|
2
|
+
export declare function zeroPriceLineCount(lines: {
|
|
3
|
+
unit_price?: number | null;
|
|
4
|
+
}[]): number;
|
|
5
|
+
/** Geeft de weigering terug, of null als aanmaken mag. */
|
|
6
|
+
export declare function zeroPriceRefusal(lines: {
|
|
7
|
+
unit_price?: number | null;
|
|
8
|
+
}[], confirmed: boolean | undefined): string | null;
|
|
9
|
+
//# sourceMappingURL=zero-price.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zero-price.d.ts","sourceRoot":"","sources":["../../src/lib/zero-price.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,kBAAkB,oHAC0E,CAAC;AAE1G,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,MAAM,CAElF;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAEvH"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// Prijs € 0 op een orderregel mag alleen na uitdrukkelijke bevestiging.
|
|
2
|
+
export const ZERO_PRICE_REFUSAL = "Er staan regels met prijs € 0. Bevestig eerst dat € 0 klopt, of vul de prijs in. Er is niets bewaard.";
|
|
3
|
+
export function zeroPriceLineCount(lines) {
|
|
4
|
+
return lines.filter((l) => !(Number(l.unit_price) > 0)).length;
|
|
5
|
+
}
|
|
6
|
+
/** Geeft de weigering terug, of null als aanmaken mag. */
|
|
7
|
+
export function zeroPriceRefusal(lines, confirmed) {
|
|
8
|
+
return zeroPriceLineCount(lines) > 0 && confirmed !== true ? ZERO_PRICE_REFUSAL : null;
|
|
9
|
+
}
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -1617,17 +1617,13 @@ DECLARE
|
|
|
1617
1617
|
v_ppc int; v_cpl int; v_lpc int;
|
|
1618
1618
|
v_vbn text; v_lc text; v_psrc text;
|
|
1619
1619
|
v_qty_crates int;
|
|
1620
|
+
v_carrier_warning text := NULL;
|
|
1621
|
+
v_carrier_fallback boolean := false;
|
|
1622
|
+
v_carrier_err text;
|
|
1623
|
+
v_zero int := 0;
|
|
1620
1624
|
BEGIN
|
|
1621
|
-
|
|
1622
|
-
--
|
|
1623
|
-
IF v_uid IS NOT NULL THEN
|
|
1624
|
-
IF NOT (public.has_role(v_uid, 'admin') OR public.has_role(v_uid, 'sales')
|
|
1625
|
-
OR public.has_role(v_uid, 'manager') OR public.has_role(v_uid, 'superadmin')) THEN
|
|
1626
|
-
RAISE EXCEPTION 'Niet toegestaan';
|
|
1627
|
-
END IF;
|
|
1628
|
-
ELSIF coalesce(auth.role(), '') IN ('anon', 'authenticated') THEN
|
|
1629
|
-
RAISE EXCEPTION 'Niet toegestaan';
|
|
1630
|
-
END IF;
|
|
1625
|
+
PERFORM public.verkoop_assert_caller('keten_genest'); -- verkoop-poort
|
|
1626
|
+
-- Toegang: zie verkoop-poort hierboven.
|
|
1631
1627
|
|
|
1632
1628
|
IF v_src = 'actiemail' THEN v_key := 'offer_order_id'; v_cf_source := 'actie-mail';
|
|
1633
1629
|
ELSIF v_src = 'mailbox' THEN v_key := 'mailbox_proposal_id'; v_cf_source := 'mailbox';
|
|
@@ -1637,7 +1633,6 @@ BEGIN
|
|
|
1637
1633
|
RETURN jsonb_build_object('ok', false, 'reason', 'Bron-id ontbreekt.');
|
|
1638
1634
|
END IF;
|
|
1639
1635
|
|
|
1640
|
-
-- Idempotent op bron-id.
|
|
1641
1636
|
PERFORM pg_advisory_xact_lock(hashtext('verkoop_create_order:' || v_key || ':' || p_source_id));
|
|
1642
1637
|
SELECT id, order_number INTO v_existing FROM public.orders
|
|
1643
1638
|
WHERE deleted_at IS NULL AND custom_fields->>v_key = p_source_id LIMIT 1;
|
|
@@ -1658,31 +1653,34 @@ BEGIN
|
|
|
1658
1653
|
RETURN jsonb_build_object('ok', false, 'reason', 'Geen regels.');
|
|
1659
1654
|
END IF;
|
|
1660
1655
|
|
|
1661
|
-
-- Regels: product op id, prijs > 0, belading uit het product.
|
|
1662
1656
|
FOR v_line IN SELECT * FROM jsonb_array_elements(p_lines) LOOP
|
|
1663
1657
|
v_n := v_n + 1;
|
|
1664
1658
|
v_pack := CASE WHEN jsonb_typeof(v_line->'packing') = 'object' THEN v_line->'packing' ELSE NULL END;
|
|
1665
1659
|
BEGIN
|
|
1666
1660
|
v_qty := nullif(v_line->>'quantity_plants', '')::int;
|
|
1667
1661
|
v_qty_crates := nullif(v_line->>'quantity_crates', '')::int;
|
|
1668
|
-
v_price := (v_line->>'unit_price')::numeric;
|
|
1662
|
+
v_price := nullif(trim(coalesce(v_line->>'unit_price','')), '')::numeric;
|
|
1669
1663
|
v_ppc := nullif(greatest(coalesce(nullif(v_pack->>'plants_per_crate', '')::numeric, 0), 0), 0)::int;
|
|
1670
1664
|
v_cpl := nullif(greatest(coalesce(nullif(v_pack->>'crates_per_layer', '')::numeric, 0), 0), 0)::int;
|
|
1671
1665
|
v_lpc := nullif(greatest(coalesce(nullif(v_pack->>'layers_per_cart', '')::numeric, 0), 0), 0)::int;
|
|
1672
1666
|
EXCEPTION WHEN others THEN
|
|
1673
1667
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: aantal, prijs of verpakking ongeldig.', v_n));
|
|
1674
1668
|
END;
|
|
1675
|
-
IF v_price IS NULL
|
|
1676
|
-
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: prijs
|
|
1669
|
+
IF v_price IS NULL THEN
|
|
1670
|
+
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: prijs ontbreekt.', v_n));
|
|
1671
|
+
ELSIF v_price < 0 THEN
|
|
1672
|
+
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: prijs mag niet negatief zijn.', v_n));
|
|
1673
|
+
ELSIF v_price = 0 THEN
|
|
1674
|
+
IF coalesce(v_line->>'zero_price_confirmed', '') <> 'true' THEN
|
|
1675
|
+
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: prijs € 0 moet je bevestigen (zero_price_confirmed).', v_n));
|
|
1676
|
+
END IF;
|
|
1677
|
+
v_zero := v_zero + 1;
|
|
1677
1678
|
END IF;
|
|
1678
|
-
-- Product op id; als jsonb gelezen zodat een ontbrekende kolom nooit stukloopt.
|
|
1679
1679
|
v_pj := NULL;
|
|
1680
1680
|
SELECT to_jsonb(p.*) INTO v_pj FROM public.products p WHERE p.id = nullif(v_line->>'product_id', '')::uuid;
|
|
1681
1681
|
IF v_pj IS NULL THEN
|
|
1682
1682
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: product niet gevonden.', v_n));
|
|
1683
1683
|
END IF;
|
|
1684
|
-
-- Verpakking-snapshot: eigen keuze per regel, anders de primaire van het product.
|
|
1685
|
-
-- Ontbrekend blijft leeg; nooit stil 1.
|
|
1686
1684
|
IF v_ppc IS NOT NULL OR v_cpl IS NOT NULL OR v_lpc IS NOT NULL THEN
|
|
1687
1685
|
v_vbn := nullif(trim(coalesce(v_pack->>'vbn_package_code', '')), '');
|
|
1688
1686
|
v_lc := nullif(trim(coalesce(v_pack->>'load_carrier_type', '')), '');
|
|
@@ -1701,7 +1699,6 @@ BEGIN
|
|
|
1701
1699
|
v_lc := NULL;
|
|
1702
1700
|
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;
|
|
1703
1701
|
END IF;
|
|
1704
|
-
-- Hoeveelheid: altijd ook in planten. Fust -> planten met de stuks per fust.
|
|
1705
1702
|
IF v_qty IS NULL AND v_qty_crates IS NOT NULL THEN
|
|
1706
1703
|
IF v_qty_crates <= 0 THEN
|
|
1707
1704
|
RETURN jsonb_build_object('ok', false, 'reason', format('Regel %s: aantal fust moet groter dan 0 zijn.', v_n));
|
|
@@ -1730,7 +1727,6 @@ BEGIN
|
|
|
1730
1727
|
END IF;
|
|
1731
1728
|
END LOOP;
|
|
1732
1729
|
|
|
1733
|
-
-- Ophaalmoment alleen via de planning; geen eigen rekenwerk.
|
|
1734
1730
|
IF p_own_transport THEN
|
|
1735
1731
|
v_carrier := NULL;
|
|
1736
1732
|
v_moment := NULL;
|
|
@@ -1738,9 +1734,21 @@ BEGIN
|
|
|
1738
1734
|
BEGIN
|
|
1739
1735
|
v_preview := public.logistics_departure_preview(v_carrier, p_delivery_location_id::text, p_delivery_date, p_moment_key);
|
|
1740
1736
|
EXCEPTION WHEN others THEN
|
|
1741
|
-
|
|
1737
|
+
v_preview := NULL;
|
|
1742
1738
|
END;
|
|
1743
|
-
|
|
1739
|
+
-- Een meegegeven vervoerder die de planning niet kent mag de order niet tegenhouden:
|
|
1740
|
+
-- dan het ophaalmoment bepalen zonder die vervoerder (de Engine kiest er zelf een).
|
|
1741
|
+
IF v_carrier IS NOT NULL AND (v_preview IS NULL OR coalesce((v_preview->>'ok')::boolean, false) = false) THEN
|
|
1742
|
+
BEGIN
|
|
1743
|
+
v_preview := public.logistics_departure_preview(NULL, p_delivery_location_id::text, p_delivery_date, p_moment_key);
|
|
1744
|
+
EXCEPTION WHEN others THEN
|
|
1745
|
+
v_preview := NULL;
|
|
1746
|
+
END;
|
|
1747
|
+
END IF;
|
|
1748
|
+
IF v_preview IS NULL THEN
|
|
1749
|
+
RETURN jsonb_build_object('ok', false, 'reason', 'Het ophaalmoment is nu niet bekend. Probeer het over een minuut opnieuw.');
|
|
1750
|
+
END IF;
|
|
1751
|
+
IF coalesce((v_preview->>'ok')::boolean, false) = false THEN
|
|
1744
1752
|
RETURN jsonb_build_object('ok', false, 'reason', coalesce(v_preview->>'reason', 'Voor deze leverdatum is geen ophaalmoment mogelijk.'));
|
|
1745
1753
|
END IF;
|
|
1746
1754
|
v_chosen := v_preview->'chosen';
|
|
@@ -1765,8 +1773,8 @@ BEGIN
|
|
|
1765
1773
|
'delivery_date', p_delivery_date, 'signup_deadline', v_chosen->>'signupDeadline',
|
|
1766
1774
|
'reason', coalesce(v_preview->>'deliveryDateReason', v_preview->>'reason'), 'source', v_src);
|
|
1767
1775
|
END IF;
|
|
1768
|
-
|
|
1769
|
-
IF v_carrier IS NULL THEN
|
|
1776
|
+
-- Vervoerder uit de preview alleen als controle; opslaan doet de Engine (contract).
|
|
1777
|
+
IF coalesce(nullif(v_preview->>'carrierId', '')::uuid, v_carrier) IS NULL THEN
|
|
1770
1778
|
RETURN jsonb_build_object('ok', false, 'reason', 'Er is geen vervoerder bekend voor deze afleverlocatie.');
|
|
1771
1779
|
END IF;
|
|
1772
1780
|
v_moment := v_chosen->>'momentKey';
|
|
@@ -1776,7 +1784,6 @@ BEGIN
|
|
|
1776
1784
|
'source', v_cf_source,
|
|
1777
1785
|
v_key, p_source_id,
|
|
1778
1786
|
'delivery_location', p_delivery_location_id,
|
|
1779
|
-
'carrier', v_carrier,
|
|
1780
1787
|
'pickup_moment', v_moment,
|
|
1781
1788
|
'is_reservation', false);
|
|
1782
1789
|
IF nullif(trim(coalesce(p_customer_reference, '')), '') IS NOT NULL THEN
|
|
@@ -1786,6 +1793,9 @@ BEGIN
|
|
|
1786
1793
|
IF p_own_transport THEN
|
|
1787
1794
|
v_cf := v_cf || jsonb_build_object('own_transport', jsonb_build_object('by', coalesce(p_accepted_by, p_customer_id::text), 'at', now()));
|
|
1788
1795
|
END IF;
|
|
1796
|
+
IF v_zero > 0 THEN
|
|
1797
|
+
v_cf := v_cf || jsonb_build_object('zero_price_confirmed', jsonb_build_object('by', coalesce(v_uid::text, 'server'), 'at', now(), 'lines', v_zero));
|
|
1798
|
+
END IF;
|
|
1789
1799
|
IF v_stickers <> '{}'::jsonb THEN v_cf := v_cf || jsonb_build_object('line_stickers', v_stickers); END IF;
|
|
1790
1800
|
|
|
1791
1801
|
INSERT INTO public.orders (customer_id, customer_name, order_date, delivery_date, is_reservation,
|
|
@@ -1804,14 +1814,39 @@ BEGIN
|
|
|
1804
1814
|
nullif(i->>'quantity_crates', '')::int, i->>'vbn', i->>'lc', i->>'psrc'
|
|
1805
1815
|
FROM jsonb_array_elements(v_items) i;
|
|
1806
1816
|
|
|
1807
|
-
--
|
|
1817
|
+
-- Vervoerder via het gedeelde contract. Zonder p_carrier_id kiest de Engine zelf.
|
|
1818
|
+
-- Mislukt het instellen, dan blijft de order bewaard met een waarschuwing.
|
|
1819
|
+
IF v_carrier IS NOT NULL AND NOT coalesce(p_own_transport, false) THEN
|
|
1820
|
+
BEGIN
|
|
1821
|
+
IF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid,uuid)') IS NOT NULL THEN
|
|
1822
|
+
EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2, $3)' USING v_order_id, v_carrier, v_uid;
|
|
1823
|
+
ELSIF to_regprocedure('public.logistics_set_order_carrier(uuid,uuid)') IS NOT NULL THEN
|
|
1824
|
+
RAISE LOG 'verkoop_create_order: logistics_set_order_carrier met drie argumenten ontbreekt, variant met twee gebruikt (order %)', v_order_id;
|
|
1825
|
+
EXECUTE 'SELECT public.logistics_set_order_carrier($1, $2)' USING v_order_id, v_carrier;
|
|
1826
|
+
ELSE
|
|
1827
|
+
RAISE LOG 'verkoop_create_order: logistics_set_order_carrier ontbreekt, oude opslag gebruikt (order %)', v_order_id;
|
|
1828
|
+
v_carrier_fallback := true;
|
|
1829
|
+
UPDATE public.orders SET custom_fields = coalesce(custom_fields, '{}'::jsonb) || jsonb_build_object('carrier', v_carrier)
|
|
1830
|
+
WHERE id = v_order_id;
|
|
1831
|
+
END IF;
|
|
1832
|
+
EXCEPTION WHEN others THEN
|
|
1833
|
+
GET STACKED DIAGNOSTICS v_carrier_err = MESSAGE_TEXT;
|
|
1834
|
+
v_carrier_warning := 'De gekozen vervoerder kon niet worden ingesteld; de planning kiest er zelf een. Reden: ' || coalesce(v_carrier_err, 'onbekend');
|
|
1835
|
+
RAISE WARNING 'verkoop_create_order: %', v_carrier_warning;
|
|
1836
|
+
UPDATE public.orders SET custom_fields = coalesce(custom_fields, '{}'::jsonb)
|
|
1837
|
+
|| jsonb_build_object('carrier_warning', jsonb_build_object('message', v_carrier_warning, 'requested_carrier_id', v_carrier, 'at', now()))
|
|
1838
|
+
WHERE id = v_order_id;
|
|
1839
|
+
END;
|
|
1840
|
+
END IF;
|
|
1841
|
+
|
|
1808
1842
|
BEGIN
|
|
1809
1843
|
PERFORM public.logistics_emit_event('verkoop', 'order.received', v_order_id::text,
|
|
1810
1844
|
jsonb_build_object('orderId', v_order_id), NULL, false, 'order-received:' || v_order_id::text, 0);
|
|
1811
1845
|
EXCEPTION WHEN others THEN NULL;
|
|
1812
1846
|
END;
|
|
1813
1847
|
|
|
1814
|
-
RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false
|
|
1848
|
+
RETURN jsonb_build_object('ok', true, 'order_id', v_order_id, 'order_number', v_order_number, 'already_existed', false,
|
|
1849
|
+
'carrier_warning', v_carrier_warning, 'carrier_fallback', v_carrier_fallback);
|
|
1815
1850
|
END;
|
|
1816
1851
|
$function$
|
|
1817
1852
|
;
|
|
@@ -2217,6 +2252,107 @@ BEGIN
|
|
|
2217
2252
|
END;
|
|
2218
2253
|
$function$;
|
|
2219
2254
|
|
|
2255
|
+
-- Verkoop 1.0.117: logboek + correctiefunctie verpakking orderregels (alleen server)
|
|
2256
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_correctie_log (
|
|
2257
|
+
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
2258
|
+
correctie text NOT NULL,
|
|
2259
|
+
uitgevoerd_op timestamptz NOT NULL DEFAULT now(),
|
|
2260
|
+
uitgevoerd_door uuid,
|
|
2261
|
+
door_label text NOT NULL,
|
|
2262
|
+
uitvoeren boolean NOT NULL,
|
|
2263
|
+
aantal_orders integer NOT NULL DEFAULT 0,
|
|
2264
|
+
aantal_orders_gewijzigd integer NOT NULL DEFAULT 0,
|
|
2265
|
+
aantal_regels_gewijzigd integer NOT NULL DEFAULT 0,
|
|
2266
|
+
aantal_overgeslagen integer NOT NULL DEFAULT 0,
|
|
2267
|
+
details jsonb NOT NULL DEFAULT '{}'::jsonb,
|
|
2268
|
+
created_at timestamptz NOT NULL DEFAULT now()
|
|
2269
|
+
);
|
|
2270
|
+
GRANT ALL ON public.verkoop_correctie_log TO service_role;
|
|
2271
|
+
REVOKE ALL ON public.verkoop_correctie_log FROM anon, authenticated;
|
|
2272
|
+
ALTER TABLE public.verkoop_correctie_log ENABLE ROW LEVEL SECURITY;
|
|
2273
|
+
|
|
2274
|
+
CREATE OR REPLACE FUNCTION public.verkoop_correctie_verpakking(p_uitvoeren boolean DEFAULT false)
|
|
2275
|
+
RETURNS jsonb
|
|
2276
|
+
LANGUAGE plpgsql
|
|
2277
|
+
SECURITY DEFINER
|
|
2278
|
+
SET search_path TO 'public'
|
|
2279
|
+
AS $function$
|
|
2280
|
+
DECLARE
|
|
2281
|
+
v_vr jsonb; v_rows jsonb; v_te_doen jsonb; v_over jsonb;
|
|
2282
|
+
v_n_orders int; v_n_over int; v_n_regels int := 0; v_n_ord_gew int := 0; v_uid uuid := auth.uid();
|
|
2283
|
+
BEGIN
|
|
2284
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2285
|
+
RAISE EXCEPTION USING ERRCODE = '42501', MESSAGE = 'Deze correctie mag alleen door de server worden uitgevoerd.';
|
|
2286
|
+
END IF;
|
|
2287
|
+
PERFORM public.verkoop_assert_caller('server'); -- verkoop-poort
|
|
2288
|
+
|
|
2289
|
+
IF to_regprocedure('public.voorraad_correctie_status(text)') IS NULL THEN
|
|
2290
|
+
RAISE EXCEPTION USING ERRCODE = 'P0001', MESSAGE = 'Voorraad-module bijwerken: de controle op Voorraad-correctie 1098 ontbreekt in deze omgeving. Er is niets gewijzigd.';
|
|
2291
|
+
END IF;
|
|
2292
|
+
v_vr := public.voorraad_correctie_status('1098');
|
|
2293
|
+
IF coalesce((v_vr->>'uitgevoerd')::boolean, false) IS NOT TRUE THEN
|
|
2294
|
+
RAISE EXCEPTION USING ERRCODE = 'P0001', MESSAGE = 'Voer eerst Voorraad-correctie 1098 uit in deze omgeving. Er is niets gewijzigd.';
|
|
2295
|
+
END IF;
|
|
2296
|
+
|
|
2297
|
+
SELECT coalesce(jsonb_agg(to_jsonb(d)), '[]'::jsonb) INTO v_rows FROM public.verkoop_packing_drift_report() d;
|
|
2298
|
+
|
|
2299
|
+
SELECT coalesce(jsonb_agg(x ORDER BY x->>'order_number'), '[]'::jsonb) INTO v_te_doen FROM (
|
|
2300
|
+
SELECT jsonb_build_object('order_id', r->>'order_id', 'order_number', min(r->>'order_number'),
|
|
2301
|
+
'regels', jsonb_agg(jsonb_build_object('order_item_id', r->>'order_item_id', 'sales_order_id', r->>'sales_order_id',
|
|
2302
|
+
'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'),
|
|
2303
|
+
'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
|
|
2304
|
+
FROM jsonb_array_elements(v_rows) r
|
|
2305
|
+
WHERE NOT (r->>'afgesloten')::boolean AND NOT (r->>'vastgezet')::boolean
|
|
2306
|
+
GROUP BY r->>'order_id') s;
|
|
2307
|
+
|
|
2308
|
+
SELECT coalesce(jsonb_agg(x ORDER BY x->>'order_number'), '[]'::jsonb) INTO v_over FROM (
|
|
2309
|
+
SELECT jsonb_build_object('order_id', r->>'order_id', 'order_number', min(r->>'order_number'), 'status', min(r->>'order_status'),
|
|
2310
|
+
'reden', CASE WHEN bool_or((r->>'afgesloten')::boolean) THEN 'afgesloten' ELSE 'vastgezet' END,
|
|
2311
|
+
'aantal_regels', count(*)) x
|
|
2312
|
+
FROM jsonb_array_elements(v_rows) r
|
|
2313
|
+
WHERE (r->>'afgesloten')::boolean OR (r->>'vastgezet')::boolean
|
|
2314
|
+
GROUP BY r->>'order_id') s;
|
|
2315
|
+
|
|
2316
|
+
v_n_orders := jsonb_array_length(v_te_doen);
|
|
2317
|
+
v_n_over := jsonb_array_length(v_over);
|
|
2318
|
+
|
|
2319
|
+
IF p_uitvoeren THEN
|
|
2320
|
+
UPDATE public.order_items oi SET
|
|
2321
|
+
plants_per_crate = d.fd_plants_per_crate,
|
|
2322
|
+
crates_per_layer = d.fd_crates_per_layer,
|
|
2323
|
+
layers_per_cart = d.fd_layers_per_cart,
|
|
2324
|
+
vbn_package_code = coalesce(d.fd_vbn_package_code, oi.vbn_package_code),
|
|
2325
|
+
load_carrier_type = coalesce(d.fd_load_carrier_type, oi.load_carrier_type),
|
|
2326
|
+
packing_source = 'floriday_order'
|
|
2327
|
+
FROM public.verkoop_packing_drift_report() d
|
|
2328
|
+
WHERE d.order_item_id = oi.id
|
|
2329
|
+
AND NOT d.afgesloten AND NOT d.vastgezet
|
|
2330
|
+
AND oi.packing_locked_at IS NULL
|
|
2331
|
+
AND oi.quarantined_at IS NULL
|
|
2332
|
+
AND (oi.plants_per_crate IS DISTINCT FROM d.fd_plants_per_crate
|
|
2333
|
+
OR oi.crates_per_layer IS DISTINCT FROM d.fd_crates_per_layer
|
|
2334
|
+
OR oi.layers_per_cart IS DISTINCT FROM d.fd_layers_per_cart);
|
|
2335
|
+
GET DIAGNOSTICS v_n_regels = ROW_COUNT;
|
|
2336
|
+
v_n_ord_gew := CASE WHEN v_n_regels > 0 THEN v_n_orders ELSE 0 END;
|
|
2337
|
+
END IF;
|
|
2338
|
+
|
|
2339
|
+
INSERT INTO public.verkoop_correctie_log (correctie, uitgevoerd_door, door_label, uitvoeren, aantal_orders,
|
|
2340
|
+
aantal_orders_gewijzigd, aantal_regels_gewijzigd, aantal_overgeslagen, details)
|
|
2341
|
+
VALUES ('verpakking', v_uid, CASE WHEN v_uid IS NULL THEN 'systeem' ELSE 'gebruiker' END, p_uitvoeren, v_n_orders,
|
|
2342
|
+
v_n_ord_gew, v_n_regels, v_n_over, jsonb_build_object('orders', v_te_doen, 'overgeslagen', v_over, 'voorraad_1098', v_vr));
|
|
2343
|
+
|
|
2344
|
+
RETURN jsonb_build_object(
|
|
2345
|
+
'uitgevoerd', p_uitvoeren,
|
|
2346
|
+
'aantal_orders', v_n_orders,
|
|
2347
|
+
'aantal_regels_gewijzigd', v_n_regels,
|
|
2348
|
+
'aantal_overgeslagen', v_n_over,
|
|
2349
|
+
'orders', v_te_doen,
|
|
2350
|
+
'overgeslagen', v_over,
|
|
2351
|
+
'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).');
|
|
2352
|
+
END $function$;
|
|
2353
|
+
REVOKE ALL ON FUNCTION public.verkoop_correctie_verpakking(boolean) FROM PUBLIC, anon, authenticated;
|
|
2354
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_correctie_verpakking(boolean) TO service_role;
|
|
2355
|
+
|
|
2220
2356
|
-- Lijst: functie → niveau. Ook gebruikt door verkoop_install_check().
|
|
2221
2357
|
CREATE OR REPLACE FUNCTION public.verkoop_guarded_functions()
|
|
2222
2358
|
RETURNS TABLE(sig text, niveau text, rollen text, opmerking text)
|
|
@@ -2243,6 +2379,7 @@ AS $function$
|
|
|
2243
2379
|
('reset_cart_layer_positions(uuid)', 'ingelogd', NULL, NULL),
|
|
2244
2380
|
('move_cart_layer_position(uuid,integer,numeric,numeric)', 'ingelogd', NULL, NULL),
|
|
2245
2381
|
('swap_cart_layer_positions(uuid,uuid)', 'ingelogd', NULL, NULL),
|
|
2382
|
+
('verkoop_correctie_verpakking(boolean)', 'server', NULL, 'eenmalige correctie verpakking orderregels; vereist Voorraad-correctie 1098'),
|
|
2246
2383
|
('order_number_prefix(text,jsonb)', 'open', NULL, 'bewust open: rekenhulp zonder gegevens')
|
|
2247
2384
|
) v(sig, niveau, rollen, opmerking);
|
|
2248
2385
|
$function$;
|
|
@@ -2350,6 +2487,17 @@ BEGIN
|
|
|
2350
2487
|
FROM (VALUES
|
|
2351
2488
|
('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')
|
|
2352
2489
|
) pl(pol, tbl);
|
|
2490
|
+
|
|
2491
|
+
RETURN QUERY
|
|
2492
|
+
SELECT 'tabel'::text, 'verkoop_correctie_log'::text,
|
|
2493
|
+
to_regclass('public.verkoop_correctie_log') IS NOT NULL,
|
|
2494
|
+
NULL::text, NULL::boolean,
|
|
2495
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN NULL ELSE has_table_privilege('anon','public.verkoop_correctie_log','SELECT') END,
|
|
2496
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN NULL ELSE has_table_privilege('authenticated','public.verkoop_correctie_log','SELECT') END,
|
|
2497
|
+
CASE WHEN to_regclass('public.verkoop_correctie_log') IS NULL THEN 'tabel ontbreekt'
|
|
2498
|
+
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'
|
|
2499
|
+
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'
|
|
2500
|
+
ELSE 'in orde: beveiliging per rij aan, geen policies (alleen de functie schrijft)' END;
|
|
2353
2501
|
END;
|
|
2354
2502
|
$function$;
|
|
2355
2503
|
|