@flowselections/floriday-verkoop-module 1.0.166 → 1.0.167
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 +132 -25
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +3 -1
- package/dist-lib/components/verkoop/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/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 +26 -0
- package/dist-lib/integrations/supabase/types.d.ts +1139 -0
- 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 +7 -1
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +17 -1
- package/dist-lib/lib/create-order.functions.d.ts +10 -7
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +88 -16
- 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/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/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 +94 -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 +117 -0
- package/dist-lib/lib/order-line-extras.js +171 -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 +4 -2
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +7 -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 +19 -0
- package/dist-lib/lib/voorraad-vrij.d.ts.map +1 -0
- package/dist-lib/lib/voorraad-vrij.js +34 -0
- package/package.json +4 -4
- package/schema/verkoop.sql +560 -0
|
@@ -6,7 +6,7 @@ import { isOwnTransportKind, parseOwnPickupMoment, pickupLockReason } from "./ow
|
|
|
6
6
|
export async function loadOrderTransport(supabase, rawOrderId) {
|
|
7
7
|
const { resolveOrderRow } = await import("./order-row.server.js");
|
|
8
8
|
const row = await resolveOrderRow(supabase, rawOrderId);
|
|
9
|
-
const { data: order, error } = await supabase.from("orders").select("id, custom_fields, delivery_date").eq("id", row.id).maybeSingle();
|
|
9
|
+
const { data: order, error } = await supabase.from("orders").select("id, custom_fields, delivery_date, order_source, floriday_sales_order_id").eq("id", row.id).maybeSingle();
|
|
10
10
|
if (error)
|
|
11
11
|
throw new Error(error.message);
|
|
12
12
|
if (!order)
|
|
@@ -24,6 +24,19 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
24
24
|
const glns = Array.from(new Set((hits ?? []).map((h) => h.gln_code).filter(Boolean)));
|
|
25
25
|
carrierGln = glns.length === 1 ? String(glns[0]) : null;
|
|
26
26
|
}
|
|
27
|
+
// Transporteur in Floriday (geschreven door de Floriday-koppeling) wijkt af van de gekozen vervoerder: alleen melden.
|
|
28
|
+
const { floridayCarrierMelding, floridayCarrierUitCf, isFloridayOrderRij } = await import("./floriday-carrier-notice.js");
|
|
29
|
+
const floriday = isFloridayOrderRij(order) ? floridayCarrierUitCf(cf) : null;
|
|
30
|
+
let floridayCarrierNotice = null;
|
|
31
|
+
if (floriday) {
|
|
32
|
+
const { carrierGlnsById } = await import("./floriday-carrier-notice.server.js");
|
|
33
|
+
const glns = carrier.carrierId ? await carrierGlnsById(supabase, [carrier.carrierId]) : new Map();
|
|
34
|
+
floridayCarrierNotice = floridayCarrierMelding({
|
|
35
|
+
isFloriday: true,
|
|
36
|
+
floriday,
|
|
37
|
+
gekozen: { state: carrier.state, name: carrier.carrierName, gln: carrier.carrierId ? glns.get(carrier.carrierId) ?? null : null },
|
|
38
|
+
});
|
|
39
|
+
}
|
|
27
40
|
const { loadPickProgress } = await import("./order-progress.server.js");
|
|
28
41
|
// Ruimere wachttijd dan de lijst: een te korte wachttijd gaf "onbekend" en vergrendelde het veld onterecht.
|
|
29
42
|
const pick = await loadPickProgress(supabase, [order.id], 10000);
|
|
@@ -35,6 +48,7 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
35
48
|
deliveryDate: (order.delivery_date ? String(order.delivery_date).slice(0, 10) : null),
|
|
36
49
|
carrier,
|
|
37
50
|
carrierGln,
|
|
51
|
+
floridayCarrierNotice,
|
|
38
52
|
own,
|
|
39
53
|
ownKind: own ? (isOwnTransportKind(carrier.carrierKind) ? carrier.carrierKind : "eigen_vervoer") : null,
|
|
40
54
|
ownPickup: own ? parseOwnPickupMoment(cf.pickup_moment) : null,
|
|
@@ -62,6 +62,12 @@ export declare function vervoerSoort(p: {
|
|
|
62
62
|
ownTransport?: boolean | null;
|
|
63
63
|
carrierKind?: string | null;
|
|
64
64
|
}): VervoerSoort;
|
|
65
|
+
/**
|
|
66
|
+
* Vervoerder voor het Engine-voorbeeld (logistics_departure_preview): bij een externe/automatische
|
|
67
|
+
* vervoerder de gekozen vervoerder; bij een gekozen vervoerder van soort eigen_vervoer of klant_haalt_op
|
|
68
|
+
* ook die vervoerder, zodat de Engine diens leverdagen gebruikt voor de eerste haalbare dag; anders null.
|
|
69
|
+
*/
|
|
70
|
+
export declare function voorbeeldVervoerderId(controle: "geen" | "werkwijze" | "vervoerder", carrierId: string | null | undefined, carrierKind: string | null | undefined): string | null;
|
|
65
71
|
/** Bij zelf ophalen is een afleverlocatie niet nodig; een gekozen adres mag blijven staan. */
|
|
66
72
|
export declare function afleverlocatieNodig(soort: VervoerSoort): boolean;
|
|
67
73
|
/** Bij zelf ophalen is de ingevulde ophaaltijd het ophaalmoment en dus verplicht. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"own-transport.d.ts","sourceRoot":"","sources":["../../src/lib/own-transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"own-transport.d.ts","sourceRoot":"","sources":["../../src/lib/own-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,6 +83,18 @@ export function vervoerSoort(p) {
|
|
|
83
83
|
return "extern";
|
|
84
84
|
return null;
|
|
85
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Vervoerder voor het Engine-voorbeeld (logistics_departure_preview): bij een externe/automatische
|
|
88
|
+
* vervoerder de gekozen vervoerder; bij een gekozen vervoerder van soort eigen_vervoer of klant_haalt_op
|
|
89
|
+
* ook die vervoerder, zodat de Engine diens leverdagen gebruikt voor de eerste haalbare dag; anders null.
|
|
90
|
+
*/
|
|
91
|
+
export function voorbeeldVervoerderId(controle, carrierId, carrierKind) {
|
|
92
|
+
if (!carrierId)
|
|
93
|
+
return null;
|
|
94
|
+
if (controle === "vervoerder")
|
|
95
|
+
return carrierId;
|
|
96
|
+
return isOwnTransportKind(carrierKind ?? null) ? carrierId : null;
|
|
97
|
+
}
|
|
86
98
|
/** Bij zelf ophalen is een afleverlocatie niet nodig; een gekozen adres mag blijven staan. */
|
|
87
99
|
export function afleverlocatieNodig(soort) {
|
|
88
100
|
return soort !== "klant_haalt_op";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkD,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkD,KAAK,UAAU,EAA2B,MAAM,gBAAgB,CAAC;AAG1H,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAI1B,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,kEAAkE;IAClE,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AA6GD,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,GAAG,IAAW,QAEjE;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA+BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAk5CrB;AAyDD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,qBAAqB,CAIvB"}
|
|
@@ -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({
|
|
@@ -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;;mCA0czB,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).
|
|
@@ -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,19 @@
|
|
|
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
|
+
}
|
|
9
|
+
export interface ProductSleutels {
|
|
10
|
+
id: string;
|
|
11
|
+
floriday_trade_item_id?: string | null;
|
|
12
|
+
trade_item_key?: string | null;
|
|
13
|
+
custom_fields?: Record<string, unknown> | null;
|
|
14
|
+
}
|
|
15
|
+
/** Sleutel → voorraadrij: eigen id, Floriday-id, voorraadsleutel (met en zonder voorvoegsel) en spiegelsleutels van het artikel. */
|
|
16
|
+
export declare function voorraadIndex(rijen: VoorraadRij[], producten: ProductSleutels[]): Map<string, VoorraadRij>;
|
|
17
|
+
/** Vrij aantal voor een keuzelijst-id; onbekend → null (dan blijft de oude waarde staan). */
|
|
18
|
+
export declare function vrijVoor(index: Map<string, VoorraadRij>, id: string): number | null;
|
|
19
|
+
//# 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,CAAA;CAAE;AACpL,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,CAkB1G;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,34 @@
|
|
|
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
|
+
for (const r of rijen) {
|
|
10
|
+
zet(r.id, r);
|
|
11
|
+
zet(r.floriday_id, r);
|
|
12
|
+
zet(r.voorraad_sleutel, r);
|
|
13
|
+
if (r.voorraad_sleutel && /^(product|draft|group):/.test(r.voorraad_sleutel))
|
|
14
|
+
zet(r.voorraad_sleutel.replace(/^(product|draft|group):/, ""), r);
|
|
15
|
+
}
|
|
16
|
+
for (const p of producten) {
|
|
17
|
+
const r = m.get(p.id);
|
|
18
|
+
if (!r)
|
|
19
|
+
continue;
|
|
20
|
+
const cf = p.custom_fields ?? {};
|
|
21
|
+
zet(p.floriday_trade_item_id, r);
|
|
22
|
+
zet(cf.draft_id, r);
|
|
23
|
+
zet(cf.floriday_id, r);
|
|
24
|
+
}
|
|
25
|
+
return m;
|
|
26
|
+
}
|
|
27
|
+
/** Vrij aantal voor een keuzelijst-id; onbekend → null (dan blijft de oude waarde staan). */
|
|
28
|
+
export function vrijVoor(index, id) {
|
|
29
|
+
const r = index.get(id);
|
|
30
|
+
if (!r)
|
|
31
|
+
return null;
|
|
32
|
+
const v = Number(r.vrij);
|
|
33
|
+
return Number.isFinite(v) ? v : null;
|
|
34
|
+
}
|
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.167",
|
|
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
|
}
|