@flowselections/mailbox-orders 1.0.64 → 1.0.66

package/dist-lib/components/MailboxProposalsPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MailboxProposalsPage.d.ts","sourceRoot":"","sources":["../../src/components/MailboxProposalsPage.tsx"],"names":[],"mappings":"AA8HA,6EAA6E;AAC7E,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AA2CD,wBAAgB,oBAAoB,gCAsgBnC"}
+{"version":3,"file":"MailboxProposalsPage.d.ts","sourceRoot":"","sources":["../../src/components/MailboxProposalsPage.tsx"],"names":[],"mappings":"AA+HA,6EAA6E;AAC7E,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AA2CD,wBAAgB,oBAAoB,gCAsgBnC"}

package/dist-lib/components/MailboxProposalsPage.js

@@ -10,6 +10,7 @@ import { normalizeUnitKind, toPlants, describeConversion, lineTotal, UNIT_KIND_L
 import { enabledLoadCarriers, normalizeAllowedLoadCarriers, EMPTY_LOAD_CARRIERS } from "../lib/load-carriers.js";
 import { listTemplateFields, listPlantTypesForPicker, listSuppliersForPicker, } from "../lib/mailbox-template.functions.js";
 import { SearchableSelect } from "./SearchableSelect.js";
+import { carrierHint, decideCarrier } from "../lib/carrier-autofill.js";
 import { AI_AUTH_PATH } from "./MailboxStatusLine.js";
 import { listProposalsPage } from "../lib/mailbox-list.functions.js";
 import { MailboxPageFrame, browserTz } from "./MailboxPageFrame.js";
@@ -621,19 +622,24 @@ function ProposalEditor({ proposal, template, customers, products, allowBackorde
             setVal("delivery_location", primary[0].id);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [deliveryLocationVal, deliveryLocations.length, customerVal]);
-    // Auto-vul vervoerder zodra een nieuwe locatie wordt gekozen (één keer per wissel).
-    const lastLocRef = useRef(deliveryLocationVal);
+    // Auto-vul vervoerder: ook bij een locatie die al vaststaat bij openen.
+    // Ref pas bijwerken als de locatie echt in de geladen lijst staat.
+    const lastLocRef = useRef(null);
     useEffect(() => {
-        if (deliveryLocationVal !== lastLocRef.current) {
-            lastLocRef.current = deliveryLocationVal;
-            const loc = deliveryLocations.find((l) => l.id === deliveryLocationVal);
-            if (loc?.carrier_id)
-                setVal("carrier", loc.carrier_id);
-            else if (deliveryLocationVal === null)
-                setVal("carrier", null);
-        }
+        const d = decideCarrier({
+            locationId: deliveryLocationVal,
+            prevLocationId: lastLocRef.current,
+            locations: deliveryLocations,
+            carriers,
+            currentCarrier: carrierVal,
+        });
+        if (d.commitLocation !== undefined)
+            lastLocRef.current = d.commitLocation;
+        if (d.action === "set" && d.carrierId !== carrierVal)
+            setVal("carrier", d.carrierId);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [deliveryLocationVal, deliveryLocations.length]);
+    }, [deliveryLocationVal, deliveryLocations.length, carriers.length, carrierVal]);
+    const carrierHintKind = carrierHint(selectedLocation, carriers, carrierVal);
     const selectedCarrier = carriers.find((c) => c.id === carrierVal) ?? null;
     const pickupLocationVal = values["pickup_location"];
     // ─── Ladingdragers uit de Rule Engine (nooit cachen) ──────────────────────
@@ -941,7 +947,7 @@ function ProposalEditor({ proposal, template, customers, products, allowBackorde
                                                             : "Kies vervoerder...", clearLabel: "\u2014 Geen \u2014", disabled: !deliveryLocationVal, options: carriers.map((c) => ({
                                                         value: c.id,
                                                         label: c.name + (c.is_default ? " (standaard)" : ""),
-                                                    })), onChange: (v) => setVal("carrier", v) }), selectedLocation?.carrier_id && carrierVal !== selectedLocation.carrier_id && (_jsx("div", { className: "text-xs text-muted-foreground", children: "Wijkt af van standaard vervoerder van deze locatie \u2014 geldt alleen voor deze bestelling." }))] }), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Bezorgdatum ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(Input, { type: "date", value: deliveryVal ?? "", onChange: (e) => setVal("delivery_date", e.target.value || null) }), _jsx(ConfBadge, { meta: metaFor("delivery_date"), thresholds: thresholds }), !carrierVal || !deliveryLocationVal ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Kies een afleverlocatie en vervoerder; daarna controleren we of deze datum haalbaar is." })) : !deliveryVal ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "De mail noemt geen datum. Kies zelf een datum." })) : previewLoading ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Haalbaarheid controleren\u2026" })) : previewError ? (_jsxs("div", { className: "text-xs text-destructive", children: ["De haalbaarheid kon niet worden gecontroleerd: ", previewError] })) : dateFeasible ? (_jsxs("div", { className: "rounded-md border border-primary/30 bg-primary/10 px-3 py-2 text-xs text-primary", children: [fmtDate(deliveryVal), " is haalbaar.", preview?.chosen?.departureAt ? ` Ophaalmoment: ${fmtDateTime(preview.chosen.departureAt)}` : "", preview?.chosen?.signupDeadline ? ` (aanmelden tot ${fmtDateTime(preview.chosen.signupDeadline)}).` : "."] })) : (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs space-y-2", children: [_jsxs("div", { className: "text-destructive", children: [fmtDate(deliveryVal), " is niet haalbaar", preview?.reason ? `: ${preview.reason}` : "."] }), preview?.firstFeasibleDeliveryDate && preview.firstFeasibleDeliveryDate !== deliveryVal && (_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setVal("delivery_date", preview.firstFeasibleDeliveryDate), children: ["Gebruik ", fmtDate(preview.firstFeasibleDeliveryDate)] })), preview?.ok === true && previewKind === "late_signup" && (_jsx(LateSignupChoice, { open: lateOpen, setOpen: setLateOpen, reason: lateReason, setReason: setLateReason }))] }))] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Referentie klant" }), _jsx(Input, { value: typeof values["reference"] === "string" ? values["reference"] : "", placeholder: "Bijv. ordernummer van de klant", onChange: (e) => setVal("reference", e.target.value) }), _jsx(ConfBadge, { meta: metaFor("reference"), thresholds: thresholds })] }), otherFields.map(renderField)] }));
+                                                    })), onChange: (v) => setVal("carrier", v) }), carrierHintKind === "location" && (_jsx("div", { className: "text-xs text-muted-foreground", children: "Standaard vervoerder van deze locatie" })), carrierHintKind === "default" && (_jsx("div", { className: "text-xs text-muted-foreground", children: "Algemene standaard vervoerder \u2014 controleer of dit klopt" })), selectedLocation?.carrier_id && carrierVal !== selectedLocation.carrier_id && (_jsx("div", { className: "text-xs text-muted-foreground", children: "Wijkt af van standaard vervoerder van deze locatie \u2014 geldt alleen voor deze bestelling." }))] }), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Bezorgdatum ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(Input, { type: "date", value: deliveryVal ?? "", onChange: (e) => setVal("delivery_date", e.target.value || null) }), _jsx(ConfBadge, { meta: metaFor("delivery_date"), thresholds: thresholds }), !carrierVal || !deliveryLocationVal ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Kies een afleverlocatie en vervoerder; daarna controleren we of deze datum haalbaar is." })) : !deliveryVal ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "De mail noemt geen datum. Kies zelf een datum." })) : previewLoading ? (_jsx("div", { className: "text-xs text-muted-foreground", children: "Haalbaarheid controleren\u2026" })) : previewError ? (_jsxs("div", { className: "text-xs text-destructive", children: ["De haalbaarheid kon niet worden gecontroleerd: ", previewError] })) : dateFeasible ? (_jsxs("div", { className: "rounded-md border border-primary/30 bg-primary/10 px-3 py-2 text-xs text-primary", children: [fmtDate(deliveryVal), " is haalbaar.", preview?.chosen?.departureAt ? ` Ophaalmoment: ${fmtDateTime(preview.chosen.departureAt)}` : "", preview?.chosen?.signupDeadline ? ` (aanmelden tot ${fmtDateTime(preview.chosen.signupDeadline)}).` : "."] })) : (_jsxs("div", { className: "rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs space-y-2", children: [_jsxs("div", { className: "text-destructive", children: [fmtDate(deliveryVal), " is niet haalbaar", preview?.reason ? `: ${preview.reason}` : "."] }), preview?.firstFeasibleDeliveryDate && preview.firstFeasibleDeliveryDate !== deliveryVal && (_jsxs(Button, { size: "sm", variant: "outline", onClick: () => setVal("delivery_date", preview.firstFeasibleDeliveryDate), children: ["Gebruik ", fmtDate(preview.firstFeasibleDeliveryDate)] })), preview?.ok === true && previewKind === "late_signup" && (_jsx(LateSignupChoice, { open: lateOpen, setOpen: setLateOpen, reason: lateReason, setReason: setLateReason }))] }))] }), _jsxs("div", { className: "space-y-1", children: [_jsx(Label, { children: "Referentie klant" }), _jsx(Input, { value: typeof values["reference"] === "string" ? values["reference"] : "", placeholder: "Bijv. ordernummer van de klant", onChange: (e) => setVal("reference", e.target.value) }), _jsx(ConfBadge, { meta: metaFor("reference"), thresholds: thresholds })] }), otherFields.map(renderField)] }));
                             })(), _jsxs("div", { className: "space-y-2", children: [_jsx(Label, { children: "Bestelregels" }), _jsxs("div", { className: "grid grid-cols-12 gap-2 text-xs text-muted-foreground px-1", children: [_jsx("div", { className: "col-span-4", children: "Product" }), _jsx("div", { className: "col-span-3", children: "Belading" }), _jsx("div", { className: "col-span-2", children: "Fusten" }), _jsx("div", { className: "col-span-2", children: "Prijs per stuk" }), _jsx("div", { className: "col-span-1 text-center", children: stickerAvailable ? "Sticker" : "" })] }), lines.map((line, idx) => {
                                         const product = line.product_id ? products.find((p) => p.id === line.product_id) : null;
                                         const stdBelading = defaultBelading(product);

package/dist-lib/lib/carrier-autofill.d.ts

@@ -0,0 +1,29 @@
+export interface CarrierLocation {
+    id: string;
+    carrier_id?: string | null;
+}
+export interface CarrierOption {
+    id: string;
+    is_default?: boolean | null;
+}
+export type CarrierSource = "location" | "default" | null;
+export interface CarrierDecision {
+    /** wait = niets doen en ref niet bijwerken; keep = niets wijzigen; set = carrierId invullen (null = leegmaken). */
+    action: "wait" | "keep" | "set";
+    carrierId: string | null;
+    source: CarrierSource;
+    /** Nieuwe waarde voor de "vorige locatie"-ref, of undefined als die niet mag wijzigen. */
+    commitLocation: string | null | undefined;
+}
+/** Alleen een standaard als precies één vervoerder is_default = true heeft. */
+export declare function uniqueDefaultCarrier(carriers: CarrierOption[]): string | null;
+export declare function decideCarrier(input: {
+    locationId: string | null;
+    prevLocationId: string | null;
+    locations: CarrierLocation[];
+    carriers: CarrierOption[];
+    currentCarrier: string | null;
+}): CarrierDecision;
+/** Grijze hulptekst onder het veld. */
+export declare function carrierHint(location: CarrierLocation | null, carriers: CarrierOption[], carrierId: string | null): "location" | "default" | "differs" | null;
+//# sourceMappingURL=carrier-autofill.d.ts.map

package/dist-lib/lib/carrier-autofill.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"carrier-autofill.d.ts","sourceRoot":"","sources":["../../src/lib/carrier-autofill.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,mHAAmH;IACnH,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,aAAa,CAAC;IACtB,0FAA0F;IAC1F,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC3C;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,GAAG,IAAI,CAG7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B,GAAG,eAAe,CA0BlB;AAED,uCAAuC;AACvC,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,GAAG,IAAI,EAChC,QAAQ,EAAE,aAAa,EAAE,EACzB,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,CAI3C"}

package/dist-lib/lib/carrier-autofill.js

@@ -0,0 +1,40 @@
+// Bepaalt of het veld "Vervoerder" automatisch ingevuld moet worden op basis
+// van de gekozen afleverlocatie. Pure functie: geen React, geen servercode.
+/** Alleen een standaard als precies één vervoerder is_default = true heeft. */
+export function uniqueDefaultCarrier(carriers) {
+    const defs = carriers.filter((c) => c.is_default === true);
+    return defs.length === 1 ? defs[0].id : null;
+}
+export function decideCarrier(input) {
+    const { locationId, prevLocationId, locations, carriers, currentCarrier } = input;
+    if (!locationId) {
+        if (!prevLocationId)
+            return { action: "wait", carrierId: null, source: null, commitLocation: undefined };
+        return { action: "set", carrierId: null, source: null, commitLocation: null };
+    }
+    const loc = locations.find((l) => l.id === locationId);
+    if (!loc)
+        return { action: "wait", carrierId: null, source: null, commitLocation: undefined };
+    const own = loc.carrier_id || null;
+    if (!own && carriers.length === 0) {
+        return { action: "wait", carrierId: null, source: null, commitLocation: undefined };
+    }
+    const def = own ? null : uniqueDefaultCarrier(carriers);
+    const target = own ?? def;
+    const source = own ? "location" : def ? "default" : null;
+    const changed = prevLocationId !== null && prevLocationId !== locationId;
+    if (changed)
+        return { action: "set", carrierId: target, source, commitLocation: locationId };
+    // Zelfde locatie of eerste keer na openen: alleen invullen als het veld leeg is.
+    if (!currentCarrier && target)
+        return { action: "set", carrierId: target, source, commitLocation: locationId };
+    return { action: "keep", carrierId: currentCarrier, source: null, commitLocation: locationId };
+}
+/** Grijze hulptekst onder het veld. */
+export function carrierHint(location, carriers, carrierId) {
+    if (!location || !carrierId)
+        return null;
+    if (location.carrier_id)
+        return carrierId === location.carrier_id ? "location" : "differs";
+    return carrierId === uniqueDefaultCarrier(carriers) ? "default" : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/mailbox-orders",
-  "version": "1.0.64",
+  "version": "1.0.66",
   "private": false,
   "sideEffects": false,
   "type": "module",