@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AA0HA,wBAAgB,eAAe,gCAo9C9B"}
|
|
@@ -8,12 +8,12 @@ import { formatBelading } from "../../lib/belading-format.js";
|
|
|
8
8
|
// van de Logistiek Engine (logistics_departure_preview).
|
|
9
9
|
import { useEffect, useMemo, useRef, useState } from "react";
|
|
10
10
|
import { Button, Input, Label, Textarea, toast, Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, } from "@flowselections/core";
|
|
11
|
-
import { Link, useBlocker, useNavigate } from "@tanstack/react-router";
|
|
11
|
+
import { Link, useBlocker, useNavigate, useRouter } from "@tanstack/react-router";
|
|
12
12
|
import { keepPreviousData, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
13
13
|
import { useDebouncedValue } from "../../lib/use-debounced-value.js";
|
|
14
14
|
import { korteMelding } from "../../lib/korte-melding.js";
|
|
15
15
|
import { AlertTriangle, ArrowLeft, CheckCircle2, ChevronUp, Loader2, Plus, Trash2 } from "lucide-react";
|
|
16
|
-
import { isOwnTransportKind, ownPickupLabel, vervoerSoort, vervoerderKeuzes, vertrekControle, vervoerFout, datumLabel, klantHaaltOpTekst, AFLEVER_NIET_NODIG, OPHAALTIJD_ONTBREEKT, EIGEN_VERVOER_WERKWIJZE } from "../../lib/own-transport.js";
|
|
16
|
+
import { isOwnTransportKind, ownPickupLabel, vervoerSoort, vervoerderKeuzes, vertrekControle, voorbeeldVervoerderId, vervoerFout, datumLabel, klantHaaltOpTekst, AFLEVER_NIET_NODIG, OPHAALTIJD_ONTBREEKT, EIGEN_VERVOER_WERKWIJZE } from "../../lib/own-transport.js";
|
|
17
17
|
import { missingItems, lineTotal, dateWithWeekday, eur, attentionItems, selectionKey, resetOnSelectionChange, applyFirstFeasible, prijsSleutel, PRIJS_FOUT_TEXT, PRIJS_ONBEKEND_TEXT, bekendePrijs, regelMistPrijs, groepLeden, groepZonderLedenTekst } from "../../lib/create-order-form.js";
|
|
18
18
|
import { useServerFn } from "@tanstack/react-start";
|
|
19
19
|
import { SearchableSelect } from "./SearchableSelect.js";
|
|
@@ -22,8 +22,12 @@ import { getDeparturePreview } from "../../lib/departure-preview.functions.js";
|
|
|
22
22
|
import { getProductPlannability } from "../../lib/product-plannable.functions.js";
|
|
23
23
|
import { decidePreview, momentLabel, firstDateText, LATE_CONFIRM } from "../../lib/departure-preview.js";
|
|
24
24
|
import { ConfirmDialog } from "./ConfirmDialog.js";
|
|
25
|
-
import { listCustomersForCreateOrder, ensureCustomerFromTwinfield, listProductsForCreateOrder,
|
|
25
|
+
import { listCustomersForCreateOrder, ensureCustomerFromTwinfield, listProductsForCreateOrder, listDeliveryLocationsForCustomerCO, listPickupLocationsCO, getLastPickupLocationCO, listCarriersForCreateOrder, getOrderPickDaysCO, listBeladingOptionsForProducts, createManualOrder, getOrderPrices, } from "../../lib/create-order.functions.js";
|
|
26
26
|
import { checkOrderStockAllowed } from "../../lib/logistics-stock.functions.js";
|
|
27
|
+
import { listLineStickerOptions, getLineFieldDefinitions } from "../../lib/order-line-extras.functions.js";
|
|
28
|
+
import { geldigeStickerKeuze, isTimeoutFout, normRegelVelden, opmerkingNorm, regelVeldenTekst, standaardRegelVelden, stickerOntbreekt } from "../../lib/order-line-extras.js";
|
|
29
|
+
import { klantPad } from "../../lib/kar-handmatig.js";
|
|
30
|
+
import { RegelGegevensVelden } from "./regel/RegelGegevensVelden.js";
|
|
27
31
|
import { useAllowedLoadCarriers } from "../../lib/useAllowedLoadCarriers.js";
|
|
28
32
|
const beladingKey = (b) => `${b.plants_per_crate}x${b.crates_per_layer}x${b.layers_per_cart}`;
|
|
29
33
|
const beladingLabel = (b) => formatBelading({ perFust: b.plants_per_crate, fustenPerLaag: b.crates_per_layer, lagenPerKar: b.layers_per_cart }) ?? "Belading onbekend";
|
|
@@ -55,7 +59,8 @@ export function CreateOrderPage() {
|
|
|
55
59
|
const fetchPickDays = useServerFn(getOrderPickDaysCO);
|
|
56
60
|
const fetchBeladingen = useServerFn(listBeladingOptionsForProducts);
|
|
57
61
|
const fetchCreate = useServerFn(createManualOrder);
|
|
58
|
-
const
|
|
62
|
+
const fetchStickerOptions = useServerFn(listLineStickerOptions);
|
|
63
|
+
const fetchFieldDefs = useServerFn(getLineFieldDefinitions);
|
|
59
64
|
const loadCarriersEngine = useAllowedLoadCarriers();
|
|
60
65
|
// Fouten niet inslikken: elke query toont zijn fout boven het formulier.
|
|
61
66
|
// Keuzelijsten na de eerste keer onthouden (in het geheugen van de pagina).
|
|
@@ -194,21 +199,75 @@ export function CreateOrderPage() {
|
|
|
194
199
|
// Standaard stickervinkje: aan als er voor deze klant + dit product een
|
|
195
200
|
// vaste klantsticker bestaat. Een zelf gezet vinkje blijft staan.
|
|
196
201
|
const stickerProductKey = Array.from(new Set(lines.map((l) => l.product_id).filter((v) => !!v))).sort();
|
|
202
|
+
// Product- en fuststickers per artikel voor deze klant (met klantstandaard).
|
|
203
|
+
const customerIsUuid = !!customerId && /^[0-9a-f-]{36}$/i.test(customerId);
|
|
197
204
|
const stickerQ = useQuery({
|
|
198
|
-
queryKey: ["co-sticker-
|
|
199
|
-
enabled:
|
|
205
|
+
queryKey: ["co-sticker-options", customerId, stickerProductKey],
|
|
206
|
+
enabled: customerIsUuid && stickerProductKey.length > 0,
|
|
200
207
|
staleTime: 60000,
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
return await fetchStickerProducts({ data: { customerId: customerId, productIds: stickerProductKey } });
|
|
204
|
-
}
|
|
205
|
-
catch {
|
|
206
|
-
return { productIds: [] };
|
|
207
|
-
}
|
|
208
|
-
},
|
|
208
|
+
placeholderData: keepPreviousData,
|
|
209
|
+
queryFn: () => fetchStickerOptions({ data: { customerId: customerId, productIds: stickerProductKey } }),
|
|
209
210
|
});
|
|
211
|
+
if (stickerQ.isError)
|
|
212
|
+
console.error("[stickers] opties laden mislukt:", stickerQ.error);
|
|
213
|
+
const stickerOpts = customerIsUuid ? (stickerQ.data?.byProduct ?? {}) : {};
|
|
214
|
+
const stickerFout = stickerQ.data?.error ?? (stickerQ.isError ? "Stickers van deze klant konden niet worden geladen." : null);
|
|
215
|
+
// Extra regelvelden (definities + klantstandaard) uit Klanten; ontbreekt die functie, dan geen velden.
|
|
216
|
+
const fieldDefsQ = useQuery({
|
|
217
|
+
queryKey: ["co-line-fields", customerId],
|
|
218
|
+
enabled: customerIsUuid,
|
|
219
|
+
staleTime: 5 * 60000,
|
|
220
|
+
queryFn: () => fetchFieldDefs({ data: { customerId: customerId } }),
|
|
221
|
+
});
|
|
222
|
+
if (fieldDefsQ.isError)
|
|
223
|
+
console.error("[regelvelden] laden mislukt:", fieldDefsQ.error);
|
|
224
|
+
const fieldDefs = customerIsUuid ? (fieldDefsQ.data?.velden ?? []) : [];
|
|
225
|
+
const fieldDefsKey = customerIsUuid && fieldDefsQ.isSuccess ? `${customerId}|${fieldDefs.map((d) => d.key).join(",")}` : null;
|
|
226
|
+
// Nieuwe of andere klant: extra velden vooraf met de klantstandaard vullen (eigen invoer blijft bij dezelfde klant).
|
|
227
|
+
useEffect(() => {
|
|
228
|
+
if (!fieldDefsKey)
|
|
229
|
+
return;
|
|
230
|
+
setLines((cur) => {
|
|
231
|
+
if (!cur.some((l) => l.fields_init_for !== fieldDefsKey))
|
|
232
|
+
return cur;
|
|
233
|
+
return cur.map((l) => (l.fields_init_for === fieldDefsKey ? l : { ...l, line_fields: standaardRegelVelden(fieldDefs), fields_init_for: fieldDefsKey }));
|
|
234
|
+
});
|
|
235
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
236
|
+
}, [fieldDefsKey, lines.length]);
|
|
237
|
+
// Stickerkeuze per regel: klantstandaard, tenzij zelf gekozen voor dit product.
|
|
238
|
+
useEffect(() => {
|
|
239
|
+
if (!customerIsUuid || stickerQ.isFetching || !stickerQ.data)
|
|
240
|
+
return;
|
|
241
|
+
setLines((cur) => {
|
|
242
|
+
let changed = false;
|
|
243
|
+
const next = cur.map((l) => {
|
|
244
|
+
if (!l.product_id)
|
|
245
|
+
return l;
|
|
246
|
+
const o = stickerOpts[l.product_id];
|
|
247
|
+
if (!o)
|
|
248
|
+
return l;
|
|
249
|
+
if (l.sticker_choice_for === l.product_id) {
|
|
250
|
+
const ps = geldigeStickerKeuze(l.product_sticker_id ?? "", o.product, o.standaardProduct);
|
|
251
|
+
const fs = geldigeStickerKeuze(l.fust_sticker_id ?? "", o.fust, o.standaardFust);
|
|
252
|
+
if (ps === (l.product_sticker_id ?? null) && fs === (l.fust_sticker_id ?? null))
|
|
253
|
+
return l;
|
|
254
|
+
changed = true;
|
|
255
|
+
return { ...l, product_sticker_id: ps, fust_sticker_id: fs };
|
|
256
|
+
}
|
|
257
|
+
const auto = `auto:${l.product_id}`;
|
|
258
|
+
if (l.sticker_choice_for === auto && (l.product_sticker_id ?? null) === o.standaardProduct && (l.fust_sticker_id ?? null) === o.standaardFust)
|
|
259
|
+
return l;
|
|
260
|
+
changed = true;
|
|
261
|
+
return { ...l, product_sticker_id: o.standaardProduct, fust_sticker_id: o.standaardFust, sticker_choice_for: auto };
|
|
262
|
+
});
|
|
263
|
+
return changed ? next : cur;
|
|
264
|
+
});
|
|
265
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
266
|
+
}, [customerIsUuid, stickerQ.data, stickerQ.isFetching, lines.map((l) => `${l.product_id}|${l.sticker_choice_for}`).join(",")]);
|
|
267
|
+
const router = useRouter();
|
|
268
|
+
const stickerKlantLink = klantPad(router, customerIsUuid ? customerId : null);
|
|
210
269
|
useEffect(() => {
|
|
211
|
-
const withSticker = new Set(customerId ? (
|
|
270
|
+
const withSticker = new Set(customerId ? Object.entries(stickerOpts).filter(([, o]) => o.product.length > 0).map(([k]) => k) : []);
|
|
212
271
|
if (customerId && stickerQ.isFetching)
|
|
213
272
|
return;
|
|
214
273
|
// Altijd op de nieuwste regels werken: een verouderde kopie wiste eerder een
|
|
@@ -223,6 +282,8 @@ export function CreateOrderPage() {
|
|
|
223
282
|
const beladingQ = useQuery({
|
|
224
283
|
queryKey: ["co-beladingen", selectedProductIds.join(",")],
|
|
225
284
|
enabled: selectedProductIds.length > 0,
|
|
285
|
+
// Vorige opties blijven staan; de belading van het product staat direct op de regel.
|
|
286
|
+
placeholderData: keepPreviousData,
|
|
226
287
|
// Kort vers houden; bij opslaan controleert de server opnieuw.
|
|
227
288
|
staleTime: 15000,
|
|
228
289
|
gcTime: 5 * 60000,
|
|
@@ -386,14 +447,15 @@ export function CreateOrderPage() {
|
|
|
386
447
|
// elke toetsaanslag een vraag wordt.
|
|
387
448
|
const fetchPreview = useServerFn(getDeparturePreview);
|
|
388
449
|
const previewInput = useMemo(() =>
|
|
389
|
-
// Zelf ophalen of eigen vervoer met tijd:
|
|
390
|
-
|
|
450
|
+
// Zelf ophalen of eigen vervoer met tijd: de tijd is het moment; het
|
|
451
|
+
// voorbeeld (eigen vervoer) dient dan alleen voor de eerste haalbare dag.
|
|
452
|
+
canPickDate && !isReservation
|
|
391
453
|
? {
|
|
392
|
-
carrierId: controle
|
|
454
|
+
carrierId: voorbeeldVervoerderId(controle, carrierId, carrierKindOf(carrierId)),
|
|
393
455
|
deliveryLocation: deliveryLocationId ?? "",
|
|
394
456
|
deliveryDate: deliveryDate || toISODate(new Date()),
|
|
395
|
-
momentKey: controle === "
|
|
396
|
-
ownTransport: controle
|
|
457
|
+
momentKey: controle === "vervoerder" ? momentKey : null,
|
|
458
|
+
ownTransport: controle !== "vervoerder",
|
|
397
459
|
selKey,
|
|
398
460
|
}
|
|
399
461
|
: null, [canPickDate, isReservation, carrierId, deliveryLocationId, deliveryDate, momentKey, controle, selKey]);
|
|
@@ -580,10 +642,24 @@ export function CreateOrderPage() {
|
|
|
580
642
|
packing_source: l.belading
|
|
581
643
|
? (l.belading.is_default === false ? "chosen" : "product_primary")
|
|
582
644
|
: null,
|
|
645
|
+
// Regelgegevens: opmerking, extra velden en stickerkeuze (op de pakbon).
|
|
646
|
+
line_note: opmerkingNorm(l.line_note),
|
|
647
|
+
line_fields: normRegelVelden(l.line_fields),
|
|
648
|
+
product_sticker_id: l.product_sticker_id ?? null,
|
|
649
|
+
fust_sticker_id: l.fust_sticker_id ?? null,
|
|
583
650
|
};
|
|
584
651
|
}),
|
|
585
652
|
};
|
|
586
|
-
|
|
653
|
+
// Time-out: één keer opnieuw met dezelfde sleutel (de server geeft dan dezelfde order terug).
|
|
654
|
+
try {
|
|
655
|
+
return await fetchCreate({ data: payload });
|
|
656
|
+
}
|
|
657
|
+
catch (e) {
|
|
658
|
+
if (!isTimeoutFout(e))
|
|
659
|
+
throw e;
|
|
660
|
+
console.warn("[aanmaken] time-out; één keer opnieuw met dezelfde sleutel", e);
|
|
661
|
+
return await fetchCreate({ data: payload });
|
|
662
|
+
}
|
|
587
663
|
},
|
|
588
664
|
onSuccess: (res) => {
|
|
589
665
|
createdRef.current = true;
|
|
@@ -671,7 +747,10 @@ export function CreateOrderPage() {
|
|
|
671
747
|
setTimeout(() => { el?.focus(); if (el instanceof HTMLInputElement)
|
|
672
748
|
el.select(); }, 30);
|
|
673
749
|
});
|
|
674
|
-
const emptyLine = () => ({
|
|
750
|
+
const emptyLine = () => ({
|
|
751
|
+
product_id: null, product_name: "", quantity: null, unit: "stuks", unit_price: null, belading: null,
|
|
752
|
+
...(fieldDefsKey ? { line_fields: standaardRegelVelden(fieldDefs), fields_init_for: fieldDefsKey } : {}),
|
|
753
|
+
});
|
|
675
754
|
const addLine = () => {
|
|
676
755
|
focusNext.current = { kind: "product", idx: lines.length };
|
|
677
756
|
setLines([...lines, emptyLine()]);
|
|
@@ -807,7 +886,7 @@ export function CreateOrderPage() {
|
|
|
807
886
|
const plants = line.quantity ?? null;
|
|
808
887
|
const cratesDisplay = crates == null ? "" : String(crates);
|
|
809
888
|
const productBeladingen = line.product_id ? beladingByProduct[line.product_id] ?? null : null;
|
|
810
|
-
const loadingBeladingen = !!line.product_id && beladingQ.isLoading;
|
|
889
|
+
const loadingBeladingen = !!line.product_id && !productBeladingen && (beladingQ.isLoading || beladingQ.isFetching);
|
|
811
890
|
const optionMap = new Map();
|
|
812
891
|
for (const b of productBeladingen ?? []) {
|
|
813
892
|
optionMap.set(beladingKey(b), {
|
|
@@ -855,7 +934,7 @@ export function CreateOrderPage() {
|
|
|
855
934
|
return;
|
|
856
935
|
}
|
|
857
936
|
kiesRegelProduct(idx, v);
|
|
858
|
-
} }), impossible && _jsxs("div", { className: "mt-1 text-xs text-destructive", children: ["Niet in te delen met deze belading: ", korteMelding(impossible) ?? "kies een andere belading."] }), missingLine && korteMelding(missingLine) && _jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Let op: ", korteMelding(missingLine)] })] }), _jsxs("label", { className: "order-3 flex h-9 min-w-11 shrink-0 cursor-pointer items-center gap-2 [@media(pointer:coarse)]:h-11 @[60rem]:order-none @[60rem]:justify-center", children: [_jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary [@media(pointer:coarse)]:h-6 [@media(pointer:coarse)]:w-6", "aria-label": "Sticker nodig", title: "Sticker nodig", checked: line.needs_sticker === true, disabled: !line.product_id, onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], needs_sticker: e.target.checked, sticker_manual_for: line.product_id }; setLines(next); } }), _jsx("span", { className: "text-sm @[60rem]:sr-only", children: "Sticker nodig" })] }), _jsxs("div", { className: "order-3 min-w-0 grow basis-[13rem] @[60rem]:order-none @[60rem]:basis-auto", children: [_jsx("div", { className: "mb-1 text-xs text-muted-foreground @[60rem]:sr-only", children: "Belading" }), _jsx(SearchableSelect, { value: effBelading ? beladingKey(effBelading) : null, placeholder: !line.product_id ? "Kies eerst product" : loadingBeladingen ? "Laden…" : noBeladingen ? "Geen belading" : "Kies belading…", disabled: !line.product_id || loadingBeladingen || noBeladingen, allowClear: false, emptyLabel: "Geen belading gekoppeld aan dit product", options: Array.from(optionMap.entries()).map(([key, b]) => ({
|
|
937
|
+
} }), impossible && _jsxs("div", { className: "mt-1 text-xs text-destructive", children: ["Niet in te delen met deze belading: ", korteMelding(impossible) ?? "kies een andere belading."] }), missingLine && korteMelding(missingLine) && _jsxs("div", { className: "mt-1 text-xs text-muted-foreground", children: ["Let op: ", korteMelding(missingLine)] })] }), _jsxs("label", { className: "order-3 flex h-9 min-w-11 shrink-0 cursor-pointer items-center gap-2 [@media(pointer:coarse)]:h-11 @[60rem]:order-none @[60rem]:justify-center", children: [_jsx("input", { type: "checkbox", className: "h-4 w-4 accent-primary [@media(pointer:coarse)]:h-6 [@media(pointer:coarse)]:w-6", "aria-label": "Sticker nodig", title: "Sticker nodig", checked: line.needs_sticker === true, disabled: !line.product_id, onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], needs_sticker: e.target.checked, sticker_manual_for: line.product_id }; setLines(next); } }), _jsx("span", { className: "text-sm @[60rem]:sr-only", children: "Sticker nodig" })] }), _jsxs("div", { className: "order-3 min-w-0 grow basis-[13rem] @[60rem]:order-none @[60rem]:basis-auto", children: [_jsx("div", { className: "mb-1 text-xs text-muted-foreground @[60rem]:sr-only", children: "Belading" }), _jsx(SearchableSelect, { value: effBelading ? beladingKey(effBelading) : null, placeholder: !line.product_id ? "Kies eerst product" : effBelading ? beladingLabel(effBelading) : loadingBeladingen ? "Laden…" : noBeladingen ? "Geen belading" : "Kies belading…", disabled: !line.product_id || (loadingBeladingen && !effBelading) || noBeladingen, allowClear: false, emptyLabel: "Geen belading gekoppeld aan dit product", options: Array.from(optionMap.entries()).map(([key, b]) => ({
|
|
859
938
|
value: key,
|
|
860
939
|
label: beladingLabel(b),
|
|
861
940
|
badge: key === defaultKey ? "Standaard" : null,
|
|
@@ -884,7 +963,35 @@ export function CreateOrderPage() {
|
|
|
884
963
|
const cr = raw ? Math.max(1, Math.floor(Number(raw))) : null;
|
|
885
964
|
next[idx] = { ...next[idx], quantity: cr === null ? null : cr * ppc };
|
|
886
965
|
setLines(next);
|
|
887
|
-
}, placeholder: ppc === null ? "—" : "Fusten", title: ppc === null ? "Kies eerst een belading" : `${ppc} planten per fust` })] }), _jsxs("div", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Stuks" }), _jsx("div", { className: "flex h-9 items-center text-sm tabular-nums text-foreground @[60rem]:justify-end", children: line.product_id && plants ? plants.toLocaleString("nl-NL") : "—" })] }), _jsxs("div", { className: "min-w-0 grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Beschikbaar" }), product ? (_jsxs("div", { className: `flex min-h-9 items-center gap-1 text-sm tabular-nums ${overStock ? (stockBlocked ? "text-destructive" : "text-warning-soft-foreground") : "text-foreground"}`, children: [overStock && _jsx(AlertTriangle, { className: "h-3.5 w-3.5 shrink-0" }), _jsxs("span", { className: "truncate", children: [(available ?? 0).toLocaleString("nl-NL"), " ", unit] })] })) : _jsx("div", { className: "flex h-9 items-center text-sm text-muted-foreground", children: "\u2014" }), overStock && (_jsx("div", { className: `text-xs ${stockBlocked ? "text-destructive" : "text-warning-soft-foreground"}`, children: shortage ? `Tekort ${shortage.missing.toLocaleString("nl-NL")}` : "Meer dan beschikbaar" }))] }), _jsxs("label", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Prijs per stuk" }), _jsx(Input, { type: "number", min: 0, step: "0.01", inputMode: "decimal", className: "h-9 tabular-nums [@media(pointer:coarse)]:h-11", value: line.unit_price ?? "", onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], unit_price: e.target.value === "" ? null : Number(e.target.value), price_mode: "manual", price_source: "Handmatig", price_error: false, price_zero_ok: false }; setLines(next); }, placeholder: "\u20AC", "aria-invalid": noPrice || line.price_error }), line.price_error ? (_jsx("span", { className: "mt-1 block text-xs text-destructive", children: PRIJS_FOUT_TEXT })) : noPrice && !pricePending ? (_jsxs("span", { className: "mt-1 block text-xs text-destructive", children: [PRIJS_ONBEKEND_TEXT, line.unit_price != null && Number(line.unit_price) === 0 && (_jsxs("span", { className: "mt-1 flex items-center gap-1.5 text-foreground [@media(pointer:coarse)]:min-h-11", children: [_jsx("input", { type: "checkbox", className: "h-4 w-4", checked: !!line.price_zero_ok, onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], price_zero_ok: e.target.checked }; setLines(next); } }), "Prijs 0 is juist"] }))] })) : line.price_zero_ok && Number(line.unit_price) === 0 ? (_jsx("span", { className: "mt-1 block text-xs text-muted-foreground", children: "Prijs 0 bevestigd" })) : line.price_source ? (_jsx("span", { className: "mt-1 block truncate text-xs text-muted-foreground", title: line.price_source, children: line.price_source })) : null, line.product_id && (line.price_mode === "manual" || line.price_error) && (_jsx("button", { type: "button", className: "mt-0.5 block text-xs font-medium text-primary hover:underline [@media(pointer:coarse)]:min-h-11", onClick: (e) => { e.preventDefault(); const next = [...lines]; next[idx] = { ...next[idx], price_mode: "auto", price_key: null, price_error: false }; setLines(next); }, children: "Prijs opnieuw ophalen" }))] }), _jsxs("div", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Totaal" }), _jsx("div", { className: "flex h-9 items-center text-sm font-medium tabular-nums text-foreground @[60rem]:justify-end", children: line.product_id ? eur(lineInfo[idx].total) : "—" })] }), _jsx("div", { className: "order-2 flex shrink-0 justify-end @[60rem]:order-none", children: _jsx(Button, { variant: "ghost", size: "icon", className: "h-9 w-9 [@media(pointer:coarse)]:h-11 [@media(pointer:coarse)]:w-11", onClick: () => setLines(lines.filter((_, i) => i !== idx)), "aria-label": "Regel verwijderen", children: _jsx(Trash2, { className: "h-4 w-4" }) }) })
|
|
966
|
+
}, placeholder: ppc === null ? "—" : "Fusten", title: ppc === null ? "Kies eerst een belading" : `${ppc} planten per fust` })] }), _jsxs("div", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Stuks" }), _jsx("div", { className: "flex h-9 items-center text-sm tabular-nums text-foreground @[60rem]:justify-end", children: line.product_id && plants ? plants.toLocaleString("nl-NL") : "—" })] }), _jsxs("div", { className: "min-w-0 grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Beschikbaar" }), product ? (_jsxs("div", { className: `flex min-h-9 items-center gap-1 text-sm tabular-nums ${overStock ? (stockBlocked ? "text-destructive" : "text-warning-soft-foreground") : "text-foreground"}`, children: [overStock && _jsx(AlertTriangle, { className: "h-3.5 w-3.5 shrink-0" }), _jsxs("span", { className: "truncate", children: [(available ?? 0).toLocaleString("nl-NL"), " ", unit] })] })) : _jsx("div", { className: "flex h-9 items-center text-sm text-muted-foreground", children: "\u2014" }), overStock && (_jsx("div", { className: `text-xs ${stockBlocked ? "text-destructive" : "text-warning-soft-foreground"}`, children: shortage ? `Tekort ${shortage.missing.toLocaleString("nl-NL")}` : "Meer dan beschikbaar" }))] }), _jsxs("label", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Prijs per stuk" }), _jsx(Input, { type: "number", min: 0, step: "0.01", inputMode: "decimal", className: "h-9 tabular-nums [@media(pointer:coarse)]:h-11", value: line.unit_price ?? "", onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], unit_price: e.target.value === "" ? null : Number(e.target.value), price_mode: "manual", price_source: "Handmatig", price_error: false, price_zero_ok: false }; setLines(next); }, placeholder: "\u20AC", "aria-invalid": noPrice || line.price_error }), line.price_error ? (_jsx("span", { className: "mt-1 block text-xs text-destructive", children: PRIJS_FOUT_TEXT })) : noPrice && !pricePending ? (_jsxs("span", { className: "mt-1 block text-xs text-destructive", children: [PRIJS_ONBEKEND_TEXT, line.unit_price != null && Number(line.unit_price) === 0 && (_jsxs("span", { className: "mt-1 flex items-center gap-1.5 text-foreground [@media(pointer:coarse)]:min-h-11", children: [_jsx("input", { type: "checkbox", className: "h-4 w-4", checked: !!line.price_zero_ok, onChange: (e) => { const next = [...lines]; next[idx] = { ...next[idx], price_zero_ok: e.target.checked }; setLines(next); } }), "Prijs 0 is juist"] }))] })) : line.price_zero_ok && Number(line.unit_price) === 0 ? (_jsx("span", { className: "mt-1 block text-xs text-muted-foreground", children: "Prijs 0 bevestigd" })) : line.price_source ? (_jsx("span", { className: "mt-1 block truncate text-xs text-muted-foreground", title: line.price_source, children: line.price_source })) : null, line.product_id && (line.price_mode === "manual" || line.price_error) && (_jsx("button", { type: "button", className: "mt-0.5 block text-xs font-medium text-primary hover:underline [@media(pointer:coarse)]:min-h-11", onClick: (e) => { e.preventDefault(); const next = [...lines]; next[idx] = { ...next[idx], price_mode: "auto", price_key: null, price_error: false }; setLines(next); }, children: "Prijs opnieuw ophalen" }))] }), _jsxs("div", { className: "grow basis-[7.5rem] @[60rem]:basis-auto order-3 @[60rem]:order-none", children: [_jsx("span", { className: "mb-1 block text-xs text-muted-foreground @[60rem]:sr-only", children: "Totaal" }), _jsx("div", { className: "flex h-9 items-center text-sm font-medium tabular-nums text-foreground @[60rem]:justify-end", children: line.product_id ? eur(lineInfo[idx].total) : "—" })] }), _jsx("div", { className: "order-2 flex shrink-0 justify-end @[60rem]:order-none", children: _jsx(Button, { variant: "ghost", size: "icon", className: "h-9 w-9 [@media(pointer:coarse)]:h-11 [@media(pointer:coarse)]:w-11", onClick: () => setLines(lines.filter((_, i) => i !== idx)), "aria-label": "Regel verwijderen", children: _jsx(Trash2, { className: "h-4 w-4" }) }) }), line.product_id && (() => {
|
|
967
|
+
const opts = stickerOpts[line.product_id] ?? null;
|
|
968
|
+
const ontbreekt = stickerOntbreekt(line, customerIsUuid ? opts : null);
|
|
969
|
+
const open = line.details_open === true || ontbreekt;
|
|
970
|
+
const naam = (id, lijst) => (id ? lijst?.find((o) => o.id === id)?.naam ?? null : null);
|
|
971
|
+
const samenvatting = [
|
|
972
|
+
naam(line.product_sticker_id, opts?.product) ? `Productsticker: ${naam(line.product_sticker_id, opts?.product)}` : null,
|
|
973
|
+
naam(line.fust_sticker_id, opts?.fust) ? `Fuststicker: ${naam(line.fust_sticker_id, opts?.fust)}` : null,
|
|
974
|
+
regelVeldenTekst(line.line_fields),
|
|
975
|
+
line.line_note?.trim() ? `Opmerking: ${line.line_note.trim()}` : null,
|
|
976
|
+
].filter(Boolean).join(" · ");
|
|
977
|
+
return (_jsxs("div", { className: "order-4 basis-full @[60rem]:order-none @[60rem]:col-span-full", children: [_jsxs("button", { type: "button", className: "flex min-h-9 w-full items-center gap-2 text-left text-xs text-muted-foreground hover:text-foreground [@media(pointer:coarse)]:min-h-11", "aria-expanded": open, onClick: () => { const next = [...lines]; next[idx] = { ...next[idx], details_open: !open }; setLines(next); }, children: [_jsx(ChevronUp, { className: `h-3.5 w-3.5 shrink-0 transition-transform ${open ? "" : "rotate-180"}`, "aria-hidden": true }), _jsx("span", { className: "font-medium text-foreground", children: "Sticker, opmerking en extra velden" }), ontbreekt && _jsxs("span", { className: "inline-flex items-center gap-1 text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "h-3.5 w-3.5", "aria-hidden": true }), " sticker ontbreekt"] }), !open && samenvatting && _jsx("span", { className: "min-w-0 truncate", children: samenvatting })] }), open && (_jsxs("div", { className: "mt-2 rounded-lg bg-muted/40 p-3", children: [stickerFout && _jsx("div", { className: "mb-2 text-xs text-destructive", children: stickerFout }), !customerIsUuid && _jsx("div", { className: "mb-2 text-xs text-muted-foreground", children: "Kies eerst een klant om stickers en extra velden te zien." }), _jsx(RegelGegevensVelden, { idPrefix: `regel-${idx}`, value: {
|
|
978
|
+
productStickerId: line.product_sticker_id ?? null,
|
|
979
|
+
fustStickerId: line.fust_sticker_id ?? null,
|
|
980
|
+
note: line.line_note ?? "",
|
|
981
|
+
fields: line.line_fields ?? [],
|
|
982
|
+
}, opties: customerIsUuid ? opts : null, optiesLaden: customerIsUuid && stickerQ.isFetching && !opts, definities: fieldDefs, needsSticker: line.needs_sticker === true, klantLink: stickerKlantLink, onChange: (patch) => {
|
|
983
|
+
const next = [...lines];
|
|
984
|
+
const cur = next[idx];
|
|
985
|
+
next[idx] = {
|
|
986
|
+
...cur,
|
|
987
|
+
...(patch.productStickerId !== undefined ? { product_sticker_id: patch.productStickerId, sticker_choice_for: cur.product_id } : {}),
|
|
988
|
+
...(patch.fustStickerId !== undefined ? { fust_sticker_id: patch.fustStickerId, sticker_choice_for: cur.product_id } : {}),
|
|
989
|
+
...(patch.note !== undefined ? { line_note: patch.note } : {}),
|
|
990
|
+
...(patch.fields !== undefined ? { line_fields: patch.fields } : {}),
|
|
991
|
+
};
|
|
992
|
+
setLines(next);
|
|
993
|
+
} })] }))] }));
|
|
994
|
+
})()] }, idx));
|
|
888
995
|
}) }), _jsxs("div", { className: "mt-3 flex flex-col gap-3 border-t border-border pt-3 sm:flex-row sm:items-center sm:justify-between", children: [_jsxs(Button, { variant: "outline", className: "h-9 w-full sm:w-auto [@media(pointer:coarse)]:h-11", onClick: addLine, children: [_jsx(Plus, { className: "mr-1 h-4 w-4" }), " Regel toevoegen"] }), _jsxs("div", { className: "flex flex-wrap items-center gap-x-5 gap-y-1 text-sm tabular-nums", children: [_jsxs("span", { className: "text-muted-foreground", children: ["Fusten ", _jsx("span", { className: "font-medium text-foreground", children: totals.crates })] }), _jsxs("span", { className: "text-muted-foreground", children: ["Stuks ", _jsx("span", { className: "font-medium text-foreground", children: totals.stuks.toLocaleString("nl-NL") })] }), _jsxs("span", { className: "text-muted-foreground", children: ["Totaal ", _jsx("span", { className: "font-semibold text-foreground", children: eur(totals.amount) })] })] })] }), stockCheck && stockCheck.shortages.length > 0 && !stockBlocked && (_jsx("div", { className: "mt-3 rounded-lg bg-warning-soft p-2.5 text-xs text-warning-soft-foreground", children: "Uitleveren zonder voorraad staat aan: de bestelling kan met tekort worden aangemaakt." }))] }), _jsxs("section", { className: cardCls, children: [_jsx("h2", { className: h2, children: "Aanvullend" }), _jsxs("div", { className: "mt-4 grid gap-4", children: [_jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { className: fieldLabel, children: "Referentie klant" }), _jsx(Input, { value: customerReference, maxLength: 100, className: "h-9 [@media(pointer:coarse)]:h-11", onChange: (e) => setCustomerReference(e.target.value), placeholder: "Optioneel, bijvoorbeeld het bestelnummer van je klant" })] }), _jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { className: fieldLabel, children: "Opmerkingen" }), _jsx(Textarea, { value: notes, onChange: (e) => setNotes(e.target.value), placeholder: "Optionele notities bij deze bestelling", rows: 3 })] })] })] })] }), _jsx("aside", { className: "min-w-0", children: _jsxs("div", { className: `${cardCls} space-y-4 xl:sticky xl:top-4`, children: [_jsx("h2", { className: h2, children: "Samenvatting" }), summaryRows, missingBlock, attentionBlock, createButton(), _jsx(Button, { variant: "ghost", className: "h-9 w-full [@media(pointer:coarse)]:h-11", onClick: () => navigate({ to: "/floriday-verkoop/verkooporders" }), disabled: createMut.isPending, children: "Annuleren" })] }) })] }), _jsxs("div", { className: "sticky bottom-0 z-30 -mx-4 border-t border-border bg-background/95 px-4 pt-3 backdrop-blur sm:-mx-6 sm:px-6 xl:hidden", style: { paddingBottom: "max(12px, env(safe-area-inset-bottom))" }, children: [mobileSummaryOpen && (_jsxs("div", { className: "mb-3 max-h-[50vh] space-y-3 overflow-y-auto", children: [summaryRows, missingBlock, attentionBlock] })), _jsxs("button", { type: "button", className: "mb-2 flex w-full items-center justify-between gap-3 text-left [@media(pointer:coarse)]:min-h-11", onClick: () => setMobileSummaryOpen((o) => !o), "aria-expanded": mobileSummaryOpen, children: [_jsxs("span", { className: "min-w-0", children: [_jsx("span", { className: "block truncate text-xs text-muted-foreground", children: momentText ? `Ophalen: ${momentText.replace(/^ophalen /, "")}` : missing.length > 0 ? `${missing.length} ontbreekt nog` : attention.length > 0 ? `${attention.length} aandachtspunt${attention.length === 1 ? "" : "en"}` : "Alles is compleet" }), _jsx("span", { className: "block text-base font-semibold tabular-nums text-foreground", children: eur(totals.amount) })] }), _jsx(ChevronUp, { className: `h-5 w-5 shrink-0 text-muted-foreground transition-transform ${mobileSummaryOpen ? "" : "rotate-180"}` })] }), createButton("h-12")] }), groepKeuze && (() => {
|
|
889
996
|
const leden = groepLeden(groepKeuze.groep, products);
|
|
890
997
|
const groepNaam = String(groepKeuze.groep.product ?? "").replace(/^\s*\[Groep\]\s*/i, "");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AAuDA,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC,
|
|
1
|
+
{"version":3,"file":"EditLocalOrderDialog.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/EditLocalOrderDialog.tsx"],"names":[],"mappings":"AAuDA,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC,sCAunBA"}
|
|
@@ -29,6 +29,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
29
29
|
const [deliveryDate, setDeliveryDate] = useState("");
|
|
30
30
|
const [isReservation, setIsReservation] = useState(false);
|
|
31
31
|
const [vervoerSoortV, setVervoerSoortV] = useState(null);
|
|
32
|
+
const [floridayCarrierNotice, setFloridayCarrierNotice] = useState(null);
|
|
32
33
|
const [items, setItems] = useState([]);
|
|
33
34
|
const [canEditProducts, setCanEditProducts] = useState(true);
|
|
34
35
|
const [priceLock, setPriceLock] = useState(null);
|
|
@@ -59,6 +60,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
59
60
|
setDeliveryDate((r.deliveryDate ?? "").slice(0, 10));
|
|
60
61
|
setIsReservation(!!r.isReservation);
|
|
61
62
|
setVervoerSoortV(r.vervoerSoort ?? null);
|
|
63
|
+
setFloridayCarrierNotice(r.floridayCarrierNotice ?? null);
|
|
62
64
|
setCanEditProducts(r.canEditProducts !== false);
|
|
63
65
|
setPriceLock(r.priceLock ?? null);
|
|
64
66
|
setShippedLock(r.shippedLock ?? null);
|
|
@@ -301,7 +303,7 @@ export function EditLocalOrderDialog({ orderId, open, onOpenChange, }) {
|
|
|
301
303
|
setSaving(false);
|
|
302
304
|
}
|
|
303
305
|
};
|
|
304
|
-
return (_jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4", onClick: () => !saving && onOpenChange(false), children: _jsxs("div", { className: "flex w-full max-w-4xl max-h-[90vh] flex-col rounded-lg border border-border bg-card shadow-lg", onClick: (e) => e.stopPropagation(), children: [_jsxs("div", { className: "shrink-0 p-6 pb-4", children: [_jsx("h2", { className: "text-lg font-semibold text-foreground", children: "Bestelling bewerken" }), _jsxs("p", { className: "mt-1 text-sm text-muted-foreground", children: ["Pas de ", datumLabel(vervoerSoortV).toLowerCase(), " en het aantal planten of fusten per regel aan. Voorraad en karindeling worden automatisch bijgewerkt."] })] }), _jsxs("div", { className: "flex-1 overflow-y-auto px-6 pb-4 min-h-0", children: [loading ? (_jsx("div", { className: "text-sm text-muted-foreground", children: "Laden\u2026" })) : error ? (_jsx("div", { className: "rounded border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive", children: error })) : (_jsxs("fieldset", { disabled: !!shippedLock, className: "min-w-0", children: [slotDragers.length > 0 && (_jsxs("div", { className: "mb-4 space-y-2", children: [_jsx(KarSlotMelding, { slot: slotDragers[0], orderId: orderId }), _jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: EXTRA_KAR_MELDING })] })), shippedLock && (_jsx("div", { className: "mb-4 rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: shippedLock })), _jsxs("div", { className: "space-y-4", children: [!isReservation && (_jsxs("div", { children: [_jsx("label", { className: "mb-1 block text-sm font-medium text-foreground", children: datumLabel(vervoerSoortV) }), _jsx(Input, { type: "date", value: deliveryDate, onChange: (e) => setDeliveryDate(e.target.value) })] })), isReservation && (_jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Dit is een reservering \u2014 er is nog geen leverdatum. Voeg een bezorgmoment toe om (deels) uit te leveren." })), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-medium text-foreground", children: "Regels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 px-1 text-xs text-muted-foreground", children: [_jsx("div", { className: "col-span-5", children: "Product" }), _jsx("div", { className: "col-span-1 text-center", children: "Sticker" }), _jsx("div", { className: "col-span-3", children: "Planten" }), _jsx("div", { className: "col-span-3", children: "Fusten" })] }), _jsxs("div", { className: "mt-1 space-y-2", children: [priceLock && _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Prijs wijzigen kan niet: ", priceLock] }), items.map((it, idx) => {
|
|
306
|
+
return (_jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4", onClick: () => !saving && onOpenChange(false), children: _jsxs("div", { className: "flex w-full max-w-4xl max-h-[90vh] flex-col rounded-lg border border-border bg-card shadow-lg", onClick: (e) => e.stopPropagation(), children: [_jsxs("div", { className: "shrink-0 p-6 pb-4", children: [_jsx("h2", { className: "text-lg font-semibold text-foreground", children: "Bestelling bewerken" }), _jsxs("p", { className: "mt-1 text-sm text-muted-foreground", children: ["Pas de ", datumLabel(vervoerSoortV).toLowerCase(), " en het aantal planten of fusten per regel aan. Voorraad en karindeling worden automatisch bijgewerkt."] })] }), _jsxs("div", { className: "flex-1 overflow-y-auto px-6 pb-4 min-h-0", children: [loading ? (_jsx("div", { className: "text-sm text-muted-foreground", children: "Laden\u2026" })) : error ? (_jsx("div", { className: "rounded border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive", children: error })) : (_jsxs("fieldset", { disabled: !!shippedLock, className: "min-w-0", children: [slotDragers.length > 0 && (_jsxs("div", { className: "mb-4 space-y-2", children: [_jsx(KarSlotMelding, { slot: slotDragers[0], orderId: orderId }), _jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: EXTRA_KAR_MELDING })] })), shippedLock && (_jsx("div", { className: "mb-4 rounded border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", children: shippedLock })), _jsxs("div", { className: "space-y-4", children: [floridayCarrierNotice && (_jsxs("div", { role: "status", className: "rounded border border-warning/40 bg-warning-soft px-3 py-2 text-sm text-warning-soft-foreground", children: [_jsx("span", { className: "font-medium", children: "Vervoer:" }), " ", floridayCarrierNotice] })), !isReservation && (_jsxs("div", { children: [_jsx("label", { className: "mb-1 block text-sm font-medium text-foreground", children: datumLabel(vervoerSoortV) }), _jsx(Input, { type: "date", value: deliveryDate, onChange: (e) => setDeliveryDate(e.target.value) })] })), isReservation && (_jsx("div", { className: "rounded border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Dit is een reservering \u2014 er is nog geen leverdatum. Voeg een bezorgmoment toe om (deels) uit te leveren." })), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-medium text-foreground", children: "Regels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 px-1 text-xs text-muted-foreground", children: [_jsx("div", { className: "col-span-5", children: "Product" }), _jsx("div", { className: "col-span-1 text-center", children: "Sticker" }), _jsx("div", { className: "col-span-3", children: "Planten" }), _jsx("div", { className: "col-span-3", children: "Fusten" })] }), _jsxs("div", { className: "mt-1 space-y-2", children: [priceLock && _jsxs("div", { className: "text-xs text-muted-foreground", children: ["Prijs wijzigen kan niet: ", priceLock] }), items.map((it, idx) => {
|
|
305
307
|
const ppc = it.plantsPerCrate;
|
|
306
308
|
const fusten = ppc !== null ? Math.ceil(it.quantity / ppc) : 0;
|
|
307
309
|
const removed = removedIds.includes(it.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,EACd,SAAS,GACV,EAAE;IACD,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+
|
|
1
|
+
{"version":3,"file":"OrderCarrierPicker.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderCarrierPicker.tsx"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,aAAqB,EACrB,OAAe,EACf,MAAc,EACd,SAAS,GACV,EAAE;IACD,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,+BA8GA"}
|
|
@@ -49,6 +49,7 @@ export function OrderCarrierPicker({ orderId, applyToBuffer = false, compact = f
|
|
|
49
49
|
if (!res.ok || res.results.length > 1)
|
|
50
50
|
setResults(res.results);
|
|
51
51
|
await qc.invalidateQueries({ queryKey: ["order-carrier"] });
|
|
52
|
+
await qc.invalidateQueries({ queryKey: ["order-transport"] });
|
|
52
53
|
await qc.invalidateQueries({ queryKey: ["sales-orders"] });
|
|
53
54
|
}
|
|
54
55
|
catch (e) {
|
|
@@ -6,6 +6,7 @@ export declare function useOrderTransport(orderId: string | null | undefined, en
|
|
|
6
6
|
deliveryDate: string | null;
|
|
7
7
|
carrier: import("../../lib/carrier-resolve.js").ResolvedCarrier;
|
|
8
8
|
carrierGln: string | null;
|
|
9
|
+
floridayCarrierNotice: string | null;
|
|
9
10
|
own: boolean;
|
|
10
11
|
ownKind: string | null;
|
|
11
12
|
ownPickup: {
|
|
@@ -16,6 +17,14 @@ export declare function useOrderTransport(orderId: string | null | undefined, en
|
|
|
16
17
|
lockReason: import("../../lib/own-transport.js").PickupLockReason;
|
|
17
18
|
lockKnown: boolean;
|
|
18
19
|
}, Error>;
|
|
20
|
+
/** Melding bij Vervoer: transporteur in Floriday wijkt af van de gekozen vervoerder (alleen weergave). */
|
|
21
|
+
export declare function FloridayCarrierNoticeText({ text }: {
|
|
22
|
+
text: string;
|
|
23
|
+
}): import("react").JSX.Element;
|
|
24
|
+
/** Zelfde melding voor meerdere orders (groep); per order met ordernummer als er meer zijn. */
|
|
25
|
+
export declare function FloridayCarrierNotices({ orderIds }: {
|
|
26
|
+
orderIds: string[];
|
|
27
|
+
}): import("react").JSX.Element | null;
|
|
19
28
|
/** "do 29 okt 15:00" uit { date, time }. */
|
|
20
29
|
export declare function ownPickupText(p: {
|
|
21
30
|
date: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderTransportCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderTransportCard.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAcjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,yCAA0C,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,UAAO
|
|
1
|
+
{"version":3,"file":"OrderTransportCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderTransportCard.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAcjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,yCAA0C,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,UAAO;;;;;;;;;;;;;;;UAQnF;AAED,0GAA0G;AAC1G,wBAAgB,yBAAyB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAMnE;AAED,+FAA+F;AAC/F,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,sCAkB1E;AAED,4CAA4C;AAC5C,wBAAgB,aAAa,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIjG;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,UAAmC,EAAE,EAAE;IACpH,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,+BAuCA;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,+BAyF9H;AAED,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,sCAWrE"}
|
|
@@ -10,7 +10,7 @@ import { OrderPickupMomentPicker } from "./OrderPickupMomentPicker.js";
|
|
|
10
10
|
import { usePickupMoment } from "../../lib/usePickupMoment.js";
|
|
11
11
|
import { formatMoment } from "../../lib/order-departure.js";
|
|
12
12
|
import { dateWithWeekday } from "../../lib/create-order-form.js";
|
|
13
|
-
import { getOrderTransport, setOrderOwnPickupTime } from "../../lib/order-transport.functions.js";
|
|
13
|
+
import { getFloridayCarrierNotices, getOrderTransport, setOrderOwnPickupTime } from "../../lib/order-transport.functions.js";
|
|
14
14
|
import { OWN_PICKUP_LOCKED_TEXT, OWN_PICKUP_MISSING_TEXT, OWN_PICKUP_UNKNOWN_TEXT, ownPickupLabel, ownPickupPlannedText, ownPickupView } from "../../lib/own-transport.js";
|
|
15
15
|
import { formatLoadUnits } from "../../lib/load-carrier-labels.js";
|
|
16
16
|
import { formatDelivery, deliveryHasTimeFor, deliveryIsWallClockFor } from "../../lib/delivery-format.js";
|
|
@@ -24,6 +24,25 @@ export function useOrderTransport(orderId, enabled = true) {
|
|
|
24
24
|
staleTime: 30000,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
+
/** Melding bij Vervoer: transporteur in Floriday wijkt af van de gekozen vervoerder (alleen weergave). */
|
|
28
|
+
export function FloridayCarrierNoticeText({ text }) {
|
|
29
|
+
return (_jsxs("div", { role: "status", className: "mt-1 flex items-start gap-1.5 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", _jsx("span", { children: text })] }));
|
|
30
|
+
}
|
|
31
|
+
/** Zelfde melding voor meerdere orders (groep); per order met ordernummer als er meer zijn. */
|
|
32
|
+
export function FloridayCarrierNotices({ orderIds }) {
|
|
33
|
+
const fetchN = useServerFn(getFloridayCarrierNotices);
|
|
34
|
+
const ids = orderIds.filter(Boolean);
|
|
35
|
+
const q = useQuery({
|
|
36
|
+
queryKey: ["order-transport", "floriday-carrier", ...ids],
|
|
37
|
+
queryFn: () => fetchN({ data: { orderIds: ids } }),
|
|
38
|
+
enabled: ids.length > 0,
|
|
39
|
+
staleTime: 30000,
|
|
40
|
+
});
|
|
41
|
+
const rows = q.data ?? [];
|
|
42
|
+
if (!rows.length)
|
|
43
|
+
return null;
|
|
44
|
+
return (_jsx("div", { className: "space-y-0.5", children: rows.map((r) => (_jsx(FloridayCarrierNoticeText, { text: ids.length > 1 && r.orderNumber ? `${r.orderNumber}: ${r.melding}` : r.melding }, r.orderId))) }));
|
|
45
|
+
}
|
|
27
46
|
/** "do 29 okt 15:00" uit { date, time }. */
|
|
28
47
|
export function ownPickupText(p) {
|
|
29
48
|
if (!p)
|
|
@@ -82,7 +101,7 @@ export function OrderTransportCard({ order, groupSize, extra }) {
|
|
|
82
101
|
const missingOwnTime = view.melding === "invullen";
|
|
83
102
|
const signup = !t?.own && !afgehandeld ? formatMoment(pm.data?.departure?.signupDeadline ?? null) : null;
|
|
84
103
|
const karren = Number(order.karCount ?? 0);
|
|
85
|
-
return (_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer", attention: missingOwnTime, action: !locked ? (_jsx(Button, { size: "sm", variant: "ghost", className: "[@media(pointer:coarse)]:h-11", onClick: () => setChanging((v) => !v), "aria-expanded": changing, children: changing ? "Klaar" : "Vervoerder wijzigen" })) : undefined, children: [(groupSize ?? 0) > 1 && (_jsxs("div", { className: "mb-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: ["Vervoerder en ophaalmoment gelden voor alle ", groupSize, " orders in deze groep."] })), missingOwnTime && (_jsxs("div", { role: "status", className: "mb-2 flex items-start gap-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", OWN_PICKUP_MISSING_TEXT] })), view.melding === "onbekend" && !t?.ownPickup && (_jsx("div", { role: "status", className: "mb-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: OWN_PICKUP_UNKNOWN_TEXT })), locked ? (
|
|
104
|
+
return (_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer", attention: missingOwnTime, action: !locked ? (_jsx(Button, { size: "sm", variant: "ghost", className: "[@media(pointer:coarse)]:h-11", onClick: () => setChanging((v) => !v), "aria-expanded": changing, children: changing ? "Klaar" : "Vervoerder wijzigen" })) : undefined, children: [(groupSize ?? 0) > 1 && (_jsxs("div", { className: "mb-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: ["Vervoerder en ophaalmoment gelden voor alle ", groupSize, " orders in deze groep."] })), missingOwnTime && (_jsxs("div", { role: "status", className: "mb-2 flex items-start gap-2 rounded-lg border border-warning/40 bg-warning-soft px-3 py-2 text-xs font-medium text-warning-soft-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), " ", OWN_PICKUP_MISSING_TEXT] })), view.melding === "onbekend" && !t?.ownPickup && (_jsx("div", { role: "status", className: "mb-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: OWN_PICKUP_UNKNOWN_TEXT })), locked ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: orderId, locked: true, compact: true }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : changing ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: orderId, compact: true, groupSize: groupSize }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : q.isLoading ? (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-muted-foreground", children: "Laden\u2026" }) })) : q.isError ? (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-destructive", children: "Het vervoer kon nu niet worden gelezen. Lukt het later nog niet, neem dan contact op met de beheerder." }) })) : hasCarrier ? (_jsxs(InfoRow, { label: "Vervoerder", children: [_jsxs("span", { className: "inline-flex flex-wrap items-center gap-2", children: [_jsx("span", { children: carrier.carrierName }), _jsx(Badge, { variant: "outline", className: "text-xs", children: manual ? "Handmatig" : "Automatisch" })] }), t?.floridayCarrierNotice && _jsx(FloridayCarrierNoticeText, { text: t.floridayCarrierNotice })] })) : (_jsx(InfoRow, { label: "Vervoerder", children: _jsx("span", { className: "text-sm text-muted-foreground", children: "Nog geen vervoerder" }) })), !locked && t?.own && !view.editable && !t.ownPickup ? (_jsx(InfoRow, { label: ownPickupLabel(t.ownKind), children: _jsxs("div", { className: "space-y-0.5", children: [view.kopTijd && _jsx("div", { className: "tabular-nums", children: view.kopTijd }), view.melding === "planning" && _jsx("div", { className: "text-xs text-muted-foreground", children: ownPickupPlannedText(view.plannedTime) })] }) })) : !locked && t?.own ? (_jsx(InfoRow, { label: ownPickupLabel(t.ownKind), children: _jsx(OwnPickupEditor, { orderId: orderId, kind: t.ownKind, current: t.ownPickup, defaultDate: t.deliveryDate, locked: t.locked, lockedText: t.lockReason === "onbekend" ? OWN_PICKUP_UNKNOWN_TEXT : OWN_PICKUP_LOCKED_TEXT }, `${t.ownPickup?.date ?? ""}|${t.ownPickup?.time ?? ""}`) })) : !locked && t && !t.own ? (_jsx(InfoRow, { label: "Ophaalmoment", children: _jsx(OrderPickupMomentPicker, { orderId: orderId, pickupOnly: true, compact: true }) })) : null, signup && _jsx(InfoRow, { label: "Aanmelden v\u00F3\u00F3r", children: signup }), t?.carrierGln && _jsx(InfoRow, { label: "GLN vervoerder", children: t.carrierGln }), order.cartTypeName && _jsx(InfoRow, { label: "Ladingdrager", children: order.cartTypeName }), karren > 0 && _jsx(InfoRow, { label: "Karren", children: formatLoadUnits(karren, order.cartTypeName ?? null) }), extra] }));
|
|
86
105
|
}
|
|
87
106
|
/** Kopregel van een handmatige order: "Ophalen do 29 okt 15:00 · Levering vr 30 okt 08:00". */
|
|
88
107
|
export function PickupDeliveryLine({ order }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrderDetailPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailPage.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SalesOrderDetailPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailPage.tsx"],"names":[],"mappings":"AAwIA,wBAAgB,oBAAoB,gCA6WnC"}
|
|
@@ -23,6 +23,7 @@ import { useSalesOrdersQuery } from "../../lib/useSalesOrdersQuery.js";
|
|
|
23
23
|
import { useBufferEvents } from "../../lib/useBufferEvents.js";
|
|
24
24
|
import { useSalesOrderDetailQuery } from "../../lib/useSalesOrderDetailQuery.js";
|
|
25
25
|
import { useLocalSalesOrderDetailQuery } from "../../lib/useLocalSalesOrderDetailQuery.js";
|
|
26
|
+
import { localIdFallback } from "../../lib/order-nav.js";
|
|
26
27
|
import { getOrderAddresses } from "../../lib/order-addresses.functions.js";
|
|
27
28
|
import { orderStageLabel, orderStageBadgeClass } from "../../lib/order-status.js";
|
|
28
29
|
import { useDetailProgressFallback } from "../../lib/useDetailProgressFallback.js";
|
|
@@ -33,7 +34,7 @@ import { OrderStepper } from "./v3/OrderStepper.js";
|
|
|
33
34
|
import { NavigationTooltip } from "./v3/NavigationTooltip.js";
|
|
34
35
|
import { FactTile, InfoCard, InfoRow } from "./v3/InfoCard.js";
|
|
35
36
|
import { KLANT_HAALT_ZELF_OP } from "../../lib/own-transport.js";
|
|
36
|
-
import { PickupDeliveryLine, useOrderTransport } from "./OrderTransportCard.js";
|
|
37
|
+
import { FloridayCarrierNotices, PickupDeliveryLine, useOrderTransport } from "./OrderTransportCard.js";
|
|
37
38
|
import { groepZonderGeannuleerd, kanLidAnnuleren } from "../../lib/order-cancel-view.js";
|
|
38
39
|
import { geannuleerdMelding } from "../../lib/order-terugdraaien.js";
|
|
39
40
|
import { cancelLocalOrder } from "../../lib/create-order.functions.js";
|
|
@@ -101,16 +102,20 @@ export function SalesOrderDetailPage() {
|
|
|
101
102
|
const { weergave } = useSearch({ from: "/_authenticated/floriday-verkoop/verkooporders/$salesOrderId" });
|
|
102
103
|
const singleInGroup = weergave === "order";
|
|
103
104
|
const cached = useListRow(salesOrderId);
|
|
104
|
-
const
|
|
105
|
+
const isLocalPrefix = salesOrderId.startsWith("local:");
|
|
105
106
|
const isMailboxProposal = salesOrderId.startsWith("mailbox-proposal:");
|
|
106
|
-
const isFloriday = !isLocal && !isMailboxProposal;
|
|
107
107
|
// Kaartgegevens tegelijk met de order ophalen (geen tweede wachtronde).
|
|
108
108
|
useOrderDetailPrefetch(salesOrderId, { reservation: cached.row?.isReservation ?? null });
|
|
109
109
|
// Floriday-orders: gerichte, snelle per-order fetch.
|
|
110
|
-
const detailQuery = useSalesOrderDetailQuery(
|
|
110
|
+
const detailQuery = useSalesOrderDetailQuery(!isLocalPrefix && !isMailboxProposal ? salesOrderId : null);
|
|
111
|
+
// De route accepteert ook het kale orders.id: geen Floriday-order met dit id → eigen order.
|
|
112
|
+
const kaalId = localIdFallback(salesOrderId, detailQuery.data ? { order: detailQuery.data.order ?? null } : null);
|
|
113
|
+
const isLocal = isLocalPrefix || !!kaalId;
|
|
114
|
+
const isFloriday = !isLocal && !isMailboxProposal;
|
|
115
|
+
const localDetailId = isLocalPrefix ? salesOrderId : kaalId;
|
|
111
116
|
// Lokale orders: eveneens gericht ophalen, onafhankelijk van paginering en
|
|
112
117
|
// filters in de algemene verkooplijst.
|
|
113
|
-
const localDetailQuery = useLocalSalesOrderDetailQuery(
|
|
118
|
+
const localDetailQuery = useLocalSalesOrderDetailQuery(localDetailId);
|
|
114
119
|
// Alleen mailbox-orders hebben de algemene lijst nog nodig. Lokale en
|
|
115
120
|
// Floriday-details hebben een eigen gerichte bron; een tweede beschermde
|
|
116
121
|
// aanvraag kan hun detailweergave dus niet meer verstoren.
|
|
@@ -194,8 +199,8 @@ export function SalesOrderDetailPage() {
|
|
|
194
199
|
const bufferCartsQ = useBufferCarts(isBuffer ? bufferId : null);
|
|
195
200
|
const engineBuffer = bufferCartsQ.data?.carts ?? null;
|
|
196
201
|
const [editOpen, setEditOpen] = useState(false);
|
|
197
|
-
const rawLocalId = isLocal &&
|
|
198
|
-
?
|
|
202
|
+
const rawLocalId = isLocal && localDetailId?.startsWith("local:")
|
|
203
|
+
? localDetailId.slice("local:".length)
|
|
199
204
|
: null;
|
|
200
205
|
// Factuurstand + pickvoortgang komen mee in het detailverzoek (geen tweede ronde).
|
|
201
206
|
const qcSeed = useQueryClient();
|
|
@@ -262,7 +267,7 @@ export function SalesOrderDetailPage() {
|
|
|
262
267
|
: `${sourceLabel(sources[0])}-order` }), isBuffer && fTotal > 0 && (_jsxs("p", { className: "text-xs font-medium tabular-nums text-foreground", children: ["Afgemeld: ", fDone, " van ", fTotal] })), !isBuffer && isLocal && _jsx(PickupDeliveryLine, { order: head }), !isBuffer && fmtDT(head.orderedAt) && (_jsxs("p", { className: "text-xs text-muted-foreground", children: ["Ontvangen op ", fmtDT(head.orderedAt)] }))] })] }), rawLocalId && !isBuffer && (_jsxs(Button, { variant: "outline", size: "sm", onClick: () => setEditOpen(true), disabled: !primary, className: "w-full sm:w-auto", children: [_jsx(Pencil, { className: "mr-2 h-4 w-4" }), " Bestelling bewerken"] }))] })), singleInGroup && inGroup && primary && (_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2 rounded-xl border border-primary/30 bg-primary/5 px-4 py-3 text-sm", children: [_jsxs("span", { className: "inline-flex items-center gap-2 text-foreground", children: [_jsx(Layers, { className: "h-4 w-4 text-primary" }), " Onderdeel van een samengevoegde order met ", bufferOrders.length, " orders"] }), _jsx(Button, { asChild: true, variant: "outline", size: "sm", children: _jsx(Link, { to: "/floriday-verkoop/verkooporders/$salesOrderId", params: { salesOrderId }, children: "Naar samengevoegde weergave" }) })] })), primary && _jsx(OrderStepper, { members: membersFor(isBuffer ? bufferOrders : [primary]), features: features, invoiceLoad: invoiceLoad }), isLoading && !primary && _jsx(DetailSkeleton, {}), error && !primary && (() => {
|
|
263
268
|
const f = friendlyLoadError(error);
|
|
264
269
|
return (_jsxs("div", { role: "alert", className: "flex items-start gap-3 rounded-xl border border-destructive/30 bg-destructive-soft p-4 text-sm", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-5 w-5 shrink-0 text-destructive" }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "font-medium text-foreground", children: f.text }), _jsxs("details", { className: "mt-1 text-xs text-muted-foreground", children: [_jsx("summary", { className: "cursor-pointer", children: "Technische details" }), f.tech] })] }), _jsx(Button, { size: "sm", variant: "outline", onClick: () => activeQuery.refetch(), children: "Opnieuw" })] }));
|
|
265
|
-
})(), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-xl border border-border bg-card p-8 text-center text-sm text-muted-foreground shadow-sm", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(Euro, {}), label: "Totale omzet", value: eur.format(totals.revenue), sub: `${bufferOrders.length} orders` }), _jsx(FactTile, { icon: _jsx(Boxes, {}), label: "Karren", value: engineBuffer ? engineBuffer.karren : totals.karren == null ? "Nog niet bekend" : formatLoadUnits(totals.karren, totals.cartType), sub: engineBuffer && engineBuffer.ladingdragers.length > 0 ? ladingdragerSummary(engineBuffer) : undefined }), _jsx(FactTile, { icon: _jsx(Layers, {}), label: "Fust", value: formatLoadUnits(totals.fusten, totals.crateType) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: primary.customer.name, sub: primary.customer.legalName ?? undefined })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx(InfoCard, { icon: _jsx(Layers, {}), title: `Orders in deze groep (${bufferOrders.length})`, children: _jsx("div", { className: "space-y-3", children: bufferOrders.map((o) => (_jsx(BufferOrderRow, { order: o, member: membersFor([o])[0], sellerFallback: sellerFallback }, o.id))) }) }), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-semibold text-foreground", children: "Gecombineerde karindeling" }), _jsx(OrderKarindelingCard, { order: primary, pickProgress: bufferPickProgress(engineBuffer, membersFor(bufferOrders).map((m) => m.pickProgress ?? null)) })] })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer en ophalen", children: [
|
|
270
|
+
})(), !isLoading && !error && !primary && (_jsx("div", { className: "rounded-xl border border-border bg-card p-8 text-center text-sm text-muted-foreground shadow-sm", children: "Order niet gevonden." })), primary && isBuffer && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4", children: [_jsx(FactTile, { icon: _jsx(Euro, {}), label: "Totale omzet", value: eur.format(totals.revenue), sub: `${bufferOrders.length} orders` }), _jsx(FactTile, { icon: _jsx(Boxes, {}), label: "Karren", value: engineBuffer ? engineBuffer.karren : totals.karren == null ? "Nog niet bekend" : formatLoadUnits(totals.karren, totals.cartType), sub: engineBuffer && engineBuffer.ladingdragers.length > 0 ? ladingdragerSummary(engineBuffer) : undefined }), _jsx(FactTile, { icon: _jsx(Layers, {}), label: "Fust", value: formatLoadUnits(totals.fusten, totals.crateType) }), _jsx(FactTile, { icon: _jsx(User, {}), label: "Klant", value: primary.customer.name, sub: primary.customer.legalName ?? undefined })] }), _jsxs("div", { className: "grid grid-cols-1 gap-4 lg:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]", children: [_jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx(InfoCard, { icon: _jsx(Layers, {}), title: `Orders in deze groep (${bufferOrders.length})`, children: _jsx("div", { className: "space-y-3", children: bufferOrders.map((o) => (_jsx(BufferOrderRow, { order: o, member: membersFor([o])[0], sellerFallback: sellerFallback }, o.id))) }) }), _jsxs("div", { children: [_jsx("div", { className: "mb-2 text-sm font-semibold text-foreground", children: "Gecombineerde karindeling" }), _jsx(OrderKarindelingCard, { order: primary, pickProgress: bufferPickProgress(engineBuffer, membersFor(bufferOrders).map((m) => m.pickProgress ?? null)) })] })] }), _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsxs(InfoCard, { icon: _jsx(Truck, {}), title: "Vervoer en ophalen", children: [_jsxs(InfoRow, { label: "Vervoerder", children: [_jsx(OrderCarrierPicker, { orderId: primary.id, applyToBuffer: true, compact: true, groupSize: bufferOrders.length, locked: bufferOrders.every((o) => !!o.isReservation) }), _jsx(FloridayCarrierNotices, { orderIds: bufferOrders.map((o) => String(o.id)) })] }), _jsxs(InfoRow, { label: "Ophaalmoment", children: [_jsx(OrderPickupMomentPicker, { orderId: primary.id, readOnly: true, compact: true }), _jsxs("div", { className: "mt-1 text-xs font-medium text-warning-soft-foreground", children: ["Geldt voor alle ", bufferOrders.length, " orders in deze groep"] })] }), _jsx(BufferAddresses, { orderId: primary.id })] }), fTotal > 0 && (_jsxs(InfoCard, { icon: _jsx(ReceiptText, {}), title: "Floriday", children: [_jsx(InfoRow, { label: "Floriday-orders", children: _jsx("span", { className: "flex flex-wrap gap-1.5", children: bufferOrders.filter((o) => !o.isLocal && o.orderNumber).map((o) => (_jsx(Badge, { variant: "outline", className: "text-xs", children: o.orderNumber }, o.id))) }) }), _jsxs(InfoRow, { label: "Afgemeld", children: [fDone, " van ", fTotal] })] }))] })] })] })), inGroup && !singleInGroup && rawLocalId && _jsx(EngineBufferCard, { orderId: rawLocalId }), primary && !isBuffer && (_jsx(SalesOrderDetailView, { order: primary, sellerFallback: sellerFallback, members: membersFor([primary]), features: features, groupSize: inGroup ? bufferOrders.length : undefined })), rawLocalId && _jsx(EditLocalOrderDialog, { orderId: rawLocalId, open: editOpen, onOpenChange: setEditOpen })] }));
|
|
266
271
|
}
|
|
267
272
|
function BufferOrderRow({ order, member, sellerFallback }) {
|
|
268
273
|
const [open, setOpen] = useState(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesOrderDetailView.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAmC,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGvH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesOrderDetailView.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/SalesOrderDetailView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAmC,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGvH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAqKnE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,KAAK,EAAE,aAAa,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,+BAkBA"}
|