@metron-labs/quote-react 0.1.60 → 0.1.62

package/dist/lib/estimators/fixedProducts.d.ts

@@ -3,5 +3,10 @@ import type { FixedBasketLine } from "../../components/estimators/useFixedBasket
 import type { EstimatorRequirement } from "./types";
 /** The catalogue search for this line's fixed product, or null when the active client has none. */
 export declare function fixedProductSearch(tool: EstimatorToolId, requirement: EstimatorRequirement): string | null;
+/**
+ * Whether a calculator should offer an option to the active client. A client with fixed products
+ * for that calculator is only offered what it stocks; any other client sees every option.
+ */
+export declare function offersOption(tool: EstimatorToolId, key: string): boolean;
 /** Basket lines when every line has a fixed product, so the calculator can skip the matching step. */
 export declare function fixedBasketLines(tool: EstimatorToolId, requirements: EstimatorRequirement[]): FixedBasketLine[] | null;

package/dist/lib/estimators/fixedProducts.js

@@ -12,11 +12,14 @@ const FIXED_PRODUCTS = {
     "NZ4Y-ZMSQ": {
         "brick-block": { "brick-common": "105499", "brick-engineering-red": "1654", "brick-engineering-blue": "1723", block: "501", "mortar-cement": "1762 cement", "mortar-sand": "564 building sand" },
         // Primed MDF, 4.4m lengths. Ogee and torus come in 119mm skirting / 69mm architrave; the other
-        // profiles only in 94mm and 144mm, so the nearer usable width is taken. FORT has no ovolo.
+        // profiles only in 94mm and 144mm, so the nearer usable width is taken. FORT has no ovolo, so
+        // the architrave calculator doesn't offer it (see offersOption).
         skirting: { "skirting-chamfered": "1525", "skirting-ogee": "135 primed mdf ogee", "skirting-pencil-round": "892", "skirting-torus": "1941" },
-        architrave: { "architrave-ogee": "134 primed mdf ogee", "architrave-ovolo": "1531", "architrave-pencil-round": "1896", "architrave-square-edge": "118 primed mdf square", "architrave-torus": "1531" },
+        architrave: { "architrave-ogee": "134 primed mdf ogee", "architrave-pencil-round": "1896", "architrave-square-edge": "118 primed mdf square", "architrave-torus": "1531" },
         // Board keys come from the board type; see fixedProductSearch.
         plasterboard: { standard: "1647", moisture: "11 moisture plasterboard", fire: "14 fire plasterboard", sound: "1769", screws: "131160", tape: "1766", adhesive: "108439" },
+        paint: { "paint-emulsion": "157217" },
+        "concrete-aggregate": { cement: "1762 cement", "sharp-sand": "563", gravel: "571", mot: "569" },
         insulation: { "insulation-floor": "152187", "insulation-ground": "442", "insulation-wall": "147", "insulation-roof": "442", "insulation-loft": "152180" },
         timber: { studs: "1213", joists: "208", battens: "1729" },
         fencing: {
@@ -38,6 +41,14 @@ export function fixedProductSearch(tool, requirement) {
     const key = tool === "plasterboard" && requirement.key === "board" ? requirement.label.split(" ")[0].toLowerCase() : requirement.key;
     return table[key] ?? null;
 }
+/**
+ * Whether a calculator should offer an option to the active client. A client with fixed products
+ * for that calculator is only offered what it stocks; any other client sees every option.
+ */
+export function offersOption(tool, key) {
+    const table = FIXED_PRODUCTS[getQuoteConfig().client ?? ""]?.[tool];
+    return !table || key in table;
+}
 /** Basket lines when every line has a fixed product, so the calculator can skip the matching step. */
 export function fixedBasketLines(tool, requirements) {
     const lines = requirements.map((requirement) => {

package/dist/util/pricing.js

@@ -102,6 +102,24 @@ const packItemsForRequestedUnit = (item, requestedUnit) => {
     }
     return null;
 };
+// A tin, bag or tub priced per item usually names its size, e.g. "Vinyl Matt Emulsion - 5L" or
+// "Sharp Sand Bulk Bag (800kg)"; a request in litres or kilograms is turned into whole packs from
+// that. Only used when the catalogue gives no volume or weight itself.
+const packSizeFromDescription = (item, measure) => {
+    const pattern = measure === "volume" ? /(\d+(?:[.,]\d+)?)\s*(ml|l|ltr|ltrs|litres?|liters?)\b/i : /(\d+(?:[.,]\d+)?)\s*(kg|kgs|tonnes?)\b/i;
+    const match = item.description.match(pattern);
+    if (!match)
+        return null;
+    const amount = Number.parseFloat(match[1].replace(",", "."));
+    if (!Number.isFinite(amount) || amount <= 0)
+        return null;
+    const unit = match[2].toLowerCase();
+    if (measure === "volume")
+        return { ml: unit === "ml" ? amount : amount * 1000 };
+    return { g: unit.startsWith("tonne") ? amount * 1000000 : amount * 1000 };
+};
+const catalogueVolumeTypes = ["volume_from_description", "same_unit_volume"];
+const catalogueWeightTypes = ["weight_from_description", "mass_from_pack", "same_unit_mass"];
 // Product exports often omit structured coverage but include it verbatim, e.g. "13.89m2/Roll".
 // This is intentionally narrow: it must name the same sell unit as the catalogue row.
 const coverageFromDescription = (item, requestedUnit, sellUnit) => {
@@ -142,6 +160,34 @@ export function getPricingBreakdown(item, options) {
     });
     if (!Number.isFinite(requestedAmount) || requestedAmount <= 0)
         return review("Quantity needs confirmation.");
+    const requestVolumeMl = volumeInMl(requestedAmount, requestedUnit);
+    const requestWeightG = weightInG(requestedAmount, requestedUnit);
+    const packFromDescription = sameUnit(requestedUnit, sellUnit)
+        ? null
+        : requestVolumeMl != null && !catalogueVolumeTypes.includes(item.conversionType ?? "")
+            ? packSizeFromDescription(item, "volume")
+            : requestWeightG != null && !catalogueWeightTypes.includes(item.conversionType ?? "")
+                ? packSizeFromDescription(item, "weight")
+                : null;
+    const requested = packFromDescription?.ml != null ? requestVolumeMl : requestWeightG;
+    const packAmount = packFromDescription?.ml ?? packFromDescription?.g ?? null;
+    if (requested != null && packAmount != null) {
+        const priceUnit = canonicalUnit(item.uoi) || sellUnit;
+        const packLabel = packFromDescription?.ml != null ? `${packAmount / 1000} l` : `${packAmount / 1000} kg`;
+        const required = hasOverride ? overriddenSellUnits : Math.ceil((requested * (1 + wasteFactor)) / packAmount - 1e-9);
+        return {
+            requestedAmount,
+            requestedUnit,
+            salesUnitSize: 1,
+            sellUnit: priceUnit,
+            calculatedSellUnits: required,
+            requiredSellUnits: required,
+            unitPrice: item.price,
+            lineTotal: item.price != null ? item.price * required : null,
+            calculation: `${requestedAmount} ${requestedUnit}${wasteFactor > 0 ? ` x ${1 + wasteFactor}` : ""} / ${packLabel} per ${priceUnit} (from product description) = ${required} ${priceUnit}`,
+            costingMode: "derived",
+        };
+    }
     // "sales_unit" means one listed-price unit, whatever it holds: 1 sales_unit of a box of
     // 1,000 screws priced "per Each" is one box at the listed price. The estimators ask for it
     // when they have already counted packs (see estimateRequestUnit).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metron-labs/quote-react",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "description": "Metron Labs quote and estimating calculator components for React",
   "license": "UNLICENSED",
   "sideEffects": [