@flowselections/floriday-verkoop-module 1.0.165 → 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 +163 -70
- 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/KarTekeningSection.d.ts.map +1 -1
- package/dist-lib/components/verkoop/KarTekeningSection.js +31 -7
- 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/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +18 -3
- 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 +16 -8
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +31 -5
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +3 -2
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +2 -1
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieBesluitKnoppen.js +47 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts +10 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectieChip.js +11 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesBalk.js +16 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts +3 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/CorrectiesPage.js +31 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts +7 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OrderCorrectiesCard.js +17 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts +5 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/correcties/OudeOrderCard.js +48 -0
- 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/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/GewijzigdNaPrintCard.js +53 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts +5 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/OrderTijdlijnCard.js +31 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts +11 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.d.ts.map +1 -0
- package/dist-lib/components/verkoop/tijdlijn/useOrderTijdlijn.js +17 -0
- package/dist-lib/index.d.ts +1 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +1 -0
- package/dist-lib/integrations/supabase/types.d.ts +2530 -2
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/integrations/supabase/types.js +1 -0
- package/dist-lib/lib/belading-format.d.ts +3 -2
- package/dist-lib/lib/belading-format.d.ts.map +1 -1
- package/dist-lib/lib/belading-format.js +5 -3
- package/dist-lib/lib/beslis-rollen.server.d.ts +10 -0
- package/dist-lib/lib/beslis-rollen.server.d.ts.map +1 -0
- package/dist-lib/lib/beslis-rollen.server.js +10 -0
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +8 -4
- 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 +163 -56
- package/dist-lib/lib/departure-preview.functions.d.ts.map +1 -1
- package/dist-lib/lib/departure-preview.functions.js +3 -1
- package/dist-lib/lib/engine-tijdlijn.d.ts +69 -0
- package/dist-lib/lib/engine-tijdlijn.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.functions.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.functions.js +47 -0
- package/dist-lib/lib/engine-tijdlijn.js +101 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts +30 -0
- package/dist-lib/lib/engine-tijdlijn.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-tijdlijn.server.js +41 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts +28 -0
- package/dist-lib/lib/floriday-carrier-notice.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.js +44 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts +8 -0
- package/dist-lib/lib/floriday-carrier-notice.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-carrier-notice.server.js +57 -0
- package/dist-lib/lib/floriday-external-fulfillment.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-external-fulfillment.server.js +15 -11
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +58 -42
- package/dist-lib/lib/kar-handmatig.d.ts +7 -1
- package/dist-lib/lib/kar-handmatig.d.ts.map +1 -1
- package/dist-lib/lib/kar-handmatig.js +24 -2
- package/dist-lib/lib/kar-tekening.d.ts +54 -4
- package/dist-lib/lib/kar-tekening.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.js +92 -8
- package/dist-lib/lib/kar-tekening.server.d.ts +5 -0
- package/dist-lib/lib/kar-tekening.server.d.ts.map +1 -1
- package/dist-lib/lib/kar-tekening.server.js +18 -0
- package/dist-lib/lib/logistics-engine.server.d.ts.map +1 -1
- package/dist-lib/lib/logistics-engine.server.js +13 -9
- 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 +40 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +95 -9
- 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-row.server.d.ts.map +1 -1
- package/dist-lib/lib/order-row.server.js +9 -6
- 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/plan-coverage.server.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.server.js +4 -2
- package/dist-lib/lib/sales-corrections.d.ts +44 -0
- package/dist-lib/lib/sales-corrections.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts +92 -0
- package/dist-lib/lib/sales-corrections.functions.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.functions.js +132 -0
- package/dist-lib/lib/sales-corrections.js +129 -0
- package/dist-lib/lib/sales-corrections.server.d.ts +27 -0
- package/dist-lib/lib/sales-corrections.server.d.ts.map +1 -0
- package/dist-lib/lib/sales-corrections.server.js +68 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +17 -11
- 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/step-timer.server.d.ts +13 -0
- package/dist-lib/lib/step-timer.server.d.ts.map +1 -0
- package/dist-lib/lib/step-timer.server.js +33 -0
- package/dist-lib/lib/stock-product-link.server.d.ts.map +1 -1
- package/dist-lib/lib/stock-product-link.server.js +12 -8
- 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/useOpenCorrections.d.ts +17 -0
- package/dist-lib/lib/useOpenCorrections.d.ts.map +1 -0
- package/dist-lib/lib/useOpenCorrections.js +34 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts +9 -0
- package/dist-lib/lib/useOrderDetailPrefetch.d.ts.map +1 -0
- package/dist-lib/lib/useOrderDetailPrefetch.js +45 -0
- 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 +9 -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
|
-
import { korteMelding
|
|
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,35 +199,82 @@ 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).
|
|
210
227
|
useEffect(() => {
|
|
211
|
-
|
|
212
|
-
if (customerId && stickerQ.isFetching)
|
|
228
|
+
if (!fieldDefsKey)
|
|
213
229
|
return;
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
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;
|
|
223
264
|
});
|
|
224
|
-
|
|
225
|
-
|
|
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);
|
|
269
|
+
useEffect(() => {
|
|
270
|
+
const withSticker = new Set(customerId ? Object.entries(stickerOpts).filter(([, o]) => o.product.length > 0).map(([k]) => k) : []);
|
|
271
|
+
if (customerId && stickerQ.isFetching)
|
|
272
|
+
return;
|
|
273
|
+
// Altijd op de nieuwste regels werken: een verouderde kopie wiste eerder een
|
|
274
|
+
// net binnengekomen automatische prijs (bijv. bij "Klant haalt zelf op").
|
|
275
|
+
const want = (l) => !!l.product_id && l.sticker_manual_for !== l.product_id && !!l.needs_sticker !== withSticker.has(l.product_id);
|
|
276
|
+
if (lines.some(want))
|
|
277
|
+
setLines((cur) => cur.map((l) => (want(l) ? { ...l, needs_sticker: withSticker.has(l.product_id) } : l)));
|
|
226
278
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
227
279
|
}, [customerId, stickerQ.data, stickerQ.isFetching, lines]);
|
|
228
280
|
// Beladingen die daadwerkelijk bij de gekozen producten horen.
|
|
@@ -230,6 +282,8 @@ export function CreateOrderPage() {
|
|
|
230
282
|
const beladingQ = useQuery({
|
|
231
283
|
queryKey: ["co-beladingen", selectedProductIds.join(",")],
|
|
232
284
|
enabled: selectedProductIds.length > 0,
|
|
285
|
+
// Vorige opties blijven staan; de belading van het product staat direct op de regel.
|
|
286
|
+
placeholderData: keepPreviousData,
|
|
233
287
|
// Kort vers houden; bij opslaan controleert de server opnieuw.
|
|
234
288
|
staleTime: 15000,
|
|
235
289
|
gcTime: 5 * 60000,
|
|
@@ -288,31 +342,32 @@ export function CreateOrderPage() {
|
|
|
288
342
|
useEffect(() => {
|
|
289
343
|
if (!beladingQ.data)
|
|
290
344
|
return;
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
if (!
|
|
345
|
+
setLines((cur) => {
|
|
346
|
+
let changed = false;
|
|
347
|
+
const next = cur.map((l) => {
|
|
348
|
+
if (!l.product_id)
|
|
349
|
+
return l;
|
|
350
|
+
const opts = beladingByProduct[l.product_id];
|
|
351
|
+
if (!opts || opts.length === 0) {
|
|
352
|
+
if (!l.belading)
|
|
353
|
+
return l;
|
|
354
|
+
changed = true;
|
|
355
|
+
return { ...l, belading: null };
|
|
356
|
+
}
|
|
357
|
+
const cur = l.belading ? beladingKey(l.belading) : null;
|
|
358
|
+
if (cur && opts.some((o) => beladingKey(o) === cur))
|
|
298
359
|
return l;
|
|
360
|
+
const def = opts.find((o) => o.is_default) ?? opts[0];
|
|
299
361
|
changed = true;
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
return {
|
|
309
|
-
...l,
|
|
310
|
-
belading: { plants_per_crate: def.plants_per_crate, crates_per_layer: def.crates_per_layer, layers_per_cart: def.layers_per_cart, crate_code: def.crate_code ?? null, cart_code: def.cart_code ?? null, is_default: true },
|
|
311
|
-
quantity: crates * def.plants_per_crate,
|
|
312
|
-
};
|
|
362
|
+
const crates = Math.max(1, Math.ceil(Number(l.quantity ?? 0) / Math.max(1, l.belading?.plants_per_crate ?? def.plants_per_crate)));
|
|
363
|
+
return {
|
|
364
|
+
...l,
|
|
365
|
+
belading: { plants_per_crate: def.plants_per_crate, crates_per_layer: def.crates_per_layer, layers_per_cart: def.layers_per_cart, crate_code: def.crate_code ?? null, cart_code: def.cart_code ?? null, is_default: true },
|
|
366
|
+
quantity: crates * def.plants_per_crate,
|
|
367
|
+
};
|
|
368
|
+
});
|
|
369
|
+
return changed ? next : cur;
|
|
313
370
|
});
|
|
314
|
-
if (changed)
|
|
315
|
-
setLines(next);
|
|
316
371
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
317
372
|
}, [beladingQ.data]);
|
|
318
373
|
// Afleverlocaties van gekozen klant
|
|
@@ -392,14 +447,15 @@ export function CreateOrderPage() {
|
|
|
392
447
|
// elke toetsaanslag een vraag wordt.
|
|
393
448
|
const fetchPreview = useServerFn(getDeparturePreview);
|
|
394
449
|
const previewInput = useMemo(() =>
|
|
395
|
-
// Zelf ophalen of eigen vervoer met tijd:
|
|
396
|
-
|
|
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
|
|
397
453
|
? {
|
|
398
|
-
carrierId: controle
|
|
454
|
+
carrierId: voorbeeldVervoerderId(controle, carrierId, carrierKindOf(carrierId)),
|
|
399
455
|
deliveryLocation: deliveryLocationId ?? "",
|
|
400
456
|
deliveryDate: deliveryDate || toISODate(new Date()),
|
|
401
|
-
momentKey: controle === "
|
|
402
|
-
ownTransport: controle
|
|
457
|
+
momentKey: controle === "vervoerder" ? momentKey : null,
|
|
458
|
+
ownTransport: controle !== "vervoerder",
|
|
403
459
|
selKey,
|
|
404
460
|
}
|
|
405
461
|
: null, [canPickDate, isReservation, carrierId, deliveryLocationId, deliveryDate, momentKey, controle, selKey]);
|
|
@@ -542,16 +598,8 @@ export function CreateOrderPage() {
|
|
|
542
598
|
throw new Error(`Vul bij regel ${lines.indexOf(l) + 1} een aantal in per hele fust, dus een veelvoud van ${ppc}.`);
|
|
543
599
|
}
|
|
544
600
|
}
|
|
545
|
-
// Verse voorraadcontrole
|
|
546
|
-
|
|
547
|
-
data: {
|
|
548
|
-
lines: validLines.map((l) => ({ productId: l.product_id, quantity: Number(l.quantity) })),
|
|
549
|
-
},
|
|
550
|
-
});
|
|
551
|
-
if (check.allowed === false) {
|
|
552
|
-
console.error("[voorraadcontrole]", check.shortages);
|
|
553
|
-
throw new Error(tekortMelding(check.shortages));
|
|
554
|
-
}
|
|
601
|
+
// Verse voorraadcontrole gebeurt bij het opslaan zelf op de server (createManualOrder,
|
|
602
|
+
// zelfde tekst via tekortMelding); een aparte controle vooraf kostte een extra ronde.
|
|
555
603
|
const customer = customers.find((c) => c.id === customerId);
|
|
556
604
|
if (!idempotencyKeyRef.current)
|
|
557
605
|
idempotencyKeyRef.current = crypto.randomUUID();
|
|
@@ -594,10 +642,24 @@ export function CreateOrderPage() {
|
|
|
594
642
|
packing_source: l.belading
|
|
595
643
|
? (l.belading.is_default === false ? "chosen" : "product_primary")
|
|
596
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,
|
|
597
650
|
};
|
|
598
651
|
}),
|
|
599
652
|
};
|
|
600
|
-
|
|
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
|
+
}
|
|
601
663
|
},
|
|
602
664
|
onSuccess: (res) => {
|
|
603
665
|
createdRef.current = true;
|
|
@@ -685,7 +747,10 @@ export function CreateOrderPage() {
|
|
|
685
747
|
setTimeout(() => { el?.focus(); if (el instanceof HTMLInputElement)
|
|
686
748
|
el.select(); }, 30);
|
|
687
749
|
});
|
|
688
|
-
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
|
+
});
|
|
689
754
|
const addLine = () => {
|
|
690
755
|
focusNext.current = { kind: "product", idx: lines.length };
|
|
691
756
|
setLines([...lines, emptyLine()]);
|
|
@@ -821,7 +886,7 @@ export function CreateOrderPage() {
|
|
|
821
886
|
const plants = line.quantity ?? null;
|
|
822
887
|
const cratesDisplay = crates == null ? "" : String(crates);
|
|
823
888
|
const productBeladingen = line.product_id ? beladingByProduct[line.product_id] ?? null : null;
|
|
824
|
-
const loadingBeladingen = !!line.product_id && beladingQ.isLoading;
|
|
889
|
+
const loadingBeladingen = !!line.product_id && !productBeladingen && (beladingQ.isLoading || beladingQ.isFetching);
|
|
825
890
|
const optionMap = new Map();
|
|
826
891
|
for (const b of productBeladingen ?? []) {
|
|
827
892
|
optionMap.set(beladingKey(b), {
|
|
@@ -869,7 +934,7 @@ export function CreateOrderPage() {
|
|
|
869
934
|
return;
|
|
870
935
|
}
|
|
871
936
|
kiesRegelProduct(idx, v);
|
|
872
|
-
} }), 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]) => ({
|
|
873
938
|
value: key,
|
|
874
939
|
label: beladingLabel(b),
|
|
875
940
|
badge: key === defaultKey ? "Standaard" : null,
|
|
@@ -898,7 +963,35 @@ export function CreateOrderPage() {
|
|
|
898
963
|
const cr = raw ? Math.max(1, Math.floor(Number(raw))) : null;
|
|
899
964
|
next[idx] = { ...next[idx], quantity: cr === null ? null : cr * ppc };
|
|
900
965
|
setLines(next);
|
|
901
|
-
}, 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));
|
|
902
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 && (() => {
|
|
903
996
|
const leden = groepLeden(groepKeuze.groep, products);
|
|
904
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":"KarTekeningSection.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarTekeningSection.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"KarTekeningSection.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/KarTekeningSection.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAgJ,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAOnO,wBAAgB,mBAAmB,gCAiBlC;AAED,MAAM,WAAW,gBAAgB;IAC/B,kEAAkE;IAClE,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;CACvB;AAED,+DAA+D;AAC/D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,IAAI,EAAE;IACJ,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;IACjC,2FAA2F;IAC3F,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CAC3C,GACA,gBAAgB,CAqGlB"}
|
|
@@ -7,9 +7,11 @@ import { useEffect, useState } from "react";
|
|
|
7
7
|
import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
8
8
|
import { useServerFn } from "@tanstack/react-start";
|
|
9
9
|
import { Badge, Button, Dialog, DialogContent, DialogHeader, DialogTitle, Skeleton, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@flowselections/core";
|
|
10
|
-
import { AlertTriangle, Loader2 } from "lucide-react";
|
|
10
|
+
import { AlertTriangle, Info, Loader2, PencilRuler } from "lucide-react";
|
|
11
|
+
import { useRouter } from "@tanstack/react-router";
|
|
12
|
+
import { karBewerkenPad, karBewerkenStand } from "../../lib/engine-tijdlijn.js";
|
|
11
13
|
import { getIndelingStand, getKarTekening } from "../../lib/kar-tekening.functions.js";
|
|
12
|
-
import { dragerTitel, dragersKop, gedeeldTekst, lagenTekst, langBezig, POLL_MS, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
14
|
+
import { dragerTitel, dragersKop, gedeeldTekst, markeringTekst, lagenTekst, langBezig, POLL_MS, regelBeladingTekst, statusLabel, toonDozen, toonStand } from "../../lib/kar-tekening.js";
|
|
13
15
|
import { bezigKey } from "../../lib/indeling-bezig.js";
|
|
14
16
|
import { korteMelding } from "../../lib/korte-melding.js";
|
|
15
17
|
import { SafeSvg } from "./SafeSvg.js";
|
|
@@ -94,7 +96,7 @@ export function useKarTekening(orderId, opts) {
|
|
|
94
96
|
}
|
|
95
97
|
else if (shown === "bezig") {
|
|
96
98
|
const sinds = stand?.stand === "bezig" ? (stand.bezig_sinds ?? markAt) : markAt;
|
|
97
|
-
node = (_jsxs("div", { className: "space-y-3", children: [_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", role: "status", "aria-live": "polite", children: [_jsx(Loader2, { className: "mt-0.5 h-4 w-4 shrink-0 animate-spin text-primary" }), _jsxs("div", { children: [_jsx("div", { children: "Indeling wordt gemaakt\u2026 meestal binnen een minuut" }), langBezig(sinds, now) && (_jsx("div", { className: "mt-0.5 text-xs text-muted-foreground", children: "Dit duurt langer dan normaal. Je kunt gewoon verder werken; de indeling verschijnt vanzelf." }))] })] }), tek && tek.dragers.length > 0 && (_jsxs("div", { className: "relative opacity-50 transition-opacity duration-300", children: [_jsx(Badge, { variant: "secondary", className: "absolute right-2 top-2 z-10", children: "Wordt bijgewerkt" }), _jsx(TekeningInhoud, { tek: tek, orderId: orderId, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager })] }))] }));
|
|
99
|
+
node = (_jsxs("div", { className: "space-y-3", children: [_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-sm text-foreground", role: "status", "aria-live": "polite", children: [_jsx(Loader2, { className: "mt-0.5 h-4 w-4 shrink-0 animate-spin text-primary" }), _jsxs("div", { children: [_jsx("div", { children: "Indeling wordt gemaakt\u2026 meestal binnen een minuut" }), langBezig(sinds, now) && (_jsx("div", { className: "mt-0.5 text-xs text-muted-foreground", children: "Dit duurt langer dan normaal. Je kunt gewoon verder werken; de indeling verschijnt vanzelf." }))] })] }), tek && tek.dragers.length > 0 && (_jsxs("div", { className: "relative opacity-50 transition-opacity duration-300", children: [_jsx(Badge, { variant: "secondary", className: "absolute right-2 top-2 z-10", children: "Wordt bijgewerkt" }), _jsx(TekeningInhoud, { tek: tek, orderId: orderId, orderDbId: null, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager })] }))] }));
|
|
98
100
|
}
|
|
99
101
|
else if (tekeningQ.isPending || !tekeningQ.data) {
|
|
100
102
|
node = _jsx(KarindelingSkeleton, {});
|
|
@@ -106,16 +108,37 @@ export function useKarTekening(orderId, opts) {
|
|
|
106
108
|
node = _jsx("p", { className: "text-sm text-muted-foreground", children: "Nog geen artikelen, dus nog geen indeling." });
|
|
107
109
|
}
|
|
108
110
|
else {
|
|
109
|
-
node = _jsx("div", { className: "animate-in fade-in duration-300", children: _jsx(TekeningInhoud, { tek: tek, orderId: orderId, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager }) });
|
|
111
|
+
node = _jsx("div", { className: "animate-in fade-in duration-300", children: _jsx(TekeningInhoud, { tek: tek, orderId: orderId, orderDbId: dbId, floriday: opts.floriday, onLagen: opts.onLagen, regels: opts.regelsPerDrager }) });
|
|
110
112
|
}
|
|
111
113
|
return { beschikbaar: true, kop, node };
|
|
112
114
|
}
|
|
113
115
|
function Melding({ tekst }) {
|
|
114
116
|
return (_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-foreground", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-4 w-4 shrink-0 text-destructive" }), _jsx("span", { children: tekst })] }));
|
|
115
117
|
}
|
|
116
|
-
|
|
118
|
+
/**
|
|
119
|
+
* Knop "Indeling aanpassen" naar het Engine-scherm Kar bewerken (?order=<orders.id>).
|
|
120
|
+
* Alleen als logistics_kar_bewerkbaar (via de tekening) minstens één drager
|
|
121
|
+
* toestaat; anders de reden. Bestaat de route niet in de shell: niets.
|
|
122
|
+
*/
|
|
123
|
+
function IndelingAanpassen({ tek, orderDbId }) {
|
|
124
|
+
const router = useRouter();
|
|
125
|
+
const pad = karBewerkenPad(router, orderDbId);
|
|
126
|
+
const stand = karBewerkenStand(tek.dragers.map((d) => ({ bewerkbaar: d.bewerkbaar, niet_bewerkbaar_reden: d.niet_bewerkbaar_reden, titel: dragerTitel(d) })));
|
|
127
|
+
if (!pad || stand.soort === "onbekend")
|
|
128
|
+
return null;
|
|
129
|
+
if (stand.soort === "kan") {
|
|
130
|
+
return (_jsx("div", { className: "flex justify-end", children: _jsx(Button, { asChild: true, variant: "outline", size: "sm", className: "h-8", children: _jsxs("a", { href: pad, onClick: (e) => {
|
|
131
|
+
if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0)
|
|
132
|
+
return;
|
|
133
|
+
e.preventDefault();
|
|
134
|
+
router.history.push(pad);
|
|
135
|
+
}, children: [_jsx(PencilRuler, { className: "mr-2 h-4 w-4" }), " Indeling aanpassen"] }) }) }));
|
|
136
|
+
}
|
|
137
|
+
return (_jsxs("div", { className: "flex items-start gap-2 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: [_jsx(Info, { className: "mt-0.5 h-3.5 w-3.5 shrink-0", "aria-hidden": true }), _jsxs("div", { className: "min-w-0", children: [_jsx("span", { className: "font-medium text-foreground", children: "Indeling aanpassen kan nu niet." }), " ", stand.redenen.length === 1 ? stand.redenen[0] : (_jsx("ul", { className: "mt-0.5 space-y-0.5", children: stand.redenen.map((r, i) => _jsx("li", { children: r }, i)) }))] })] }));
|
|
138
|
+
}
|
|
139
|
+
function TekeningInhoud({ tek, orderId, orderDbId, floriday, onLagen, regels }) {
|
|
117
140
|
const [groot, setGroot] = useState(null);
|
|
118
|
-
return (_jsxs("div", { className: "space-y-3", children: [_jsx("div", { className: "-mx-1 flex gap-2 overflow-x-auto px-1 pb-1", children: tek.dragers.map((d) => (_jsx("button", { type: "button", onClick: () => setGroot(d), className: "shrink-0 rounded-lg border border-border bg-card p-1 transition-shadow hover:border-ring/50 hover:shadow-md focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", "aria-label": `Grote tekening van ${dragerTitel(d)}`, title: dragerTitel(d), children: d.svg ? _jsx(SafeSvg, { svg: d.svg, className: "h-16 w-12 [&>svg]:h-full [&>svg]:w-full", label: dragerTitel(d) }) : _jsx("div", { className: "flex h-16 w-12 items-center justify-center text-xs tabular-nums text-muted-foreground", children: d.nummer ?? "—" }) }, d.id))) }), tek.dragers.length === 0 && tek.svg_rij && _jsx(SafeSvg, { svg: tek.svg_rij, className: "overflow-x-auto", label: "Overzicht van de indeling" }), _jsx("div", { className: "grid gap-3 md:grid-cols-2", children: tek.dragers.map((d) => _jsx(DragerKaart, { d: d, orderId: orderId, regels: regels?.get(d.id) ?? [], floriday: floriday, onGroot: () => setGroot(d), onLagen: onLagen }, d.id)) }), _jsx(Dialog, { open: !!groot, onOpenChange: (v) => { if (!v)
|
|
141
|
+
return (_jsxs("div", { className: "space-y-3", children: [tek.meldingen.length > 0 && (_jsx("ul", { className: "space-y-1 rounded-lg border border-border bg-muted/40 px-3 py-2 text-xs text-foreground", children: tek.meldingen.map((m, i) => (_jsxs("li", { className: "flex items-start gap-1.5", children: [_jsx(Info, { className: "mt-0.5 h-3 w-3 shrink-0 text-muted-foreground", "aria-hidden": true }), m] }, i))) })), _jsx(IndelingAanpassen, { tek: tek, orderDbId: orderDbId }), _jsx("div", { className: "-mx-1 flex gap-2 overflow-x-auto px-1 pb-1", children: tek.dragers.map((d) => (_jsx("button", { type: "button", onClick: () => setGroot(d), className: "shrink-0 rounded-lg border border-border bg-card p-1 transition-shadow hover:border-ring/50 hover:shadow-md focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", "aria-label": `Grote tekening van ${dragerTitel(d)}`, title: dragerTitel(d), children: d.svg ? _jsx(SafeSvg, { svg: d.svg, className: "h-16 w-12 [&>svg]:h-full [&>svg]:w-full", label: dragerTitel(d) }) : _jsx("div", { className: "flex h-16 w-12 items-center justify-center text-xs tabular-nums text-muted-foreground", children: d.nummer ?? "—" }) }, d.id))) }), tek.dragers.length === 0 && tek.svg_rij && _jsx(SafeSvg, { svg: tek.svg_rij, className: "overflow-x-auto", label: "Overzicht van de indeling" }), _jsx("div", { className: "grid gap-3 md:grid-cols-2", children: tek.dragers.map((d) => _jsx(DragerKaart, { d: d, orderId: orderId, regels: regels?.get(d.id) ?? [], floriday: floriday, onGroot: () => setGroot(d), onLagen: onLagen }, d.id)) }), _jsx(Dialog, { open: !!groot, onOpenChange: (v) => { if (!v)
|
|
119
142
|
setGroot(null); }, children: _jsxs(DialogContent, { className: "max-w-2xl", children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: groot ? dragerTitel(groot) : "" }) }), groot?.svg ? _jsx(SafeSvg, { svg: groot.svg, className: "max-h-[70vh] overflow-auto [&>svg]:h-auto [&>svg]:w-full", label: dragerTitel(groot) }) : _jsx("p", { className: "text-sm text-muted-foreground", children: "Geen tekening beschikbaar." })] }) })] }));
|
|
120
143
|
}
|
|
121
144
|
function DragerKaart({ d, orderId, regels, floriday, onGroot, onLagen }) {
|
|
@@ -124,5 +147,6 @@ function DragerKaart({ d, orderId, regels, floriday, onGroot, onLagen }) {
|
|
|
124
147
|
const dozen = toonDozen(regels);
|
|
125
148
|
const gedeeld = gedeeldTekst(d.gedeeld_met);
|
|
126
149
|
const lagen = lagenTekst(d.lagen_gebruikt, d.lagen_max);
|
|
127
|
-
|
|
150
|
+
const rood = markeringTekst(d);
|
|
151
|
+
return (_jsxs("div", { className: `min-w-0 space-y-2 rounded-xl border bg-card p-3 shadow-sm ${rood ? "border-destructive" : "border-border"}`, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("span", { className: "font-medium text-foreground", children: dragerTitel(d) }), rood && _jsxs(Badge, { variant: "destructive", className: "rounded-full", children: [_jsx(AlertTriangle, { className: "mr-1 h-3 w-3", "aria-hidden": true }), rood] }), status && _jsx(Badge, { variant: "outline", className: "rounded-full", children: status }), floriday && d.floriday_gelijk === true && _jsx(Badge, { variant: "secondary", className: "rounded-full", children: "Floriday gelijk" }), gedeeld && _jsx(Badge, { variant: "outline", className: "rounded-full", children: gedeeld })] }), (d.nummer != null || d.letters.length > 0) && (_jsx("div", { className: "text-xs tabular-nums text-muted-foreground", children: karKop({ nummer: d.nummer, vulgraad_pct: d.vulgraad_pct, letters: d.letters, naam: d.naam }) })), _jsx(KarSlotMelding, { slot: d, orderId: orderId, compact: true }), pct != null && (_jsxs("div", { className: "flex items-center gap-2 text-xs text-muted-foreground", children: [_jsx("div", { className: "h-2 flex-1 overflow-hidden rounded-full bg-muted", role: "progressbar", "aria-valuenow": pct, "aria-valuemin": 0, "aria-valuemax": 100, "aria-label": "Vulgraad", children: _jsx("div", { className: "h-full rounded-full bg-primary", style: { width: `${pct}%` } }) }), _jsxs("span", { className: "tabular-nums", children: [pct, "%"] })] })), lagen && _jsx("div", { className: "text-xs tabular-nums text-muted-foreground", children: lagen }), d.waarschuwingen.length > 0 && (_jsx("ul", { className: "space-y-0.5 text-xs text-foreground", children: d.waarschuwingen.map((w, i) => (_jsxs("li", { className: "flex items-start gap-1", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-3 w-3 shrink-0 text-warning" }), w] }, i))) })), d.svg && (_jsx("button", { type: "button", onClick: onGroot, className: "block w-full rounded-lg focus:outline-none focus-visible:ring-2 focus-visible:ring-ring", "aria-label": `Grote tekening van ${dragerTitel(d)}`, children: _jsx(SafeSvg, { svg: d.svg, className: "max-h-64 overflow-hidden [&>svg]:mx-auto [&>svg]:h-auto [&>svg]:max-h-64 [&>svg]:w-full", label: dragerTitel(d) }) })), regels.length > 0 && (_jsx("div", { className: "overflow-x-auto", children: _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: "Artikel" }), _jsx(TableHead, { children: "Fusten" }), dozen && _jsx(TableHead, { children: "Dozen" }), _jsx(TableHead, { children: "Belading" })] }) }), _jsx(TableBody, { children: regels.map((a) => (_jsxs(TableRow, { children: [_jsx(TableCell, { className: "min-w-0", children: a.product }), _jsx(TableCell, { className: "tabular-nums", children: a.fusten ?? "—" }), dozen && _jsx(TableCell, { className: "tabular-nums", children: a.dozen ?? "—" }), _jsx(TableCell, { className: "text-xs text-muted-foreground", children: regelBeladingTekst(a, d) })] }, a.key))) })] }) })), onLagen && d.soort === "layered" && (_jsx(Button, { variant: "outline", size: "sm", className: "h-8", onClick: () => onLagen(d), children: "Lagen bekijken" }))] }));
|
|
128
152
|
}
|
|
@@ -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) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAgB/D,eAAO,MAAM,WAAW,iDAA4C,CAAC;AAiBrE,wBAAgB,oBAAoB,CAAC,EACnC,KAAK,EACL,YAAY,GACb,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,2EAA2E;IAC3E,YAAY,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAClH,+
|
|
1
|
+
{"version":3,"file":"OrderKarindelingCard.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/OrderKarindelingCard.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAgB/D,eAAO,MAAM,WAAW,iDAA4C,CAAC;AAiBrE,wBAAgB,oBAAoB,CAAC,EACnC,KAAK,EACL,YAAY,GACb,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,2EAA2E;IAC3E,YAAY,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAClH,+BAsXA;AAGD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,+BAaxD"}
|
|
@@ -21,8 +21,8 @@ import { CartLayersDialog } from "./CartLayersDialog.js";
|
|
|
21
21
|
import { PlanCoverageBadge } from "./PlanCoverageBadge.js";
|
|
22
22
|
import { isProefindeling } from "../../lib/floriday-actual-carriers.js";
|
|
23
23
|
import { KarindelingSkeleton, useKarTekening } from "./KarTekeningSection.js";
|
|
24
|
-
import { karRegelsPerDrager, pickTekst, toonDozen } from "../../lib/kar-tekening.js";
|
|
25
|
-
import { listOrderItemPacking } from "../../lib/order-item-packing.functions.js";
|
|
24
|
+
import { karRegelsPerDrager, pickTekst, regelsZonderBelading, toonDozen } from "../../lib/kar-tekening.js";
|
|
25
|
+
import { listOrderItemBelading, listOrderItemPacking } from "../../lib/order-item-packing.functions.js";
|
|
26
26
|
export const PROEF_TITEL = "Proefindeling – afgehandeld in Floriday";
|
|
27
27
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
28
28
|
const PICK_LABEL = {
|
|
@@ -128,7 +128,22 @@ export function OrderKarindelingCard({ order, pickProgress, }) {
|
|
|
128
128
|
});
|
|
129
129
|
if (packingQ.isError)
|
|
130
130
|
console.error("[karindeling] belading orderregels:", packingQ.error);
|
|
131
|
-
|
|
131
|
+
// Regels op de kar die niet (volledig) uit de eigen orderregels komen (gedeelde kar,
|
|
132
|
+
// onvolledige snapshot): belading uit de orderregel zelf of de Engine-uitleg.
|
|
133
|
+
const packingKlaar = packingQ.isSuccess || packingQ.isError;
|
|
134
|
+
const zonderBelading = packingKlaar ? regelsZonderBelading(carts, packingQ.data?.items ?? []) : [];
|
|
135
|
+
const fetchBelading = useServerFn(listOrderItemBelading);
|
|
136
|
+
const extraQ = useQuery({
|
|
137
|
+
queryKey: ["kar-regel-belading", zonderBelading.join(",")],
|
|
138
|
+
enabled: !proef && zonderBelading.length > 0,
|
|
139
|
+
staleTime: 60000,
|
|
140
|
+
queryFn: () => fetchBelading({ data: { orderItemIds: zonderBelading.slice(0, 100) } }),
|
|
141
|
+
});
|
|
142
|
+
if (extraQ.isError)
|
|
143
|
+
console.error("[karindeling] belading aanvullen:", extraQ.error);
|
|
144
|
+
const extraBelading = new Map(Object.entries(extraQ.data?.items ?? {}));
|
|
145
|
+
const beladingLaden = !proef && (packingQ.isPending || (zonderBelading.length > 0 && extraQ.isPending));
|
|
146
|
+
const regelsPerDrager = karRegelsPerDrager(carts, packingQ.data?.items ?? [], resolveProductName, extraBelading, beladingLaden);
|
|
132
147
|
const kt = useKarTekening(proef ? null : orderId, {
|
|
133
148
|
floriday: isFloriday,
|
|
134
149
|
onLagen: (d) => setLayersFor({ id: d.id, number: d.nummer ?? 0 }),
|