thm-p3-configurator 0.0.349 → 0.0.352

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

@@ -162,6 +162,15 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       method: 'GET'
     });
   },
+  getBusinessBranches: _ref2 => {
+    let {
+      searchTerm,
+      formula
+    } = _ref2;
+    return authenticatedClient("api/v1/branches/zakelijk?searchTerm=".concat(searchTerm, "&formula=").concat(formula), {
+      method: 'GET'
+    });
+  },
   getMyBranchesByFormula: formula => authenticatedClient("api/v1/profile/".concat(formula, "/branches"), {
     method: 'GET'
   }),
@@ -183,23 +192,23 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
   getAppointmentRequestById: id => authenticatedClient("api/v1/appointment-requests/".concat(id), {
     method: 'GET'
   }),
-  getDossiers: _ref2 => {
+  getDossiers: _ref3 => {
     let {
       term,
       offset = 0,
       limit = 10,
       branchId,
       formula
-    } = _ref2;
+    } = _ref3;
     return authenticatedClient("api/v1/dossiers?term=".concat(term, "&offset=").concat(offset, "&limit=").concat(limit).concat(branchId ? "&branchId=".concat(branchId) : '').concat(formula ? "&formula=".concat(formula) : ''), {
       method: 'GET'
     });
   },
-  putDossierById: _ref3 => {
+  putDossierById: _ref4 => {
     let {
       id,
       payload
-    } = _ref3;
+    } = _ref4;
     return authenticatedClient("api/v1/dossiers/".concat(id), {
       method: 'PUT',
       data: payload
@@ -237,11 +246,11 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       'Content-Type': 'application/json'
     }
   }),
-  putQuotationById: _ref4 => {
+  putQuotationById: _ref5 => {
     let {
       payload,
       id
-    } = _ref4;
+    } = _ref5;
     return authenticatedClient("api/v1/quotations/".concat(id), {
       method: 'PUT',
       data: payload,
@@ -250,11 +259,11 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       }
     });
   },
-  putAppointmentById: _ref5 => {
+  putAppointmentById: _ref6 => {
     let {
       payload,
       id
-    } = _ref5;
+    } = _ref6;
     return authenticatedClient("api/v1/appointments/".concat(id), {
       method: 'PUT',
       data: payload,
@@ -263,11 +272,11 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       }
     });
   },
-  putAppointmentRequestById: _ref6 => {
+  putAppointmentRequestById: _ref7 => {
     let {
       payload,
       id
-    } = _ref6;
+    } = _ref7;
     return authenticatedClient("api/v1/appointment-requests/".concat(id, "?action=order"), {
       method: 'PUT',
       data: payload,
@@ -276,12 +285,12 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       }
     });
   },
-  getActiveDiscounts: _ref7 => {
+  getActiveDiscounts: _ref8 => {
     let {
       formulaCode,
       limit,
       offset
-    } = _ref7;
+    } = _ref8;
     return authenticatedClient("api/v1/discounts?limit=".concat(limit, "&offset=").concat(offset, "&formulaCode=").concat(formulaCode), {
       method: 'GET',
       headers: {

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

@@ -16,7 +16,7 @@ require("core-js/modules/web.url-search-params.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleOrderCart = exports.useSingleOrderBranchesQuery = exports.useSingleOrderBranchTypes = exports.useSingleOrderArticles = exports.useQuestionsQuery = exports.useProductsQuery = exports.useProductFieldLabels = exports.usePrivateDossierByTypeAndIdQuery = exports.usePartBrands = exports.useOrderDataQuery = exports.useMyBranches = exports.useModelsQuery = exports.useMarketingChannels = exports.useCountriesQuery = exports.useBuildYearsQuery = exports.useBrandsQuery = exports.useBranchesQuery = exports.useBranchesByType = exports.useBranchTypes = exports.useBranchByIdOrWidgetId = exports.useArticleTypes = exports.useArticleSubGroups = exports.useArticleGroups = exports.useActiveDiscounts = void 0;
+exports.useSingleOrderCart = exports.useSingleOrderBranchesQuery = exports.useSingleOrderBranchTypes = exports.useSingleOrderArticles = exports.useQuestionsQuery = exports.useProductsQuery = exports.useProductFieldLabels = exports.usePrivateDossierByTypeAndIdQuery = exports.usePartBrands = exports.useOrderDataQuery = exports.useMyBranches = exports.useModelsQuery = exports.useMarketingChannels = exports.useCountriesQuery = exports.useBusinessBranches = exports.useBuildYearsQuery = exports.useBrandsQuery = exports.useBranchesQuery = exports.useBranchesByType = exports.useBranchTypes = exports.useBranchByIdOrWidgetId = exports.useArticleTypes = exports.useArticleSubGroups = exports.useArticleGroups = exports.useActiveDiscounts = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.json.stringify.js");
@@ -710,11 +710,38 @@ const useBranchesByType = _ref4 => {
     branchesByType: branchesByTypeQuery === null || branchesByTypeQuery === void 0 ? void 0 : branchesByTypeQuery.data
   };
 };
+exports.useBranchesByType = useBranchesByType;
+const useBusinessBranches = _ref5 => {
+  let {
+    searchTerm,
+    formula: formulaRaw,
+    enabled = true
+  } = _ref5;
+  const formula = formulaRaw == null ? undefined : typeof formulaRaw === 'string' ? formulaRaw : formulaRaw === null || formulaRaw === void 0 ? void 0 : formulaRaw.entityId;
+  const businessBranchesQuery = (0, _reactQuery.useQuery)(['businessBranches', searchTerm, formula], {
+    queryFn: async () => {
+      const response = await _authenticatedProxyApi.authenticatedProxyApi.getBusinessBranches({
+        searchTerm,
+        formula
+      });
+      if (response.data.length === 0) {
+        return null;
+      }
+      return response.data;
+    },
+    enabled: enabled && !!searchTerm && searchTerm.length >= 2
+  });
+  return {
+    isLoadingBusinessBranches: businessBranchesQuery.isLoading,
+    businessBranchesError: businessBranchesQuery.isError,
+    businessBranches: businessBranchesQuery === null || businessBranchesQuery === void 0 ? void 0 : businessBranchesQuery.data
+  };
+};
 
 /**
  * @description finds a branch either by its Id, or its widget id
  */
-exports.useBranchesByType = useBranchesByType;
+exports.useBusinessBranches = useBusinessBranches;
 const useBranchByIdOrWidgetId = exports.useBranchByIdOrWidgetId = function useBranchByIdOrWidgetId() {
   let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   const branchByIdQuery = (0, _reactQuery.useQuery)(['branchById', id], {
@@ -797,11 +824,11 @@ const useBranchTypes = () => {
  * Available types: Quotation, appointment request and planned appointment.
  */
 exports.useBranchTypes = useBranchTypes;
-const usePrivateDossierByTypeAndIdQuery = _ref5 => {
+const usePrivateDossierByTypeAndIdQuery = _ref6 => {
   let {
     dossierId,
     dossierType
-  } = _ref5;
+  } = _ref6;
   const dossierByIdQuery = (0, _reactQuery.useQuery)([dossierType, dossierId], {
     enabled: !!dossierId && !!dossierType,
     cacheTime: 0,
@@ -849,12 +876,12 @@ const usePrivateDossierByTypeAndIdQuery = _ref5 => {
  * @description Query the discounts from Hyper, allows for pagination and filtering with formula
  */
 exports.usePrivateDossierByTypeAndIdQuery = usePrivateDossierByTypeAndIdQuery;
-const useActiveDiscounts = _ref6 => {
+const useActiveDiscounts = _ref7 => {
   let {
     formulaCode,
     offset,
     limit
-  } = _ref6;
+  } = _ref7;
   const {
     authenticated,
     initialized

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

@@ -178,9 +178,9 @@ const ProductCartSide = () => {
     }
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
 
-    // GetOrder is the single source of truth for prices
-    // Fallback to cartItem.consumerTotal for articles without price (e.g. boardComputerUpdate)
-    const resolvedSalesPrice = Number(product === null || product === void 0 ? void 0 : product.price) || Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+    // GetOrder is the single source of truth for row prices after discounts.
+    // Fall back to enriched product pricing only when the order response has no consumer total yet.
+    const resolvedSalesPrice = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) : Number(product === null || product === void 0 ? void 0 : product.price) || 0;
 
     // Get prices directly from product objects and calculate excl VAT for location
     const purchasePrice = hasLocationTotal ? cartItem.locationTotal : 0;

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

@@ -403,9 +403,9 @@ const ProductCartTable = () => {
     }
     const hasLocationTotal = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== undefined && (cartItem === null || cartItem === void 0 ? void 0 : cartItem.locationTotal) !== null;
 
-    // GetOrder is the single source of truth for prices
-    // Fallback to cartItem.consumerTotal for articles without price (e.g. boardComputerUpdate)
-    const salesPriceIncl = Number(product === null || product === void 0 ? void 0 : product.price) || Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) || 0;
+    // GetOrder is the single source of truth for row prices after discounts.
+    // Fall back to enriched product pricing only when the order response has no consumer total yet.
+    const salesPriceIncl = (cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) != null ? Number(cartItem.consumerTotal) : Number(product === null || product === void 0 ? void 0 : product.price) || 0;
     const salesPrice = salesPriceIncl / _cartTable.VAT_RATE;
     const purchasePrice = hasLocationTotal ? Number(cartItem.locationTotal) : null;
 
@@ -669,7 +669,7 @@ const ProductCartTable = () => {
     var _product$consumerDisc, _product$images, _product$images2;
     const isVehicleCodingProduct = (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;
     const isBoardComputerProduct = selectedBoardComputer && String(product.articleNumber) === String(selectedBoardComputer);
-    const stateDiscountValue = (_product$consumerDisc = product === null || product === void 0 ? void 0 : product.consumerDiscountPercentage) !== null && _product$consumerDisc !== void 0 ? _product$consumerDisc : isVehicleCodingProduct ? vehicleCodingDiscountPercentage || null : null;
+    const stateDiscountValue = (_product$consumerDisc = product === null || product === void 0 ? void 0 : product.consumerDiscountPercentage) !== null && _product$consumerDisc !== void 0 ? _product$consumerDisc : isVehicleCodingProduct ? vehicleCodingDiscountPercentage !== null && vehicleCodingDiscountPercentage !== void 0 ? vehicleCodingDiscountPercentage : null : null;
     const lineDiscountValue = stateDiscountValue;
     const allowLineDiscountMain = displayMode === _cartTable.CART_TABLE_DISPLAY_MODES.TOGGLED_STANDARD && (isTowmotive || isTowFormula);
     const discountInputCellMain = allowLineDiscountMain ? {

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

@@ -198,7 +198,7 @@ const getEmptyCustomerState = () => ({
   zakelijkContactEMailadres: ''
 });
 const InternalAppointmentForm = _ref => {
-  var _branchTypes$byId$aut, _authSession$branch, _contextCustomer$note2;
+  var _branchTypes$byId$aut, _authSession$branch, _authSession$branch2, _contextCustomer$note2;
   let {
     onSubmit = payload => {},
     isError = false,
@@ -433,6 +433,7 @@ const InternalAppointmentForm = _ref => {
     }
   }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, dispatch]);
   const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
+  const isLeaseOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij;
   const isNetherlandsSelected = (0, _react.useMemo)(() => {
     if (!(selectedCountry !== null && selectedCountry !== void 0 && selectedCountry.label)) return false;
     return selectedCountry.label.toUpperCase() === 'NEDERLAND';
@@ -635,11 +636,19 @@ const InternalAppointmentForm = _ref => {
   } = (0, _queries.useBranchesByType)({
     isTmg,
     isTowCenterBranch,
-    searchTerm: companySearchTerm,
+    searchTerm: isLeaseOwnership ? companySearchTerm : '',
     formula,
     ownershipType: activeOwnershipType,
     organisationType: branchType
   });
+  const {
+    businessBranches,
+    isLoadingBusinessBranches
+  } = (0, _queries.useBusinessBranches)({
+    searchTerm: companySearchTerm,
+    formula: authSession === null || authSession === void 0 || (_authSession$branch2 = authSession.branch) === null || _authSession$branch2 === void 0 ? void 0 : _authSession$branch2.formule,
+    enabled: isBusinessOwnership
+  });
 
   /**
    * @description Autofills the customer form with the current branch data where applicable
@@ -835,7 +844,7 @@ const InternalAppointmentForm = _ref => {
     form: "quotation",
     label: "Leasemaatschappij:",
     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',
@@ -848,9 +857,9 @@ const InternalAppointmentForm = _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: {
@@ -1090,7 +1099,7 @@ const InternalAppointmentForm = _ref => {
     form: "quotation",
     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',
@@ -1103,9 +1112,9 @@ const InternalAppointmentForm = _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/__containers__/internal/InternalQuotationForm.js

@@ -185,7 +185,7 @@ const internalQuotationFormSchema = (0, _yup.object)({
   })
 });
 const InternalQuotationForm = _ref => {
-  var _branchTypes$byId$aut, _authSession$branch, _contextCustomer$note2;
+  var _branchTypes$byId$aut, _authSession$branch, _authSession$branch2, _contextCustomer$note2;
   let {
     onSubmit = payload => {},
     isError = false,
@@ -377,17 +377,27 @@ const InternalQuotationForm = _ref => {
   }, [isTmg, marketingChannels, channel === null || channel === void 0 ? void 0 : channel.channelId, dispatch]);
   const formula = (0, _FormulaContext.useFormula)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
+  const isLeaseOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij;
   const {
     branchesByType,
     isLoadingBranchesByType
   } = (0, _queries.useBranchesByType)({
     isTmg,
     isTowCenterBranch,
-    searchTerm: companySearchTerm,
+    searchTerm: isLeaseOwnership ? companySearchTerm : '',
     formula,
     ownershipType: activeOwnershipType,
     organisationType: branchType
   });
+  const {
+    businessBranches,
+    isLoadingBusinessBranches
+  } = (0, _queries.useBusinessBranches)({
+    searchTerm: companySearchTerm,
+    formula: authSession === null || authSession === void 0 || (_authSession$branch2 = authSession.branch) === null || _authSession$branch2 === void 0 ? void 0 : _authSession$branch2.formule,
+    enabled: isBusinessOwnership
+  });
   const countryOptions = (0, _react.useMemo)(() => {
     var _countries$results;
     if (!(countries !== null && countries !== void 0 && (_countries$results = countries.results) !== null && _countries$results !== void 0 && _countries$results.length)) return [];
@@ -720,7 +730,7 @@ const InternalQuotationForm = _ref => {
     form: "quotation",
     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',
@@ -733,9 +743,9 @@ const InternalQuotationForm = _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/__helpers__/singleOrderArticles.js

@@ -2,11 +2,13 @@
 
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.flat-map.js");
+require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.unscopables.flat-map.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -15,6 +17,8 @@ require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.url-search-params.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -39,11 +43,32 @@ var _index = require("./index");
 var _thLogoBlack = _interopRequireDefault(require("../../../public/assets/images/th-logo-black.png"));
 var _index2 = require("../__constants__/index");
 var _image = require("../__helpers__/image");
+const _excluded = ["pricingPartNumber"];
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
   };
 }
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    r,
+    i = _objectWithoutPropertiesLoose(e, t);
+  if (Object.getOwnPropertySymbols) {
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+  }
+  return i;
+}
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -239,7 +264,18 @@ const fetchPartStockLevels = exports.fetchPartStockLevels = async function fetch
  * @returns {Object} The articles
  */
 const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPrices = async function enrichArticlesWithBrandsAndPrices(articles, branchId) {
+  var _pricesResponse$data;
   let formula = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  const findBrandDataForArticle = function findBrandDataForArticle(article) {
+    var _brandRecords$find;
+    let brandRecords = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    return (_brandRecords$find = brandRecords.find(brand => brand.entityId === article.entityId)) !== null && _brandRecords$find !== void 0 ? _brandRecords$find : brandRecords.find(brand => brand.articleNumber === article.articleNumber);
+  };
+  const findPreferredPricePart = article => {
+    var _parts$find;
+    const parts = Array.isArray(article === null || article === void 0 ? void 0 : article.parts) ? article.parts : [];
+    return (_parts$find = parts.find(part => (part === null || part === void 0 ? void 0 : part.isPreferred) === true)) !== null && _parts$find !== void 0 ? _parts$find : parts.length === 1 ? parts[0] : null;
+  };
   const articleNumbers = [...new Set(articles.map(article => article.articleNumber))];
   const articleBrandQueryString = new URLSearchParams({
     articleNumbers: JSON.stringify(articleNumbers)
@@ -250,20 +286,23 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
     throw new Error('Failed to fetch the brands of the articles');
   }
   const articlesWithBrands = articles.map(article => {
+    var _ref3, _ref4, _preferredPricePart$p, _preferredPricePart$p2;
+    const brandData = findBrandDataForArticle(article, brandResponse.data);
+    const preferredPricePart = findPreferredPricePart(article);
+    const resolvedBrandNumber = (_ref3 = (_ref4 = (_preferredPricePart$p = preferredPricePart === null || preferredPricePart === void 0 ? void 0 : preferredPricePart.partBrandId) !== null && _preferredPricePart$p !== void 0 ? _preferredPricePart$p : brandData === null || brandData === void 0 ? void 0 : brandData.preferredPartBrandNumber) !== null && _ref4 !== void 0 ? _ref4 : brandData === null || brandData === void 0 ? void 0 : brandData.brandNumber) !== null && _ref3 !== void 0 ? _ref3 : _index2.DEFAULT_ARTICLE_BRAND;
+    const pricingPartNumber = (_preferredPricePart$p2 = preferredPricePart === null || preferredPricePart === void 0 ? void 0 : preferredPricePart.partNumber) !== null && _preferredPricePart$p2 !== void 0 ? _preferredPricePart$p2 : article.articleNumber;
     return _objectSpread(_objectSpread({}, article), {}, {
-      brand: ((_ref3, _brandData$brandNumbe) => {
-        const brandData = brandResponse.data.find(brand => brand.articleNumber === article.articleNumber);
-        return (_ref3 = (_brandData$brandNumbe = brandData === null || brandData === void 0 ? void 0 : brandData.brandNumber) !== null && _brandData$brandNumbe !== void 0 ? _brandData$brandNumbe : brandData === null || brandData === void 0 ? void 0 : brandData.preferredPartBrandNumber) !== null && _ref3 !== void 0 ? _ref3 : _index2.DEFAULT_ARTICLE_BRAND;
-      })()
+      brand: resolvedBrandNumber,
+      pricingPartNumber
     });
-  }).filter(article => article.brand);
-  const parts = articlesWithBrands.map(article => {
+  }).filter(article => article.brand && article.pricingPartNumber);
+  const parts = [...new Map(articlesWithBrands.map(article => {
     var _article$brand;
-    return {
-      partNumber: article.articleNumber,
+    return ["".concat(article.pricingPartNumber, ":").concat(article.brand), {
+      partNumber: article.pricingPartNumber,
       brandNumber: (_article$brand = article.brand) !== null && _article$brand !== void 0 ? _article$brand : _index2.DEFAULT_ARTICLE_BRAND
-    };
-  });
+    }];
+  })).values()];
   const pricesResponse = await _authenticatedProxyApi.authenticatedProxyApi.getArticlePrices(new URLSearchParams((0, _index.removeNullishProps)({
     branchId,
     formula,
@@ -272,25 +311,30 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
   if (!(pricesResponse !== null && pricesResponse !== void 0 && pricesResponse.data)) {
     throw new Error('No prices available for the given articles');
   }
-  const {
-    consumerPrices = [],
-    locationPrices = []
-  } = pricesResponse.data.data;
+  const responseData = pricesResponse === null || pricesResponse === void 0 || (_pricesResponse$data = pricesResponse.data) === null || _pricesResponse$data === void 0 ? void 0 : _pricesResponse$data.data;
+  const consumerPrices = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.consumerPrices) ? responseData.consumerPrices : [];
+  const locationPrices = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.locationPrices) ? responseData.locationPrices : [];
   const pricesMap = {
     consumer: Object.fromEntries(consumerPrices.map(price => [price.partNumber, price])),
     location: Object.fromEntries(locationPrices.map(price => [price.partNumber, price]))
   };
-  let currentArticles = articlesWithBrands.map(article => _objectSpread(_objectSpread({}, article), {}, {
-    consumerPrices: pricesMap.consumer[article.articleNumber],
-    locationPrices: pricesMap.location[article.articleNumber]
-  }));
+  let currentArticles = articlesWithBrands.map(_ref5 => {
+    let {
+        pricingPartNumber
+      } = _ref5,
+      article = _objectWithoutProperties(_ref5, _excluded);
+    return _objectSpread(_objectSpread({}, article), {}, {
+      consumerPrices: pricesMap.consumer[pricingPartNumber],
+      locationPrices: pricesMap.location[pricingPartNumber]
+    });
+  });
   return currentArticles;
 };
 const formatModelArticle = article => {
-  var _ref4, _article$name, _ref5, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
+  var _ref6, _article$name, _ref7, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
   return _objectSpread(_objectSpread({}, article), {}, {
-    name: (_ref4 = (_article$name = article.name) !== null && _article$name !== void 0 ? _article$name : article === null || article === void 0 ? void 0 : article.title) !== null && _ref4 !== void 0 ? _ref4 : null,
-    description: (_ref5 = (_article$description$ = article === null || article === void 0 || (_article$description = article.description) === null || _article$description === void 0 || (_article$description = _article$description.ops) === null || _article$description === void 0 || (_article$description = _article$description[0]) === null || _article$description === void 0 ? void 0 : _article$description.insert) !== null && _article$description$ !== void 0 ? _article$description$ : article === null || article === void 0 ? void 0 : article.remark) !== null && _ref5 !== void 0 ? _ref5 : null,
+    name: (_ref6 = (_article$name = article.name) !== null && _article$name !== void 0 ? _article$name : article === null || article === void 0 ? void 0 : article.title) !== null && _ref6 !== void 0 ? _ref6 : null,
+    description: (_ref7 = (_article$description$ = article === null || article === void 0 || (_article$description = article.description) === null || _article$description === void 0 || (_article$description = _article$description.ops) === null || _article$description === void 0 || (_article$description = _article$description[0]) === null || _article$description === void 0 ? void 0 : _article$description.insert) !== null && _article$description$ !== void 0 ? _article$description$ : article === null || article === void 0 ? void 0 : article.remark) !== null && _ref7 !== void 0 ? _ref7 : null,
     subTitle: (_article$boldDescript = article === null || article === void 0 || (_article$boldDescript2 = article.boldDescription) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2.ops) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2[0]) === null || _article$boldDescript2 === void 0 ? void 0 : _article$boldDescript2.insert) !== null && _article$boldDescript !== void 0 ? _article$boldDescript : null,
     specifications: Array.isArray(article === null || article === void 0 ? void 0 : article.specifications) ? article === null || article === void 0 ? void 0 : article.specifications.join(' \n ') : (_article$specificatio = article === null || article === void 0 ? void 0 : article.specifications) !== null && _article$specificatio !== void 0 ? _article$specificatio : null,
     image: article !== null && article !== void 0 && (_article$images = article.images) !== null && _article$images !== void 0 && _article$images[0] ? (0, _image.getImageFromHyper)({
@@ -305,11 +349,11 @@ const formatModelArticle = article => {
 const formatGenericArticle = article => {
   var _article$articleNumbe2, _article$type, _article$group, _article$subgroup;
   const specificationPairs = [['C2 module', article === null || article === void 0 ? void 0 : article.c2Module], ['Check control', article === null || article === void 0 ? void 0 : article.checkControl], ['Direct current', article === null || article === void 0 ? void 0 : article.directCurrent], ['Draw weight', article === null || article === void 0 ? void 0 : article.drawWeight], ['D value', article === null || article === void 0 ? void 0 : article.dValue], ['Foglight shutdown', article === null || article === void 0 ? void 0 : article.foglightShutdown], ['PDC shutdown', article === null || article === void 0 ? void 0 : article.pdcShutdown], ['Switched PSU', article === null || article === void 0 ? void 0 : article.switchedPsu], ['LED', article === null || article === void 0 ? void 0 : article.led]];
-  const specification = specificationPairs.filter(_ref6 => {
-    let [_, value] = _ref6;
+  const specification = specificationPairs.filter(_ref8 => {
+    let [_, value] = _ref8;
     return value;
-  }).map(_ref7 => {
-    let [label, value] = _ref7;
+  }).map(_ref9 => {
+    let [label, value] = _ref9;
     return "".concat(label, ": ").concat(value);
   }).join(' \n ');
   return _objectSpread(_objectSpread({}, article), {}, {

package/package.json

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