thm-p3-configurator 0.0.286 → 0.0.288

package/dist/src/shared/__containers__/ProductsCartOverview.js

@@ -345,6 +345,7 @@ const ProductCartTable = () => {
     };
   }, [marketCorrection, totals]);
   const getItemPrices = (cartItem, product) => {
+    var _product$consumerPric3, _product$consumerPric4;
     if (!cartItem) {
       return {
         purchasePrice: 0,
@@ -368,12 +369,13 @@ const ProductCartTable = () => {
       };
     }
 
-    // TMG case
-    if (isTmg && isToggled && product !== null && product !== void 0 && product.consumerPrices) {
-      var _product$locationPric, _ref, _ref2, _cartItem$consumerTot, _product$consumerPric;
+    // TMG-style case (used for TOGGLED_TMG display mode)
+    // This provides more robust price calculations with proper fallbacks
+    if (useTmgDisplayMode && isToggled && product !== null && product !== void 0 && product.consumerPrices) {
+      var _product$locationPric, _ref, _ref2, _product$consumerPric, _product$consumerPric2;
       const purchasePrice = locationTotal || Number((product === null || product === void 0 || (_product$locationPric = product.locationPrices) === null || _product$locationPric === void 0 ? void 0 : _product$locationPric.priceExclVat) || 0);
-      const salesPriceRaw = (_ref = (_ref2 = (_cartItem$consumerTot = cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) !== null && _cartItem$consumerTot !== void 0 ? _cartItem$consumerTot : product === null || product === void 0 || (_product$consumerPric = product.consumerPrices) === null || _product$consumerPric === void 0 ? void 0 : _product$consumerPric.priceInclVat) !== null && _ref2 !== void 0 ? _ref2 : product === null || product === void 0 ? void 0 : product.price) !== null && _ref !== void 0 ? _ref : 0;
-      const salesPrice = salesPriceRaw && !Number.isNaN(Number(salesPriceRaw)) ? Number(salesPriceRaw) / _cartTable.VAT_RATE : 0;
+      const salesPriceRaw = (_ref = (_ref2 = (_product$consumerPric = product === null || product === void 0 || (_product$consumerPric2 = product.consumerPrices) === null || _product$consumerPric2 === void 0 ? void 0 : _product$consumerPric2.priceExclVat) !== null && _product$consumerPric !== void 0 ? _product$consumerPric : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) / _cartTable.VAT_RATE : null) !== null && _ref2 !== void 0 ? _ref2 : product === null || product === void 0 ? void 0 : product.price) !== null && _ref !== void 0 ? _ref : 0;
+      const salesPrice = salesPriceRaw && !Number.isNaN(Number(salesPriceRaw)) ? Number(salesPriceRaw) : 0;
       return {
         purchasePrice,
         salesPrice,
@@ -387,6 +389,7 @@ const ProductCartTable = () => {
     // Standard case
     let purchasePrice = 0;
     let salesPrice = 0;
+    let salesPriceIncl = 0;
     if (APP_CONFIG.internal) {
       purchasePrice = locationTotal;
       salesPrice = isToggled ? (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) / _cartTable.VAT_RATE : hasLocationTotal ? locationTotal : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
@@ -394,13 +397,16 @@ const ProductCartTable = () => {
       purchasePrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
       salesPrice = (product === null || product === void 0 ? void 0 : product.price) || 0;
     }
+    const consumerPriceInclVat = (_product$consumerPric3 = product === null || product === void 0 || (_product$consumerPric4 = product.consumerPrices) === null || _product$consumerPric4 === void 0 ? void 0 : _product$consumerPric4.priceInclVat) !== null && _product$consumerPric3 !== void 0 ? _product$consumerPric3 : (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) : 0;
+    const salesPriceNumber = Number(salesPrice) || 0;
+    salesPriceIncl = consumerPriceInclVat > 0 ? Number(consumerPriceInclVat) : salesPriceNumber > 0 ? salesPriceNumber * _cartTable.VAT_RATE : 0;
     return {
       purchasePrice,
       salesPrice,
       margin: salesPrice - purchasePrice,
       hasLocationTotal,
       catalogPriceExcl: 0,
-      salesPriceIncl: 0
+      salesPriceIncl
     };
   };
 
@@ -435,7 +441,7 @@ const ProductCartTable = () => {
       mainProducts: rawMainProducts.map(enhanceProduct),
       accessoireProducts: rawAccessoireProducts.map(enhanceProduct)
     };
-  }, [products, selectedTowbar, selectedCombiset, selectedCableset, selectedBoardComputer, selectedExtras, cartLookup, consumerDiscounts, isTmg, isToggled]);
+  }, [products, selectedTowbar, selectedCombiset, selectedCableset, selectedBoardComputer, selectedExtras, cartLookup, consumerDiscounts, useTmgDisplayMode, isToggled]);
 
   // Calculate subtotals
   const subtotals = (0, _react.useMemo)(() => {
@@ -452,15 +458,21 @@ const ProductCartTable = () => {
     // Main products incl VAT (for default mode)
     const mainInclVat = !isToggled ? mainProducts.reduce((total, product) => {
       const {
+        salesPriceIncl,
         salesPrice
       } = product.priceInfo || {};
-      if (!APP_CONFIG.internal) {
-        const isVehicleCoding = (product === null || product === void 0 ? void 0 : product.subgroupName) === _constants__.VEHICLE_CODING_SUBGROUP_NAME || (product === null || product === void 0 ? void 0 : product.groupName) === _constants__.VEHICLE_CODING_SUBGROUP_NAME;
-        if (!isVehicleCoding) return total;
-      }
-      return salesPrice > 0 ? total + Number(salesPrice) : total;
+      const resolvedIncl = salesPriceIncl || (salesPrice ? Number(salesPrice) * _cartTable.VAT_RATE : 0);
+      return resolvedIncl > 0 ? total + Number(resolvedIncl) : total;
     }, 0) : 0;
     const montageInclVat = !isToggled && APP_CONFIG.internal ? Number((totals === null || totals === void 0 ? void 0 : totals.montagePricePlusMarketCorrectionInclVat) || 0) : 0;
+    const accessoryInclVat = !isToggled ? accessoireProducts.reduce((total, product) => {
+      const {
+        salesPriceIncl,
+        salesPrice
+      } = product.priceInfo || {};
+      const resolvedIncl = salesPriceIncl || (salesPrice ? Number(salesPrice) * _cartTable.VAT_RATE : 0);
+      return resolvedIncl > 0 ? total + Number(resolvedIncl) : total;
+    }, 0) : 0;
 
     // Main products excl VAT (for toggled standard mode)
     // Use !useTmgDisplayMode to match the display mode logic (isTmg && !isTowFormula)
@@ -473,30 +485,31 @@ const ProductCartTable = () => {
     const montageExclVat = isToggled && !useTmgDisplayMode ? Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0) : 0;
     const marketCorrectionExclVat = isToggled && !useTmgDisplayMode && marketCorrectionValues.hasValue ? marketCorrectionValues.salesExcl : 0;
 
-    // TMG subtotals
-    const tmgCatalog = isTmg ? mainProducts.reduce((t, p) => {
+    // TMG-style subtotals (used for TOGGLED_TMG display mode)
+    // Calculate whenever useTmgDisplayMode is true (TMG users OR THC users without discount capability)
+    const tmgCatalog = useTmgDisplayMode ? mainProducts.reduce((t, p) => {
       var _p$priceInfo2;
       return t + Number((p === null || p === void 0 || (_p$priceInfo2 = p.priceInfo) === null || _p$priceInfo2 === void 0 ? void 0 : _p$priceInfo2.catalogPriceExcl) || 0);
     }, 0) : 0;
-    const tmgMargin = isTmg ? mainProducts.reduce((t, p) => {
+    const tmgMargin = useTmgDisplayMode ? mainProducts.reduce((t, p) => {
       var _p$priceInfo3;
       return t + Number((p === null || p === void 0 || (_p$priceInfo3 = p.priceInfo) === null || _p$priceInfo3 === void 0 ? void 0 : _p$priceInfo3.margin) || 0);
     }, 0) + (isToggled && marketCorrectionValues.hasValue ? marketCorrectionValues.margin : 0) : 0;
-    const tmgSales = isTmg ? mainProducts.reduce((t, p) => {
+    const tmgSales = useTmgDisplayMode ? mainProducts.reduce((t, p) => {
       var _p$priceInfo4;
       return t + Number((p === null || p === void 0 || (_p$priceInfo4 = p.priceInfo) === null || _p$priceInfo4 === void 0 ? void 0 : _p$priceInfo4.salesPrice) || 0);
     }, 0) + Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0) + (isToggled && marketCorrectionValues.hasValue ? marketCorrectionValues.salesExcl : 0) : 0;
 
-    // Accessories TMG subtotals
-    const accessoryTmgCatalog = isTmg ? accessoireProducts.reduce((t, p) => {
+    // Accessories TMG-style subtotals
+    const accessoryTmgCatalog = useTmgDisplayMode ? accessoireProducts.reduce((t, p) => {
       var _p$priceInfo5;
       return t + Number((p === null || p === void 0 || (_p$priceInfo5 = p.priceInfo) === null || _p$priceInfo5 === void 0 ? void 0 : _p$priceInfo5.catalogPriceExcl) || 0);
     }, 0) : 0;
-    const accessoryTmgMargin = isTmg ? accessoireProducts.reduce((t, p) => {
+    const accessoryTmgMargin = useTmgDisplayMode ? accessoireProducts.reduce((t, p) => {
       var _p$priceInfo6;
       return t + Number((p === null || p === void 0 || (_p$priceInfo6 = p.priceInfo) === null || _p$priceInfo6 === void 0 ? void 0 : _p$priceInfo6.margin) || 0);
     }, 0) : 0;
-    const accessoryTmgSales = isTmg ? accessoireProducts.reduce((t, p) => {
+    const accessoryTmgSales = useTmgDisplayMode ? accessoireProducts.reduce((t, p) => {
       var _p$priceInfo7;
       return t + Number((p === null || p === void 0 || (_p$priceInfo7 = p.priceInfo) === null || _p$priceInfo7 === void 0 ? void 0 : _p$priceInfo7.salesPrice) || 0);
     }, 0) : 0;
@@ -514,6 +527,7 @@ const ProductCartTable = () => {
       },
       accessories: {
         purchase: accessoryPurchase,
+        inclVat: accessoryInclVat,
         tmg: {
           catalog: accessoryTmgCatalog,
           margin: accessoryTmgMargin,
@@ -522,7 +536,7 @@ const ProductCartTable = () => {
         }
       }
     };
-  }, [mainProducts, accessoireProducts, marketCorrectionValues, isToggled, isTmg, useTmgDisplayMode, totals]);
+  }, [mainProducts, accessoireProducts, marketCorrectionValues, isToggled, useTmgDisplayMode, totals]);
 
   // ============================================================================
   // RENDER HELPERS
@@ -574,6 +588,7 @@ const ProductCartTable = () => {
 
   const showCatalogPrice = !isThc;
   const headerColumns = (0, _cartTable2.getCartTableHeaderColumns)(displayMode, showCatalogPrice);
+  console.log(mainProducts);
   const montageRateInputCell = isThc ? {} : {
     text: renderMontageRateInput(),
     className: _cartTable.CART_TABLE_PRICE_CELL_CLASS
@@ -711,7 +726,7 @@ const ProductCartTable = () => {
         purchase: subtotals.accessories.purchase,
         sales: totals === null || totals === void 0 ? void 0 : totals.totalExtrasExclVat
       },
-      defaultSubtotal: APP_CONFIG.internal ? totals === null || totals === void 0 ? void 0 : totals.totalExtrasInclVat : (totals === null || totals === void 0 ? void 0 : totals.totalExtrasExclVat) * _cartTable.VAT_RATE
+      defaultSubtotal: subtotals.accessories.inclVat
     }, showCatalogPrice)
   })), /*#__PURE__*/_react.default.createElement(_ProductTableTotal.default, {
     rows: [(0, _cartTable2.getTotalRowCells)(displayMode, {

package/dist/src/shared/__helpers__/cartTable.js

@@ -138,7 +138,8 @@ const getMainProductCells = _ref => {
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
     default:
       {
-        const showPrice = APP_CONFIG.internal && salesPrice > 0 ? (0, _index.formatPrice)(salesPriceIncl || salesPrice) : isVehicleCodingProduct ? (0, _index.formatPrice)(salesPriceIncl || salesPrice) : '';
+        const resolvedPrice = Number(salesPriceIncl || salesPrice || 0);
+        const showPrice = resolvedPrice > 0 ? (0, _index.formatPrice)(resolvedPrice) : '';
         return [...baseCells, {}, {}, textCell(showPrice, _cartTable.CART_TABLE_PRICE_CELL_CLASS)];
       }
   }
@@ -183,7 +184,8 @@ const getAccessoryProductCells = _ref2 => {
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
     default:
       {
-        const showPrice = APP_CONFIG.internal && salesPrice > 0 ? (0, _index.formatPrice)(salesPriceIncl || salesPrice) : '';
+        const resolvedPrice = Number(salesPriceIncl || salesPrice || 0);
+        const showPrice = resolvedPrice > 0 ? (0, _index.formatPrice)(resolvedPrice) : '';
         return [...baseCells, {}, {}, textCell(showPrice, _cartTable.CART_TABLE_PRICE_CELL_CLASS)];
       }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.286",
+  "version": "0.0.288",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",