@flowselections/floriday-verkoop-module 1.0.125 → 1.0.129
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 +19 -2
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -2
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +5 -2
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +7 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +2 -1
- package/dist-lib/integrations/supabase/types.d.ts +730 -122
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/cart-replan.functions.d.ts +3 -58
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +3 -364
- package/dist-lib/lib/cart-replan.server.d.ts +67 -0
- package/dist-lib/lib/cart-replan.server.d.ts.map +1 -0
- package/dist-lib/lib/cart-replan.server.js +367 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +8 -2
- package/dist-lib/lib/cron/index.d.ts +1 -0
- package/dist-lib/lib/cron/index.d.ts.map +1 -1
- package/dist-lib/lib/cron/index.js +1 -0
- package/dist-lib/lib/cron/salesorders-sync.server.d.ts +20 -0
- package/dist-lib/lib/cron/salesorders-sync.server.d.ts.map +1 -0
- package/dist-lib/lib/cron/salesorders-sync.server.js +104 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +2 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -0
- package/dist-lib/lib/cron/sync-salesorders-now.js +52 -0
- package/dist-lib/lib/cron/sync-salesorders.js +1 -1
- package/dist-lib/lib/delivery-location.check.d.ts +2 -0
- package/dist-lib/lib/delivery-location.check.d.ts.map +1 -0
- package/dist-lib/lib/delivery-location.check.js +29 -0
- package/dist-lib/lib/delivery-location.server.d.ts +35 -0
- package/dist-lib/lib/delivery-location.server.d.ts.map +1 -0
- package/dist-lib/lib/delivery-location.server.js +171 -0
- package/dist-lib/lib/engine-wake.server.d.ts +3 -1
- package/dist-lib/lib/engine-wake.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-wake.server.js +16 -14
- package/dist-lib/lib/floriday-mirror.functions.d.ts +1 -19
- package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.functions.js +6 -1475
- package/dist-lib/lib/floriday-mirror.server.d.ts +27 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-mirror.server.js +1508 -0
- package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.server.js +2 -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-addresses.functions.d.ts +1 -0
- package/dist-lib/lib/order-addresses.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-addresses.functions.js +28 -29
- package/dist-lib/lib/order-buffers.functions.d.ts +0 -2
- package/dist-lib/lib/order-buffers.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-buffers.functions.js +0 -10
- package/dist-lib/lib/order-buffers.server.d.ts +3 -0
- package/dist-lib/lib/order-buffers.server.d.ts.map +1 -0
- package/dist-lib/lib/order-buffers.server.js +11 -0
- package/dist-lib/lib/order-cancel.server.d.ts +2 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +1 -1
- package/dist-lib/lib/order-item-packing.functions.d.ts +6 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +19 -2
- package/dist-lib/lib/plan-coverage.d.ts +15 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +16 -0
- package/dist-lib/lib/product-plannable.functions.d.ts +14 -0
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -0
- package/dist-lib/lib/product-plannable.functions.js +24 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +22 -6
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +10 -0
- package/dist-lib/lib/salesorders-mapping.d.ts +2 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts +0 -14
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -102
- package/package.json +11 -2
- package/schema/verkoop.sql +98 -0
|
@@ -32,111 +32,13 @@ function pickString(v) {
|
|
|
32
32
|
}
|
|
33
33
|
return null;
|
|
34
34
|
}
|
|
35
|
-
// Ophalen bij Floriday doet uitsluitend de Authenticatie-module (cursor
|
|
36
|
-
// "sales-orders", zelfde tabel floriday_salesorders_cache). Deze module
|
|
37
|
-
// spiegelt alleen nog uit die gedeelde cache naar de lokale orders.
|
|
38
|
-
async function runSalesOrdersMirror(mirrorLimit) {
|
|
39
|
-
let mirrorOk = true;
|
|
40
|
-
let mirrored = 0;
|
|
41
|
-
try {
|
|
42
|
-
const { mirrorFloridayOrdersFromCron } = await import("./floriday-mirror.functions.js");
|
|
43
|
-
const m = (await mirrorFloridayOrdersFromCron(mirrorLimit));
|
|
44
|
-
mirrorOk = m?.ok !== false;
|
|
45
|
-
mirrored = Number(m?.created ?? 0) + Number(m?.updated ?? 0) || 0;
|
|
46
|
-
}
|
|
47
|
-
catch (mirrorErr) {
|
|
48
|
-
mirrorOk = false;
|
|
49
|
-
console.error("[floriday-mirror] failed", mirrorErr);
|
|
50
|
-
}
|
|
51
|
-
return { ok: mirrorOk, mirrorOk, mirrored };
|
|
52
|
-
}
|
|
53
|
-
const MIRROR_CRON_LIMIT = 500;
|
|
54
|
-
const SYNC_KEY = "salesorders-mirror";
|
|
55
|
-
/** Onderhoud zonder handwerk: index herbouwen als die leeg is (max 1×/uur), cron vastleggen (max 1×/uur). */
|
|
56
|
-
async function runMaintenance(supabaseAdmin, nowMs) {
|
|
57
|
-
const { dueAgain, REBUILD_EVERY_MS, ENSURE_CRON_EVERY_MS } = await import("./sync-watermark.js");
|
|
58
|
-
const out = {};
|
|
59
|
-
const { data: rows } = await supabaseAdmin
|
|
60
|
-
.from("verkoop_sync_state")
|
|
61
|
-
.select("key, rebuilt_at, ensure_cron_at")
|
|
62
|
-
.in("key", ["fulfillment-index", "cron"]);
|
|
63
|
-
const byKey = new Map((rows ?? []).map((r) => [r.key, r]));
|
|
64
|
-
try {
|
|
65
|
-
const { count, error } = await supabaseAdmin
|
|
66
|
-
.from("verkoop_fulfillment_index")
|
|
67
|
-
.select("sales_order_id", { count: "exact", head: true });
|
|
68
|
-
if (error)
|
|
69
|
-
throw new Error(error.message);
|
|
70
|
-
if ((count ?? 0) === 0 && dueAgain(byKey.get("fulfillment-index")?.rebuilt_at, nowMs, REBUILD_EVERY_MS)) {
|
|
71
|
-
const { data, error: rErr } = await supabaseAdmin.rpc("verkoop_fulfillment_index_rebuild");
|
|
72
|
-
if (rErr)
|
|
73
|
-
throw new Error(rErr.message);
|
|
74
|
-
out.indexRebuild = data;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
catch (e) {
|
|
78
|
-
out.indexError = e.message;
|
|
79
|
-
}
|
|
80
|
-
if (dueAgain(byKey.get("cron")?.ensure_cron_at, nowMs, ENSURE_CRON_EVERY_MS)) {
|
|
81
|
-
const { data, error } = await supabaseAdmin.rpc("verkoop_ensure_cron");
|
|
82
|
-
out.ensureCron = error ? { ok: false, error: error.message } : data;
|
|
83
|
-
}
|
|
84
|
-
return out;
|
|
85
|
-
}
|
|
86
|
-
export async function runSalesOrdersSyncFromCron() {
|
|
87
|
-
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
88
|
-
const { planMirrorRun, nextSyncState } = await import("./sync-watermark.js");
|
|
89
|
-
const nowMs = Date.now();
|
|
90
|
-
const startedAt = new Date(nowMs).toISOString();
|
|
91
|
-
const maintenance = await runMaintenance(supabaseAdmin, nowMs);
|
|
92
|
-
const { data: stateRow, error: stErr } = await supabaseAdmin
|
|
93
|
-
.from("verkoop_sync_state")
|
|
94
|
-
.select("last_seen_at, full_run_at")
|
|
95
|
-
.eq("key", SYNC_KEY)
|
|
96
|
-
.maybeSingle();
|
|
97
|
-
// Stand niet leesbaar: volledige ronde (veilig), watermerk blijft staan.
|
|
98
|
-
const run = stErr ? { full: true, since: null } : planMirrorRun(stateRow ?? null, nowMs);
|
|
99
|
-
let mirrorOk = true;
|
|
100
|
-
let mirrored = 0;
|
|
101
|
-
let processed = 0;
|
|
102
|
-
let skipped;
|
|
103
|
-
try {
|
|
104
|
-
const { mirrorFloridayOrdersFromCron } = await import("./floriday-mirror.functions.js");
|
|
105
|
-
const m = (await mirrorFloridayOrdersFromCron(MIRROR_CRON_LIMIT, run.since));
|
|
106
|
-
mirrorOk = m?.ok !== false;
|
|
107
|
-
mirrored = Number(m?.inserted ?? 0) + Number(m?.updated ?? 0) || 0;
|
|
108
|
-
processed = Number(m?.processed ?? 0) || 0;
|
|
109
|
-
skipped = m?.skipped_reason;
|
|
110
|
-
}
|
|
111
|
-
catch (mirrorErr) {
|
|
112
|
-
mirrorOk = false;
|
|
113
|
-
console.error("[floriday-mirror] failed", mirrorErr);
|
|
114
|
-
}
|
|
115
|
-
const next = !stErr && !skipped ? nextSyncState(run, { ok: mirrorOk, processed }, MIRROR_CRON_LIMIT, startedAt) : null;
|
|
116
|
-
if (next) {
|
|
117
|
-
await supabaseAdmin
|
|
118
|
-
.from("verkoop_sync_state")
|
|
119
|
-
.upsert({ key: SYNC_KEY, ...next, updated_at: new Date().toISOString() }, { onConflict: "key" });
|
|
120
|
-
}
|
|
121
|
-
// Blokkade-alarm alleen op basis van de Engine (koppelprompt 22).
|
|
122
|
-
const { checkDefinitiveBlocks } = await import("./engine-block-alerts.server.js");
|
|
123
|
-
const alerts = await checkDefinitiveBlocks();
|
|
124
|
-
return {
|
|
125
|
-
ok: mirrorOk,
|
|
126
|
-
mirrorOk,
|
|
127
|
-
mirrored,
|
|
128
|
-
processed,
|
|
129
|
-
fullRun: run.full,
|
|
130
|
-
since: run.since,
|
|
131
|
-
watermarkAdvanced: Boolean(next),
|
|
132
|
-
maintenance,
|
|
133
|
-
blockAlerts: { mailed: alerts.mailed, closed: alerts.closed },
|
|
134
|
-
};
|
|
135
|
-
}
|
|
136
35
|
// Knop "Verversen": direct spiegelen uit de gedeelde cache, kleine limiet.
|
|
137
36
|
export const runSalesOrdersSync = createServerFn({ method: "POST" })
|
|
138
37
|
.middleware([requireSupabaseAuth])
|
|
139
|
-
.handler(async () =>
|
|
38
|
+
.handler(async () => {
|
|
39
|
+
const { runSalesOrdersMirror } = await import("./cron/salesorders-sync.server.js");
|
|
40
|
+
return runSalesOrdersMirror(100);
|
|
41
|
+
});
|
|
140
42
|
// ─── Write actions ────────────────────────────────────────────────────────
|
|
141
43
|
const CreateOrderSchema = z.object({
|
|
142
44
|
customerOrganizationId: z.string().min(1),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flowselections/floriday-verkoop-module",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.129",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -27,7 +27,8 @@
|
|
|
27
27
|
"scripts": {
|
|
28
28
|
"dev": "vite dev",
|
|
29
29
|
"build": "vite build",
|
|
30
|
-
"build:lib": "tsc -p tsconfig.build.json && (tsc-alias -p tsconfig.build.json --resolve-full-paths || echo 'build:lib: tsc-alias draaide niet — dist-lib wordt gecontroleerd') && node scripts/check-esm-extensions.mjs && node -e \"require('fs').writeFileSync('dist-lib/styles.css', '@source \\\"./\\\";\\n')\" && node scripts/check-schema.mjs",
|
|
30
|
+
"build:lib": "tsc -p tsconfig.build.json && (tsc-alias -p tsconfig.build.json --resolve-full-paths || echo 'build:lib: tsc-alias draaide niet — dist-lib wordt gecontroleerd') && node scripts/check-esm-extensions.mjs && node scripts/check-client-graph.mjs && node -e \"require('fs').writeFileSync('dist-lib/styles.css', '@source \\\"./\\\";\\n')\" && node scripts/check-schema.mjs",
|
|
31
|
+
"check:client": "node scripts/check-client-graph.mjs && node scripts/client-build-proef/run.mjs",
|
|
31
32
|
"build:lib:watch": "tsc -p tsconfig.build.json --watch",
|
|
32
33
|
"build:dev": "vite build --mode development",
|
|
33
34
|
"preview": "vite preview",
|
|
@@ -126,6 +127,14 @@
|
|
|
126
127
|
"methods": [
|
|
127
128
|
"POST"
|
|
128
129
|
]
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
"routePath": "/api/public/cron/sync-salesorders-now",
|
|
133
|
+
"import": "@flowselections/floriday-verkoop-module/cron",
|
|
134
|
+
"handler": "syncSalesOrdersNowCron",
|
|
135
|
+
"methods": [
|
|
136
|
+
"POST"
|
|
137
|
+
]
|
|
129
138
|
}
|
|
130
139
|
],
|
|
131
140
|
"schema": {
|
package/schema/verkoop.sql
CHANGED
|
@@ -2750,3 +2750,101 @@ DO $$ BEGIN
|
|
|
2750
2750
|
FOR EACH ROW EXECUTE FUNCTION public.verkoop_fulfillment_index_trg();
|
|
2751
2751
|
END IF;
|
|
2752
2752
|
END $$;
|
|
2753
|
+
|
|
2754
|
+
-- ===== 1.0.128: directe omzetting Floriday-verkooporders =====
|
|
2755
|
+
CREATE OR REPLACE FUNCTION public.verkoop_salesorder_content_hash(p_data jsonb, p_deleted boolean)
|
|
2756
|
+
RETURNS text
|
|
2757
|
+
LANGUAGE sql
|
|
2758
|
+
IMMUTABLE
|
|
2759
|
+
SET search_path = public
|
|
2760
|
+
AS $$
|
|
2761
|
+
SELECT md5(concat_ws('|',
|
|
2762
|
+
coalesce(p_deleted, false)::text,
|
|
2763
|
+
p_data->>'status',
|
|
2764
|
+
p_data->>'numberOfPieces',
|
|
2765
|
+
p_data->>'tradeItemId',
|
|
2766
|
+
p_data->>'salesOrderGroupId',
|
|
2767
|
+
(p_data->'delivery')::text,
|
|
2768
|
+
(p_data->'packingConfiguration')::text,
|
|
2769
|
+
p_data->>'pricePerPiece'
|
|
2770
|
+
))
|
|
2771
|
+
$$;
|
|
2772
|
+
|
|
2773
|
+
CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_post(p_ids text[])
|
|
2774
|
+
RETURNS void
|
|
2775
|
+
LANGUAGE plpgsql
|
|
2776
|
+
SECURITY DEFINER
|
|
2777
|
+
SET search_path = public
|
|
2778
|
+
AS $$
|
|
2779
|
+
BEGIN
|
|
2780
|
+
IF p_ids IS NULL OR cardinality(p_ids) = 0 THEN RETURN; END IF;
|
|
2781
|
+
IF to_regprocedure('public.flowselections_cron_post(text,jsonb,integer,text)') IS NULL THEN RETURN; END IF;
|
|
2782
|
+
PERFORM public.flowselections_cron_post(
|
|
2783
|
+
'/api/public/cron/sync-salesorders-now',
|
|
2784
|
+
jsonb_build_object('salesOrderIds', to_jsonb(p_ids[1:200])),
|
|
2785
|
+
15000,
|
|
2786
|
+
'anon'
|
|
2787
|
+
);
|
|
2788
|
+
EXCEPTION WHEN OTHERS THEN
|
|
2789
|
+
RAISE WARNING '[verkoop] directe omzetting niet verstuurd: %', SQLERRM;
|
|
2790
|
+
END
|
|
2791
|
+
$$;
|
|
2792
|
+
|
|
2793
|
+
CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_ins_trg()
|
|
2794
|
+
RETURNS trigger
|
|
2795
|
+
LANGUAGE plpgsql
|
|
2796
|
+
SECURITY DEFINER
|
|
2797
|
+
SET search_path = public
|
|
2798
|
+
AS $$
|
|
2799
|
+
DECLARE v_ids text[];
|
|
2800
|
+
BEGIN
|
|
2801
|
+
SELECT array_agg(DISTINCT n.floriday_id) INTO v_ids
|
|
2802
|
+
FROM new_rows n
|
|
2803
|
+
WHERE n.floriday_id IS NOT NULL
|
|
2804
|
+
AND coalesce(n.is_deleted, false) = false
|
|
2805
|
+
AND NOT EXISTS (SELECT 1 FROM public.orders o WHERE o.floriday_sales_order_id = n.floriday_id AND o.deleted_at IS NULL);
|
|
2806
|
+
PERFORM public.verkoop_salesorders_direct_post(v_ids);
|
|
2807
|
+
RETURN NULL;
|
|
2808
|
+
EXCEPTION WHEN OTHERS THEN
|
|
2809
|
+
RAISE WARNING '[verkoop] directe omzetting (insert) overgeslagen: %', SQLERRM;
|
|
2810
|
+
RETURN NULL;
|
|
2811
|
+
END
|
|
2812
|
+
$$;
|
|
2813
|
+
|
|
2814
|
+
CREATE OR REPLACE FUNCTION public.verkoop_salesorders_direct_upd_trg()
|
|
2815
|
+
RETURNS trigger
|
|
2816
|
+
LANGUAGE plpgsql
|
|
2817
|
+
SECURITY DEFINER
|
|
2818
|
+
SET search_path = public
|
|
2819
|
+
AS $$
|
|
2820
|
+
DECLARE v_ids text[];
|
|
2821
|
+
BEGIN
|
|
2822
|
+
SELECT array_agg(DISTINCT n.floriday_id) INTO v_ids
|
|
2823
|
+
FROM new_rows n
|
|
2824
|
+
JOIN old_rows o ON o.floriday_id = n.floriday_id AND o.connection_id IS NOT DISTINCT FROM n.connection_id
|
|
2825
|
+
WHERE n.floriday_id IS NOT NULL
|
|
2826
|
+
AND public.verkoop_salesorder_content_hash(n.data, n.is_deleted)
|
|
2827
|
+
IS DISTINCT FROM public.verkoop_salesorder_content_hash(o.data, o.is_deleted);
|
|
2828
|
+
PERFORM public.verkoop_salesorders_direct_post(v_ids);
|
|
2829
|
+
RETURN NULL;
|
|
2830
|
+
EXCEPTION WHEN OTHERS THEN
|
|
2831
|
+
RAISE WARNING '[verkoop] directe omzetting (update) overgeslagen: %', SQLERRM;
|
|
2832
|
+
RETURN NULL;
|
|
2833
|
+
END
|
|
2834
|
+
$$;
|
|
2835
|
+
|
|
2836
|
+
REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_post(text[]) FROM PUBLIC, anon, authenticated;
|
|
2837
|
+
REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_ins_trg() FROM PUBLIC, anon, authenticated;
|
|
2838
|
+
REVOKE ALL ON FUNCTION public.verkoop_salesorders_direct_upd_trg() FROM PUBLIC, anon, authenticated;
|
|
2839
|
+
|
|
2840
|
+
DO $$
|
|
2841
|
+
BEGIN
|
|
2842
|
+
IF to_regclass('public.floriday_salesorders_cache') IS NOT NULL THEN
|
|
2843
|
+
EXECUTE 'DROP TRIGGER IF EXISTS verkoop_salesorders_direct_ins ON public.floriday_salesorders_cache';
|
|
2844
|
+
EXECUTE 'DROP TRIGGER IF EXISTS verkoop_salesorders_direct_upd ON public.floriday_salesorders_cache';
|
|
2845
|
+
EXECUTE $q$CREATE TRIGGER verkoop_salesorders_direct_ins AFTER INSERT ON public.floriday_salesorders_cache
|
|
2846
|
+
REFERENCING NEW TABLE AS new_rows FOR EACH STATEMENT EXECUTE FUNCTION public.verkoop_salesorders_direct_ins_trg()$q$;
|
|
2847
|
+
EXECUTE $q$CREATE TRIGGER verkoop_salesorders_direct_upd AFTER UPDATE ON public.floriday_salesorders_cache
|
|
2848
|
+
REFERENCING OLD TABLE AS old_rows NEW TABLE AS new_rows FOR EACH STATEMENT EXECUTE FUNCTION public.verkoop_salesorders_direct_upd_trg()$q$;
|
|
2849
|
+
END IF;
|
|
2850
|
+
END $$;
|