@flowselections/floriday-verkoop-module 1.0.160 → 1.0.162
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/OrderKarindelingCard.d.ts +1 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +7 -2
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +6 -4
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +7 -4
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +21 -6
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +3 -3
- package/dist-lib/integrations/supabase/types.d.ts +658 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.d.ts +6 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +18 -8
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts +1 -0
- package/dist-lib/lib/cron/sync-salesorders-now.d.ts.map +1 -1
- package/dist-lib/lib/cron/sync-salesorders-now.js +26 -2
- package/dist-lib/lib/engine-block-alerts.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-block-alerts.server.js +3 -1
- package/dist-lib/lib/floriday-actual-carriers.d.ts +18 -0
- package/dist-lib/lib/floriday-actual-carriers.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.js +26 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts +6 -0
- package/dist-lib/lib/floriday-actual-carriers.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-actual-carriers.server.js +31 -0
- package/dist-lib/lib/floriday-backfill.d.ts +26 -0
- package/dist-lib/lib/floriday-backfill.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.js +43 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts +2 -0
- package/dist-lib/lib/floriday-backfill.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-backfill.server.js +32 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts +2 -1
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +42 -50
- package/dist-lib/lib/floriday-order-level.d.ts +15 -0
- package/dist-lib/lib/floriday-order-level.d.ts.map +1 -1
- package/dist-lib/lib/floriday-order-level.js +23 -0
- package/dist-lib/lib/floriday-status.d.ts +9 -0
- package/dist-lib/lib/floriday-status.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.js +12 -0
- package/dist-lib/lib/invoice-timing.d.ts +9 -0
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.js +15 -0
- package/dist-lib/lib/invoice-timing.server.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.server.js +8 -3
- package/dist-lib/lib/klok-labels.d.ts +4 -1
- package/dist-lib/lib/klok-labels.d.ts.map +1 -1
- package/dist-lib/lib/klok-labels.js +10 -1
- package/dist-lib/lib/list-own-rows.d.ts +9 -0
- package/dist-lib/lib/list-own-rows.d.ts.map +1 -0
- package/dist-lib/lib/list-own-rows.js +20 -0
- package/dist-lib/lib/logistics-engine.functions.d.ts +1 -1
- package/dist-lib/lib/order-departure.d.ts +1 -1
- package/dist-lib/lib/order-departure.d.ts.map +1 -1
- package/dist-lib/lib/order-departure.js +1 -1
- package/dist-lib/lib/order-status.d.ts +15 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +17 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +70 -4
- 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-mapping.js +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +12 -3
- package/dist-lib/lib/sync-melding.d.ts +3 -0
- package/dist-lib/lib/sync-melding.d.ts.map +1 -1
- package/dist-lib/lib/sync-melding.functions.d.ts.map +1 -1
- package/dist-lib/lib/sync-melding.functions.js +1 -0
- package/dist-lib/lib/sync-melding.js +5 -2
- package/package.json +1 -1
- package/schema/verkoop.sql +473 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,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":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,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;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAqczB,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"}
|
|
@@ -6,7 +6,8 @@ import { invoiceStateLabel } from "./invoice-timing.js";
|
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
9
|
-
import { resolveOrderStage } from "./order-status.js";
|
|
9
|
+
import { resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
10
|
+
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
10
11
|
import { invoiceRoute } from "./order-progress.js";
|
|
11
12
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
12
13
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
@@ -294,8 +295,11 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
294
295
|
try {
|
|
295
296
|
const ownRes = await supabase
|
|
296
297
|
.from("orders")
|
|
297
|
-
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
298
|
+
.select("id, buffer_id, status, is_reservation, order_source, floriday_sales_order_id, custom_fields, deleted_at, invoice_due_at, invoice_ready_at, invoice_ready_note, order_items(product_id, product_name, source_line_key, quarantined_at, quantity, unit_price)")
|
|
298
299
|
.eq("floriday_sales_order_id", data.id)
|
|
300
|
+
// Actieve order eerst; een verwijderde alleen als er geen actieve is.
|
|
301
|
+
.order("deleted_at", { ascending: true, nullsFirst: true })
|
|
302
|
+
.limit(1)
|
|
299
303
|
.maybeSingle();
|
|
300
304
|
const ownRow = ownRes.data ?? null;
|
|
301
305
|
// De order is leidend voor de belading. Ontbreekt hij in de cache-payload,
|
|
@@ -310,7 +314,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
310
314
|
status: ownRow ? ownRow.status : orderData?.status,
|
|
311
315
|
controlledAt: controlledAt,
|
|
312
316
|
isReservation: ownRow ? !!ownRow.is_reservation : false,
|
|
317
|
+
deleted: !!ownRow?.deleted_at,
|
|
318
|
+
backfill: orderStageNote({ customFields: ownRow?.custom_fields }) === "handled",
|
|
313
319
|
});
|
|
320
|
+
dto.stageNote = ownRow ? orderStageNote({ deletedAt: ownRow.deleted_at, customFields: ownRow.custom_fields }) : null;
|
|
314
321
|
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
315
322
|
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
316
323
|
// Zelfde factuurroute en ids als de lijst (salesorders-list.server).
|
|
@@ -320,7 +327,7 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
320
327
|
orderSource: ownRow?.order_source ?? "floriday",
|
|
321
328
|
});
|
|
322
329
|
dto.floridayFulfilled = Boolean((ownRow?.custom_fields ?? {})?.floriday_fulfilled);
|
|
323
|
-
dto.floridayExternalFulfilledAt = (ownRow?.custom_fields
|
|
330
|
+
dto.floridayExternalFulfilledAt = handledAtForDisplay(ownRow?.custom_fields);
|
|
324
331
|
{
|
|
325
332
|
const r = (ownRow?.custom_fields ?? {})?.customer_reference;
|
|
326
333
|
dto.customerReference = typeof r === "string" && r.trim() ? r.trim() : null;
|
|
@@ -515,7 +522,9 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
515
522
|
status: sLocal ? sLocal.status : sr.data?.status,
|
|
516
523
|
controlledAt: sr.controlled_at ?? null,
|
|
517
524
|
isReservation: sLocal ? !!sLocal.is_reservation : false,
|
|
525
|
+
backfill: orderStageNote({ customFields: sLocal?.custom_fields }) === "handled",
|
|
518
526
|
});
|
|
527
|
+
sDto.stageNote = sLocal ? orderStageNote({ customFields: sLocal.custom_fields }) : null;
|
|
519
528
|
sDto.floridayFulfilled = Boolean((sLocal?.custom_fields ?? {})?.floriday_fulfilled);
|
|
520
529
|
sDto.floridayExternalFulfilledIds = (sLocal?.custom_fields ?? {})?.floriday_external_fulfilled_sales_order_ids ?? [];
|
|
521
530
|
{
|
|
@@ -2,7 +2,10 @@ export interface SyncMelding {
|
|
|
2
2
|
zichtbaar: boolean;
|
|
3
3
|
sinds?: string | null;
|
|
4
4
|
wachten?: number | null;
|
|
5
|
+
/** Nieuwe Floriday-orders komen als verwijderd binnen (soort verwijderd_binnen). */
|
|
6
|
+
verwijderd?: boolean;
|
|
5
7
|
}
|
|
8
|
+
export declare const VERWIJDERD_MELDING = "Nieuwe orders worden als verwijderd opgeslagen; ze krijgen geen karindeling.";
|
|
6
9
|
/** Eén zin voor beheerders; technische details staan alleen in de installatiecontrole. */
|
|
7
10
|
export declare function syncMeldingTekst(m: SyncMelding | null | undefined, nu?: Date): string | null;
|
|
8
11
|
//# sourceMappingURL=sync-melding.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-melding.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"sync-melding.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oFAAoF;IACpF,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,kBAAkB,iFAAiF,CAAC;AAEjH,0FAA0F;AAC1F,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,EAAE,EAAE,GAAE,IAAiB,GAAG,MAAM,GAAG,IAAI,CAcxG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-melding.functions.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.functions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,4HAA4H;AAC5H,eAAO,MAAM,qBAAqB;;;;
|
|
1
|
+
{"version":3,"file":"sync-melding.functions.d.ts","sourceRoot":"","sources":["../../src/lib/sync-melding.functions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,4HAA4H;AAC5H,eAAO,MAAM,qBAAqB;;;;sEAe9B,CAAC"}
|
|
@@ -13,6 +13,7 @@ export const getVerkoopSyncMelding = createServerFn({ method: "POST" })
|
|
|
13
13
|
return {
|
|
14
14
|
zichtbaar: d.zichtbaar === true,
|
|
15
15
|
sinds: typeof d.sinds === "string" ? d.sinds : null,
|
|
16
|
+
verwijderd: d.verwijderd === true,
|
|
16
17
|
wachten: typeof d.wachten === "number" ? d.wachten : Number(d.wachten ?? 0),
|
|
17
18
|
};
|
|
18
19
|
});
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { fmtNL } from "./nl-datetime.js";
|
|
2
|
+
export const VERWIJDERD_MELDING = "Nieuwe orders worden als verwijderd opgeslagen; ze krijgen geen karindeling.";
|
|
2
3
|
/** Eén zin voor beheerders; technische details staan alleen in de installatiecontrole. */
|
|
3
4
|
export function syncMeldingTekst(m, nu = new Date()) {
|
|
5
|
+
const extra = m?.verwijderd ? VERWIJDERD_MELDING : null;
|
|
4
6
|
if (!m?.zichtbaar)
|
|
5
|
-
return
|
|
7
|
+
return extra;
|
|
6
8
|
const n = Math.max(0, Number(m.wachten ?? 0));
|
|
7
9
|
let tijd = "kort";
|
|
8
10
|
if (m.sinds) {
|
|
@@ -12,5 +14,6 @@ export function syncMeldingTekst(m, nu = new Date()) {
|
|
|
12
14
|
? fmtNL(d, { hour: "2-digit", minute: "2-digit" }) ?? "kort"
|
|
13
15
|
: `${fmtNL(d, { weekday: "short", day: "numeric", month: "short" })} ${fmtNL(d, { hour: "2-digit", minute: "2-digit" })}`;
|
|
14
16
|
}
|
|
15
|
-
|
|
17
|
+
const basis = `Nieuwe Floriday-orders komen sinds ${tijd} niet binnen (${n} wachten). De beheerder is gewaarschuwd.`;
|
|
18
|
+
return extra ? `${basis} ${extra}` : basis;
|
|
16
19
|
}
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -3467,7 +3467,41 @@ END $$;
|
|
|
3467
3467
|
REVOKE ALL ON FUNCTION public.verkoop_fo_zonder_order(timestamptz, interval) FROM PUBLIC, anon;
|
|
3468
3468
|
GRANT EXECUTE ON FUNCTION public.verkoop_fo_zonder_order(timestamptz, interval) TO authenticated, service_role;
|
|
3469
3469
|
|
|
3470
|
-
--
|
|
3470
|
+
-- Inhalen van gemiste Floriday-orders (backfill) via de gewone omzetroute.
|
|
3471
|
+
CREATE TABLE IF NOT EXISTS public.verkoop_inhaal_items (
|
|
3472
|
+
sales_order_id text PRIMARY KEY,
|
|
3473
|
+
run_id uuid NOT NULL,
|
|
3474
|
+
sinds timestamptz NOT NULL,
|
|
3475
|
+
categorie text NOT NULL,
|
|
3476
|
+
status text NOT NULL DEFAULT 'aangevraagd',
|
|
3477
|
+
melding text,
|
|
3478
|
+
order_id uuid,
|
|
3479
|
+
pogingen integer NOT NULL DEFAULT 1,
|
|
3480
|
+
aangevraagd_at timestamptz NOT NULL DEFAULT now(),
|
|
3481
|
+
verwerkt_at timestamptz,
|
|
3482
|
+
created_at timestamptz NOT NULL DEFAULT now(),
|
|
3483
|
+
updated_at timestamptz NOT NULL DEFAULT now()
|
|
3484
|
+
);
|
|
3485
|
+
GRANT ALL ON public.verkoop_inhaal_items TO service_role;
|
|
3486
|
+
ALTER TABLE public.verkoop_inhaal_items ENABLE ROW LEVEL SECURITY;
|
|
3487
|
+
DROP TRIGGER IF EXISTS verkoop_inhaal_items_updated_at ON public.verkoop_inhaal_items;
|
|
3488
|
+
CREATE TRIGGER verkoop_inhaal_items_updated_at BEFORE UPDATE ON public.verkoop_inhaal_items
|
|
3489
|
+
FOR EACH ROW EXECUTE FUNCTION public.update_updated_at_column();
|
|
3490
|
+
|
|
3491
|
+
-- Ondersteunen Voorraad en Engine backfill-orders? Controle op functienaam.
|
|
3492
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_ondersteund()
|
|
3493
|
+
RETURNS jsonb LANGUAGE sql STABLE SECURITY DEFINER SET search_path = public
|
|
3494
|
+
AS $$
|
|
3495
|
+
SELECT jsonb_build_object(
|
|
3496
|
+
'engine', to_regprocedure('public.logistics_order_is_backfill(uuid)') IS NOT NULL,
|
|
3497
|
+
'voorraad', to_regprocedure('public.voorraad_order_is_backfill(uuid)') IS NOT NULL,
|
|
3498
|
+
'ok', to_regprocedure('public.logistics_order_is_backfill(uuid)') IS NOT NULL
|
|
3499
|
+
AND to_regprocedure('public.voorraad_order_is_backfill(uuid)') IS NOT NULL);
|
|
3500
|
+
$$;
|
|
3501
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_ondersteund() FROM PUBLIC, anon;
|
|
3502
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_ondersteund() TO authenticated, service_role;
|
|
3503
|
+
|
|
3504
|
+
-- Voorbeeld: aantallen per categorie plus nieuwe klanten. Alleen lezen.
|
|
3471
3505
|
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_preview(p_sinds timestamptz)
|
|
3472
3506
|
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3473
3507
|
AS $$
|
|
@@ -3476,20 +3510,144 @@ BEGIN
|
|
|
3476
3510
|
IF NOT public.verkoop_is_server() THEN
|
|
3477
3511
|
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3478
3512
|
END IF;
|
|
3513
|
+
WITH kand AS MATERIALIZED (
|
|
3514
|
+
SELECT * FROM public.verkoop_fo_zonder_order(p_sinds, interval '0')
|
|
3515
|
+
), nk AS (
|
|
3516
|
+
SELECT c.buyer_organization_id AS org,
|
|
3517
|
+
coalesce(max(fc.data->>'name'), max(fc.data->>'commercialName'), c.buyer_organization_id) AS naam,
|
|
3518
|
+
count(*) AS n
|
|
3519
|
+
FROM kand z
|
|
3520
|
+
JOIN public.floriday_salesorders_cache c ON c.floriday_id = z.floriday_id
|
|
3521
|
+
LEFT JOIN public.floriday_customers_cache fc ON fc.organization_id = c.buyer_organization_id
|
|
3522
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
3523
|
+
AND c.buyer_organization_id IS NOT NULL
|
|
3524
|
+
AND NOT EXISTS (SELECT 1 FROM public.customers cu WHERE cu.floriday_organization_id = c.buyer_organization_id)
|
|
3525
|
+
GROUP BY c.buyer_organization_id
|
|
3526
|
+
), kl AS (
|
|
3527
|
+
SELECT coalesce(jsonb_agg(jsonb_build_object('organisatie_id', org, 'naam', naam, 'orders', n) ORDER BY naam), '[]'::jsonb) AS lijst FROM nk
|
|
3528
|
+
)
|
|
3479
3529
|
SELECT jsonb_build_object(
|
|
3480
3530
|
'sinds', p_sinds,
|
|
3481
|
-
'totaal', count(*),
|
|
3482
|
-
'afgehandeld', count(*)
|
|
3483
|
-
'verleden', count(*)
|
|
3484
|
-
'toekomst', count(*)
|
|
3485
|
-
'geannuleerd', count(*)
|
|
3486
|
-
'oudste', min(ontvangen_at), 'nieuwste', max(ontvangen_at))
|
|
3487
|
-
|
|
3531
|
+
'totaal', (SELECT count(*) FROM kand),
|
|
3532
|
+
'afgehandeld', (SELECT count(*) FROM kand WHERE categorie='afgehandeld'),
|
|
3533
|
+
'verleden', (SELECT count(*) FROM kand WHERE categorie='verleden'),
|
|
3534
|
+
'toekomst', (SELECT count(*) FROM kand WHERE categorie='toekomst'),
|
|
3535
|
+
'geannuleerd', (SELECT count(*) FROM kand WHERE categorie='geannuleerd'),
|
|
3536
|
+
'oudste', (SELECT min(ontvangen_at) FROM kand), 'nieuwste', (SELECT max(ontvangen_at) FROM kand),
|
|
3537
|
+
'nieuwe_klanten', jsonb_build_object('aantal', jsonb_array_length(kl.lijst), 'klanten', kl.lijst))
|
|
3538
|
+
INTO v FROM kl;
|
|
3488
3539
|
RETURN v;
|
|
3489
3540
|
END $$;
|
|
3490
3541
|
REVOKE ALL ON FUNCTION public.verkoop_inhaal_preview(timestamptz) FROM PUBLIC, anon;
|
|
3491
3542
|
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_preview(timestamptz) TO authenticated, service_role;
|
|
3492
3543
|
|
|
3544
|
+
-- Inhalen uitvoeren: zet hooguit p_max orders in de inhaallijst en vraagt de
|
|
3545
|
+
-- gewone omzetroute aan (eigen Verkoop-sleutel via verkoop_cron_post).
|
|
3546
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_uitvoeren(p_sinds timestamptz, p_max integer DEFAULT 100)
|
|
3547
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
3548
|
+
AS $$
|
|
3549
|
+
DECLARE
|
|
3550
|
+
v_ok jsonb; v_run uuid := gen_random_uuid(); v_max int := least(greatest(coalesce(p_max,100),1),200);
|
|
3551
|
+
v_ids text[]; v_part text[]; v_req jsonb := '[]'::jsonb; v_al int := 0; v_opnieuw int := 0; i int;
|
|
3552
|
+
BEGIN
|
|
3553
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3554
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3555
|
+
END IF;
|
|
3556
|
+
IF p_sinds IS NULL THEN RAISE EXCEPTION 'Inhalen geweigerd: geef een begintijd op (p_sinds).'; END IF;
|
|
3557
|
+
v_ok := public.verkoop_inhaal_ondersteund();
|
|
3558
|
+
IF NOT coalesce((v_ok->>'ok')::boolean, false) THEN
|
|
3559
|
+
RAISE EXCEPTION 'Inhalen geweigerd: %. Werk die module eerst bij; er is niets gewijzigd.',
|
|
3560
|
+
concat_ws(' en ',
|
|
3561
|
+
CASE WHEN NOT (v_ok->>'voorraad')::boolean THEN 'Voorraad slaat ingehaalde orders nog niet over (voorraad_order_is_backfill ontbreekt)' END,
|
|
3562
|
+
CASE WHEN NOT (v_ok->>'engine')::boolean THEN 'de Logistiek Engine slaat ingehaalde orders nog niet over (logistics_order_is_backfill ontbreekt)' END);
|
|
3563
|
+
END IF;
|
|
3564
|
+
IF NOT pg_try_advisory_xact_lock(hashtext('verkoop_inhaal_uitvoeren')) THEN
|
|
3565
|
+
RETURN jsonb_build_object('bezig', true, 'melding', 'Er loopt al een inhaalaanroep; probeer het over een minuut opnieuw.');
|
|
3566
|
+
END IF;
|
|
3567
|
+
|
|
3568
|
+
-- Al omgezet (door een eerdere aanvraag of de minuutronde): bijwerken.
|
|
3569
|
+
UPDATE public.verkoop_inhaal_items it
|
|
3570
|
+
SET status = CASE WHEN o.custom_fields ? 'backfill' THEN 'aangemaakt' ELSE 'al_aanwezig' END,
|
|
3571
|
+
order_id = o.id, verwerkt_at = coalesce(it.verwerkt_at, now()), melding = NULL
|
|
3572
|
+
FROM public.orders o
|
|
3573
|
+
WHERE it.status IN ('aangevraagd','fout')
|
|
3574
|
+
AND (o.floriday_sales_order_id = it.sales_order_id
|
|
3575
|
+
OR (jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array' AND o.custom_fields->'floriday_sales_order_ids' ? it.sales_order_id));
|
|
3576
|
+
GET DIAGNOSTICS v_al = ROW_COUNT;
|
|
3577
|
+
|
|
3578
|
+
-- Kandidaten: nieuw, of fout/vastgelopen (>10 min aangevraagd). Geannuleerd en toekomst nooit.
|
|
3579
|
+
SELECT array_agg(z.floriday_id ORDER BY z.ontvangen_at) INTO v_ids
|
|
3580
|
+
FROM (SELECT z.* FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
3581
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
3582
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
3583
|
+
AND (it.sales_order_id IS NULL OR it.status = 'fout'
|
|
3584
|
+
OR (it.status = 'aangevraagd' AND it.aangevraagd_at < now() - interval '10 minutes'))
|
|
3585
|
+
ORDER BY z.ontvangen_at LIMIT v_max) z;
|
|
3586
|
+
|
|
3587
|
+
IF coalesce(array_length(v_ids,1),0) > 0 THEN
|
|
3588
|
+
INSERT INTO public.verkoop_inhaal_items AS it (sales_order_id, run_id, sinds, categorie, status)
|
|
3589
|
+
SELECT z.floriday_id, v_run, p_sinds, z.categorie, 'aangevraagd'
|
|
3590
|
+
FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z WHERE z.floriday_id = ANY(v_ids)
|
|
3591
|
+
ON CONFLICT (sales_order_id) DO UPDATE
|
|
3592
|
+
SET run_id = EXCLUDED.run_id, status = 'aangevraagd', melding = NULL, aangevraagd_at = now(),
|
|
3593
|
+
pogingen = it.pogingen + 1, categorie = EXCLUDED.categorie;
|
|
3594
|
+
SELECT count(*) INTO v_opnieuw FROM public.verkoop_inhaal_items WHERE run_id = v_run AND pogingen > 1;
|
|
3595
|
+
|
|
3596
|
+
i := 1;
|
|
3597
|
+
WHILE i <= array_length(v_ids,1) LOOP
|
|
3598
|
+
v_part := v_ids[i:i+49];
|
|
3599
|
+
v_req := v_req || jsonb_build_array(public.verkoop_cron_post('/api/public/cron/sync-salesorders-now',
|
|
3600
|
+
jsonb_build_object('salesOrderIds', to_jsonb(v_part), 'backfill', true), 55000));
|
|
3601
|
+
i := i + 50;
|
|
3602
|
+
END LOOP;
|
|
3603
|
+
END IF;
|
|
3604
|
+
|
|
3605
|
+
RETURN jsonb_build_object(
|
|
3606
|
+
'run_id', v_run, 'sinds', p_sinds, 'max', v_max,
|
|
3607
|
+
'aangevraagd', coalesce(array_length(v_ids,1),0),
|
|
3608
|
+
'waarvan_opnieuw', v_opnieuw,
|
|
3609
|
+
'net_bijgewerkt_als_omgezet', v_al,
|
|
3610
|
+
'verzoeken', v_req,
|
|
3611
|
+
'resterend', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
3612
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
3613
|
+
WHERE z.categorie IN ('afgehandeld','verleden') AND it.sales_order_id IS NULL),
|
|
3614
|
+
'overgeslagen_geannuleerd', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') WHERE categorie = 'geannuleerd'),
|
|
3615
|
+
'melding', 'Aangevraagd. Bekijk de uitkomst over een minuut met verkoop_inhaal_status().');
|
|
3616
|
+
END $$;
|
|
3617
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) FROM PUBLIC, anon;
|
|
3618
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) TO authenticated, service_role;
|
|
3619
|
+
|
|
3620
|
+
-- Uitkomst per order (alleen lezen).
|
|
3621
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_status(p_run_id uuid DEFAULT NULL)
|
|
3622
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
3623
|
+
AS $$
|
|
3624
|
+
DECLARE v jsonb;
|
|
3625
|
+
BEGIN
|
|
3626
|
+
IF NOT public.verkoop_is_server() THEN
|
|
3627
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
3628
|
+
END IF;
|
|
3629
|
+
WITH it AS (
|
|
3630
|
+
SELECT i.*, (i.status = 'aangevraagd' AND i.aangevraagd_at < now() - interval '10 minutes') AS vast
|
|
3631
|
+
FROM public.verkoop_inhaal_items i WHERE p_run_id IS NULL OR i.run_id = p_run_id)
|
|
3632
|
+
SELECT jsonb_build_object(
|
|
3633
|
+
'totaal', count(*),
|
|
3634
|
+
'aangemaakt', count(*) FILTER (WHERE status = 'aangemaakt'),
|
|
3635
|
+
'al_aanwezig', count(*) FILTER (WHERE status = 'al_aanwezig'),
|
|
3636
|
+
'fout', count(*) FILTER (WHERE status = 'fout'),
|
|
3637
|
+
'wacht', count(*) FILTER (WHERE status = 'aangevraagd' AND NOT vast),
|
|
3638
|
+
'vastgelopen', count(*) FILTER (WHERE vast),
|
|
3639
|
+
'per_order', coalesce(jsonb_agg(jsonb_build_object(
|
|
3640
|
+
'sales_order_id', sales_order_id, 'categorie', categorie,
|
|
3641
|
+
'status', CASE WHEN vast THEN 'vastgelopen' ELSE status END,
|
|
3642
|
+
'order_id', order_id, 'melding', melding, 'pogingen', pogingen,
|
|
3643
|
+
'aangevraagd_at', aangevraagd_at, 'verwerkt_at', verwerkt_at) ORDER BY aangevraagd_at, sales_order_id), '[]'::jsonb),
|
|
3644
|
+
'tip', 'Vastgelopen of fout? Roep verkoop_inhaal_uitvoeren opnieuw aan; die vraagt ze opnieuw aan.')
|
|
3645
|
+
INTO v FROM it;
|
|
3646
|
+
RETURN v;
|
|
3647
|
+
END $$;
|
|
3648
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_status(uuid) FROM PUBLIC, anon;
|
|
3649
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_status(uuid) TO authenticated, service_role;
|
|
3650
|
+
|
|
3493
3651
|
-- Bewaking (alleen SQL): cron herstellen, stilstand en achterstand melden.
|
|
3494
3652
|
CREATE OR REPLACE FUNCTION public.verkoop_sync_bewaking()
|
|
3495
3653
|
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
@@ -3932,3 +4090,310 @@ BEGIN
|
|
|
3932
4090
|
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;
|
|
3933
4091
|
END $function$;
|
|
3934
4092
|
|
|
4093
|
+
|
|
4094
|
+
-- ===== Spoed samenvoegen (inhalen stil, bestaand via orderregels, bewaking verwijderd, startdatum factureren) =====
|
|
4095
|
+
-- 1. Inhalen stil tot vrijgave
|
|
4096
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_vrijgegeven()
|
|
4097
|
+
RETURNS boolean LANGUAGE sql STABLE SECURITY DEFINER SET search_path = public
|
|
4098
|
+
AS $$ SELECT coalesce((SELECT (details->>'aan')::boolean FROM public.verkoop_sync_state WHERE key = 'inhaal-vrijgave'), false) $$;
|
|
4099
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_vrijgegeven() FROM PUBLIC, anon;
|
|
4100
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_vrijgegeven() TO authenticated, service_role;
|
|
4101
|
+
|
|
4102
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_vrijgave(p_aan boolean)
|
|
4103
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
4104
|
+
AS $$
|
|
4105
|
+
BEGIN
|
|
4106
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4107
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4108
|
+
END IF;
|
|
4109
|
+
INSERT INTO public.verkoop_sync_state(key, details, updated_at)
|
|
4110
|
+
VALUES ('inhaal-vrijgave', jsonb_build_object('aan', coalesce(p_aan,false), 'door', auth.uid(), 'at', now()), now())
|
|
4111
|
+
ON CONFLICT (key) DO UPDATE SET details = EXCLUDED.details, updated_at = now();
|
|
4112
|
+
RETURN jsonb_build_object('inhalen', CASE WHEN coalesce(p_aan,false) THEN 'vrijgegeven' ELSE 'stil' END);
|
|
4113
|
+
END $$;
|
|
4114
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_vrijgave(boolean) FROM PUBLIC, anon;
|
|
4115
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_vrijgave(boolean) TO authenticated, service_role;
|
|
4116
|
+
|
|
4117
|
+
CREATE OR REPLACE FUNCTION public.verkoop_inhaal_uitvoeren(p_sinds timestamptz, p_max integer DEFAULT 100)
|
|
4118
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
4119
|
+
AS $$
|
|
4120
|
+
DECLARE
|
|
4121
|
+
v_ok jsonb; v_run uuid := gen_random_uuid(); v_max int := least(greatest(coalesce(p_max,100),1),200);
|
|
4122
|
+
v_ids text[]; v_part text[]; v_req jsonb := '[]'::jsonb; v_al int := 0; v_opnieuw int := 0; i int;
|
|
4123
|
+
BEGIN
|
|
4124
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4125
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4126
|
+
END IF;
|
|
4127
|
+
IF NOT public.verkoop_inhaal_vrijgegeven() THEN
|
|
4128
|
+
RAISE EXCEPTION 'Inhalen staat stil. Er is niets gewijzigd. Vrijgeven: SELECT public.verkoop_inhaal_vrijgave(true);';
|
|
4129
|
+
END IF;
|
|
4130
|
+
IF p_sinds IS NULL THEN RAISE EXCEPTION 'Inhalen geweigerd: geef een begintijd op (p_sinds).'; END IF;
|
|
4131
|
+
v_ok := public.verkoop_inhaal_ondersteund();
|
|
4132
|
+
IF NOT coalesce((v_ok->>'ok')::boolean, false) THEN
|
|
4133
|
+
RAISE EXCEPTION 'Inhalen geweigerd: %. Werk die module eerst bij; er is niets gewijzigd.',
|
|
4134
|
+
concat_ws(' en ',
|
|
4135
|
+
CASE WHEN NOT (v_ok->>'voorraad')::boolean THEN 'Voorraad slaat ingehaalde orders nog niet over (voorraad_order_is_backfill ontbreekt)' END,
|
|
4136
|
+
CASE WHEN NOT (v_ok->>'engine')::boolean THEN 'de Logistiek Engine slaat ingehaalde orders nog niet over (logistics_order_is_backfill ontbreekt)' END);
|
|
4137
|
+
END IF;
|
|
4138
|
+
IF NOT pg_try_advisory_xact_lock(hashtext('verkoop_inhaal_uitvoeren')) THEN
|
|
4139
|
+
RETURN jsonb_build_object('bezig', true, 'melding', 'Er loopt al een inhaalaanroep; probeer het over een minuut opnieuw.');
|
|
4140
|
+
END IF;
|
|
4141
|
+
|
|
4142
|
+
UPDATE public.verkoop_inhaal_items it
|
|
4143
|
+
SET status = CASE WHEN o.custom_fields ? 'backfill' THEN 'aangemaakt' ELSE 'al_aanwezig' END,
|
|
4144
|
+
order_id = o.id, verwerkt_at = coalesce(it.verwerkt_at, now()), melding = NULL
|
|
4145
|
+
FROM public.orders o
|
|
4146
|
+
WHERE it.status IN ('aangevraagd','fout')
|
|
4147
|
+
AND (o.floriday_sales_order_id = it.sales_order_id
|
|
4148
|
+
OR (jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array' AND o.custom_fields->'floriday_sales_order_ids' ? it.sales_order_id));
|
|
4149
|
+
GET DIAGNOSTICS v_al = ROW_COUNT;
|
|
4150
|
+
|
|
4151
|
+
SELECT array_agg(z.floriday_id ORDER BY z.ontvangen_at) INTO v_ids
|
|
4152
|
+
FROM (SELECT z.* FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
4153
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
4154
|
+
WHERE z.categorie IN ('afgehandeld','verleden')
|
|
4155
|
+
AND (it.sales_order_id IS NULL OR it.status = 'fout'
|
|
4156
|
+
OR (it.status = 'aangevraagd' AND it.aangevraagd_at < now() - interval '10 minutes'))
|
|
4157
|
+
ORDER BY z.ontvangen_at LIMIT v_max) z;
|
|
4158
|
+
|
|
4159
|
+
IF coalesce(array_length(v_ids,1),0) > 0 THEN
|
|
4160
|
+
INSERT INTO public.verkoop_inhaal_items AS it (sales_order_id, run_id, sinds, categorie, status)
|
|
4161
|
+
SELECT z.floriday_id, v_run, p_sinds, z.categorie, 'aangevraagd'
|
|
4162
|
+
FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z WHERE z.floriday_id = ANY(v_ids)
|
|
4163
|
+
ON CONFLICT (sales_order_id) DO UPDATE
|
|
4164
|
+
SET run_id = EXCLUDED.run_id, status = 'aangevraagd', melding = NULL, aangevraagd_at = now(),
|
|
4165
|
+
pogingen = it.pogingen + 1, categorie = EXCLUDED.categorie;
|
|
4166
|
+
SELECT count(*) INTO v_opnieuw FROM public.verkoop_inhaal_items WHERE run_id = v_run AND pogingen > 1;
|
|
4167
|
+
i := 1;
|
|
4168
|
+
WHILE i <= array_length(v_ids,1) LOOP
|
|
4169
|
+
v_part := v_ids[i:i+49];
|
|
4170
|
+
v_req := v_req || jsonb_build_array(public.verkoop_cron_post('/api/public/cron/sync-salesorders-now',
|
|
4171
|
+
jsonb_build_object('salesOrderIds', to_jsonb(v_part), 'backfill', true), 55000));
|
|
4172
|
+
i := i + 50;
|
|
4173
|
+
END LOOP;
|
|
4174
|
+
END IF;
|
|
4175
|
+
|
|
4176
|
+
RETURN jsonb_build_object(
|
|
4177
|
+
'run_id', v_run, 'sinds', p_sinds, 'max', v_max,
|
|
4178
|
+
'aangevraagd', coalesce(array_length(v_ids,1),0),
|
|
4179
|
+
'waarvan_opnieuw', v_opnieuw,
|
|
4180
|
+
'net_bijgewerkt_als_omgezet', v_al,
|
|
4181
|
+
'verzoeken', v_req,
|
|
4182
|
+
'resterend', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') z
|
|
4183
|
+
LEFT JOIN public.verkoop_inhaal_items it ON it.sales_order_id = z.floriday_id
|
|
4184
|
+
WHERE z.categorie IN ('afgehandeld','verleden') AND it.sales_order_id IS NULL),
|
|
4185
|
+
'overgeslagen_geannuleerd', (SELECT count(*) FROM public.verkoop_fo_zonder_order(p_sinds, interval '0') WHERE categorie = 'geannuleerd'),
|
|
4186
|
+
'melding', 'Aangevraagd. Bekijk de uitkomst over een minuut met verkoop_inhaal_status().');
|
|
4187
|
+
END $$;
|
|
4188
|
+
REVOKE ALL ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) FROM PUBLIC, anon;
|
|
4189
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_inhaal_uitvoeren(timestamptz, integer) TO authenticated, service_role;
|
|
4190
|
+
|
|
4191
|
+
-- 2. Bestaand = ook een order (ook verwijderd/samengevoegd/hersteld) die de regels van deze salesOrderId draagt
|
|
4192
|
+
CREATE OR REPLACE FUNCTION public.verkoop_fo_zonder_order(p_sinds timestamp with time zone, p_min_leeftijd interval)
|
|
4193
|
+
RETURNS TABLE(floriday_id text, ontvangen_at timestamp with time zone, leverdatum date, categorie text)
|
|
4194
|
+
LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
|
|
4195
|
+
AS $function$
|
|
4196
|
+
BEGIN
|
|
4197
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4198
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4199
|
+
END IF;
|
|
4200
|
+
IF to_regclass('public.floriday_salesorders_cache') IS NULL THEN RETURN; END IF;
|
|
4201
|
+
RETURN QUERY
|
|
4202
|
+
WITH kand AS MATERIALIZED (
|
|
4203
|
+
SELECT c.floriday_id AS fid, c.created_at AS ontv, c.status AS st,
|
|
4204
|
+
c.data->>'salesOrderGroupId' AS gid, c.buyer_organization_id AS org,
|
|
4205
|
+
c.data->'delivery'->>'latestDeliveryDateTime' AS lev
|
|
4206
|
+
FROM public.floriday_salesorders_cache c
|
|
4207
|
+
WHERE NOT coalesce(c.is_deleted, false)
|
|
4208
|
+
AND c.created_at >= p_sinds
|
|
4209
|
+
AND c.created_at < now() - p_min_leeftijd
|
|
4210
|
+
AND NOT EXISTS (SELECT 1 FROM public.orders o WHERE o.floriday_sales_order_id = c.floriday_id)
|
|
4211
|
+
), rest AS MATERIALIZED (
|
|
4212
|
+
SELECT k.* FROM kand k
|
|
4213
|
+
WHERE NOT (k.gid IS NOT NULL AND EXISTS (SELECT 1 FROM public.orders o
|
|
4214
|
+
WHERE o.floriday_order_group_key = 'fo|g|' || coalesce(k.org,'') || '|' || k.gid))
|
|
4215
|
+
AND NOT EXISTS (SELECT 1 FROM public.order_items oi WHERE oi.source_line_key = k.fid)
|
|
4216
|
+
)
|
|
4217
|
+
SELECT r.fid, r.ontv,
|
|
4218
|
+
CASE WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T' THEN (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date END,
|
|
4219
|
+
CASE WHEN upper(coalesce(r.st,'')) IN ('CANCELLED','CANCELED','DELETED','REJECTED') THEN 'geannuleerd'
|
|
4220
|
+
WHEN EXISTS (SELECT 1 FROM public.verkoop_fulfillment_index f WHERE f.sales_order_id = r.fid AND NOT coalesce(f.is_deleted,false)) THEN 'afgehandeld'
|
|
4221
|
+
WHEN r.lev ~ '^\d{4}-\d{2}-\d{2}T'
|
|
4222
|
+
AND (r.lev::timestamptz AT TIME ZONE 'Europe/Amsterdam')::date < (now() AT TIME ZONE 'Europe/Amsterdam')::date THEN 'verleden'
|
|
4223
|
+
ELSE 'toekomst' END
|
|
4224
|
+
FROM rest r
|
|
4225
|
+
WHERE NOT EXISTS (SELECT 1 FROM public.orders o
|
|
4226
|
+
WHERE jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array'
|
|
4227
|
+
AND o.custom_fields->'floriday_sales_order_ids' ? r.fid);
|
|
4228
|
+
END $function$;
|
|
4229
|
+
|
|
4230
|
+
-- 3. Bewaking: nieuwe Floriday-orders die meteen verwijderd zijn
|
|
4231
|
+
CREATE OR REPLACE FUNCTION public.verkoop_bewaking_verwijderd()
|
|
4232
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
4233
|
+
AS $$
|
|
4234
|
+
DECLARE v_n int; v_mail text; v_b text := 'Nieuwe orders worden als verwijderd opgeslagen; ze krijgen geen karindeling.';
|
|
4235
|
+
BEGIN
|
|
4236
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4237
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4238
|
+
END IF;
|
|
4239
|
+
SELECT count(*)::int INTO v_n FROM public.orders o
|
|
4240
|
+
WHERE o.created_at > now() - interval '30 minutes' AND o.deleted_at IS NOT NULL
|
|
4241
|
+
AND (o.floriday_sales_order_id IS NOT NULL OR lower(coalesce(o.order_source,'')) = 'floriday')
|
|
4242
|
+
AND NOT (o.custom_fields ? 'backfill');
|
|
4243
|
+
IF v_n >= 3 THEN
|
|
4244
|
+
IF NOT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE soort='verwijderd_binnen' AND resolved_at IS NULL) THEN
|
|
4245
|
+
v_mail := public.verkoop_alert_mail('Verkoop: nieuwe orders worden als verwijderd opgeslagen',
|
|
4246
|
+
v_b || E'\n' || format('%s nieuwe Floriday-order(s) in de laatste 30 minuten.', v_n));
|
|
4247
|
+
INSERT INTO public.verkoop_alerts(soort, bericht, details)
|
|
4248
|
+
VALUES ('verwijderd_binnen', v_b, jsonb_build_object('aantal', v_n, 'mail', v_mail));
|
|
4249
|
+
END IF;
|
|
4250
|
+
ELSE
|
|
4251
|
+
UPDATE public.verkoop_alerts SET resolved_at = now() WHERE soort='verwijderd_binnen' AND resolved_at IS NULL;
|
|
4252
|
+
END IF;
|
|
4253
|
+
RETURN jsonb_build_object('verwijderd_30min', v_n);
|
|
4254
|
+
END $$;
|
|
4255
|
+
REVOKE ALL ON FUNCTION public.verkoop_bewaking_verwijderd() FROM PUBLIC, anon, authenticated;
|
|
4256
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_bewaking_verwijderd() TO service_role;
|
|
4257
|
+
|
|
4258
|
+
CREATE OR REPLACE FUNCTION public.verkoop_ensure_cron_heal()
|
|
4259
|
+
RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path = public
|
|
4260
|
+
AS $$
|
|
4261
|
+
DECLARE v_bad int := 0; v_job boolean := false; v_heal jsonb; v_bew jsonb; v_del jsonb;
|
|
4262
|
+
BEGIN
|
|
4263
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4264
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4265
|
+
END IF;
|
|
4266
|
+
IF to_regclass('cron.job') IS NOT NULL THEN
|
|
4267
|
+
EXECUTE $q$SELECT count(*)::int FROM cron.job
|
|
4268
|
+
WHERE (jobname IN ('verkoop-salesorders-sync-1min','invoice-due-verkoop')
|
|
4269
|
+
AND (command NOT LIKE '%verkoop_cron_post(%' OR command ILIKE '%flowselections_cron_post%' OR NOT active))
|
|
4270
|
+
OR (jobname = 'verkoop-cron-guard-5min' AND (command NOT LIKE '%verkoop_ensure_cron_heal()%' OR NOT active))$q$ INTO v_bad;
|
|
4271
|
+
EXECUTE $q$SELECT EXISTS (SELECT 1 FROM cron.job WHERE jobname='verkoop-salesorders-sync-1min')$q$ INTO v_job;
|
|
4272
|
+
IF v_bad > 0 OR NOT v_job THEN
|
|
4273
|
+
BEGIN
|
|
4274
|
+
v_heal := public.verkoop_ensure_cron();
|
|
4275
|
+
INSERT INTO public.verkoop_sync_state(key, last_ok_at, details, updated_at)
|
|
4276
|
+
VALUES ('cron-heal', now(), jsonb_build_object('at', now(), 'fout_jobs', v_bad, 'sync_job_ontbrak', NOT v_job, 'uitkomst', v_heal), now())
|
|
4277
|
+
ON CONFLICT (key) DO UPDATE SET last_ok_at = EXCLUDED.last_ok_at, details = EXCLUDED.details, updated_at = now();
|
|
4278
|
+
EXCEPTION WHEN OTHERS THEN
|
|
4279
|
+
v_heal := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
4280
|
+
RAISE WARNING '[verkoop] cron herstellen mislukt: %', SQLERRM;
|
|
4281
|
+
INSERT INTO public.verkoop_sync_state(key, last_error_at, last_error, details, updated_at)
|
|
4282
|
+
VALUES ('cron-heal', now(), left(SQLERRM, 500), jsonb_build_object('at', now(), 'uitkomst', v_heal), now())
|
|
4283
|
+
ON CONFLICT (key) DO UPDATE SET last_error_at = EXCLUDED.last_error_at, last_error = EXCLUDED.last_error, details = EXCLUDED.details, updated_at = now();
|
|
4284
|
+
END;
|
|
4285
|
+
END IF;
|
|
4286
|
+
END IF;
|
|
4287
|
+
v_bew := public.verkoop_sync_bewaking();
|
|
4288
|
+
BEGIN
|
|
4289
|
+
v_del := public.verkoop_bewaking_verwijderd();
|
|
4290
|
+
EXCEPTION WHEN OTHERS THEN
|
|
4291
|
+
RAISE WARNING '[verkoop] bewaking verwijderde orders mislukt: %', SQLERRM;
|
|
4292
|
+
v_del := jsonb_build_object('ok', false, 'error', SQLERRM);
|
|
4293
|
+
END;
|
|
4294
|
+
RETURN jsonb_build_object('herstel', v_heal, 'bewaking', v_bew, 'verwijderd', v_del);
|
|
4295
|
+
END $$;
|
|
4296
|
+
REVOKE ALL ON FUNCTION public.verkoop_ensure_cron_heal() FROM PUBLIC, anon, authenticated;
|
|
4297
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_ensure_cron_heal() TO service_role;
|
|
4298
|
+
|
|
4299
|
+
CREATE OR REPLACE FUNCTION public.verkoop_sync_melding()
|
|
4300
|
+
RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path = public
|
|
4301
|
+
AS $$
|
|
4302
|
+
DECLARE v_open boolean; v_del boolean; v_n int; v_oudste timestamptz; v_ok_at timestamptz;
|
|
4303
|
+
BEGIN
|
|
4304
|
+
IF auth.uid() IS NULL OR NOT (public.has_role(auth.uid(), 'admin') OR public.has_role(auth.uid(), 'superadmin')) THEN
|
|
4305
|
+
RETURN jsonb_build_object('zichtbaar', false);
|
|
4306
|
+
END IF;
|
|
4307
|
+
SELECT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE resolved_at IS NULL AND soort IN ('sync_route','achterstand')) INTO v_open;
|
|
4308
|
+
SELECT EXISTS (SELECT 1 FROM public.verkoop_alerts WHERE resolved_at IS NULL AND soort = 'verwijderd_binnen') INTO v_del;
|
|
4309
|
+
IF NOT v_open AND NOT v_del THEN RETURN jsonb_build_object('zichtbaar', false); END IF;
|
|
4310
|
+
IF NOT v_open THEN RETURN jsonb_build_object('zichtbaar', false, 'verwijderd', true); END IF;
|
|
4311
|
+
SELECT (details->>'aantal')::int, (details->>'oudste')::timestamptz INTO v_n, v_oudste
|
|
4312
|
+
FROM public.verkoop_alerts WHERE soort='achterstand' AND resolved_at IS NULL ORDER BY created_at DESC LIMIT 1;
|
|
4313
|
+
SELECT last_ok_at INTO v_ok_at FROM public.verkoop_sync_state WHERE key='salesorders-heartbeat';
|
|
4314
|
+
RETURN jsonb_build_object('zichtbaar', true, 'sinds', coalesce(v_oudste, v_ok_at), 'wachten', coalesce(v_n, 0), 'verwijderd', v_del);
|
|
4315
|
+
END $$;
|
|
4316
|
+
REVOKE ALL ON FUNCTION public.verkoop_sync_melding() FROM PUBLIC, anon;
|
|
4317
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_sync_melding() TO authenticated, service_role;
|
|
4318
|
+
|
|
4319
|
+
-- 4. Startdatum automatisch factureren (factuurmoment van Verkoop)
|
|
4320
|
+
ALTER TABLE public.invoice_timing_settings ADD COLUMN IF NOT EXISTS start_date date;
|
|
4321
|
+
|
|
4322
|
+
CREATE OR REPLACE FUNCTION public.invoice_timing_settings_start_date()
|
|
4323
|
+
RETURNS trigger LANGUAGE plpgsql SET search_path = public
|
|
4324
|
+
AS $$
|
|
4325
|
+
BEGIN
|
|
4326
|
+
IF NEW.enabled IS TRUE AND (TG_OP = 'INSERT' OR OLD.enabled IS DISTINCT FROM true)
|
|
4327
|
+
AND (TG_OP = 'INSERT' OR NEW.start_date IS NOT DISTINCT FROM OLD.start_date) THEN
|
|
4328
|
+
NEW.start_date := (now() AT TIME ZONE 'Europe/Amsterdam')::date;
|
|
4329
|
+
END IF;
|
|
4330
|
+
RETURN NEW;
|
|
4331
|
+
END $$;
|
|
4332
|
+
DROP TRIGGER IF EXISTS trg_invoice_timing_settings_start_date ON public.invoice_timing_settings;
|
|
4333
|
+
CREATE TRIGGER trg_invoice_timing_settings_start_date BEFORE INSERT OR UPDATE ON public.invoice_timing_settings
|
|
4334
|
+
FOR EACH ROW EXECUTE FUNCTION public.invoice_timing_settings_start_date();
|
|
4335
|
+
|
|
4336
|
+
-- Uiterste levertijd aanvullen (alleen server/SQL-editor)
|
|
4337
|
+
CREATE OR REPLACE FUNCTION public.verkoop_latest_delivery_aanvullen(p_max integer DEFAULT 500)
|
|
4338
|
+
RETURNS jsonb LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path = public
|
|
4339
|
+
AS $$
|
|
4340
|
+
DECLARE
|
|
4341
|
+
v_max int := least(greatest(coalesce(p_max,500),1),2000);
|
|
4342
|
+
v_vandaag date := (now() AT TIME ZONE 'Europe/Amsterdam')::date;
|
|
4343
|
+
v_bijgewerkt int := 0; v_zonder int := 0; v_rest int := 0;
|
|
4344
|
+
BEGIN
|
|
4345
|
+
IF NOT public.verkoop_is_server() THEN
|
|
4346
|
+
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
4347
|
+
END IF;
|
|
4348
|
+
IF NOT pg_try_advisory_xact_lock(hashtext('verkoop_latest_delivery_aanvullen')) THEN
|
|
4349
|
+
RETURN jsonb_build_object('bezig', true, 'melding', 'Er loopt al een aanvulronde; probeer het over een minuut opnieuw.');
|
|
4350
|
+
END IF;
|
|
4351
|
+
|
|
4352
|
+
CREATE TEMP TABLE IF NOT EXISTS _vlda (order_id uuid PRIMARY KEY, waarde text) ON COMMIT DROP;
|
|
4353
|
+
TRUNCATE _vlda;
|
|
4354
|
+
|
|
4355
|
+
-- Alleen lezen uit de eigen kopie van Floriday; vroegste over de actieve bestellingen.
|
|
4356
|
+
INSERT INTO _vlda (order_id, waarde)
|
|
4357
|
+
SELECT o.id,
|
|
4358
|
+
to_char(min((c.data->'delivery'->>'latestDeliveryDateTime')::timestamptz) AT TIME ZONE 'UTC',
|
|
4359
|
+
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
|
|
4360
|
+
FROM public.orders o
|
|
4361
|
+
JOIN LATERAL (
|
|
4362
|
+
SELECT DISTINCT x AS foid FROM (
|
|
4363
|
+
SELECT o.floriday_sales_order_id AS x
|
|
4364
|
+
UNION ALL
|
|
4365
|
+
SELECT jsonb_array_elements_text(CASE WHEN jsonb_typeof(o.custom_fields->'floriday_sales_order_ids') = 'array'
|
|
4366
|
+
THEN o.custom_fields->'floriday_sales_order_ids' ELSE '[]'::jsonb END)
|
|
4367
|
+
) s WHERE x IS NOT NULL
|
|
4368
|
+
) ids ON true
|
|
4369
|
+
JOIN public.floriday_salesorders_cache c ON c.floriday_id = ids.foid
|
|
4370
|
+
WHERE o.order_source = 'floriday'
|
|
4371
|
+
AND o.deleted_at IS NULL
|
|
4372
|
+
AND NOT (o.custom_fields ? 'backfill')
|
|
4373
|
+
AND lower(coalesce(o.status,'')) NOT IN ('geannuleerd','cancelled','verzonden','shipped','geleverd','delivered')
|
|
4374
|
+
AND o.delivery_date IS NOT NULL AND o.delivery_date ~ '^\d{4}-\d{2}-\d{2}'
|
|
4375
|
+
AND left(o.delivery_date,10)::date >= v_vandaag
|
|
4376
|
+
AND coalesce(c.is_deleted,false) = false
|
|
4377
|
+
AND upper(coalesce(c.data->>'status','')) NOT IN ('CANCELLED','CANCELED','REJECTED','EXPIRED','UNFULFILLABLE')
|
|
4378
|
+
AND coalesce(c.data->'delivery'->>'latestDeliveryDateTime','') <> ''
|
|
4379
|
+
GROUP BY o.id;
|
|
4380
|
+
|
|
4381
|
+
DELETE FROM _vlda v USING public.orders o
|
|
4382
|
+
WHERE o.id = v.order_id AND (v.waarde IS NULL
|
|
4383
|
+
OR o.custom_fields->>'floriday_latest_delivery_at' IS NOT DISTINCT FROM v.waarde);
|
|
4384
|
+
|
|
4385
|
+
SELECT count(*) INTO v_rest FROM _vlda;
|
|
4386
|
+
|
|
4387
|
+
UPDATE public.orders o
|
|
4388
|
+
SET custom_fields = coalesce(o.custom_fields,'{}'::jsonb) || jsonb_build_object('floriday_latest_delivery_at', v.waarde)
|
|
4389
|
+
FROM (SELECT * FROM _vlda ORDER BY order_id LIMIT v_max) v
|
|
4390
|
+
WHERE o.id = v.order_id;
|
|
4391
|
+
GET DIAGNOSTICS v_bijgewerkt = ROW_COUNT;
|
|
4392
|
+
|
|
4393
|
+
RETURN jsonb_build_object('bijgewerkt', v_bijgewerkt, 'nog_te_doen', greatest(v_rest - v_bijgewerkt, 0),
|
|
4394
|
+
'vanaf_leverdag', v_vandaag, 'bron', 'delivery.latestDeliveryDateTime');
|
|
4395
|
+
END $$;
|
|
4396
|
+
|
|
4397
|
+
REVOKE ALL ON FUNCTION public.verkoop_latest_delivery_aanvullen(integer) FROM PUBLIC, anon;
|
|
4398
|
+
GRANT EXECUTE ON FUNCTION public.verkoop_latest_delivery_aanvullen(integer) TO authenticated, service_role;
|
|
4399
|
+
REVOKE EXECUTE ON FUNCTION public.verkoop_latest_delivery_aanvullen(integer) FROM authenticated;
|