@flowselections/floriday-verkoop-module 1.0.104 → 1.0.106
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 +10 -1
- package/dist-lib/integrations/supabase/types.d.ts +402 -18
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/belading.server.d.ts +3 -0
- package/dist-lib/lib/belading.server.d.ts.map +1 -1
- package/dist-lib/lib/belading.server.js +9 -3
- package/dist-lib/lib/create-order.functions.d.ts +7 -4
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +60 -33
- package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.functions.js +51 -41
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/packing-snapshot.check.d.ts +2 -0
- package/dist-lib/lib/packing-snapshot.check.d.ts.map +1 -0
- package/dist-lib/lib/packing-snapshot.check.js +45 -0
- package/dist-lib/lib/packing-snapshot.d.ts +50 -0
- package/dist-lib/lib/packing-snapshot.d.ts.map +1 -0
- package/dist-lib/lib/packing-snapshot.js +105 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +12 -7
- package/package.json +1 -1
- package/schema/verkoop.sql +86 -14
|
@@ -7,6 +7,9 @@ export interface BeladingOption {
|
|
|
7
7
|
is_default: boolean;
|
|
8
8
|
crate_type_name: string | null;
|
|
9
9
|
cart_type_name: string | null;
|
|
10
|
+
/** Fustcode (VBN) en ladingdrager van deze verpakking, voor de snapshot. */
|
|
11
|
+
crate_code: string | null;
|
|
12
|
+
cart_code: string | null;
|
|
10
13
|
}
|
|
11
14
|
/**
|
|
12
15
|
* Alle beladingen per product, al gefilterd op de ladingdragers die de
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"belading.server.d.ts","sourceRoot":"","sources":["../../src/lib/belading.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"belading.server.d.ts","sourceRoot":"","sources":["../../src/lib/belading.server.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4EAA4E;IAC5E,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAWD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,GAAG,EACb,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAiO3C"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Geen eigen controle op ladingdragers: alleen de Logistiek Engine beslist
|
|
3
3
|
// of een belading kan (koppelprompt 22).
|
|
4
4
|
import { cratePackageName, loadCarrierName } from "./load-carrier-labels.js";
|
|
5
|
+
import { posOrNull } from "./packing-snapshot.js";
|
|
5
6
|
/**
|
|
6
7
|
* Alle beladingen per product, al gefilterd op de ladingdragers die de
|
|
7
8
|
* Logistics Engine toestaat. Nooit cachen: de Engine-instelling kan tijdens
|
|
@@ -37,9 +38,12 @@ export async function computeBeladingByProduct(supabase, productIds) {
|
|
|
37
38
|
]);
|
|
38
39
|
const packsById = new Map();
|
|
39
40
|
const push = (key, ppc, cpl, lpc, isDefault, crateCode, cartCode) => {
|
|
40
|
-
|
|
41
|
-
const
|
|
42
|
-
const
|
|
41
|
+
// Alleen volledige verpakkingen zijn een keuze; ontbrekend wordt nooit 1.
|
|
42
|
+
const a = posOrNull(ppc);
|
|
43
|
+
const b = posOrNull(cpl);
|
|
44
|
+
const c = posOrNull(lpc);
|
|
45
|
+
if (a == null || b == null || c == null)
|
|
46
|
+
return;
|
|
43
47
|
const crate = crateCode == null || crateCode === "" ? null : String(crateCode);
|
|
44
48
|
const cart = cartCode == null || cartCode === "" ? null : String(cartCode);
|
|
45
49
|
const arr = packsById.get(key) ?? [];
|
|
@@ -167,6 +171,8 @@ export async function computeBeladingByProduct(supabase, productIds) {
|
|
|
167
171
|
plants_per_cart: v.plants_per_crate * v.crates_per_layer * v.layers_per_cart,
|
|
168
172
|
crate_type_name: cratePackageName(v.crate_code, crateDescriptions),
|
|
169
173
|
cart_type_name: loadCarrierName(v.cart_code),
|
|
174
|
+
crate_code: v.crate_code,
|
|
175
|
+
cart_code: v.cart_code,
|
|
170
176
|
}));
|
|
171
177
|
}
|
|
172
178
|
return byProduct;
|
|
@@ -25,9 +25,9 @@ export declare const listProductsForCreateOrder: import("@tanstack/start-client-
|
|
|
25
25
|
article_code: string | null;
|
|
26
26
|
unit: string;
|
|
27
27
|
sale_price: number | null;
|
|
28
|
-
plants_per_crate: number;
|
|
29
|
-
crates_per_layer: number;
|
|
30
|
-
layers_per_cart: number;
|
|
28
|
+
plants_per_crate: number | null;
|
|
29
|
+
crates_per_layer: number | null;
|
|
30
|
+
layers_per_cart: number | null;
|
|
31
31
|
physical_stock: number;
|
|
32
32
|
reserved_stock: number;
|
|
33
33
|
available_stock: number;
|
|
@@ -141,6 +141,9 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
141
141
|
layers_per_cart?: number | undefined;
|
|
142
142
|
article_code?: string | null | undefined;
|
|
143
143
|
needs_sticker?: boolean | undefined;
|
|
144
|
+
vbn_package_code?: string | null | undefined;
|
|
145
|
+
load_carrier_type?: string | null | undefined;
|
|
146
|
+
packing_source?: "product_primary" | "customer" | "chosen" | null | undefined;
|
|
144
147
|
}[];
|
|
145
148
|
carrierId?: string | null | undefined;
|
|
146
149
|
deliveryDate?: string | null | undefined;
|
|
@@ -214,7 +217,7 @@ export declare const getLocalOrderForEdit: import("@tanstack/start-client-core")
|
|
|
214
217
|
productName: string;
|
|
215
218
|
quantity: number;
|
|
216
219
|
unit: string | null;
|
|
217
|
-
plantsPerCrate: number;
|
|
220
|
+
plantsPerCrate: number | null;
|
|
218
221
|
needsSticker: boolean;
|
|
219
222
|
shippedQuantity: number;
|
|
220
223
|
plannedQuantity: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAcA,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;;;;;;;;;;;;;;;;;;GAWnC,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;AAuEL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA2PY,MAAM;GAE/C,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;;;;;;;;;;;;;;;;;;;;;;;;;;GAgR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAwBrE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Server functions voor de handmatige "Nieuwe bestelling" flow.
|
|
2
2
|
// Deelt DB-queries met de Mailbox-module zodat beide manieren van
|
|
3
3
|
// orderinvoer identieke lijsten, validaties en berekeningen gebruiken.
|
|
4
|
+
import { posOrNull, choosePacking } from "./packing-snapshot.js";
|
|
4
5
|
import { createServerFn } from "@tanstack/react-start";
|
|
5
6
|
import { productNameForStorage } from "./product-name.js";
|
|
6
7
|
import { z } from "zod";
|
|
@@ -258,9 +259,10 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
258
259
|
article_code: articleCode,
|
|
259
260
|
unit: "stuks",
|
|
260
261
|
sale_price: null,
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
262
|
+
// Ontbrekend = leeg (nooit stil 1).
|
|
263
|
+
plants_per_crate: posOrNull(primary?.piecesPerPackage ?? primary?.unitsPerPackage),
|
|
264
|
+
crates_per_layer: posOrNull(primary?.packagesPerLayer),
|
|
265
|
+
layers_per_cart: posOrNull(primary?.layersPerLoadCarrier),
|
|
264
266
|
physical_stock: physical,
|
|
265
267
|
reserved_stock: reserved,
|
|
266
268
|
available_stock: available,
|
|
@@ -296,9 +298,9 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
296
298
|
unit: "stuks",
|
|
297
299
|
sale_price: typeof d.salePricePerPiece === "number" ? d.salePricePerPiece : null,
|
|
298
300
|
// Drafts gebruiken Floriday-veldnamen: unitsPerPackage / packagesPerLayer / layersPerLoadCarrier
|
|
299
|
-
plants_per_crate:
|
|
300
|
-
crates_per_layer:
|
|
301
|
-
layers_per_cart:
|
|
301
|
+
plants_per_crate: posOrNull(primary?.unitsPerPackage ?? primary?.piecesPerPackage),
|
|
302
|
+
crates_per_layer: posOrNull(primary?.packagesPerLayer),
|
|
303
|
+
layers_per_cart: posOrNull(primary?.layersPerLoadCarrier),
|
|
302
304
|
physical_stock: physical,
|
|
303
305
|
reserved_stock: reserved,
|
|
304
306
|
available_stock: available,
|
|
@@ -334,11 +336,14 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
334
336
|
productsByGroupId.set(key.slice("group:".length), p);
|
|
335
337
|
}
|
|
336
338
|
}
|
|
337
|
-
const packingFromProductRow = (p) =>
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
339
|
+
const packingFromProductRow = (p) => {
|
|
340
|
+
const v = {
|
|
341
|
+
plants_per_crate: posOrNull(p?.plants_per_crate),
|
|
342
|
+
crates_per_layer: posOrNull(p?.crates_per_layer),
|
|
343
|
+
layers_per_cart: posOrNull(p?.layers_per_cart),
|
|
344
|
+
};
|
|
345
|
+
return v.plants_per_crate == null && v.crates_per_layer == null && v.layers_per_cart == null ? null : v;
|
|
346
|
+
};
|
|
342
347
|
for (const r of Array.isArray(groupsRes.data) ? groupsRes.data : []) {
|
|
343
348
|
const id = r.id;
|
|
344
349
|
if (byId.has(id))
|
|
@@ -372,7 +377,7 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
372
377
|
// Head eerst — belading van de groep = belading van het hoofdproduct.
|
|
373
378
|
// Volgorde: head_trade_item_floriday_id → head_product_id → group-mirror
|
|
374
379
|
// products-rij (`trade_item_key = 'group:<id>'`) → eerste member.
|
|
375
|
-
let packing = { plants_per_crate:
|
|
380
|
+
let packing = { plants_per_crate: null, crates_per_layer: null, layers_per_cart: null };
|
|
376
381
|
const headFloriday = r.head_trade_item_floriday_id;
|
|
377
382
|
const headProduct = r.head_product_id;
|
|
378
383
|
const groupMirror = productsByGroupId.get(id);
|
|
@@ -441,9 +446,9 @@ export const listProductsForCreateOrder = createServerFn({ method: "GET" })
|
|
|
441
446
|
article_code: articleCode,
|
|
442
447
|
unit: r.unit ?? "stuks",
|
|
443
448
|
sale_price: r.sale_price ?? null,
|
|
444
|
-
plants_per_crate:
|
|
445
|
-
crates_per_layer:
|
|
446
|
-
layers_per_cart:
|
|
449
|
+
plants_per_crate: posOrNull(r.plants_per_crate),
|
|
450
|
+
crates_per_layer: posOrNull(r.crates_per_layer),
|
|
451
|
+
layers_per_cart: posOrNull(r.layers_per_cart),
|
|
447
452
|
physical_stock: physical,
|
|
448
453
|
reserved_stock: reserved,
|
|
449
454
|
available_stock: available,
|
|
@@ -645,7 +650,28 @@ const LineInput = z.object({
|
|
|
645
650
|
article_code: z.string().max(100).nullable().optional(),
|
|
646
651
|
// Sticker nodig op deze regel (alleen vastleggen; telt nergens mee).
|
|
647
652
|
needs_sticker: z.boolean().optional(),
|
|
653
|
+
// Verpakking-snapshot: fust en ladingdrager van de gekozen verpakking, en
|
|
654
|
+
// of het de standaard van het product was of een eigen keuze.
|
|
655
|
+
vbn_package_code: z.string().max(50).nullable().optional(),
|
|
656
|
+
load_carrier_type: z.string().max(50).nullable().optional(),
|
|
657
|
+
packing_source: z.enum(["product_primary", "customer", "chosen"]).nullable().optional(),
|
|
648
658
|
});
|
|
659
|
+
/** Vaste verpakking-snapshot voor een nieuwe handmatige regel (HO). */
|
|
660
|
+
function snapshotForLine(l) {
|
|
661
|
+
const snap = choosePacking({
|
|
662
|
+
chosen: l.packing_source === "chosen" ? l : null,
|
|
663
|
+
customer: l.packing_source === "customer" ? l : null,
|
|
664
|
+
primary: l,
|
|
665
|
+
});
|
|
666
|
+
return {
|
|
667
|
+
plants_per_crate: snap.plants_per_crate,
|
|
668
|
+
crates_per_layer: snap.crates_per_layer,
|
|
669
|
+
layers_per_cart: snap.layers_per_cart,
|
|
670
|
+
vbn_package_code: (l.vbn_package_code ?? "").trim() || null,
|
|
671
|
+
load_carrier_type: (l.load_carrier_type ?? "").trim() || null,
|
|
672
|
+
packing_source: snap.packing_source,
|
|
673
|
+
};
|
|
674
|
+
}
|
|
649
675
|
const CreateManualOrderInput = z.object({
|
|
650
676
|
customerId: z.string().uuid(),
|
|
651
677
|
customerName: z.string().min(1).max(255),
|
|
@@ -830,9 +856,9 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
830
856
|
batch: "",
|
|
831
857
|
location: "",
|
|
832
858
|
unit: l.unit ?? "stuks",
|
|
833
|
-
plants_per_crate:
|
|
834
|
-
crates_per_layer:
|
|
835
|
-
layers_per_cart:
|
|
859
|
+
plants_per_crate: posOrNull(l.plants_per_crate),
|
|
860
|
+
crates_per_layer: posOrNull(l.crates_per_layer),
|
|
861
|
+
layers_per_cart: posOrNull(l.layers_per_cart),
|
|
836
862
|
sale_price: l.unit_price ?? null,
|
|
837
863
|
trade_item_key: tradeItemKey,
|
|
838
864
|
article_number: articleNumber,
|
|
@@ -889,9 +915,7 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
889
915
|
unit: l.unit ?? "stuks",
|
|
890
916
|
// Gekozen belading vastleggen op de regel zelf, zodat de karindeling
|
|
891
917
|
// de handmatige keuze gebruikt i.p.v. de standaard van het product.
|
|
892
|
-
|
|
893
|
-
crates_per_layer: l.crates_per_layer ?? null,
|
|
894
|
-
layers_per_cart: l.layers_per_cart ?? null,
|
|
918
|
+
...snapshotForLine(l),
|
|
895
919
|
unit_price: l.unit_price ?? undefined,
|
|
896
920
|
needs_sticker: l.needs_sticker === true,
|
|
897
921
|
};
|
|
@@ -1122,7 +1146,7 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1122
1146
|
}
|
|
1123
1147
|
const { data: items, error: iErr } = await context.supabase
|
|
1124
1148
|
.from("order_items")
|
|
1125
|
-
.select("id, product_id, product_name, quantity, unit, needs_sticker, products(plants_per_crate)")
|
|
1149
|
+
.select("id, product_id, product_name, quantity, unit, needs_sticker, plants_per_crate, products(plants_per_crate)")
|
|
1126
1150
|
.eq("order_id", data.orderId)
|
|
1127
1151
|
.is("quarantined_at", null)
|
|
1128
1152
|
.order("id");
|
|
@@ -1198,7 +1222,9 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1198
1222
|
context.supabase.from("floriday_trade_items_cache").select("floriday_id, data").in("floriday_id", ids),
|
|
1199
1223
|
]);
|
|
1200
1224
|
for (const p of prodRes.data ?? []) {
|
|
1201
|
-
const ppc =
|
|
1225
|
+
const ppc = posOrNull(p.plants_per_crate);
|
|
1226
|
+
if (ppc == null)
|
|
1227
|
+
continue;
|
|
1202
1228
|
ppcById.set(p.id, ppc);
|
|
1203
1229
|
const fid = p.custom_fields?.floriday_id;
|
|
1204
1230
|
if (fid && !ppcById.has(fid))
|
|
@@ -1211,16 +1237,16 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1211
1237
|
? (d.data.packingConfigurations.find((c) => c?.isPrimary) ??
|
|
1212
1238
|
d.data.packingConfigurations[0])
|
|
1213
1239
|
: null;
|
|
1214
|
-
const ppc =
|
|
1215
|
-
if (ppc
|
|
1240
|
+
const ppc = posOrNull(cfg?.unitsPerPackage ?? cfg?.piecesPerPackage);
|
|
1241
|
+
if (ppc != null)
|
|
1216
1242
|
ppcById.set(d.id, ppc);
|
|
1217
1243
|
}
|
|
1218
1244
|
for (const t of tradeRes.data ?? []) {
|
|
1219
1245
|
if (ppcById.has(t.floriday_id))
|
|
1220
1246
|
continue;
|
|
1221
1247
|
const cfg = t.data?.packingConfiguration;
|
|
1222
|
-
const ppc =
|
|
1223
|
-
if (ppc
|
|
1248
|
+
const ppc = posOrNull(cfg?.piecesPerPackage ?? cfg?.unitsPerPackage);
|
|
1249
|
+
if (ppc != null)
|
|
1224
1250
|
ppcById.set(t.floriday_id, ppc);
|
|
1225
1251
|
}
|
|
1226
1252
|
}
|
|
@@ -1228,10 +1254,10 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1228
1254
|
const members = (memberMap.get(groupId) ?? []).slice().sort((a, b) => a.sort_order - b.sort_order);
|
|
1229
1255
|
for (const m of members) {
|
|
1230
1256
|
const p = ppcById.get(m.trade_item_id);
|
|
1231
|
-
if (p
|
|
1257
|
+
if (p != null)
|
|
1232
1258
|
return p;
|
|
1233
1259
|
}
|
|
1234
|
-
return
|
|
1260
|
+
return null;
|
|
1235
1261
|
};
|
|
1236
1262
|
// Reeds geleverde/geplande aantallen per order-item — nodig zodat het
|
|
1237
1263
|
// bewerkscherm niet onder deze ondergrens kan gaan.
|
|
@@ -1262,17 +1288,18 @@ export const getLocalOrderForEdit = createServerFn({ method: "POST" })
|
|
|
1262
1288
|
planLockedAt: order.plan_locked_at ?? null,
|
|
1263
1289
|
canEditProducts: !order.plan_locked_at,
|
|
1264
1290
|
items: rows.map((it) => {
|
|
1265
|
-
|
|
1266
|
-
|
|
1291
|
+
// Eerst de vastgelegde verpakking van de regel zelf; onbekend = null.
|
|
1292
|
+
let ppc = posOrNull(it.plants_per_crate) ?? posOrNull(it.products?.plants_per_crate);
|
|
1293
|
+
if (ppc == null && it.product_id && groupIdSet.has(it.product_id)) {
|
|
1267
1294
|
ppc = groupPpc(it.product_id);
|
|
1268
1295
|
}
|
|
1269
|
-
else if (ppc
|
|
1296
|
+
else if (ppc == null && !it.product_id && GROUP_PREFIX.test(it.product_name ?? "")) {
|
|
1270
1297
|
const key = it.product_name.replace(GROUP_PREFIX, "").trim().toLowerCase();
|
|
1271
1298
|
const gid = groupIdByName.get(key);
|
|
1272
1299
|
if (gid)
|
|
1273
1300
|
ppc = groupPpc(gid);
|
|
1274
1301
|
}
|
|
1275
|
-
else if (ppc
|
|
1302
|
+
else if (ppc == null && it.product_id && ppcById.has(it.product_id)) {
|
|
1276
1303
|
ppc = ppcById.get(it.product_id);
|
|
1277
1304
|
}
|
|
1278
1305
|
const shipped = shippedByItem.get(it.id) ?? 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floriday-mirror.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-mirror.functions.ts"],"names":[],"mappings":"
|
|
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;AAm3CD,wBAAsB,4BAA4B,CAAC,KAAK,SAAgB,yBAEvE;AAED,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;yBAG0C,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { diffBuyerChanges } from "./floriday-change-diff.js";
|
|
2
2
|
import { MISSING_LINE_KEY_NOTICE, splitByLineKey } from "./floriday-line-key.js";
|
|
3
3
|
import { keepOrSetCustomer, promoteCustomers } from "./floriday-promote-customer.js";
|
|
4
|
+
import { fillOnlyEmpty, snapshotFromFloridayOrder } from "./packing-snapshot.js";
|
|
4
5
|
// Spiegelt Floriday-verkooporders (FO's) uit `floriday_salesorders_cache`
|
|
5
6
|
// naar de lokale `orders`-tabel, zodat ze via `resolveBufferForOrderInternal`
|
|
6
7
|
// in dezelfde buffer terechtkomen als lokale orders en gedeelde karren
|
|
@@ -413,42 +414,22 @@ async function mirrorUnlocked(limit) {
|
|
|
413
414
|
const numberOfPieces = Number(d?.numberOfPieces ?? 0);
|
|
414
415
|
const tradeItemId = String(d?.tradeItemId ?? "");
|
|
415
416
|
const tiCache = tiByFoId.get(tradeItemId) ?? {};
|
|
416
|
-
|
|
417
|
-
//
|
|
418
|
-
//
|
|
419
|
-
//
|
|
420
|
-
//
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
const
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
const p = pos(cfg.piecesPerPackage);
|
|
427
|
-
const l = pos(cfg.packagesPerLayer);
|
|
428
|
-
const c = pos(cfg.layersPerLoadCarrier);
|
|
429
|
-
if (p == null || l == null || c == null)
|
|
430
|
-
return null;
|
|
431
|
-
return { cfg, piecesPerPackage: p, packagesPerLayer: l, layersPerLoadCarrier: c };
|
|
432
|
-
};
|
|
433
|
-
const orderPacking = wholePacking(d?.packingConfiguration);
|
|
434
|
-
const cachePacking = orderPacking ? null : wholePacking(packingCache);
|
|
435
|
-
const chosenPacking = orderPacking ?? cachePacking;
|
|
436
|
-
const packingSource = orderPacking ? "order" : cachePacking ? "trade-item" : null;
|
|
437
|
-
const piecesPerPackage = chosenPacking?.piecesPerPackage ?? null;
|
|
438
|
-
const packagesPerLayer = chosenPacking?.packagesPerLayer ?? null;
|
|
439
|
-
const layersPerLoadCarrier = chosenPacking?.layersPerLoadCarrier ?? null;
|
|
417
|
+
// Verpakking-snapshot (1.0.105): alleen de packingConfiguration van déze
|
|
418
|
+
// sales order. Geen terugval op de artikelkopie of het product: die kopie
|
|
419
|
+
// kon door andere processen overschreven zijn (1/10/4). Bij klokorders
|
|
420
|
+
// zijn fusten per laag en lagen 0 → leeg; de Logistieke Engine vult aan.
|
|
421
|
+
// Ontbrekend blijft leeg, nooit 1.
|
|
422
|
+
const snapshot = snapshotFromFloridayOrder(d?.packingConfiguration);
|
|
423
|
+
const piecesPerPackage = snapshot.plants_per_crate;
|
|
424
|
+
const packagesPerLayer = snapshot.crates_per_layer;
|
|
425
|
+
const layersPerLoadCarrier = snapshot.layers_per_cart;
|
|
426
|
+
const packingSource = snapshot.packing_source ? "order" : null;
|
|
440
427
|
const productRow = productByTradeItemId.get(tradeItemId);
|
|
441
428
|
const productName = productNameForStorage(productRow?.product, tiCache?.name, tiCache?.tradeItemName, d?.tradeItemName, productRow?.article_number, "Floriday-artikel");
|
|
442
429
|
const productId = productRow?.id ?? null;
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
// verschillende bronnen worden niet door elkaar gehusseld.
|
|
447
|
-
const belading = completeSource(piecesPerPackage, packagesPerLayer, layersPerLoadCarrier) ??
|
|
448
|
-
completeSource(productRow?.plants_per_crate, productRow?.crates_per_layer, productRow?.layers_per_cart);
|
|
449
|
-
const plants_per_crate = belading?.plants_per_crate ?? null;
|
|
450
|
-
const crates_per_layer = belading?.crates_per_layer ?? null;
|
|
451
|
-
const layers_per_cart = belading?.layers_per_cart ?? null;
|
|
430
|
+
const plants_per_crate = piecesPerPackage;
|
|
431
|
+
const crates_per_layer = packagesPerLayer;
|
|
432
|
+
const layers_per_cart = layersPerLoadCarrier;
|
|
452
433
|
const totalPrice = Number(d?.calculatedFields?.orderAmount?.value ?? 0);
|
|
453
434
|
const ff = fulfillmentStates.get(foId);
|
|
454
435
|
const fullyFulfilled = ff
|
|
@@ -464,7 +445,7 @@ async function mirrorUnlocked(limit) {
|
|
|
464
445
|
// belading. Is geen enkele bron compleet, dan geldt de gewone
|
|
465
446
|
// bronvolgorde (order → trade item) voor alleen deze codes; er worden
|
|
466
447
|
// nooit beladingsgetallen uit verschillende bronnen gemengd.
|
|
467
|
-
const codeCfg =
|
|
448
|
+
const codeCfg = d?.packingConfiguration ?? null;
|
|
468
449
|
const packing = {
|
|
469
450
|
pieces_per_package: piecesPerPackage,
|
|
470
451
|
packages_per_layer: packagesPerLayer,
|
|
@@ -500,6 +481,7 @@ async function mirrorUnlocked(limit) {
|
|
|
500
481
|
ff,
|
|
501
482
|
fullyFulfilled,
|
|
502
483
|
packing,
|
|
484
|
+
snapshot,
|
|
503
485
|
};
|
|
504
486
|
}
|
|
505
487
|
const allLines = rows.map(buildLine);
|
|
@@ -1150,7 +1132,7 @@ async function mirrorUnlocked(limit) {
|
|
|
1150
1132
|
const existingLineByKey = new Map();
|
|
1151
1133
|
{
|
|
1152
1134
|
const { data: itemRows, error: lockErr } = await supabaseAdmin.from("order_items")
|
|
1153
|
-
.select("source_line_key, product_id, product_name, quantity, unit, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, packing_locked_at")
|
|
1135
|
+
.select("source_line_key, product_id, product_name, quantity, unit, unit_price, plants_per_crate, crates_per_layer, layers_per_cart, vbn_package_code, load_carrier_type, packing_source, packing_locked_at")
|
|
1154
1136
|
.eq("order_id", orderId);
|
|
1155
1137
|
if (lockErr)
|
|
1156
1138
|
throw new Error(`bestaande orderregels lezen: ${lockErr.message}`);
|
|
@@ -1168,8 +1150,28 @@ async function mirrorUnlocked(limit) {
|
|
|
1168
1150
|
// nooit meer wissen-en-opnieuw-toevoegen: dat veroorzaakte duplicaten
|
|
1169
1151
|
// zodra de verwijdering op een timeout stuk liep.
|
|
1170
1152
|
// Alleen regels met een geldige Floriday-salesOrderId (uuid) als sleutel.
|
|
1153
|
+
//
|
|
1154
|
+
// Verpakking-snapshot: een nieuwe regel krijgt de verpakking van de
|
|
1155
|
+
// sales order; een bestaande regel houdt zijn verpakking. Alleen een
|
|
1156
|
+
// leeg veld wordt aangevuld met een echte waarde (bijv. klokorder
|
|
1157
|
+
// waarvan de Engine/Floriday later lagen meldt). Nooit overschrijven.
|
|
1171
1158
|
const lineRows = splitByLineKey(group).valid.map((l) => {
|
|
1172
1159
|
const locked = lockedByKey.get(l.foId);
|
|
1160
|
+
const prev = existingLineByKey.get(l.foId);
|
|
1161
|
+
// Regels van vóór 1.0.105 (geen packing_source) blijven helemaal
|
|
1162
|
+
// ongemoeid: bestaande regels worden niet achteraf aangevuld.
|
|
1163
|
+
const snap = !prev
|
|
1164
|
+
? l.snapshot
|
|
1165
|
+
: prev.packing_source === "floriday_order"
|
|
1166
|
+
? fillOnlyEmpty(prev, l.snapshot)
|
|
1167
|
+
: {
|
|
1168
|
+
plants_per_crate: pos(prev.plants_per_crate),
|
|
1169
|
+
crates_per_layer: pos(prev.crates_per_layer),
|
|
1170
|
+
layers_per_cart: pos(prev.layers_per_cart),
|
|
1171
|
+
vbn_package_code: prev.vbn_package_code ?? null,
|
|
1172
|
+
load_carrier_type: prev.load_carrier_type ?? null,
|
|
1173
|
+
packing_source: prev.packing_source ?? null,
|
|
1174
|
+
};
|
|
1173
1175
|
return {
|
|
1174
1176
|
order_id: orderId,
|
|
1175
1177
|
source_line_key: l.foId,
|
|
@@ -1177,17 +1179,19 @@ async function mirrorUnlocked(limit) {
|
|
|
1177
1179
|
// product op de regel laten staan, nooit overschrijven met "geen
|
|
1178
1180
|
// product" (anders schrijft elke ronde opnieuw en plant de Engine
|
|
1179
1181
|
// telkens opnieuw in).
|
|
1180
|
-
product_id: l.productId ??
|
|
1182
|
+
product_id: l.productId ?? prev?.product_id ?? null,
|
|
1181
1183
|
product_name: l.productName,
|
|
1182
1184
|
quantity: Math.max(0, l.numberOfPieces),
|
|
1183
1185
|
unit: "stuks",
|
|
1184
1186
|
unit_price: l.unitPrice,
|
|
1185
1187
|
locked: Boolean(locked),
|
|
1186
|
-
// Vastgezet? Dan telt de handmatige waarde
|
|
1187
|
-
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
|
|
1188
|
+
// Vastgezet? Dan telt de handmatige waarde.
|
|
1189
|
+
plants_per_crate: locked ? pos(locked.plants_per_crate) : snap.plants_per_crate,
|
|
1190
|
+
crates_per_layer: locked ? pos(locked.crates_per_layer) : snap.crates_per_layer,
|
|
1191
|
+
layers_per_cart: locked ? pos(locked.layers_per_cart) : snap.layers_per_cart,
|
|
1192
|
+
vbn_package_code: snap.vbn_package_code,
|
|
1193
|
+
load_carrier_type: snap.load_carrier_type,
|
|
1194
|
+
packing_source: snap.packing_source,
|
|
1191
1195
|
};
|
|
1192
1196
|
});
|
|
1193
1197
|
const LINE_CHUNK = 100;
|
|
@@ -1208,6 +1212,12 @@ async function mirrorUnlocked(limit) {
|
|
|
1208
1212
|
return true;
|
|
1209
1213
|
if (Number(prev.unit_price ?? 0) !== Number(r.unit_price ?? 0))
|
|
1210
1214
|
return true;
|
|
1215
|
+
if (String(prev.vbn_package_code ?? "") !== String(r.vbn_package_code ?? ""))
|
|
1216
|
+
return true;
|
|
1217
|
+
if (String(prev.load_carrier_type ?? "") !== String(r.load_carrier_type ?? ""))
|
|
1218
|
+
return true;
|
|
1219
|
+
if (String(prev.packing_source ?? "") !== String(r.packing_source ?? ""))
|
|
1220
|
+
return true;
|
|
1211
1221
|
if (r.locked)
|
|
1212
1222
|
return false;
|
|
1213
1223
|
return (pos(prev.plants_per_crate) !== pos(r.plants_per_crate) ||
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.105";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"packing-snapshot.check.d.ts","sourceRoot":"","sources":["../../src/lib/packing-snapshot.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
// Losse controle: bun src/lib/packing-snapshot.check.ts
|
|
2
|
+
import { choosePacking, fillOnlyEmpty, plantsFromCrates, posOrNull, snapshotFromFloridayOrder } from "./packing-snapshot.js";
|
|
3
|
+
let fails = 0;
|
|
4
|
+
const ok = (c, m) => { if (!c) {
|
|
5
|
+
fails++;
|
|
6
|
+
console.error("FOUT:", m);
|
|
7
|
+
}
|
|
8
|
+
else
|
|
9
|
+
console.log("ok:", m); };
|
|
10
|
+
// FO – directe verkoop
|
|
11
|
+
const direct = snapshotFromFloridayOrder({
|
|
12
|
+
piecesPerPackage: 12, packagesPerLayer: 8, layersPerLoadCarrier: 5,
|
|
13
|
+
package: { vbnPackageCode: 575 }, loadCarrier: "DANISH_TROLLEY",
|
|
14
|
+
});
|
|
15
|
+
ok(direct.plants_per_crate === 12 && direct.crates_per_layer === 8 && direct.layers_per_cart === 5, "FO direct: verpakking uit de order");
|
|
16
|
+
ok(direct.vbn_package_code === "575" && direct.load_carrier_type === "DANISH_TROLLEY", "FO direct: fust en ladingdrager vastgelegd");
|
|
17
|
+
ok(direct.packing_source === "floriday_order", "FO direct: bron = Floriday-order");
|
|
18
|
+
// Latere cachewijziging (bijv. 1/10/4) verandert een bestaande regel niet.
|
|
19
|
+
const afterCache = fillOnlyEmpty(direct, snapshotFromFloridayOrder({ piecesPerPackage: 1, packagesPerLayer: 10, layersPerLoadCarrier: 4 }));
|
|
20
|
+
ok(afterCache.plants_per_crate === 12 && afterCache.crates_per_layer === 8 && afterCache.layers_per_cart === 5, "FO: bestaande regel wordt niet overschreven");
|
|
21
|
+
// FO – klok / klok-voorverkoop
|
|
22
|
+
const clock = snapshotFromFloridayOrder({ piecesPerPackage: 10, packagesPerLayer: 0, layersPerLoadCarrier: 0 });
|
|
23
|
+
ok(clock.plants_per_crate === 10, "FO klok: stuks per fust bewaard");
|
|
24
|
+
ok(clock.crates_per_layer === null && clock.layers_per_cart === null, "FO klok: 0 wordt leeg, nooit 0 of 1");
|
|
25
|
+
const clockLater = fillOnlyEmpty(clock, snapshotFromFloridayOrder({ piecesPerPackage: 99, packagesPerLayer: 6, layersPerLoadCarrier: 3 }));
|
|
26
|
+
ok(clockLater.crates_per_layer === 6 && clockLater.layers_per_cart === 3, "FO klok: latere echte waarde vult alleen lege velden");
|
|
27
|
+
ok(clockLater.plants_per_crate === 10, "FO klok: gevuld veld blijft staan");
|
|
28
|
+
ok(snapshotFromFloridayOrder(null).plants_per_crate === null, "FO zonder verpakking: leeg");
|
|
29
|
+
// HO
|
|
30
|
+
const primary = { plants_per_crate: 10, crates_per_layer: 6, layers_per_cart: 4 };
|
|
31
|
+
const customer = { plants_per_crate: 8, crates_per_layer: 6, layers_per_cart: 4 };
|
|
32
|
+
ok(choosePacking({ primary }).packing_source === "product_primary", "HO: standaard primaire verpakking");
|
|
33
|
+
ok(choosePacking({ primary, customer }).plants_per_crate === 8, "HO: klantspecifiek gaat voor primair");
|
|
34
|
+
ok(choosePacking({ primary, customer, chosen: { plants_per_crate: 20, crates_per_layer: 3, layers_per_cart: 2 } }).packing_source === "chosen", "HO: eigen keuze gaat voor alles");
|
|
35
|
+
const none = choosePacking({ primary: { plants_per_crate: null, crates_per_layer: 0 } });
|
|
36
|
+
ok(none.plants_per_crate === null && none.packing_source === null, "HO: ontbrekende verpakking blijft leeg");
|
|
37
|
+
// MO / AO
|
|
38
|
+
ok(choosePacking({ primary }).plants_per_crate === 10, "MO/AO: zelfde regel als HO");
|
|
39
|
+
const conv = plantsFromCrates(3, 12);
|
|
40
|
+
ok(conv.ok && conv.plants === 36, "AO: 3 fust × 12 = 36 planten");
|
|
41
|
+
ok(!plantsFromCrates(3, null).ok, "AO: fust zonder stuks per fust wordt geweigerd");
|
|
42
|
+
// Nergens terugval naar 1
|
|
43
|
+
ok(posOrNull(undefined) === null && posOrNull(0) === null && posOrNull("") === null, "geen terugval naar 1");
|
|
44
|
+
if (fails)
|
|
45
|
+
process.exit(1);
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
export type PackingSource = "floriday_order" | "product_primary" | "customer" | "chosen";
|
|
2
|
+
export interface PackingSnapshot {
|
|
3
|
+
plants_per_crate: number | null;
|
|
4
|
+
crates_per_layer: number | null;
|
|
5
|
+
layers_per_cart: number | null;
|
|
6
|
+
vbn_package_code: string | null;
|
|
7
|
+
load_carrier_type: string | null;
|
|
8
|
+
packing_source: PackingSource | null;
|
|
9
|
+
}
|
|
10
|
+
export declare const EMPTY_PACKING: PackingSnapshot;
|
|
11
|
+
/** Positief geheel getal of null. 0, leeg of onzin wordt null — nooit 1. */
|
|
12
|
+
export declare function posOrNull(v: unknown): number | null;
|
|
13
|
+
/**
|
|
14
|
+
* FO: alleen de packingConfiguration van de Floriday-sales order zelf.
|
|
15
|
+
* Bij klokorders zijn packagesPerLayer/layersPerLoadCarrier 0 → leeg; de
|
|
16
|
+
* Logistieke Engine vult die aan. Geen terugval op artikel of product.
|
|
17
|
+
*/
|
|
18
|
+
export declare function snapshotFromFloridayOrder(cfg: any): PackingSnapshot;
|
|
19
|
+
/**
|
|
20
|
+
* Bestaande regel bijwerken: een gevuld veld wordt nooit overschreven; een
|
|
21
|
+
* leeg veld mag alleen worden aangevuld met een echte waarde (> 0 of tekst).
|
|
22
|
+
*/
|
|
23
|
+
export declare function fillOnlyEmpty(existing: Partial<PackingSnapshot>, incoming: PackingSnapshot): PackingSnapshot;
|
|
24
|
+
export interface PackingCandidate {
|
|
25
|
+
plants_per_crate?: unknown;
|
|
26
|
+
crates_per_layer?: unknown;
|
|
27
|
+
layers_per_cart?: unknown;
|
|
28
|
+
vbn_package_code?: unknown;
|
|
29
|
+
load_carrier_type?: unknown;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* HO/MO/AO: eigen keuze → klantspecifiek → primaire verpakking van het
|
|
33
|
+
* product. Niets bekend → leeg snapshot (de aanroeper meldt dat).
|
|
34
|
+
*/
|
|
35
|
+
export declare function choosePacking(opts: {
|
|
36
|
+
chosen?: PackingCandidate | null;
|
|
37
|
+
customer?: PackingCandidate | null;
|
|
38
|
+
primary?: PackingCandidate | null;
|
|
39
|
+
}): PackingSnapshot;
|
|
40
|
+
/**
|
|
41
|
+
* Hoeveelheid in fust → planten. Zonder stuks per fust: fout, nooit raden.
|
|
42
|
+
*/
|
|
43
|
+
export declare function plantsFromCrates(crates: number, plantsPerCrate: number | null): {
|
|
44
|
+
ok: true;
|
|
45
|
+
plants: number;
|
|
46
|
+
} | {
|
|
47
|
+
ok: false;
|
|
48
|
+
reason: string;
|
|
49
|
+
};
|
|
50
|
+
//# sourceMappingURL=packing-snapshot.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"packing-snapshot.d.ts","sourceRoot":"","sources":["../../src/lib/packing-snapshot.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEzF,MAAM,WAAW,eAAe;IAC9B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,aAAa,GAAG,IAAI,CAAC;CACtC;AAED,eAAO,MAAM,aAAa,EAAE,eAO3B,CAAC;AAEF,4EAA4E;AAC5E,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAInD;AAQD;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe,CAiBnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,eAAe,GAAG,eAAe,CAW5G;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAmBD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,MAAM,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACnC,GAAG,eAAe,CAKlB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAU9D"}
|