@flowselections/floriday-verkoop-module 1.0.166 → 1.0.168
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 +155 -34
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +63 -8
- package/dist-lib/components/verkoop/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +11 -4
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +1 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +9 -0
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +21 -2
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +13 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +26 -4
- package/dist-lib/components/verkoop/SearchableSelect.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SearchableSelect.js +11 -3
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts +8 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/OrderLineExtrasCard.js +107 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts +19 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.d.ts.map +1 -0
- package/dist-lib/components/verkoop/regel/RegelGegevensVelden.js +33 -0
- package/dist-lib/integrations/supabase/types.d.ts +1492 -68
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.d.ts +13 -0
- package/dist-lib/lib/create-order-customers.d.ts.map +1 -1
- package/dist-lib/lib/create-order-customers.js +41 -0
- package/dist-lib/lib/create-order-form.d.ts +30 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +55 -1
- package/dist-lib/lib/create-order.functions.d.ts +16 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +104 -21
- package/dist-lib/lib/customer-stickers.d.ts +2 -1
- package/dist-lib/lib/customer-stickers.d.ts.map +1 -1
- package/dist-lib/lib/customer-stickers.js +2 -2
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/engine-tijdlijn.d.ts +11 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -1
- package/dist-lib/lib/engine-tijdlijn.js +26 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +47 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -1
- package/dist-lib/lib/engine-tijdlijn.server.js +119 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +5 -0
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +21 -0
- package/dist-lib/lib/kar-tekening.d.ts +23 -0
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +51 -1
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-bijwerken.server.d.ts +20 -0
- package/dist-lib/lib/order-bijwerken.server.d.ts.map +1 -0
- package/dist-lib/lib/order-bijwerken.server.js +31 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +33 -23
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +4 -13
- package/dist-lib/lib/order-cf-merge.d.ts +17 -0
- package/dist-lib/lib/order-cf-merge.d.ts.map +1 -0
- package/dist-lib/lib/order-cf-merge.js +51 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +20 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +26 -5
- package/dist-lib/lib/order-line-extras.d.ts +157 -0
- package/dist-lib/lib/order-line-extras.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts +55 -0
- package/dist-lib/lib/order-line-extras.functions.d.ts.map +1 -0
- package/dist-lib/lib/order-line-extras.functions.js +184 -0
- package/dist-lib/lib/order-line-extras.js +281 -0
- package/dist-lib/lib/order-nav.d.ts +8 -0
- package/dist-lib/lib/order-nav.d.ts.map +1 -1
- package/dist-lib/lib/order-nav.js +13 -0
- package/dist-lib/lib/order-pickup.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-pickup.functions.js +5 -9
- package/dist-lib/lib/order-status.d.ts +9 -1
- package/dist-lib/lib/order-status.d.ts.map +1 -1
- package/dist-lib/lib/order-status.js +8 -0
- package/dist-lib/lib/order-transport.functions.d.ts +9 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.functions.js +21 -3
- package/dist-lib/lib/order-transport.server.d.ts +1 -0
- package/dist-lib/lib/order-transport.server.d.ts.map +1 -1
- package/dist-lib/lib/order-transport.server.js +15 -1
- package/dist-lib/lib/own-transport.d.ts +6 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +12 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +41 -3
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +12 -2
- package/dist-lib/lib/useBufferEvents.d.ts.map +1 -1
- package/dist-lib/lib/useBufferEvents.js +2 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useLocalSalesOrderDetailQuery.js +7 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrderDetailQuery.js +5 -0
- package/dist-lib/lib/voorraad-vrij.d.ts +30 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +64 -0
- package/package.json +4 -4
- package/schema/verkoop.sql +630 -0
|
@@ -21,7 +21,7 @@ import { loadPlanCoverage } from "./plan-coverage.server.js";
|
|
|
21
21
|
import { combineStages } from "./floriday-status.js";
|
|
22
22
|
import { combinedCartCount, mergeSummaries, summarize } from "./plan-coverage.js";
|
|
23
23
|
import { resolveOrderNumbers } from "./order-numbers.server.js";
|
|
24
|
-
import { mergeStages, resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
24
|
+
import { mergeStages, resolveOrderStage, orderStageNote, floridayZonderOrderNote } from "./order-status.js";
|
|
25
25
|
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
26
26
|
import { loadBacklogFlags } from "./order-backlog.server.js";
|
|
27
27
|
import { detectSource, hasProblem, invoiceRoute, isInvoicedDone, toProgressMember, } from "./order-progress.js";
|
|
@@ -731,7 +731,9 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
731
731
|
});
|
|
732
732
|
dto.stageNote = !localRow && deletedFoIds.has(String(r.floriday_id))
|
|
733
733
|
? "deleted"
|
|
734
|
-
:
|
|
734
|
+
: localRow
|
|
735
|
+
? orderStageNote({ customFields: localRow?.custom_fields })
|
|
736
|
+
: floridayZonderOrderNote({ hasOwnRow: false, deleted: false, stage: dto.stage });
|
|
735
737
|
dto.invoiceState = localRow ? invoiceStateLabel(localRow) : null;
|
|
736
738
|
// Weergave: bron, klant-id, orders.id, factuurroute en verzendmoment.
|
|
737
739
|
dto.source = detectSource({
|
|
@@ -1250,7 +1252,31 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1250
1252
|
o.erpInvoice = res.invoices.get(o.orderRowId) ?? null;
|
|
1251
1253
|
})
|
|
1252
1254
|
: Promise.resolve();
|
|
1253
|
-
|
|
1255
|
+
// 12t) Fase uit de tijdlijn van de Engine voor ALLE open orders in de periode
|
|
1256
|
+
// (één aanroep, verkoop_tijdlijn_fasen), vóór filteren en tellen: zo
|
|
1257
|
+
// gebruiken tabblad, teller en lijst dezelfde fase. Verzonden/geannuleerd
|
|
1258
|
+
// volgt de tijdlijn al uit dezelfde orderstatus. Te laat/fout → eigen fase
|
|
1259
|
+
// blijft (melding); de zichtbare rijen krijgen dan in 14t nog hun tijdlijn.
|
|
1260
|
+
const tijdlijnGedekt = new Set();
|
|
1261
|
+
const tijdlijnTask = !params.all && !params.localOrderId && all.length
|
|
1262
|
+
? t.time("12t_tijdlijn", async () => {
|
|
1263
|
+
const open = all.filter((o) => {
|
|
1264
|
+
const st = o.stage ?? "incoming";
|
|
1265
|
+
return st === "incoming" || st === "topick" || st === "picked";
|
|
1266
|
+
});
|
|
1267
|
+
const { applyTijdlijnFasenBulk } = await import("./engine-tijdlijn.server.js");
|
|
1268
|
+
const res = await applyTijdlijnFasenBulk(supabase, open, { timeoutMs: 4000 });
|
|
1269
|
+
for (const id of res.gedekt)
|
|
1270
|
+
tijdlijnGedekt.add(id);
|
|
1271
|
+
if (res.beschikbaar && !res.gelukt)
|
|
1272
|
+
warnings.push("De status uit de planning kon nu niet voor alle orders worden gelezen; de tellers bij de tabbladen volgen voor nu de eigen status.");
|
|
1273
|
+
if (res.mislukt > 0)
|
|
1274
|
+
warnings.push(`Tijdlijn van ${res.mislukt} order(s) niet gelezen; die tonen hun eigen status.`);
|
|
1275
|
+
if (res.overgeslagen > 0)
|
|
1276
|
+
warnings.push(`Van ${res.overgeslagen} order(s) is de status uit de planning niet gelezen (te veel tegelijk); kies een kortere periode.`);
|
|
1277
|
+
})
|
|
1278
|
+
: Promise.resolve();
|
|
1279
|
+
await Promise.all([overviewTask, dismissalsTask, backlogTask, invoiceTask, tijdlijnTask]);
|
|
1254
1280
|
t.mark("12_engine");
|
|
1255
1281
|
const membersOf = (g) => g.map((m) => toProgressMember(m));
|
|
1256
1282
|
// 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
|
|
@@ -1406,6 +1432,18 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1406
1432
|
o.deliveryLocationLabel = deliveryLocationLabel(l) ?? null;
|
|
1407
1433
|
}
|
|
1408
1434
|
}));
|
|
1435
|
+
// Fase en controle uit de tijdlijn van de Engine (logistics_order_tijdlijn),
|
|
1436
|
+
// niet uit het eigen statusveld: gecontroleerd is nooit "Te picken".
|
|
1437
|
+
enrichTasks.push(t.time("14t_tijdlijn", async () => {
|
|
1438
|
+
// Wat 12t al las, niet opnieuw (verzonden/geannuleerd rijen en terugval).
|
|
1439
|
+
const rest = visible.filter((o) => !(o.orderRowId && tijdlijnGedekt.has(o.orderRowId)));
|
|
1440
|
+
if (rest.length === 0)
|
|
1441
|
+
return;
|
|
1442
|
+
const { applyTijdlijnStages } = await import("./engine-tijdlijn.server.js");
|
|
1443
|
+
const res = await applyTijdlijnStages(supabase, rest, { max: 60, timeoutMs: 2500 });
|
|
1444
|
+
if (res.mislukt > 0)
|
|
1445
|
+
warnings.push(`Tijdlijn van ${res.mislukt} order(s) niet gelezen; die tonen hun eigen status.`);
|
|
1446
|
+
}));
|
|
1409
1447
|
enrichTasks.push(t.time("14c_dekking", async () => {
|
|
1410
1448
|
const coverage = await loadPlanCoverage(supabase, ids, "list");
|
|
1411
1449
|
let failed = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAkC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC/G,4FAA4F;IAC5F,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1I,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCA+czB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { invoiceStateLabel } from "./invoice-timing.js";
|
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
8
|
import { mapJsonbToSalesOrderDTO, packingConfigFromFloridayPacking, } from "./salesorders-mapping.js";
|
|
9
|
-
import { resolveOrderStage, orderStageNote } from "./order-status.js";
|
|
9
|
+
import { resolveOrderStage, orderStageNote, floridayZonderOrderNote } from "./order-status.js";
|
|
10
10
|
import { handledAtForDisplay } from "./floriday-backfill.js";
|
|
11
11
|
import { invoiceRoute } from "./order-progress.js";
|
|
12
12
|
import { engineLoadCarrierLabel, normalizeLoadCarrierCode } from "./load-carriers.js";
|
|
@@ -317,7 +317,12 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
317
317
|
deleted: !!ownRow?.deleted_at,
|
|
318
318
|
backfill: orderStageNote({ customFields: ownRow?.custom_fields }) === "handled",
|
|
319
319
|
});
|
|
320
|
-
|
|
320
|
+
// Nog geen eigen order (spiegelronde loopt): "Wordt verwerkt"; alleen als het lezen lukte.
|
|
321
|
+
dto.stageNote = ownRow
|
|
322
|
+
? orderStageNote({ deletedAt: ownRow.deleted_at, customFields: ownRow.custom_fields })
|
|
323
|
+
: ownRes.error
|
|
324
|
+
? null
|
|
325
|
+
: floridayZonderOrderNote({ hasOwnRow: false, deleted: false, stage: dto.stage });
|
|
321
326
|
dto.invoiceState = ownRow ? invoiceStateLabel(ownRow) : null;
|
|
322
327
|
dto.invoiceNote = ownRow?.invoice_ready_note ?? null;
|
|
323
328
|
// Zelfde factuurroute en ids als de lijst (salesorders-list.server).
|
|
@@ -547,12 +552,17 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
547
552
|
}
|
|
548
553
|
const { attachDetailProgress } = await import("./order-progress.server.js");
|
|
549
554
|
const { loadPickupMomentForDetail } = await import("./order-pickup.server.js");
|
|
555
|
+
const { applyTijdlijnStages } = await import("./engine-tijdlijn.server.js");
|
|
550
556
|
const [progress, pickupMoment] = await Promise.all([
|
|
551
557
|
attachDetailProgress(supabase, [dto, ...bufferSiblings]).catch(() => ({
|
|
552
558
|
features: { erpInvoices: false, pickProgress: false },
|
|
553
559
|
invoice: "failed",
|
|
554
560
|
})),
|
|
555
561
|
loadPickupMomentForDetail(supabase, String(dto.id)),
|
|
562
|
+
// Fase uit de tijdlijn van de Engine (zelfde regel als de lijst).
|
|
563
|
+
applyTijdlijnStages(supabase, [dto, ...bufferSiblings], { max: 30, timeoutMs: 2500 }).catch((e) => {
|
|
564
|
+
console.error("[getSalesOrderDetail] tijdlijn mislukt:", e?.message ?? e);
|
|
565
|
+
}),
|
|
556
566
|
]);
|
|
557
567
|
return { order: dto, sellerFallback, environment, bufferId, bufferSiblings, progress, pickupMoment };
|
|
558
568
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBufferEvents.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferEvents.ts"],"names":[],"mappings":"AAWA,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,OAAO,UAAO;;
|
|
1
|
+
{"version":3,"file":"useBufferEvents.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferEvents.ts"],"names":[],"mappings":"AAWA,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,OAAO,UAAO;;UAiE7C"}
|
|
@@ -30,7 +30,8 @@ export function useBufferEvents(enabled = true) {
|
|
|
30
30
|
// Bewust kort: een buffer mag nooit langer gecachet worden dan tot het
|
|
31
31
|
// eerstvolgende seintje.
|
|
32
32
|
staleTime: 0,
|
|
33
|
-
|
|
33
|
+
// Vangnet naast Realtime (logistics_events): hooguit elke 60 s.
|
|
34
|
+
refetchInterval: 60000,
|
|
34
35
|
refetchOnWindowFocus: true,
|
|
35
36
|
queryFn: () => fetchEvents(),
|
|
36
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useLocalSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useLocalSalesOrderDetailQuery.ts"],"names":[],"mappings":"AAQA,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAsD1E"}
|
|
@@ -15,10 +15,13 @@ export function useLocalSalesOrderDetailQuery(id) {
|
|
|
15
15
|
if (!validRawId)
|
|
16
16
|
return;
|
|
17
17
|
const invalidate = () => void queryClient.invalidateQueries({ queryKey: ["salesorders", "local-detail", validRawId] });
|
|
18
|
+
// Regels (belading, prijs, regelgegevens) delen één sleutel met het DTO-id.
|
|
19
|
+
const invalidateRegels = () => void queryClient.invalidateQueries({ queryKey: ["order-item-packing", `local:${validRawId}`] });
|
|
18
20
|
const channel = supabase
|
|
19
21
|
.channel(`local-order-detail-${validRawId}`)
|
|
20
22
|
.on("postgres_changes", { event: "*", schema: "public", table: "orders", filter: `id=eq.${validRawId}` }, invalidate)
|
|
21
|
-
.on("postgres_changes", { event: "*", schema: "public", table: "order_items", filter: `order_id=eq.${validRawId}` }, invalidate)
|
|
23
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "order_items", filter: `order_id=eq.${validRawId}` }, () => { invalidate(); invalidateRegels(); })
|
|
24
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "verkoop_orderregel_extra", filter: `order_id=eq.${validRawId}` }, invalidateRegels)
|
|
22
25
|
.subscribe();
|
|
23
26
|
return () => {
|
|
24
27
|
void supabase.removeChannel(channel);
|
|
@@ -29,6 +32,9 @@ export function useLocalSalesOrderDetailQuery(id) {
|
|
|
29
32
|
enabled: !!validRawId,
|
|
30
33
|
staleTime: 30000,
|
|
31
34
|
refetchOnWindowFocus: false,
|
|
35
|
+
// Vangnet naast Realtime: hooguit elke 60 s, alleen als het scherm zichtbaar is.
|
|
36
|
+
refetchInterval: 60000,
|
|
37
|
+
refetchIntervalInBackground: false,
|
|
32
38
|
retry: (failureCount, error) => AUTH_RETRY.test(error.message) && failureCount < 5,
|
|
33
39
|
retryDelay: (attempt) => Math.min(500 * 2 ** attempt, 4000),
|
|
34
40
|
queryFn: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrderDetailQuery.ts"],"names":[],"mappings":"AASA,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"useSalesOrderDetailQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrderDetailQuery.ts"],"names":[],"mappings":"AASA,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,mHAsDrE"}
|
|
@@ -33,6 +33,8 @@ export function useSalesOrderDetailQuery(id) {
|
|
|
33
33
|
table: "floriday_salesorders_cache",
|
|
34
34
|
filter: `floriday_id=eq.${floridayId}`,
|
|
35
35
|
}, invalidate)
|
|
36
|
+
// Eigen order ontstaat of wijzigt (bv. "Wordt verwerkt" → in het ERP).
|
|
37
|
+
.on("postgres_changes", { event: "*", schema: "public", table: "orders", filter: `floriday_sales_order_id=eq.${floridayId}` }, invalidate)
|
|
36
38
|
.subscribe();
|
|
37
39
|
return () => {
|
|
38
40
|
if (timer)
|
|
@@ -45,6 +47,9 @@ export function useSalesOrderDetailQuery(id) {
|
|
|
45
47
|
enabled: !!floridayId,
|
|
46
48
|
staleTime: 30000,
|
|
47
49
|
refetchOnWindowFocus: false,
|
|
50
|
+
// Vangnet naast Realtime: hooguit elke 60 s, alleen als het scherm zichtbaar is.
|
|
51
|
+
refetchInterval: 60000,
|
|
52
|
+
refetchIntervalInBackground: false,
|
|
48
53
|
queryFn: async () => fetchDetail({ data: { id: floridayId } }),
|
|
49
54
|
});
|
|
50
55
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export interface VoorraadRij {
|
|
2
|
+
id: string;
|
|
3
|
+
floriday_id: string | null;
|
|
4
|
+
voorraad_sleutel: string | null;
|
|
5
|
+
vrij: number | null;
|
|
6
|
+
liggend?: number | null;
|
|
7
|
+
gereserveerd?: number | null;
|
|
8
|
+
gearchiveerd_at?: string | null;
|
|
9
|
+
}
|
|
10
|
+
export interface ProductSleutels {
|
|
11
|
+
id: string;
|
|
12
|
+
floriday_trade_item_id?: string | null;
|
|
13
|
+
trade_item_key?: string | null;
|
|
14
|
+
custom_fields?: Record<string, unknown> | null;
|
|
15
|
+
}
|
|
16
|
+
/** Sleutel → voorraadrij: eigen id, Floriday-id, voorraadsleutel (met en zonder voorvoegsel) en spiegelsleutels van het artikel. */
|
|
17
|
+
export declare function voorraadIndex(rijen: VoorraadRij[], producten: ProductSleutels[]): Map<string, VoorraadRij>;
|
|
18
|
+
/** Liggend en gereserveerd van dezelfde rij (voor de uitleg bij "Beschikbaar 0"); onbekend → null. */
|
|
19
|
+
export declare function voorraadUitleg(index: Map<string, VoorraadRij>, id: string): {
|
|
20
|
+
liggend: number;
|
|
21
|
+
gereserveerd: number;
|
|
22
|
+
} | null;
|
|
23
|
+
/** "Beschikbaar: 0 stuks (402 op voorraad, 624 gereserveerd)" — zelfde getallen als Voorraad. */
|
|
24
|
+
export declare function beschikbaarTekst(vrij: number | null | undefined, unit: string, uitleg?: {
|
|
25
|
+
liggend: number;
|
|
26
|
+
gereserveerd: number;
|
|
27
|
+
} | null): string;
|
|
28
|
+
/** Vrij aantal voor een keuzelijst-id; onbekend → null (dan blijft de oude waarde staan). */
|
|
29
|
+
export declare function vrijVoor(index: Map<string, VoorraadRij>, id: string): number | null;
|
|
30
|
+
//# sourceMappingURL=voorraad-vrij.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"voorraad-vrij.d.ts","sourceRoot":"","sources":["../../src/lib/voorraad-vrij.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AACrN,MAAM,WAAW,eAAe;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE;AAEvK,oIAAoI;AACpI,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CA6B1G;AAED,sGAAsG;AACtG,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAK5H;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,MAAM,CAMjJ;AAED,6FAA6F;AAC7F,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKnF"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
// "Beschikbaar" in Nieuwe bestelling komt uit dezelfde bron als de
|
|
2
|
+
// voorraadlijst van Voorraad (voorraad_lijst_v2_rijen, kolom vrij). Hier alleen
|
|
3
|
+
// het koppelen van een keuzelijst-id aan die rij; geen eigen rekenwerk.
|
|
4
|
+
/** Sleutel → voorraadrij: eigen id, Floriday-id, voorraadsleutel (met en zonder voorvoegsel) en spiegelsleutels van het artikel. */
|
|
5
|
+
export function voorraadIndex(rijen, producten) {
|
|
6
|
+
const m = new Map();
|
|
7
|
+
const zet = (k, r) => { if (typeof k === "string" && k && !m.has(k))
|
|
8
|
+
m.set(k, r); };
|
|
9
|
+
// Eerst de actieve rijen (zoals Voorraad ze toont), daarna pas gearchiveerde: een oude
|
|
10
|
+
// gearchiveerde sleutel mag een actief artikel nooit overschaduwen.
|
|
11
|
+
const geordend = [...rijen.filter((r) => !r.gearchiveerd_at), ...rijen.filter((r) => !!r.gearchiveerd_at)];
|
|
12
|
+
for (const r of geordend) {
|
|
13
|
+
zet(r.id, r);
|
|
14
|
+
zet(r.floriday_id, r);
|
|
15
|
+
zet(r.voorraad_sleutel, r);
|
|
16
|
+
if (r.voorraad_sleutel && /^(product|draft|group):/.test(r.voorraad_sleutel))
|
|
17
|
+
zet(r.voorraad_sleutel.replace(/^(product|draft|group):/, ""), r);
|
|
18
|
+
}
|
|
19
|
+
for (const p of producten) {
|
|
20
|
+
const r = m.get(p.id);
|
|
21
|
+
if (!r)
|
|
22
|
+
continue;
|
|
23
|
+
const cf = p.custom_fields ?? {};
|
|
24
|
+
zet(p.floriday_trade_item_id, r);
|
|
25
|
+
zet(cf.draft_id, r);
|
|
26
|
+
zet(cf.floriday_id, r);
|
|
27
|
+
}
|
|
28
|
+
// Artikel zonder eigen rij: via zijn Floriday-id of artikelsleutel naar de rij van Voorraad.
|
|
29
|
+
for (const p of producten) {
|
|
30
|
+
if (m.has(p.id))
|
|
31
|
+
continue;
|
|
32
|
+
const tk = typeof p.trade_item_key === "string" ? p.trade_item_key : null;
|
|
33
|
+
const r = (p.floriday_trade_item_id ? m.get(p.floriday_trade_item_id) : undefined)
|
|
34
|
+
?? (tk ? m.get(tk) ?? m.get(tk.replace(/^(product|draft|group):/, "")) : undefined);
|
|
35
|
+
if (r)
|
|
36
|
+
m.set(p.id, r);
|
|
37
|
+
}
|
|
38
|
+
return m;
|
|
39
|
+
}
|
|
40
|
+
/** Liggend en gereserveerd van dezelfde rij (voor de uitleg bij "Beschikbaar 0"); onbekend → null. */
|
|
41
|
+
export function voorraadUitleg(index, id) {
|
|
42
|
+
const r = index.get(id);
|
|
43
|
+
if (!r)
|
|
44
|
+
return null;
|
|
45
|
+
const l = Number(r.liggend), g = Number(r.gereserveerd);
|
|
46
|
+
return Number.isFinite(l) && Number.isFinite(g) ? { liggend: l, gereserveerd: g } : null;
|
|
47
|
+
}
|
|
48
|
+
/** "Beschikbaar: 0 stuks (402 op voorraad, 624 gereserveerd)" — zelfde getallen als Voorraad. */
|
|
49
|
+
export function beschikbaarTekst(vrij, unit, uitleg) {
|
|
50
|
+
const v = Number(vrij ?? 0);
|
|
51
|
+
const fmt = (n) => n.toLocaleString("nl-NL");
|
|
52
|
+
const basis = `Beschikbaar: ${fmt(v)} ${unit}`;
|
|
53
|
+
if (v <= 0 && uitleg && uitleg.liggend > 0)
|
|
54
|
+
return `${basis} (${fmt(uitleg.liggend)} op voorraad, ${fmt(uitleg.gereserveerd)} gereserveerd)`;
|
|
55
|
+
return basis;
|
|
56
|
+
}
|
|
57
|
+
/** Vrij aantal voor een keuzelijst-id; onbekend → null (dan blijft de oude waarde staan). */
|
|
58
|
+
export function vrijVoor(index, id) {
|
|
59
|
+
const r = index.get(id);
|
|
60
|
+
if (!r)
|
|
61
|
+
return null;
|
|
62
|
+
const v = Number(r.vrij);
|
|
63
|
+
return Number.isFinite(v) ? v : null;
|
|
64
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flowselections/floriday-verkoop-module",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.168",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -172,19 +172,19 @@
|
|
|
172
172
|
"crons": [
|
|
173
173
|
{
|
|
174
174
|
"name": "verkoop-salesorders-sync-1min",
|
|
175
|
-
"schedule": "
|
|
175
|
+
"schedule": "2-59/5 * * * *",
|
|
176
176
|
"kind": "sql",
|
|
177
177
|
"sql": "SELECT public.verkoop_cron_post('/api/public/cron/sync-salesorders', '{}'::jsonb, 15000);"
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"name": "invoice-due-verkoop",
|
|
181
|
-
"schedule": "
|
|
181
|
+
"schedule": "12,27,42,57 * * * *",
|
|
182
182
|
"kind": "sql",
|
|
183
183
|
"sql": "SELECT public.verkoop_cron_post('/api/public/cron/invoice-due', '{}'::jsonb, 15000);"
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"name": "verkoop-cron-guard-5min",
|
|
187
|
-
"schedule": "
|
|
187
|
+
"schedule": "2-59/5 * * * *",
|
|
188
188
|
"kind": "sql",
|
|
189
189
|
"sql": "SELECT public.verkoop_ensure_cron_heal();"
|
|
190
190
|
}
|