@flowselections/floriday-verkoop-module 1.0.103 → 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/AnalyticsCards.d.ts +1 -1
- package/dist-lib/components/verkoop/AnalyticsCards.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CartAssignmentWizard.d.ts +1 -1
- package/dist-lib/components/verkoop/CartAssignmentWizard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CartLayersDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/CartLayersDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/ConfirmDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/ConfirmDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +10 -1
- package/dist-lib/components/verkoop/DiagnoseConnectionDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/DiagnoseConnectionDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EngineBufferCard.d.ts +1 -1
- package/dist-lib/components/verkoop/EngineBufferCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts +2 -2
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/InvoiceTimingSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/InvoiceTimingSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderAfleverbrievenCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderAfleverbrievenCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderControlStatusCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderPickupMomentPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/PlanCoverageBadge.d.ts +1 -1
- package/dist-lib/components/verkoop/PlanCoverageBadge.d.ts.map +1 -1
- package/dist-lib/components/verkoop/ProductDimensionsSettings.d.ts +1 -1
- package/dist-lib/components/verkoop/ProductDimensionsSettings.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +6 -6
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilterPanel.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilterPanel.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +2 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.d.ts +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/StockConsumptionAlertsBanner.d.ts +1 -1
- package/dist-lib/components/verkoop/StockConsumptionAlertsBanner.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/WeekCalendar.d.ts +1 -1
- package/dist-lib/components/verkoop/WeekCalendar.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/client.js +1 -1
- package/dist-lib/integrations/supabase/client.server.js +1 -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 +101 -161
- package/dist-lib/lib/floriday-promote-customer.check.d.ts +2 -0
- package/dist-lib/lib/floriday-promote-customer.check.d.ts.map +1 -0
- package/dist-lib/lib/floriday-promote-customer.check.js +28 -0
- package/dist-lib/lib/floriday-promote-customer.d.ts +12 -0
- package/dist-lib/lib/floriday-promote-customer.d.ts.map +1 -0
- package/dist-lib/lib/floriday-promote-customer.js +43 -0
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-cart-count.server.d.ts +8 -0
- package/dist-lib/lib/order-cart-count.server.d.ts.map +1 -0
- package/dist-lib/lib/order-cart-count.server.js +69 -0
- 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/dist-lib/lib/tradeitems.functions.d.ts +1117 -12
- package/dist-lib/lib/tradeitems.functions.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.d.ts +2 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts +2 -2
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/package.json +1 -1
- package/schema/verkoop.sql +86 -14
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.d.ts +0 -9
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.d.ts.map +0 -1
- package/dist-lib/components/floriday/FlorydaySyncHealthBanner.js +0 -26
- package/dist-lib/components/karindeling/AfmetingenTab.d.ts +0 -6
- package/dist-lib/components/karindeling/AfmetingenTab.d.ts.map +0 -1
- package/dist-lib/components/karindeling/AfmetingenTab.js +0 -128
- package/dist-lib/components/karindeling/KarindelingPage.d.ts +0 -2
- package/dist-lib/components/karindeling/KarindelingPage.d.ts.map +0 -1
- package/dist-lib/components/karindeling/KarindelingPage.js +0 -102
- package/dist-lib/components/ui/dropdown-menu.d.ts +0 -9
- package/dist-lib/components/ui/dropdown-menu.d.ts.map +0 -1
- package/dist-lib/components/ui/dropdown-menu.js +0 -14
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.d.ts +0 -4
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.d.ts.map +0 -1
- package/dist-lib/components/verkoop/AutoFulfillmentStatusCard.js +0 -95
- package/dist-lib/components/verkoop/CreateOrderDialog.d.ts +0 -5
- package/dist-lib/components/verkoop/CreateOrderDialog.d.ts.map +0 -1
- package/dist-lib/components/verkoop/CreateOrderDialog.js +0 -33
- package/dist-lib/lib/cron/mirror-floriday-orders.d.ts +0 -4
- package/dist-lib/lib/cron/mirror-floriday-orders.d.ts.map +0 -1
- package/dist-lib/lib/cron/mirror-floriday-orders.js +0 -23
- package/dist-lib/lib/cron/push-order-statuses.d.ts +0 -4
- package/dist-lib/lib/cron/push-order-statuses.d.ts.map +0 -1
- package/dist-lib/lib/cron/push-order-statuses.js +0 -23
- package/dist-lib/lib/floriday/floriday.server.d.ts +0 -14
- package/dist-lib/lib/floriday/floriday.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday/floriday.server.js +0 -92
- package/dist-lib/lib/floriday/sales-orders.functions.d.ts +0 -4736
- package/dist-lib/lib/floriday/sales-orders.functions.d.ts.map +0 -1
- package/dist-lib/lib/floriday/sales-orders.functions.js +0 -193
- package/dist-lib/lib/floriday-auto-fulfillment.functions.d.ts +0 -77581
- package/dist-lib/lib/floriday-auto-fulfillment.functions.d.ts.map +0 -1
- package/dist-lib/lib/floriday-auto-fulfillment.functions.js +0 -65
- package/dist-lib/lib/floriday-auto-fulfillment.server.d.ts +0 -21
- package/dist-lib/lib/floriday-auto-fulfillment.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday-auto-fulfillment.server.js +0 -352
- package/dist-lib/lib/floriday-status-sync.server.d.ts +0 -14
- package/dist-lib/lib/floriday-status-sync.server.d.ts.map +0 -1
- package/dist-lib/lib/floriday-status-sync.server.js +0 -130
|
@@ -1,5 +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
|
+
import { keepOrSetCustomer, promoteCustomers } from "./floriday-promote-customer.js";
|
|
4
|
+
import { fillOnlyEmpty, snapshotFromFloridayOrder } from "./packing-snapshot.js";
|
|
3
5
|
// Spiegelt Floriday-verkooporders (FO's) uit `floriday_salesorders_cache`
|
|
4
6
|
// naar de lokale `orders`-tabel, zodat ze via `resolveBufferForOrderInternal`
|
|
5
7
|
// in dezelfde buffer terechtkomen als lokale orders en gedeelde karren
|
|
@@ -64,88 +66,61 @@ function buyerOrgIdOf(row) {
|
|
|
64
66
|
return String(row?.buyer_organization_id ?? row?.data?.customerOrganizationId ?? "");
|
|
65
67
|
}
|
|
66
68
|
/**
|
|
67
|
-
*
|
|
68
|
-
*
|
|
69
|
-
*
|
|
69
|
+
* Vangnet: Floriday-orders zonder customer_id krijgen de klant die
|
|
70
|
+
* promote_floriday_customer teruggeeft. Organisatienummer: custom_fields.
|
|
71
|
+
* floriday_customer_id, anders de koper uit de Floriday-gegevens. Alleen
|
|
72
|
+
* customer_id wordt gezet, alleen als die nog leeg is.
|
|
70
73
|
*/
|
|
71
74
|
async function linkCustomersForFloridayOrders() {
|
|
72
75
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
73
|
-
const { data:
|
|
74
|
-
.from("
|
|
75
|
-
.select("id,
|
|
76
|
-
.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
for (const [k, v] of byOrg) {
|
|
85
|
-
if (v === null)
|
|
86
|
-
console.warn(`[floriday-mirror] organisatienummer ${k} hoort bij meerdere klanten; geen klant gekoppeld.`);
|
|
87
|
-
}
|
|
88
|
-
if (byOrg.size === 0)
|
|
76
|
+
const { data: loose, error: lErr } = await supabaseAdmin
|
|
77
|
+
.from("orders")
|
|
78
|
+
.select("id, floriday_sales_order_id, custom_fields")
|
|
79
|
+
.is("customer_id", null)
|
|
80
|
+
.not("floriday_sales_order_id", "is", null)
|
|
81
|
+
.limit(1000);
|
|
82
|
+
if (lErr)
|
|
83
|
+
throw new Error(lErr.message);
|
|
84
|
+
const todo = (loose ?? []);
|
|
85
|
+
if (!todo.length)
|
|
89
86
|
return 0;
|
|
87
|
+
const needCache = [
|
|
88
|
+
...new Set(todo.filter((o) => !o?.custom_fields?.floriday_customer_id).map((o) => String(o.floriday_sales_order_id))),
|
|
89
|
+
];
|
|
90
|
+
const orgBySo = new Map();
|
|
91
|
+
for (let i = 0; i < needCache.length; i += 200) {
|
|
92
|
+
const { data: cache, error: cErr } = await supabaseAdmin
|
|
93
|
+
.from("floriday_salesorders_cache")
|
|
94
|
+
.select("floriday_id, buyer_organization_id")
|
|
95
|
+
.in("floriday_id", needCache.slice(i, i + 200));
|
|
96
|
+
if (cErr)
|
|
97
|
+
throw new Error(cErr.message);
|
|
98
|
+
for (const r of cache ?? []) {
|
|
99
|
+
const org = r.buyer_organization_id;
|
|
100
|
+
if (org)
|
|
101
|
+
orgBySo.set(String(r.floriday_id), String(org));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
const orgOf = (o) => (o?.custom_fields?.floriday_customer_id ? String(o.custom_fields.floriday_customer_id) : null) ??
|
|
105
|
+
orgBySo.get(String(o.floriday_sales_order_id)) ??
|
|
106
|
+
null;
|
|
107
|
+
const promoted = await promoteCustomers(todo.map(orgOf).filter(Boolean), (org) => supabaseAdmin.rpc("promote_floriday_customer", { _org_id: org }));
|
|
90
108
|
let linked = 0;
|
|
91
|
-
for (const
|
|
109
|
+
for (const o of todo) {
|
|
110
|
+
const org = orgOf(o);
|
|
111
|
+
const custId = org ? promoted.get(org) : null;
|
|
92
112
|
if (!custId)
|
|
93
113
|
continue;
|
|
94
114
|
const { data, error } = await supabaseAdmin
|
|
95
115
|
.from("orders")
|
|
96
116
|
.update({ customer_id: custId })
|
|
117
|
+
.eq("id", o.id)
|
|
97
118
|
.is("customer_id", null)
|
|
98
|
-
.not("floriday_sales_order_id", "is", null)
|
|
99
|
-
.eq("custom_fields->>floriday_customer_id", org)
|
|
100
119
|
.select("id");
|
|
101
120
|
if (error)
|
|
102
121
|
throw new Error(error.message);
|
|
103
122
|
linked += data?.length ?? 0;
|
|
104
123
|
}
|
|
105
|
-
// Terugval: Floriday-orders zonder floriday_customer_id. Organisatienummer
|
|
106
|
-
// uit de Floriday-gegevens (buyer_organization_id) via het verkoopnummer.
|
|
107
|
-
// Alleen customer_id wordt gezet; verder wordt niets gewijzigd.
|
|
108
|
-
const { data: loose, error: lErr } = await supabaseAdmin
|
|
109
|
-
.from("orders")
|
|
110
|
-
.select("id, floriday_sales_order_id, custom_fields")
|
|
111
|
-
.is("customer_id", null)
|
|
112
|
-
.not("floriday_sales_order_id", "is", null)
|
|
113
|
-
.limit(1000);
|
|
114
|
-
if (lErr)
|
|
115
|
-
throw new Error(lErr.message);
|
|
116
|
-
const todo = (loose ?? []).filter((o) => !o?.custom_fields?.floriday_customer_id);
|
|
117
|
-
if (todo.length) {
|
|
118
|
-
const ids = [...new Set(todo.map((o) => String(o.floriday_sales_order_id)))];
|
|
119
|
-
const orgBySo = new Map();
|
|
120
|
-
for (let i = 0; i < ids.length; i += 200) {
|
|
121
|
-
const { data: cache, error: cErr2 } = await supabaseAdmin
|
|
122
|
-
.from("floriday_salesorders_cache")
|
|
123
|
-
.select("floriday_id, buyer_organization_id")
|
|
124
|
-
.in("floriday_id", ids.slice(i, i + 200));
|
|
125
|
-
if (cErr2)
|
|
126
|
-
throw new Error(cErr2.message);
|
|
127
|
-
for (const r of cache ?? []) {
|
|
128
|
-
const org = r.buyer_organization_id;
|
|
129
|
-
if (org)
|
|
130
|
-
orgBySo.set(String(r.floriday_id), String(org));
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
for (const o of todo) {
|
|
134
|
-
const org = orgBySo.get(String(o.floriday_sales_order_id));
|
|
135
|
-
const custId = org ? byOrg.get(org) : null;
|
|
136
|
-
if (!custId)
|
|
137
|
-
continue;
|
|
138
|
-
const { data, error } = await supabaseAdmin
|
|
139
|
-
.from("orders")
|
|
140
|
-
.update({ customer_id: custId })
|
|
141
|
-
.eq("id", o.id)
|
|
142
|
-
.is("customer_id", null)
|
|
143
|
-
.select("id");
|
|
144
|
-
if (error)
|
|
145
|
-
throw new Error(error.message);
|
|
146
|
-
linked += data?.length ?? 0;
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
124
|
return linked;
|
|
150
125
|
}
|
|
151
126
|
function pickString(value) {
|
|
@@ -341,63 +316,17 @@ async function mirrorUnlocked(limit) {
|
|
|
341
316
|
catch {
|
|
342
317
|
/* afhandelstatus is best-effort */
|
|
343
318
|
}
|
|
344
|
-
// Klant
|
|
319
|
+
// Klant per koper: altijd via de Klanten-module (promote_floriday_customer),
|
|
320
|
+
// één aanroep per organisatienummer per ronde. Fout → geen klant.
|
|
345
321
|
const orgIds = Array.from(new Set(rows.map((r) => buyerOrgIdOf(r)).filter(Boolean)));
|
|
346
322
|
const customerByOrgId = new Map();
|
|
347
323
|
if (orgIds.length > 0) {
|
|
348
|
-
const
|
|
349
|
-
.from("customers")
|
|
350
|
-
.select("id, company_name, commercial_name, floriday_organization_id")
|
|
351
|
-
.in("floriday_organization_id", orgIds);
|
|
352
|
-
// Alleen eenduidige koppelingen: hoort een organisatienummer bij meer
|
|
353
|
-
// dan één klant, dan koppelen we geen klant (geen giswerk).
|
|
354
|
-
const ambiguous = new Set();
|
|
355
|
-
for (const c of custRows ?? []) {
|
|
356
|
-
const key = String(c.floriday_organization_id);
|
|
357
|
-
if (customerByOrgId.has(key))
|
|
358
|
-
ambiguous.add(key);
|
|
359
|
-
customerByOrgId.set(key, {
|
|
360
|
-
id: c.id,
|
|
361
|
-
name: c.commercial_name ?? c.company_name ?? "Onbekende klant",
|
|
362
|
-
});
|
|
363
|
-
}
|
|
364
|
-
for (const key of ambiguous) {
|
|
365
|
-
console.warn(`[floriday-mirror] organisatienummer ${key} hoort bij meerdere klanten; geen klant gekoppeld.`);
|
|
366
|
-
customerByOrgId.delete(key);
|
|
367
|
-
}
|
|
368
|
-
// Floriday-only koper direct laten omzetten door de Klanten-module
|
|
369
|
-
// (promote_floriday_customer). Alleen bij geen treffer; nooit bij
|
|
370
|
-
// ambigue nummers; fail-closed: bij fout blijft customer_id leeg.
|
|
371
|
-
const toPromote = orgIds.filter((o) => !customerByOrgId.has(String(o)) && !ambiguous.has(String(o)));
|
|
372
|
-
const promotedIds = new Map();
|
|
373
|
-
for (let i = 0; i < toPromote.length; i += 12) {
|
|
374
|
-
await Promise.all(toPromote.slice(i, i + 12).map(async (org) => {
|
|
375
|
-
try {
|
|
376
|
-
const { data, error } = await supabaseAdmin.rpc("promote_floriday_customer", { _org_id: org });
|
|
377
|
-
if (error)
|
|
378
|
-
throw new Error(error.message);
|
|
379
|
-
const raw = Array.isArray(data) ? data[0] : data;
|
|
380
|
-
const id = typeof raw === "string"
|
|
381
|
-
? raw
|
|
382
|
-
: raw && typeof raw === "object"
|
|
383
|
-
? (raw.id ?? raw.customer_id ?? raw.promote_floriday_customer ?? null)
|
|
384
|
-
: null;
|
|
385
|
-
if (!id) {
|
|
386
|
-
console.warn(`[floriday-mirror] promote_floriday_customer gaf geen klant voor ${org}; geen klant gekoppeld.`);
|
|
387
|
-
return;
|
|
388
|
-
}
|
|
389
|
-
promotedIds.set(org, String(id));
|
|
390
|
-
}
|
|
391
|
-
catch (e) {
|
|
392
|
-
console.warn(`[floriday-mirror] klant omzetten mislukt voor ${org}: ${e.message}; geen klant gekoppeld.`);
|
|
393
|
-
}
|
|
394
|
-
}));
|
|
395
|
-
}
|
|
324
|
+
const promotedIds = await promoteCustomers(orgIds, (org) => supabaseAdmin.rpc("promote_floriday_customer", { _org_id: org }));
|
|
396
325
|
if (promotedIds.size > 0) {
|
|
397
326
|
const { data: promRows } = await supabaseAdmin
|
|
398
327
|
.from("customers")
|
|
399
328
|
.select("id, company_name, commercial_name")
|
|
400
|
-
.in("id", Array.from(promotedIds.values()));
|
|
329
|
+
.in("id", Array.from(new Set(promotedIds.values())));
|
|
401
330
|
const byId = new Map((promRows ?? []).map((c) => [String(c.id), c]));
|
|
402
331
|
for (const [org, id] of promotedIds) {
|
|
403
332
|
const c = byId.get(id);
|
|
@@ -485,42 +414,22 @@ async function mirrorUnlocked(limit) {
|
|
|
485
414
|
const numberOfPieces = Number(d?.numberOfPieces ?? 0);
|
|
486
415
|
const tradeItemId = String(d?.tradeItemId ?? "");
|
|
487
416
|
const tiCache = tiByFoId.get(tradeItemId) ?? {};
|
|
488
|
-
|
|
489
|
-
//
|
|
490
|
-
//
|
|
491
|
-
//
|
|
492
|
-
//
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
const
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
const p = pos(cfg.piecesPerPackage);
|
|
499
|
-
const l = pos(cfg.packagesPerLayer);
|
|
500
|
-
const c = pos(cfg.layersPerLoadCarrier);
|
|
501
|
-
if (p == null || l == null || c == null)
|
|
502
|
-
return null;
|
|
503
|
-
return { cfg, piecesPerPackage: p, packagesPerLayer: l, layersPerLoadCarrier: c };
|
|
504
|
-
};
|
|
505
|
-
const orderPacking = wholePacking(d?.packingConfiguration);
|
|
506
|
-
const cachePacking = orderPacking ? null : wholePacking(packingCache);
|
|
507
|
-
const chosenPacking = orderPacking ?? cachePacking;
|
|
508
|
-
const packingSource = orderPacking ? "order" : cachePacking ? "trade-item" : null;
|
|
509
|
-
const piecesPerPackage = chosenPacking?.piecesPerPackage ?? null;
|
|
510
|
-
const packagesPerLayer = chosenPacking?.packagesPerLayer ?? null;
|
|
511
|
-
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;
|
|
512
427
|
const productRow = productByTradeItemId.get(tradeItemId);
|
|
513
428
|
const productName = productNameForStorage(productRow?.product, tiCache?.name, tiCache?.tradeItemName, d?.tradeItemName, productRow?.article_number, "Floriday-artikel");
|
|
514
429
|
const productId = productRow?.id ?? null;
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
// verschillende bronnen worden niet door elkaar gehusseld.
|
|
519
|
-
const belading = completeSource(piecesPerPackage, packagesPerLayer, layersPerLoadCarrier) ??
|
|
520
|
-
completeSource(productRow?.plants_per_crate, productRow?.crates_per_layer, productRow?.layers_per_cart);
|
|
521
|
-
const plants_per_crate = belading?.plants_per_crate ?? null;
|
|
522
|
-
const crates_per_layer = belading?.crates_per_layer ?? null;
|
|
523
|
-
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;
|
|
524
433
|
const totalPrice = Number(d?.calculatedFields?.orderAmount?.value ?? 0);
|
|
525
434
|
const ff = fulfillmentStates.get(foId);
|
|
526
435
|
const fullyFulfilled = ff
|
|
@@ -536,7 +445,7 @@ async function mirrorUnlocked(limit) {
|
|
|
536
445
|
// belading. Is geen enkele bron compleet, dan geldt de gewone
|
|
537
446
|
// bronvolgorde (order → trade item) voor alleen deze codes; er worden
|
|
538
447
|
// nooit beladingsgetallen uit verschillende bronnen gemengd.
|
|
539
|
-
const codeCfg =
|
|
448
|
+
const codeCfg = d?.packingConfiguration ?? null;
|
|
540
449
|
const packing = {
|
|
541
450
|
pieces_per_package: piecesPerPackage,
|
|
542
451
|
packages_per_layer: packagesPerLayer,
|
|
@@ -572,6 +481,7 @@ async function mirrorUnlocked(limit) {
|
|
|
572
481
|
ff,
|
|
573
482
|
fullyFulfilled,
|
|
574
483
|
packing,
|
|
484
|
+
snapshot,
|
|
575
485
|
};
|
|
576
486
|
}
|
|
577
487
|
const allLines = rows.map(buildLine);
|
|
@@ -1113,10 +1023,12 @@ async function mirrorUnlocked(limit) {
|
|
|
1113
1023
|
// Verschillende kopers op één order: nooit gokken welke klant.
|
|
1114
1024
|
...(lvl.multiBuyer
|
|
1115
1025
|
? {}
|
|
1116
|
-
:
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1026
|
+
: target?.customer_id
|
|
1027
|
+
? {} // bestaande klant nooit overschrijven
|
|
1028
|
+
: {
|
|
1029
|
+
customer_id: keepOrSetCustomer(null, primary.custId),
|
|
1030
|
+
customer_name: primary.customerName,
|
|
1031
|
+
}),
|
|
1120
1032
|
delivery_date: lvl.deliveryDate,
|
|
1121
1033
|
order_date: lvl.orderDate ?? primary.orderDateIso,
|
|
1122
1034
|
...statusPatch,
|
|
@@ -1220,7 +1132,7 @@ async function mirrorUnlocked(limit) {
|
|
|
1220
1132
|
const existingLineByKey = new Map();
|
|
1221
1133
|
{
|
|
1222
1134
|
const { data: itemRows, error: lockErr } = await supabaseAdmin.from("order_items")
|
|
1223
|
-
.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")
|
|
1224
1136
|
.eq("order_id", orderId);
|
|
1225
1137
|
if (lockErr)
|
|
1226
1138
|
throw new Error(`bestaande orderregels lezen: ${lockErr.message}`);
|
|
@@ -1238,8 +1150,28 @@ async function mirrorUnlocked(limit) {
|
|
|
1238
1150
|
// nooit meer wissen-en-opnieuw-toevoegen: dat veroorzaakte duplicaten
|
|
1239
1151
|
// zodra de verwijdering op een timeout stuk liep.
|
|
1240
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.
|
|
1241
1158
|
const lineRows = splitByLineKey(group).valid.map((l) => {
|
|
1242
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
|
+
};
|
|
1243
1175
|
return {
|
|
1244
1176
|
order_id: orderId,
|
|
1245
1177
|
source_line_key: l.foId,
|
|
@@ -1247,17 +1179,19 @@ async function mirrorUnlocked(limit) {
|
|
|
1247
1179
|
// product op de regel laten staan, nooit overschrijven met "geen
|
|
1248
1180
|
// product" (anders schrijft elke ronde opnieuw en plant de Engine
|
|
1249
1181
|
// telkens opnieuw in).
|
|
1250
|
-
product_id: l.productId ??
|
|
1182
|
+
product_id: l.productId ?? prev?.product_id ?? null,
|
|
1251
1183
|
product_name: l.productName,
|
|
1252
1184
|
quantity: Math.max(0, l.numberOfPieces),
|
|
1253
1185
|
unit: "stuks",
|
|
1254
1186
|
unit_price: l.unitPrice,
|
|
1255
1187
|
locked: Boolean(locked),
|
|
1256
|
-
// Vastgezet? Dan telt de handmatige waarde
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
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,
|
|
1261
1195
|
};
|
|
1262
1196
|
});
|
|
1263
1197
|
const LINE_CHUNK = 100;
|
|
@@ -1278,6 +1212,12 @@ async function mirrorUnlocked(limit) {
|
|
|
1278
1212
|
return true;
|
|
1279
1213
|
if (Number(prev.unit_price ?? 0) !== Number(r.unit_price ?? 0))
|
|
1280
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;
|
|
1281
1221
|
if (r.locked)
|
|
1282
1222
|
return false;
|
|
1283
1223
|
return (pos(prev.plants_per_crate) !== pos(r.plants_per_crate) ||
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"floriday-promote-customer.check.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-promote-customer.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// Losse controle: bun src/lib/floriday-promote-customer.check.ts
|
|
2
|
+
import { extractCustomerId, keepOrSetCustomer, promoteCustomers } from "./floriday-promote-customer.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
|
+
const calls = [];
|
|
11
|
+
const res = await promoteCustomers(["A", "A", "B", "C", ""], async (org) => {
|
|
12
|
+
calls.push(org);
|
|
13
|
+
if (org === "A")
|
|
14
|
+
return { data: "klant-a", error: null };
|
|
15
|
+
if (org === "B")
|
|
16
|
+
return { data: null, error: { message: "organisatie onbekend" } };
|
|
17
|
+
return { data: null, error: null };
|
|
18
|
+
}, () => { });
|
|
19
|
+
ok(calls.length === 3, "één aanroep per uniek nummer, leeg overgeslagen");
|
|
20
|
+
ok(res.get("A") === "klant-a", "teruggegeven id wordt gebruikt");
|
|
21
|
+
ok(!res.has("B"), "fout → geen klant");
|
|
22
|
+
ok(!res.has("C"), "leeg antwoord → geen klant");
|
|
23
|
+
ok(extractCustomerId([{ id: "x" }]) === "x", "rij-antwoord met id");
|
|
24
|
+
ok(keepOrSetCustomer("bestaand", "nieuw") === "bestaand", "bestaande klant blijft");
|
|
25
|
+
ok(keepOrSetCustomer(null, "nieuw") === "nieuw", "lege klant wordt gevuld");
|
|
26
|
+
ok(keepOrSetCustomer(null, null) === null, "niets gevonden → leeg");
|
|
27
|
+
if (fails)
|
|
28
|
+
process.exit(1);
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export type PromoteRpc = (orgId: string) => Promise<{
|
|
2
|
+
data: unknown;
|
|
3
|
+
error: {
|
|
4
|
+
message: string;
|
|
5
|
+
} | null;
|
|
6
|
+
}>;
|
|
7
|
+
export declare function extractCustomerId(data: unknown): string | null;
|
|
8
|
+
/** Roept de functie één keer per uniek nummer aan, max 12 tegelijk. */
|
|
9
|
+
export declare function promoteCustomers(orgIds: Iterable<string>, rpc: PromoteRpc, warn?: (msg: string) => void): Promise<Map<string, string>>;
|
|
10
|
+
/** Regel 4: een bestaande klant op de order wordt nooit overschreven. */
|
|
11
|
+
export declare function keepOrSetCustomer(existing: string | null | undefined, found: string | null | undefined): string | null;
|
|
12
|
+
//# sourceMappingURL=floriday-promote-customer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"floriday-promote-customer.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-promote-customer.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,CAAC,CAAC;AAE1G,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAS9D;AAED,uEAAuE;AACvE,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EACxB,GAAG,EAAE,UAAU,EACf,IAAI,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAA6B,GACnD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsB9B;AAED,yEAAyE;AACzE,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAEtH"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
// Floriday-koper → klant, altijd via de Klanten-module
|
|
2
|
+
// (public.promote_floriday_customer). Deze module maakt nooit zelf klanten
|
|
3
|
+
// aan en wijzigt nooit klantgegevens. Fail closed: fout of leeg antwoord →
|
|
4
|
+
// geen klant (de Klanten-ronde probeert het later opnieuw).
|
|
5
|
+
export function extractCustomerId(data) {
|
|
6
|
+
const raw = Array.isArray(data) ? data[0] : data;
|
|
7
|
+
if (typeof raw === "string")
|
|
8
|
+
return raw.trim() || null;
|
|
9
|
+
if (raw && typeof raw === "object") {
|
|
10
|
+
const r = raw;
|
|
11
|
+
const id = r.id ?? r.customer_id ?? r.promote_floriday_customer;
|
|
12
|
+
return typeof id === "string" && id.trim() ? id : null;
|
|
13
|
+
}
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
/** Roept de functie één keer per uniek nummer aan, max 12 tegelijk. */
|
|
17
|
+
export async function promoteCustomers(orgIds, rpc, warn = (m) => console.warn(m)) {
|
|
18
|
+
const unique = [...new Set([...orgIds].map((o) => String(o ?? "").trim()).filter(Boolean))];
|
|
19
|
+
const out = new Map();
|
|
20
|
+
for (let i = 0; i < unique.length; i += 12) {
|
|
21
|
+
await Promise.all(unique.slice(i, i + 12).map(async (org) => {
|
|
22
|
+
try {
|
|
23
|
+
const { data, error } = await rpc(org);
|
|
24
|
+
if (error)
|
|
25
|
+
throw new Error(error.message);
|
|
26
|
+
const id = extractCustomerId(data);
|
|
27
|
+
if (!id) {
|
|
28
|
+
warn(`[floriday-mirror] promote_floriday_customer gaf geen klant voor ${org}; geen klant gekoppeld.`);
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
out.set(org, id);
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
warn(`[floriday-mirror] klant omzetten mislukt voor ${org}: ${e.message}; geen klant gekoppeld.`);
|
|
35
|
+
}
|
|
36
|
+
}));
|
|
37
|
+
}
|
|
38
|
+
return out;
|
|
39
|
+
}
|
|
40
|
+
/** Regel 4: een bestaande klant op de order wordt nooit overschreven. */
|
|
41
|
+
export function keepOrSetCustomer(existing, found) {
|
|
42
|
+
return existing || found || null;
|
|
43
|
+
}
|
|
@@ -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,8 @@
|
|
|
1
|
+
export interface OrderCartInfo {
|
|
2
|
+
count: number;
|
|
3
|
+
carrierTypes: string[];
|
|
4
|
+
sharedCount: number;
|
|
5
|
+
cartIds: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function loadCartsByOrder(supabase: any, orderIds: string[]): Promise<Map<string, OrderCartInfo>>;
|
|
8
|
+
//# sourceMappingURL=order-cart-count.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-cart-count.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-cart-count.server.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAID,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CA2DrC"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// Alleen-lezen telling van karren per order via de KARREGELS.
|
|
2
|
+
//
|
|
3
|
+
// Een order in een buffer ligt op gedeelde karren waarvan order_carts.order_id
|
|
4
|
+
// LEEG is (de kar hoort bij order_carts.buffer_id). Tellen op order_id geeft
|
|
5
|
+
// dan 0. Daarom: actieve order_items -> order_cart_items -> order_carts.
|
|
6
|
+
// Schrijft nooit iets; de indeling is van de Logistiek Engine.
|
|
7
|
+
const CHUNK = 200;
|
|
8
|
+
export async function loadCartsByOrder(supabase, orderIds) {
|
|
9
|
+
const out = new Map();
|
|
10
|
+
const ids = Array.from(new Set(orderIds.filter(Boolean)));
|
|
11
|
+
if (ids.length === 0)
|
|
12
|
+
return out;
|
|
13
|
+
// 1) actieve regels
|
|
14
|
+
const itemOrder = new Map();
|
|
15
|
+
for (let i = 0; i < ids.length; i += CHUNK) {
|
|
16
|
+
const { data, error } = await supabase
|
|
17
|
+
.from("order_items")
|
|
18
|
+
.select("id, order_id")
|
|
19
|
+
.in("order_id", ids.slice(i, i + CHUNK))
|
|
20
|
+
.is("quarantined_at", null);
|
|
21
|
+
if (error)
|
|
22
|
+
throw new Error(`orderregels lezen: ${error.message}`);
|
|
23
|
+
for (const r of (data ?? []))
|
|
24
|
+
itemOrder.set(String(r.id), String(r.order_id));
|
|
25
|
+
}
|
|
26
|
+
const itemIds = Array.from(itemOrder.keys());
|
|
27
|
+
// 2) karregels
|
|
28
|
+
const cartsPerOrder = new Map();
|
|
29
|
+
for (let i = 0; i < itemIds.length; i += CHUNK) {
|
|
30
|
+
const { data, error } = await supabase
|
|
31
|
+
.from("order_cart_items")
|
|
32
|
+
.select("order_item_id, cart_id")
|
|
33
|
+
.in("order_item_id", itemIds.slice(i, i + CHUNK));
|
|
34
|
+
if (error)
|
|
35
|
+
throw new Error(`karregels lezen: ${error.message}`);
|
|
36
|
+
for (const r of (data ?? [])) {
|
|
37
|
+
const oid = itemOrder.get(String(r.order_item_id));
|
|
38
|
+
if (!oid || !r.cart_id)
|
|
39
|
+
continue;
|
|
40
|
+
const s = cartsPerOrder.get(oid) ?? new Set();
|
|
41
|
+
s.add(String(r.cart_id));
|
|
42
|
+
cartsPerOrder.set(oid, s);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// 3) karren zelf (type + gedeeld)
|
|
46
|
+
const allCartIds = Array.from(new Set([...cartsPerOrder.values()].flatMap((s) => [...s])));
|
|
47
|
+
const cartRow = new Map();
|
|
48
|
+
for (let i = 0; i < allCartIds.length; i += CHUNK) {
|
|
49
|
+
const { data, error } = await supabase
|
|
50
|
+
.from("order_carts")
|
|
51
|
+
.select("id, order_id, carrier_type")
|
|
52
|
+
.in("id", allCartIds.slice(i, i + CHUNK));
|
|
53
|
+
if (error)
|
|
54
|
+
throw new Error(`karren lezen: ${error.message}`);
|
|
55
|
+
for (const r of (data ?? []))
|
|
56
|
+
cartRow.set(String(r.id), { order_id: r.order_id ?? null, carrier_type: r.carrier_type ?? null });
|
|
57
|
+
}
|
|
58
|
+
for (const oid of ids) {
|
|
59
|
+
const set = cartsPerOrder.get(oid);
|
|
60
|
+
const cartIds = set ? [...set].filter((c) => cartRow.has(c)) : [];
|
|
61
|
+
out.set(oid, {
|
|
62
|
+
count: cartIds.length,
|
|
63
|
+
cartIds,
|
|
64
|
+
carrierTypes: cartIds.map((c) => String(cartRow.get(c)?.carrier_type ?? "")),
|
|
65
|
+
sharedCount: cartIds.filter((c) => cartRow.get(c)?.order_id !== oid).length,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return out;
|
|
69
|
+
}
|
|
@@ -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);
|