@flowselections/floriday-verkoop-module 1.0.111 → 1.0.115
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 +31 -31
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts +4 -4
- package/dist-lib/components/verkoop/OrderCarrierPicker.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderCarrierPicker.js +26 -19
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +1 -1
- package/dist-lib/integrations/supabase/types.d.ts +901 -10
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/carrier-resolve.check.d.ts +2 -0
- package/dist-lib/lib/carrier-resolve.check.d.ts.map +1 -0
- package/dist-lib/lib/carrier-resolve.check.js +38 -0
- package/dist-lib/lib/carrier-resolve.d.ts +27 -0
- package/dist-lib/lib/carrier-resolve.d.ts.map +1 -0
- package/dist-lib/lib/carrier-resolve.js +100 -0
- package/dist-lib/lib/carrier-resolve.server.d.ts +15 -0
- package/dist-lib/lib/carrier-resolve.server.d.ts.map +1 -0
- package/dist-lib/lib/carrier-resolve.server.js +32 -0
- package/dist-lib/lib/create-order.functions.d.ts +2 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +22 -10
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-carrier.functions.d.ts +10 -4
- package/dist-lib/lib/order-carrier.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-carrier.functions.js +64 -40
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +24 -0
- package/dist-lib/lib/salesorders-mapping.d.ts +7 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/package.json +3 -3
- package/schema/verkoop.sql +216 -42
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"carrier-resolve.check.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
// Losse test: bun src/lib/carrier-resolve.check.ts
|
|
2
|
+
import { badgeFor, isMissingFunctionError, normalizeResolvedCarrier, normalizeResolvedMany, CARRIER_SOURCES, } from "./carrier-resolve.js";
|
|
3
|
+
let fails = 0;
|
|
4
|
+
function eq(name, got, want) {
|
|
5
|
+
const ok = JSON.stringify(got) === JSON.stringify(want);
|
|
6
|
+
if (!ok)
|
|
7
|
+
fails++;
|
|
8
|
+
console.log(`${ok ? "ok " : "FOUT"} ${name}${ok ? "" : ` → ${JSON.stringify(got)} ≠ ${JSON.stringify(want)}`}`);
|
|
9
|
+
}
|
|
10
|
+
const id = "11111111-1111-1111-1111-111111111111";
|
|
11
|
+
eq("acht bronnen uit het contract", CARRIER_SOURCES.length, 8);
|
|
12
|
+
eq("geen 'standaard' als bron", CARRIER_SOURCES.includes("standaard"), false);
|
|
13
|
+
const hand = normalizeResolvedCarrier({ carrier_id: id, carrier_name: "Testvervoerder", bron: "handmatig", reden: "Handmatig gekozen" });
|
|
14
|
+
eq("handmatig: ok", [hand.state, hand.source, hand.carrierName, hand.badge], ["ok", "handmatig", "Testvervoerder", null]);
|
|
15
|
+
for (const s of CARRIER_SOURCES.filter((x) => x !== "geen")) {
|
|
16
|
+
eq(`bron ${s} wordt overgenomen`, normalizeResolvedCarrier({ carrier_id: id, carrier_name: "X", bron: s }).source, s);
|
|
17
|
+
}
|
|
18
|
+
eq("aanduiding oud", badgeFor("oud"), "oude instelling");
|
|
19
|
+
eq("aanduiding favoriet", badgeFor("favoriet"), "favoriet");
|
|
20
|
+
eq("geen aanduiding bij afleverlocatie", badgeFor("afleverlocatie"), null);
|
|
21
|
+
eq("favoriet krijgt aanduiding", normalizeResolvedCarrier({ carrier_id: id, carrier_name: "X", bron: "favoriet" }).badge, "favoriet");
|
|
22
|
+
const geen = normalizeResolvedCarrier({ carrier_id: null, bron: "geen", reden: "Geen vervoerder ingesteld" });
|
|
23
|
+
eq("bron geen: geen vervoerder, geen standaardwaarde", [geen.state, geen.carrierId, geen.carrierName], ["geen", null, null]);
|
|
24
|
+
const zonderId = normalizeResolvedCarrier({ carrier_id: null, bron: "klant" });
|
|
25
|
+
eq("bron zonder vervoerder-id: geen (nooit gokken)", [zonderId.state, zonderId.carrierId], ["geen", null]);
|
|
26
|
+
const raar = normalizeResolvedCarrier({ carrier_id: id, bron: "standaard" });
|
|
27
|
+
eq("onbekende bron: onbekend", [raar.state, raar.carrierId], ["onbekend", null]);
|
|
28
|
+
eq("leeg antwoord: onbekend", normalizeResolvedCarrier(null).state, "onbekend");
|
|
29
|
+
eq("ontbrekende functie (PGRST202)", isMissingFunctionError("PGRST202: Could not find the function public.logistics_resolve_carrier"), true);
|
|
30
|
+
eq("ontbrekende functie (42883)", isMissingFunctionError("42883 function public.logistics_set_order_carrier(uuid, uuid) does not exist"), true);
|
|
31
|
+
eq("andere fout is geen oude Engine", isMissingFunctionError("permission denied for function"), false);
|
|
32
|
+
const many = normalizeResolvedMany([{ order_id: "a", carrier_id: id, carrier_name: "X", bron: "oud" }, { order_id: "b", bron: "geen" }]);
|
|
33
|
+
eq("lijstversie per order-id", [many.get("a")?.source, many.get("b")?.state], ["oud", "geen"]);
|
|
34
|
+
if (fails) {
|
|
35
|
+
console.error(`${fails} controle(s) mislukt`);
|
|
36
|
+
process.exit(1);
|
|
37
|
+
}
|
|
38
|
+
console.log("alle controles geslaagd");
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export declare const CARRIER_SOURCES: readonly ["handmatig", "afleverlocatie", "afleverlocatie_gln", "klant", "werkgebied", "favoriet", "geen", "oud"];
|
|
2
|
+
export type CarrierSource = (typeof CARRIER_SOURCES)[number];
|
|
3
|
+
export declare const ENGINE_CARRIER_MIN_VERSION_NOTICE = "Logistieke Engine 1.0.184 of hoger nodig";
|
|
4
|
+
export interface ResolvedCarrier {
|
|
5
|
+
state: "ok" | "geen" | "onbekend";
|
|
6
|
+
carrierId: string | null;
|
|
7
|
+
carrierName: string | null;
|
|
8
|
+
carrierKind: string | null;
|
|
9
|
+
source: CarrierSource | null;
|
|
10
|
+
reason: string | null;
|
|
11
|
+
warning: string | null;
|
|
12
|
+
/** Kleine aanduiding voor de planner (bron oud/favoriet). */
|
|
13
|
+
badge: string | null;
|
|
14
|
+
/** Melding voor beheer (oude Engine of fout). */
|
|
15
|
+
adminNotice: string | null;
|
|
16
|
+
}
|
|
17
|
+
export declare function sourceLabel(s: CarrierSource | null): string;
|
|
18
|
+
export declare function badgeFor(s: CarrierSource | null): string | null;
|
|
19
|
+
/** Herkent een ontbrekende Engine-functie (oude Engine). */
|
|
20
|
+
export declare function isMissingFunctionError(msg: string | null | undefined): boolean;
|
|
21
|
+
export declare function unknownCarrier(adminNotice: string | null, legacyName?: string | null, legacyId?: string | null): ResolvedCarrier;
|
|
22
|
+
/** Normaliseert één antwoord van logistics_resolve_carrier. Nooit een standaardwaarde. */
|
|
23
|
+
export declare function normalizeResolvedCarrier(raw: unknown): ResolvedCarrier;
|
|
24
|
+
/** Antwoord van logistics_resolve_carrier_many: array of object per order-id. */
|
|
25
|
+
export declare function normalizeResolvedMany(raw: unknown): Map<string, ResolvedCarrier>;
|
|
26
|
+
export declare function carrierLine(c: ResolvedCarrier): string;
|
|
27
|
+
//# sourceMappingURL=carrier-resolve.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"carrier-resolve.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,kHASlB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iDAAiD;IACjD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAaD,wBAAgB,WAAW,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,CAE3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9E;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,eAAe,CAc5I;AAED,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,CAkBtE;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAWhF;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAItD"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
// Vervoerder per order volgens het gedeelde contract (eigenaar: Logistiek Engine).
|
|
2
|
+
// Alleen lezen/normaliseren; Verkoop kiest zelf nooit een vervoerder.
|
|
3
|
+
export const CARRIER_SOURCES = [
|
|
4
|
+
"handmatig",
|
|
5
|
+
"afleverlocatie",
|
|
6
|
+
"afleverlocatie_gln",
|
|
7
|
+
"klant",
|
|
8
|
+
"werkgebied",
|
|
9
|
+
"favoriet",
|
|
10
|
+
"geen",
|
|
11
|
+
"oud",
|
|
12
|
+
];
|
|
13
|
+
export const ENGINE_CARRIER_MIN_VERSION_NOTICE = "Logistieke Engine 1.0.184 of hoger nodig";
|
|
14
|
+
const SOURCE_LABEL = {
|
|
15
|
+
handmatig: "handmatig gekozen",
|
|
16
|
+
afleverlocatie: "van de afleverlocatie",
|
|
17
|
+
afleverlocatie_gln: "van de afleverlocatie (GLN)",
|
|
18
|
+
klant: "van de klant",
|
|
19
|
+
werkgebied: "van het werkgebied",
|
|
20
|
+
favoriet: "favoriete vervoerder",
|
|
21
|
+
geen: "geen vervoerder",
|
|
22
|
+
oud: "oude instelling",
|
|
23
|
+
};
|
|
24
|
+
export function sourceLabel(s) {
|
|
25
|
+
return s ? SOURCE_LABEL[s] : "onbekend";
|
|
26
|
+
}
|
|
27
|
+
export function badgeFor(s) {
|
|
28
|
+
if (s === "oud")
|
|
29
|
+
return "oude instelling";
|
|
30
|
+
if (s === "favoriet")
|
|
31
|
+
return "favoriet";
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
function str(v) {
|
|
35
|
+
return typeof v === "string" && v.trim() ? v.trim() : null;
|
|
36
|
+
}
|
|
37
|
+
/** Herkent een ontbrekende Engine-functie (oude Engine). */
|
|
38
|
+
export function isMissingFunctionError(msg) {
|
|
39
|
+
const m = String(msg ?? "");
|
|
40
|
+
return /PGRST202|42883|could not find the function|function .* does not exist/i.test(m);
|
|
41
|
+
}
|
|
42
|
+
export function unknownCarrier(adminNotice, legacyName = null, legacyId = null) {
|
|
43
|
+
return {
|
|
44
|
+
state: "onbekend",
|
|
45
|
+
carrierId: legacyId,
|
|
46
|
+
carrierName: legacyName,
|
|
47
|
+
carrierKind: null,
|
|
48
|
+
source: null,
|
|
49
|
+
reason: legacyId
|
|
50
|
+
? "Opgeslagen vervoerder; de Logistiek Engine geeft nog geen vervoerder door."
|
|
51
|
+
: "Vervoerder onbekend – de Logistiek Engine geeft nog geen vervoerder door.",
|
|
52
|
+
warning: null,
|
|
53
|
+
badge: null,
|
|
54
|
+
adminNotice,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
/** Normaliseert één antwoord van logistics_resolve_carrier. Nooit een standaardwaarde. */
|
|
58
|
+
export function normalizeResolvedCarrier(raw) {
|
|
59
|
+
const r = (raw && typeof raw === "object" ? raw : {});
|
|
60
|
+
const bron = str(r.bron);
|
|
61
|
+
const source = bron && CARRIER_SOURCES.includes(bron) ? bron : null;
|
|
62
|
+
if (!source)
|
|
63
|
+
return unknownCarrier(bron ? `Onbekende bron "${bron}" van de Logistiek Engine` : "Leeg antwoord van de Logistiek Engine");
|
|
64
|
+
const carrierId = str(r.carrier_id);
|
|
65
|
+
const state = source === "geen" || !carrierId ? "geen" : "ok";
|
|
66
|
+
return {
|
|
67
|
+
state,
|
|
68
|
+
carrierId: state === "ok" ? carrierId : null,
|
|
69
|
+
carrierName: state === "ok" ? str(r.carrier_name) : null,
|
|
70
|
+
carrierKind: str(r.carrier_kind),
|
|
71
|
+
source: state === "geen" ? "geen" : source,
|
|
72
|
+
reason: str(r.reden),
|
|
73
|
+
warning: str(r.waarschuwing),
|
|
74
|
+
badge: badgeFor(state === "geen" ? "geen" : source),
|
|
75
|
+
adminNotice: null,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
/** Antwoord van logistics_resolve_carrier_many: array of object per order-id. */
|
|
79
|
+
export function normalizeResolvedMany(raw) {
|
|
80
|
+
const out = new Map();
|
|
81
|
+
if (Array.isArray(raw)) {
|
|
82
|
+
for (const row of raw) {
|
|
83
|
+
const id = str(row?.order_id);
|
|
84
|
+
if (id)
|
|
85
|
+
out.set(id, normalizeResolvedCarrier(row));
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
else if (raw && typeof raw === "object") {
|
|
89
|
+
for (const [id, row] of Object.entries(raw))
|
|
90
|
+
out.set(id, normalizeResolvedCarrier(row));
|
|
91
|
+
}
|
|
92
|
+
return out;
|
|
93
|
+
}
|
|
94
|
+
export function carrierLine(c) {
|
|
95
|
+
if (c.state === "geen")
|
|
96
|
+
return `Geen vervoerder${c.reason ? ` – ${c.reason}` : ""}`;
|
|
97
|
+
if (c.state === "onbekend")
|
|
98
|
+
return c.carrierName ? `Vervoerder: ${c.carrierName} – ${c.reason}` : (c.reason ?? "Vervoerder onbekend");
|
|
99
|
+
return `Vervoerder: ${c.carrierName ?? "onbekend"} – ${c.reason ?? sourceLabel(c.source)}`;
|
|
100
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { type ResolvedCarrier } from "./carrier-resolve.js";
|
|
2
|
+
/** Vervoerder voor veel orders in één aanroep per blok; fout = "onbekend", nooit een standaard. */
|
|
3
|
+
export declare function resolveCarriersMany(supabase: any, orders: {
|
|
4
|
+
id: string;
|
|
5
|
+
legacyCarrierId: string | null;
|
|
6
|
+
legacyCarrierName: string | null;
|
|
7
|
+
}[]): Promise<{
|
|
8
|
+
byId: Map<string, ResolvedCarrier>;
|
|
9
|
+
error: string | null;
|
|
10
|
+
}>;
|
|
11
|
+
export declare function resolveCarrierOne(supabase: any, orderId: string, legacy: {
|
|
12
|
+
id: string | null;
|
|
13
|
+
name: string | null;
|
|
14
|
+
}): Promise<ResolvedCarrier>;
|
|
15
|
+
//# sourceMappingURL=carrier-resolve.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"carrier-resolve.server.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-resolve.server.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAI3B,mGAAmG;AACnG,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,GAAG,EACb,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACzF,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAkBvE;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjD,OAAO,CAAC,eAAe,CAAC,CAU1B"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Leest de vervoerder per order bij de Logistiek Engine (contract vervoerder).
|
|
2
|
+
import { ENGINE_CARRIER_MIN_VERSION_NOTICE, isMissingFunctionError, normalizeResolvedCarrier, normalizeResolvedMany, unknownCarrier, } from "./carrier-resolve.js";
|
|
3
|
+
const CHUNK = 500;
|
|
4
|
+
/** Vervoerder voor veel orders in één aanroep per blok; fout = "onbekend", nooit een standaard. */
|
|
5
|
+
export async function resolveCarriersMany(supabase, orders) {
|
|
6
|
+
const byId = new Map();
|
|
7
|
+
let error = null;
|
|
8
|
+
for (let i = 0; i < orders.length; i += CHUNK) {
|
|
9
|
+
const chunk = orders.slice(i, i + CHUNK);
|
|
10
|
+
const { data, error: e } = await supabase.rpc("logistics_resolve_carrier_many", {
|
|
11
|
+
p_order_ids: chunk.map((o) => o.id),
|
|
12
|
+
});
|
|
13
|
+
if (e) {
|
|
14
|
+
const notice = isMissingFunctionError(e.message) ? ENGINE_CARRIER_MIN_VERSION_NOTICE : `Vervoerders konden niet worden opgevraagd: ${e.message}`;
|
|
15
|
+
error = notice;
|
|
16
|
+
for (const o of chunk)
|
|
17
|
+
byId.set(o.id, unknownCarrier(notice, o.legacyCarrierName, o.legacyCarrierId));
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const m = normalizeResolvedMany(data);
|
|
21
|
+
for (const o of chunk)
|
|
22
|
+
byId.set(o.id, m.get(o.id) ?? unknownCarrier("Geen antwoord van de Logistiek Engine voor deze order", o.legacyCarrierName, o.legacyCarrierId));
|
|
23
|
+
}
|
|
24
|
+
return { byId, error };
|
|
25
|
+
}
|
|
26
|
+
export async function resolveCarrierOne(supabase, orderId, legacy) {
|
|
27
|
+
const { data, error } = await supabase.rpc("logistics_resolve_carrier", { p_order_id: orderId });
|
|
28
|
+
if (error) {
|
|
29
|
+
return unknownCarrier(isMissingFunctionError(error.message) ? ENGINE_CARRIER_MIN_VERSION_NOTICE : `Vervoerder kon niet worden opgevraagd: ${error.message}`, legacy.name, legacy.id);
|
|
30
|
+
}
|
|
31
|
+
return normalizeResolvedCarrier(data);
|
|
32
|
+
}
|
|
@@ -162,9 +162,11 @@ export declare const createManualOrder: import("@tanstack/start-client-core").Op
|
|
|
162
162
|
ok: true;
|
|
163
163
|
orderId: string;
|
|
164
164
|
alreadyExisted: true;
|
|
165
|
+
carrierAdminNotice?: undefined;
|
|
165
166
|
} | {
|
|
166
167
|
ok: true;
|
|
167
168
|
orderId: string;
|
|
169
|
+
carrierAdminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
|
|
168
170
|
alreadyExisted?: undefined;
|
|
169
171
|
}>>;
|
|
170
172
|
export declare const cancelLocalOrder: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"create-order.functions.d.ts","sourceRoot":"","sources":["../../src/lib/create-order.functions.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,2BAA2B;;;;;;GA+CpC,CAAC;AAIL,eAAO,MAAM,2BAA2B;;;;0CAElB,OAAO;;;;GAoDzB,CAAC;AAWL,eAAO,MAAM,0BAA0B;;;;;;YA+D7B,MAAM;iBACD,MAAM;sBACD,MAAM,GAAG,IAAI;cACrB,MAAM;oBACA,MAAM,GAAG,IAAI;0BACP,MAAM,GAAG,IAAI;0BACb,MAAM,GAAG,IAAI;yBACd,MAAM,GAAG,IAAI;wBACd,MAAM;wBACN,MAAM;yBACL,MAAM;kBACb,OAAO;gBACT,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS;;GAkSpD,CAAC;AAGL,eAAO,MAAM,kCAAkC;;;;0CAEzB,OAAO;;;;;;;;;;;;;;;;;;;;;;GAkDzB,CAAC;AAKL,eAAO,MAAM,qBAAqB;;;;;;YAoBI,MAAM;;;GAIxC,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;GAanC,CAAC;AASL,eAAO,MAAM,8BAA8B;;;;8CAEjB,OAAO;;;;GAU7B,CAAC;AASL,eAAO,MAAM,mBAAmB;;;;;;;;0BAgBuB,MAAM;0BAAoB,MAAM;yBAAmB,MAAM;;;GA8C5G,CAAC;AAGL,eAAO,MAAM,kBAAkB;;;;;;GAU3B,CAAC;AA8EL,eAAO,MAAM,iBAAiB;;;;8CAEJ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA2QL,MAAM;;;GAI9B,CAAC;AAKL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;GAY7B,CAAC;AAQL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;GAoG7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;8CAER,OAAO;;;;GAyB7B,CAAC;AAgDL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;aA2JG,MAAM;iBACQ,MAAM,GAAG,IAAI;kBACX,MAAM;;YAEnB,MAAM,GAAG,IAAI;;;;YAmB7B,MAAM;mBACS,MAAM,GAAG,IAAI;qBACT,MAAM;;cAErB,MAAM,GAAG,IAAI;;;;;;;GASpC,CAAC;AAIL,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;GAgR7B,CAAC;AAKL,eAAO,MAAM,kBAAkB;;;;8CAEL,OAAO;;;;;;;;WAUM,MAAM;YAAU,MAAM,GAAG,IAAI;WAahE,CAAC;AAOL,eAAO,MAAM,2BAA2B;;;;8CAEd,OAAO;;;;gBAIgC,MAAM,EAAE;GAoCrE,CAAC"}
|
|
@@ -544,11 +544,14 @@ export const listPickupLocationsCO = createServerFn({ method: "GET" })
|
|
|
544
544
|
export const listCarriersForCreateOrder = createServerFn({ method: "GET" })
|
|
545
545
|
.middleware([requireSupabaseAuth])
|
|
546
546
|
.handler(async ({ context }) => {
|
|
547
|
-
const { data } = await context.supabase
|
|
547
|
+
const { data, error } = await context.supabase
|
|
548
548
|
.from("carriers")
|
|
549
549
|
.select("id, name, is_default, sort_order, delivery_days, signup_time_1, signup_time_2, signup_days_before_delivery, pickup_weekdays, delivery_weekdays, pickup_moments")
|
|
550
550
|
.order("sort_order", { ascending: true, nullsFirst: false })
|
|
551
551
|
.order("name");
|
|
552
|
+
// Fout niet inslikken: het scherm toont hem.
|
|
553
|
+
if (error)
|
|
554
|
+
throw new Error(`Vervoerders konden niet worden geladen: ${error.message}`);
|
|
552
555
|
return { items: data ?? [] };
|
|
553
556
|
});
|
|
554
557
|
// ─── Beladingen per product ────────────────────────────────────────────────
|
|
@@ -722,7 +725,10 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
722
725
|
// Ophaalmoment en haalbaarheid komen alleen van de Logistiek Engine
|
|
723
726
|
// (logistics_departure_preview). Geen eigen berekening of terugval.
|
|
724
727
|
const ownTransport = !data.isReservation && data.ownTransport === true;
|
|
725
|
-
|
|
728
|
+
// carrierId = alleen een handmatige keuze ("Automatisch" = null).
|
|
729
|
+
const carrierId = data.isReservation || ownTransport ? null : (data.carrierId ?? null);
|
|
730
|
+
// Alleen voor de terugval bij een oude Engine (custom_fields.carrier).
|
|
731
|
+
let fallbackCarrierId = null;
|
|
726
732
|
let ownTransportInfo = null;
|
|
727
733
|
let momentKey = null;
|
|
728
734
|
let deliveryTime = null;
|
|
@@ -773,13 +779,12 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
773
779
|
source: data.source ?? "manual",
|
|
774
780
|
};
|
|
775
781
|
}
|
|
782
|
+
// Handmatige keuze blijft leidend; zonder keuze kiest de Engine (voorbeeld).
|
|
776
783
|
if (!ownTransport)
|
|
777
|
-
|
|
778
|
-
if (!ownTransport && !carrierId)
|
|
779
|
-
throw new Error("Er is geen vervoerder bekend voor deze afleverlocatie. Kies een vervoerder.");
|
|
784
|
+
fallbackCarrierId = carrierId ?? preview?.carrierId ?? null;
|
|
780
785
|
momentKey = d.momentKey;
|
|
781
|
-
if (!ownTransport)
|
|
782
|
-
deliveryTime = await deliveryTimeForMoment(context.supabase,
|
|
786
|
+
if (!ownTransport && fallbackCarrierId)
|
|
787
|
+
deliveryTime = await deliveryTimeForMoment(context.supabase, fallbackCarrierId, momentKey);
|
|
783
788
|
}
|
|
784
789
|
const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
|
|
785
790
|
// Zorg dat elk product_id (= identiteit uit de voorraadmodule) een rij
|
|
@@ -880,6 +885,11 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
880
885
|
}
|
|
881
886
|
const total = data.lines.reduce((s, l) => s + (Number(l.unit_price ?? 0) * Number(l.quantity)), 0);
|
|
882
887
|
const orderPayload = {
|
|
888
|
+
// Vervoerder via de Engine in dezelfde transactie (logistics_set_order_carrier);
|
|
889
|
+
// geen custom_fields.carrier meer, behalve als terugval bij een oude Engine.
|
|
890
|
+
manual_carrier_id: carrierId,
|
|
891
|
+
fallback_carrier_id: fallbackCarrierId,
|
|
892
|
+
set_by_user_id: context.userId ?? null,
|
|
883
893
|
customer_name: data.customerName,
|
|
884
894
|
customer_id: data.customerId,
|
|
885
895
|
order_date: new Date().toISOString().slice(0, 10),
|
|
@@ -893,7 +903,6 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
893
903
|
source: "manual",
|
|
894
904
|
delivery_location: data.deliveryLocationId,
|
|
895
905
|
pickup_location: data.pickupLocationId,
|
|
896
|
-
carrier: carrierId,
|
|
897
906
|
delivery_time: deliveryTime,
|
|
898
907
|
pickup_moment: momentKey,
|
|
899
908
|
...(lateSignup ? { late_signup_override: lateSignup } : {}),
|
|
@@ -948,8 +957,11 @@ export const createManualOrder = createServerFn({ method: "POST" })
|
|
|
948
957
|
catch (err) {
|
|
949
958
|
console.warn("[createManualOrder] engine-event faalde:", err);
|
|
950
959
|
}
|
|
951
|
-
|
|
952
|
-
|
|
960
|
+
return {
|
|
961
|
+
ok: true,
|
|
962
|
+
orderId: order.id,
|
|
963
|
+
carrierAdminNotice: rpcRes.carrier_fallback ? "Logistieke Engine 1.0.184 of hoger nodig" : null,
|
|
964
|
+
};
|
|
953
965
|
});
|
|
954
966
|
// ─── Annuleren van een lokale bestelling ──────────────────────────────────
|
|
955
967
|
// Annuleren bewaart de order (tabblad "Geannuleerd") maar haalt hem uit de
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.114";
|
|
2
2
|
//# sourceMappingURL=module-version.d.ts.map
|
|
@@ -9,11 +9,16 @@ export declare const getOrderCarrier: import("@tanstack/start-client-core").Opti
|
|
|
9
9
|
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
10
10
|
orderId: string;
|
|
11
11
|
}, Promise<{
|
|
12
|
-
|
|
13
|
-
carrierName: string | null;
|
|
12
|
+
resolved: import("./carrier-resolve.js").ResolvedCarrier;
|
|
14
13
|
bufferId: string | null;
|
|
15
14
|
options: CarrierOption[];
|
|
16
15
|
}>>;
|
|
16
|
+
export interface SetCarrierResult {
|
|
17
|
+
orderId: string;
|
|
18
|
+
orderNumber: string | null;
|
|
19
|
+
ok: boolean;
|
|
20
|
+
error: string | null;
|
|
21
|
+
}
|
|
17
22
|
export declare const setOrderCarrier: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
18
23
|
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
19
24
|
userId: string;
|
|
@@ -23,7 +28,8 @@ export declare const setOrderCarrier: import("@tanstack/start-client-core").Opti
|
|
|
23
28
|
carrierId: string | null;
|
|
24
29
|
applyToBuffer?: boolean | undefined;
|
|
25
30
|
}, Promise<{
|
|
26
|
-
ok:
|
|
27
|
-
|
|
31
|
+
ok: boolean;
|
|
32
|
+
results: SetCarrierResult[];
|
|
33
|
+
adminNotice: "Logistieke Engine 1.0.184 of hoger nodig" | null;
|
|
28
34
|
}>>;
|
|
29
35
|
//# sourceMappingURL=order-carrier.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"order-carrier.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-carrier.functions.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAqBD,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;GAsB7B,CAAC;AAEL,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;GAsE7B,CAAC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
-
// Vervoerder
|
|
1
|
+
// Vervoerder van een order lezen en (handmatig) kiezen.
|
|
2
|
+
// Contract vervoerder: de Logistiek Engine is eigenaar. Lezen via
|
|
3
|
+
// logistics_resolve_carrier, kiezen alleen via logistics_set_order_carrier
|
|
4
|
+
// (NULL = terug naar automatisch). Alleen bij een oude Engine zonder die
|
|
5
|
+
// functie valt het kiezen terug op de bestaande opslag (custom_fields.carrier).
|
|
2
6
|
import { createServerFn } from "@tanstack/react-start";
|
|
3
7
|
import { z } from "zod";
|
|
4
8
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
5
9
|
import { assertRowsAffected, resolveOrderRow } from "./order-row.server.js";
|
|
10
|
+
import { ENGINE_CARRIER_MIN_VERSION_NOTICE, isMissingFunctionError } from "./carrier-resolve.js";
|
|
6
11
|
async function findOrder(supabase, orderId) {
|
|
7
|
-
// DTO-id kan een Floriday salesOrderId zijn; resolveOrderRow vertaalt dat.
|
|
8
12
|
const row = await resolveOrderRow(supabase, orderId);
|
|
9
13
|
const { data, error } = await supabase
|
|
10
14
|
.from("orders")
|
|
11
|
-
.select("id, buffer_id, custom_fields, is_reservation")
|
|
15
|
+
.select("id, order_number, buffer_id, custom_fields, is_reservation")
|
|
12
16
|
.eq("id", row.id)
|
|
13
17
|
.maybeSingle();
|
|
14
18
|
if (error)
|
|
@@ -20,42 +24,33 @@ export const getOrderCarrier = createServerFn({ method: "GET" })
|
|
|
20
24
|
.inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
|
|
21
25
|
.handler(async ({ data, context }) => {
|
|
22
26
|
const supabase = context.supabase;
|
|
23
|
-
const { data: carrierRows } = await supabase
|
|
27
|
+
const { data: carrierRows, error: cErr } = await supabase
|
|
24
28
|
.from("carriers")
|
|
25
29
|
.select("id, name, sort_order")
|
|
26
30
|
.order("sort_order", { ascending: true, nullsFirst: false })
|
|
27
31
|
.order("name");
|
|
32
|
+
if (cErr)
|
|
33
|
+
throw new Error(`Vervoerders konden niet worden geladen: ${cErr.message}`);
|
|
28
34
|
const options = (carrierRows ?? []).map((c) => ({
|
|
29
35
|
id: String(c.id),
|
|
30
36
|
name: String(c.name ?? "Onbekend"),
|
|
31
37
|
}));
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
catch {
|
|
37
|
-
order = null;
|
|
38
|
-
}
|
|
39
|
-
if (!order) {
|
|
40
|
-
return { carrierId: null, carrierName: null, bufferId: null, options };
|
|
41
|
-
}
|
|
38
|
+
const order = await findOrder(supabase, data.orderId);
|
|
39
|
+
if (!order)
|
|
40
|
+
throw new Error("Order niet gevonden");
|
|
42
41
|
const cf = (order.custom_fields ?? {});
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return {
|
|
48
|
-
carrierId,
|
|
49
|
-
carrierName,
|
|
50
|
-
bufferId: order.buffer_id ?? null,
|
|
51
|
-
options,
|
|
52
|
-
};
|
|
42
|
+
const legacyId = cf.carrier ? String(cf.carrier) : null;
|
|
43
|
+
const legacyName = legacyId ? (options.find((o) => o.id === legacyId)?.name ?? null) : null;
|
|
44
|
+
const { resolveCarrierOne } = await import("./carrier-resolve.server.js");
|
|
45
|
+
const resolved = await resolveCarrierOne(supabase, order.id, { id: legacyId, name: legacyName });
|
|
46
|
+
return { resolved, bufferId: order.buffer_id ?? null, options };
|
|
53
47
|
});
|
|
54
48
|
export const setOrderCarrier = createServerFn({ method: "POST" })
|
|
55
49
|
.middleware([requireSupabaseAuth])
|
|
56
50
|
.inputValidator((input) => z
|
|
57
51
|
.object({
|
|
58
52
|
orderId: z.string().min(1),
|
|
53
|
+
// null = terug naar automatisch
|
|
59
54
|
carrierId: z.string().uuid().nullable(),
|
|
60
55
|
applyToBuffer: z.boolean().optional(),
|
|
61
56
|
})
|
|
@@ -69,29 +64,58 @@ export const setOrderCarrier = createServerFn({ method: "POST" })
|
|
|
69
64
|
throw new Error("Bij een reservering kan nog geen vervoerder worden gekozen; dat kan pas bij het aanmaken van de verzending.");
|
|
70
65
|
}
|
|
71
66
|
let targets = [
|
|
72
|
-
{ id: order.id, custom_fields: order.custom_fields },
|
|
67
|
+
{ id: order.id, order_number: order.order_number, custom_fields: order.custom_fields },
|
|
73
68
|
];
|
|
74
69
|
if (data.applyToBuffer && order.buffer_id) {
|
|
75
|
-
const { data: rows } = await supabase
|
|
70
|
+
const { data: rows, error } = await supabase
|
|
76
71
|
.from("orders")
|
|
77
|
-
.select("id, custom_fields")
|
|
72
|
+
.select("id, order_number, custom_fields")
|
|
78
73
|
.eq("buffer_id", order.buffer_id);
|
|
74
|
+
if (error)
|
|
75
|
+
throw new Error(`Orders in de buffer konden niet worden gelezen: ${error.message}`);
|
|
79
76
|
if (rows && rows.length > 0)
|
|
80
77
|
targets = rows;
|
|
81
78
|
}
|
|
79
|
+
const results = [];
|
|
80
|
+
let legacyMode = false;
|
|
82
81
|
for (const t of targets) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
82
|
+
try {
|
|
83
|
+
if (!legacyMode) {
|
|
84
|
+
const { error } = await supabase.rpc("logistics_set_order_carrier", {
|
|
85
|
+
p_order_id: t.id,
|
|
86
|
+
p_carrier_id: data.carrierId,
|
|
87
|
+
});
|
|
88
|
+
if (!error) {
|
|
89
|
+
results.push({ orderId: t.id, orderNumber: t.order_number, ok: true, error: null });
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
if (!isMissingFunctionError(error.message))
|
|
93
|
+
throw new Error(error.message);
|
|
94
|
+
legacyMode = true;
|
|
95
|
+
}
|
|
96
|
+
// Oude Engine: bestaande opslag als terugval.
|
|
97
|
+
const cf = { ...(t.custom_fields ?? {}) };
|
|
98
|
+
if (data.carrierId)
|
|
99
|
+
cf.carrier = data.carrierId;
|
|
100
|
+
else
|
|
101
|
+
delete cf.carrier;
|
|
102
|
+
const { data: updated, error } = await supabase
|
|
103
|
+
.from("orders")
|
|
104
|
+
.update({ custom_fields: cf })
|
|
105
|
+
.eq("id", t.id)
|
|
106
|
+
.select("id");
|
|
107
|
+
if (error)
|
|
108
|
+
throw new Error(error.message);
|
|
109
|
+
assertRowsAffected(updated, "Vervoerder opslaan");
|
|
110
|
+
results.push({ orderId: t.id, orderNumber: t.order_number, ok: true, error: null });
|
|
111
|
+
}
|
|
112
|
+
catch (e) {
|
|
113
|
+
results.push({ orderId: t.id, orderNumber: t.order_number, ok: false, error: e?.message ?? "Onbekende fout" });
|
|
114
|
+
}
|
|
95
115
|
}
|
|
96
|
-
return {
|
|
116
|
+
return {
|
|
117
|
+
ok: results.every((r) => r.ok),
|
|
118
|
+
results,
|
|
119
|
+
adminNotice: legacyMode ? ENGINE_CARRIER_MIN_VERSION_NOTICE : null,
|
|
120
|
+
};
|
|
97
121
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,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;CACvB;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,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;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,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;CACvB;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,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;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAunCrB"}
|
|
@@ -891,6 +891,10 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
891
891
|
crateTypeName: mergeTypeNames(members.map((m) => m.crateTypeName ?? "")),
|
|
892
892
|
cartTypeName: mergeTypeNames(members.map((m) => m.cartTypeName ?? "")),
|
|
893
893
|
carrierName: head.carrierName ?? members.find((m) => m.carrierName)?.carrierName ?? null,
|
|
894
|
+
carrierState: head.carrierState ?? null,
|
|
895
|
+
carrierSource: head.carrierSource ?? null,
|
|
896
|
+
carrierReason: head.carrierReason ?? null,
|
|
897
|
+
carrierBadge: head.carrierBadge ?? null,
|
|
894
898
|
incomplete,
|
|
895
899
|
engineCounts: members.some((m) => m.engineCounts),
|
|
896
900
|
planCoverage: mergeSummaries(members.map((m) => m.planCoverage)),
|
|
@@ -1062,6 +1066,26 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1062
1066
|
if (idFor(o))
|
|
1063
1067
|
o.pickupLabel = "onbekend";
|
|
1064
1068
|
}
|
|
1069
|
+
// Vervoerder + bron uit de Engine (contract vervoerder), één aanroep per blok.
|
|
1070
|
+
{
|
|
1071
|
+
const { resolveCarriersMany } = await import("./carrier-resolve.server.js");
|
|
1072
|
+
const reqs = visible
|
|
1073
|
+
.map((o) => ({ o, id: idFor(o) }))
|
|
1074
|
+
.filter((x) => !!x.id);
|
|
1075
|
+
const res = await resolveCarriersMany(supabase, reqs.map(({ o, id }) => ({ id, legacyCarrierId: o.carrierName ? "oud" : null, legacyCarrierName: o.carrierName ?? null })));
|
|
1076
|
+
for (const { o, id } of reqs) {
|
|
1077
|
+
const c = res.byId.get(id);
|
|
1078
|
+
if (!c)
|
|
1079
|
+
continue;
|
|
1080
|
+
o.carrierName = c.carrierName;
|
|
1081
|
+
o.carrierState = c.state;
|
|
1082
|
+
o.carrierSource = c.source;
|
|
1083
|
+
o.carrierReason = c.reason;
|
|
1084
|
+
o.carrierBadge = c.badge;
|
|
1085
|
+
}
|
|
1086
|
+
if (res.error)
|
|
1087
|
+
warnings.push(`Vervoerder: ${res.error}`);
|
|
1088
|
+
}
|
|
1065
1089
|
const coverage = await loadPlanCoverage(supabase, ids, "list");
|
|
1066
1090
|
let failed = 0;
|
|
1067
1091
|
for (const o of visible) {
|
|
@@ -113,6 +113,13 @@ export interface SalesOrderDTO {
|
|
|
113
113
|
missingPrice?: boolean;
|
|
114
114
|
/** Vervoerder van de order (indien bekend). */
|
|
115
115
|
carrierName?: string | null;
|
|
116
|
+
/** Vervoerder volgens de Logistiek Engine: ok / geen / onbekend. */
|
|
117
|
+
carrierState?: "ok" | "geen" | "onbekend" | null;
|
|
118
|
+
/** Bron volgens het contract (handmatig, afleverlocatie, favoriet, oud, …). */
|
|
119
|
+
carrierSource?: string | null;
|
|
120
|
+
carrierReason?: string | null;
|
|
121
|
+
/** Kleine aanduiding bij bron oud/favoriet. */
|
|
122
|
+
carrierBadge?: string | null;
|
|
116
123
|
/** Concrete ontbrekende gegevens, bv. "geen klant gekoppeld". */
|
|
117
124
|
incomplete?: string[];
|
|
118
125
|
customer: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAElE,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yGAAyG;IACzG,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,0FAA0F;IAC1F,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,sDAAsD;IACtD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sDAAsD;IACtD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,kEAAkE;IAClE,YAAY,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;IAClC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oFAAoF;IACpF,2BAA2B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,4BAA4B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,gFAAgF;IAChF,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,4EAA4E;IAC5E,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAC;IACxC,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;OAGG;IACH,iBAAiB,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE,+EAA+E;IAC/E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uEAAuE;IACvE,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IAElE,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,2EAA2E;IAC3E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,iBAAiB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEpE;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,+DAA+D;IAC/D,cAAc,CAAC,EAAE,OAAO,mBAAmB,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC1E,0EAA0E;IAC1E,UAAU,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oEAAoE;IACpE,YAAY,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IACjD,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAGtB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,+EAA+E;QAC/E,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;KACxB,CAAC;IACF,MAAM,EAAE;QACN,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;KAC7B,CAAC;IAEF,GAAG,EAAE;QACH,KAAK,EAAE,GAAG,CAAC;QACX,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;QACrB,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC;KACvB,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AACD,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAE9D,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AACD,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AAWhE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,CAAC;AAmD9E;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAmBpE;AAKD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAEpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED,wFAAwF;AACxF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAC;AAK7D,wBAAgB,eAAe,CAC7B,EAAE,EAAE,MAAM,GACT;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAa7C;AAED,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,GAAG,EACN,cAAc,CAAC,EAAE,cAAc,EAC/B,eAAe,CAAC,EAAE,eAAe,EACjC,wBAAwB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7C,aAAa,CAkGf;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAUxE;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACnE;AAGD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAWnF;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAIlF;AAYD,wBAAgB,YAAY,CAC1B,MAAM,EAAE,aAAa,EAAE,EACvB,CAAC,EAAE,iBAAiB,GACnB,aAAa,EAAE,CAuDjB;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAyCtF"}
|