@flowselections/floriday-verkoop-module 1.0.155 → 1.0.156
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 +8 -6
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts +3 -1
- package/dist-lib/components/verkoop/OrderTransportCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderTransportCard.js +8 -6
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +5 -2
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +6 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.js +10 -4
- package/dist-lib/components/verkoop/SearchableSelect.js +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +30 -18
- package/dist-lib/components/verkoop/klok/KlokOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrderPage.js +38 -17
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokOrdersList.js +2 -1
- package/dist-lib/components/verkoop/klok/KlokPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/klok/KlokPage.js +26 -5
- package/dist-lib/lib/create-order-form.d.ts +23 -0
- package/dist-lib/lib/create-order-form.d.ts.map +1 -1
- package/dist-lib/lib/create-order-form.js +35 -0
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +12 -3
- package/dist-lib/lib/klok-form.d.ts +12 -0
- package/dist-lib/lib/klok-form.d.ts.map +1 -1
- package/dist-lib/lib/klok-form.js +76 -0
- package/dist-lib/lib/klok-labels.d.ts +13 -0
- package/dist-lib/lib/klok-labels.d.ts.map +1 -1
- package/dist-lib/lib/klok-labels.js +22 -0
- package/dist-lib/lib/klok-payload.d.ts +34 -0
- package/dist-lib/lib/klok-payload.d.ts.map +1 -0
- package/dist-lib/lib/klok-payload.js +38 -0
- package/dist-lib/lib/klok.server.d.ts +4 -33
- package/dist-lib/lib/klok.server.d.ts.map +1 -1
- package/dist-lib/lib/klok.server.js +6 -38
- package/dist-lib/lib/order-transport.functions.d.ts +1 -0
- package/dist-lib/lib/order-transport.functions.d.ts.map +1 -1
- 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 +5 -3
- package/dist-lib/lib/own-transport.d.ts +29 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -1
- package/dist-lib/lib/own-transport.js +33 -0
- package/package.json +5 -4
|
@@ -60,4 +60,17 @@ export declare function afleverbriefPdfBody(b: KlokAfleverbrief): {
|
|
|
60
60
|
clockSupplyId: string;
|
|
61
61
|
auctionLetterCode?: undefined;
|
|
62
62
|
};
|
|
63
|
+
/** Weergave van een Floriday-keuzelijst: laden → Skeleton; alleen "geen koppeling" als de gereedheid dat zegt. */
|
|
64
|
+
export declare function klokLijstWeergave(isLoading: boolean, gereed: {
|
|
65
|
+
koppeling_actief?: boolean;
|
|
66
|
+
} | null | undefined): "laden" | "geen_koppeling" | "lijst";
|
|
67
|
+
/** Veillocatie-knoppen: eerder gebruikt + gekozen blijven zichtbaar (aangevuld tot 3); de rest achter "Meer". */
|
|
68
|
+
export declare function klokLocatieKnoppen<T extends {
|
|
69
|
+
id: string;
|
|
70
|
+
}>(locaties: T[], gebruikt: string[], gekozen: string | null): {
|
|
71
|
+
knoppen: T[];
|
|
72
|
+
meer: T[];
|
|
73
|
+
};
|
|
74
|
+
/** Prijs altijd met twee decimalen, NL-notatie ("0,50"). */
|
|
75
|
+
export declare function prijsTekst(v: number | null | undefined): string;
|
|
63
76
|
//# sourceMappingURL=klok-labels.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"klok-labels.d.ts","sourceRoot":"","sources":["../../src/lib/klok-labels.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,WAAW,GACX,UAAU,GACV,YAAY,GACZ,SAAS,GACT,cAAc,GACd,cAAc,GACd,QAAQ,GACR,YAAY,GACZ,MAAM,CAAC;AAEX,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAWxD,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAEpE;AAiBD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI,CAGnF;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAchI;AAED,+EAA+E;AAC/E,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGzD,CAAC;AAEF,8CAA8C;AAC9C,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAExE;AAED,8FAA8F;AAC9F,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAErE;AAED,eAAO,MAAM,yBAAyB,gFAAgF,CAAC;AACvH,eAAO,MAAM,wBAAwB,uDAAuD,CAAC;AAC7F,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAE3E,kEAAkE;AAClE,eAAO,MAAM,oBAAoB,KAAK,CAAC;AACvC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAKjG;AAYD,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIxD;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,wDAAwD;AACxD,wBAAgB,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAYzG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEzF;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAU,GAAG,MAAM,CASrE;AAED,wDAAwD;AACxD,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,0BAA0B,4EAA4E,CAAC;AACpH,eAAO,MAAM,uBAAuB,yBAAyB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAAG,aAAa,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAE9F,oHAAoH;AACpH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,GAAG,gBAAgB,EAAE,CAUrE;AAED,8CAA8C;AAC9C,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,gBAAgB;;;;;;;;EAKtD"}
|
|
1
|
+
{"version":3,"file":"klok-labels.d.ts","sourceRoot":"","sources":["../../src/lib/klok-labels.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,3 +151,25 @@ export function afleverbriefPdfBody(b) {
|
|
|
151
151
|
? { kind: "auction-letter", clockSupplyId: b.clockSupplyId, auctionLetterCode: code }
|
|
152
152
|
: { kind: "auction-letter", clockSupplyId: b.clockSupplyId };
|
|
153
153
|
}
|
|
154
|
+
/** Weergave van een Floriday-keuzelijst: laden → Skeleton; alleen "geen koppeling" als de gereedheid dat zegt. */
|
|
155
|
+
export function klokLijstWeergave(isLoading, gereed) {
|
|
156
|
+
if (isLoading || !gereed)
|
|
157
|
+
return "laden";
|
|
158
|
+
return gereed.koppeling_actief === false ? "geen_koppeling" : "lijst";
|
|
159
|
+
}
|
|
160
|
+
/** Veillocatie-knoppen: eerder gebruikt + gekozen blijven zichtbaar (aangevuld tot 3); de rest achter "Meer". */
|
|
161
|
+
export function klokLocatieKnoppen(locaties, gebruikt, gekozen) {
|
|
162
|
+
const zicht = new Set(gebruikt.filter((id) => locaties.some((l) => l.id === id)));
|
|
163
|
+
if (gekozen)
|
|
164
|
+
zicht.add(gekozen);
|
|
165
|
+
for (const l of locaties) {
|
|
166
|
+
if (zicht.size >= 3)
|
|
167
|
+
break;
|
|
168
|
+
zicht.add(l.id);
|
|
169
|
+
}
|
|
170
|
+
return { knoppen: locaties.filter((l) => zicht.has(l.id)), meer: locaties.filter((l) => !zicht.has(l.id)) };
|
|
171
|
+
}
|
|
172
|
+
/** Prijs altijd met twee decimalen, NL-notatie ("0,50"). */
|
|
173
|
+
export function prijsTekst(v) {
|
|
174
|
+
return v == null || !Number.isFinite(Number(v)) ? "" : Number(v).toFixed(2).replace(".", ",");
|
|
175
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { type KlokKop, type KlokRegel } from "./klok-form.js";
|
|
2
|
+
export declare function bouwSendPayload(klokNummer: string, version: number, kop: KlokKop, regels: KlokRegel[]): {
|
|
3
|
+
orderNumber: string;
|
|
4
|
+
version: number;
|
|
5
|
+
header: {
|
|
6
|
+
carrierOrganizationId?: string | undefined;
|
|
7
|
+
auctionDate: string | null;
|
|
8
|
+
auctionGroupCode: number | null;
|
|
9
|
+
auctionLocationId: string | null;
|
|
10
|
+
despatchWarehouseId: string | null;
|
|
11
|
+
deliveryDateTime: string;
|
|
12
|
+
};
|
|
13
|
+
lines: {
|
|
14
|
+
deliveryRemark?: string | undefined;
|
|
15
|
+
auctionRemark?: string | undefined;
|
|
16
|
+
inspectionCodes?: import("./klok-form.js").KlokKeurcode[] | undefined;
|
|
17
|
+
quality?: string | undefined;
|
|
18
|
+
clockPreSalesPrice?: number | undefined;
|
|
19
|
+
kind: "trade_item";
|
|
20
|
+
tradeItemId: string | null;
|
|
21
|
+
articleName: string | undefined;
|
|
22
|
+
packingConfiguration: {
|
|
23
|
+
customPackageId?: string | undefined;
|
|
24
|
+
vbnPackageCode: number | null;
|
|
25
|
+
piecesPerPackage: number;
|
|
26
|
+
packagesPerLayer: number | undefined;
|
|
27
|
+
layersPerLoadCarrier: number | undefined;
|
|
28
|
+
loadCarrier: string | null;
|
|
29
|
+
};
|
|
30
|
+
numberOfPackages: number;
|
|
31
|
+
clockMinimumPrice: number;
|
|
32
|
+
}[];
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=klok-payload.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"klok-payload.d.ts","sourceRoot":"","sources":["../../src/lib/klok-payload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAG3E,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCrG"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
// Veilbrief → aanvraag voor de Floriday-authenticatiemodule (clock_order_send). Puur en client-veilig,
|
|
2
|
+
// zodat de contracttest hem zonder server kan opbouwen. Getallen gaan als Number mee (Floriday eist gehele getallen).
|
|
3
|
+
import { alsGeheelGetal } from "./klok-form.js";
|
|
4
|
+
import { amsterdamDateTime } from "./klok-labels.js";
|
|
5
|
+
export function bouwSendPayload(klokNummer, version, kop, regels) {
|
|
6
|
+
return {
|
|
7
|
+
orderNumber: klokNummer,
|
|
8
|
+
version,
|
|
9
|
+
header: {
|
|
10
|
+
auctionDate: kop.veildatum,
|
|
11
|
+
auctionGroupCode: alsGeheelGetal(kop.veilgroep),
|
|
12
|
+
auctionLocationId: kop.veillocatie_id,
|
|
13
|
+
despatchWarehouseId: kop.verzendlocatie_id,
|
|
14
|
+
deliveryDateTime: amsterdamDateTime(String(kop.veildatum)),
|
|
15
|
+
...(kop.vervoer === "transporteur" && kop.carrier_org_id ? { carrierOrganizationId: kop.carrier_org_id } : {}),
|
|
16
|
+
},
|
|
17
|
+
lines: regels.map((r) => ({
|
|
18
|
+
kind: "trade_item",
|
|
19
|
+
tradeItemId: r.trade_item_id,
|
|
20
|
+
articleName: r.product_name || undefined,
|
|
21
|
+
packingConfiguration: {
|
|
22
|
+
vbnPackageCode: alsGeheelGetal(r.vbn_package_code),
|
|
23
|
+
piecesPerPackage: Number(r.stuks_per_fust),
|
|
24
|
+
packagesPerLayer: Number(r.fust_per_laag) || undefined,
|
|
25
|
+
layersPerLoadCarrier: Number(r.lagen_per_kar) || undefined,
|
|
26
|
+
loadCarrier: r.load_carrier,
|
|
27
|
+
...(r.custom_package_id ? { customPackageId: r.custom_package_id } : {}),
|
|
28
|
+
},
|
|
29
|
+
numberOfPackages: Number(r.fusten),
|
|
30
|
+
clockMinimumPrice: Number(r.min_prijs),
|
|
31
|
+
...(Number(r.voorverkoop_prijs) > 0 ? { clockPreSalesPrice: Number(r.voorverkoop_prijs) } : {}),
|
|
32
|
+
...(r.kwaliteit ? { quality: r.kwaliteit } : {}),
|
|
33
|
+
...(r.keurcodes?.length ? { inspectionCodes: r.keurcodes } : {}),
|
|
34
|
+
...(r.veil_opmerking ? { auctionRemark: r.veil_opmerking } : {}),
|
|
35
|
+
...(r.aflever_opmerking ? { deliveryRemark: r.aflever_opmerking } : {}),
|
|
36
|
+
})),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type KlokKop, type KlokRegel } from "./klok-form.js";
|
|
1
|
+
import { type KlokFout, type KlokKop, type KlokRegel } from "./klok-form.js";
|
|
2
2
|
export interface KlokGereed {
|
|
3
3
|
koppeling_actief: boolean;
|
|
4
4
|
alleen_lezen: boolean | null;
|
|
@@ -15,44 +15,15 @@ export declare function zorgVoorVeilingKlant(kop: KlokKop): Promise<{
|
|
|
15
15
|
id: string;
|
|
16
16
|
name: string;
|
|
17
17
|
}>;
|
|
18
|
-
export
|
|
19
|
-
orderNumber: string;
|
|
20
|
-
version: number;
|
|
21
|
-
header: {
|
|
22
|
-
carrierOrganizationId?: string | undefined;
|
|
23
|
-
auctionDate: string | null;
|
|
24
|
-
auctionGroupCode: string | null;
|
|
25
|
-
auctionLocationId: string | null;
|
|
26
|
-
despatchWarehouseId: string | null;
|
|
27
|
-
deliveryDateTime: string;
|
|
28
|
-
};
|
|
29
|
-
lines: {
|
|
30
|
-
deliveryRemark?: string | undefined;
|
|
31
|
-
auctionRemark?: string | undefined;
|
|
32
|
-
inspectionCodes?: import("./klok-form.js").KlokKeurcode[] | undefined;
|
|
33
|
-
quality?: string | undefined;
|
|
34
|
-
clockPreSalesPrice?: number | undefined;
|
|
35
|
-
kind: "trade_item";
|
|
36
|
-
tradeItemId: string | null;
|
|
37
|
-
articleName: string | undefined;
|
|
38
|
-
packingConfiguration: {
|
|
39
|
-
customPackageId?: string | undefined;
|
|
40
|
-
vbnPackageCode: string | null;
|
|
41
|
-
piecesPerPackage: number;
|
|
42
|
-
packagesPerLayer: number | undefined;
|
|
43
|
-
layersPerLoadCarrier: number | undefined;
|
|
44
|
-
loadCarrier: string | null;
|
|
45
|
-
};
|
|
46
|
-
numberOfPackages: number;
|
|
47
|
-
clockMinimumPrice: number;
|
|
48
|
-
}[];
|
|
49
|
-
};
|
|
18
|
+
export { bouwSendPayload } from "./klok-payload.js";
|
|
50
19
|
export interface KlokActieResultaat {
|
|
51
20
|
ok: boolean;
|
|
52
21
|
status: string;
|
|
53
22
|
reden?: string;
|
|
54
23
|
code?: string;
|
|
55
24
|
waarschuwing?: string;
|
|
25
|
+
/** Eén regel per fout, met het veld waar hij bij hoort. */
|
|
26
|
+
fouten?: KlokFout[];
|
|
56
27
|
}
|
|
57
28
|
/** Versturen (of opnieuw versturen). Dubbel drukken: claim + idempotente sleutel. */
|
|
58
29
|
export declare function verstuurKlokOrder(sbUser: any, userId: string, id: string): Promise<KlokActieResultaat>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"klok.server.d.ts","sourceRoot":"","sources":["../../src/lib/klok.server.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"klok.server.d.ts","sourceRoot":"","sources":["../../src/lib/klok.server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAgC,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxG,MAAM,WAAW,UAAU;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,0EAA0E;AAC1E,wBAAsB,cAAc,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAOjE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAKzD;AAED,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAMjE;AAeD,oFAAoF;AACpF,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC9F;AAWD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAgHjD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;CACrB;AAED,qFAAqF;AACrF,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAwE5G;AAED,iEAAiE;AACjE,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAahH;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB7G;AAED,2EAA2E;AAC3E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2B9I;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO;;;;;;;;;;;EAOtC"}
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
// - Afnemer = de veiling als klant (eerst op GLN, dan organizationId; anders
|
|
8
8
|
// één keer aanmaken).
|
|
9
9
|
import { stockError } from "./stock-errors.js";
|
|
10
|
-
import {
|
|
11
|
-
import { klokOntbreekt } from "./klok-form.js";
|
|
10
|
+
import { KLOK_AUCTION_STARTED_TEXT, KLOK_GEEN_KOPPELING_TEXT } from "./klok-labels.js";
|
|
11
|
+
import { klokFoutLijst, klokOntbreekt } from "./klok-form.js";
|
|
12
12
|
import { klokFoutZin, klokGatewayWrite } from "./klok-gateway.server.js";
|
|
13
13
|
/** Stand van de koppeling; ontbreekt de functie, dan "geen koppeling". */
|
|
14
14
|
export async function leesKlokGereed(sb) {
|
|
@@ -94,40 +94,8 @@ function kopVanRij(r) {
|
|
|
94
94
|
vervoer: r.vervoer ?? "geen", carrier_org_id: r.carrier_org_id,
|
|
95
95
|
};
|
|
96
96
|
}
|
|
97
|
-
export
|
|
98
|
-
|
|
99
|
-
orderNumber: klokNummer,
|
|
100
|
-
version,
|
|
101
|
-
header: {
|
|
102
|
-
auctionDate: kop.veildatum,
|
|
103
|
-
auctionGroupCode: kop.veilgroep,
|
|
104
|
-
auctionLocationId: kop.veillocatie_id,
|
|
105
|
-
despatchWarehouseId: kop.verzendlocatie_id,
|
|
106
|
-
deliveryDateTime: amsterdamDateTime(String(kop.veildatum)),
|
|
107
|
-
...(kop.vervoer === "transporteur" && kop.carrier_org_id ? { carrierOrganizationId: kop.carrier_org_id } : {}),
|
|
108
|
-
},
|
|
109
|
-
lines: regels.map((r) => ({
|
|
110
|
-
kind: "trade_item",
|
|
111
|
-
tradeItemId: r.trade_item_id,
|
|
112
|
-
articleName: r.product_name || undefined,
|
|
113
|
-
packingConfiguration: {
|
|
114
|
-
vbnPackageCode: r.vbn_package_code,
|
|
115
|
-
piecesPerPackage: Number(r.stuks_per_fust),
|
|
116
|
-
packagesPerLayer: Number(r.fust_per_laag) || undefined,
|
|
117
|
-
layersPerLoadCarrier: Number(r.lagen_per_kar) || undefined,
|
|
118
|
-
loadCarrier: r.load_carrier,
|
|
119
|
-
...(r.custom_package_id ? { customPackageId: r.custom_package_id } : {}),
|
|
120
|
-
},
|
|
121
|
-
numberOfPackages: Number(r.fusten),
|
|
122
|
-
clockMinimumPrice: Number(r.min_prijs),
|
|
123
|
-
...(Number(r.voorverkoop_prijs) > 0 ? { clockPreSalesPrice: Number(r.voorverkoop_prijs) } : {}),
|
|
124
|
-
...(r.kwaliteit ? { quality: r.kwaliteit } : {}),
|
|
125
|
-
...(r.keurcodes?.length ? { inspectionCodes: r.keurcodes } : {}),
|
|
126
|
-
...(r.veil_opmerking ? { auctionRemark: r.veil_opmerking } : {}),
|
|
127
|
-
...(r.aflever_opmerking ? { deliveryRemark: r.aflever_opmerking } : {}),
|
|
128
|
-
})),
|
|
129
|
-
};
|
|
130
|
-
}
|
|
97
|
+
export { bouwSendPayload } from "./klok-payload.js";
|
|
98
|
+
import { bouwSendPayload } from "./klok-payload.js";
|
|
131
99
|
async function claim(id) {
|
|
132
100
|
const sb = await admin();
|
|
133
101
|
const cutoff = new Date(Date.now() - 2 * 60 * 1000).toISOString();
|
|
@@ -258,7 +226,7 @@ export async function verstuurKlokOrder(sbUser, userId, id) {
|
|
|
258
226
|
const ontbreekt = klokOntbreekt(kop, regels);
|
|
259
227
|
if (ontbreekt.length) {
|
|
260
228
|
await release(id);
|
|
261
|
-
return { ok: false, status: "concept", reden:
|
|
229
|
+
return { ok: false, status: "concept", reden: "Nog niet compleet.", fouten: ontbreekt.map((t) => ({ tekst: t, veld: null })) };
|
|
262
230
|
}
|
|
263
231
|
const env = gereed.omgeving ?? "staging";
|
|
264
232
|
let version = Number(row.version ?? 0) + 1;
|
|
@@ -280,7 +248,7 @@ export async function verstuurKlokOrder(sbUser, userId, id) {
|
|
|
280
248
|
const zin = klokFoutZin(res);
|
|
281
249
|
// Mislukte versie: volgende poging met een hogere versie.
|
|
282
250
|
await release(id, { status: "concept", version, laatste_fout: zin });
|
|
283
|
-
return { ok: false, status: "concept", code: res.code, reden: zin };
|
|
251
|
+
return { ok: false, status: "concept", code: res.code, reden: zin, fouten: klokFoutLijst(res.errors, res.reason, regels) };
|
|
284
252
|
}
|
|
285
253
|
let orderId = null;
|
|
286
254
|
let customerId = row.customer_id ?? null;
|
|
@@ -16,6 +16,7 @@ export declare const getOrderTransport: import("@tanstack/start-client-core").Op
|
|
|
16
16
|
time: string;
|
|
17
17
|
} | null;
|
|
18
18
|
locked: boolean;
|
|
19
|
+
lockReason: import("./own-transport.js").PickupLockReason;
|
|
19
20
|
lockKnown: boolean;
|
|
20
21
|
}>>;
|
|
21
22
|
/** Ophaaltijd bij eigen vervoer / klant haalt op: "YYYY-MM-DD|HH:MM"; alleen vóór printen/picken. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-transport.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.functions.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;;;;0CAER,OAAO
|
|
1
|
+
{"version":3,"file":"order-transport.functions.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.functions.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;;;;0CAER,OAAO;;;;;;;;;;;;;;;;GAIzB,CAAC;AAEL,qGAAqG;AACrG,eAAO,MAAM,qBAAqB;;;;0CAEZ,OAAO;;;;;;;;;;;;;;;;;;;;;;GAwBzB,CAAC"}
|
|
@@ -10,6 +10,7 @@ export declare function loadOrderTransport(supabase: any, rawOrderId: string): P
|
|
|
10
10
|
time: string;
|
|
11
11
|
} | null;
|
|
12
12
|
locked: boolean;
|
|
13
|
+
lockReason: import("./own-transport.js").PickupLockReason;
|
|
13
14
|
lockKnown: boolean;
|
|
14
15
|
}>;
|
|
15
16
|
export type OrderTransport = Awaited<ReturnType<typeof loadOrderTransport>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-transport.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.server.ts"],"names":[],"mappings":"AAMA,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"order-transport.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-transport.server.ts"],"names":[],"mappings":"AAMA,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;gBA6B9C,MAAM;kBAC2D,MAAM,GAAG,IAAI;;;;;;;;;;;;GAUzG;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Vervoerder van de Engine (logistics_resolve_carrier), pickstand van de
|
|
3
3
|
// Engine (logistics_order_pick_progress), GLN uit floriday_carriers_cache.
|
|
4
4
|
// Rekent zelf niets uit; ontbreekt iets, dan null.
|
|
5
|
-
import { isOwnTransportKind, parseOwnPickupMoment,
|
|
5
|
+
import { isOwnTransportKind, parseOwnPickupMoment, pickupLockReason } from "./own-transport.js";
|
|
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);
|
|
@@ -25,7 +25,8 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
25
25
|
carrierGln = glns.length === 1 ? String(glns[0]) : null;
|
|
26
26
|
}
|
|
27
27
|
const { loadPickProgress } = await import("./order-progress.server.js");
|
|
28
|
-
|
|
28
|
+
// Ruimere wachttijd dan de lijst: een te korte wachttijd gaf "onbekend" en vergrendelde het veld onterecht.
|
|
29
|
+
const pick = await loadPickProgress(supabase, [order.id], 10000);
|
|
29
30
|
const progress = pick.pick.get(order.id) ?? null;
|
|
30
31
|
const known = pick.available;
|
|
31
32
|
const own = isOwnTransportKind(carrier.carrierKind) || !!cf.own_transport;
|
|
@@ -37,7 +38,8 @@ export async function loadOrderTransport(supabase, rawOrderId) {
|
|
|
37
38
|
own,
|
|
38
39
|
ownKind: own ? (isOwnTransportKind(carrier.carrierKind) ? carrier.carrierKind : "eigen_vervoer") : null,
|
|
39
40
|
ownPickup: own ? parseOwnPickupMoment(cf.pickup_moment) : null,
|
|
40
|
-
locked:
|
|
41
|
+
locked: pickupLockReason(progress, known) !== null,
|
|
42
|
+
lockReason: pickupLockReason(progress, known),
|
|
41
43
|
lockKnown: known,
|
|
42
44
|
};
|
|
43
45
|
}
|
|
@@ -24,4 +24,33 @@ export declare function pickupTimeLocked(p: {
|
|
|
24
24
|
cartsPrinted?: number | null;
|
|
25
25
|
cartsScanned?: number | null;
|
|
26
26
|
} | null | undefined, known: boolean): boolean;
|
|
27
|
+
export type PickupLockReason = "geprint" | "gepickt" | "onbekend" | null;
|
|
28
|
+
/**
|
|
29
|
+
* Waarom de ophaaltijd vastligt. Gegeven: Engine logistics_order_pick_progress —
|
|
30
|
+
* carts_printed > 0 (picklijst/karlabel geprint) of carts_scanned > 0 (gepickt).
|
|
31
|
+
* Geen rij voor de order = niets geprint/gepickt; functie niet bereikbaar = "onbekend" (fail closed).
|
|
32
|
+
*/
|
|
33
|
+
export declare function pickupLockReason(p: {
|
|
34
|
+
cartsPrinted?: number | null;
|
|
35
|
+
cartsScanned?: number | null;
|
|
36
|
+
} | null | undefined, known: boolean): PickupLockReason;
|
|
37
|
+
export declare const OWN_PICKUP_UNKNOWN_TEXT = "De pickstand is nu niet bekend; de ophaaltijd kan even niet worden gewijzigd. Probeer het over een minuut opnieuw.";
|
|
38
|
+
/** "Ophaaltijd volgt uit de planning (07:00). Wijzigen kan via de planning." */
|
|
39
|
+
export declare function ownPickupPlannedText(plannedTime: string | null): string;
|
|
40
|
+
/** Eén weergave voor kop én blok Vervoer: eigen tijd, anders het moment uit de Engine-planning. */
|
|
41
|
+
export declare function ownPickupView(p: {
|
|
42
|
+
own: boolean;
|
|
43
|
+
ownPickup: {
|
|
44
|
+
date: string;
|
|
45
|
+
time: string;
|
|
46
|
+
} | null;
|
|
47
|
+
lockReason: PickupLockReason;
|
|
48
|
+
/** Kort moment uit de Engine (logistics_order_departure), bv. "vr 6 nov 07:00". */
|
|
49
|
+
plannedShort: string | null;
|
|
50
|
+
}): {
|
|
51
|
+
kopTijd: string | null;
|
|
52
|
+
plannedTime: string | null;
|
|
53
|
+
melding: "invullen" | "planning" | "onbekend" | null;
|
|
54
|
+
editable: boolean;
|
|
55
|
+
};
|
|
27
56
|
//# sourceMappingURL=own-transport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"own-transport.d.ts","sourceRoot":"","sources":["../../src/lib/own-transport.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,aAA+C,CAAC;AAE9E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE3E;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE;;;EAG5G;AAMD,eAAO,MAAM,uBAAuB,6EAA6E,CAAC;AAClH,eAAO,MAAM,sBAAsB,+EAA+E,CAAC;AAInH,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAEtE;AAED,kFAAkF;AAClF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAKpH;AAED,+FAA+F;AAC/F,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAGtF;AAED,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAG9I"}
|
|
1
|
+
{"version":3,"file":"own-transport.d.ts","sourceRoot":"","sources":["../../src/lib/own-transport.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,aAA+C,CAAC;AAE9E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE3E;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,CAAC,EAAE;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE;;;EAG5G;AAMD,eAAO,MAAM,uBAAuB,6EAA6E,CAAC;AAClH,eAAO,MAAM,sBAAsB,+EAA+E,CAAC;AAInH,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAEtE;AAED,kFAAkF;AAClF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAKpH;AAED,+FAA+F;AAC/F,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAGtF;AAED,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAG9I;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAKvJ;AAED,eAAO,MAAM,uBAAuB,uHAAuH,CAAC;AAE5J,gFAAgF;AAChF,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAIvE;AAED,mGAAmG;AACnG,wBAAgB,aAAa,CAAC,CAAC,EAAE;IAC/B,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjD,UAAU,EAAE,gBAAgB,CAAC;IAC7B,mFAAmF;IACnF,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAOlI"}
|
|
@@ -36,3 +36,36 @@ export function pickupTimeLocked(p, known) {
|
|
|
36
36
|
return true;
|
|
37
37
|
return (Number(p?.cartsPrinted ?? 0) > 0) || (Number(p?.cartsScanned ?? 0) > 0);
|
|
38
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* Waarom de ophaaltijd vastligt. Gegeven: Engine logistics_order_pick_progress —
|
|
41
|
+
* carts_printed > 0 (picklijst/karlabel geprint) of carts_scanned > 0 (gepickt).
|
|
42
|
+
* Geen rij voor de order = niets geprint/gepickt; functie niet bereikbaar = "onbekend" (fail closed).
|
|
43
|
+
*/
|
|
44
|
+
export function pickupLockReason(p, known) {
|
|
45
|
+
if (!known)
|
|
46
|
+
return "onbekend";
|
|
47
|
+
if (Number(p?.cartsScanned ?? 0) > 0)
|
|
48
|
+
return "gepickt";
|
|
49
|
+
if (Number(p?.cartsPrinted ?? 0) > 0)
|
|
50
|
+
return "geprint";
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
export const OWN_PICKUP_UNKNOWN_TEXT = "De pickstand is nu niet bekend; de ophaaltijd kan even niet worden gewijzigd. Probeer het over een minuut opnieuw.";
|
|
54
|
+
/** "Ophaaltijd volgt uit de planning (07:00). Wijzigen kan via de planning." */
|
|
55
|
+
export function ownPickupPlannedText(plannedTime) {
|
|
56
|
+
return plannedTime
|
|
57
|
+
? `Ophaaltijd volgt uit de planning (${plannedTime}). Wijzigen kan via de planning.`
|
|
58
|
+
: "Ophaaltijd volgt uit de planning. Wijzigen kan via de planning.";
|
|
59
|
+
}
|
|
60
|
+
/** Eén weergave voor kop én blok Vervoer: eigen tijd, anders het moment uit de Engine-planning. */
|
|
61
|
+
export function ownPickupView(p) {
|
|
62
|
+
const plannedTime = p.plannedShort ? (/\b([01]\d|2[0-3]):[0-5]\d\b/.exec(p.plannedShort)?.[0] ?? null) : null;
|
|
63
|
+
if (!p.own)
|
|
64
|
+
return { kopTijd: p.plannedShort, plannedTime, melding: null, editable: false };
|
|
65
|
+
const kopTijd = p.ownPickup ? null : p.plannedShort; // eigen tijd wordt door de aanroeper opgemaakt
|
|
66
|
+
if (p.lockReason === "onbekend")
|
|
67
|
+
return { kopTijd, plannedTime, melding: "onbekend", editable: false };
|
|
68
|
+
if (p.lockReason)
|
|
69
|
+
return { kopTijd, plannedTime, melding: p.ownPickup ? null : "planning", editable: false };
|
|
70
|
+
return { kopTijd, plannedTime, melding: p.ownPickup ? null : "invullen", editable: true };
|
|
71
|
+
}
|
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.156",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -54,6 +54,7 @@
|
|
|
54
54
|
"@cloudflare/vite-plugin": "^1.25.5",
|
|
55
55
|
"@eslint/js": "^9.32.0",
|
|
56
56
|
"@flowselections/core": "1.0.37",
|
|
57
|
+
"@flowselections/floriday-authenticatie-module": "^1.0.144",
|
|
57
58
|
"@flowselections/layout-maker": "1.13.2",
|
|
58
59
|
"@lovable.dev/vite-tanstack-config": "2.26.5",
|
|
59
60
|
"@rsbuild/core": "^1.0.0",
|
|
@@ -71,17 +72,17 @@
|
|
|
71
72
|
"eslint-plugin-react-refresh": "^0.4.20",
|
|
72
73
|
"globals": "^15.15.0",
|
|
73
74
|
"lucide-react": "^0.575.0",
|
|
75
|
+
"nitro": "3.0.260603-beta",
|
|
74
76
|
"react": "^19.2.0",
|
|
75
77
|
"react-dom": "^19.2.0",
|
|
76
78
|
"sonner": "^2.0.7",
|
|
77
79
|
"tailwindcss": "^4.2.1",
|
|
80
|
+
"tsc-alias": "^1.8.0",
|
|
78
81
|
"tw-animate-css": "^1.3.4",
|
|
79
82
|
"typescript": "^5.8.3",
|
|
80
|
-
"tsc-alias": "^1.8.0",
|
|
81
83
|
"typescript-eslint": "^8.56.1",
|
|
82
84
|
"vite": "^7.3.1",
|
|
83
|
-
"vite-tsconfig-paths": "^6.0.2"
|
|
84
|
-
"nitro": "3.0.260603-beta"
|
|
85
|
+
"vite-tsconfig-paths": "^6.0.2"
|
|
85
86
|
},
|
|
86
87
|
"flowselections": {
|
|
87
88
|
"moduleId": "Verkoop",
|