thm-p3-configurator 0.0.227 → 0.0.229

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

@@ -44,12 +44,13 @@ var _ProductTableSectionTotal = _interopRequireDefault(require("../__components_
 var _ProductTableStaticRow = _interopRequireDefault(require("../__components__/ProductTable/ProductTableStaticRow"));
 var _ProductTableTotal = _interopRequireDefault(require("../__components__/ProductTable/ProductTableTotal"));
 var _FullPageSpinner = _interopRequireDefault(require("../__components__/Spinners/FullPageSpinner"));
+var _constants__ = require("../__constants__");
 var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
-var _constants__ = require("../__constants__");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
 var _product = require("../__helpers__/product");
+var _useIsTmg = require("../__hooks__/useIsTmg");
 var _InternalDiscountForm = _interopRequireDefault(require("./internal/InternalDiscountForm"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
@@ -127,6 +128,7 @@ function _toPrimitive(t, r) {
 const ProductCartTable = () => {
   var _marketCorrection$con;
   const formula = (0, _FormulaContext.useFormula)();
+  const isTmg = (0, _useIsTmg.useIsTmg)();
   const [isToggled, setIsToggled] = (0, _react.useState)(false);
   const [{
     licensePlate,
@@ -179,6 +181,7 @@ const ProductCartTable = () => {
     discountPercentage,
     formula
   });
+  console.log('Cart Input:', cartInput);
   const marketCorrection = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === 'MC');
   let mainProducts = [];
   let accessoireProducts = [];
@@ -200,7 +203,9 @@ const ProductCartTable = () => {
         salesPriceInclVat: 0,
         margin: 0,
         marginPercentage: 0,
-        hasLocationTotal: false
+        hasLocationTotal: false,
+        catalogPriceExcl: 0,
+        salesPriceIncl: 0
       };
     }
     if (!product) {
@@ -209,11 +214,26 @@ const ProductCartTable = () => {
         salesPrice: 0,
         margin: 0,
         marginPercentage: 0,
-        hasLocationTotal: false
+        hasLocationTotal: false,
+        catalogPriceExcl: 0,
+        salesPriceIncl: 0
+      };
+    }
+
+    // TMG case: when TMG and toggled, show catalog price excl and verkoop prijs incl
+    if (isTmg && isToggled && product !== null && product !== void 0 && product.consumerPrices) {
+      return {
+        purchasePrice: 0,
+        salesPrice: 0,
+        margin: 0,
+        hasLocationTotal: false,
+        catalogPriceExcl: product.consumerPrices.listPriceExclVat || 0,
+        salesPriceIncl: product.consumerPrices.priceInclVat || 0
       };
     }
     let purchasePrice = 0;
     let salesPrice = 0;
+    console.log('Cart Item:', cartItem);
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
 
     // Get prices directly from product objects
@@ -229,7 +249,9 @@ const ProductCartTable = () => {
       purchasePrice,
       salesPrice,
       margin,
-      hasLocationTotal
+      hasLocationTotal,
+      catalogPriceExcl: 0,
+      salesPriceIncl: 0
     };
   };
   if (products) {
@@ -272,17 +294,24 @@ const ProductCartTable = () => {
   if (isLoadingProducts) {
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
   }
+  console.log('Hyper API Response:', cart);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("content col-lg")
   }, /*#__PURE__*/_react.default.createElement(_TogglableCard.default, {
     title: 'Overzicht',
-    untoggleButton: selectedBranch ? 'Verberg inkoopprijzen' : undefined,
-    toggleButton: selectedBranch ? 'Toon inkoopprijzen' : undefined,
+    untoggleButton: selectedBranch || isTmg ? 'Verberg inkoopprijzen' : undefined,
+    toggleButton: selectedBranch || isTmg ? 'Toon inkoopprijzen' : undefined,
     onToggle: toggled => setIsToggled(toggled)
   }, /*#__PURE__*/_react.default.createElement("table", {
     className: (0, _helpers__.withStyle)('cart__table table table-borderless align-middle')
   }, /*#__PURE__*/_react.default.createElement(_ProductTableHead.default, {
-    columns: [{}, {}, {}, {}, ...(isToggled ? [{
+    columns: [{}, {}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+      text: 'Catalogprijs (excl. btw)',
+      className: 'fw-bold text-end'
+    }, {
+      text: 'Verkoop Prijs (incl. btw)',
+      className: 'fw-bold text-end'
+    }] : [{
       text: 'Marge (excl. btw)',
       className: 'fw-bold text-end'
     }, {
@@ -305,15 +334,27 @@ const ProductCartTable = () => {
       salesPrice,
       margin,
       marginPercentage,
-      hasLocationTotal
+      hasLocationTotal,
+      catalogPriceExcl,
+      salesPriceIncl
     } = product.priceInfo;
+    console.log('Product:', {
+      subgroupName: (product === null || product === void 0 ? void 0 : product.subgroupName) || (product === null || product === void 0 ? void 0 : product.groupName) || product.title,
+      priceInfo: product.priceInfo
+    });
     return /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
       key: product.articleNumber,
       productTitle: (product === null || product === void 0 ? void 0 : product.subgroupName) || (product === null || product === void 0 ? void 0 : product.groupName) || product.title,
       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 ? [{
+      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+        text: (0, _helpers__.formatPrice)(catalogPriceExcl),
+        className: 'cart__table-price text-end'
+      }, {
+        text: (0, _helpers__.formatPrice)(salesPriceIncl),
+        className: 'cart__table-price text-end'
+      }] : [{
         text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
         className: 'cart__table-price text-end'
       }, {
@@ -331,7 +372,13 @@ const ProductCartTable = () => {
     productTitle: 'Montage',
     productSubtitle: (0, _helpers__.formatMontageTime)(totals === null || totals === void 0 ? void 0 : totals.montageTime),
     productImage: _montagePlaceholder.default,
-    extraCells: [{}, {}, {}, ...(isToggled ? [{
+    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.montagePricePlusMarketCorrectionInclVat),
+      className: 'cart__table-price text-end'
+    }] : [{
       text: 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
@@ -347,7 +394,13 @@ const ProductCartTable = () => {
   }), isToggled && marketCorrection && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
     productTitle: 'Marktcorrectie',
     productImage: _montagePlaceholder.default,
-    extraCells: [{}, {}, {}, ...(isToggled ? [{
+    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),
+      className: 'cart__table-price text-end'
+    }] : [{
       text: (marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.locationTotal) > 0 ? (0, _helpers__.formatPrice)(((_marketCorrection$con = marketCorrection === null || marketCorrection === void 0 ? void 0 : marketCorrection.consumerTotal) !== null && _marketCorrection$con !== void 0 ? _marketCorrection$con : 0) / 1.21 - marketCorrection.locationTotal) : 'N.v.t.',
       className: 'cart__table-price text-end'
     }, {
@@ -364,7 +417,13 @@ const ProductCartTable = () => {
     isEditable: true,
     editLabel: 'Wijzig je trekhaakpakket',
     editLink: '/configurator/trekhaakpakket',
-    extraCells: [{}, {}, ...(isToggled ? [{
+    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {
+      text: '',
+      className: 'fw-bold text-end'
+    }, {
+      text: '',
+      className: 'fw-bold text-end'
+    }] : [{
       text: '',
       className: 'fw-bold text-end'
     }, {
@@ -376,7 +435,7 @@ const ProductCartTable = () => {
     }] : [{}, {}, {}, {
       text: 'Subtotaal (incl. btw)',
       className: 'fw-bold text-end pb-2'
-    }]), ...(isToggled ? [{
+    }]), ...(isToggled ? isTmg ? [] : [{
       text: (0, _helpers__.formatPrice)(mainProductsSubtotal),
       className: 'fw-bold text-end pb-2'
     }, {
@@ -396,7 +455,9 @@ const ProductCartTable = () => {
       salesPrice,
       margin,
       marginPercentage,
-      hasLocationTotal
+      hasLocationTotal,
+      catalogPriceExcl,
+      salesPriceIncl
     } = product.priceInfo;
     let canProductBeAltered = canAlterQuantity;
     if (!canAlterQuantity && !(allArticleNumbers !== null && allArticleNumbers !== void 0 && allArticleNumbers.includes(product.articleNumber))) {
@@ -409,7 +470,13 @@ 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 ? [{
+      extraCells: [{}, {}, {}, ...(isToggled ? isTmg ? [{}, {
+        text: (0, _helpers__.formatPrice)(catalogPriceExcl),
+        className: 'cart__table-price text-end'
+      }, {
+        text: (0, _helpers__.formatPrice)(salesPriceIncl),
+        className: 'cart__table-price text-end'
+      }] : [{
         text: hasLocationTotal ? (0, _helpers__.formatPrice)(margin) : 'N.v.t.',
         className: 'cart__table-price text-end'
       }, {
@@ -443,7 +510,13 @@ const ProductCartTable = () => {
     });
   }), /*#__PURE__*/_react.default.createElement(_ProductTableSectionTotal.default, {
     isEditable: false,
-    extraCells: [{}, {}, ...(isToggled ? [{
+    extraCells: [{}, {}, ...(isToggled ? isTmg ? [{}, {
+      text: '',
+      className: 'fw-bold text-end'
+    }, {
+      text: '',
+      className: 'fw-bold text-end'
+    }] : [{
       text: '',
       className: 'fw-bold text-end'
     }, {
@@ -455,7 +528,7 @@ const ProductCartTable = () => {
     }] : [{}, {}, {}, {
       text: 'Subtotaal (incl. btw)',
       className: 'fw-bold text-end pb-2'
-    }]), ...(isToggled ? [{
+    }]), ...(isToggled ? isTmg ? [] : [{
       text: (0, _helpers__.formatPrice)(accessoireProductsSubtotal),
       className: 'fw-bold text-end pb-2'
     }, {

package/dist/src/shared/__containers__/internal/InternalSingleOrderFilters.js

@@ -198,11 +198,11 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
       label: 'Maak een keuze',
       value: null
     }, ...(articleTypes && !isLoadingArticleTypes && articleTypes.length > 0 ? articleTypes.map(articleType => ({
-      label: "".concat(articleType.title, " ").concat(articleType.xdmsExternalRef ? ' | ' + articleType.xdmsExternalRef : ''),
+      label: "".concat(articleType.title).concat(articleType.xdmsExternalRef ? ' (' + articleType.xdmsExternalRef + ')' : ''),
       value: articleType.entityId
     })) : [])],
     initialValue: selectedArticleType,
-    label: "Artikel soort",
+    label: "Artikelsoort",
     placeholder: "Maak een keuze",
     onChange: option => {
       resetLicensePlateFilters();
@@ -216,11 +216,11 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
       label: 'Maak een keuze',
       value: null
     }, ...(articleGroups && !isLoadingArticleGroups && articleGroups.length > 0 ? articleGroups.map(articleGroup => ({
-      label: "".concat(articleGroup.title, " ").concat(articleGroup.xdmsExternalRef ? ' | ' + articleGroup.xdmsExternalRef : ''),
+      label: "".concat(articleGroup.title).concat(articleGroup.xdmsExternalRef ? ' (' + articleGroup.xdmsExternalRef + ')' : ''),
       value: articleGroup.entityId
     })) : [])],
     initialValue: selectedArticleGroup,
-    label: "Artikel groep",
+    label: "Productgroep",
     placeholder: "Maak een keuze",
     onChange: option => {
       resetLicensePlateFilters();
@@ -235,11 +235,11 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
       label: 'Maak een keuze',
       value: null
     }, ...(articleSubGroups && !isLoadingArticleSubGroups && articleSubGroups.length > 0 ? articleSubGroups.map(articleSubGroup => ({
-      label: "".concat(articleSubGroup.title, " ").concat(articleSubGroup.xdmsExternalRef ? ' | ' + articleSubGroup.xdmsExternalRef : ''),
+      label: "".concat(articleSubGroup.title).concat(articleSubGroup.xdmsExternalRef ? ' (' + articleSubGroup.xdmsExternalRef + ')' : ''),
       value: articleSubGroup.entityId
     })) : [])],
     initialValue: selectedArticleSubGroup,
-    label: "Artikel subgroep",
+    label: "Sub productgroep",
     placeholder: "Maak een keuze",
     onChange: option => {
       resetLicensePlateFilters();

package/package.json

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