@flowselections/floriday-verkoop-module 1.0.121 → 1.0.125
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 +5 -2
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +13 -7
- package/dist-lib/integrations/supabase/types.d.ts +681 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.d.ts +3 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +20 -3
- package/dist-lib/lib/engine-wake.server.d.ts +2 -0
- package/dist-lib/lib/engine-wake.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-wake.server.js +90 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +5 -3
- package/dist-lib/lib/floriday-fulfillment-status.server.d.ts +4 -2
- package/dist-lib/lib/floriday-fulfillment-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-fulfillment-status.server.js +59 -58
- package/dist-lib/lib/floriday-mirror.functions.d.ts +1 -1
- package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.functions.js +34 -7
- package/dist-lib/lib/list-speed.check.d.ts +2 -0
- package/dist-lib/lib/list-speed.check.d.ts.map +1 -0
- package/dist-lib/lib/list-speed.check.js +49 -0
- package/dist-lib/lib/logistics-engine.functions.js +1 -1
- package/dist-lib/lib/logistics-engine.server.d.ts +13 -3
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +48 -8
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-backlog.server.d.ts.map +1 -1
- package/dist-lib/lib/order-backlog.server.js +48 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +9 -2
- package/dist-lib/lib/salesorders-list.functions.d.ts +1 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +22 -1
- package/dist-lib/lib/salesorders-list.server.d.ts +20 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +421 -268
- package/dist-lib/lib/salesorders.functions.d.ts +14 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +78 -2
- package/dist-lib/lib/sync-watermark.check.d.ts +2 -0
- package/dist-lib/lib/sync-watermark.check.d.ts.map +1 -0
- package/dist-lib/lib/sync-watermark.check.js +22 -0
- package/dist-lib/lib/sync-watermark.d.ts +26 -0
- package/dist-lib/lib/sync-watermark.d.ts.map +1 -0
- package/dist-lib/lib/sync-watermark.js +29 -0
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +12 -2
- package/package.json +1 -1
- package/schema/verkoop.sql +251 -4
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
import { type SalesOrderDTO } from "./salesorders-mapping.js";
|
|
2
|
-
export declare function runSalesOrdersSyncFromCron(): Promise<
|
|
2
|
+
export declare function runSalesOrdersSyncFromCron(): Promise<{
|
|
3
|
+
ok: boolean;
|
|
4
|
+
mirrorOk: boolean;
|
|
5
|
+
mirrored: number;
|
|
6
|
+
processed: number;
|
|
7
|
+
fullRun: boolean;
|
|
8
|
+
since: string | null;
|
|
9
|
+
watermarkAdvanced: boolean;
|
|
10
|
+
maintenance: Record<string, unknown>;
|
|
11
|
+
blockAlerts: {
|
|
12
|
+
mailed: number;
|
|
13
|
+
closed: number;
|
|
14
|
+
};
|
|
15
|
+
}>;
|
|
3
16
|
export declare const runSalesOrdersSync: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
4
17
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
5
18
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAqF/B,wBAAsB,0BAA0B;;;;;;;;;;;;;GAmD/C;AAGD,eAAO,MAAM,kBAAkB;;;;;QAxGzB,OAAO;cACD,OAAO;cACP,MAAM;GAwG+B,CAAC;AA6BlD,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAqazB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -50,12 +50,88 @@ async function runSalesOrdersMirror(mirrorLimit) {
|
|
|
50
50
|
}
|
|
51
51
|
return { ok: mirrorOk, mirrorOk, mirrored };
|
|
52
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
|
+
}
|
|
53
86
|
export async function runSalesOrdersSyncFromCron() {
|
|
54
|
-
const
|
|
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
|
+
}
|
|
55
121
|
// Blokkade-alarm alleen op basis van de Engine (koppelprompt 22).
|
|
56
122
|
const { checkDefinitiveBlocks } = await import("./engine-block-alerts.server.js");
|
|
57
123
|
const alerts = await checkDefinitiveBlocks();
|
|
58
|
-
return {
|
|
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
|
+
};
|
|
59
135
|
}
|
|
60
136
|
// Knop "Verversen": direct spiegelen uit de gedeelde cache, kleine limiet.
|
|
61
137
|
export const runSalesOrdersSync = createServerFn({ method: "POST" })
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-watermark.check.d.ts","sourceRoot":"","sources":["../../src/lib/sync-watermark.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
// Draaien: bun src/lib/sync-watermark.check.ts
|
|
2
|
+
import { planMirrorRun, nextSyncState, dueAgain, WATERMARK_OVERLAP_MS } from "./sync-watermark.js";
|
|
3
|
+
let fail = 0;
|
|
4
|
+
const eq = (name, got, want) => {
|
|
5
|
+
const ok = JSON.stringify(got) === JSON.stringify(want);
|
|
6
|
+
if (!ok)
|
|
7
|
+
fail++;
|
|
8
|
+
console.log(`${ok ? "ok " : "FOUT"} ${name}: ${JSON.stringify(got)}`);
|
|
9
|
+
};
|
|
10
|
+
const now = Date.parse("2026-10-26T12:00:00Z");
|
|
11
|
+
eq("geen stand → volledige ronde", planMirrorRun(null, now), { full: true, since: null });
|
|
12
|
+
eq("watermerk met 2 min overlap", planMirrorRun({ last_seen_at: "2026-10-26T11:59:00Z", full_run_at: "2026-10-26T11:30:00Z" }, now), { full: false, since: new Date(Date.parse("2026-10-26T11:59:00Z") - WATERMARK_OVERLAP_MS).toISOString() });
|
|
13
|
+
eq("na een uur weer volledig", planMirrorRun({ last_seen_at: "2026-10-26T11:59:00Z", full_run_at: "2026-10-26T10:59:00Z" }, now).full, true);
|
|
14
|
+
eq("fout → niet opschuiven", nextSyncState({ full: false }, { ok: false, processed: 0 }, 500, "t"), null);
|
|
15
|
+
eq("limiet geraakt → niet opschuiven", nextSyncState({ full: false }, { ok: true, processed: 500 }, 500, "t"), null);
|
|
16
|
+
eq("volledige ronde schuift altijd op", nextSyncState({ full: true }, { ok: true, processed: 500 }, 500, "t"), { last_seen_at: "t", full_run_at: "t" });
|
|
17
|
+
eq("geslaagd → opschuiven", nextSyncState({ full: false }, { ok: true, processed: 3 }, 500, "t"), { last_seen_at: "t" });
|
|
18
|
+
eq("herbouw net gedaan → niet opnieuw", dueAgain("2026-10-26T11:30:00Z", now, 3600000), false);
|
|
19
|
+
eq("herbouw > 1 uur geleden → weer", dueAgain("2026-10-26T10:59:00Z", now, 3600000), true);
|
|
20
|
+
eq("nooit herbouwd → mag", dueAgain(null, now, 3600000), true);
|
|
21
|
+
if (fail)
|
|
22
|
+
process.exit(1);
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export declare const WATERMARK_OVERLAP_MS: number;
|
|
2
|
+
export declare const FULL_RUN_EVERY_MS: number;
|
|
3
|
+
export declare const REBUILD_EVERY_MS: number;
|
|
4
|
+
export declare const ENSURE_CRON_EVERY_MS: number;
|
|
5
|
+
export interface SyncState {
|
|
6
|
+
last_seen_at?: string | null;
|
|
7
|
+
full_run_at?: string | null;
|
|
8
|
+
}
|
|
9
|
+
/** Bepaalt of deze ronde volledig moet zijn, en zo niet vanaf welk moment. */
|
|
10
|
+
export declare function planMirrorRun(state: SyncState | null, nowMs: number): {
|
|
11
|
+
full: boolean;
|
|
12
|
+
since: string | null;
|
|
13
|
+
};
|
|
14
|
+
/** Nieuwe stand na een ronde; null = niet opschuiven (fout of limiet bereikt). */
|
|
15
|
+
export declare function nextSyncState(run: {
|
|
16
|
+
full: boolean;
|
|
17
|
+
}, result: {
|
|
18
|
+
ok: boolean;
|
|
19
|
+
processed: number;
|
|
20
|
+
}, limit: number, startedAtIso: string): {
|
|
21
|
+
last_seen_at: string;
|
|
22
|
+
full_run_at?: string;
|
|
23
|
+
} | null;
|
|
24
|
+
/** Mag een actie (herbouw, croncontrole) weer? Hooguit eens per interval. */
|
|
25
|
+
export declare function dueAgain(lastIso: string | null | undefined, nowMs: number, everyMs: number): boolean;
|
|
26
|
+
//# sourceMappingURL=sync-watermark.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-watermark.d.ts","sourceRoot":"","sources":["../../src/lib/sync-watermark.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,oBAAoB,QAAgB,CAAC;AAClD,eAAO,MAAM,iBAAiB,QAAiB,CAAC;AAChD,eAAO,MAAM,gBAAgB,QAAiB,CAAC;AAC/C,eAAO,MAAM,oBAAoB,QAAiB,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAO7G;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAC3B,GAAG,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EACtB,MAAM,EAAE;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC1C,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,GACnB;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMvD;AAED,6EAA6E;AAC7E,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAGpG"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
// Watermerk van de Floriday-spiegelronde (pure helpers, testbaar).
|
|
2
|
+
export const WATERMARK_OVERLAP_MS = 2 * 60 * 1000;
|
|
3
|
+
export const FULL_RUN_EVERY_MS = 60 * 60 * 1000;
|
|
4
|
+
export const REBUILD_EVERY_MS = 60 * 60 * 1000;
|
|
5
|
+
export const ENSURE_CRON_EVERY_MS = 60 * 60 * 1000;
|
|
6
|
+
/** Bepaalt of deze ronde volledig moet zijn, en zo niet vanaf welk moment. */
|
|
7
|
+
export function planMirrorRun(state, nowMs) {
|
|
8
|
+
const last = state?.last_seen_at ? Date.parse(state.last_seen_at) : NaN;
|
|
9
|
+
const fullAt = state?.full_run_at ? Date.parse(state.full_run_at) : NaN;
|
|
10
|
+
if (!Number.isFinite(last) || !Number.isFinite(fullAt) || nowMs - fullAt >= FULL_RUN_EVERY_MS) {
|
|
11
|
+
return { full: true, since: null };
|
|
12
|
+
}
|
|
13
|
+
return { full: false, since: new Date(last - WATERMARK_OVERLAP_MS).toISOString() };
|
|
14
|
+
}
|
|
15
|
+
/** Nieuwe stand na een ronde; null = niet opschuiven (fout of limiet bereikt). */
|
|
16
|
+
export function nextSyncState(run, result, limit, startedAtIso) {
|
|
17
|
+
if (!result.ok)
|
|
18
|
+
return null;
|
|
19
|
+
// Een volledige ronde is een vangnet met dezelfde limiet als vroeger: die schuift altijd op.
|
|
20
|
+
// Een watermerkronde die de limiet raakt schuift niet op (de rest volgt in de volgende ronde).
|
|
21
|
+
if (!run.full && result.processed >= limit)
|
|
22
|
+
return null;
|
|
23
|
+
return run.full ? { last_seen_at: startedAtIso, full_run_at: startedAtIso } : { last_seen_at: startedAtIso };
|
|
24
|
+
}
|
|
25
|
+
/** Mag een actie (herbouw, croncontrole) weer? Hooguit eens per interval. */
|
|
26
|
+
export function dueAgain(lastIso, nowMs, everyMs) {
|
|
27
|
+
const t = lastIso ? Date.parse(lastIso) : NaN;
|
|
28
|
+
return !Number.isFinite(t) || nowMs - t >= everyMs;
|
|
29
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,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,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;CACnC,CAwCA;AAED,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,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,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;CACnC,CAwCA;AAED,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,uBAAuB,0EA0ElC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// `listSalesOrders`. De browser ontvangt alleen de rijen van de zichtbare
|
|
3
3
|
// pagina plus totalen/tellingen, zodat de lijst snel blijft bij tienduizenden
|
|
4
4
|
// orders.
|
|
5
|
-
import { useEffect } from "react";
|
|
5
|
+
import { useEffect, useRef } from "react";
|
|
6
6
|
import { useQuery, useQueryClient, keepPreviousData } from "@tanstack/react-query";
|
|
7
7
|
import { useServerFn } from "@tanstack/react-start";
|
|
8
8
|
import { supabase } from "../integrations/supabase/client.js";
|
|
@@ -78,10 +78,14 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
78
78
|
page,
|
|
79
79
|
pageSize,
|
|
80
80
|
};
|
|
81
|
+
// Realtime-seintje op referentiedata: volgende opvraging leegt de servercache.
|
|
82
|
+
const refreshRef = useRef(false);
|
|
81
83
|
const query = useQuery({
|
|
82
84
|
queryKey: ["floriday", "salesorders-list", params],
|
|
83
85
|
queryFn: async () => {
|
|
84
|
-
const
|
|
86
|
+
const refreshReference = refreshRef.current;
|
|
87
|
+
refreshRef.current = false;
|
|
88
|
+
const res = await fetchList({ data: { ...params, refreshReference } });
|
|
85
89
|
const { rows, ...rest } = res;
|
|
86
90
|
return { orders: rows, ...rest };
|
|
87
91
|
},
|
|
@@ -102,12 +106,18 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
102
106
|
queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] });
|
|
103
107
|
}, 750);
|
|
104
108
|
};
|
|
109
|
+
const invalidateRef = () => {
|
|
110
|
+
refreshRef.current = true;
|
|
111
|
+
invalidate();
|
|
112
|
+
};
|
|
105
113
|
if (!enabled)
|
|
106
114
|
return;
|
|
107
115
|
const channel = supabase
|
|
108
116
|
.channel("salesorders-list-refresh")
|
|
109
117
|
.on("postgres_changes", { event: "*", schema: "public", table: "floriday_salesorders_cache" }, invalidate)
|
|
110
118
|
.on("postgres_changes", { event: "*", schema: "public", table: "orders" }, invalidate)
|
|
119
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "carriers" }, invalidateRef)
|
|
120
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "product_groups" }, invalidateRef)
|
|
111
121
|
.subscribe();
|
|
112
122
|
return () => {
|
|
113
123
|
if (timer)
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -2457,7 +2457,6 @@ BEGIN
|
|
|
2457
2457
|
IF NOT public.verkoop_is_server() THEN
|
|
2458
2458
|
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
2459
2459
|
END IF;
|
|
2460
|
-
|
|
2461
2460
|
RETURN QUERY
|
|
2462
2461
|
SELECT 'functie'::text, g.sig,
|
|
2463
2462
|
to_regprocedure('public.' || g.sig) IS NOT NULL,
|
|
@@ -2468,7 +2467,6 @@ BEGIN
|
|
|
2468
2467
|
CASE WHEN to_regprocedure('public.' || g.sig) IS NULL THEN NULL ELSE has_function_privilege('authenticated', to_regprocedure('public.' || g.sig), 'EXECUTE') END,
|
|
2469
2468
|
g.opmerking
|
|
2470
2469
|
FROM public.verkoop_guarded_functions() g;
|
|
2471
|
-
|
|
2472
2470
|
RETURN QUERY
|
|
2473
2471
|
SELECT 'trigger'::text, t.tbl || '.' || t.trg,
|
|
2474
2472
|
EXISTS (SELECT 1 FROM pg_trigger x WHERE x.tgname = t.trg AND x.tgrelid = to_regclass('public.' || t.tbl) AND NOT x.tgisinternal),
|
|
@@ -2477,7 +2475,6 @@ BEGIN
|
|
|
2477
2475
|
FROM (VALUES
|
|
2478
2476
|
('update_floriday_auto_fulfillment_log_updated_at','floriday_auto_fulfillment_log'),('trg_floriday_salesorders_assign_number','floriday_salesorders_cache'),('trg_assign_offer_order_number','offer_orders'),('order_items_replan_trg','order_items'),('trg_enqueue_cart_replan_order_items','order_items'),('orders_replan_trg','orders'),('orders_status_origin','orders'),('trg_enqueue_cart_replan_orders','orders'),('trg_orders_apply_buffer_decision','orders'),('trg_stock_mutation_alert','stock_mutation_log'),('order_shipments_assign_number','order_shipments'),('order_shipments_touch','order_shipments'),('order_shipment_items_recompute','order_shipment_items'),('order_shipment_items_touch','order_shipment_items'),('trg_order_buffers_updated_at','order_buffers'),('trg_invoice_timing_settings_touch','invoice_timing_settings'),('trg_stock_consumption_alerts_updated_at','stock_consumption_alerts'),('update_delivery_notes_updated_at','delivery_notes'),('floriday_status_sync_queue_touch','floriday_status_sync_queue')
|
|
2479
2477
|
) t(trg, tbl);
|
|
2480
|
-
|
|
2481
2478
|
RETURN QUERY
|
|
2482
2479
|
SELECT 'policy'::text, pl.tbl || '.' || pl.pol,
|
|
2483
2480
|
EXISTS (SELECT 1 FROM pg_policies x WHERE x.schemaname = 'public' AND x.tablename = pl.tbl AND x.policyname = pl.pol),
|
|
@@ -2487,7 +2484,6 @@ BEGIN
|
|
|
2487
2484
|
FROM (VALUES
|
|
2488
2485
|
('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')
|
|
2489
2486
|
) pl(pol, tbl);
|
|
2490
|
-
|
|
2491
2487
|
RETURN QUERY
|
|
2492
2488
|
SELECT 'tabel'::text, 'verkoop_correctie_log'::text,
|
|
2493
2489
|
to_regclass('public.verkoop_correctie_log') IS NOT NULL,
|
|
@@ -2498,8 +2494,259 @@ BEGIN
|
|
|
2498
2494
|
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
2495
|
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
2496
|
ELSE 'in orde: beveiliging per rij aan, geen policies (alleen de functie schrijft)' END;
|
|
2497
|
+
RETURN QUERY
|
|
2498
|
+
SELECT 'controle'::text, c.naam, c.ok, NULL::text, NULL::boolean, NULL::boolean, NULL::boolean, c.opm
|
|
2499
|
+
FROM public.verkoop_health_checks() c;
|
|
2501
2500
|
END;
|
|
2502
2501
|
$function$;
|
|
2503
2502
|
|
|
2504
2503
|
REVOKE ALL ON FUNCTION public.verkoop_install_check() FROM PUBLIC, anon;
|
|
2505
2504
|
GRANT EXECUTE ON FUNCTION public.verkoop_install_check() TO authenticated, service_role;
|
|
2505
|
+
|
|
2506
|
+
-- ── Verkoop 1.0.122: fulfillment-index, synchronisatiestand, engine-eventlog, ensure_cron, gezondheidscontroles.
|
|
2507
|
+
|
|
2508
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_fulfillment_index (
|
|
2509
|
+
fulfillment_id text NOT NULL,
|
|
2510
|
+
sales_order_id text NOT NULL,
|
|
2511
|
+
status text,
|
|
2512
|
+
packages numeric NOT NULL DEFAULT 0,
|
|
2513
|
+
received boolean NOT NULL DEFAULT false,
|
|
2514
|
+
received_at timestamptz,
|
|
2515
|
+
delivery_note_codes text[] NOT NULL DEFAULT '{}',
|
|
2516
|
+
is_deleted boolean NOT NULL DEFAULT false,
|
|
2517
|
+
changed_at timestamptz NOT NULL DEFAULT now(),
|
|
2518
|
+
PRIMARY KEY (fulfillment_id, sales_order_id)
|
|
2519
|
+
);
|
|
2520
|
+
CREATE INDEX IF NOT EXISTS verkoop_fulfillment_index_so_idx ON public.verkoop_fulfillment_index (sales_order_id);
|
|
2521
|
+
CREATE INDEX IF NOT EXISTS verkoop_fulfillment_index_changed_idx ON public.verkoop_fulfillment_index (changed_at);
|
|
2522
|
+
GRANT SELECT ON public.verkoop_fulfillment_index TO authenticated;
|
|
2523
|
+
GRANT ALL ON public.verkoop_fulfillment_index TO service_role;
|
|
2524
|
+
ALTER TABLE public.verkoop_fulfillment_index ENABLE ROW LEVEL SECURITY;
|
|
2525
|
+
DO $$ BEGIN
|
|
2526
|
+
IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE schemaname='public' AND tablename='verkoop_fulfillment_index' AND policyname='Ingelogde gebruikers lezen fulfillment-index') THEN
|
|
2527
|
+
CREATE POLICY "Ingelogde gebruikers lezen fulfillment-index" ON public.verkoop_fulfillment_index FOR SELECT TO authenticated USING (true);
|
|
2528
|
+
END IF;
|
|
2529
|
+
END $$;
|
|
2530
|
+
|
|
2531
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_sync_state (
|
|
2532
|
+
key text PRIMARY KEY,
|
|
2533
|
+
last_seen_at timestamptz,
|
|
2534
|
+
full_run_at timestamptz,
|
|
2535
|
+
rebuilt_at timestamptz,
|
|
2536
|
+
ensure_cron_at timestamptz,
|
|
2537
|
+
updated_at timestamptz NOT NULL DEFAULT now()
|
|
2538
|
+
);
|
|
2539
|
+
GRANT SELECT ON public.verkoop_sync_state TO authenticated;
|
|
2540
|
+
GRANT ALL ON public.verkoop_sync_state TO service_role;
|
|
2541
|
+
ALTER TABLE public.verkoop_sync_state ENABLE ROW LEVEL SECURITY;
|
|
2542
|
+
DO $$ BEGIN
|
|
2543
|
+
IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE schemaname='public' AND tablename='verkoop_sync_state' AND policyname='Ingelogde gebruikers lezen synchronisatiestand') THEN
|
|
2544
|
+
CREATE POLICY "Ingelogde gebruikers lezen synchronisatiestand" ON public.verkoop_sync_state FOR SELECT TO authenticated USING (true);
|
|
2545
|
+
END IF;
|
|
2546
|
+
END $$;
|
|
2547
|
+
|
|
2548
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_engine_event_log (
|
|
2549
|
+
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
2550
|
+
created_at timestamptz NOT NULL DEFAULT now(),
|
|
2551
|
+
order_id uuid,
|
|
2552
|
+
event_type text,
|
|
2553
|
+
ok boolean NOT NULL,
|
|
2554
|
+
reason text,
|
|
2555
|
+
user_id uuid
|
|
2556
|
+
);
|
|
2557
|
+
CREATE INDEX IF NOT EXISTS verkoop_engine_event_log_created_idx ON public.verkoop_engine_event_log (created_at);
|
|
2558
|
+
GRANT SELECT ON public.verkoop_engine_event_log TO authenticated;
|
|
2559
|
+
GRANT ALL ON public.verkoop_engine_event_log TO service_role;
|
|
2560
|
+
ALTER TABLE public.verkoop_engine_event_log ENABLE ROW LEVEL SECURITY;
|
|
2561
|
+
DO $$ BEGIN
|
|
2562
|
+
IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE schemaname='public' AND tablename='verkoop_engine_event_log' AND policyname='Ingelogde gebruikers lezen engine-eventlog') THEN
|
|
2563
|
+
CREATE POLICY "Ingelogde gebruikers lezen engine-eventlog" ON public.verkoop_engine_event_log FOR SELECT TO authenticated USING (true);
|
|
2564
|
+
END IF;
|
|
2565
|
+
END $$;
|
|
2566
|
+
|
|
2567
|
+
-- Eén afhandeling (fulfillment) naar de index. Schrijft alleen bij echte verschillen.
|
|
2568
|
+
|
|
2569
|
+
|
|
2570
|
+
|
|
2571
|
+
-- Volledig opnieuw opbouwen (idempotent). Alleen server.
|
|
2572
|
+
|
|
2573
|
+
-- Cronjobs van Verkoop vastleggen via de core-helper. Geen vaste host.
|
|
2574
|
+
|
|
2575
|
+
-- Gezondheidscontroles voor install_check.
|
|
2576
|
+
|
|
2577
|
+
-- Functies Verkoop 1.0.122 (uit de live definities).
|
|
2578
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron()
|
|
2579
|
+
RETURNS jsonb
|
|
2580
|
+
LANGUAGE plpgsql
|
|
2581
|
+
SECURITY DEFINER
|
|
2582
|
+
SET search_path TO 'public'
|
|
2583
|
+
AS $function$
|
|
2584
|
+
DECLARE j record; v_id bigint; v_cmd text; v_out jsonb := '[]'::jsonb; v_jobid bigint; v_sched text; v_curcmd text;
|
|
2585
|
+
BEGIN
|
|
2586
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2587
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
2588
|
+
END IF;
|
|
2589
|
+
IF to_regprocedure('public.flowselections_cron_post(text,jsonb,integer,text)') IS NULL THEN
|
|
2590
|
+
RAISE EXCEPTION 'core-helper flowselections_cron_post ontbreekt; Shell bijwerken';
|
|
2591
|
+
END IF;
|
|
2592
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
2593
|
+
RAISE EXCEPTION 'pg_cron ontbreekt in deze database';
|
|
2594
|
+
END IF;
|
|
2595
|
+
INSERT INTO public.verkoop_sync_state (key, ensure_cron_at) VALUES ('cron', now())
|
|
2596
|
+
ON CONFLICT (key) DO UPDATE SET ensure_cron_at = now(), updated_at = now();
|
|
2597
|
+
FOR j IN SELECT * FROM (VALUES
|
|
2598
|
+
('verkoop-salesorders-sync-1min', '* * * * *', '/api/public/cron/sync-salesorders'),
|
|
2599
|
+
('invoice-due-verkoop', '*/15 * * * *', '/api/public/cron/invoice-due')
|
|
2600
|
+
) t(name, sched, path) LOOP
|
|
2601
|
+
v_cmd := format('SELECT public.flowselections_cron_post(%L, ''{}''::jsonb, 15000, ''anon'');', j.path);
|
|
2602
|
+
v_jobid := NULL;
|
|
2603
|
+
EXECUTE 'SELECT jobid, schedule, command FROM cron.job WHERE jobname = $1 ORDER BY jobid LIMIT 1' INTO v_jobid, v_sched, v_curcmd USING j.name;
|
|
2604
|
+
IF v_jobid IS NULL THEN
|
|
2605
|
+
EXECUTE 'SELECT cron.schedule($1, $2, $3)' INTO v_id USING j.name, j.sched, v_cmd;
|
|
2606
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'aangemaakt', 'jobid', v_id);
|
|
2607
|
+
ELSIF v_sched IS DISTINCT FROM j.sched OR rtrim(btrim(v_curcmd), ';') IS DISTINCT FROM rtrim(v_cmd, ';') THEN
|
|
2608
|
+
EXECUTE 'SELECT cron.alter_job(job_id := $1, schedule := $2, command := $3)' USING v_jobid, j.sched, v_cmd;
|
|
2609
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'bijgewerkt', 'jobid', v_jobid);
|
|
2610
|
+
ELSE
|
|
2611
|
+
v_out := v_out || jsonb_build_object('job', j.name, 'actie', 'ongewijzigd', 'jobid', v_jobid);
|
|
2612
|
+
END IF;
|
|
2613
|
+
END LOOP;
|
|
2614
|
+
RETURN jsonb_build_object('ok', true, 'jobs', v_out);
|
|
2615
|
+
END $function$
|
|
2616
|
+
;
|
|
2617
|
+
|
|
2618
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fulfillment_index_apply(p_fulfillment_id text, p_status text, p_is_deleted boolean, p_data jsonb)
|
|
2619
|
+
RETURNS integer
|
|
2620
|
+
LANGUAGE plpgsql
|
|
2621
|
+
SECURITY DEFINER
|
|
2622
|
+
SET search_path TO 'public'
|
|
2623
|
+
AS $function$
|
|
2624
|
+
DECLARE v_n integer := 0; v_m integer := 0;
|
|
2625
|
+
BEGIN
|
|
2626
|
+
PERFORM public.verkoop_assert_caller('keten');
|
|
2627
|
+
IF p_fulfillment_id IS NULL THEN RETURN 0; END IF;
|
|
2628
|
+
WITH items AS (
|
|
2629
|
+
SELECT nullif(i->>'salesOrderId','') AS so,
|
|
2630
|
+
coalesce(nullif(i->>'numberOfPackages','')::numeric, 0) AS pk,
|
|
2631
|
+
(c->>'isReceived') = 'true' OR nullif(c->>'receiptDateTime','') IS NOT NULL AS rc,
|
|
2632
|
+
nullif(c->>'receiptDateTime','')::timestamptz AS rcat,
|
|
2633
|
+
coalesce(nullif(i->>'deliveryNoteCode',''), nullif(c->>'documentReference','')) AS code
|
|
2634
|
+
FROM jsonb_array_elements(CASE WHEN jsonb_typeof(p_data->'loadCarriers')='array' THEN p_data->'loadCarriers' ELSE '[]'::jsonb END) c,
|
|
2635
|
+
jsonb_array_elements(CASE WHEN jsonb_typeof(c->'loadCarrierItems')='array' THEN c->'loadCarrierItems' ELSE '[]'::jsonb END) i
|
|
2636
|
+
), agg AS (
|
|
2637
|
+
SELECT so, sum(pk) pk, coalesce(bool_or(rc), false) rc, min(rcat) rcat,
|
|
2638
|
+
coalesce(array_agg(DISTINCT code ORDER BY code) FILTER (WHERE code IS NOT NULL), '{}') codes
|
|
2639
|
+
FROM items WHERE so IS NOT NULL GROUP BY so
|
|
2640
|
+
), up AS (
|
|
2641
|
+
INSERT INTO public.verkoop_fulfillment_index AS x (fulfillment_id, sales_order_id, status, packages, received, received_at, delivery_note_codes, is_deleted, changed_at)
|
|
2642
|
+
SELECT p_fulfillment_id, so, upper(p_status), pk, rc, rcat, codes, coalesce(p_is_deleted,false), now() FROM agg
|
|
2643
|
+
ON CONFLICT (fulfillment_id, sales_order_id) DO UPDATE
|
|
2644
|
+
SET status = EXCLUDED.status, packages = EXCLUDED.packages, received = EXCLUDED.received,
|
|
2645
|
+
received_at = EXCLUDED.received_at, delivery_note_codes = EXCLUDED.delivery_note_codes,
|
|
2646
|
+
is_deleted = EXCLUDED.is_deleted, changed_at = now()
|
|
2647
|
+
WHERE (x.status, x.packages, x.received, x.received_at, x.delivery_note_codes, x.is_deleted)
|
|
2648
|
+
IS DISTINCT FROM (EXCLUDED.status, EXCLUDED.packages, EXCLUDED.received, EXCLUDED.received_at, EXCLUDED.delivery_note_codes, EXCLUDED.is_deleted)
|
|
2649
|
+
RETURNING 1
|
|
2650
|
+
)
|
|
2651
|
+
SELECT count(*) INTO v_n FROM up;
|
|
2652
|
+
WITH so_now AS (
|
|
2653
|
+
SELECT DISTINCT nullif(i->>'salesOrderId','') so
|
|
2654
|
+
FROM jsonb_array_elements(CASE WHEN jsonb_typeof(p_data->'loadCarriers')='array' THEN p_data->'loadCarriers' ELSE '[]'::jsonb END) c,
|
|
2655
|
+
jsonb_array_elements(CASE WHEN jsonb_typeof(c->'loadCarrierItems')='array' THEN c->'loadCarrierItems' ELSE '[]'::jsonb END) i
|
|
2656
|
+
), gone AS (
|
|
2657
|
+
UPDATE public.verkoop_fulfillment_index x SET is_deleted = true, changed_at = now()
|
|
2658
|
+
WHERE x.fulfillment_id = p_fulfillment_id AND NOT x.is_deleted
|
|
2659
|
+
AND x.sales_order_id NOT IN (SELECT so FROM so_now WHERE so IS NOT NULL)
|
|
2660
|
+
RETURNING 1
|
|
2661
|
+
)
|
|
2662
|
+
SELECT count(*) INTO v_m FROM gone;
|
|
2663
|
+
RETURN v_n + v_m;
|
|
2664
|
+
END $function$
|
|
2665
|
+
;
|
|
2666
|
+
|
|
2667
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fulfillment_index_rebuild()
|
|
2668
|
+
RETURNS jsonb
|
|
2669
|
+
LANGUAGE plpgsql
|
|
2670
|
+
SECURITY DEFINER
|
|
2671
|
+
SET search_path TO 'public'
|
|
2672
|
+
AS $function$
|
|
2673
|
+
DECLARE r record; v_rows integer := 0; v_changed integer := 0;
|
|
2674
|
+
BEGIN
|
|
2675
|
+
PERFORM public.verkoop_assert_caller('server');
|
|
2676
|
+
INSERT INTO public.verkoop_sync_state (key, rebuilt_at) VALUES ('fulfillment-index', now())
|
|
2677
|
+
ON CONFLICT (key) DO UPDATE SET rebuilt_at = now(), updated_at = now();
|
|
2678
|
+
IF to_regclass('public.floriday_fulfillment_orders_cache') IS NULL THEN
|
|
2679
|
+
RETURN jsonb_build_object('ok', true, 'rows', 0, 'changed', 0, 'note', 'geen Floriday-afhandelingen in deze shell');
|
|
2680
|
+
END IF;
|
|
2681
|
+
FOR r IN EXECUTE 'SELECT floriday_id, status, is_deleted, data FROM public.floriday_fulfillment_orders_cache' LOOP
|
|
2682
|
+
v_rows := v_rows + 1;
|
|
2683
|
+
v_changed := v_changed + public.verkoop_fulfillment_index_apply(r.floriday_id, coalesce(r.status, r.data->>'status'), r.is_deleted, r.data);
|
|
2684
|
+
END LOOP;
|
|
2685
|
+
RETURN jsonb_build_object('ok', true, 'rows', v_rows, 'changed', v_changed);
|
|
2686
|
+
END $function$
|
|
2687
|
+
;
|
|
2688
|
+
|
|
2689
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fulfillment_index_trg()
|
|
2690
|
+
RETURNS trigger
|
|
2691
|
+
LANGUAGE plpgsql
|
|
2692
|
+
SECURITY DEFINER
|
|
2693
|
+
SET search_path TO 'public'
|
|
2694
|
+
AS $function$
|
|
2695
|
+
BEGIN
|
|
2696
|
+
IF TG_OP = 'UPDATE' AND (OLD.status, OLD.is_deleted, OLD.data) IS NOT DISTINCT FROM (NEW.status, NEW.is_deleted, NEW.data) THEN
|
|
2697
|
+
RETURN NEW;
|
|
2698
|
+
END IF;
|
|
2699
|
+
BEGIN
|
|
2700
|
+
PERFORM public.verkoop_fulfillment_index_apply(NEW.floriday_id, coalesce(NEW.status, NEW.data->>'status'), NEW.is_deleted, NEW.data);
|
|
2701
|
+
EXCEPTION WHEN OTHERS THEN
|
|
2702
|
+
RAISE WARNING 'verkoop_fulfillment_index bijwerken faalde voor %: %', NEW.floriday_id, SQLERRM;
|
|
2703
|
+
END;
|
|
2704
|
+
RETURN NEW;
|
|
2705
|
+
END $function$
|
|
2706
|
+
;
|
|
2707
|
+
|
|
2708
|
+
CREATE OR REPLACE FUNCTION public.verkoop_health_checks()
|
|
2709
|
+
RETURNS TABLE(naam text, ok boolean, opm text)
|
|
2710
|
+
LANGUAGE plpgsql
|
|
2711
|
+
STABLE SECURITY DEFINER
|
|
2712
|
+
SET search_path TO 'public'
|
|
2713
|
+
AS $function$
|
|
2714
|
+
DECLARE v_bad integer; v_cnt integer; v_idx integer; v_has_cache boolean := to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL;
|
|
2715
|
+
BEGIN
|
|
2716
|
+
IF NOT public.verkoop_is_server() THEN
|
|
2717
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
2718
|
+
END IF;
|
|
2719
|
+
IF to_regclass('cron.job') IS NULL THEN
|
|
2720
|
+
RETURN QUERY SELECT 'Verkoop: cronjobs wijzen naar deze shell'::text, false, 'pg_cron ontbreekt'::text;
|
|
2721
|
+
ELSE
|
|
2722
|
+
EXECUTE $q$SELECT count(*)::int FROM (VALUES ('verkoop-salesorders-sync-1min'),('invoice-due-verkoop')) n(name)
|
|
2723
|
+
WHERE NOT EXISTS (SELECT 1 FROM cron.job j WHERE j.jobname = n.name AND j.command LIKE '%flowselections_cron_post(%' AND j.command NOT ILIKE '%http%')$q$ INTO v_bad;
|
|
2724
|
+
RETURN QUERY SELECT 'Verkoop: cronjobs wijzen naar deze shell'::text, v_bad = 0,
|
|
2725
|
+
CASE WHEN v_bad = 0 THEN 'beide jobs via flowselections_cron_post, geen vaste host'
|
|
2726
|
+
ELSE v_bad || ' job(s) ontbreken of gebruiken een vaste host; de minuutronde herstelt dit binnen een uur' END;
|
|
2727
|
+
END IF;
|
|
2728
|
+
IF NOT v_has_cache THEN
|
|
2729
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text, true, 'geen Floriday-afhandelingen in deze shell'::text;
|
|
2730
|
+
ELSE
|
|
2731
|
+
SELECT count(*)::int INTO v_idx FROM public.verkoop_fulfillment_index;
|
|
2732
|
+
EXECUTE 'SELECT count(*)::int FROM public.floriday_fulfillment_orders_cache WHERE jsonb_typeof(data->''loadCarriers'')=''array'' AND jsonb_array_length(data->''loadCarriers'')>0' INTO v_cnt;
|
|
2733
|
+
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text,
|
|
2734
|
+
EXISTS (SELECT 1 FROM pg_trigger WHERE tgname='verkoop_fulfillment_index_sync' AND tgrelid='public.floriday_fulfillment_orders_cache'::regclass)
|
|
2735
|
+
AND (v_cnt = 0 OR v_idx > 0),
|
|
2736
|
+
format('index %s rijen, afhandelingen met karren %s', v_idx, v_cnt);
|
|
2737
|
+
END IF;
|
|
2738
|
+
SELECT count(*)::int INTO v_bad FROM public.verkoop_engine_event_log l WHERE NOT l.ok AND l.created_at > now() - interval '24 hours';
|
|
2739
|
+
RETURN QUERY SELECT 'Verkoop: engine-event schrijft zonder fout'::text, v_bad = 0,
|
|
2740
|
+
CASE WHEN v_bad = 0 THEN 'geen mislukte meldingen in 24 uur' ELSE v_bad || ' mislukte melding(en) in 24 uur, zie verkoop_engine_event_log' END;
|
|
2741
|
+
END $function$
|
|
2742
|
+
;
|
|
2743
|
+
|
|
2744
|
+
-- Trigger op de Floriday-afhandelingen (alleen als die tabel bestaat).
|
|
2745
|
+
DO $$ BEGIN
|
|
2746
|
+
IF to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL
|
|
2747
|
+
AND NOT EXISTS (SELECT 1 FROM pg_trigger WHERE tgname='verkoop_fulfillment_index_sync' AND tgrelid='public.floriday_fulfillment_orders_cache'::regclass) THEN
|
|
2748
|
+
CREATE TRIGGER verkoop_fulfillment_index_sync
|
|
2749
|
+
AFTER INSERT OR UPDATE ON public.floriday_fulfillment_orders_cache
|
|
2750
|
+
FOR EACH ROW EXECUTE FUNCTION public.verkoop_fulfillment_index_trg();
|
|
2751
|
+
END IF;
|
|
2752
|
+
END $$;
|