thm-p3-configurator 0.0.398 → 0.0.400

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

@@ -40,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");
@@ -91,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
  */
@@ -396,7 +412,6 @@ const useSingleOrderCart = () => {
   })).toString();
   const cartQuery = (0, _reactQuery.useQuery)(['singleOrderCart', cartOrderQuery, webshop], {
     queryFn: async () => {
-      var _articleResponse$arti2;
       const emptyTotals = {
         totalQuantity: 0,
         totalBtw: 0,
@@ -413,9 +428,7 @@ const useSingleOrderCart = () => {
 
       // If webshop is selected, use Shopify prices directly without API call
       if (webshop) {
-        var _articleResponse$arti;
-        const articleResponse = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(singleOrderCart.map(article => article.articleNumber), null, false, null, singleOrderFormula);
-        const articleLookup = Object.fromEntries(((_articleResponse$arti = articleResponse === null || articleResponse === void 0 ? void 0 : articleResponse.articles) !== null && _articleResponse$arti !== void 0 ? _articleResponse$arti : []).map(article => [article.articleNumber, article]));
+        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 : {};
@@ -475,8 +488,7 @@ const useSingleOrderCart = () => {
           validationError
         };
       }
-      const articleResponse = await (0, _singleOrderArticles.fetchArticlesByArticleNumbers)(cart.map(article => article.articleNumber), null, false, null, singleOrderFormula);
-      const articleLookup = Object.fromEntries(((_articleResponse$arti2 = articleResponse === null || articleResponse === void 0 ? void 0 : articleResponse.articles) !== null && _articleResponse$arti2 !== void 0 ? _articleResponse$arti2 : []).map(article => [article.articleNumber, article]));
+      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 : {};

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

@@ -211,8 +211,10 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   const normalizedOwnershipType = activeOwnershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty ? null : activeOwnershipType;
   const checkboxAvailability = (0, _helpers__.getSingleOrderCheckboxAvailability)({
     isTmg,
-    isTowCenterBranch
+    isTowCenterBranch,
+    webshop
   });
+  const isDirectDeliveryEnabled = Boolean(anderAfleveradres || checkboxAvailability.shouldForceDirectDelivery);
 
   // Separate customer state for each ownership type
   const [customerDataPerType, setCustomerDataPerType] = (0, _react.useState)(() => {
@@ -258,7 +260,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     return defaultCountry || null;
   }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions]);
   const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk;
-  const needsCustomerDeliveryIdentity = Boolean(anderAfleveradres);
+  const needsCustomerDeliveryIdentity = isDirectDeliveryEnabled;
   const isNetherlandsSelected = (0, _react.useMemo)(() => {
     if (!(selectedCountry !== null && selectedCountry !== void 0 && selectedCountry.label)) return false;
     return selectedCountry.label.toUpperCase() === 'NEDERLAND';
@@ -346,6 +348,16 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
       }
     }
   }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, updateCustomerField]);
+  (0, _react.useEffect)(() => {
+    if (checkboxAvailability.shouldForceDirectDelivery && !Boolean(anderAfleveradres)) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+        payload: {
+          anderAfleveradres: true
+        }
+      });
+    }
+  }, [checkboxAvailability.shouldForceDirectDelivery, anderAfleveradres, dispatch]);
 
   /**
    * @description Auto-set Partner Portal channel for non-TMG users
@@ -524,10 +536,10 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
       }
       let validationSchema = webshop || !isTmg ? customerDetailsFormSchema.omit(['channelType', 'channelId']) : customerDetailsFormSchema;
       const requiredFields = (0, _helpers__.getSingleOrderRequiredFields)({
-        anderAfleveradres,
+        anderAfleveradres: isDirectDeliveryEnabled,
         ownershipType: normalizedOwnershipType
       });
-      if (anderAfleveradres) {
+      if (isDirectDeliveryEnabled) {
         validationSchema = validationSchema.shape({
           singleOrderOwnershipType: (0, _yup.string)().required('Type is verplicht').notOneOf([_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty], 'Type is verplicht')
         });
@@ -641,15 +653,15 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
       setActiveOwnershipType(val);
     },
     options: [_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Particulier, _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk],
-    isRequired: Boolean(anderAfleveradres),
+    isRequired: isDirectDeliveryEnabled,
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['singleOrderOwnershipType']
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mb-2')
   }, /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: "anderAfleveradres",
     label: "Rechtstreeks leveren aan de klant",
-    initialValue: checkboxAvailability.canUseDirectDelivery ? Boolean(anderAfleveradres) : false,
-    isDisabled: !checkboxAvailability.canUseDirectDelivery,
+    initialValue: checkboxAvailability.shouldForceDirectDelivery ? true : checkboxAvailability.canUseDirectDelivery ? Boolean(anderAfleveradres) : false,
+    isDisabled: checkboxAvailability.shouldForceDirectDelivery || !checkboxAvailability.canUseDirectDelivery,
     onChange: value => dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
       payload: {
@@ -675,7 +687,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     initialValue: customer.firstName,
     name: "firstName",
     onChange: value => updateCustomerField('firstName', value),
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     form: form,
     label: "Voornaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['firstName']
@@ -693,7 +705,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     initialValue: customer.lastName,
     name: "lastName",
     onChange: value => updateCustomerField('lastName', value),
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     form: form,
     label: "Achternaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['lastName']
@@ -702,7 +714,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     initialValue: customer.email,
     name: "email",
     onChange: value => updateCustomerField('email', value),
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     form: form,
     label: "E-mailadres:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['email']
@@ -712,7 +724,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     name: "phoneNumber",
     onChange: value => updateCustomerField('phoneNumber', value),
     form: form,
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber']
   })), /*#__PURE__*/_react.default.createElement("div", {
@@ -749,7 +761,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         setIsCompanyInputFocused(false);
       }, 300);
     },
-    isRequired: anderAfleveradres && normalizedOwnershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk,
+    isRequired: isDirectDeliveryEnabled && normalizedOwnershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk,
     form: form,
     label: "Bedrijfsnaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['companyName']
@@ -838,7 +850,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         handleAddressLookup(value, customer.houseNumber);
       }
     },
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     key: "zipCode-".concat(refreshKey),
     form: form,
     label: "Postcode:",
@@ -854,7 +866,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         handleAddressLookup(customer.zipCode, value);
       }
     },
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     key: "houseNumber-".concat(refreshKey),
     form: form,
     label: "Huisnummer:",
@@ -874,7 +886,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     value: customer.streetName,
     name: "streetName",
     onChange: value => updateCustomerField('streetName', value),
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     key: "streetName-".concat(refreshKey),
     form: form,
     label: "Straat:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -884,7 +896,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     value: customer.city,
     name: "city",
     onChange: value => updateCustomerField('city', value),
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     key: "city-".concat(refreshKey),
     form: form,
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -893,7 +905,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     options: countryOptions,
     name: "country",
     label: "Land:",
-    isRequired: anderAfleveradres,
+    isRequired: isDirectDeliveryEnabled,
     isLoading: isLoadingCountries,
     noOptionsMessage: "Geen landen beschikbaar",
     placeholder: "Selecteer een land",

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/dist/src/shared/__helpers__/singleOrderCustomerDetails.js

@@ -5,15 +5,17 @@ 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.some.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
 });
-exports.getSingleOrderRequiredFields = exports.getSingleOrderCheckboxAvailability = exports.getEmptySingleOrderCustomer = exports.buildSingleOrderVehiclePayload = exports.buildSingleOrderCustomerPayload = exports.buildSingleOrderBusinessContactPayload = void 0;
+exports.shouldForceDirectDeliveryForWebshop = exports.getSingleOrderRequiredFields = exports.getSingleOrderCheckboxAvailability = exports.getEmptySingleOrderCustomer = exports.buildSingleOrderVehiclePayload = exports.buildSingleOrderCustomerPayload = exports.buildSingleOrderBusinessContactPayload = void 0;
 require("core-js/modules/es.string.trim.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.some.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _constants__ = require("../__constants__");
 function ownKeys(e, r) {
   var t = Object.keys(e);
@@ -58,6 +60,15 @@ function _toPrimitive(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
+const normalizeWebshop = function normalizeWebshop() {
+  let webshop = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  return typeof webshop === 'string' ? webshop.trim().toLowerCase() : '';
+};
+const FORCED_DIRECT_DELIVERY_WEBSHOPS = new Set(['trekhaakland', 'trekhaken.nl']);
+const shouldForceDirectDeliveryForWebshop = exports.shouldForceDirectDeliveryForWebshop = function shouldForceDirectDeliveryForWebshop() {
+  let webshop = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  return FORCED_DIRECT_DELIVERY_WEBSHOPS.has(normalizeWebshop(webshop));
+};
 const getEmptySingleOrderCustomer = () => ({
   firstName: '',
   infix: '',
@@ -84,11 +95,13 @@ exports.getEmptySingleOrderCustomer = getEmptySingleOrderCustomer;
 const getSingleOrderCheckboxAvailability = _ref => {
   let {
     isTmg = false,
-    isTowCenterBranch = false
+    isTowCenterBranch = false,
+    webshop = null
   } = _ref;
   return {
-    canUseDirectDelivery: Boolean(isTmg || isTowCenterBranch),
-    canUseWarehouseSale: false
+    canUseDirectDelivery: Boolean(isTmg || isTowCenterBranch || shouldForceDirectDeliveryForWebshop(webshop)),
+    canUseWarehouseSale: false,
+    shouldForceDirectDelivery: shouldForceDirectDeliveryForWebshop(webshop)
   };
 };
 exports.getSingleOrderCheckboxAvailability = getSingleOrderCheckboxAvailability;
@@ -117,7 +130,7 @@ const buildSingleOrderCustomerPayload = _ref3 => {
   } = _ref3;
   const baseCustomer = _objectSpread(_objectSpread({}, getEmptySingleOrderCustomer()), customer);
   const payload = _objectSpread(_objectSpread({}, baseCustomer), {}, {
-    anderAfleveradres: Boolean(anderAfleveradres),
+    anderAfleveradres: Boolean(anderAfleveradres || shouldForceDirectDeliveryForWebshop(webshop)),
     afhalenInWinkel: false,
     anderFactuuradres: false
   });

package/package.json

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