@metron-labs/quote-react 0.1.46 → 0.1.48

package/dist/app/QuickQuote.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useRef, useEffect, useCallback } from "react";
-import { apiUrl, getQuoteConfig } from "../lib/config";
+import { getQuoteConfig } from "../lib/config";
 import { TrackContext, useTracker } from "../lib/analytics";
 import { submitSchedule, pollScheduleJob } from "../lib/api/fetchSchedule";
 import { pollJob } from "../lib/api/pollJob";
@@ -10,8 +10,6 @@ import { ENTRY_DRAFT_KEY } from "./stages/EntryStage";
 import ScheduleResultsStage from "./stages/ScheduleResultsStage";
 import BasketStage from "./stages/BasketStage";
 import { CartProvider, useCart } from "../lib/cart/CartContext";
-import { clientHeaders, readJson } from "../lib/api/boqClient";
-import { getPricingBreakdown } from "../util/pricing";
 const SAVED_QUOTE_KEY = "metron-quick-quote";
 // Its own provider, separate from the estimating tools' - a quote in progress and a set
 // of calculator results are different baskets.
@@ -39,82 +37,11 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         }
         catch { }
     };
-    const resolvedConversionInputs = useRef(new Map());
     const rootRef = useRef(null);
     const track = useTracker("quick-quote", rootRef);
     useEffect(() => {
         track("viewed");
     }, [track]);
-    useEffect(() => {
-        for (const item of Object.values(cart)) {
-            if (getPricingBreakdown(item).requiredSellUnits != null)
-                resolvedConversionInputs.current.delete(item.lineId);
-        }
-        const unresolved = Object.values(cart).filter((item) => {
-            if (item.productId === "-" || getPricingBreakdown(item).requiredSellUnits != null)
-                return false;
-            const input = `${item.productId}|${item.qty}|${item.unit}`;
-            if (resolvedConversionInputs.current.get(item.lineId) === input)
-                return false;
-            resolvedConversionInputs.current.set(item.lineId, input);
-            return true;
-        });
-        if (unresolved.length === 0)
-            return;
-        void fetch(apiUrl("/api/catalogue/resolve-conversions"), {
-            method: "POST",
-            headers: { "Content-Type": "application/json", ...clientHeaders() },
-            body: JSON.stringify({
-                lines: unresolved.map((item) => ({
-                    line_id: item.lineId,
-                    product_id: item.productId,
-                    requested_description: item.requestedDescription ?? item.description,
-                    requested_qty: item.qty,
-                    requested_uom: item.unit || null,
-                    selected_description: item.description,
-                    selected_uoi: item.uoi,
-                    selected_uoi_count: item.uoiCount,
-                    linked_context: item.linkedContext ?? [],
-                    selected_conversion: {
-                        sales_uom_normalised: item.salesUomNormalised,
-                        conversion_type: item.conversionType,
-                        sales_unit_size: item.salesUnitSize,
-                        sales_unit_size_uom: item.salesUnitSizeUom,
-                        coverage_qty: item.coverageQty,
-                        coverage_uom: item.coverageUom,
-                    },
-                })),
-            }),
-        })
-            .then((response) => (response.ok ? readJson(response) : null))
-            .then((payload) => {
-            const updates = {};
-            for (const resolved of payload?.data?.items ?? payload?.items ?? []) {
-                const conversion = resolved?.conversion;
-                if (!conversion || typeof resolved?.line_id !== "string")
-                    continue;
-                const current = cart[resolved.line_id];
-                updates[resolved.line_id] = {
-                    conversionType: conversion.conversion_type,
-                    requestUomsSupported: conversion.request_uoms_supported,
-                    salesUomNormalised: conversion.sales_uom_normalised,
-                    salesUnitSize: conversion.sales_unit_size,
-                    salesUnitSizeUom: conversion.sales_unit_size_uom,
-                    coverageQty: conversion.coverage_qty,
-                    coverageUom: conversion.coverage_uom,
-                    roundingRule: conversion.rounding_rule,
-                    conversionConfidence: conversion.conversion_confidence,
-                    conversionNotes: conversion.conversion_notes,
-                    ...(current?.qty === 0 && Number.isFinite(conversion.suggested_order_qty) && conversion.suggested_order_qty > 0
-                        ? { qty: conversion.suggested_order_qty, unit: conversion.suggested_order_uom || current.unit }
-                        : {}),
-                };
-            }
-            if (Object.keys(updates).length > 0)
-                updateCartConversions(updates);
-        })
-            .catch((error) => console.error("Catalogue conversion resolution failed", error));
-    }, [cart, updateCartConversions]);
     // The quote survives the widget restarting - the host re-rendering the page under us
     // (Turbo restoring its own entry), or a refresh. It lives in this tab's sessionStorage and
     // the URL hash says which step to show. Restored after mount, not in the initial state, so
@@ -321,7 +248,7 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         setEntryMode("schedule");
         await runScheduleMatch(file);
     }, [runScheduleMatch]);
-    return (_jsx(TrackContext.Provider, { value: track, children: _jsx("div", { ref: rootRef, className: `app-wrapper${fullPage ? "" : " app-wrapper--embedded"}${hideHeader ? " app-wrapper--no-header" : ""}${!fullPage && stage === "processing" ? " app-wrapper--loading" : ""}`, style: getQuoteConfig().theme, children: _jsxs("main", { className: "main-content", children: [error && (_jsxs("div", { className: "error-box", role: "alert", children: [_jsx("strong", { children: "Error:" }), " ", error] })), stage === "entry" && _jsx(EntryStage, { onPasteSchedule: handlePasteSchedule, onUploadSchedule: handleUploadSchedule, onEntryModeChange: setEntryMode, draft: entryDraft, onSubmitDraft: setEntryDraft, onCancelMatch: cancelMatch }), stage === "results" && entryMode === "schedule" && scheduleResult && (_jsx(ScheduleResultsStage, { scheduleResult: scheduleResult, onStartOver: resetToEntry, cart: cart, onAddToCart: addToCart, onRemoveFromCart: removeFromCart, onGoToBasket: goToBasket, cartSeeded: cartSeeded, onCartSeeded: () => setCartSeeded(true), reviewGateComplete: scheduleReviewGateComplete, onReviewGateComplete: () => setScheduleReviewGateComplete(true), internal: internal })), stage === "basket" && (_jsx(BasketStage, { cart: cart, onUpdateQty: updateCartQty, onUpdateSellUnits: updateCartSellUnits, onRemove: removeFromCart, onBack: backToResults, onStartNewQuote: resetToEntry, onQuoteRequested: () => {
+    return (_jsx(TrackContext.Provider, { value: track, children: _jsx("div", { ref: rootRef, className: `app-wrapper${fullPage ? "" : " app-wrapper--embedded"}${hideHeader ? " app-wrapper--no-header" : ""}${!fullPage && stage === "processing" ? " app-wrapper--loading" : ""}`, style: getQuoteConfig().theme, children: _jsxs("main", { className: "main-content", children: [error && (_jsxs("div", { className: "error-box", role: "alert", children: [_jsx("strong", { children: "Error:" }), " ", error] })), stage === "entry" && _jsx(EntryStage, { onPasteSchedule: handlePasteSchedule, onUploadSchedule: handleUploadSchedule, onEntryModeChange: setEntryMode, draft: entryDraft, onSubmitDraft: setEntryDraft, onCancelMatch: cancelMatch }), stage === "results" && entryMode === "schedule" && scheduleResult && (_jsx(ScheduleResultsStage, { scheduleResult: scheduleResult, onStartOver: resetToEntry, cart: cart, onAddToCart: addToCart, onRemoveFromCart: removeFromCart, onGoToBasket: goToBasket, cartSeeded: cartSeeded, onCartSeeded: () => setCartSeeded(true), reviewGateComplete: scheduleReviewGateComplete, onReviewGateComplete: () => setScheduleReviewGateComplete(true), internal: internal })), stage === "basket" && (_jsx(BasketStage, { cart: cart, onUpdateQty: updateCartQty, onUpdateSellUnits: updateCartSellUnits, onResolveConversions: updateCartConversions, onRemove: removeFromCart, onBack: backToResults, onStartNewQuote: resetToEntry, onQuoteRequested: () => {
                             setScheduleResult(null);
                             setScheduleReviewGateComplete(false);
                             setCartSeeded(false);

package/dist/app/stages/BasketStage.js

@@ -10,6 +10,7 @@ import { exportBasketExcel } from "../../util/exportScheduleExcel";
 import { renderDisplayUnit, unitDisplayText } from "../components/UnitDisplay";
 import { clientHeaders, getBoqClientId, readJson } from "../../lib/api/boqClient";
 import { MAX_ORDER_QTY } from "../../lib/boq/inputLimits";
+import { conversionInputKey } from "../../lib/cart/CartContext";
 // ponytail: flat UK VAT rate, matching fmtCurrency's GBP-only assumption elsewhere in this app.
 const VAT_RATE = 0.2;
 const PAGE_SIZE = 10;
@@ -53,18 +54,28 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     const [calcOpen, setCalcOpen] = useState({});
     const [wasteEnabled, setWasteEnabled] = useState(false);
     const [wastePercent, setWastePercent] = useState("0");
-    const resolvedProductIds = useRef(new Set());
+    const [resolvingConversionInputs, setResolvingConversionInputs] = useState({});
+    const resolvedConversionInputs = useRef(new Map());
     useEffect(() => {
         if (!onResolveConversions)
             return;
         for (const item of Object.values(cart)) {
             if (getPricingBreakdown(item).requiredSellUnits != null)
-                resolvedProductIds.current.delete(item.lineId);
+                resolvedConversionInputs.current.delete(item.lineId);
         }
-        const unresolved = Object.values(cart).filter((item) => item.productId !== "-" && getPricingBreakdown(item).requiredSellUnits == null && !resolvedProductIds.current.has(item.lineId));
+        const unresolved = Object.values(cart).filter((item) => {
+            if (item.productId === "-" || getPricingBreakdown(item).requiredSellUnits != null)
+                return false;
+            const input = conversionInputKey(item);
+            if (resolvedConversionInputs.current.get(item.lineId) === input)
+                return false;
+            resolvedConversionInputs.current.set(item.lineId, input);
+            return true;
+        });
         if (unresolved.length === 0)
             return;
-        unresolved.forEach((item) => resolvedProductIds.current.add(item.lineId));
+        const inputByLineId = new Map(unresolved.map((item) => [item.lineId, conversionInputKey(item)]));
+        setResolvingConversionInputs((current) => ({ ...current, ...Object.fromEntries(inputByLineId) }));
         void fetch(apiUrl("/api/catalogue/resolve-conversions"), {
             method: "POST",
             headers: { "Content-Type": "application/json", ...clientHeaders() },
@@ -95,7 +106,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
             const updates = {};
             for (const resolved of payload?.data?.items ?? payload?.items ?? []) {
                 const conversion = resolved?.conversion;
-                if (!conversion || typeof resolved?.line_id !== "string")
+                if (!conversion || typeof resolved?.line_id !== "string" || resolvedConversionInputs.current.get(resolved.line_id) !== inputByLineId.get(resolved.line_id))
                     continue;
                 const current = cart[resolved.line_id];
                 updates[resolved.line_id] = {
@@ -117,7 +128,16 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
             if (Object.keys(updates).length > 0)
                 onResolveConversions(updates);
         })
-            .catch((error) => console.error("Catalogue conversion resolution failed", error));
+            .catch((error) => console.error("Catalogue conversion resolution failed", error))
+            .finally(() => {
+            setResolvingConversionInputs((current) => {
+                const next = { ...current };
+                for (const [lineId, input] of inputByLineId)
+                    if (next[lineId] === input)
+                        delete next[lineId];
+                return next;
+            });
+        });
     }, [cart, onResolveConversions]);
     function clearQtyDraft(lineId) {
         setQtyDrafts((prev) => {
@@ -156,6 +176,10 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     // Sends the basket to the merchant as a quote request (POST /v1/quote-requests). Success only
     // shows once the API confirms the email went out; otherwise the customer is asked to retry.
     async function submitQuoteRequest() {
+        if (pricedItems.some(({ pricing }) => pricing.lineTotal == null)) {
+            setQuoteContactError("Confirm the highlighted quantities before requesting a quote.");
+            return;
+        }
         const email = reference.trim();
         if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
             setQuoteContactError(INVALID_EMAIL_MESSAGE);
@@ -196,7 +220,8 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                     : "Your request couldn't be sent. Please try again, or contact us if it keeps happening.");
                 return;
             }
-            track("quote_requested", { items: pricedItems.length, total: Math.round(total * 100) / 100 });
+            if (total != null)
+                track("quote_requested", { items: pricedItems.length, total: Math.round(total * 100) / 100 });
             setQuoteRequestSent(true);
             onQuoteRequested?.();
             window.scrollTo(0, 0);
@@ -219,10 +244,12 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
         wasteFactorEnabled: wasteEnabled,
         wasteFactorOverride: Math.max(0, Number.parseFloat(wastePercent) || 0) / 100,
     });
-    const vat = subtotal * VAT_RATE;
-    const total = subtotal + vat;
+    const vat = subtotal == null ? null : subtotal * VAT_RATE;
+    const total = subtotal == null ? null : subtotal * (1 + VAT_RATE);
+    const unpriced = pricedItems.filter(({ pricing }) => pricing.lineTotal == null).length;
+    const resolvingCount = Object.keys(resolvingConversionInputs).length;
     // Once per visit to the basket, with the figures it opened with.
-    const openedWith = useRef({ items: pricedItems.length, total: Math.round(total * 100) / 100 });
+    const openedWith = useRef({ items: pricedItems.length, ...(total == null ? {} : { total: Math.round(total * 100) / 100 }) });
     useEffect(() => {
         track("basket_viewed", openedWith.current);
     }, [track]);
@@ -247,7 +274,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                                                     return (_jsxs("article", { className: "basket-card", children: [_jsxs("div", { className: "basket-card-top", children: [_jsx("img", { className: "basket-card-thumb", src: productImageSrc(item.description, item.productId, item.pdpPhotoUrl), alt: "", width: 48, height: 48 }), _jsxs("div", { className: "basket-card-info", children: [_jsx("div", { className: "bom-component-name", children: item.description }), rawDiffersFromOrder && pricing.costingMode !== "review" && (_jsxs("button", { type: "button", className: "basket-calc-toggle", onClick: () => setCalcOpen((prev) => ({
                                                                                     ...prev,
                                                                                     [item.lineId]: !prev[item.lineId],
-                                                                                })), "aria-expanded": !!calcOpen[item.lineId], children: ["How we calculated this", _jsx("span", { className: `basket-calc-toggle-chevron${calcOpen[item.lineId] ? " basket-calc-toggle-chevron--open" : ""}`, children: _jsx(ChevronIcon, {}) })] }))] }), _jsx("div", { className: "basket-card-actions", children: _jsx("button", { type: "button", className: "mf-remove-small-btn basket-card-remove", onClick: () => onRemove(item.lineId), "aria-label": `Remove ${item.description}`, children: _jsx(TrashIcon, {}) }) })] }), internal && (_jsxs("div", { className: "results-detail-block basket-internal-detail", children: [_jsxs("dl", { className: "results-detail-grid", children: [_jsxs("div", { children: [_jsx("dt", { children: "Conversion type" }), _jsx("dd", { children: item.conversionType ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Conversion confidence" }), _jsx("dd", { children: item.conversionConfidence ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Sales unit" }), _jsx("dd", { children: item.salesUnitSize != null ? (_jsxs(_Fragment, { children: [item.salesUnitSize, " ", renderDisplayUnit(item.salesUnitSizeUom, item.salesUnitSize)] })) : ("-") })] }), _jsxs("div", { children: [_jsx("dt", { children: "Coverage" }), _jsx("dd", { children: item.coverageQty != null ? (_jsxs(_Fragment, { children: [item.coverageQty, " ", renderDisplayUnit(item.coverageUom, item.coverageQty)] })) : ("-") })] }), _jsxs("div", { children: [_jsx("dt", { children: "Waste factor" }), _jsx("dd", { children: item.wasteFactorDefault ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Rounding rule" }), _jsx("dd", { children: item.roundingRule ?? "-" })] })] }), item.conversionNotes && _jsx("p", { className: "results-rerank-note", children: item.conversionNotes })] })), pricing.costingMode === "review" ? (_jsxs("p", { className: "basket-calc-text basket-calc-text--review", children: [_jsx("strong", { children: "Quantity needs confirmation." }), " ", reviewMessage(pricing)] })) : rawDiffersFromOrder && calcOpen[item.lineId] ? (_jsx("p", { className: "basket-calc-text", children: orderSummary(item, pricing) })) : null, _jsxs("div", { className: "basket-card-stats", children: [_jsxs("div", { className: "basket-stat", children: [_jsx("span", { className: "basket-stat-label", children: "Requested qty" }), _jsxs("div", { className: "basket-stat-value", children: [_jsxs("div", { className: "basket-qty-field", children: [_jsx("input", { className: "bom-qty-edit", type: "number", inputMode: "decimal", min: "0", placeholder: "-", value: requestedQtyValue, disabled: requestedLocked, onChange: (e) => setQtyDrafts((prev) => ({
+                                                                                })), "aria-expanded": !!calcOpen[item.lineId], children: ["How we calculated this", _jsx("span", { className: `basket-calc-toggle-chevron${calcOpen[item.lineId] ? " basket-calc-toggle-chevron--open" : ""}`, children: _jsx(ChevronIcon, {}) })] }))] }), _jsx("div", { className: "basket-card-actions", children: _jsx("button", { type: "button", className: "mf-remove-small-btn basket-card-remove", onClick: () => onRemove(item.lineId), "aria-label": `Remove ${item.description}`, children: _jsx(TrashIcon, {}) }) })] }), internal && (_jsxs("div", { className: "results-detail-block basket-internal-detail", children: [_jsxs("dl", { className: "results-detail-grid", children: [_jsxs("div", { children: [_jsx("dt", { children: "Conversion type" }), _jsx("dd", { children: item.conversionType ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Conversion confidence" }), _jsx("dd", { children: item.conversionConfidence ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Sales unit" }), _jsx("dd", { children: item.salesUnitSize != null ? (_jsxs(_Fragment, { children: [item.salesUnitSize, " ", renderDisplayUnit(item.salesUnitSizeUom, item.salesUnitSize)] })) : ("-") })] }), _jsxs("div", { children: [_jsx("dt", { children: "Coverage" }), _jsx("dd", { children: item.coverageQty != null ? (_jsxs(_Fragment, { children: [item.coverageQty, " ", renderDisplayUnit(item.coverageUom, item.coverageQty)] })) : ("-") })] }), _jsxs("div", { children: [_jsx("dt", { children: "Waste factor" }), _jsx("dd", { children: item.wasteFactorDefault ?? "-" })] }), _jsxs("div", { children: [_jsx("dt", { children: "Rounding rule" }), _jsx("dd", { children: item.roundingRule ?? "-" })] })] }), item.conversionNotes && _jsx("p", { className: "results-rerank-note", children: item.conversionNotes })] })), pricing.costingMode === "review" ? (_jsxs("p", { className: "basket-calc-text basket-calc-text--review", children: [_jsx("strong", { children: resolvingConversionInputs[item.lineId] === conversionInputKey(item) ? "Calculating order quantity…" : "Quantity needs confirmation." }), " ", reviewMessage(pricing)] })) : rawDiffersFromOrder && calcOpen[item.lineId] ? (_jsx("p", { className: "basket-calc-text", children: orderSummary(item, pricing) })) : null, _jsxs("div", { className: "basket-card-stats", children: [_jsxs("div", { className: "basket-stat", children: [_jsx("span", { className: "basket-stat-label", children: "Requested qty" }), _jsxs("div", { className: "basket-stat-value", children: [_jsxs("div", { className: "basket-qty-field", children: [_jsx("input", { className: "bom-qty-edit", type: "number", inputMode: "decimal", min: "0", placeholder: "-", value: requestedQtyValue, disabled: requestedLocked, onChange: (e) => setQtyDrafts((prev) => ({
                                                                                                     ...prev,
                                                                                                     [item.lineId]: e.target.value,
                                                                                                 })), onBlur: (e) => commitRequestedQty(item.lineId, e.target.value), onKeyDown: (e) => {
@@ -260,11 +287,11 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                                                                                                     if (e.key === "Enter")
                                                                                                         e.target.blur();
                                                                                                 }, "aria-label": `${item.description} order quantity` }), _jsxs("div", { className: "basket-qty-arrows", children: [_jsx("button", { type: "button", className: "basket-qty-arrow", onClick: () => stepSellUnits(item.lineId, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0, 1), "aria-label": `Increase ${item.description} order quantity`, children: _jsx(ChevronIcon, {}) }), _jsx("button", { type: "button", className: "basket-qty-arrow basket-qty-arrow--down", onClick: () => stepSellUnits(item.lineId, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0, -1), "aria-label": `Decrease ${item.description} order quantity`, children: _jsx(ChevronIcon, {}) })] })] }), _jsx("span", { className: "basket-metric-unit", children: renderDisplayUnit(pricing.sellUnit, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0) })] })] }), _jsxs("div", { className: "basket-stat basket-stat--total", children: [_jsx("span", { className: "basket-stat-label", children: "Total" }), _jsxs("div", { className: "basket-stat-value", children: [_jsx("strong", { children: pricing.lineTotal != null ? fmtCurrency(pricing.lineTotal) : "-" }), pricing.lineTotal != null && _jsx("span", { className: "basket-metric-unit", children: "ex. VAT" })] })] })] })] }, item.lineId));
-                                                }) }), totalPages > 1 && (_jsxs("div", { className: "results-pagination", children: [_jsxs("span", { className: "results-pagination-count", children: ["Showing ", (currentPage - 1) * PAGE_SIZE + 1, "\u2013", Math.min(currentPage * PAGE_SIZE, pricedItems.length), " of ", pricedItems.length] }), _jsxs("div", { className: "results-pagination-controls", children: [_jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage - 1), disabled: currentPage === 1, children: "Previous" }), _jsxs("span", { className: "results-pagination-page", children: ["Page ", currentPage, " of ", totalPages] }), _jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage + 1), disabled: currentPage === totalPages, children: "Next" })] })] }))] }), _jsxs("aside", { className: "basket-sidebar", children: [_jsx("div", { className: "basket-sidebar-title", children: qzaBasketLayout ? "Quote request summary" : "Order summary" }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "List price (ex. VAT)" : "Subtotal (ex. VAT)" }), _jsx("span", { children: fmtCurrency(subtotal) })] }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "VAT (20%)" : "VAT (20%)" }), _jsx("span", { children: fmtCurrency(vat) })] }), _jsxs("div", { className: "basket-sidebar-row basket-sidebar-row--total", children: [_jsx("span", { children: qzaBasketLayout ? "List price (inc. VAT)" : "Total" }), _jsx("span", { children: fmtCurrency(total) })] }), !qzaBasketLayout && (_jsx("div", { className: "basket-summary-waste", children: _jsxs("div", { className: "basket-waste-control", children: [_jsxs("label", { className: "basket-global-waste", children: [_jsx("input", { type: "checkbox", checked: wasteEnabled, onChange: (e) => setWasteEnabled(e.target.checked) }), _jsx("span", { children: "Add waste factor" })] }), _jsxs("label", { className: "basket-global-waste-percent", children: [_jsx("input", { type: "number", inputMode: "decimal", min: "0", step: "0.1", value: wastePercent, onChange: (e) => setWastePercent(e.target.value), disabled: !wasteEnabled, "aria-label": "Waste factor percent" }), _jsx("span", { children: "%" })] })] }) })), _jsx("label", { htmlFor: `${uid}-basket-reference`, className: "basket-sidebar-label", children: qzaBasketLayout ? "Enter email for your sharper quote" : "Your reference (optional)" }), _jsx("input", { id: `${uid}-basket-reference`, type: qzaBasketLayout ? "email" : "text", className: "basket-sidebar-input", value: reference, onChange: (e) => {
+                                                }) }), totalPages > 1 && (_jsxs("div", { className: "results-pagination", children: [_jsxs("span", { className: "results-pagination-count", children: ["Showing ", (currentPage - 1) * PAGE_SIZE + 1, "\u2013", Math.min(currentPage * PAGE_SIZE, pricedItems.length), " of ", pricedItems.length] }), _jsxs("div", { className: "results-pagination-controls", children: [_jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage - 1), disabled: currentPage === 1, children: "Previous" }), _jsxs("span", { className: "results-pagination-page", children: ["Page ", currentPage, " of ", totalPages] }), _jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage + 1), disabled: currentPage === totalPages, children: "Next" })] })] }))] }), _jsxs("aside", { className: "basket-sidebar", children: [_jsx("div", { className: "basket-sidebar-title", children: qzaBasketLayout ? "Quote request summary" : "Order summary" }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "List price (ex. VAT)" : "Subtotal (ex. VAT)" }), _jsx("span", { children: subtotal == null ? "To confirm" : fmtCurrency(subtotal) })] }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "VAT (20%)" : "VAT (20%)" }), _jsx("span", { children: vat == null ? "To confirm" : fmtCurrency(vat) })] }), _jsxs("div", { className: "basket-sidebar-row basket-sidebar-row--total", children: [_jsx("span", { children: qzaBasketLayout ? "List price (inc. VAT)" : "Total" }), _jsx("span", { children: total == null ? "To confirm" : fmtCurrency(total) })] }), !qzaBasketLayout && (_jsx("div", { className: "basket-summary-waste", children: _jsxs("div", { className: "basket-waste-control", children: [_jsxs("label", { className: "basket-global-waste", children: [_jsx("input", { type: "checkbox", checked: wasteEnabled, onChange: (e) => setWasteEnabled(e.target.checked) }), _jsx("span", { children: "Add waste factor" })] }), _jsxs("label", { className: "basket-global-waste-percent", children: [_jsx("input", { type: "number", inputMode: "decimal", min: "0", step: "0.1", value: wastePercent, onChange: (e) => setWastePercent(e.target.value), disabled: !wasteEnabled, "aria-label": "Waste factor percent" }), _jsx("span", { children: "%" })] })] }) })), _jsx("label", { htmlFor: `${uid}-basket-reference`, className: "basket-sidebar-label", children: qzaBasketLayout ? "Enter email for your sharper quote" : "Your reference (optional)" }), _jsx("input", { id: `${uid}-basket-reference`, type: qzaBasketLayout ? "email" : "text", className: "basket-sidebar-input", value: reference, onChange: (e) => {
                                                     setReference(e.target.value);
                                                     if (qzaBasketLayout)
                                                         setQuoteContactError("");
-                                                }, placeholder: qzaBasketLayout ? "you@example.com" : "PO number or job reference", "aria-invalid": qzaBasketLayout && quoteContactError === INVALID_EMAIL_MESSAGE, "aria-describedby": qzaBasketLayout && quoteContactError ? `${uid}-basket-reference-error` : undefined }), qzaBasketLayout && quoteContactError && (_jsx("p", { id: `${uid}-basket-reference-error`, className: "basket-quote-request-error", role: "alert", children: quoteContactError })), qzaBasketLayout ? (_jsx("button", { type: "button", className: "cta-btn", onClick: () => void submitQuoteRequest(), disabled: quoteRequestSending, "aria-busy": quoteRequestSending, children: _jsx("span", { children: quoteRequestSending ? "Sending…" : "Request our best quote" }) })) : (_jsx("button", { className: "cta-btn", onClick: () => {
+                                                }, placeholder: qzaBasketLayout ? "you@example.com" : "PO number or job reference", "aria-invalid": qzaBasketLayout && quoteContactError === INVALID_EMAIL_MESSAGE, "aria-describedby": qzaBasketLayout && quoteContactError ? `${uid}-basket-reference-error` : undefined }), qzaBasketLayout && quoteContactError && (_jsx("p", { id: `${uid}-basket-reference-error`, className: "basket-quote-request-error", role: "alert", children: quoteContactError })), qzaBasketLayout ? (_jsx("button", { type: "button", className: "cta-btn", onClick: () => void submitQuoteRequest(), disabled: quoteRequestSending || unpriced > 0 || resolvingCount > 0, "aria-busy": quoteRequestSending, children: _jsx("span", { children: quoteRequestSending ? "Sending…" : "Request our best quote" }) })) : (_jsx("button", { className: "cta-btn", onClick: () => {
                                                     track("downloaded", { type: "basket", items: items.length });
                                                     void exportBasketExcel(items);
                                                 }, "aria-label": internal ? "Download selection" : "Download basket", children: _jsx("span", { children: internal ? "Download Quote" : "Buy Now" }) })), _jsxs("p", { className: "basket-sidebar-disclaimer", children: [_jsx("span", { "aria-hidden": "true", children: "\u26A0\uFE0F" }), qzaBasketLayout

package/dist/app/stages/ScheduleResultsStage.d.ts

@@ -16,5 +16,6 @@ export declare function resolveBest(result: MatchResult | undefined, overriddenP
 export declare function candidateFromCart(item: CartItem): MatchCandidate;
 export declare function refreshedCartItem(refreshed: CartItem, existing: CartItem): CartItem;
 export declare function displayLineLabel(item: LineItem, allItems: LineItem[]): string;
+export declare function formatResultsTotal(totalValue: number | null, needsPricingCount: number): string | null;
 export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart, onAddToCart, onRemoveFromCart, onGoToBasket, cartSeeded, onCartSeeded, reviewGateComplete, onReviewGateComplete, internal }: ResultsStageProps): import("react").JSX.Element;
 export {};

package/dist/app/stages/ScheduleResultsStage.js

@@ -153,6 +153,9 @@ export function displayLineLabel(item, allItems) {
     const label = typeof item.customer_display_label === "string" ? item.customer_display_label.trim() : "";
     return label || original || "(no description)";
 }
+export function formatResultsTotal(totalValue, needsPricingCount) {
+    return needsPricingCount > 0 || totalValue == null ? null : fmtCurrency(totalValue);
+}
 const LINK_GROUP_BUBBLE_STYLES = [
     { background: "#fff7ed", borderColor: "#fdba74", color: "#9a3412" },
     { background: "#eff6ff", borderColor: "#93c5fd", color: "#1d4ed8" },
@@ -379,7 +382,8 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
         };
     });
     // Match BasketStage: catalogue waste defaults are opt-in in the basket UI.
-    let totalValue = getCartSubtotal(Object.values(cart), { wasteFactorEnabled: false, wasteFactorOverride: 0 });
+    const hasPendingReview = rows.some((row) => !row.unmatchable && !row.best && !skippedReviewIds.has(row.item.line_id));
+    let totalValue = hasPendingReview ? null : getCartSubtotal(Object.values(cart), { wasteFactorEnabled: false, wasteFactorOverride: 0 });
     let needsPricingCount = 0;
     for (const row of rows) {
         if (row.unmatchable || row.decision?.include_in_quote !== true || !row.best)
@@ -390,6 +394,7 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
     }
     if (needsPricingCount > 0)
         totalValue = null;
+    const totalLabel = formatResultsTotal(totalValue, needsPricingCount);
     const hasBestAlternative = (row) => !row.unmatchable && !row.best && row.decision?.technical_classification !== "no_suitable_candidate" && recommendedCandidates(row.result).length > 0;
     const previewCandidate = (row) => row.best ?? recommendedCandidates(row.result)[0];
     const reviewRequiredRows = rows.filter((row) => !row.unmatchable && !row.best);
@@ -684,7 +689,7 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
     })();
     const activeReviewCartMatches = !!activeReviewRow?.best && cart[activeReviewRow.item.line_id]?.productId === activeReviewRow.best.product_id;
     const activeReviewHasPendingUpdate = !!activeReviewRow?.best && !!cart[activeReviewRow.item.line_id] && !activeReviewCartMatches;
-    return (_jsxs("div", { className: "wizard-step entry-stage", children: [_jsxs("div", { className: `quick-order-card${internal ? "" : " quick-order-card--customer"}`, children: [_jsx("div", { className: `quick-order-hero${internal ? "" : " quick-order-hero--customer"}`, children: internal ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "quick-order-eyebrow", children: "Construction Services" }), _jsxs("div", { className: "quick-order-hero-title-row", children: [_jsx("h1", { children: "Your Results" }), _jsxs("span", { className: "summary-chip summary-chip--scope", children: [_jsx("strong", { children: totalValue == null ? "Calculating…" : fmtCurrency(totalValue) }), " Est. total"] })] }), _jsx("p", { children: "Each line item from your schedule matched against your catalogue, ranked by confidence." })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { children: [_jsx("h1", { children: "Review your matched products" }), _jsxs("p", { children: ["Check you're happy with these items, then click ", qzaQuoteRequest ? "View Quote" : "View Basket", " to continue."] })] }), _jsxs("button", { type: "button", className: "results-total-action", onClick: onGoToBasket, "aria-label": qzaQuoteRequest ? "View quote" : "View basket", children: [_jsxs("span", { children: [_jsx("small", { children: qzaQuoteRequest ? "View Quote" : "View Basket" }), _jsx("strong", { children: totalValue == null ? "Calculating…" : fmtCurrency(totalValue) })] }), _jsx("span", { className: "arrow", children: _jsx(ForwardArrow, {}) })] })] })) }), _jsxs("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: [debugEnabled && (_jsx("div", { className: "results-summary", style: { marginBottom: 12 }, children: _jsx("button", { type: "button", className: "bom-toolbar-btn", "aria-pressed": showTimings, onClick: () => setShowTimings((value) => !value), children: showTimings ? "Hide timings" : "Show timings" }) })), debugEnabled && showTimings && _jsx(TimingBreakdown, { ...timings }), !qzaQuoteRequest && (_jsx("div", { className: "results-toolbar-row", children: !activeReviewRow && (_jsxs("div", { className: "results-summary", style: { marginBottom: 0 }, children: [needsPricingCount > 0 && (_jsxs("span", { className: "summary-chip summary-chip--neutral", children: [_jsx("strong", { children: needsPricingCount }), " need pricing"] })), _jsxs("div", { style: {
+    return (_jsxs("div", { className: "wizard-step entry-stage", children: [_jsxs("div", { className: `quick-order-card${internal ? "" : " quick-order-card--customer"}`, children: [_jsx("div", { className: `quick-order-hero${internal ? "" : " quick-order-hero--customer"}`, children: internal ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "quick-order-eyebrow", children: "Construction Services" }), _jsxs("div", { className: "quick-order-hero-title-row", children: [_jsx("h1", { children: "Your Results" }), _jsxs("span", { className: "summary-chip summary-chip--scope", children: [_jsx("strong", { children: totalLabel ?? "Review quantities" }), " Est. total"] })] }), _jsx("p", { children: "Each line item from your schedule matched against your catalogue, ranked by confidence." })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { children: [_jsx("h1", { children: "Review your matched products" }), _jsxs("p", { children: ["Check you're happy with these items, then click ", qzaQuoteRequest ? "View Quote" : "View Basket", " to continue."] })] }), _jsxs("button", { type: "button", className: "results-total-action", onClick: onGoToBasket, "aria-label": qzaQuoteRequest ? "View quote" : "View basket", children: [_jsxs("span", { children: [_jsx("small", { children: qzaQuoteRequest ? "View Quote" : "View Basket" }), totalLabel != null && _jsx("strong", { children: totalLabel })] }), _jsx("span", { className: "arrow", children: _jsx(ForwardArrow, {}) })] })] })) }), _jsxs("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: [debugEnabled && (_jsx("div", { className: "results-summary", style: { marginBottom: 12 }, children: _jsx("button", { type: "button", className: "bom-toolbar-btn", "aria-pressed": showTimings, onClick: () => setShowTimings((value) => !value), children: showTimings ? "Hide timings" : "Show timings" }) })), debugEnabled && showTimings && _jsx(TimingBreakdown, { ...timings }), !qzaQuoteRequest && (_jsx("div", { className: "results-toolbar-row", children: !activeReviewRow && (_jsxs("div", { className: "results-summary", style: { marginBottom: 0 }, children: [needsPricingCount > 0 && (_jsxs("span", { className: "summary-chip summary-chip--neutral", children: [_jsx("strong", { children: needsPricingCount }), " need pricing"] })), _jsxs("div", { style: {
                                                 display: "flex",
                                                 gap: 8,
                                                 flexWrap: "wrap",

package/dist/components/estimators/DeckingEstimator.js

@@ -26,7 +26,6 @@ const CONFIG = {
     wastage: { straight: 0.05, diagonal: 0.15 },
     pictureFrame: { extraWastage: 0.08 },
     joist: {
-        lengthM: 2.4,
         spacingOptions: [
             { id: "300", label: "300mm centres (heavy duty)", spacingM: 0.3 },
             { id: "400", label: "400mm centres (standard)", spacingM: 0.4 },
@@ -145,13 +144,15 @@ export default function DeckingEstimator({ onBack, onReview, submitLabel = "Add
         const screwBoxes = Math.ceil((area * 30 * (1 + wastageRate + pfExtra)) / 200);
         const spacing = CONFIG.joist.spacingOptions.find((option) => option.id === state.joistSpacing) ?? CONFIG.joist.spacingOptions[1];
         const joistRunTotalM = area / spacing.spacingM;
-        const joistLengthsNeeded = Math.ceil(joistRunTotalM / CONFIG.joist.lengthM);
+        // Asked for in metres: the matched joist's own length turns it into lengths, so a merchant
+        // selling 2.4m and one selling 3.6m both get the right count.
+        const joistMetres = Math.ceil(joistRunTotalM);
         return {
             range,
             area,
             boardCount,
             screwBoxes,
-            joistLengthsNeeded,
+            joistMetres,
             spacing,
         };
     };
@@ -159,7 +160,7 @@ export default function DeckingEstimator({ onBack, onReview, submitLabel = "Add
     const requirements = results
         ? [
             { key: `boards-${state.range ?? "meridian"}`, label: `Deck boards (${results.range.label})`, qty: results.boardCount, unit: "each", query: "timber decking board", category: "decking", calculatorWasteIncluded: true },
-            { key: "joists", label: "Treated C24 joists", qty: results.joistLengthsNeeded, unit: "each", query: "treated joist", category: "timber", calculatorWasteIncluded: true },
+            { key: "joists", label: "Treated C24 joists", qty: results.joistMetres, unit: "m", query: "treated joist", category: "timber", calculatorWasteIncluded: true },
             { key: "screws", label: "Green decking screws (200/box)", qty: results.screwBoxes, unit: "box", query: "green decking screws", category: "fixings", calculatorWasteIncluded: true },
         ]
         : [];

package/dist/components/estimators/EstimatorResults.d.ts

@@ -1,6 +1,7 @@
 import type { EstimatorRequirement } from "../../lib/estimators/types";
+import type { EstimatorToolId } from "./registry";
 interface EstimatorResultsProps {
-    toolId: string;
+    toolId: EstimatorToolId;
     requirements: EstimatorRequirement[];
     /** Mirrors the estimator's own `calculated` flag - nothing is fetched before Calculate. */
     ready: boolean;

package/dist/components/estimators/EstimatorResults.js

@@ -96,7 +96,7 @@ export default function EstimatorResults({ toolId, requirements, ready, onBack,
         (async () => {
             let next = null;
             try {
-                const resolved = await resolveRequirements(requirements);
+                const resolved = await resolveRequirements(requirements, undefined, toolId);
                 next = resolved.map(({ requirement, candidates }) => ({
                     requirement,
                     candidates,

package/dist/components/estimators/EstimatorReviewStage.d.ts

@@ -1,6 +1,7 @@
+import type { EstimatorToolId } from "./registry";
 import type { EstimatorRequirement } from "../../lib/estimators/types";
 interface EstimatorReviewStageProps {
-    toolId: string;
+    toolId: EstimatorToolId;
     toolTitle: string;
     requirements: EstimatorRequirement[];
     onBack: () => void;

package/dist/components/estimators/InsulationEstimator.js

@@ -1,11 +1,16 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from "react";
+// byArea: ask for the area and let the matched product's own coverage turn it into packs, which
+// is right whichever client's product it is. Floor and wall still ask for packs worked out from
+// the coverage here.
+// ponytail: floor/wall stay on packs because FORT's catalogue coverage for its floor roll and wall
+// slab is wrong (0.06 and 0.546 m2); switch them to byArea once that data is fixed.
 const APPLICATIONS = {
     floor: { label: "Floor", product: "Knauf Acoustic Roll", thickness: "100mm", coverage: 12.36, salesUnit: "roll" },
     wall: { label: "Cavity wall", product: "Celotex CW4100", thickness: "100mm", coverage: 3.24, salesUnit: "pack" },
-    roof: { label: "Pitched roof", product: "Kingspan K107", thickness: "100mm", coverage: 8.64, salesUnit: "pack" },
-    loft: { label: "Loft", product: "Knauf Loft Roll 44", thickness: "100mm", coverage: 13.89, salesUnit: "roll" },
+    roof: { label: "Pitched roof", product: "Kingspan K107", thickness: "100mm", coverage: 8.64, salesUnit: "pack", byArea: true },
+    loft: { label: "Loft", product: "Knauf Loft Roll 44", thickness: "100mm", coverage: 13.89, salesUnit: "roll", byArea: true },
 };
 export default function InsulationEstimator({ onBack, onReview, submitLabel = "Add to basket" }) {
     const [application, setApplication] = useState("floor");
@@ -14,13 +19,12 @@ export default function InsulationEstimator({ onBack, onReview, submitLabel = "A
     const area = Number.parseFloat(length) * Number.parseFloat(width) || 0;
     const selected = APPLICATIONS[application];
     const packs = Math.ceil(area / selected.coverage);
-    // Requested as area - pack coverage comes from the product, not PRODUCT_COVERAGE.
     const requirements = [
         {
             key: `insulation-${application}`,
             label: `${selected.product} ${selected.thickness}`,
-            qty: packs,
-            unit: selected.salesUnit,
+            qty: selected.byArea ? Math.round(area * 100) / 100 : packs,
+            unit: selected.byArea ? "m2" : selected.salesUnit,
             query: selected.product,
             category: "insulation",
         },

package/dist/components/estimators/SkirtingEstimator.js

@@ -21,7 +21,7 @@ export default function SkirtingEstimator({ onBack, onReview, submitLabel = "Add
     const [rooms, setRooms] = useState([emptyRoom()]);
     const [openings, setOpenings] = useState("");
     const [profile, setProfile] = useState("chamfered");
-    const boardLength = "4.2";
+    const boardLength = "4.4";
     const baseLengthM = mode === "total"
         ? toMetres(totalLength, unit)
         : rooms.reduce((total, room) => total + 2 * (toMetres(room.length, unit) + toMetres(room.width, unit)), 0);
@@ -34,5 +34,5 @@ export default function SkirtingEstimator({ onBack, onReview, submitLabel = "Add
     const updateRoom = (index, key, nextValue) => {
         setRooms((items) => items.map((room, roomIndex) => roomIndex === index ? { ...room, [key]: nextValue } : room));
     };
-    return (_jsx(_Fragment, { children: _jsxs("div", { className: "truss-estimator", children: [_jsxs("div", { className: "quick-order-hero", children: [_jsx("div", { className: "quick-order-eyebrow", children: "Estimating Tools" }), _jsx("h1", { children: "Skirting Board Calculator" }), _jsx("p", { children: "Work out how many skirting board lengths you need for one room or a whole project." })] }), _jsxs("div", { className: "truss-estimator__card skirting-calculator", children: [_jsx("h2", { className: "truss-estimator__step-title", children: "Measure by room or total length" }), _jsx("p", { className: "truss-estimator__step-sub", children: "Enter a single total or work room by room. The run is converted straight into board lengths." }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "How would you like to measure?" }), _jsxs("div", { className: "brick-calculator__unit-toggle skirting-calculator__mode-toggle", role: "group", "aria-label": "Calculation method", children: [_jsx("button", { type: "button", className: mode === "total" ? "is-selected" : "", onClick: () => setMode("total"), children: "Total length" }), _jsx("button", { type: "button", className: mode === "rooms" ? "is-selected" : "", onClick: () => setMode("rooms"), children: "Room by room" })] })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Measurements" }), _jsxs("div", { className: "skirting-calculator__unit-row", children: [_jsx("span", { children: "Units" }), _jsxs("div", { className: "brick-calculator__unit-toggle", role: "group", "aria-label": "Measurement units", children: [_jsx("button", { type: "button", className: unit === "m" ? "is-selected" : "", onClick: () => setUnit("m"), children: "Metres" }), _jsx("button", { type: "button", className: unit === "ft" ? "is-selected" : "", onClick: () => setUnit("ft"), children: "Feet" })] })] }), mode === "total" ? (_jsxs("label", { className: "truss-estimator__field skirting-calculator__single-field", children: [_jsxs("span", { children: ["Total skirting length (", unit, ")"] }), _jsx("input", { type: "number", min: "0", step: "0.01", value: totalLength, onChange: (event) => setTotalLength(event.target.value) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "skirting-calculator__dimensions-header", children: [_jsx("span", { children: "Room" }), _jsxs("span", { children: ["Length (", unit, ")"] }), _jsxs("span", { children: ["Width (", unit, ")"] }), _jsx("span", {})] }), rooms.map((room, index) => (_jsxs("div", { className: "skirting-calculator__room-row", children: [_jsxs("span", { className: "skirting-calculator__room-label", children: ["Room ", index + 1] }), _jsx("input", { "aria-label": `Room ${index + 1} length in ${unit}`, type: "number", min: "0", step: "0.01", value: room.length, onChange: (event) => updateRoom(index, "length", event.target.value) }), _jsx("input", { "aria-label": `Room ${index + 1} width in ${unit}`, type: "number", min: "0", step: "0.01", value: room.width, onChange: (event) => updateRoom(index, "width", event.target.value) }), rooms.length > 1 ? _jsx("button", { type: "button", className: "paint-calculator__remove", onClick: () => setRooms((items) => items.filter((_, roomIndex) => roomIndex !== index)), children: "Remove" }) : null] }, `room-${index}`))), _jsx("button", { type: "button", className: "paint-calculator__add", onClick: () => setRooms((items) => [...items, emptyRoom()]), children: "+ Add another room" })] })), _jsxs("label", { className: "truss-estimator__field skirting-calculator__single-field", children: [_jsxs("span", { children: ["Openings and doorways to deduct (", unit, ") ", _jsx("small", { children: "optional" })] }), _jsx("input", { type: "number", min: "0", step: "0.01", value: openings, onChange: (event) => setOpenings(event.target.value) })] })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Profile" }), _jsx("p", { className: "skirting-calculator__hint", children: "Choose the finish you want for the fixed 4.2m white-primed MDF boards." }), _jsx("div", { className: "architrave-calculator__profiles", children: PROFILES.map((option) => _jsxs("button", { type: "button", className: `truss-estimator__option-card${profile === option.id ? " is-selected" : ""}`, onClick: () => setProfile(option.id), children: [_jsx(ProfileDiagram, { profile: option.id }), _jsx("div", { className: "truss-estimator__option-title", children: option.label }), _jsx("div", { className: "truss-estimator__option-copy", children: option.blurb })] }, option.id)) })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Board and waste" }), _jsx("div", { className: "truss-estimator__field-grid skirting-calculator__options-grid", children: _jsxs("label", { className: "truss-estimator__field", children: [_jsx("span", { children: "Board length" }), _jsx("input", { value: "4.20 m", disabled: true })] }) }), _jsx("p", { className: "skirting-calculator__hint", children: "Longer boards can reduce the number of joins, while 10% waste allows for cuts, corners and mistakes." })] }), _jsxs("div", { className: "skirting-calculator__totals", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Totals" }), _jsxs("div", { className: "skirting-calculator__result-grid", children: [_jsxs("div", { children: [_jsx("span", { children: "Net skirting" }), _jsxs("strong", { children: [netLengthM.toFixed(2), " m"] })] }), _jsxs("div", { children: [_jsx("span", { children: "Board lengths" }), _jsx("strong", { children: boardCount })] })] }), _jsx("p", { className: "skirting-calculator__note", children: "Corners and joins vary by room layout. Measure each wall where possible for the most accurate result." })] }), _jsxs("div", { className: "skirting-calculator__actions", children: [_jsx("button", { type: "button", className: "cta-btn cta-btn-secondary estimator-actions__back", onClick: onBack, children: "Back" }), _jsx("button", { type: "button", className: "cta-btn estimator-actions__calculate", onClick: () => onReview?.(requirements), disabled: netLengthM <= 0, children: submitLabel })] })] })] }) }));
+    return (_jsx(_Fragment, { children: _jsxs("div", { className: "truss-estimator", children: [_jsxs("div", { className: "quick-order-hero", children: [_jsx("div", { className: "quick-order-eyebrow", children: "Estimating Tools" }), _jsx("h1", { children: "Skirting Board Calculator" }), _jsx("p", { children: "Work out how many skirting board lengths you need for one room or a whole project." })] }), _jsxs("div", { className: "truss-estimator__card skirting-calculator", children: [_jsx("h2", { className: "truss-estimator__step-title", children: "Measure by room or total length" }), _jsx("p", { className: "truss-estimator__step-sub", children: "Enter a single total or work room by room. The run is converted straight into board lengths." }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "How would you like to measure?" }), _jsxs("div", { className: "brick-calculator__unit-toggle skirting-calculator__mode-toggle", role: "group", "aria-label": "Calculation method", children: [_jsx("button", { type: "button", className: mode === "total" ? "is-selected" : "", onClick: () => setMode("total"), children: "Total length" }), _jsx("button", { type: "button", className: mode === "rooms" ? "is-selected" : "", onClick: () => setMode("rooms"), children: "Room by room" })] })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Measurements" }), _jsxs("div", { className: "skirting-calculator__unit-row", children: [_jsx("span", { children: "Units" }), _jsxs("div", { className: "brick-calculator__unit-toggle", role: "group", "aria-label": "Measurement units", children: [_jsx("button", { type: "button", className: unit === "m" ? "is-selected" : "", onClick: () => setUnit("m"), children: "Metres" }), _jsx("button", { type: "button", className: unit === "ft" ? "is-selected" : "", onClick: () => setUnit("ft"), children: "Feet" })] })] }), mode === "total" ? (_jsxs("label", { className: "truss-estimator__field skirting-calculator__single-field", children: [_jsxs("span", { children: ["Total skirting length (", unit, ")"] }), _jsx("input", { type: "number", min: "0", step: "0.01", value: totalLength, onChange: (event) => setTotalLength(event.target.value) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "skirting-calculator__dimensions-header", children: [_jsx("span", { children: "Room" }), _jsxs("span", { children: ["Length (", unit, ")"] }), _jsxs("span", { children: ["Width (", unit, ")"] }), _jsx("span", {})] }), rooms.map((room, index) => (_jsxs("div", { className: "skirting-calculator__room-row", children: [_jsxs("span", { className: "skirting-calculator__room-label", children: ["Room ", index + 1] }), _jsx("input", { "aria-label": `Room ${index + 1} length in ${unit}`, type: "number", min: "0", step: "0.01", value: room.length, onChange: (event) => updateRoom(index, "length", event.target.value) }), _jsx("input", { "aria-label": `Room ${index + 1} width in ${unit}`, type: "number", min: "0", step: "0.01", value: room.width, onChange: (event) => updateRoom(index, "width", event.target.value) }), rooms.length > 1 ? _jsx("button", { type: "button", className: "paint-calculator__remove", onClick: () => setRooms((items) => items.filter((_, roomIndex) => roomIndex !== index)), children: "Remove" }) : null] }, `room-${index}`))), _jsx("button", { type: "button", className: "paint-calculator__add", onClick: () => setRooms((items) => [...items, emptyRoom()]), children: "+ Add another room" })] })), _jsxs("label", { className: "truss-estimator__field skirting-calculator__single-field", children: [_jsxs("span", { children: ["Openings and doorways to deduct (", unit, ") ", _jsx("small", { children: "optional" })] }), _jsx("input", { type: "number", min: "0", step: "0.01", value: openings, onChange: (event) => setOpenings(event.target.value) })] })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Profile" }), _jsx("p", { className: "skirting-calculator__hint", children: "Choose the finish you want for the fixed 4.4m white-primed MDF boards." }), _jsx("div", { className: "architrave-calculator__profiles", children: PROFILES.map((option) => _jsxs("button", { type: "button", className: `truss-estimator__option-card${profile === option.id ? " is-selected" : ""}`, onClick: () => setProfile(option.id), children: [_jsx(ProfileDiagram, { profile: option.id }), _jsx("div", { className: "truss-estimator__option-title", children: option.label }), _jsx("div", { className: "truss-estimator__option-copy", children: option.blurb })] }, option.id)) })] }), _jsxs("div", { className: "skirting-calculator__section", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Board and waste" }), _jsx("div", { className: "truss-estimator__field-grid skirting-calculator__options-grid", children: _jsxs("label", { className: "truss-estimator__field", children: [_jsx("span", { children: "Board length" }), _jsx("input", { value: "4.40 m", disabled: true })] }) }), _jsx("p", { className: "skirting-calculator__hint", children: "Longer boards can reduce the number of joins, while 10% waste allows for cuts, corners and mistakes." })] }), _jsxs("div", { className: "skirting-calculator__totals", children: [_jsx("div", { className: "truss-estimator__section-heading", children: "Totals" }), _jsxs("div", { className: "skirting-calculator__result-grid", children: [_jsxs("div", { children: [_jsx("span", { children: "Net skirting" }), _jsxs("strong", { children: [netLengthM.toFixed(2), " m"] })] }), _jsxs("div", { children: [_jsx("span", { children: "Board lengths" }), _jsx("strong", { children: boardCount })] })] }), _jsx("p", { className: "skirting-calculator__note", children: "Corners and joins vary by room layout. Measure each wall where possible for the most accurate result." })] }), _jsxs("div", { className: "skirting-calculator__actions", children: [_jsx("button", { type: "button", className: "cta-btn cta-btn-secondary estimator-actions__back", onClick: onBack, children: "Back" }), _jsx("button", { type: "button", className: "cta-btn estimator-actions__calculate", onClick: () => onReview?.(requirements), disabled: netLengthM <= 0, children: submitLabel })] })] })] }) }));
 }

package/dist/components/estimators/useFixedBasket.d.ts

@@ -1,6 +1,7 @@
 export type FixedBasketLine = {
     key: string;
     productId: string;
+    search: string;
     qty: number;
     unit?: string;
 };

package/dist/components/estimators/useFixedBasket.js

@@ -4,7 +4,7 @@ import { useState } from "react";
 import BrickWall from "../BrickWall";
 import { useCart } from "../../lib/cart/CartContext";
 import { candidateToCartItem } from "../../lib/boq/toCartItem";
-import { searchCatalogue } from "../../lib/estimators/resolveProducts";
+import { estimateRequestUnit, searchCatalogue } from "../../lib/estimators/resolveProducts";
 const MIN_BASKET_LOADING_MS = 1500;
 export function useFixedBasket(toolTitle) {
     const { addManyToCart, clearCart, openBasket } = useCart();
@@ -16,10 +16,10 @@ export function useFixedBasket(toolTitle) {
         setBasketError(null);
         try {
             const items = await Promise.all(lines.filter((line) => line.qty > 0).map(async (line) => {
-                const candidate = (await searchCatalogue(line.productId)).find((item) => item.product_id === line.productId);
+                const candidate = (await searchCatalogue(line.search)).find((item) => item.product_id === line.productId);
                 if (!candidate)
                     throw new Error("A selected product is no longer available in this catalogue.");
-                return candidateToCartItem(candidate, { lineId: `${toolTitle}:${line.key}`, description: candidate.description, unit: line.unit ?? "each", qty: line.qty, calculatorWasteIncluded: wasteIncluded });
+                return candidateToCartItem(candidate, { lineId: `${toolTitle}:${line.key}`, description: candidate.description, unit: estimateRequestUnit(line.unit ?? "each", candidate), qty: line.qty, calculatorWasteIncluded: wasteIncluded });
             }));
             const remaining = MIN_BASKET_LOADING_MS - (Date.now() - startedAt);
             if (remaining > 0)