@flowselections/floriday-verkoop-module 1.0.121 → 1.0.123
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 +2 -0
- 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 +6 -3
- 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/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-cancel.server.js +2 -2
- 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/package.json +1 -1
- package/schema/verkoop.sql +251 -4
|
@@ -163,10 +163,12 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
163
163
|
ok: true;
|
|
164
164
|
orderId: string;
|
|
165
165
|
alreadyExisted: true;
|
|
166
|
+
engineWarning?: undefined;
|
|
166
167
|
carrierAdminNotice?: undefined;
|
|
167
168
|
} | {
|
|
168
169
|
ok: true;
|
|
169
170
|
orderId: string;
|
|
171
|
+
engineWarning: string | null;
|
|
170
172
|
carrierAdminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
|
|
171
173
|
alreadyExisted?: undefined;
|
|
172
174
|
}>>;
|
|
@@ -263,6 +265,7 @@ export declare const updateLocalOrder: import("@tanstack/start-client-core").Opt
|
|
|
263
265
|
}[] | undefined;
|
|
264
266
|
}, Promise<{
|
|
265
267
|
ok: true;
|
|
268
|
+
engineWarning: string | null;
|
|
266
269
|
}>>;
|
|
267
270
|
export declare const getEffectivePrices: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
268
271
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AAkFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AAkFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAoRL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAY7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -965,9 +965,10 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
965
965
|
// Karindeling wordt door de Logistiek Engine gedaan (eigen minuut-cron);
|
|
966
966
|
// deze module stoot dat niet zelf meer aan.
|
|
967
967
|
// Logistics Engine informeren (schaduwmodus): Engine plant de keten.
|
|
968
|
+
let engineWarning = null;
|
|
968
969
|
try {
|
|
969
970
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
970
|
-
await notifyEngineOrder(order.id, "order.received");
|
|
971
|
+
engineWarning = (await notifyEngineOrder(order.id, "order.received", context.userId)).warning;
|
|
971
972
|
}
|
|
972
973
|
catch (err) {
|
|
973
974
|
console.warn("[createManualOrder] engine-event faalde:", err);
|
|
@@ -975,6 +976,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
975
976
|
return {
|
|
976
977
|
ok: true,
|
|
977
978
|
orderId: order.id,
|
|
979
|
+
engineWarning,
|
|
978
980
|
carrierAdminNotice: rpcRes.carrier_fallback ? "Logistieke Engine 1.0.184 of hoger nodig" : null,
|
|
979
981
|
};
|
|
980
982
|
});
|
|
@@ -1600,16 +1602,17 @@ export const updateLocalOrder = createServerFn({ method: "POST" })
|
|
|
1600
1602
|
}
|
|
1601
1603
|
// Karindeling: de Logistiek Engine plant opnieuw in haar eigen ronde.
|
|
1602
1604
|
// Alleen melden bij een echte wijziging (niet bij alleen het stickervinkje).
|
|
1605
|
+
let engineWarning = null;
|
|
1603
1606
|
if (realChange) {
|
|
1604
1607
|
try {
|
|
1605
1608
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
1606
|
-
await notifyEngineOrder(data.orderId, "order.changed");
|
|
1609
|
+
engineWarning = (await notifyEngineOrder(data.orderId, "order.changed", context.userId)).warning;
|
|
1607
1610
|
}
|
|
1608
1611
|
catch (err) {
|
|
1609
1612
|
console.warn("[updateLocalOrder] engine-event faalde:", err);
|
|
1610
1613
|
}
|
|
1611
1614
|
}
|
|
1612
|
-
return { ok: true };
|
|
1615
|
+
return { ok: true, engineWarning };
|
|
1613
1616
|
});
|
|
1614
1617
|
// ─── Prijs uit prijsgroep of artikel ────────────────────────────────────────
|
|
1615
1618
|
// Leest per product de geldende prijs via local_effective_price (prijsgroep,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"floriday-external-fulfillment.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-external-fulfillment.server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErF,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAkFzC;AAED,qGAAqG;AACrG,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ3D"}
|
|
@@ -21,11 +21,13 @@ export async function handleFloridayExternalFulfillment(orderId, states) {
|
|
|
21
21
|
: cf.floriday_sales_order_id ? [String(cf.floriday_sales_order_id)] : [];
|
|
22
22
|
if (soIds.length === 0)
|
|
23
23
|
return "none";
|
|
24
|
-
// Ontbrekende bestellingen in de meegegeven stand:
|
|
24
|
+
// Ontbrekende bestellingen in de meegegeven stand: gericht uit de kleine index
|
|
25
|
+
// lezen (geen volledige cache-scan; fail closed = niet afgehandeld).
|
|
25
26
|
let map = states ?? new Map();
|
|
26
|
-
|
|
27
|
+
const missing = soIds.filter((id) => !map.has(id));
|
|
28
|
+
if (missing.length > 0) {
|
|
27
29
|
const { loadFloridayFulfillmentStates } = await import("./floriday-fulfillment-status.server.js");
|
|
28
|
-
const fresh = await loadFloridayFulfillmentStates(supabaseAdmin,
|
|
30
|
+
const fresh = await loadFloridayFulfillmentStates(supabaseAdmin, missing);
|
|
29
31
|
map = new Map([...map, ...fresh]);
|
|
30
32
|
}
|
|
31
33
|
const decision = decideExternalFulfillment({
|
|
@@ -15,8 +15,10 @@ export interface FloridayFulfillmentState {
|
|
|
15
15
|
external: boolean;
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
* Bouwt een map salesOrderId -> afhandelstatus
|
|
19
|
-
*
|
|
18
|
+
* Bouwt een map salesOrderId -> afhandelstatus, alleen voor de gevraagde ids.
|
|
19
|
+
* Leest uit de kleine index `verkoop_fulfillment_index` (bijgehouden door een
|
|
20
|
+
* trigger op de Floriday-afhandelingen); nooit een volledige cache-scan.
|
|
21
|
+
* Zonder ids: lege map. Ontbreekt de index: fout (fail closed).
|
|
20
22
|
*/
|
|
21
23
|
export declare function loadFloridayFulfillmentStates(supabase: SupabaseClient, salesOrderIds?: string[]): Promise<Map<string, FloridayFulfillmentState>>;
|
|
22
24
|
/** Aantal fust dat een Floriday-verkooporder in totaal zou moeten bevatten. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,EAAE,OAAO,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"floriday-fulfillment-status.server.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fulfillment-status.server.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kFAAkF;IAClF,YAAY,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,QAAQ,EAAE,OAAO,CAAC;CACnB;AAMD;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,cAAc,EACxB,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CA8DhD;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAIhE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,wBAAwB,GAAG,SAAS,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT"}
|
|
@@ -1,74 +1,75 @@
|
|
|
1
1
|
const ACCEPTED_STATUSES = new Set(["ACCEPTED", "RECEIVED", "COMPLETED", "DELIVERED"]);
|
|
2
|
+
const CHUNK = 200;
|
|
2
3
|
/**
|
|
3
|
-
* Bouwt een map salesOrderId -> afhandelstatus
|
|
4
|
-
*
|
|
4
|
+
* Bouwt een map salesOrderId -> afhandelstatus, alleen voor de gevraagde ids.
|
|
5
|
+
* Leest uit de kleine index `verkoop_fulfillment_index` (bijgehouden door een
|
|
6
|
+
* trigger op de Floriday-afhandelingen); nooit een volledige cache-scan.
|
|
7
|
+
* Zonder ids: lege map. Ontbreekt de index: fout (fail closed).
|
|
5
8
|
*/
|
|
6
9
|
export async function loadFloridayFulfillmentStates(supabase, salesOrderIds) {
|
|
7
|
-
const wanted = salesOrderIds && salesOrderIds.length > 0 ? new Set(salesOrderIds) : null;
|
|
8
10
|
const result = new Map();
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const ids = Array.from(new Set((salesOrderIds ?? []).map(String).filter(Boolean)));
|
|
12
|
+
if (ids.length === 0)
|
|
13
|
+
return result;
|
|
14
|
+
const rows = [];
|
|
15
|
+
for (let i = 0; i < ids.length; i += CHUNK) {
|
|
16
|
+
const { data, error } = await supabase
|
|
17
|
+
.from("verkoop_fulfillment_index")
|
|
18
|
+
.select("fulfillment_id, sales_order_id, status, packages, received, received_at, delivery_note_codes")
|
|
19
|
+
.in("sales_order_id", ids.slice(i, i + CHUNK))
|
|
20
|
+
.eq("is_deleted", false);
|
|
21
|
+
if (error)
|
|
22
|
+
throw new Error(`Floriday-afhandelingen lezen faalde: ${error.message}`);
|
|
23
|
+
rows.push(...(data ?? []));
|
|
24
|
+
}
|
|
25
|
+
const accepted = rows.filter((r) => ACCEPTED_STATUSES.has(String(r.status ?? "").toUpperCase()));
|
|
26
|
+
if (accepted.length === 0)
|
|
27
|
+
return result;
|
|
28
|
+
// Herkomst (door het ERP gemaakt?) alleen voor de gevonden afhandelingen.
|
|
16
29
|
const erpFulfillmentIds = new Set();
|
|
30
|
+
const fIds = Array.from(new Set(accepted.map((r) => String(r.fulfillment_id))));
|
|
17
31
|
try {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
32
|
+
for (let i = 0; i < fIds.length; i += CHUNK) {
|
|
33
|
+
const { data: logRows } = await supabase
|
|
34
|
+
.from("floriday_auto_fulfillment_log")
|
|
35
|
+
.select("fulfillment_order_id")
|
|
36
|
+
.in("fulfillment_order_id", fIds.slice(i, i + CHUNK));
|
|
37
|
+
for (const r of (logRows ?? [])) {
|
|
38
|
+
if (r.fulfillment_order_id)
|
|
39
|
+
erpFulfillmentIds.add(String(r.fulfillment_order_id));
|
|
40
|
+
}
|
|
26
41
|
}
|
|
27
42
|
}
|
|
28
43
|
catch {
|
|
29
44
|
/* herkomst is optioneel */
|
|
30
45
|
}
|
|
31
|
-
for (const
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
createdByErp: false,
|
|
53
|
-
external: false,
|
|
54
|
-
};
|
|
55
|
-
prev.fulfilled = true;
|
|
56
|
-
prev.packages += Number(item?.numberOfPackages ?? 0) || 0;
|
|
57
|
-
if (carrier?.isReceived === true || carrier?.receiptDateTime) {
|
|
58
|
-
prev.received = true;
|
|
59
|
-
prev.receivedAt = prev.receivedAt ?? (carrier?.receiptDateTime ?? null);
|
|
60
|
-
}
|
|
61
|
-
const code = item?.deliveryNoteCode ?? carrier?.documentReference ?? null;
|
|
62
|
-
if (code && !prev.deliveryNoteCodes.includes(String(code))) {
|
|
63
|
-
prev.deliveryNoteCodes.push(String(code));
|
|
64
|
-
}
|
|
65
|
-
if (byErp)
|
|
66
|
-
prev.createdByErp = true;
|
|
67
|
-
else
|
|
68
|
-
prev.external = true;
|
|
69
|
-
result.set(soId, prev);
|
|
70
|
-
}
|
|
46
|
+
for (const r of accepted) {
|
|
47
|
+
const soId = String(r.sales_order_id);
|
|
48
|
+
const prev = result.get(soId) ??
|
|
49
|
+
{
|
|
50
|
+
fulfilled: false,
|
|
51
|
+
packages: 0,
|
|
52
|
+
received: false,
|
|
53
|
+
receivedAt: null,
|
|
54
|
+
deliveryNoteCodes: [],
|
|
55
|
+
createdByErp: false,
|
|
56
|
+
external: false,
|
|
57
|
+
};
|
|
58
|
+
prev.fulfilled = true;
|
|
59
|
+
prev.packages += Number(r.packages ?? 0) || 0;
|
|
60
|
+
if (r.received) {
|
|
61
|
+
prev.received = true;
|
|
62
|
+
prev.receivedAt = prev.receivedAt ?? (r.received_at ?? null);
|
|
63
|
+
}
|
|
64
|
+
for (const code of (r.delivery_note_codes ?? [])) {
|
|
65
|
+
if (code && !prev.deliveryNoteCodes.includes(String(code)))
|
|
66
|
+
prev.deliveryNoteCodes.push(String(code));
|
|
71
67
|
}
|
|
68
|
+
if (erpFulfillmentIds.has(String(r.fulfillment_id)))
|
|
69
|
+
prev.createdByErp = true;
|
|
70
|
+
else
|
|
71
|
+
prev.external = true;
|
|
72
|
+
result.set(soId, prev);
|
|
72
73
|
}
|
|
73
74
|
return result;
|
|
74
75
|
}
|
|
@@ -15,7 +15,7 @@ interface MirrorResult {
|
|
|
15
15
|
errors: string[];
|
|
16
16
|
skipped_reason?: string;
|
|
17
17
|
}
|
|
18
|
-
export declare function mirrorFloridayOrdersFromCron(limit?: number): Promise<MirrorResult>;
|
|
18
|
+
export declare function mirrorFloridayOrdersFromCron(limit?: number, since?: string | null): Promise<MirrorResult>;
|
|
19
19
|
export declare const mirrorFloridayOrders: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
20
20
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
21
21
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AA0KA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"AA0KA,UAAU,YAAY;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA24CD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,yBAEpG;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;yBAG0C,CAAC"}
|
|
@@ -154,7 +154,7 @@ function pickString(value) {
|
|
|
154
154
|
// terwijl ze dit spiegelen aanroept). Faalt gesloten: geen slot = geen ronde.
|
|
155
155
|
const MIRROR_LOCK_KEY = "verkoop:floriday-mirror";
|
|
156
156
|
const MIRROR_LOCK_SECONDS = 600;
|
|
157
|
-
async function mirrorInternal(limit) {
|
|
157
|
+
async function mirrorInternal(limit, since = null) {
|
|
158
158
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
159
159
|
const empty = (reason, ok) => ({
|
|
160
160
|
ok, processed: 0, inserted: 0, updated: 0, skipped: 0, failed: 0, errors: ok ? [] : [reason], skipped_reason: reason,
|
|
@@ -165,7 +165,7 @@ async function mirrorInternal(limit) {
|
|
|
165
165
|
if (acquired !== true)
|
|
166
166
|
return empty("already-running", true);
|
|
167
167
|
try {
|
|
168
|
-
return await mirrorUnlocked(limit);
|
|
168
|
+
return await mirrorUnlocked(limit, since);
|
|
169
169
|
}
|
|
170
170
|
finally {
|
|
171
171
|
try {
|
|
@@ -176,20 +176,47 @@ async function mirrorInternal(limit) {
|
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
|
-
async function mirrorUnlocked(limit) {
|
|
179
|
+
async function mirrorUnlocked(limit, since) {
|
|
180
180
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
181
181
|
const { loadFloridayFulfillmentStates, expectedPackagesFromSalesOrder, isFullyFulfilled, } = await import("./floriday-fulfillment-status.server.js");
|
|
182
182
|
const cutoffIso = new Date(Date.now() - LOOKBACK_DAYS * 24 * 60 * 60 * 1000).toISOString();
|
|
183
183
|
// Recente/toekomstige FO's uit de cache.
|
|
184
|
-
|
|
184
|
+
// Met watermerk (minuutronde): alleen salesorders die sinds `since` gewijzigd
|
|
185
|
+
// zijn, plus salesorders waarvan de afhandeling (index) sindsdien wijzigde.
|
|
186
|
+
let cacheQuery = supabaseAdmin
|
|
185
187
|
.from("floriday_salesorders_cache")
|
|
186
188
|
.select("floriday_id, data, updated_at, buyer_organization_id")
|
|
187
189
|
.eq("is_deleted", false)
|
|
188
|
-
.gte("data->delivery->>latestDeliveryDateTime", cutoffIso)
|
|
190
|
+
.gte("data->delivery->>latestDeliveryDateTime", cutoffIso);
|
|
191
|
+
if (since)
|
|
192
|
+
cacheQuery = cacheQuery.gt("updated_at", since);
|
|
193
|
+
const { data: baseRows, error: cacheErr } = await cacheQuery
|
|
189
194
|
.order("updated_at", { ascending: false })
|
|
190
195
|
.limit(limit);
|
|
191
196
|
if (cacheErr)
|
|
192
197
|
throw new Error(cacheErr.message);
|
|
198
|
+
let cacheRows = (baseRows ?? []);
|
|
199
|
+
if (since) {
|
|
200
|
+
const { data: idxRows, error: idxErr } = await supabaseAdmin
|
|
201
|
+
.from("verkoop_fulfillment_index")
|
|
202
|
+
.select("sales_order_id")
|
|
203
|
+
.gt("changed_at", since)
|
|
204
|
+
.limit(limit);
|
|
205
|
+
if (idxErr)
|
|
206
|
+
throw new Error(`afhandelingsindex lezen: ${idxErr.message}`);
|
|
207
|
+
const have = new Set(cacheRows.map((r) => String(r.floriday_id)));
|
|
208
|
+
const extra = Array.from(new Set((idxRows ?? []).map((r) => String(r.sales_order_id)))).filter((id) => !have.has(id));
|
|
209
|
+
for (let i = 0; i < extra.length; i += 200) {
|
|
210
|
+
const { data: more, error: mErr } = await supabaseAdmin
|
|
211
|
+
.from("floriday_salesorders_cache")
|
|
212
|
+
.select("floriday_id, data, updated_at, buyer_organization_id")
|
|
213
|
+
.eq("is_deleted", false)
|
|
214
|
+
.in("floriday_id", extra.slice(i, i + 200));
|
|
215
|
+
if (mErr)
|
|
216
|
+
throw new Error(mErr.message);
|
|
217
|
+
cacheRows = cacheRows.concat((more ?? []));
|
|
218
|
+
}
|
|
219
|
+
}
|
|
193
220
|
const rows = (cacheRows ?? []);
|
|
194
221
|
if (rows.length === 0) {
|
|
195
222
|
// Ook zonder nieuwe Floriday-gegevens: orders koppelen aan klanten die
|
|
@@ -1445,8 +1472,8 @@ async function mirrorUnlocked(limit) {
|
|
|
1445
1472
|
errors: errors.slice(0, 20),
|
|
1446
1473
|
};
|
|
1447
1474
|
}
|
|
1448
|
-
export async function mirrorFloridayOrdersFromCron(limit = DEFAULT_BATCH) {
|
|
1449
|
-
return mirrorInternal(limit);
|
|
1475
|
+
export async function mirrorFloridayOrdersFromCron(limit = DEFAULT_BATCH, since = null) {
|
|
1476
|
+
return mirrorInternal(limit, since);
|
|
1450
1477
|
}
|
|
1451
1478
|
export const mirrorFloridayOrders = createServerFn({ method: "POST" })
|
|
1452
1479
|
.middleware([requireSupabaseAuth])
|
|
@@ -29,7 +29,7 @@ export const sendOrderEventToEngine = createServerFn({ method: "POST" })
|
|
|
29
29
|
const payload = await buildEngineOrderPayload(order.id);
|
|
30
30
|
if (!payload)
|
|
31
31
|
throw new Error("Order niet gevonden");
|
|
32
|
-
const res = await insertLogisticsEvent({ eventType: data.type, order: payload });
|
|
32
|
+
const res = await insertLogisticsEvent({ eventType: data.type, order: payload, userId: context.userId });
|
|
33
33
|
if (!res.ok)
|
|
34
34
|
return { ok: false, error: res.error };
|
|
35
35
|
return { ok: true, eventId: res.id };
|
|
@@ -19,10 +19,14 @@ export declare function isEngineShadowMode(): boolean;
|
|
|
19
19
|
* Gebruikt de service-role client zodat het ook vanuit cron werkt.
|
|
20
20
|
*/
|
|
21
21
|
export declare function buildEngineOrderPayload(orderId: string): Promise<EngineOrderPayload | null>;
|
|
22
|
-
/** Meld een gebeurtenis aan de Engine: rij in logistics_events.
|
|
22
|
+
/** Meld een gebeurtenis aan de Engine: rij in logistics_events.
|
|
23
|
+
* Contract van de Engine: elke melding hoort bij een echte gebruiker (user_id,
|
|
24
|
+
* net als logistics_emit_event). Zonder gebruiker: geen melding met een
|
|
25
|
+
* verzonnen gebruiker; de Engine pakt de wijziging op via haar eigen trigger. */
|
|
23
26
|
export declare function insertLogisticsEvent(input: {
|
|
24
27
|
eventType: "order.received" | "order.changed" | "stock.changed" | string;
|
|
25
28
|
order: EngineOrderPayload;
|
|
29
|
+
userId: string | null | undefined;
|
|
26
30
|
strategyId?: string | null;
|
|
27
31
|
shadow?: boolean;
|
|
28
32
|
}): Promise<{
|
|
@@ -31,7 +35,13 @@ export declare function insertLogisticsEvent(input: {
|
|
|
31
35
|
} | {
|
|
32
36
|
ok: false;
|
|
33
37
|
error: string;
|
|
38
|
+
skipped?: boolean;
|
|
34
39
|
}>;
|
|
35
|
-
/**
|
|
36
|
-
|
|
40
|
+
/** Melding bij aanmaken/wijzigen van een order. Geeft een waarschuwing in gewone
|
|
41
|
+
* taal terug als het niet lukte (null = gelukt of bewust overgeslagen). */
|
|
42
|
+
export declare function notifyEngineOrder(orderId: string, type: "order.received" | "order.changed", userId?: string | null): Promise<{
|
|
43
|
+
ok: boolean;
|
|
44
|
+
warning: string | null;
|
|
45
|
+
}>;
|
|
46
|
+
export declare function engineWarningText(reason: string): string;
|
|
37
47
|
//# sourceMappingURL=logistics-engine.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logistics-engine.server.d.ts","sourceRoot":"","sources":["../../src/lib/logistics-engine.server.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAG7D,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,aAAa,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAG5C;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAuDpC;AAED
|
|
1
|
+
{"version":3,"file":"logistics-engine.server.d.ts","sourceRoot":"","sources":["../../src/lib/logistics-engine.server.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAG7D,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,aAAa,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAG5C;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAuDpC;AAED;;;iFAGiF;AACjF,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAChD,SAAS,EAAE,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,MAAM,CAAC;IACzE,KAAK,EAAE,kBAAkB,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAqBtF;AAmBD;2EAC2E;AAC3E,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,GAAG,eAAe,EACxC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAuBlD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD"}
|
|
@@ -61,8 +61,14 @@ export async function buildEngineOrderPayload(orderId) {
|
|
|
61
61
|
],
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
-
/** Meld een gebeurtenis aan de Engine: rij in logistics_events.
|
|
64
|
+
/** Meld een gebeurtenis aan de Engine: rij in logistics_events.
|
|
65
|
+
* Contract van de Engine: elke melding hoort bij een echte gebruiker (user_id,
|
|
66
|
+
* net als logistics_emit_event). Zonder gebruiker: geen melding met een
|
|
67
|
+
* verzonnen gebruiker; de Engine pakt de wijziging op via haar eigen trigger. */
|
|
65
68
|
export async function insertLogisticsEvent(input) {
|
|
69
|
+
if (!input.userId) {
|
|
70
|
+
return { ok: false, skipped: true, error: "geen ingelogde gebruiker bij deze actie; de Logistiek Engine pakt de wijziging zelf op" };
|
|
71
|
+
}
|
|
66
72
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
67
73
|
const { orderRef, ...rest } = input.order;
|
|
68
74
|
const { data, error } = await supabaseAdmin
|
|
@@ -71,6 +77,7 @@ export async function insertLogisticsEvent(input) {
|
|
|
71
77
|
source_module: "verkoop",
|
|
72
78
|
event_type: input.eventType,
|
|
73
79
|
order_ref: orderRef,
|
|
80
|
+
user_id: input.userId,
|
|
74
81
|
strategy_id: input.strategyId ?? null,
|
|
75
82
|
shadow: input.shadow ?? isEngineShadowMode(),
|
|
76
83
|
payload: rest,
|
|
@@ -81,18 +88,51 @@ export async function insertLogisticsEvent(input) {
|
|
|
81
88
|
return { ok: false, error: error.message };
|
|
82
89
|
return { ok: true, id: data.id };
|
|
83
90
|
}
|
|
84
|
-
/**
|
|
85
|
-
|
|
91
|
+
/** Uitkomst vastleggen in de eigen log van Verkoop (nooit in orders.custom_fields:
|
|
92
|
+
* dat is een triggerkolom van de Engine en zou een herindeling starten). */
|
|
93
|
+
async function logEngineEvent(row) {
|
|
94
|
+
try {
|
|
95
|
+
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
96
|
+
await supabaseAdmin.from("verkoop_engine_event_log").insert({
|
|
97
|
+
order_id: row.orderId,
|
|
98
|
+
event_type: row.eventType,
|
|
99
|
+
ok: row.ok,
|
|
100
|
+
reason: row.reason,
|
|
101
|
+
user_id: row.userId,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
console.warn("[logistics-engine] eventlog schrijven faalde:", err);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
/** Melding bij aanmaken/wijzigen van een order. Geeft een waarschuwing in gewone
|
|
109
|
+
* taal terug als het niet lukte (null = gelukt of bewust overgeslagen). */
|
|
110
|
+
export async function notifyEngineOrder(orderId, type, userId) {
|
|
86
111
|
try {
|
|
87
112
|
// Alleen de gebeurtenis melden; buffers bepaalt de Engine zelf.
|
|
88
113
|
const payload = await buildEngineOrderPayload(orderId);
|
|
89
114
|
if (!payload)
|
|
90
|
-
return;
|
|
91
|
-
const res = await insertLogisticsEvent({ eventType: type, order: payload });
|
|
92
|
-
if (
|
|
93
|
-
|
|
115
|
+
return { ok: true, warning: null };
|
|
116
|
+
const res = await insertLogisticsEvent({ eventType: type, order: payload, userId });
|
|
117
|
+
if (res.ok) {
|
|
118
|
+
await logEngineEvent({ orderId, eventType: type, ok: true, reason: null, userId: userId ?? null });
|
|
119
|
+
return { ok: true, warning: null };
|
|
120
|
+
}
|
|
121
|
+
if (res.skipped) {
|
|
122
|
+
await logEngineEvent({ orderId, eventType: type, ok: true, reason: res.error, userId: null });
|
|
123
|
+
return { ok: true, warning: null };
|
|
124
|
+
}
|
|
125
|
+
console.warn("[logistics-engine] event schrijven faalde:", res.error);
|
|
126
|
+
await logEngineEvent({ orderId, eventType: type, ok: false, reason: res.error, userId: userId ?? null });
|
|
127
|
+
return { ok: false, warning: engineWarningText(res.error) };
|
|
94
128
|
}
|
|
95
129
|
catch (err) {
|
|
96
|
-
|
|
130
|
+
const msg = err?.message ?? String(err);
|
|
131
|
+
console.warn("[logistics-engine] notifyEngineOrder faalde:", msg);
|
|
132
|
+
await logEngineEvent({ orderId, eventType: type, ok: false, reason: msg, userId: userId ?? null });
|
|
133
|
+
return { ok: false, warning: engineWarningText(msg) };
|
|
97
134
|
}
|
|
98
135
|
}
|
|
136
|
+
export function engineWarningText(reason) {
|
|
137
|
+
return `De Logistiek Engine kon niet direct gewaarschuwd worden: ${reason}. De indeling volgt in de volgende ronde.`;
|
|
138
|
+
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.122";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -122,7 +122,7 @@ export async function cancelLocalOrderInternal(input) {
|
|
|
122
122
|
// Engine informeren zodat buffering/transport de order laat vallen.
|
|
123
123
|
try {
|
|
124
124
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
125
|
-
await notifyEngineOrder(input.orderId, "order.changed");
|
|
125
|
+
await notifyEngineOrder(input.orderId, "order.changed", input.userId ?? null);
|
|
126
126
|
}
|
|
127
127
|
catch (err) {
|
|
128
128
|
console.warn("[cancelLocalOrder] engine-event faalde:", err);
|
|
@@ -211,7 +211,7 @@ export async function handleFloridayCancellation(orderId) {
|
|
|
211
211
|
throw stockError(`Annuleren faalde: ${uErr.message}`);
|
|
212
212
|
try {
|
|
213
213
|
const { notifyEngineOrder } = await import("./logistics-engine.server.js");
|
|
214
|
-
await notifyEngineOrder(orderId, "order.changed");
|
|
214
|
+
await notifyEngineOrder(orderId, "order.changed", null);
|
|
215
215
|
}
|
|
216
216
|
catch (err) {
|
|
217
217
|
console.warn("[floriday-cancel] engine-event faalde:", err);
|
|
@@ -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"}
|