@flowselections/floriday-verkoop-module 1.0.162 → 1.0.163
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/integrations/supabase/types.d.ts +629 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/backfill-flag.d.ts +2 -0
- package/dist-lib/lib/backfill-flag.d.ts.map +1 -0
- package/dist-lib/lib/backfill-flag.js +18 -0
- package/dist-lib/lib/cart-replan.functions.d.ts +7 -12
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +6 -12
- package/dist-lib/lib/cart-replan.server.d.ts +5 -45
- package/dist-lib/lib/cart-replan.server.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.server.js +13 -364
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +3 -7
- package/dist-lib/lib/floriday-backfill.d.ts.map +1 -1
- package/dist-lib/lib/floriday-backfill.js +5 -4
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +0 -3
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +3 -24
- package/dist-lib/lib/invoice-timing.d.ts.map +1 -1
- package/dist-lib/lib/invoice-timing.js +2 -2
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +2 -4
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +11 -3
- package/package.json +1 -1
- package/schema/verkoop.sql +700 -17
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backfill-flag.d.ts","sourceRoot":"","sources":["../../src/lib/backfill-flag.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAS/D"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// Is custom_fields.backfill echt gezet? Eén regel voor Verkoop, gelijk aan de
|
|
2
|
+
// Engine (logistics_order_is_backfill) en de databasehulp verkoop_cf_is_backfill:
|
|
3
|
+
// ontbreekt, null, false, "", "0", "false", "nee", "no" = niet ingehaald.
|
|
4
|
+
export function isBackfillMarked(customFields) {
|
|
5
|
+
if (!customFields || typeof customFields !== "object" || Array.isArray(customFields))
|
|
6
|
+
return false;
|
|
7
|
+
const cf = customFields;
|
|
8
|
+
if (!("backfill" in cf))
|
|
9
|
+
return false;
|
|
10
|
+
const v = cf.backfill;
|
|
11
|
+
if (v === null || v === undefined)
|
|
12
|
+
return false;
|
|
13
|
+
if (typeof v === "boolean")
|
|
14
|
+
return v;
|
|
15
|
+
if (typeof v === "object")
|
|
16
|
+
return true;
|
|
17
|
+
return !["", "false", "0", "nee", "no"].includes(String(v).trim().toLowerCase());
|
|
18
|
+
}
|
|
@@ -7,14 +7,12 @@ export declare const replanOrderCarts: import("@tanstack/start-client-core").Opt
|
|
|
7
7
|
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
8
8
|
orderId: string;
|
|
9
9
|
}, Promise<{
|
|
10
|
-
ok:
|
|
10
|
+
ok: false;
|
|
11
11
|
orderId: string;
|
|
12
|
+
reason: string;
|
|
12
13
|
cartsCreated: number;
|
|
13
|
-
replacedManualCount: number;
|
|
14
|
-
usedFloridayPacking: boolean;
|
|
15
|
-
warnings: string[];
|
|
16
14
|
blockedItems: import("./cart-replan.server.js").BlockedItem[];
|
|
17
|
-
|
|
15
|
+
warnings: string[];
|
|
18
16
|
}>>;
|
|
19
17
|
export declare const getOrderPlanCoverage: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
20
18
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
@@ -43,14 +41,11 @@ export declare const replanBufferForOrder: import("@tanstack/start-client-core")
|
|
|
43
41
|
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
44
42
|
orderId: string;
|
|
45
43
|
}, Promise<{
|
|
46
|
-
ok:
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
ok: false;
|
|
45
|
+
orderId: string;
|
|
46
|
+
reason: string;
|
|
49
47
|
cartsCreated: number;
|
|
50
|
-
replacedManualCount: number;
|
|
51
|
-
usedFloridayPacking: boolean;
|
|
52
|
-
warnings: string[];
|
|
53
48
|
blockedItems: import("./cart-replan.server.js").BlockedItem[];
|
|
54
|
-
|
|
49
|
+
warnings: string[];
|
|
55
50
|
}>>;
|
|
56
51
|
//# sourceMappingURL=cart-replan.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cart-replan.functions.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cart-replan.functions.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.functions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAMlE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;GAI7B,CAAC;AAML,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;gBAUA,MAAM,GAAG,IAAI;eAAS,MAAM,GAAG,IAAI;mBAAa,MAAM,GAAG,IAAI;;;;kBA8BhE,eAAe,EAAE;eAAS,MAAM,GAAG,IAAI;;GAMjE,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;GAI7B,CAAC"}
|
|
@@ -6,11 +6,9 @@ import { resolveOrderRow } from "./order-row.server.js";
|
|
|
6
6
|
export const replanOrderCarts = createServerFn({ method: "POST" })
|
|
7
7
|
.middleware([requireSupabaseAuth])
|
|
8
8
|
.inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
|
|
9
|
-
.handler(async ({ data
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
const { replanOrderInternal } = await import("./cart-replan.server.js");
|
|
13
|
-
return replanOrderInternal(order.id);
|
|
9
|
+
.handler(async ({ data }) => {
|
|
10
|
+
const { oldPlannerRefusal } = await import("./cart-replan.server.js");
|
|
11
|
+
return oldPlannerRefusal(data.orderId);
|
|
14
12
|
});
|
|
15
13
|
// ─── Lezen — voor de UI ─────────────────────────────────────────────────────
|
|
16
14
|
// De karindeling van een order komt uitsluitend uit de Logistiek Engine
|
|
@@ -69,11 +67,7 @@ export const getOrderPlanCoverage = createServerFn({ method: "GET" })
|
|
|
69
67
|
export const replanBufferForOrder = createServerFn({ method: "POST" })
|
|
70
68
|
.middleware([requireSupabaseAuth])
|
|
71
69
|
.inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
|
|
72
|
-
.handler(async ({ data
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const { resolveBufferForOrderInternal } = await import("./order-buffers.server.js");
|
|
76
|
-
const { replanScopeInternal } = await import("./cart-replan.server.js");
|
|
77
|
-
const bufferId = await resolveBufferForOrderInternal(order.id);
|
|
78
|
-
return replanScopeInternal({ bufferId, orderId: order.id });
|
|
70
|
+
.handler(async ({ data }) => {
|
|
71
|
+
const { oldPlannerRefusal } = await import("./cart-replan.server.js");
|
|
72
|
+
return oldPlannerRefusal(data.orderId);
|
|
79
73
|
});
|
|
@@ -5,55 +5,15 @@ export interface BlockedItem {
|
|
|
5
5
|
reason: "geen_belading" | "onvolledige_belading";
|
|
6
6
|
missing: string[];
|
|
7
7
|
}
|
|
8
|
-
export declare
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
orderIds: string[];
|
|
12
|
-
cartsCreated: number;
|
|
13
|
-
replacedManualCount: number;
|
|
14
|
-
usedFloridayPacking: boolean;
|
|
15
|
-
warnings: string[];
|
|
16
|
-
blockedItems: BlockedItem[];
|
|
17
|
-
skipped?: "locked";
|
|
18
|
-
}>;
|
|
19
|
-
/**
|
|
20
|
-
* Plant karren voor een scope: een Engine-buffer (bufferId) óf één losse order
|
|
21
|
-
* (orderId) wanneer de Engine zegt dat er niet gebufferd wordt.
|
|
22
|
-
*/
|
|
23
|
-
export declare function replanScopeInternal(scope: {
|
|
24
|
-
bufferId?: string | null;
|
|
25
|
-
orderId?: string | null;
|
|
26
|
-
}): Promise<{
|
|
27
|
-
ok: boolean;
|
|
28
|
-
bufferId: string | null;
|
|
29
|
-
orderIds: string[];
|
|
30
|
-
cartsCreated: number;
|
|
31
|
-
replacedManualCount: number;
|
|
32
|
-
usedFloridayPacking: boolean;
|
|
33
|
-
warnings: string[];
|
|
34
|
-
blockedItems: BlockedItem[];
|
|
35
|
-
skipped?: "locked";
|
|
36
|
-
}>;
|
|
37
|
-
export declare function replanOrderInternal(orderId: string): Promise<{
|
|
38
|
-
ok: boolean;
|
|
8
|
+
export declare const OLD_PLANNER_MESSAGE = "De karindeling wordt gemaakt door de Logistiek Engine; deze oude planner doet niets meer.";
|
|
9
|
+
export declare function oldPlannerRefusal(orderId: string): {
|
|
10
|
+
ok: false;
|
|
39
11
|
orderId: string;
|
|
12
|
+
reason: string;
|
|
40
13
|
cartsCreated: number;
|
|
41
|
-
replacedManualCount: number;
|
|
42
|
-
usedFloridayPacking: boolean;
|
|
43
|
-
warnings: string[];
|
|
44
14
|
blockedItems: BlockedItem[];
|
|
45
|
-
skipped?: "locked";
|
|
46
|
-
}>;
|
|
47
|
-
export declare function replanOrderCartsFromCron(orderId: string): Promise<{
|
|
48
|
-
ok: boolean;
|
|
49
|
-
orderId: string;
|
|
50
|
-
cartsCreated: number;
|
|
51
|
-
replacedManualCount: number;
|
|
52
|
-
usedFloridayPacking: boolean;
|
|
53
15
|
warnings: string[];
|
|
54
|
-
|
|
55
|
-
skipped?: "locked";
|
|
56
|
-
}>;
|
|
16
|
+
};
|
|
57
17
|
export declare function drainCartReplanQueue(_limit?: number): Promise<{
|
|
58
18
|
ok: boolean;
|
|
59
19
|
processed: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cart-replan.server.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cart-replan.server.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.server.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,GAAG,sBAAsB,CAAC;IACjD,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,8FAC6D,CAAC;AAE9F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM;;;;;kBAOzB,WAAW,EAAE;;EAGpC;AAGD,wBAAsB,oBAAoB,CAAC,MAAM,SAAK,GAAG,OAAO,CAAC;IAC/D,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE,CAAC,CAED"}
|
|
@@ -1,371 +1,20 @@
|
|
|
1
|
-
// Server-only:
|
|
2
|
-
// Logistiek Engine
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
return replanScopeInternal({ bufferId });
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* Plant karren voor een scope: een Engine-buffer (bufferId) óf één losse order
|
|
12
|
-
* (orderId) wanneer de Engine zegt dat er niet gebufferd wordt.
|
|
13
|
-
*/
|
|
14
|
-
export async function replanScopeInternal(scope) {
|
|
15
|
-
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
16
|
-
const bufferId = scope.bufferId ?? null;
|
|
17
|
-
const soloOrderId = bufferId ? null : (scope.orderId ?? null);
|
|
18
|
-
if (!bufferId && !soloOrderId)
|
|
19
|
-
throw new Error("replanScopeInternal: geen scope");
|
|
20
|
-
let ordersQuery = supabaseAdmin
|
|
21
|
-
.from("orders")
|
|
22
|
-
.select("id, order_number, custom_fields, plan_locked_at")
|
|
23
|
-
.is("deleted_at", null);
|
|
24
|
-
ordersQuery = bufferId
|
|
25
|
-
? ordersQuery.eq("buffer_id", bufferId)
|
|
26
|
-
: ordersQuery.eq("id", soloOrderId);
|
|
27
|
-
const { data: orders } = await ordersQuery;
|
|
28
|
-
const orderRows = (orders ?? []);
|
|
29
|
-
const orderIds = orderRows.map((o) => o.id);
|
|
30
|
-
const orderNumberById = new Map();
|
|
31
|
-
for (const o of orderRows) {
|
|
32
|
-
if (o.order_number)
|
|
33
|
-
orderNumberById.set(o.id, String(o.order_number));
|
|
34
|
-
}
|
|
35
|
-
if (orderRows.some((o) => o.plan_locked_at)) {
|
|
36
|
-
return {
|
|
37
|
-
ok: true,
|
|
38
|
-
bufferId,
|
|
39
|
-
orderIds,
|
|
40
|
-
cartsCreated: 0,
|
|
41
|
-
replacedManualCount: 0,
|
|
42
|
-
usedFloridayPacking: false,
|
|
43
|
-
warnings: ["plan_locked"],
|
|
44
|
-
blockedItems: [],
|
|
45
|
-
skipped: "locked",
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
// Items van alle orders in de buffer.
|
|
49
|
-
const { data: items, error: itErr } = await supabaseAdmin
|
|
50
|
-
.from("order_items")
|
|
51
|
-
.select("id, order_id, product_id, product_name, quantity, plants_per_crate, crates_per_layer, layers_per_cart, products(plants_per_crate, crates_per_layer, layers_per_cart)")
|
|
52
|
-
.in("order_id", orderIds.length > 0 ? orderIds : ["00000000-0000-0000-0000-000000000000"])
|
|
53
|
-
.is("quarantined_at", null);
|
|
54
|
-
if (itErr)
|
|
55
|
-
throw new Error(itErr.message);
|
|
56
|
-
// Onbekend blijft onbekend: geen ?? 1. De planner blokkeert regels
|
|
57
|
-
// zonder (volledige) belading in plaats van 1×1×1 te plannen.
|
|
58
|
-
const pos = (v) => {
|
|
59
|
-
if (v === null || v === undefined)
|
|
60
|
-
return null;
|
|
61
|
-
const n = Number(v);
|
|
62
|
-
return Number.isFinite(n) && n > 0 ? Math.round(n) : null;
|
|
63
|
-
};
|
|
64
|
-
/** Een bron telt alleen als álle drie de velden gevuld zijn (> 0). */
|
|
65
|
-
const completeSource = (plants_per_crate, crates_per_layer, layers_per_cart) => {
|
|
66
|
-
const a = pos(plants_per_crate);
|
|
67
|
-
const b = pos(crates_per_layer);
|
|
68
|
-
const c = pos(layers_per_cart);
|
|
69
|
-
return a && b && c ? { plants_per_crate: a, crates_per_layer: b, layers_per_cart: c } : null;
|
|
70
|
-
};
|
|
71
|
-
// Beladingbron per order: custom_fields.floriday_packing bevat de belading
|
|
72
|
-
// zoals die in Floriday op de order staat. Dat zijn de packing-VELDEN
|
|
73
|
-
// (pieces_per_package / packages_per_layer / layers_per_load_carrier) —
|
|
74
|
-
// géén voorgekauwde karrenlijst; de karindeling rekenen we zelf.
|
|
75
|
-
const floridayByOrder = new Map();
|
|
76
|
-
const loadCarrierByOrder = new Map();
|
|
77
|
-
for (const o of orderRows) {
|
|
78
|
-
const fp = (o.custom_fields ?? {})?.floriday_packing ?? null;
|
|
79
|
-
if (!fp)
|
|
80
|
-
continue;
|
|
81
|
-
const bel = completeSource(fp.pieces_per_package, fp.packages_per_layer, fp.layers_per_load_carrier);
|
|
82
|
-
if (bel)
|
|
83
|
-
floridayByOrder.set(o.id, bel);
|
|
84
|
-
const lc = typeof fp.load_carrier === "string" ? fp.load_carrier.trim() : "";
|
|
85
|
-
if (lc)
|
|
86
|
-
loadCarrierByOrder.set(o.id, lc.toUpperCase());
|
|
87
|
-
}
|
|
88
|
-
// ── Ladingdragerprofiel ────────────────────────────────────────────────
|
|
89
|
-
// Vertrouw NIET op de kolomdefault 'trolley' van order_carts: die verbergt
|
|
90
|
-
// dat er geen profielkeuze is gemaakt. Zonder profiel plannen we niet.
|
|
91
|
-
const { data: carrierProfiles } = await supabaseAdmin
|
|
92
|
-
.from("load_carrier_types")
|
|
93
|
-
.select("id, code, name, layers_per_carrier, is_active, is_default");
|
|
94
|
-
const activeProfiles = (carrierProfiles ?? []).filter((p) => p.is_active);
|
|
95
|
-
const defaultProfile = activeProfiles.find((p) => p.is_default) ??
|
|
96
|
-
activeProfiles.find((p) => String(p.code).toLowerCase() === "trolley") ??
|
|
97
|
-
null;
|
|
98
|
-
/** Floriday-ladingdragercode → code in load_carrier_types. */
|
|
99
|
-
const CARRIER_CODE_MAP = {
|
|
100
|
-
DANISH_TROLLEY: ["danish_container", "danish_trolley"],
|
|
101
|
-
DANISH_TROLLEY_NON_CC_RFID: ["danish_container"],
|
|
102
|
-
DANISH_TROLLEY_WATER_TRAY: ["danish_container"],
|
|
103
|
-
ONE_THIRD_DANISH_TROLLEY: ["danish_container"],
|
|
104
|
-
AUCTION_TROLLEY: ["auction_trolley", "trolley"],
|
|
105
|
-
EURO_TROLLEY: ["euro_rolcontainer", "trolley"],
|
|
106
|
-
ROLL_CONTAINER: ["euro_rolcontainer"],
|
|
107
|
-
EURO_PALLET: ["euro_pallet", "pallet"],
|
|
108
|
-
HT_EURO_PALLET: ["euro_pallet", "pallet"],
|
|
109
|
-
PALLET: ["pallet"],
|
|
110
|
-
BLOCK_PALLET: ["pallet"],
|
|
111
|
-
NONE: ["loose"],
|
|
112
|
-
};
|
|
113
|
-
const profileFor = (loadCarrier) => {
|
|
114
|
-
if (!loadCarrier)
|
|
115
|
-
return defaultProfile;
|
|
116
|
-
const direct = activeProfiles.find((p) => String(p.code).toUpperCase() === loadCarrier.toUpperCase());
|
|
117
|
-
if (direct)
|
|
118
|
-
return direct;
|
|
119
|
-
for (const code of CARRIER_CODE_MAP[loadCarrier.toUpperCase()] ?? []) {
|
|
120
|
-
const hit = activeProfiles.find((p) => String(p.code).toLowerCase() === code);
|
|
121
|
-
if (hit)
|
|
122
|
-
return hit;
|
|
123
|
-
}
|
|
124
|
-
return defaultProfile;
|
|
125
|
-
};
|
|
126
|
-
let usedFloridayPacking = false;
|
|
127
|
-
const inputs = (items ?? []).map((it) => {
|
|
128
|
-
const prod = it.products ?? {};
|
|
129
|
-
// Volgorde: orderregel → floriday_packing → product. Niet coalescen per
|
|
130
|
-
// veld: een half-Floriday/half-orderregel-belading is geen belading.
|
|
131
|
-
const fromFloriday = floridayByOrder.get(it.order_id) ?? null;
|
|
132
|
-
const orderLineBel = completeSource(it.plants_per_crate, it.crates_per_layer, it.layers_per_cart);
|
|
133
|
-
const bel = orderLineBel ??
|
|
134
|
-
fromFloriday ??
|
|
135
|
-
completeSource(prod.plants_per_crate, prod.crates_per_layer, prod.layers_per_cart);
|
|
136
|
-
if (orderLineBel == null && fromFloriday != null)
|
|
137
|
-
usedFloridayPacking = true;
|
|
138
|
-
const loadCarrier = loadCarrierByOrder.get(it.order_id) ?? null;
|
|
139
|
-
// layers_per_cart = LEAST(profiel, bron) — identiek aan logistics_plan_buffer_sql.
|
|
140
|
-
const profileLayers = pos(profileFor(loadCarrier)?.layers_per_carrier);
|
|
141
|
-
const layers = bel?.layers_per_cart != null && profileLayers != null
|
|
142
|
-
? Math.min(bel.layers_per_cart, profileLayers)
|
|
143
|
-
: (bel?.layers_per_cart ?? null);
|
|
144
|
-
return {
|
|
145
|
-
order_item_id: it.id,
|
|
146
|
-
product_id: it.product_id,
|
|
147
|
-
product_name: productNameForStorage(it.product_name),
|
|
148
|
-
plants: Math.max(0, Number(it.quantity ?? 0)),
|
|
149
|
-
plants_per_crate: bel?.plants_per_crate ?? null,
|
|
150
|
-
crates_per_layer: bel?.crates_per_layer ?? null,
|
|
151
|
-
layers_per_cart: layers,
|
|
152
|
-
load_carrier: loadCarrier,
|
|
153
|
-
};
|
|
154
|
-
});
|
|
155
|
-
// Item → order-map voor het toewijzen van cart.order_id bij homogene karren.
|
|
156
|
-
const itemToOrder = new Map();
|
|
157
|
-
for (const it of items ?? []) {
|
|
158
|
-
itemToOrder.set(it.id, it.order_id);
|
|
159
|
-
}
|
|
160
|
-
// Nummering én delete-scope liggen altijd op bufferniveau als de order een
|
|
161
|
-
// buffer heeft; order-scope is uitsluitend terugval. Wissen én wegschrijven
|
|
162
|
-
// gebeuren verderop in ÉÉN transactie via public.replace_order_carts, zodat
|
|
163
|
-
// een mislukte replan de bestaande indeling laat staan.
|
|
164
|
-
if (!bufferId) {
|
|
165
|
-
console.warn("[cart-replan] geen buffer voor order %s — nummering en delete vallen terug op order-scope", soloOrderId);
|
|
166
|
-
}
|
|
167
|
-
let replacedManualCount = 0;
|
|
168
|
-
// De karindeling wordt hier altijd zelf gerekend. custom_fields.floriday_packing
|
|
169
|
-
// levert alleen de belading-VELDEN (pieces_per_package / packages_per_layer /
|
|
170
|
-
// layers_per_load_carrier) — de mirror schrijft nooit een voorgekauwde
|
|
171
|
-
// carts-array, dus die tak bestaat bewust niet meer.
|
|
172
|
-
const plannedCarts = [];
|
|
173
|
-
const warnings = [];
|
|
174
|
-
let blockedItems = [];
|
|
175
|
-
{
|
|
176
|
-
const { ensureDefaultsWithin } = await import("./ensure-defaults.server.js");
|
|
177
|
-
const ensured = await ensureDefaultsWithin(supabaseAdmin);
|
|
178
|
-
if (!ensured.ok)
|
|
179
|
-
warnings.push("Standaardinstellingen voor de karindeling konden niet worden aangemaakt.");
|
|
180
|
-
const [{ data: settings }, { data: overrides }] = await Promise.all([
|
|
181
|
-
supabaseAdmin.from("cart_planning_settings").select("*").eq("id", 1).maybeSingle(),
|
|
182
|
-
supabaseAdmin.from("cart_planning_product_overrides").select("product_id, never_mix"),
|
|
183
|
-
]);
|
|
184
|
-
const neverMix = new Set((overrides ?? [])
|
|
185
|
-
.filter((o) => o.never_mix && o.product_id)
|
|
186
|
-
.map((o) => o.product_id));
|
|
187
|
-
// Ladingdrager is een HARDE partitie: één planner-run per load_carrier.
|
|
188
|
-
// Items zonder load_carrier (lokale orders) vormen hun eigen partitie op
|
|
189
|
-
// het defaultprofiel.
|
|
190
|
-
const partitions = new Map();
|
|
191
|
-
for (const input of inputs) {
|
|
192
|
-
const key = input.load_carrier ?? "";
|
|
193
|
-
const list = partitions.get(key);
|
|
194
|
-
if (list)
|
|
195
|
-
list.push(input);
|
|
196
|
-
else
|
|
197
|
-
partitions.set(key, [input]);
|
|
198
|
-
}
|
|
199
|
-
const allBlocked = [];
|
|
200
|
-
let nextCartNumber = 1;
|
|
201
|
-
for (const [key, partitionInputs] of partitions) {
|
|
202
|
-
const profile = profileFor(key || null);
|
|
203
|
-
if (!profile) {
|
|
204
|
-
// Geen actief profiel én geen 'trolley': niet plannen, wel blokkeren.
|
|
205
|
-
for (const i of partitionInputs) {
|
|
206
|
-
allBlocked.push({
|
|
207
|
-
order_item_id: i.order_item_id,
|
|
208
|
-
product_id: i.product_id,
|
|
209
|
-
product_name: productNameForStorage(i.product_name),
|
|
210
|
-
reason: "geen_belading",
|
|
211
|
-
missing: ["load_carrier_profile"],
|
|
212
|
-
});
|
|
213
|
-
}
|
|
214
|
-
warnings.push(`Geen actief ladingdragerprofiel gevonden${key ? ` voor ${key}` : ""} — karindeling overgeslagen.`);
|
|
215
|
-
continue;
|
|
216
|
-
}
|
|
217
|
-
const result = planCarts(partitionInputs, {
|
|
218
|
-
maxPartySharePerLayerPct: settings?.max_party_share_per_layer_pct ?? 50,
|
|
219
|
-
maxBeladingenPerLayer: settings?.max_beladingen_per_layer ?? 2,
|
|
220
|
-
neverMixProductIds: neverMix,
|
|
221
|
-
startCartNumber: nextCartNumber,
|
|
222
|
-
});
|
|
223
|
-
for (const cart of result.carts) {
|
|
224
|
-
nextCartNumber = Math.max(nextCartNumber, cart.cart_number + 1);
|
|
225
|
-
plannedCarts.push({ cart, profile });
|
|
226
|
-
}
|
|
227
|
-
warnings.push(...result.warnings);
|
|
228
|
-
allBlocked.push(...result.blocked);
|
|
229
|
-
}
|
|
230
|
-
const result = { blocked: allBlocked };
|
|
231
|
-
// Regels zonder (volledige) belading: NOOIT karren maken. Meld de
|
|
232
|
-
// blokkade aan de logistiek-engine zodat die zichtbaar wordt in
|
|
233
|
-
// logistics_plan_queue / logistics_events / logistics_decisions.
|
|
234
|
-
if (result.blocked.length > 0) {
|
|
235
|
-
const blockedOrderIds = [
|
|
236
|
-
...new Set(result.blocked
|
|
237
|
-
.map((b) => itemToOrder.get(b.order_item_id))
|
|
238
|
-
.filter((v) => !!v)),
|
|
239
|
-
];
|
|
240
|
-
blockedItems = result.blocked.map((b) => ({
|
|
241
|
-
order_item_id: b.order_item_id,
|
|
242
|
-
order_id: itemToOrder.get(b.order_item_id) ?? null,
|
|
243
|
-
product_name: productNameForStorage(b.product_name),
|
|
244
|
-
reason: b.reason,
|
|
245
|
-
missing: b.missing,
|
|
246
|
-
}));
|
|
247
|
-
if (blockedOrderIds.length > 0) {
|
|
248
|
-
const FIELD_LABELS = {
|
|
249
|
-
plants_per_crate: "planten per fust",
|
|
250
|
-
crates_per_layer: "fusten per laag",
|
|
251
|
-
layers_per_cart: "lagen per kar",
|
|
252
|
-
};
|
|
253
|
-
const nummers = blockedOrderIds
|
|
254
|
-
.map((id) => orderNumberById.get(id) ?? id.slice(0, 8))
|
|
255
|
-
.join(", ");
|
|
256
|
-
const velden = [
|
|
257
|
-
...new Set(blockedItems.flatMap((b) => b.missing)),
|
|
258
|
-
]
|
|
259
|
-
.map((f) => FIELD_LABELS[f] ?? f)
|
|
260
|
-
.join(", ");
|
|
261
|
-
const reason = `Karindeling geblokkeerd voor order(s) ${nummers}: ` +
|
|
262
|
-
`${blockedItems.length} orderregel(s) zonder volledige belading` +
|
|
263
|
-
(velden ? ` (ontbreekt: ${velden})` : "") + ".";
|
|
264
|
-
// Geen eigen blokkade of mail meer (koppelprompt 22): de Engine
|
|
265
|
-
// beslist zelf en meldt een definitieve blokkade.
|
|
266
|
-
warnings.push(reason);
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
}
|
|
270
|
-
// Payload voor public.replace_order_carts. LET OP: de sleutels hieronder
|
|
271
|
-
// moeten gelijk lopen met de sleutellijsten in die SQL-functie; ontbreekt er
|
|
272
|
-
// één, dan gooit de database een fout in plaats van stil NULL te schrijven.
|
|
273
|
-
const cartPayload = plannedCarts.map(({ cart, profile }) => {
|
|
274
|
-
// Bepaal cart.order_id: null bij mix van orders, anders die ene order.
|
|
275
|
-
const orderIdsOnCart = new Set();
|
|
276
|
-
for (const i of cart.items) {
|
|
277
|
-
const oid = itemToOrder.get(i.order_item_id);
|
|
278
|
-
if (oid)
|
|
279
|
-
orderIdsOnCart.add(oid);
|
|
280
|
-
}
|
|
281
|
-
const singleOrderId = orderIdsOnCart.size === 1 ? [...orderIdsOnCart][0] : null;
|
|
282
|
-
return {
|
|
283
|
-
order_id: singleOrderId,
|
|
284
|
-
buffer_id: bufferId,
|
|
285
|
-
cart_number: cart.cart_number,
|
|
286
|
-
is_auto: true,
|
|
287
|
-
is_complete: cart.is_complete,
|
|
288
|
-
source: usedFloridayPacking ? "floriday" : "auto",
|
|
289
|
-
occupancy_pct: cart.occupancy_pct,
|
|
290
|
-
total_layers_used: cart.total_layers_used,
|
|
291
|
-
// Profiel expliciet meegeven; nooit leunen op de kolomdefault.
|
|
292
|
-
carrier_type: profile.code,
|
|
293
|
-
carrier_type_id: profile.id,
|
|
294
|
-
max_layers: profile.layers_per_carrier ?? null,
|
|
295
|
-
algorithm_version: CART_PLANNER_VERSION,
|
|
296
|
-
items: cart.items.map((i) => ({
|
|
297
|
-
order_item_id: i.order_item_id,
|
|
298
|
-
product_id: i.product_id,
|
|
299
|
-
product_name: productNameForStorage(i.product_name),
|
|
300
|
-
crates: Math.max(1, Math.round(i.crates)),
|
|
301
|
-
plants_per_crate: i.plants_per_crate,
|
|
302
|
-
crates_per_layer: i.crates_per_layer,
|
|
303
|
-
layers_per_cart: i.layers_per_cart,
|
|
304
|
-
layer_fraction: i.layer_fraction,
|
|
305
|
-
layer_share_pct: i.layer_share_pct,
|
|
306
|
-
})),
|
|
307
|
-
};
|
|
308
|
-
});
|
|
309
|
-
// Delete + inserts in één transactie: faalt er iets, dan blijft de oude
|
|
310
|
-
// karindeling staan in plaats van een lege buffer achter te laten.
|
|
311
|
-
const { data: replaceRes, error: replaceErr } = await supabaseAdmin.rpc("replace_order_carts", {
|
|
312
|
-
p_buffer_id: bufferId,
|
|
313
|
-
p_order_id: bufferId ? null : soloOrderId,
|
|
314
|
-
p_carts: cartPayload,
|
|
315
|
-
});
|
|
316
|
-
if (replaceErr)
|
|
317
|
-
throw new Error(replaceErr.message);
|
|
318
|
-
const cartsCreated = Number(replaceRes?.carts_written ?? 0);
|
|
319
|
-
const itemsWritten = Number(replaceRes?.items_written ?? 0);
|
|
320
|
-
replacedManualCount = Number(replaceRes?.replaced_manual_count ?? 0);
|
|
321
|
-
// Controleer dat de database daadwerkelijk heeft weggeschreven wat de
|
|
322
|
-
// planner opleverde. Nul karren mag, maar alleen als de planner er ook nul
|
|
323
|
-
// opleverde — niet als gevolg van een fout.
|
|
324
|
-
const expectedItems = cartPayload.reduce((n, c) => n + c.items.length, 0);
|
|
325
|
-
if (cartsCreated !== cartPayload.length || itemsWritten !== expectedItems) {
|
|
326
|
-
throw new Error(`Karindeling niet volledig weggeschreven: ${cartsCreated}/${cartPayload.length} karren, ` +
|
|
327
|
-
`${itemsWritten}/${expectedItems} artikelen.`);
|
|
328
|
-
}
|
|
329
|
-
// Weer ingedeeld: eerdere blokkademeldingen wissen, zodat een latere
|
|
330
|
-
// blokkade opnieuw gemaild mag worden.
|
|
331
|
-
if (cartsCreated > 0) {
|
|
332
|
-
const plannedOrderIds = Array.from(new Set(Array.from(itemToOrder.values()).filter((v) => !!v)));
|
|
333
|
-
const { clearOrderBlockNotifications } = await import("./order-block-mail.server.js");
|
|
334
|
-
await clearOrderBlockNotifications(plannedOrderIds);
|
|
335
|
-
}
|
|
1
|
+
// Server-only: oude eigen karplanner van Verkoop — onschadelijk sinds golf 1.
|
|
2
|
+
// Karplanning is van de Logistiek Engine. Deze module plant, schrijft of wist
|
|
3
|
+
// geen karren meer; ze bestaat alleen nog zodat oude aanroepen een duidelijke
|
|
4
|
+
// weigering krijgen. Verwijderen is een handmatige stap (zie verslag golf 1).
|
|
5
|
+
export const OLD_PLANNER_MESSAGE = "De karindeling wordt gemaakt door de Logistiek Engine; deze oude planner doet niets meer.";
|
|
6
|
+
export function oldPlannerRefusal(orderId) {
|
|
7
|
+
console.error(`[cart-replan] oude karplanner aangeroepen voor ${orderId}; geweigerd (karplanning is van de Logistiek Engine)`);
|
|
336
8
|
return {
|
|
337
|
-
ok:
|
|
338
|
-
bufferId,
|
|
339
|
-
orderIds,
|
|
340
|
-
cartsCreated,
|
|
341
|
-
replacedManualCount,
|
|
342
|
-
usedFloridayPacking,
|
|
343
|
-
warnings,
|
|
344
|
-
blockedItems,
|
|
345
|
-
};
|
|
346
|
-
}
|
|
347
|
-
export async function replanOrderInternal(orderId) {
|
|
348
|
-
// Vraag het bufferbesluit aan de Engine en plan die scope opnieuw.
|
|
349
|
-
const bufferId = await resolveBufferForOrderInternal(orderId);
|
|
350
|
-
const res = await replanScopeInternal({ bufferId, orderId });
|
|
351
|
-
return {
|
|
352
|
-
ok: res.ok,
|
|
9
|
+
ok: false,
|
|
353
10
|
orderId,
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
warnings:
|
|
358
|
-
blockedItems: res.blockedItems,
|
|
359
|
-
skipped: res.skipped,
|
|
11
|
+
reason: OLD_PLANNER_MESSAGE,
|
|
12
|
+
cartsCreated: 0,
|
|
13
|
+
blockedItems: [],
|
|
14
|
+
warnings: [OLD_PLANNER_MESSAGE],
|
|
360
15
|
};
|
|
361
16
|
}
|
|
362
|
-
|
|
363
|
-
return replanOrderInternal(orderId);
|
|
364
|
-
}
|
|
365
|
-
// ─── Queue drain (aangeroepen door pg_cron elke minuut) ─────────────────────
|
|
366
|
-
// Karplanning is eigendom van de Logistiek Engine (runCartPlanRequests draait
|
|
367
|
-
// daar elke minuut). Deze drain is bewust geneutraliseerd zodat de Verkoop-
|
|
368
|
-
// module nooit zelf een indeelronde start.
|
|
17
|
+
// Vroeger leeggemaakt door pg_cron; doet niets (cart_replan_queue wordt niet meer gevuld).
|
|
369
18
|
export async function drainCartReplanQueue(_limit = 50) {
|
|
370
19
|
return { ok: true, processed: 0, failed: 0, results: [] };
|
|
371
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,2BAA2B;;;;;;YAwBpB,MAAM;sBACc,MAAM,GAAG,IAAI;yBACG,MAAM,GAAG,IAAI;cACnC,MAAM,GAAG,IAAI;eACX,MAAM,GAAG,IAAI;wBACK,MAAM,GAAG,IAAI;gBACvC,MAAM;;;GAkB9B,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;;;YAuE7B,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;QAClD,mFAAmF;qBACtE,MAAM,EAAE;;GAmUvB,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAOL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;GAWzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;;;;;YAuCI,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;AAsFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA+UL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;GAe7B,CAAC;
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,2BAA2B;;;;;;YAwBpB,MAAM;sBACc,MAAM,GAAG,IAAI;yBACG,MAAM,GAAG,IAAI;cACnC,MAAM,GAAG,IAAI;eACX,MAAM,GAAG,IAAI;wBACK,MAAM,GAAG,IAAI;gBACvC,MAAM;;;GAkB9B,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;;;YAuE7B,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;QAClD,mFAAmF;qBACtE,MAAM,EAAE;;GAmUvB,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAOL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;GAWzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;;;;;YAuCI,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;AAsFL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA+UL,MAAM;;;;GAK9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;GAe7B,CAAC;AAOL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;GAkC7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAkDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;;;YA8B7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;;GAUpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8T7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAmBhE,CAAC;AAML,eAAO,MAAM,cAAc;;;;8CAED,OAAO;;;;;;;;;;;;;MA+B7B,CAAC;AAML,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -1161,8 +1161,7 @@ export const cancelLocalOrder = createServerFn({ method: "POST" })
|
|
|
1161
1161
|
});
|
|
1162
1162
|
// ─── Verwijderen van een lokale bestelling ────────────────────────────────
|
|
1163
1163
|
// Draait eerst de voorraad terug via Voorraad (voorraad_order_terugdraaien)
|
|
1164
|
-
// en verwijdert de order (order_items
|
|
1165
|
-
// cascade). FO-orders (Floriday) worden geweigerd — die kunnen alleen via
|
|
1164
|
+
// en verwijdert de order (order_items en order_carts via cascade). FO-orders (Floriday) worden geweigerd — die kunnen alleen via
|
|
1166
1165
|
// Floriday zelf worden geannuleerd.
|
|
1167
1166
|
export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
1168
1167
|
.middleware([requireSupabaseAuth])
|
|
@@ -1187,12 +1186,9 @@ export const deleteLocalOrder = createServerFn({ method: "POST" })
|
|
|
1187
1186
|
// mislukt dat, dan wordt de order niet verwijderd.
|
|
1188
1187
|
const { voorraadOrderTerugdraaien } = await import("./order-cancel.server.js");
|
|
1189
1188
|
const voorraad = await voorraadOrderTerugdraaien(context.supabase, data.orderId, "Bestelling verwijderd");
|
|
1190
|
-
// Eerst order_items verwijderen
|
|
1191
|
-
//
|
|
1192
|
-
// op dat moment nog bestaan (anders FK-violation).
|
|
1189
|
+
// Eerst order_items verwijderen, daarna de order (cart_replan_queue wordt
|
|
1190
|
+
// sinds golf 1 niet meer gevuld; oude rijen vallen weg via ON DELETE CASCADE).
|
|
1193
1191
|
await supabaseAdmin.from("order_items").delete().eq("order_id", data.orderId);
|
|
1194
|
-
// Queue-entries opruimen die de trigger zojuist heeft aangemaakt.
|
|
1195
|
-
await supabaseAdmin.from("cart_replan_queue").delete().eq("order_id", data.orderId);
|
|
1196
1192
|
const { error: dErr } = await supabaseAdmin
|
|
1197
1193
|
.from("orders")
|
|
1198
1194
|
.delete()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-backfill.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-backfill.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"floriday-backfill.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-backfill.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,GACb;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAW3D;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQxE;AAED,+DAA+D;AAC/D,wBAAgB,cAAc,CAC5B,KAAK,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,EACpD,IAAI,EAAE,MAAM,GAAG,IAAI,GAClB;IAAE,MAAM,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAGpG"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
// "Afgehandeld in Floriday", zodat triggers van Voorraad en Engine hem meteen
|
|
5
5
|
// overslaan (voorraad_order_is_backfill / logistics_order_is_backfill).
|
|
6
6
|
import { FLORIDAY_EXTERNAL_REASON, SHIPPED_STATUS } from "./floriday-external-fulfillment.js";
|
|
7
|
+
import { isBackfillMarked } from "./backfill-flag.js";
|
|
7
8
|
export function backfillInsertFields(info, memberIds, nowIso) {
|
|
8
9
|
return {
|
|
9
10
|
status: SHIPPED_STATUS,
|
|
@@ -17,7 +18,7 @@ export function backfillInsertFields(info, memberIds, nowIso) {
|
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
20
|
export function isBackfillOrder(customFields) {
|
|
20
|
-
return
|
|
21
|
+
return isBackfillMarked(customFields);
|
|
21
22
|
}
|
|
22
23
|
/**
|
|
23
24
|
* Moment waarop de order als afgehandeld geldt voor de weergave: de
|
|
@@ -28,12 +29,12 @@ export function handledAtForDisplay(customFields) {
|
|
|
28
29
|
const cf = (customFields && typeof customFields === "object" ? customFields : {});
|
|
29
30
|
if (typeof cf.floriday_external_fulfilled_at === "string" && cf.floriday_external_fulfilled_at)
|
|
30
31
|
return cf.floriday_external_fulfilled_at;
|
|
32
|
+
if (!isBackfillMarked(cf))
|
|
33
|
+
return null;
|
|
31
34
|
if (cf.backfill && typeof cf.backfill === "object") {
|
|
32
35
|
return typeof cf.backfill.at === "string" && cf.backfill.at ? cf.backfill.at : "backfill";
|
|
33
36
|
}
|
|
34
|
-
|
|
35
|
-
return "backfill";
|
|
36
|
-
return null;
|
|
37
|
+
return "backfill";
|
|
37
38
|
}
|
|
38
39
|
/** Uitkomst per aangevraagde salesOrderId na de omzetronde. */
|
|
39
40
|
export function inhaalUitkomst(order, fout) {
|
|
@@ -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,CA+EzC;AAED,qGAAqG;AACrG,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ3D"}
|
|
@@ -53,9 +53,6 @@ export async function handleFloridayExternalFulfillment(orderId, states) {
|
|
|
53
53
|
const { error: uErr } = await supabaseAdmin.from("orders").update(patch).eq("id", orderId);
|
|
54
54
|
if (uErr)
|
|
55
55
|
throw new Error(uErr.message);
|
|
56
|
-
if (decision.kind === "full") {
|
|
57
|
-
await supabaseAdmin.from("cart_replan_queue").delete().eq("order_id", orderId);
|
|
58
|
-
}
|
|
59
56
|
// Engine melden via logistics_emit_event (idempotent); event-id of fout op de order bewaren.
|
|
60
57
|
const ids = [...new Set(decision.fulfilledIds.map(String))].sort();
|
|
61
58
|
let eventId = null;
|