thm-p3-configurator 0.0.258 → 0.0.259

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

@@ -215,6 +215,8 @@ const ProductCartTable = () => {
         salesPriceIncl: 0
       };
     }
+    const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
+    const locationTotal = hasLocationTotal ? Number(cartItem.locationTotal) : 0;
     if (!product) {
       return {
         purchasePrice: 0,
@@ -229,19 +231,22 @@ const ProductCartTable = () => {
 
     // TMG case: when TMG and toggled, show catalog price excl and verkoop prijs incl
     if (isTmg && isToggled && product !== null && product !== void 0 && product.consumerPrices) {
+      var _product$locationPric, _ref2, _ref3, _cartItem$consumerTot, _product$consumerPric;
+      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 = (_ref2 = (_ref3 = (_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 && _ref3 !== void 0 ? _ref3 : product === null || product === void 0 ? void 0 : product.price) !== null && _ref2 !== void 0 ? _ref2 : 0;
+      const salesPrice = salesPriceRaw && !Number.isNaN(Number(salesPriceRaw)) ? Number(salesPriceRaw) / 1.21 : 0;
+      const margin = salesPrice - purchasePrice;
       return {
-        purchasePrice: 0,
-        salesPrice: 0,
-        margin: 0,
-        hasLocationTotal: false,
+        purchasePrice,
+        salesPrice,
+        margin,
+        hasLocationTotal,
         catalogPriceExcl: product.consumerPrices.listPriceExclVat || 0,
         salesPriceIncl: product.consumerPrices.priceInclVat || 0
       };
     }
     let purchasePrice = 0;
     let salesPrice = 0;
-    const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
-    const locationTotal = hasLocationTotal ? Number(cartItem.locationTotal) : 0;
 
     // Get prices directly from product objects
     if (APP_CONFIG.internal) {
@@ -325,6 +330,34 @@ const ProductCartTable = () => {
   const montageDisplayedTotalExclVat = isToggled && !isTmg ? Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0) : 0;
   const marketCorrectionDisplayedTotalExclVat = isToggled && !isTmg && hasMarketCorrectionValue ? Number(marketCorrectionSalesExcl || 0) : 0;
   const trekhaakmontageSubtotalExclVat = displayedMainProductsTotalExclVat + montageDisplayedTotalExclVat + marketCorrectionDisplayedTotalExclVat;
+
+  // TMG subtotal helpers (excl. btw columns)
+  const tmgMainCatalogSubtotal = isTmg ? mainProducts.reduce((total, product) => {
+    var _product$priceInfo2;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo2 = product.priceInfo) === null || _product$priceInfo2 === void 0 ? void 0 : _product$priceInfo2.catalogPriceExcl) || 0);
+  }, 0) : 0;
+  const tmgMainMarginSubtotal = isTmg ? mainProducts.reduce((total, product) => {
+    var _product$priceInfo3;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo3 = product.priceInfo) === null || _product$priceInfo3 === void 0 ? void 0 : _product$priceInfo3.margin) || 0);
+  }, 0) + (isToggled && hasMarketCorrectionValue ? Number(marketCorrectionMargin || 0) : 0) : 0;
+  const tmgMainPurchaseSubtotal = isTmg ? mainProductsSubtotal : 0;
+  const tmgMainSalesSubtotal = isTmg ? mainProducts.reduce((total, product) => {
+    var _product$priceInfo4;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo4 = product.priceInfo) === null || _product$priceInfo4 === void 0 ? void 0 : _product$priceInfo4.salesPrice) || 0);
+  }, 0) + Number((totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat) || 0) + (isToggled && hasMarketCorrectionValue ? Number(marketCorrectionSalesExcl || 0) : 0) : 0;
+  const tmgAccessoriesCatalogSubtotal = isTmg ? accessoireProducts.reduce((total, product) => {
+    var _product$priceInfo5;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo5 = product.priceInfo) === null || _product$priceInfo5 === void 0 ? void 0 : _product$priceInfo5.catalogPriceExcl) || 0);
+  }, 0) : 0;
+  const tmgAccessoriesMarginSubtotal = isTmg ? accessoireProducts.reduce((total, product) => {
+    var _product$priceInfo6;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo6 = product.priceInfo) === null || _product$priceInfo6 === void 0 ? void 0 : _product$priceInfo6.margin) || 0);
+  }, 0) : 0;
+  const tmgAccessoriesPurchaseSubtotal = isTmg ? accessoireProductsSubtotal : 0;
+  const tmgAccessoriesSalesSubtotal = isTmg ? accessoireProducts.reduce((total, product) => {
+    var _product$priceInfo7;
+    return total + Number((product === null || product === void 0 || (_product$priceInfo7 = product.priceInfo) === null || _product$priceInfo7 === void 0 ? void 0 : _product$priceInfo7.salesPrice) || 0);
+  }, 0) : 0;
   if (isLoadingProducts) {
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
   }
@@ -338,11 +371,17 @@ const ProductCartTable = () => {
   }, /*#__PURE__*/_react.default.createElement("table", {
     className: (0, _helpers__.withStyle)('cart__table table table-borderless align-middle')
   }, /*#__PURE__*/_react.default.createElement(_ProductTableHead.default, {
-    columns: [{}, {}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+    columns: [{}, {}, {}, {}, ...(isToggled ? isTmg ? [{
       text: 'Catalogprijs (excl. btw)',
       className: 'fw-bold text-end'
     }, {
-      text: 'Verkoop Prijs (incl. btw)',
+      text: 'Marge (excl. btw)',
+      className: 'fw-bold text-end'
+    }, {
+      text: 'Inkoopprijs (excl. btw)',
+      className: 'fw-bold text-end'
+    }, {
+      text: 'Verkoop Prijs (excl. btw)',
       className: 'fw-bold text-end'
     }] : [{
       text: 'Marge (excl. btw)',
@@ -377,11 +416,17 @@ const ProductCartTable = () => {
       productImage: product !== null && product !== void 0 && (_product$images = product.images) !== null && _product$images !== void 0 && _product$images[0] ? (0, _image.getImageFromHyper)({
         imageId: (_product$images2 = product.images) === null || _product$images2 === void 0 ? void 0 : _product$images2[0]
       }) : _logoPrimary.default,
-      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{
         text: (0, _helpers__.formatPrice)(catalogPriceExcl),
         className: 'cart__table-price text-end'
       }, {
-        text: (0, _helpers__.formatPrice)(salesPriceIncl),
+        text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
+        className: 'cart__table-price text-end'
+      }, {
+        text: hasLocationTotal ? (0, _helpers__.formatPrice)(purchasePrice) : 'N.v.t.',
+        className: 'cart__table-price text-end'
+      }, {
+        text: salesPrice > 0 ? (0, _helpers__.formatPrice)(salesPrice) : 'N.v.t.',
         className: 'cart__table-price text-end'
       }] : [{
         text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
@@ -401,11 +446,17 @@ const ProductCartTable = () => {
     productTitle: 'Montage',
     productSubtitle: (0, _helpers__.formatMontageTime)(totals === null || totals === void 0 ? void 0 : totals.montageTime),
     productImage: _montagePlaceholder.default,
-    extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+    extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{
       text: 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
-      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.montagePriceInclVat),
+      text: 'N.v.t.',
+      className: 'cart__table-price text-end'
+    }, {
+      text: 'N.v.t.',
+      className: 'cart__table-price text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat),
       className: 'cart__table-price text-end'
     }] : [{
       text: 'N.v.t.',
@@ -423,11 +474,17 @@ const ProductCartTable = () => {
   }), isToggled && hasMarketCorrectionValue && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
     productTitle: 'Marktcorrectie',
     productImage: _montagePlaceholder.default,
-    extraCells: [{}, {}, {}, ...(isTmg ? [{}, {
+    extraCells: [{}, {}, {}, ...(isTmg ? [{
       text: 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
-      text: (0, _helpers__.formatPrice)(marketCorrectionSalesIncl),
+      text: (0, _helpers__.formatPrice)(marketCorrectionMargin),
+      className: 'cart__table-price text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(marketCorrectionPurchaseExcl),
+      className: 'cart__table-price text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(marketCorrectionSalesExcl),
       className: 'cart__table-price text-end'
     }] : [{
       text: (0, _helpers__.formatPrice)(marketCorrectionMargin),
@@ -443,12 +500,18 @@ const ProductCartTable = () => {
     isEditable: true,
     editLabel: 'Wijzig je trekhaakpakket',
     editLink: '/configurator/trekhaakpakket',
-    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {
-      text: '',
+    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {}, {
+      text: (0, _helpers__.formatPrice)(tmgMainCatalogSubtotal),
       className: 'fw-bold text-end'
     }, {
-      text: '',
+      text: (0, _helpers__.formatPrice)(tmgMainMarginSubtotal),
+      className: 'fw-bold text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(tmgMainPurchaseSubtotal),
       className: 'fw-bold text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(tmgMainSalesSubtotal),
+      className: 'fw-bold text-end pb-2'
     }] : [{
       text: '',
       className: 'fw-bold text-end'
@@ -496,11 +559,17 @@ const ProductCartTable = () => {
       productImage: product !== null && product !== void 0 && (_product$images3 = product.images) !== null && _product$images3 !== void 0 && _product$images3[0] ? (0, _image.getImageFromHyper)({
         imageId: (_product$images4 = product.images) === null || _product$images4 === void 0 ? void 0 : _product$images4[0]
       }) : _logoPrimary.default,
-      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{
         text: (0, _helpers__.formatPrice)(catalogPriceExcl),
         className: 'cart__table-price text-end'
       }, {
-        text: (0, _helpers__.formatPrice)(salesPriceIncl),
+        text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
+        className: 'cart__table-price text-end'
+      }, {
+        text: hasLocationTotal ? (0, _helpers__.formatPrice)(purchasePrice) : 'N.v.t.',
+        className: 'cart__table-price text-end'
+      }, {
+        text: salesPrice > 0 ? (0, _helpers__.formatPrice)(salesPrice) : 'N.v.t.',
         className: 'cart__table-price text-end'
       }] : [{
         text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
@@ -536,12 +605,18 @@ const ProductCartTable = () => {
     });
   }), /*#__PURE__*/_react.default.createElement(_ProductTableSectionTotal.default, {
     isEditable: false,
-    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {
-      text: '',
+    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {}, {
+      text: (0, _helpers__.formatPrice)(tmgAccessoriesCatalogSubtotal),
       className: 'fw-bold text-end'
     }, {
-      text: '',
+      text: (0, _helpers__.formatPrice)(tmgAccessoriesMarginSubtotal),
       className: 'fw-bold text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(tmgAccessoriesPurchaseSubtotal),
+      className: 'fw-bold text-end'
+    }, {
+      text: (0, _helpers__.formatPrice)(tmgAccessoriesSalesSubtotal),
+      className: 'fw-bold text-end pb-2'
     }] : [{
       text: '',
       className: 'fw-bold text-end'
@@ -565,7 +640,7 @@ const ProductCartTable = () => {
       className: 'fw-bold text-end pb-2'
     }])]
   })), /*#__PURE__*/_react.default.createElement(_ProductTableTotal.default, {
-    rows: [[{}, {}, {}, ...(isToggled ? [{
+    rows: [[{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'text-end pt-2'
     }, {
@@ -583,7 +658,7 @@ const ProductCartTable = () => {
     }] : [{
       text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountExclVat),
       className: 'text-end pt-2'
-    }])], [{}, {}, {}, ...(isToggled ? [{
+    }])], [{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'text-end'
     }, {
@@ -601,7 +676,7 @@ const ProductCartTable = () => {
     }] : [{
       text: APP_CONFIG.internal ? (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalVatAfterDiscount) : (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalVatAfterDiscount),
       className: 'text-end'
-    }])], [{}, {}, {}, ...(isToggled ? [{
+    }])], [{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'fw-bold text-end'
     }, {
@@ -624,7 +699,7 @@ const ProductCartTable = () => {
     colSpan: "10",
     className: (0, _helpers__.withStyle)('pt-4 pb-2')
   }, /*#__PURE__*/_react.default.createElement("hr", null))), /*#__PURE__*/_react.default.createElement(_ProductTableTotal.default, {
-    rows: [[{}, {}, {}, ...(isToggled ? [{
+    rows: [[{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'text-end text-success'
     }, {
@@ -639,7 +714,7 @@ const ProductCartTable = () => {
     }]), {
       text: "-".concat((0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.discountInclVat)),
       className: 'text-end text-success'
-    }], [{}, {}, {}, ...(isToggled ? [{
+    }], [{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'text-end'
     }, {
@@ -654,7 +729,7 @@ const ProductCartTable = () => {
     }]), {
       text: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountExclVat),
       className: 'text-end'
-    }], [{}, {}, {}, ...(isToggled ? [{
+    }], [{}, {}, {}, ...(isToggled && isTmg ? [{}] : []), ...(isToggled ? [{
       text: '',
       className: 'fw-bold text-end'
     }, {

package/package.json

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