thm-p3-configurator 0.0.283 → 0.0.285

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

@@ -571,7 +571,8 @@ const ProductCartTable = () => {
   // ============================================================================
 
   const showCatalogPrice = !isThc;
-  const headerColumns = (0, _cartTable2.getCartTableHeaderColumns)(displayMode, showCatalogPrice);
+  const showDiscountColumn = isTowmotive || isTowFormula;
+  const headerColumns = (0, _cartTable2.getCartTableHeaderColumns)(displayMode, showCatalogPrice, showDiscountColumn);
   const montageRateInputCell = isThc ? {} : {
     text: renderMontageRateInput(),
     className: _cartTable.CART_TABLE_PRICE_CELL_CLASS
@@ -654,7 +655,7 @@ const ProductCartTable = () => {
         sales: subtotals.main.exclVat
       },
       defaultSubtotal: subtotals.main.inclVat
-    }, showCatalogPrice)
+    }, showCatalogPrice, showDiscountColumn)
   })), accessoireProducts.length > 0 && /*#__PURE__*/_react.default.createElement(_ProductTableSection.default, {
     heading: "Toebehoren"
   }, accessoireProducts.map(product => {
@@ -710,24 +711,24 @@ const ProductCartTable = () => {
         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
-    }, showCatalogPrice)
+    }, showCatalogPrice, showDiscountColumn)
   })), /*#__PURE__*/_react.default.createElement(_ProductTableTotal.default, {
     rows: [(0, _cartTable2.getTotalRowCells)(displayMode, {
       label: 'Producten (excl. btw)',
       locationValue: totals === null || totals === void 0 ? void 0 : totals.totalLocationPriceExclVat,
       consumerValue: isToggled ? totals === null || totals === void 0 ? void 0 : totals.totalBeforeDiscountExclVat : totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountExclVat,
       className: 'text-end pt-2'
-    }, showCatalogPrice), (0, _cartTable2.getTotalRowCells)(displayMode, {
+    }, showCatalogPrice, showDiscountColumn), (0, _cartTable2.getTotalRowCells)(displayMode, {
       label: 'btw',
       locationValue: totals === null || totals === void 0 ? void 0 : totals.totalLocationVat,
       consumerValue: isToggled ? totals === null || totals === void 0 ? void 0 : totals.totalVatBeforeDiscount : totals === null || totals === void 0 ? void 0 : totals.totalVatAfterDiscount,
       className: 'text-end'
-    }, showCatalogPrice), (0, _cartTable2.getTotalRowCells)(displayMode, {
+    }, showCatalogPrice, showDiscountColumn), (0, _cartTable2.getTotalRowCells)(displayMode, {
       label: 'Totaal (incl. btw)',
       locationValue: totals === null || totals === void 0 ? void 0 : totals.totalLocationPriceInclVat,
       consumerValue: isToggled ? totals === null || totals === void 0 ? void 0 : totals.totalBeforeDiscountInclVat : APP_CONFIG.internal ? totals === null || totals === void 0 ? void 0 : totals.totalBeforeDiscountInclVat : totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountInclVat,
       className: 'fw-bold text-end'
-    }, showCatalogPrice)]
+    }, showCatalogPrice, showDiscountColumn)]
   }), (discountAmount || discountPercentage) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
     colSpan: "10",
     className: (0, _helpers__.withStyle)('pt-4 pb-2')
@@ -736,15 +737,15 @@ const ProductCartTable = () => {
       label: discountPercentage ? "Correctie (".concat(discountPercentage, "%)") : 'Correctie',
       value: "-".concat((0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.discountInclVat)),
       className: 'text-end text-success'
-    }, showCatalogPrice), (0, _cartTable2.getDiscountRowCells)(displayMode, {
+    }, showCatalogPrice, showDiscountColumn), (0, _cartTable2.getDiscountRowCells)(displayMode, {
       label: 'Totaal na correctie (excl. btw)',
       value: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountExclVat),
       className: 'text-end'
-    }, showCatalogPrice), (0, _cartTable2.getDiscountRowCells)(displayMode, {
+    }, showCatalogPrice, showDiscountColumn), (0, _cartTable2.getDiscountRowCells)(displayMode, {
       label: 'Totaal na correctie (incl. btw)',
       value: (0, _helpers__.formatPrice)(totals === null || totals === void 0 ? void 0 : totals.totalAfterDiscountInclVat),
       className: 'fw-bold text-end'
-    }, showCatalogPrice)]
+    }, showCatalogPrice, showDiscountColumn)]
   })))), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalDiscountForm.default, null)));
 };
 var _default = exports.default = ProductCartTable;

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

@@ -71,10 +71,12 @@ const emptyCells = exports.emptyCells = function emptyCells(count) {
  * Get table header columns based on display mode
  * @param {string} displayMode - The current display mode
  * @param {boolean} showCatalogPrice - Whether to show the catalog price column (false for THC, true otherwise)
+ * @param {boolean} showDiscountColumn - Whether to show the discount column (true for Towmotive/TOW/TM, false otherwise)
  * @returns {Array} Array of column configuration objects
  */
 const getCartTableHeaderColumns = exports.getCartTableHeaderColumns = function getCartTableHeaderColumns(displayMode) {
   let showCatalogPrice = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  let showDiscountColumn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   const baseColumns = [{}, {}, {}, {}];
   switch (displayMode) {
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_TMG:
@@ -82,9 +84,10 @@ const getCartTableHeaderColumns = exports.getCartTableHeaderColumns = function g
       // Towmotive: Inkoopprijs - Marge - Catalogprijs - Verkoopprijs ex BTW
       return [...baseColumns, textCell('Inkoopprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), textCell('Marge (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), ...(showCatalogPrice ? [textCell('Catalogprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)] : []), textCell('Verkoop Prijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD:
-      // THC: Inkoopprijs - Marge - Korting% - Verkoopprijs ex BTW
+      // THC (no discount): Inkoopprijs - Marge - Verkoopprijs ex BTW
+      // THC (with discount): Inkoopprijs - Marge - Korting% - Verkoopprijs ex BTW
       // Towmotive: Inkoopprijs - Marge - Catalogusprijs - Korting% - Verkoopprijs ex BTW
-      return [...baseColumns, textCell('Inkoopprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), textCell('Marge (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), ...(showCatalogPrice ? [textCell('Catalogusprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)] : []), textCell('Korting (%)', _cartTable.CART_TABLE_BOLD_END_CLASS), textCell('Verkoop Prijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)];
+      return [...baseColumns, textCell('Inkoopprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), textCell('Marge (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS), ...(showCatalogPrice ? [textCell('Catalogusprijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)] : []), ...(showDiscountColumn ? [textCell('Korting (%)', _cartTable.CART_TABLE_BOLD_END_CLASS)] : []), textCell('Verkoop Prijs (excl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
     default:
       return [...baseColumns, {}, {}, textCell('Verkoop Prijs (incl. btw)', _cartTable.CART_TABLE_BOLD_END_CLASS)];
@@ -267,6 +270,7 @@ const getMarketCorrectionCells = exports.getMarketCorrectionCells = function get
  * @param {Object} params.standardSubtotals - Standard subtotals
  * @param {number} params.defaultSubtotal - Default subtotal
  * @param {boolean} showCatalogPrice - Whether to show the catalog price column (false for THC, true otherwise)
+ * @param {boolean} showDiscountColumn - Whether to show the discount column (true for Towmotive/TOW/TM, false otherwise)
  * @returns {Array} Array of cell configuration objects
  */
 const getSectionTotalCells = exports.getSectionTotalCells = function getSectionTotalCells(displayMode, _ref4) {
@@ -276,6 +280,7 @@ const getSectionTotalCells = exports.getSectionTotalCells = function getSectionT
     defaultSubtotal
   } = _ref4;
   let showCatalogPrice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let showDiscountColumn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   const baseCells = [{}, {}];
   switch (displayMode) {
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_TMG:
@@ -283,15 +288,16 @@ const getSectionTotalCells = exports.getSectionTotalCells = function getSectionT
       // Towmotive: Inkoopprijs - Marge - Catalogprijs - Verkoopprijs
       return [...baseCells, {}, {}, priceCell(tmgSubtotals.purchase, _cartTable.CART_TABLE_BOLD_END_CLASS), priceCell(tmgSubtotals.margin, _cartTable.CART_TABLE_BOLD_END_CLASS), ...(showCatalogPrice ? [priceCell(tmgSubtotals.catalog, _cartTable.CART_TABLE_BOLD_END_CLASS)] : []), textCell((0, _index.formatPrice)(tmgSubtotals.sales), 'fw-bold text-end pb-2')];
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD:
-      // THC: Inkoopprijs - Marge - Korting% - Verkoopprijs
+      // THC (no discount): Inkoopprijs - Marge - Verkoopprijs
+      // THC (with discount): Inkoopprijs - Marge - Korting% - Verkoopprijs
       // Towmotive: Inkoopprijs - Marge - Catalogusprijs - Korting% - Verkoopprijs
       return [...baseCells, emptyCell(_cartTable.CART_TABLE_BOLD_END_CLASS), textCell('Subtotaal inkoopprijs', _cartTable.CART_TABLE_BOLD_END_CLASS), textCell((0, _index.formatPrice)(standardSubtotals.purchase), 'fw-bold text-end pb-2'),
       // Marge column (no subtotal value)
       emptyCell(_cartTable.CART_TABLE_BOLD_END_CLASS),
       // Catalogusprijs column (only present for Towmotive)
       ...(showCatalogPrice ? [emptyCell(_cartTable.CART_TABLE_BOLD_END_CLASS)] : []),
-      // Korting column: show subtotal label for sales
-      textCell('Subtotaal (excl. btw)', 'fw-bold text-end pb-2'),
+      // Korting column: show label if column exists, otherwise empty
+      ...(showDiscountColumn ? [textCell('Subtotaal (excl. btw)', 'fw-bold text-end pb-2')] : []),
       // Verkoopprijs column: show subtotal sales value
       textCell((0, _index.formatPrice)(standardSubtotals.sales), 'fw-bold text-end pb-2')];
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
@@ -309,6 +315,7 @@ const getSectionTotalCells = exports.getSectionTotalCells = function getSectionT
  * @param {number} params.consumerValue - Consumer price value
  * @param {string} params.className - CSS class for cells
  * @param {boolean} showCatalogPrice - Whether to show the catalog price column (false for THC, true otherwise)
+ * @param {boolean} showDiscountColumn - Whether to show the discount column (true for Towmotive/TOW/TM, false otherwise)
  * @returns {Array} Array of cell configuration objects
  */
 const getTotalRowCells = exports.getTotalRowCells = function getTotalRowCells(displayMode, _ref5) {
@@ -319,6 +326,7 @@ const getTotalRowCells = exports.getTotalRowCells = function getTotalRowCells(di
     className = 'text-end'
   } = _ref5;
   let showCatalogPrice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let showDiscountColumn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   const baseCells = [{}, {}, {}];
   switch (displayMode) {
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_TMG:
@@ -326,9 +334,10 @@ const getTotalRowCells = exports.getTotalRowCells = function getTotalRowCells(di
       // Towmotive: Inkoopprijs - Marge - Catalogprijs - Verkoopprijs
       return [...baseCells, {}, textCell(label, className), ...(showCatalogPrice ? [emptyCell(className)] : []), textCell((0, _index.formatPrice)(locationValue), className), textCell((0, _index.formatPrice)(consumerValue), className)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD:
-      // THC: Inkoopprijs - Marge - Korting% - Verkoopprijs
+      // THC (no discount): Inkoopprijs - Marge - Verkoopprijs
+      // THC (with discount): Inkoopprijs - Marge - Korting% - Verkoopprijs
       // Towmotive: Inkoopprijs - Marge - Catalogusprijs - Korting% - Verkoopprijs
-      return [...baseCells, emptyCell(className), emptyCell(className), ...(showCatalogPrice ? [emptyCell(className)] : []), textCell(label, className), textCell((0, _index.formatPrice)(locationValue), className), textCell((0, _index.formatPrice)(consumerValue), className)];
+      return [...baseCells, emptyCell(className), emptyCell(className), ...(showCatalogPrice ? [emptyCell(className)] : []), ...(showDiscountColumn ? [emptyCell(className)] : []), textCell(label, className), textCell((0, _index.formatPrice)(locationValue), className), textCell((0, _index.formatPrice)(consumerValue), className)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
     default:
       return [...baseCells, {}, {}, textCell(label, className), textCell((0, _index.formatPrice)(consumerValue), className)];
@@ -343,6 +352,7 @@ const getTotalRowCells = exports.getTotalRowCells = function getTotalRowCells(di
  * @param {string} params.value - Formatted value string
  * @param {string} params.className - CSS class for cells
  * @param {boolean} showCatalogPrice - Whether to show the catalog price column (false for THC, true otherwise)
+ * @param {boolean} showDiscountColumn - Whether to show the discount column (true for Towmotive/TOW/TM, false otherwise)
  * @returns {Array} Array of cell configuration objects
  */
 const getDiscountRowCells = exports.getDiscountRowCells = function getDiscountRowCells(displayMode, _ref6) {
@@ -352,6 +362,7 @@ const getDiscountRowCells = exports.getDiscountRowCells = function getDiscountRo
     className = 'text-end'
   } = _ref6;
   let showCatalogPrice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let showDiscountColumn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   const baseCells = [{}, {}, {}];
   switch (displayMode) {
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_TMG:
@@ -359,9 +370,10 @@ const getDiscountRowCells = exports.getDiscountRowCells = function getDiscountRo
       // Towmotive: Inkoopprijs - Marge - Catalogprijs - Verkoopprijs
       return [...baseCells, {}, emptyCell(className), ...(showCatalogPrice ? [emptyCell(className)] : []), textCell(label, className), textCell(value, className)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD:
-      // THC: Inkoopprijs - Marge - Korting% - Verkoopprijs
+      // THC (no discount): Inkoopprijs - Marge - Verkoopprijs
+      // THC (with discount): Inkoopprijs - Marge - Korting% - Verkoopprijs
       // Towmotive: Inkoopprijs - Marge - Catalogusprijs - Korting% - Verkoopprijs
-      return [...baseCells, emptyCell(className), emptyCell(className), ...(showCatalogPrice ? [emptyCell(className)] : []), emptyCell(className), textCell(label, className), textCell(value, className)];
+      return [...baseCells, emptyCell(className), emptyCell(className), ...(showCatalogPrice ? [emptyCell(className)] : []), ...(showDiscountColumn ? [emptyCell(className)] : []), textCell(label, className), textCell(value, className)];
     case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
     default:
       return [...baseCells, {}, {}, textCell(label, className), textCell(value, className)];

package/dist/src/shared/__pages__/internal/InternalAppointmentPage.js

@@ -230,9 +230,6 @@ const InternalAppointmentPage = () => {
     setEmailConflictData(null);
   };
   const handleCancelLink = () => {
-    if (pendingPayload) {
-      performSubmit(pendingPayload);
-    }
     setIsEmailConflictModalShown(false);
     setPendingPayload(null);
     setEmailConflictData(null);

package/dist/src/shared/__pages__/internal/InternalQuotationPage.js

@@ -197,9 +197,6 @@ const InternalQuotationPage = () => {
     setEmailConflictData(null);
   };
   const handleCancelLink = () => {
-    if (pendingPayload) {
-      performSubmit(pendingPayload);
-    }
     setIsEmailConflictModalShown(false);
     setPendingPayload(null);
     setEmailConflictData(null);

package/package.json

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