thm-p3-configurator 0.0.211 → 0.0.213

package/dist/src/shared/App.js

@@ -75,6 +75,6 @@ const App = () => {
     defaultCountry: APP_CONFIG.country
   }, /*#__PURE__*/_react.default.createElement(_OrderSessionContext.OrderSessionController, null, /*#__PURE__*/_react.default.createElement(_reactQuery.QueryClientProvider, {
     client: _queryClient.default
-  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), /*#__PURE__*/_react.default.createElement(_index.default, null))))))))));
+  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), APP_CONFIG.nodeEnv === 'development' && APP_CONFIG.internal === true && /*#__PURE__*/_react.default.createElement(_TEST_ONLY_INTERNAL_ROUTES.default, null))))))))));
 };
 var _default = exports.default = App;

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

@@ -195,6 +195,9 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
       }
     });
   },
+  getPartBrands: () => authenticateClient("api/v1/configurator/part-brands", {
+    method: 'GET'
+  }),
   getOrder: orderParameters => {
     const basePath = APP_CONFIG.internal ? 'api/v1' : 'api/public/v1';
     return authenticateClient("".concat(basePath, "/configurator/order?").concat(orderParameters), {

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

@@ -15,7 +15,7 @@ require("core-js/modules/esnext.iterator.filter.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleOrderCart = exports.useSingleOrderBranchesQuery = exports.useSingleOrderBranchTypes = exports.useSingleOrderArticles = exports.useQuestionsQuery = exports.useProductsQuery = exports.useProductFieldLabels = exports.usePrivateDossierByTypeAndIdQuery = 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.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;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.from-entries.js");
@@ -271,7 +271,7 @@ const useSingleOrderArticles = exports.useSingleOrderArticles = function useSing
         ({
           articles,
           totalCount
-        } = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)([articleNumber], articleNumber));
+        } = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)([articleNumber], articleNumber, filters.searchByParts, filters.brand));
       }
       if (totalCount === 0 || !articles.length) {
         return {
@@ -748,26 +748,36 @@ const usePrivateDossierByTypeAndIdQuery = _ref4 => {
  */
 exports.usePrivateDossierByTypeAndIdQuery = usePrivateDossierByTypeAndIdQuery;
 const useActiveDiscounts = _ref5 => {
-  var _discountsQuery$data;
   let {
     formulaCode,
     offset,
     limit,
     authSession
   } = _ref5;
-  const discountsQuery = (0, _reactQuery.useQuery)({
-    queryKey: ['discounts', formulaCode, offset, limit, authSession],
+  const activeDiscountsQuery = (0, _reactQuery.useQuery)(['activeDiscounts', formulaCode, offset, limit], {
+    enabled: !!formulaCode && !!authSession,
     queryFn: () => _authenticatedProxyApi.authenticatedProxyApi.getActiveDiscounts({
       formulaCode,
       offset,
       limit
-    }),
+    }).then(res => res.data)
+  });
+  return {
+    isLoadingActiveDiscounts: activeDiscountsQuery.isLoading,
+    isActiveDiscountsError: activeDiscountsQuery.isError,
+    activeDiscounts: activeDiscountsQuery === null || activeDiscountsQuery === void 0 ? void 0 : activeDiscountsQuery.data
+  };
+};
+exports.useActiveDiscounts = useActiveDiscounts;
+const usePartBrands = () => {
+  const partBrandsQuery = (0, _reactQuery.useQuery)(['part-brands'], {
+    queryFn: () => _authenticatedProxyApi.authenticatedProxyApi.getPartBrands().then(res => res.data),
     retry: true
   });
   return {
-    isLoadingDiscounts: discountsQuery.isLoading,
-    discountsError: discountsQuery.isError,
-    discounts: discountsQuery === null || discountsQuery === void 0 || (_discountsQuery$data = discountsQuery.data) === null || _discountsQuery$data === void 0 ? void 0 : _discountsQuery$data.data
+    partBrands: (partBrandsQuery === null || partBrandsQuery === void 0 ? void 0 : partBrandsQuery.data) || [],
+    isLoadingPartBrands: partBrandsQuery.isLoading,
+    partBrandsError: partBrandsQuery.error
   };
 };
-exports.useActiveDiscounts = useActiveDiscounts;
+exports.usePartBrands = usePartBrands;

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

@@ -79,6 +79,11 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
     isLoadingBranchTypes,
     branchTypesError
   } = (0, _queries.useBranchTypes)();
+  const {
+    partBrands,
+    isLoadingPartBrands,
+    partBrandsError
+  } = (0, _queries.usePartBrands)();
   const {
     branch
   } = (0, _useAuthSession.useAuthSession)();
@@ -88,6 +93,8 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
   const [selectedArticleSubGroup, setSelectedArticleSubGroup] = (0, _react.useState)('');
   const [selectedArticleNumber, setSelectedArticleNumber] = (0, _react.useState)('');
   const [showAllArticles, setShowAllArticles] = (0, _react.useState)(false);
+  const [searchByParts, setSearchByParts] = (0, _react.useState)(false);
+  const [selectedPartBrand, setSelectedPartBrand] = (0, _react.useState)('');
   const resetLicensePlateFilters = () => {
     if (licensePlate || model) {
       dispatch({
@@ -101,6 +108,7 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
     setSelectedArticleGroup('');
     setSelectedArticleSubGroup('');
     setSelectedArticleNumber('');
+    setSelectedPartBrand('');
     setShowAllArticles(false);
     if (!dontReset) {
       resetFilters();
@@ -139,6 +147,12 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
       onFilterChange('articleNumber', selectedArticleNumber);
     }
   }, [selectedArticleNumber]);
+  (0, _react.useEffect)(() => {
+    onFilterChange('searchByParts', searchByParts);
+  }, [searchByParts]);
+  (0, _react.useEffect)(() => {
+    onFilterChange('brand', selectedPartBrand);
+  }, [selectedPartBrand]);
   const {
     articleGroups,
     isLoadingArticleGroups,
@@ -166,8 +180,10 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
     message: "Er is iets fout gegaan bij het ophalen van de artikelsubgroepen."
   }), articleTypesError && /*#__PURE__*/_react.default.createElement(_DangerAlert.default, {
     message: "Er is iets fout gegaan bij het ophalen van de artikelsoorten."
+  }), partBrandsError && /*#__PURE__*/_react.default.createElement(_DangerAlert.default, {
+    message: "Er is iets fout gegaan bij het ophalen van de onderdeel merken."
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('row row-cols-1 row-cols-md-4 pb-3 px-2')
+    className: (0, _helpers__.withStyle)("row row-cols-1 ".concat(searchByParts ? 'row-cols-md-5' : 'row-cols-md-4', " pb-3 px-2"))
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col')
   }, /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
@@ -235,13 +251,38 @@ const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, re
       setSelectedArticleNumber(value);
     },
     className: "w-100"
-  })), isTmg && /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
+  })), isTmg && searchByParts && /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)('col')
+  }, /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
+    options: [{
+      label: 'Maak een keuze',
+      value: null
+    }, ...(partBrands && !isLoadingPartBrands && partBrands.length > 0 ? partBrands.map(partBrand => ({
+      label: partBrand.title,
+      value: partBrand.entityId
+    })) : [])],
+    initialValue: selectedPartBrand,
+    label: "Onderdeel merken",
+    placeholder: "Maak een keuze",
+    onChange: option => {
+      resetLicensePlateFilters();
+      setSelectedPartBrand(option.value);
+    },
+    className: "w-100"
+  })), isTmg && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: 'showAllArticles',
     initialValue: showAllArticles,
     onChange: value => {
       setShowAllArticles(value);
     },
     label: "Toon alle artikelen"
-  }))));
+  }), /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
+    name: 'searchByParts',
+    initialValue: searchByParts,
+    onChange: value => {
+      setSearchByParts(value);
+    },
+    label: "Zoeken op onderdelen"
+  })))));
 });
 var _default = exports.default = InternalSingleOrderFilters;

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

@@ -8,7 +8,6 @@ require("core-js/modules/esnext.iterator.find.js");
 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/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -17,12 +16,12 @@ exports.default = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.number.to-fixed.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");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireDefault(require("react"));
 var _queries = require("../../__api__/queries");
-var _DangerAlert = _interopRequireDefault(require("../../__components__/DangerAlert"));
 var _EmptyState = _interopRequireDefault(require("../../__components__/EmptyState"));
 var _Pagination = _interopRequireDefault(require("../../__components__/Pagination"));
 var _SingleOrderProductCard = _interopRequireDefault(require("../../__components__/SingleOrderProductCard"));
@@ -110,7 +109,7 @@ const InternalSingleOrderProductOverview = _ref => {
     executionAnswer1,
     executionAnswer2
   });
-  const hasActiveFilters = Boolean(mergedFilters.articleNumber || mergedFilters.licensePlate || mergedFilters.model || mergedFilters.type || mergedFilters.group || mergedFilters.subgroup || mergedFilters.executionAnswer1 || mergedFilters.executionAnswer2 || mergedFilters.durationAnswer);
+  const hasActiveFilters = Boolean(mergedFilters.articleNumber || mergedFilters.licensePlate || mergedFilters.model || mergedFilters.type || mergedFilters.group || mergedFilters.subgroup || mergedFilters.brand || mergedFilters.searchByParts || mergedFilters.executionAnswer1 || mergedFilters.executionAnswer2 || mergedFilters.durationAnswer);
   const {
     articles,
     areArticlesError,
@@ -124,8 +123,12 @@ const InternalSingleOrderProductOverview = _ref => {
   }), articles && hasActiveFilters && (articles === null || articles === void 0 || (_articles$articles = articles.articles) === null || _articles$articles === void 0 ? void 0 : _articles$articles.length) === 0 && /*#__PURE__*/_react.default.createElement(_EmptyState.default, {
     message: "Geen producten gevonden.",
     subMessage: "Probeer een ander filter toe te passen."
-  }), articles && hasActiveFilters && (articles === null || articles === void 0 || (_articles$articles2 = articles.articles) === null || _articles$articles2 === void 0 ? void 0 : _articles$articles2.length) > 0 && (articles === null || articles === void 0 || (_articles$articles3 = articles.articles) === null || _articles$articles3 === void 0 ? void 0 : _articles$articles3.map(article => {
-    var _cart$find$quantity, _cart$find, _article$locationPric, _article$locationPric2, _article$locationPric3, _article$locationPric6, _article$locationPric7;
+  }), articles && hasActiveFilters && (articles === null || articles === void 0 || (_articles$articles2 = articles.articles) === null || _articles$articles2 === void 0 ? void 0 : _articles$articles2.length) > 0 && (articles === null || articles === void 0 || (_articles$articles3 = articles.articles) === null || _articles$articles3 === void 0 || (_articles$articles3 = _articles$articles3.filter(article => {
+    var _article$locationPric;
+    const productPrice = Number(article === null || article === void 0 || (_article$locationPric = article.locationPrices) === null || _article$locationPric === void 0 ? void 0 : _article$locationPric.priceExclVat);
+    return isTmg || productPrice > 0;
+  })) === null || _articles$articles3 === void 0 ? void 0 : _articles$articles3.map(article => {
+    var _cart$find$quantity, _cart$find, _article$locationPric2, _article$locationPric3, _article$locationPric4, _article$locationPric7, _article$locationPric8;
     return /*#__PURE__*/_react.default.createElement(_SingleOrderProductCard.default, {
       isTmg: isTmg,
       branchId: selectedBranch,
@@ -137,11 +140,11 @@ const InternalSingleOrderProductOverview = _ref => {
       productId: article.articleNumber,
       quantity: (_cart$find$quantity = (_cart$find = cart.find(product => product.articleNumber === article.articleNumber)) === null || _cart$find === void 0 ? void 0 : _cart$find.quantity) !== null && _cart$find$quantity !== void 0 ? _cart$find$quantity : 0,
       isSelected: false,
-      stock: (_article$locationPric = article === null || article === void 0 || (_article$locationPric2 = article.locationPrices) === null || _article$locationPric2 === void 0 || (_article$locationPric2 = _article$locationPric2.stock) === null || _article$locationPric2 === void 0 ? void 0 : _article$locationPric2.quantity) !== null && _article$locationPric !== void 0 ? _article$locationPric : 0,
-      isOutOfStock: (article === null || article === void 0 || (_article$locationPric3 = article.locationPrices) === null || _article$locationPric3 === void 0 || (_article$locationPric3 = _article$locationPric3.stock) === null || _article$locationPric3 === void 0 ? void 0 : _article$locationPric3.status) == _constants__.StockStatus.OutOfStock,
+      stock: (_article$locationPric2 = article === null || article === void 0 || (_article$locationPric3 = article.locationPrices) === null || _article$locationPric3 === void 0 || (_article$locationPric3 = _article$locationPric3.stock) === null || _article$locationPric3 === void 0 ? void 0 : _article$locationPric3.quantity) !== null && _article$locationPric2 !== void 0 ? _article$locationPric2 : 0,
+      isOutOfStock: (article === null || article === void 0 || (_article$locationPric4 = article.locationPrices) === null || _article$locationPric4 === void 0 || (_article$locationPric4 = _article$locationPric4.stock) === null || _article$locationPric4 === void 0 ? void 0 : _article$locationPric4.status) == _constants__.StockStatus.OutOfStock,
       handleSelected: () => {
-        var _article$locationPric4, _article$locationPric5;
-        return handleQuantityChange(article.articleNumber, 1, article === null || article === void 0 || (_article$locationPric4 = article.locationPrices) === null || _article$locationPric4 === void 0 ? void 0 : _article$locationPric4.priceExclVat, article === null || article === void 0 || (_article$locationPric5 = article.locationPrices) === null || _article$locationPric5 === void 0 ? void 0 : _article$locationPric5.priceInclVat);
+        var _article$locationPric5, _article$locationPric6;
+        return handleQuantityChange(article.articleNumber, 1, article === null || article === void 0 || (_article$locationPric5 = article.locationPrices) === null || _article$locationPric5 === void 0 ? void 0 : _article$locationPric5.priceExclVat, article === null || article === void 0 || (_article$locationPric6 = article.locationPrices) === null || _article$locationPric6 === void 0 ? void 0 : _article$locationPric6.priceInclVat);
       },
       productUsps: [{
         type: 'excl',
@@ -159,8 +162,8 @@ const InternalSingleOrderProductOverview = _ref => {
       productImage: article.image,
       productSpecifications: (0, _product.extractProductSpecsArray)(article),
       productTitle: article.name,
-      productPrice: Number(article === null || article === void 0 || (_article$locationPric6 = article.locationPrices) === null || _article$locationPric6 === void 0 ? void 0 : _article$locationPric6.priceExclVat).toFixed(2),
-      productPriceInclVat: Number(article === null || article === void 0 || (_article$locationPric7 = article.locationPrices) === null || _article$locationPric7 === void 0 ? void 0 : _article$locationPric7.priceInclVat).toFixed(2),
+      productPrice: Number(article === null || article === void 0 || (_article$locationPric7 = article.locationPrices) === null || _article$locationPric7 === void 0 ? void 0 : _article$locationPric7.priceExclVat).toFixed(2),
+      productPriceInclVat: Number(article === null || article === void 0 || (_article$locationPric8 = article.locationPrices) === null || _article$locationPric8 === void 0 ? void 0 : _article$locationPric8.priceInclVat).toFixed(2),
       productType: article === null || article === void 0 ? void 0 : article.type,
       productGroup: article === null || article === void 0 ? void 0 : article.group,
       productSubgroup: article === null || article === void 0 ? void 0 : article.subgroup

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

@@ -94,6 +94,7 @@ function _toPrimitive(t, r) {
  */
 const fetchArticlesByFilters = async filters => {
   const articlesParamsString = new URLSearchParams((0, _index.removeNullishProps)(filters)).toString();
+  console.log('articlesParamsString:', articlesParamsString);
   const response = await _authenticatedProxyApi.authenticatedProxyApi.getArticles(articlesParamsString);
   if (!(response !== null && response !== void 0 && response.data)) {
     throw new Error('No articles found');
@@ -157,10 +158,16 @@ const fetchArticlesByLicensePlateAndModel = async (filters, formula, branchId) =
 exports.fetchArticlesByLicensePlateAndModel = fetchArticlesByLicensePlateAndModel;
 const fetchArticlesByArticleNumbers = exports.fetchArticlesByArticleNumbers = async function fetchArticlesByArticleNumbers(articleNumbers) {
   let term = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  const articleParamsString = new URLSearchParams(_objectSpread({
+  let searchByParts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let brand = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  const articleParamsString = new URLSearchParams(_objectSpread(_objectSpread(_objectSpread({
     articleNumbers: JSON.stringify(articleNumbers)
   }, term ? {
     term
+  } : {}), searchByParts ? {
+    searchByParts
+  } : {}), brand ? {
+    brand
   } : {})).toString();
   const response = await _authenticatedProxyApi.authenticatedProxyApi.getArticles(articleParamsString);
   if (!(response !== null && response !== void 0 && response.data)) {

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

@@ -168,7 +168,7 @@ const InternalSingleOrderPage = () => {
   const handleSelectedFilterChange = (0, _react.useCallback)((filter, value) => {
     filters.licensePlate = null;
     filters.model = null;
-    if (['type', 'group', 'subgroup', 'articleNumber'].includes(filter)) {
+    if (['type', 'group', 'subgroup', 'articleNumber', 'brand'].includes(filter)) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.RESET_LICENSEPLATE_FILTERS
       });
@@ -190,6 +190,7 @@ const InternalSingleOrderPage = () => {
       group: null,
       subgroup: null,
       articleNumber: null,
+      brand: null,
       model: null,
       page: 1
     });

package/dist/src/shared/__style__/configurator/_configurator-offset.scss

@@ -1,5 +1,5 @@
 $configurator-offset-sm: 60px;
-$configurator-offset-lg: 260px;
+$configurator-offset-lg: 200px;
 
 /* ==========================================================================
 Configurator Offset

package/package.json

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