@metron-labs/quote-react 0.1.72 → 0.1.74

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

@@ -1,3 +1,4 @@
+import { getPricingBreakdown } from "../../util/pricing";
 import type { CartItem } from "../../util/types";
 interface BasketStageProps {
     cart: Record<string, CartItem>;
@@ -10,5 +11,6 @@ interface BasketStageProps {
     onQuoteRequested?: () => void;
     internal?: boolean;
 }
+export declare const orderSummary: (item: CartItem, pricing: ReturnType<typeof getPricingBreakdown>) => string;
 export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onResolveConversions, onRemove, onBack, onStartNewQuote, onQuoteRequested, internal, }: BasketStageProps): import("react").JSX.Element;
 export {};

package/dist/app/stages/BasketStage.js

@@ -16,12 +16,17 @@ import ProductImage from "../../util/ProductImage";
 const VAT_RATE = 0.2; //Flat UK VAT rate, matching fmtCurrency's GBP-only assumption elsewhere in this app.
 const PAGE_SIZE = 10;
 const INVALID_EMAIL_MESSAGE = "Enter a valid email address so we can send your quote.";
-const orderSummary = (item, pricing) => {
+export const orderSummary = (item, pricing) => {
     const requested = `${pricing.requestedAmount} ${unitDisplayText(pricing.requestedUnit, pricing.requestedAmount)}`;
     const order = `${pricing.requiredSellUnits} ${unitDisplayText(pricing.sellUnit, pricing.requiredSellUnits ?? 0)}`;
     const conversion = item.unitConversions?.find((entry) => entry.requestUom === pricing.requestedUnit);
     if (conversion && conversion.quantityPerSaleUnit < 1) {
-        return `${requested} requested → order ${order} (${Math.round(1 / conversion.quantityPerSaleUnit)} ${unitDisplayText(pricing.sellUnit, 2)} per ${unitDisplayText(pricing.requestedUnit, 1)})`;
+        // A whole number reads per requested unit ("2 bulk bags per m3"); otherwise per sell unit ("0.75 l per unit", not "1 units per l").
+        const perRequested = Math.round(1 / conversion.quantityPerSaleUnit);
+        const ratio = Math.abs(perRequested * conversion.quantityPerSaleUnit - 1) < 1e-9
+            ? `${perRequested} ${unitDisplayText(pricing.sellUnit, perRequested)} per ${unitDisplayText(pricing.requestedUnit, 1)}`
+            : `${conversion.quantityPerSaleUnit} ${unitDisplayText(pricing.requestedUnit, conversion.quantityPerSaleUnit)} per ${unitDisplayText(pricing.sellUnit, 1)}`;
+        return `${requested} requested → order ${order} (${ratio})`;
     }
     const bulkBagKg = pricing.sellUnit === "bulk bag" ? item.description.match(/(\d+(?:\.\d+)?)\s*kg\b/i) : null;
     if (bulkBagKg) {

package/dist/components/unit/UnitDisplay.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import UnitLabel from "./UnitLabel";
 function pluralizeUnit(unit, count) {
-    if (count === 1 || /^m\d*$/i.test(unit))
+    // Unit symbols never take a plural: "800 kg", not "800 kgs".
+    if (count === 1 || /^(m\d*|mm|cm|ml|kg|g)$/i.test(unit))
         return unit;
     if (/(s|x|z|ch|sh)$/i.test(unit))
         return `${unit}es`;
@@ -13,7 +14,7 @@ export function unitDisplayText(unit, count) {
     const normalized = (unit ?? "").trim();
     if (!normalized || normalized === "-")
         return "";
-    const word = /^each$/i.test(normalized) ? "unit" : normalized;
+    const word = /^each$/i.test(normalized) ? "unit" : /^l$/i.test(normalized) ? "litre" : normalized;
     return count != null ? pluralizeUnit(word, count) : word;
 }
 export function renderDisplayUnit(unit, count) {