thm-p3-configurator 0.0.368 → 0.0.370

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

@@ -190,6 +190,10 @@ const QuotationForm = () => {
         action: 'submit',
         action_value: 'valid'
       });
+      (0, _Datalayer.pushToDataLayer)({
+        event: 'form_submit',
+        form_name: 'config_offerte'
+      });
       await createQuotation((0, _helpers__.removeNullishProps)({
         isExitIntent: false,
         licensePlate,
@@ -316,12 +320,22 @@ const QuotationForm = () => {
     placeholder: "",
     initialValue: customer.infix,
     name: "infix",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
-      payload: {
-        infix: value
-      }
-    }),
+    onFocus: () => trackFormField('tussenvoegsel', 'focus'),
+    onChange: value => {
+      trackInput({
+        event: 'form',
+        component: 'offerte',
+        element: 'text_field',
+        field: 'tussenvoegsel',
+        action: 'input'
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
+        payload: {
+          infix: value
+        }
+      });
+    },
     isRequired: false,
     form: "quotation",
     label: "Tussenvoegsel:",
@@ -330,12 +344,22 @@ const QuotationForm = () => {
     placeholder: "",
     initialValue: customer.lastName,
     name: "lastName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
-      payload: {
-        lastName: value
-      }
-    }),
+    onFocus: () => trackFormField('achternaam', 'focus'),
+    onChange: value => {
+      trackInput({
+        event: 'form',
+        component: 'offerte',
+        element: 'text_field',
+        field: 'achternaam',
+        action: 'input'
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
+        payload: {
+          lastName: value
+        }
+      });
+    },
     isRequired: true,
     form: "quotation",
     label: "Achternaam:",
@@ -368,12 +392,22 @@ const QuotationForm = () => {
     placeholder: "",
     initialValue: customer.phoneNumber,
     name: "phoneNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: value
-      }
-    }),
+    onFocus: () => trackFormField('telefoonnummer', 'focus'),
+    onChange: value => {
+      trackInput({
+        event: 'form',
+        component: 'offerte',
+        element: 'text_field',
+        field: 'telefoonnummer',
+        action: 'input'
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
+        payload: {
+          phoneNumber: value
+        }
+      });
+    },
     isRequired: true,
     form: "quotation",
     label: "Telefoonnummer:",
@@ -388,12 +422,22 @@ const QuotationForm = () => {
     placeholder: "",
     initialValue: customer.companyName,
     name: "companyName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-      payload: {
-        companyName: value
-      }
-    }),
+    onFocus: () => trackFormField('bedrijfsnaam', 'focus'),
+    onChange: value => {
+      trackInput({
+        event: 'form',
+        component: 'offerte',
+        element: 'text_field',
+        field: 'bedrijfsnaam',
+        action: 'input'
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
+        payload: {
+          companyName: value
+        }
+      });
+    },
     isRequired: true,
     form: "quotation",
     label: "Bedrijfsnaam:",
@@ -402,12 +446,21 @@ const QuotationForm = () => {
     placeholder: "",
     initialValue: customer.note,
     name: "note",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_NOTE,
-      payload: {
-        note: value
-      }
-    }),
+    onChange: value => {
+      trackInput({
+        event: 'form',
+        component: 'offerte',
+        element: 'text_field',
+        field: 'opmerkingen',
+        action: 'input'
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_NOTE,
+        payload: {
+          note: value
+        }
+      });
+    },
     isRequired: false,
     form: "quotation",
     label: "Eventuele vragen of opmerkingen:",
@@ -421,8 +474,9 @@ const QuotationForm = () => {
         event: 'form',
         component: 'offerte',
         element: 'checkbox',
+        field: 'algemene voorwaarden',
         action: value ? 'on' : 'off',
-        action_value: 'Ik ga akkoord met de algemene voorwaarden'
+        action_value: String(value)
       });
       setIsTermsAccepted(value);
     },

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

@@ -212,6 +212,7 @@ const SingleOrderModalContent = _ref6 => {
     isLoadingSingleOrderBranches
   } = (0, _queries.useSingleOrderBranchesQuery)({
     branchTypeId: formula === _constants__.CONFIGURATOR_FORMULAS.TMG ? singleOrderBranchType : _constants__.VESTIGING_TYPE_ID,
+    formula: (0, _constants__.getConfiguratorFormulaCode)(formula),
     limit: 500,
     offset: 0
   });

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

@@ -144,7 +144,7 @@ const InternalSingleOrderProductOverview = _ref => {
     const stockQuantity = orderSession.webshop ? 0 : (_article$consumerPric = article === null || article === void 0 || (_article$consumerPric2 = article.consumerPrices) === null || _article$consumerPric2 === void 0 || (_article$consumerPric2 = _article$consumerPric2.stock) === null || _article$consumerPric2 === void 0 ? void 0 : _article$consumerPric2.quantity) !== null && _article$consumerPric !== void 0 ? _article$consumerPric : 0;
     const apiStockStatus = article === null || article === void 0 || (_article$consumerPric3 = article.consumerPrices) === null || _article$consumerPric3 === void 0 || (_article$consumerPric3 = _article$consumerPric3.stock) === null || _article$consumerPric3 === void 0 ? void 0 : _article$consumerPric3.status;
     const stockStatus = (0, _singleOrderArticles.mapApiStockStatusToStockStatus)(apiStockStatus);
-    const isOutOfStock = !orderSession.webshop && !isTmg && stockStatus === _constants__.StockStatus.OutOfStock;
+    const isOutOfStock = !orderSession.webshop && stockStatus === _constants__.StockStatus.OutOfStock;
     return /*#__PURE__*/_react.default.createElement(_SingleOrderProductCard.default, {
       isTmg: isTmg,
       branchId: selectedBranch,

package/dist/src/shared/__context__/OrderSessionContext.js

@@ -1357,7 +1357,10 @@ const initializeOrderSession = function initializeOrderSession() {
   }
   return cachedSession;
 };
-const AuthSessionRuntimeSync = () => {
+const AuthSessionRuntimeSync = _ref => {
+  let {
+    authMode = 'internal'
+  } = _ref;
   const {
     authenticated,
     initialized,
@@ -1370,25 +1373,26 @@ const AuthSessionRuntimeSync = () => {
   const formula = (0, _FormulaContext.useFormula)();
   const lastSyncedContextRef = (0, _react.useRef)(null);
   const authRuntime = (0, _AuthRuntimeContext.useAuthRuntime)();
+  const isExternalAuthMode = authMode === 'external';
   (0, _react.useLayoutEffect)(() => {
-    var _ref;
+    var _ref2;
     if (!APP_CONFIG.internal || !initialized) {
       if (APP_CONFIG.internal) {
         authRuntime.setSessionContextReady(false);
       }
       return;
     }
-    authRuntime.setActiveBranchId((_ref = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref !== void 0 ? _ref : null);
+    authRuntime.setActiveBranchId((_ref2 = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref2 !== void 0 ? _ref2 : null);
   }, [authRuntime, initialized, selectedBranch, branch]);
   (0, _react.useEffect)(() => {
-    var _ref2;
+    var _ref3;
     if (!APP_CONFIG.internal || !initialized) {
       if (APP_CONFIG.internal) {
         authRuntime.setSessionContextReady(false);
       }
       return;
     }
-    const branchId = (_ref2 = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref2 !== void 0 ? _ref2 : null;
+    const branchId = (_ref3 = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref3 !== void 0 ? _ref3 : null;
     if (!authenticated || !branchId || !formula) {
       lastSyncedContextRef.current = null;
       authRuntime.setSessionContextReady(false);
@@ -1404,6 +1408,11 @@ const AuthSessionRuntimeSync = () => {
       authRuntime.setSessionContextReady(true);
       return;
     }
+    if (isExternalAuthMode) {
+      lastSyncedContextRef.current = nextContextKey;
+      authRuntime.setSessionContextReady(true);
+      return;
+    }
     let isCancelled = false;
     authRuntime.setSessionContextReady(false);
     _authenticatedProxyApi.authenticatedProxyApi.putSessionContext({
@@ -1422,16 +1431,16 @@ const AuthSessionRuntimeSync = () => {
     return () => {
       isCancelled = true;
     };
-  }, [authRuntime, authenticated, initialized, selectedBranch, branch, formula, module]);
+  }, [authRuntime, authenticated, initialized, selectedBranch, branch, formula, module, isExternalAuthMode]);
   return null;
 };
-const OrderSessionController = _ref3 => {
+const OrderSessionController = _ref4 => {
   let {
     children,
     authMode = 'internal',
     externalAuthSession = null,
     externalAuthRuntime = null
-  } = _ref3;
+  } = _ref4;
   const isSingleOrderPage = (0, _useIsSingleOrder.default)();
   const isExternalAuthMode = authMode === 'external' || Boolean(externalAuthSession);
   const runtimeMode = isExternalAuthMode ? 'external' : 'internal';
@@ -1451,7 +1460,9 @@ const OrderSessionController = _ref3 => {
   }, /*#__PURE__*/_react.default.createElement(_AuthSessionContext.AuthSessionProvider, {
     authMode: runtimeMode,
     externalAuthSession: externalAuthSession
-  }, /*#__PURE__*/_react.default.createElement(AuthSessionRuntimeSync, null), children)));
+  }, /*#__PURE__*/_react.default.createElement(AuthSessionRuntimeSync, {
+    authMode: runtimeMode
+  }), children)));
 };
 exports.OrderSessionController = OrderSessionController;
 const useOrderSession = () => {

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

@@ -232,7 +232,7 @@ const fetchArticlesByArticleNumbers = exports.fetchArticlesByArticleNumbers = as
  * @param {Object} parts - The parts
  */
 const fetchPartStockLevels = exports.fetchPartStockLevels = async function fetchPartStockLevels(part, branchId) {
-  var _response$data$data;
+  var _response$data$data$c, _response$data$data, _response$data$data2;
   let formula = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   const partParamsString = new URLSearchParams((0, _index.removeNullishProps)(_objectSpread(_objectSpread({
     branchId
@@ -247,7 +247,7 @@ const fetchPartStockLevels = exports.fetchPartStockLevels = async function fetch
   if (!(response !== null && response !== void 0 && response.data)) {
     throw new Error('No response from the API');
   }
-  const stockLevel = (_response$data$data = response.data.data) === null || _response$data$data === void 0 || (_response$data$data = _response$data$data.consumerPrices) === null || _response$data$data === void 0 || (_response$data$data = _response$data$data[0]) === null || _response$data$data === void 0 ? void 0 : _response$data$data.stock;
+  const stockLevel = (_response$data$data$c = (_response$data$data = response.data.data) === null || _response$data$data === void 0 || (_response$data$data = _response$data$data.consumerPrices) === null || _response$data$data === void 0 || (_response$data$data = _response$data$data[0]) === null || _response$data$data === void 0 ? void 0 : _response$data$data.stock) !== null && _response$data$data$c !== void 0 ? _response$data$data$c : (_response$data$data2 = response.data.data) === null || _response$data$data2 === void 0 || (_response$data$data2 = _response$data$data2.locationPrices) === null || _response$data$data2 === void 0 || (_response$data$data2 = _response$data$data2[0]) === null || _response$data$data2 === void 0 ? void 0 : _response$data$data2.stock;
   if (stockLevel) {
     return _objectSpread(_objectSpread({}, stockLevel), {}, {
       status: mapApiStockStatusToStockStatus(stockLevel.status)
@@ -271,11 +271,6 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
     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)
@@ -286,14 +281,12 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
     throw new Error('Failed to fetch the brands of the articles');
   }
   const articlesWithBrands = articles.map(article => {
-    var _preferredPricePart$p, _ref3, _ref4, _preferredPricePart$p2, _ref5, _brandData$brandNumbe;
+    var _brandData$brandNumbe;
     const brandData = findBrandDataForArticle(article, brandResponse.data);
-    const preferredPricePart = findPreferredPricePart(article);
-    const pricingPartNumber = (_preferredPricePart$p = preferredPricePart === null || preferredPricePart === void 0 ? void 0 : preferredPricePart.partNumber) !== null && _preferredPricePart$p !== void 0 ? _preferredPricePart$p : article.articleNumber;
-    const resolvedBrandNumber = preferredPricePart ? (_ref3 = (_ref4 = (_preferredPricePart$p2 = preferredPricePart === null || preferredPricePart === void 0 ? void 0 : preferredPricePart.partBrandId) !== null && _preferredPricePart$p2 !== void 0 ? _preferredPricePart$p2 : 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 : (_ref5 = (_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 && _ref5 !== void 0 ? _ref5 : _index2.DEFAULT_ARTICLE_BRAND;
+    const resolvedBrandNumber = (_brandData$brandNumbe = brandData === null || brandData === void 0 ? void 0 : brandData.brandNumber) !== null && _brandData$brandNumbe !== void 0 ? _brandData$brandNumbe : _index2.DEFAULT_ARTICLE_BRAND;
     return _objectSpread(_objectSpread({}, article), {}, {
       brand: resolvedBrandNumber,
-      pricingPartNumber
+      pricingPartNumber: article.articleNumber
     });
   }).filter(article => article.brand && article.pricingPartNumber);
   const parts = [...new Map(articlesWithBrands.map(article => {
@@ -318,11 +311,11 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
     consumer: Object.fromEntries(consumerPrices.map(price => [price.partNumber, price])),
     location: Object.fromEntries(locationPrices.map(price => [price.partNumber, price]))
   };
-  let currentArticles = articlesWithBrands.map(_ref6 => {
+  let currentArticles = articlesWithBrands.map(_ref3 => {
     let {
         pricingPartNumber
-      } = _ref6,
-      article = _objectWithoutProperties(_ref6, _excluded);
+      } = _ref3,
+      article = _objectWithoutProperties(_ref3, _excluded);
     return _objectSpread(_objectSpread({}, article), {}, {
       consumerPrices: pricesMap.consumer[pricingPartNumber],
       locationPrices: pricesMap.location[pricingPartNumber]
@@ -331,10 +324,10 @@ const enrichArticlesWithBrandsAndPrices = exports.enrichArticlesWithBrandsAndPri
   return currentArticles;
 };
 const formatModelArticle = article => {
-  var _ref7, _article$name, _ref8, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
+  var _ref4, _article$name, _ref5, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
   return _objectSpread(_objectSpread({}, article), {}, {
-    name: (_ref7 = (_article$name = article.name) !== null && _article$name !== void 0 ? _article$name : article === null || article === void 0 ? void 0 : article.title) !== null && _ref7 !== void 0 ? _ref7 : null,
-    description: (_ref8 = (_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 && _ref8 !== void 0 ? _ref8 : null,
+    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,
     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)({
@@ -349,11 +342,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(_ref9 => {
-    let [_, value] = _ref9;
+  const specification = specificationPairs.filter(_ref6 => {
+    let [_, value] = _ref6;
     return value;
-  }).map(_ref10 => {
-    let [label, value] = _ref10;
+  }).map(_ref7 => {
+    let [label, value] = _ref7;
     return "".concat(label, ": ").concat(value);
   }).join(' \n ');
   return _objectSpread(_objectSpread({}, article), {}, {

package/dist/src/shared/__pages__/LicensePlatePage.js

@@ -145,9 +145,9 @@ const LicensePlatePage = () => {
     }
   }, [discountCode]);
   (0, _react.useEffect)(() => {
-    if (APP_CONFIG.internal) return;
+    if (APP_CONFIG.internal || activeStep !== 0) return;
     (0, _Datalayer.pushToDataLayer)({
-      event: activeStep === 0 ? 'configurator_step_wijzig_auto' : 'configurator_step_extra_questions'
+      event: 'configurator_step_wijzig_auto'
     });
   }, [activeStep]);
   const Steps = (0, _react.useMemo)(() => getSteps({

package/dist/src/shared/__pages__/ManualSelectionPage.js

@@ -121,9 +121,9 @@ const ManualSelectionPage = () => {
     }
   }, [franchiseName]);
   (0, _react.useEffect)(() => {
-    if (APP_CONFIG.internal) return;
+    if (APP_CONFIG.internal || activeStep !== 0) return;
     (0, _Datalayer.pushToDataLayer)({
-      event: activeStep === 0 ? 'configurator_step_wijzig_auto' : 'configurator_step_extra_questions'
+      event: 'configurator_step_wijzig_auto'
     });
   }, [activeStep]);
   const handleNext = () => {

package/package.json

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