thm-p3-configurator 0.0.378 → 0.0.381

package/dist/src/shared/__api__/businessBranches.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveBusinessBranchesFormula = void 0;
+var _constants__ = require("../__constants__");
+const resolveBusinessBranchesFormula = formulaRaw => {
+  var _ref, _formulaRaw$entityId;
+  if (formulaRaw == null) {
+    return undefined;
+  }
+  if (typeof formulaRaw === 'string') {
+    return formulaRaw;
+  }
+  return (_ref = (_formulaRaw$entityId = formulaRaw === null || formulaRaw === void 0 ? void 0 : formulaRaw.entityId) !== null && _formulaRaw$entityId !== void 0 ? _formulaRaw$entityId : formulaRaw === null || formulaRaw === void 0 ? void 0 : formulaRaw.id) !== null && _ref !== void 0 ? _ref : (0, _constants__.getConfiguratorFormulaCode)(formulaRaw);
+};
+exports.resolveBusinessBranchesFormula = resolveBusinessBranchesFormula;

package/dist/src/shared/__api__/queries.js

@@ -40,6 +40,7 @@ var _helpers__ = require("../__helpers__");
 var _singleOrderArticles = require("../__helpers__/singleOrderArticles");
 var _useSessionContextReady = require("../__hooks__/useSessionContextReady");
 var _authenticatedProxyApi = require("./authenticatedProxyApi");
+var _businessBranches = require("./businessBranches");
 var _orderApi = require("./orderApi");
 var _publicProxyApi = require("./publicProxyApi");
 var _queryKeyFactory = require("./queryKeyFactory");
@@ -748,13 +749,12 @@ const useBranchesByType = _ref4 => {
 };
 exports.useBranchesByType = useBranchesByType;
 const useBusinessBranches = _ref5 => {
-  var _getConfiguratorFormu;
   let {
     searchTerm,
     formula: formulaRaw,
     enabled = true
   } = _ref5;
-  const formula = (_getConfiguratorFormu = (0, _constants__.getConfiguratorFormulaCode)(formulaRaw)) !== null && _getConfiguratorFormu !== void 0 ? _getConfiguratorFormu : typeof formulaRaw === 'string' ? formulaRaw : formulaRaw === null || formulaRaw === void 0 ? void 0 : formulaRaw.entityId;
+  const formula = (0, _businessBranches.resolveBusinessBranchesFormula)(formulaRaw);
   const businessBranchesQuery = (0, _reactQuery.useQuery)(['businessBranches', searchTerm, formula], {
     queryFn: async () => {
       const response = await _authenticatedProxyApi.authenticatedProxyApi.getBusinessBranches({

package/dist/src/shared/__components__/internal/InternalCustomerDetailsForm.js

@@ -31,7 +31,6 @@ var _yup = require("yup");
 var _queries = require("../../__api__/queries");
 var _constants__ = require("../../__constants__");
 var _AuthSessionContext = require("../../__context__/AuthSessionContext");
-var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
 var _useIsTmg = require("../../__hooks__/useIsTmg");
@@ -161,7 +160,7 @@ const customerDetailsFormSchema = (0, _yup.object)({
   })
 });
 const InternalCustomerDetailsForm = (_ref, ref) => {
-  var _customer$vatNumber, _customer$kvkNumber, _branchTypes$byId$aut, _authSession$branch;
+  var _customer$vatNumber, _customer$kvkNumber, _branchTypes$byId$aut, _authSession$branch, _authSession$branch2;
   let {
     errors = {},
     onValidationError,
@@ -198,7 +197,6 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   }, [countries]);
   const authSession = (0, _AuthSessionContext.useAuthSession)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
-  const formula = (0, _FormulaContext.useFormula)();
   const [companySearchTerm, setCompanySearchTerm] = (0, _react.useState)('');
   const [isCompanyInputFocused, setIsCompanyInputFocused] = (0, _react.useState)(false);
   const [addressLookupLoading, setAddressLookupLoading] = (0, _react.useState)(false);
@@ -332,15 +330,12 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     isLoadingMarketingChannels
   } = (0, _queries.useMarketingChannels)(branchType);
   const {
-    branchesByType,
-    isLoadingBranchesByType
-  } = (0, _queries.useBranchesByType)({
-    isTmg,
-    isTowCenterBranch,
+    businessBranches,
+    isLoadingBusinessBranches
+  } = (0, _queries.useBusinessBranches)({
     searchTerm: companySearchTerm,
-    formula,
-    ownershipType: activeOwnershipType,
-    organisationType: branchType
+    formula: authSession === null || authSession === void 0 || (_authSession$branch2 = authSession.branch) === null || _authSession$branch2 === void 0 ? void 0 : _authSession$branch2.formule,
+    enabled: isBusinessOwnership
   });
   (0, _react.useEffect)(() => {
     if (!(customer !== null && customer !== void 0 && customer.countryId) && countryOptions !== null && countryOptions !== void 0 && countryOptions.length) {
@@ -758,7 +753,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     form: form,
     label: "Bedrijfsnaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['companyName']
-  }), isCompanyInputFocused && companySearchTerm && companySearchTerm.length >= 3 && branchesByType && branchesByType.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  }), isCompanyInputFocused && companySearchTerm && companySearchTerm.length >= 3 && businessBranches && businessBranches.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('dropdown-results position-absolute w-100 border rounded bg-white shadow'),
     style: {
       maxHeight: '200px',
@@ -771,9 +766,9 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     onMouseDown: e => {
       e.preventDefault();
     }
-  }, isLoadingBranchesByType && /*#__PURE__*/_react.default.createElement("div", {
+  }, isLoadingBusinessBranches && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('p-2 text-center')
-  }, /*#__PURE__*/_react.default.createElement("span", null, "Zoeken...")), branchesByType.map(branch => /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("span", null, "Zoeken...")), businessBranches.map(branch => /*#__PURE__*/_react.default.createElement("div", {
     key: branch.entityId,
     className: (0, _helpers__.withStyle)('dropdown-item p-2 border-bottom'),
     style: {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VAT_RATE = exports.MARKET_CORRECTION_ARTICLE_NUMBER = exports.EXTRA_PRICE_ARTICLE_NUMBER = exports.CART_TABLE_PRICE_CELL_CLASS = exports.CART_TABLE_DISPLAY_MODES = exports.CART_TABLE_BOLD_END_CLASS = void 0;
+exports.VAT_RATE = exports.MARKET_CORRECTION_ARTICLE_NUMBER = exports.EXTRA_PRICE_ARTICLE_NUMBER = exports.DISCOUNT_MONTAGESET_ARTICLE_NUMBER = exports.CART_TABLE_PRICE_CELL_CLASS = exports.CART_TABLE_DISPLAY_MODES = exports.CART_TABLE_BOLD_END_CLASS = void 0;
 /**
  * Display modes for the cart table:
  * - DEFAULT: No purchase prices shown (7 columns)
@@ -29,4 +29,7 @@ const VAT_RATE = exports.VAT_RATE = 1.21;
 const MARKET_CORRECTION_ARTICLE_NUMBER = exports.MARKET_CORRECTION_ARTICLE_NUMBER = 'MC';
 
 /** Extra price (Meerprijs) article number */
-const EXTRA_PRICE_ARTICLE_NUMBER = exports.EXTRA_PRICE_ARTICLE_NUMBER = 'MEERPRIJS';
+const EXTRA_PRICE_ARTICLE_NUMBER = exports.EXTRA_PRICE_ARTICLE_NUMBER = 'MEERPRIJS';
+
+/** Cart line for combi / montageset discount (not a catalog product) */
+const DISCOUNT_MONTAGESET_ARTICLE_NUMBER = exports.DISCOUNT_MONTAGESET_ARTICLE_NUMBER = 'DISCOUNT MONTAGESET';

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

@@ -406,6 +406,7 @@ const ProductCartTable = () => {
   const cartLookup = (0, _react.useMemo)(() => cart ? Object.fromEntries(cart.map(item => [item.articleNumber, item])) : {}, [cart]);
   const marketCorrection = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === _cartTable.MARKET_CORRECTION_ARTICLE_NUMBER);
   const extraPriceItem = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === _cartTable.EXTRA_PRICE_ARTICLE_NUMBER);
+  const discountMontagesetItem = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === _cartTable.DISCOUNT_MONTAGESET_ARTICLE_NUMBER);
   const extraPriceValues = (0, _react.useMemo)(() => {
     const consumerTotal = Number(extraPriceItem === null || extraPriceItem === void 0 ? void 0 : extraPriceItem.consumerTotal) || 0;
     const hasValue = consumerTotal !== 0;
@@ -738,6 +739,10 @@ const ProductCartTable = () => {
     productSubtitle: (0, _helpers__.formatMontageTime)(totals === null || totals === void 0 ? void 0 : totals.montageTime),
     productImage: _montagePlaceholder.default,
     extraCells: (0, _cartTable2.getMontageCells)(displayMode, totals === null || totals === void 0 ? void 0 : totals.totalMontageExclVat, totals === null || totals === void 0 ? void 0 : totals.montagePricePlusMarketCorrectionInclVat, montageRateCellOverrides, showCatalogPrice)
+  }), mainProducts.length > 0 && APP_CONFIG.internal && discountMontagesetItem && discountMontagesetItem.consumerTotal != null && discountMontagesetItem.consumerTotal !== '' && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
+    productTitle: "Korting montageset",
+    productImage: _montagePlaceholder.default,
+    extraCells: (0, _cartTable2.getDiscountMontagesetCells)(displayMode, discountMontagesetItem.consumerTotal, showCatalogPrice)
   }), isToggled && marketCorrectionValues.hasValue && /*#__PURE__*/_react.default.createElement(_ProductTableStaticRow.default, {
     productTitle: "Marktcorrectie",
     productImage: _montagePlaceholder.default,

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

@@ -32,11 +32,11 @@ var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
-var _Datalayer = require("../__services__/Datalayer");
 var _montageRate = require("../__helpers__/montageRate");
 var _product = require("../__helpers__/product");
 var _useIsTmg = require("../__hooks__/useIsTmg");
 var _useIsTowmotive = require("../__hooks__/useIsTowmotive");
+var _Datalayer = require("../__services__/Datalayer");
 var _BoardComputerCard = _interopRequireDefault(require("./BoardComputerCard"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {

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

@@ -5,7 +5,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.textCell = exports.priceCell = exports.placeholderCell = exports.getTotalRowCells = exports.getSectionTotalCells = exports.getMontageCells = exports.getMarketCorrectionCells = exports.getMainProductCells = exports.getExtraPriceCells = exports.getDiscountRowCells = exports.getCartTableHeaderColumns = exports.getCartTableDisplayMode = exports.getAccessoryProductCells = exports.emptyCells = exports.emptyCell = void 0;
+exports.textCell = exports.priceCell = exports.placeholderCell = exports.getTotalRowCells = exports.getSectionTotalCells = exports.getMontageCells = exports.getMarketCorrectionCells = exports.getMainProductCells = exports.getExtraPriceCells = exports.getDiscountRowCells = exports.getDiscountMontagesetCells = exports.getCartTableHeaderColumns = exports.getCartTableDisplayMode = exports.getAccessoryProductCells = exports.emptyCells = exports.emptyCell = void 0;
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _cartTable = require("../__constants__/cartTable");
@@ -244,6 +244,31 @@ const getMontageCells = exports.getMontageCells = function getMontageCells(displ
   }
 };
 
+/**
+ * Montageset discount row (API pseudo-article). Same column layout as montage:
+ * no purchase/margin; non-editable korting cell; price from consumerTotal (incl. BTW in default mode).
+ *
+ * @param {string} displayMode
+ * @param {number|string|null|undefined} consumerTotalIncl - consumerTotal from cart (incl. BTW)
+ * @param {boolean} showCatalogPrice
+ */
+const getDiscountMontagesetCells = exports.getDiscountMontagesetCells = function getDiscountMontagesetCells(displayMode, consumerTotalIncl) {
+  let showCatalogPrice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  const salesIncl = Number(consumerTotalIncl);
+  const salesExcl = salesIncl / _cartTable.VAT_RATE;
+  const baseCells = [{}, {}, {}];
+  const nvt = textCell('N.v.t.', _cartTable.CART_TABLE_PRICE_CELL_CLASS);
+  switch (displayMode) {
+    case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_TMG:
+      return [...baseCells, nvt, nvt, ...(showCatalogPrice ? [nvt] : []), priceCell(salesExcl)];
+    case _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD:
+      return [...baseCells, nvt, nvt, ...(showCatalogPrice ? [nvt] : []), emptyCell(_cartTable.CART_TABLE_PRICE_CELL_CLASS), priceCell(salesExcl)];
+    case _cartTable.CART_TABLE_DISPLAY_MODES.DEFAULT:
+    default:
+      return [{}, {}, {}, {}, {}, priceCell(salesIncl)];
+  }
+};
+
 /**
  * Generate extra cells for the market correction row
  * @param {string} displayMode - Current display mode

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

@@ -267,7 +267,7 @@ const InternalAppointmentPage = () => {
   }, "Vul het onderstaande formulier"), /*#__PURE__*/_react.default.createElement("h2", {
     className: (0, _helpers__.withStyle)('fw-normal')
   }, "in om een afspraak te maken.")), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('col-12 col-lg-8')
+    className: (0, _helpers__.withStyle)('col-12 col-xxl-8')
   }, /*#__PURE__*/_react.default.createElement(_InternalAppointmentForm.default, {
     onSubmit: handleSubmit,
     submitErrorMessage: submitErrorMessage,
@@ -276,7 +276,7 @@ const InternalAppointmentPage = () => {
     isSuccess: isCreatePlannedAppointmentSuccess || isCreateAppointmentRequestSuccess || isUpdateAppointmentSuccess || isUpdateAppointmentRequestSuccess,
     entityId: createdEntityId || existingDossierId
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("sidebar col-12 col-lg-4 pt-5")
+    className: (0, _helpers__.withStyle)("sidebar col col-xxl-4 pt-5")
   }, /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
     key: "configurator-vehicle-data"
   }), /*#__PURE__*/_react.default.createElement(_ProductCartSide.default, null))))), anchorEl && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement(_Modal.default, {

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

@@ -38,9 +38,9 @@ const InternalExtraProductsPage = () => {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-lg-5')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('col-lg')
+    className: (0, _helpers__.withStyle)('col-xxl')
   }, /*#__PURE__*/_react.default.createElement(_ExtraProductsOverview.default, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-4 pt-5")
+    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-5")
   }, /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
     key: "configurator-vehicle-data"
   }), /*#__PURE__*/_react.default.createElement(_ProductCartSide.default, null)))), /*#__PURE__*/_react.default.createElement(_BottomNavigationBar.default, null)));

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

@@ -45,9 +45,9 @@ const InternalOverviewPage = () => {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-lg-5')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('col-lg')
+    className: (0, _helpers__.withStyle)('col-xxl')
   }, /*#__PURE__*/_react.default.createElement(_internal.InternalDiscountCodeSelector, null), /*#__PURE__*/_react.default.createElement(_ProductsCartOverview.default, null), /*#__PURE__*/_react.default.createElement(_ProductDiscountCard.default, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-4 pt-5")
+    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-5")
   }, /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
     key: "configurator-vehicle-data"
   }), /*#__PURE__*/_react.default.createElement("div", {

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

@@ -39,9 +39,9 @@ const InternalProductsPage = () => {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-lg-5')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("col-lg")
+    className: (0, _helpers__.withStyle)("col-xxl")
   }, /*#__PURE__*/_react.default.createElement(_ProductsOverview.default, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-4 pt-5")
+    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-5")
   }, APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalPriceCalculationSelector.default, null), /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
     key: "configurator-vehicle-data"
   }), /*#__PURE__*/_react.default.createElement(_ProductCartSide.default, null)))), /*#__PURE__*/_react.default.createElement(_BottomNavigationBar.default, null)));

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

@@ -421,7 +421,7 @@ const InternalSingleOrderPage = () => {
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-lg-5')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("col-lg")
+    className: (0, _helpers__.withStyle)("col-xxl")
   }, showProductOverview ? /*#__PURE__*/_react.default.createElement(_InternalSingleOrderProductOverview.default, {
     removeFromCart: removeFromCart,
     filters: filters,
@@ -439,7 +439,7 @@ const InternalSingleOrderPage = () => {
     errors: customerErrors,
     onValidationError: handleCustomerValidationError
   }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-4 pt-3")
+    className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-3")
   }, (licensePlate || model) && /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
     key: "single-order-vehicle-data",
     isFilter: true

package/package.json

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