thm-p3-configurator 0.0.397 → 0.0.399

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

@@ -1,14 +1,15 @@
 "use strict";
 
 require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.sort.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");
 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");
@@ -18,14 +19,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 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.useConfiguratorLocationsQuery = 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.includes.js");
 require("core-js/modules/es.array.sort.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");
 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");
@@ -38,6 +40,7 @@ var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _singleOrderArticles = require("../__helpers__/singleOrderArticles");
+var _singleOrderCartArticles = require("../__helpers__/singleOrderCartArticles");
 var _product = require("../__helpers__/product");
 var _useSessionContextReady = require("../__hooks__/useSessionContextReady");
 var _authenticatedProxyApi = require("./authenticatedProxyApi");
@@ -89,6 +92,21 @@ function _toPrimitive(t, r) {
   return ("string" === r ? String : Number)(t);
 }
 const ORDER_QUERY_STALE_TIME_MS = 5 * 60 * 1000;
+const fetchCartArticleLookup = async function fetchCartArticleLookup() {
+  var _directResponse$artic, _directResponse$artic2, _partFallbackResponse;
+  let articleNumbers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let formula = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  const directResponse = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(articleNumbers, null, false, null, formula);
+  const {
+    mergedByArticleNumber,
+    missingArticleNumbers
+  } = (0, _singleOrderCartArticles.mergeCartArticlesWithPartFallback)(articleNumbers, (_directResponse$artic = directResponse === null || directResponse === void 0 ? void 0 : directResponse.articles) !== null && _directResponse$artic !== void 0 ? _directResponse$artic : []);
+  if (!missingArticleNumbers.length) {
+    return mergedByArticleNumber;
+  }
+  const partFallbackResponse = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(missingArticleNumbers, null, true, null, formula);
+  return (0, _singleOrderCartArticles.mergeCartArticlesWithPartFallback)(articleNumbers, (_directResponse$artic2 = directResponse === null || directResponse === void 0 ? void 0 : directResponse.articles) !== null && _directResponse$artic2 !== void 0 ? _directResponse$artic2 : [], (_partFallbackResponse = partFallbackResponse === null || partFallbackResponse === void 0 ? void 0 : partFallbackResponse.articles) !== null && _partFallbackResponse !== void 0 ? _partFallbackResponse : []).mergedByArticleNumber;
+};
 /**
  * @description Retrieves the car brand options
  */
@@ -308,7 +326,9 @@ const useSingleOrderArticles = exports.useSingleOrderArticles = function useSing
           totalArticles: 0
         };
       }
-      const currentArticles = await (0, _singleOrderArticles.enrichArticlesWithBrandsAndPrices)(articles, branchId || null, branchId ? singleOrderFormula : singleOrderFormula || 'THL');
+      const currentArticles = await (0, _singleOrderArticles.enrichArticlesWithBrandsAndPrices)(articles, branchId || null, branchId ? singleOrderFormula : singleOrderFormula || 'THL', {
+        useArticleNumberForPricing: true
+      });
       const pricedArticles = currentArticles.filter(article => {
         const {
           priceExclVat,
@@ -392,23 +412,30 @@ const useSingleOrderCart = () => {
   })).toString();
   const cartQuery = (0, _reactQuery.useQuery)(['singleOrderCart', cartOrderQuery, webshop], {
     queryFn: async () => {
-      var _articles$articles2;
+      const emptyTotals = {
+        totalQuantity: 0,
+        totalBtw: 0,
+        totalExclVat: 0,
+        totalInclVat: 0
+      };
       if (!singleOrderCart.length) {
         return {
           articles: [],
-          totals: []
+          totals: emptyTotals,
+          validationError: null
         };
       }
 
       // If webshop is selected, use Shopify prices directly without API call
       if (webshop) {
-        var _articles$articles;
-        const articles = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(singleOrderCart.map(article => article.articleNumber), null, false, null, singleOrderFormula);
-        const articlesWithPrice = articles === null || articles === void 0 || (_articles$articles = articles.articles) === null || _articles$articles === void 0 ? void 0 : _articles$articles.map(article => {
-          var _cartItem$brandNumber;
-          const cartItem = singleOrderCart.find(item => item.articleNumber === article.articleNumber);
-          const totals = cartTotalsLookup[article.articleNumber];
+        const articleLookup = await fetchCartArticleLookup(singleOrderCart.map(article => article.articleNumber), singleOrderFormula);
+        const articlesWithPrice = singleOrderCart.map(cartItem => {
+          var _articleLookup$cartIt, _article$name, _cartItem$brandNumber;
+          const article = (_articleLookup$cartIt = articleLookup[cartItem.articleNumber]) !== null && _articleLookup$cartIt !== void 0 ? _articleLookup$cartIt : {};
+          const totals = cartTotalsLookup[cartItem.articleNumber];
           return _objectSpread(_objectSpread({}, article), {}, {
+            articleNumber: cartItem.articleNumber,
+            name: (_article$name = article === null || article === void 0 ? void 0 : article.name) !== null && _article$name !== void 0 ? _article$name : cartItem.articleNumber,
             price: cartItem !== null && cartItem !== void 0 && cartItem.productPriceInclVat ? Math.round(Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.productPriceInclVat) * 100) / 100 : 0,
             quantity: Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.quantity),
             // Add the calculated totals using Shopify prices
@@ -429,25 +456,46 @@ const useSingleOrderCart = () => {
             totalBtw: Math.round(totalBtw * 100) / 100,
             totalExclVat: Math.round(totalExclVat * 100) / 100,
             totalInclVat: Math.round(totalInclVat * 100) / 100
-          }
+          },
+          validationError: null
         };
       }
 
-      // Original logic for non-webshop orders
-      const orderResults = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(cartOrderQuery).then(res => res.data);
-      if (!orderResults.data.cart) {
+      // Original logic for non-webshop orders.
+      // If Hyper rejects a cart with ARTICLES_NOT_FOUND (404), keep rendering
+      // from the local session cart instead of breaking the entire cart query.
+      let cart = [];
+      let validationError = null;
+      try {
+        var _orderResults$data$ca, _orderResults$data;
+        const orderResults = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(cartOrderQuery).then(res => res.data);
+        cart = (_orderResults$data$ca = orderResults === null || orderResults === void 0 || (_orderResults$data = orderResults.data) === null || _orderResults$data === void 0 ? void 0 : _orderResults$data.cart) !== null && _orderResults$data$ca !== void 0 ? _orderResults$data$ca : [];
+      } catch (error) {
+        var _error$response, _error$response2, _error$response3;
+        const isCartOrderLookup = cartOrderQuery.includes('cart=');
+        const isArticlesNotFoundError = (error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 404 && (error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 || (_error$response2 = _error$response2.data) === null || _error$response2 === void 0 ? void 0 : _error$response2.code) === 'ARTICLES_NOT_FOUND';
+        const isGenericNotFoundError = (error === null || error === void 0 || (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.status) === 404;
+        if (!isCartOrderLookup || !isArticlesNotFoundError && !isGenericNotFoundError) {
+          throw error;
+        }
+        cart = apiCart;
+        validationError = 'Een of meer artikelen in de winkelwagen zijn momenteel niet bestelbaar voor deze formule.';
+      }
+      if (!cart.length) {
         return {
-          cart: []
+          articles: [],
+          totals: emptyTotals,
+          validationError
         };
       }
-      const cart = orderResults.data.cart;
-      const articles = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(cart.map(article => article.articleNumber), null, false, null, singleOrderFormula);
-      const cartLookup = Object.fromEntries(cart.map(item => [item.articleNumber, item]));
-      const articlesWithPrice = articles === null || articles === void 0 || (_articles$articles2 = articles.articles) === null || _articles$articles2 === void 0 ? void 0 : _articles$articles2.map(article => {
-        var _cartItem$brandNumber2;
-        const cartItem = cartLookup[article.articleNumber];
-        const totals = cartTotalsLookup[article.articleNumber];
+      const articleLookup = await fetchCartArticleLookup(cart.map(article => article.articleNumber), singleOrderFormula);
+      const articlesWithPrice = cart.map(cartItem => {
+        var _articleLookup$cartIt2, _article$name2, _cartItem$brandNumber2;
+        const article = (_articleLookup$cartIt2 = articleLookup[cartItem.articleNumber]) !== null && _articleLookup$cartIt2 !== void 0 ? _articleLookup$cartIt2 : {};
+        const totals = cartTotalsLookup[cartItem.articleNumber];
         return _objectSpread(_objectSpread({}, article), {}, {
+          articleNumber: cartItem.articleNumber,
+          name: (_article$name2 = article === null || article === void 0 ? void 0 : article.name) !== null && _article$name2 !== void 0 ? _article$name2 : cartItem.articleNumber,
           price: cartItem !== null && cartItem !== void 0 && cartItem.consumerTotal ? Math.round(Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.consumerTotal) * 100) / 100 : 0,
           quantity: Number(cartItem === null || cartItem === void 0 ? void 0 : cartItem.quantity),
           // Add the calculated totals
@@ -468,7 +516,8 @@ const useSingleOrderCart = () => {
           totalBtw: Math.round(totalBtw * 100) / 100,
           totalExclVat: Math.round(totalExclVat * 100) / 100,
           totalInclVat: Math.round(totalInclVat * 100) / 100
-        }
+        },
+        validationError
       };
     }
   });

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

@@ -12,6 +12,7 @@ var _react = _interopRequireDefault(require("react"));
 var _queries = require("../../__api__/queries");
 var _LinkButton = _interopRequireDefault(require("../../__components__/Buttons/LinkButton"));
 var _PrimaryButton = _interopRequireDefault(require("../../__components__/Buttons/PrimaryButton"));
+var _DangerAlert = _interopRequireDefault(require("../../__components__/DangerAlert"));
 var _ExpandableCard = _interopRequireDefault(require("../../__components__/Cards/ExpandableCard"));
 var _SingleOrderCartCard = _interopRequireDefault(require("../../__components__/SingleOrderCartCard"));
 var _helpers__ = require("../../__helpers__");
@@ -29,7 +30,7 @@ const EmptyState = _ref => {
   }, message));
 };
 const InternalSingleOrderCart = _ref2 => {
-  var _cart$articles, _cart$totals$totalExc, _cart$totals, _cart$totals$totalBtw, _cart$totals2, _cart$totals$totalInc, _cart$totals3;
+  var _cart$validationError, _cart$articles, _cart$totals$totalExc, _cart$totals, _cart$totals$totalBtw, _cart$totals2, _cart$totals$totalInc, _cart$totals3;
   let {
     handleQuantityChange,
     removeFromCart: _removeFromCart,
@@ -43,6 +44,7 @@ const InternalSingleOrderCart = _ref2 => {
     cart,
     isLoadingCart
   } = (0, _queries.useSingleOrderCart)();
+  const cartValidationError = (_cart$validationError = cart === null || cart === void 0 ? void 0 : cart.validationError) !== null && _cart$validationError !== void 0 ? _cart$validationError : null;
   const confirmButtonClicked = () => {
     if (showProductOverview) {
       toggleOverview();
@@ -89,8 +91,11 @@ const InternalSingleOrderCart = _ref2 => {
   }, /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
     label: "Bestelling herstarten",
     onClick: () => resetOrderSession()
+  }), cartValidationError && /*#__PURE__*/_react.default.createElement(_DangerAlert.default, {
+    className: "mx-2 mb-0",
+    message: "".concat(cartValidationError, " Pas de artikelen aan voordat je kunt bevestigen.")
   }), /*#__PURE__*/_react.default.createElement(_PrimaryButton.default, {
-    isDisabled: disabledCreateOrder,
+    isDisabled: disabledCreateOrder || Boolean(cartValidationError),
     label: !showProductOverview ? 'Bevestigen' : 'Bestellen',
     onClick: confirmButtonClicked
   })));

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

@@ -0,0 +1,79 @@
+"use strict";
+
+require("core-js/modules/es.object.from-entries.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.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.for-each.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeCartArticlesWithPartFallback = void 0;
+require("core-js/modules/es.object.from-entries.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
+}
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+const toArticleLookup = function toArticleLookup() {
+  let articles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return Object.fromEntries(articles.filter(article => article === null || article === void 0 ? void 0 : article.articleNumber).map(article => [article.articleNumber, article]));
+};
+const mergeCartArticlesWithPartFallback = exports.mergeCartArticlesWithPartFallback = function mergeCartArticlesWithPartFallback() {
+  let cartArticleNumbers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let directMatches = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  let partFallbackMatches = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  const uniqueCartArticleNumbers = [...new Set(cartArticleNumbers.filter(Boolean))];
+  const directLookup = toArticleLookup(directMatches);
+  const fallbackLookup = toArticleLookup(partFallbackMatches);
+  const missingArticleNumbers = uniqueCartArticleNumbers.filter(articleNumber => !directLookup[articleNumber]);
+  const mergedByArticleNumber = _objectSpread(_objectSpread({}, directLookup), Object.fromEntries(missingArticleNumbers.filter(articleNumber => fallbackLookup[articleNumber]).map(articleNumber => [articleNumber, fallbackLookup[articleNumber]])));
+  return {
+    mergedByArticleNumber,
+    missingArticleNumbers
+  };
+};

package/package.json

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