thm-p3-configurator 0.0.417 → 0.0.418

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

@@ -107,7 +107,8 @@ const useCreateQuotationMutation = () => {
       discount,
       vehicle,
       skipFilters,
-      isExitIntent = false
+      isExitIntent = false,
+      prospectId
     } = _ref;
     return _publicProxyApi.publicProxyApi.postQuotation({
       isExitIntent,
@@ -122,7 +123,8 @@ const useCreateQuotationMutation = () => {
       skipFilters,
       selectBoardComputerUpdate: selectBoardComputerUpdate,
       customer: customer,
-      branchId
+      branchId,
+      prospectId
     });
   });
   return {
@@ -144,6 +146,7 @@ const useCreateAppointmentRequestMutation = () => {
       licensePlate,
       model,
       constructionYear,
+      prospectId,
       answers,
       cart,
       selectBoardComputerUpdate,
@@ -166,7 +169,8 @@ const useCreateAppointmentRequestMutation = () => {
       customer,
       branchId,
       discount,
-      vehicle
+      vehicle,
+      prospectId
     });
   }, {});
   return {

package/dist/src/shared/__components__/SingleOrderProductCard.js

@@ -1,5 +1,6 @@
 "use strict";
 
+require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.trim.js");
 require("core-js/modules/es.weak-map.js");
@@ -16,6 +17,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.trim.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -218,6 +220,8 @@ const SingleOrderProductCard = _ref4 => {
     productTitle,
     productPrice,
     productPriceInclVat,
+    locationPriceExclVat = null,
+    consumerPriceExclVat = null,
     productBrandNumber,
     productSpecifications,
     quantity = 0,
@@ -315,8 +319,8 @@ const SingleOrderProductCard = _ref4 => {
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h5", {
     className: (0, _helpers__.withStyle)('card-title mb-3')
   }, productTitle, /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _helpers__.withStyle)('ms-2')
-  }, "\u20AC", productPrice)), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)('ms-2 d-flex flex-column align-items-end')
+  }, locationPriceExclVat != null && /*#__PURE__*/_react.default.createElement("span", null, "Vestigingprijs excl BTW: \u20AC", locationPriceExclVat.toFixed(2)), consumerPriceExclVat != null && /*#__PURE__*/_react.default.createElement("small", null, "Consumentenprijs excl BTW: \u20AC", consumerPriceExclVat.toFixed(2)))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)(isModelArticle ? 'd-flex justify-content-between' : '')
   }, (productSubgroup || articleNumber || preferredPart) && /*#__PURE__*/_react.default.createElement(ProductCategories, {
     brandName: brandName,

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

@@ -40,6 +40,7 @@ var _constants__ = require("../__constants__");
 var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
+var _prospectTracking = require("../__helpers__/prospectTracking");
 var _Datalayer = require("../__services__/Datalayer");
 var _product = require("../__helpers__/product");
 var _useDebouncedPush = _interopRequireDefault(require("../__hooks__/useDebouncedPush"));
@@ -164,6 +165,8 @@ const AppointmentForm = () => {
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const [errors, setErrors] = (0, _react.useState)({});
   const [isTermsAccepted, setIsTermsAccepted] = (0, _react.useState)(false);
+  const hasTrackedValidSubmitRef = (0, _react.useRef)(false);
+  const prospectIdRef = (0, _react.useRef)(null);
   const trackInput = (0, _useDebouncedPush.default)();
   const APPOINTMENT_REQUEST_ERROR_FALLBACK = 'Er is een fout opgetreden bij het maken van de afspraak, probeer het opnieuw.';
   const {
@@ -194,7 +197,10 @@ const AppointmentForm = () => {
         strict: false,
         abortEarly: false
       });
+      const prospectId = (0, _prospectTracking.createProspectId)();
+      prospectIdRef.current = prospectId;
       const appointmentRequestPayload = (0, _helpers__.removeNullishProps)({
+        prospectId,
         licensePlate: licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.replace(/-/g, ''),
         model,
         constructionYear: buildYear !== null && buildYear !== void 0 ? buildYear : undefined,
@@ -233,17 +239,6 @@ const AppointmentForm = () => {
         })
       });
       await createAppointmentRequest(appointmentRequestPayload);
-      (0, _Datalayer.pushToDataLayer)({
-        event: 'form',
-        component: 'afspraak',
-        element: 'button',
-        action: 'submit',
-        action_value: 'valid'
-      });
-      (0, _Datalayer.pushToDataLayer)({
-        event: 'form_submit',
-        form_name: 'config_afspraak'
-      });
     } catch (ex) {
       (0, _Datalayer.pushToDataLayer)({
         event: 'form',
@@ -262,6 +257,13 @@ const AppointmentForm = () => {
     }
   };
   if (isCreateAppointmentRequestSuccess) {
+    if (!hasTrackedValidSubmitRef.current) {
+      hasTrackedValidSubmitRef.current = true;
+      (0, _prospectTracking.pushProspectCreated)({
+        formName: 'afspraak',
+        prospectId: prospectIdRef.current
+      });
+    }
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
       to: {
         pathname: "/configurator/gegevens/bedankt",

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

@@ -37,6 +37,7 @@ var _Datalayer = require("../__services__/Datalayer");
 var _product = require("../__helpers__/product");
 var _ui = require("../__helpers__/ui");
 var _useIsTowmotive = require("../__hooks__/useIsTowmotive");
+var _prospectTracking = require("../__helpers__/prospectTracking");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -125,6 +126,7 @@ const ExitIntentModal = () => {
   const [errors, setErrors] = (0, _react.useState)(null);
   const hasTrackedOpenRef = (0, _react.useRef)(false);
   const hasTrackedValidSubmitRef = (0, _react.useRef)(false);
+  const prospectIdRef = (0, _react.useRef)(null);
   const inputDebounceRefs = (0, _react.useRef)({
     email: null,
     phoneNumber: null
@@ -143,7 +145,6 @@ const ExitIntentModal = () => {
     discountCode,
     executionAnswer1,
     executionAnswer2,
-    priceCalculationDate,
     selectedDiscountedProducts = [],
     selectedExtras,
     vehicleCodingDiscountPercentage,
@@ -154,6 +155,27 @@ const ExitIntentModal = () => {
   (0, _react.useEffect)(() => {
     (0, _ui.scrollToFirstErrorMessage)();
   }, [errors]);
+  (0, _react.useEffect)(() => {
+    if (!isCreateQuotationSuccess || hasTrackedValidSubmitRef.current) {
+      return;
+    }
+    hasTrackedValidSubmitRef.current = true;
+    (0, _Datalayer.pushToDataLayer)({
+      event: 'form',
+      component: 'exit_intent',
+      element: 'button',
+      action: 'submit',
+      action_value: 'valid'
+    });
+    (0, _prospectTracking.pushProspectCreated)({
+      formName: 'offerte',
+      prospectId: prospectIdRef.current
+    });
+    (0, _Datalayer.pushToDataLayer)({
+      event: 'form_submit',
+      form_name: 'config_exitintent'
+    });
+  }, [isCreateQuotationSuccess]);
   const handleMouseLeave = event => {
     if (document.cookie.includes('exitIntentModalShown=true')) {
       return;
@@ -210,7 +232,10 @@ const ExitIntentModal = () => {
         strict: false,
         abortEarly: false
       });
+      const prospectId = (0, _prospectTracking.createProspectId)();
+      prospectIdRef.current = prospectId;
       await createQuotation((0, _helpers__.removeNullishProps)({
+        prospectId,
         isExitIntent: true,
         licensePlate,
         model,
@@ -242,20 +267,6 @@ const ExitIntentModal = () => {
           vehicleCodingDiscountPercentage
         })
       }));
-      (0, _Datalayer.pushToDataLayer)({
-        event: 'form',
-        component: 'exit_intent',
-        element: 'button',
-        action: 'submit',
-        action_value: 'valid'
-      });
-      if (!hasTrackedValidSubmitRef.current) {
-        hasTrackedValidSubmitRef.current = true;
-        (0, _Datalayer.pushToDataLayer)({
-          event: 'form_submit',
-          form_name: 'config_exitintent'
-        });
-      }
     } catch (ex) {
       (0, _Datalayer.pushToDataLayer)({
         event: 'form',

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

@@ -32,6 +32,7 @@ var _constants__ = require("../__constants__");
 var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
+var _prospectTracking = require("../__helpers__/prospectTracking");
 var _Datalayer = require("../__services__/Datalayer");
 var _useDebouncedPush = _interopRequireDefault(require("../__hooks__/useDebouncedPush"));
 var _product = require("../__helpers__/product");
@@ -155,6 +156,8 @@ const QuotationForm = () => {
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const [errors, setErrors] = (0, _react.useState)({});
   const [isTermsAccepted, setIsTermsAccepted] = (0, _react.useState)(false);
+  const hasTrackedValidSubmitRef = (0, _react.useRef)(false);
+  const prospectIdRef = (0, _react.useRef)(null);
   const trackInput = (0, _useDebouncedPush.default)();
   const {
     createQuotation,
@@ -184,18 +187,10 @@ const QuotationForm = () => {
         strict: false,
         abortEarly: false
       });
-      (0, _Datalayer.pushToDataLayer)({
-        event: 'form',
-        component: 'offerte',
-        element: 'button',
-        action: 'submit',
-        action_value: 'valid'
-      });
-      (0, _Datalayer.pushToDataLayer)({
-        event: 'form_submit',
-        form_name: 'config_offerte'
-      });
+      const prospectId = (0, _prospectTracking.createProspectId)();
+      prospectIdRef.current = prospectId;
       await createQuotation((0, _helpers__.removeNullishProps)({
+        prospectId,
         isExitIntent: false,
         licensePlate,
         model,
@@ -245,6 +240,13 @@ const QuotationForm = () => {
     }
   };
   if (isCreateQuotationSuccess) {
+    if (!hasTrackedValidSubmitRef.current) {
+      hasTrackedValidSubmitRef.current = true;
+      (0, _prospectTracking.pushProspectCreated)({
+        formName: 'offerte',
+        prospectId: prospectIdRef.current
+      });
+    }
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
       to: {
         pathname: "/configurator/offerte/bedankt",

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

@@ -133,7 +133,9 @@ const InternalSingleOrderProductOverview = _ref => {
     var _article$consumerPric, _article$consumerPric2, _article$consumerPric3, _cart$find$quantity, _cart$find;
     const {
       priceExclVat,
-      priceInclVat
+      priceInclVat,
+      locationPriceExclVat,
+      consumerPriceExclVat
     } = (0, _product.resolveSingleOrderArticlePrices)(article);
     // Hide stock for webshops (online orders)
     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;
@@ -174,6 +176,8 @@ const InternalSingleOrderProductOverview = _ref => {
       productTitle: article.name,
       productPrice: priceExclVat.toFixed(2),
       productPriceInclVat: priceInclVat.toFixed(2),
+      locationPriceExclVat: locationPriceExclVat,
+      consumerPriceExclVat: consumerPriceExclVat,
       productBrandNumber: article.brand,
       productSubgroup: article === null || article === void 0 ? void 0 : article.subgroup,
       isWebshop: !!orderSession.webshop

package/dist/src/shared/__helpers__/__tests__/product.test.js

@@ -18,7 +18,9 @@ describe('product helpers', () => {
       }
     })).toEqual({
       priceExclVat: 129.95,
-      priceInclVat: 157.24
+      priceInclVat: 157.24,
+      locationPriceExclVat: null,
+      consumerPriceExclVat: 129.95
     });
     expect((0, _product.resolveSingleOrderArticlePrices)({
       locationPrices: {
@@ -31,7 +33,9 @@ describe('product helpers', () => {
       }
     })).toEqual({
       priceExclVat: 129.95,
-      priceInclVat: 157.24
+      priceInclVat: 157.24,
+      locationPriceExclVat: null,
+      consumerPriceExclVat: 129.95
     });
     expect((0, _product.resolveSingleOrderArticlePrices)({
       locationPrices: {
@@ -44,14 +48,36 @@ describe('product helpers', () => {
       }
     })).toEqual({
       priceExclVat: 50,
-      priceInclVat: 60.5
+      priceInclVat: 60.5,
+      locationPriceExclVat: 50,
+      consumerPriceExclVat: 129.95
     });
   });
-  it('falls back to article.price (incl VAT) when location and consumer prices are empty', () => {
-    const result = (0, _product.resolveSingleOrderArticlePrices)({
+  it('returns zero totals and null per-audience prices when no prices are present', () => {
+    expect((0, _product.resolveSingleOrderArticlePrices)({
       price: 189
+    })).toEqual({
+      priceExclVat: 0,
+      priceInclVat: 0,
+      locationPriceExclVat: null,
+      consumerPriceExclVat: null
+    });
+  });
+  it('treats non-numeric price values as absent', () => {
+    expect((0, _product.resolveSingleOrderArticlePrices)({
+      locationPrices: {
+        priceExclVat: 'n/a',
+        priceInclVat: 'n/a'
+      },
+      consumerPrices: {
+        priceExclVat: '129.95',
+        priceInclVat: '157.24'
+      }
+    })).toEqual({
+      priceExclVat: 129.95,
+      priceInclVat: 157.24,
+      locationPriceExclVat: null,
+      consumerPriceExclVat: 129.95
     });
-    expect(result.priceInclVat).toBe(189);
-    expect(result.priceExclVat).toBeCloseTo(156.2, 2);
   });
 });

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

@@ -108,34 +108,37 @@ const shouldRequestUnfilteredProductsForCart = exports.shouldRequestUnfilteredPr
   let cart = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return Array.isArray(cart) && cart.some(lineItem => (lineItem === null || lineItem === void 0 ? void 0 : lineItem.articleNumber) != null);
 };
-const firstFiniteNumber = function firstFiniteNumber() {
-  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
-    values[_key] = arguments[_key];
+const toFiniteNumber = value => {
+  if (value === null || value === undefined || value === '') {
+    return null;
   }
-  for (const value of values) {
-    if (value === null || value === undefined || value === '') {
-      continue;
-    }
-    const numberValue = Number(value);
-    if (Number.isFinite(numberValue)) {
-      return numberValue;
-    }
-  }
-  return 0;
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : null;
 };
+
+/**
+ * @description Resolves single-order article prices.
+ * Returns both the merged price (location, falling back to consumer, used
+ * for cart/quantity totals) and the raw per-audience exclVat prices (used
+ * to display them separately in the UI).
+ */
 const resolveSingleOrderArticlePrices = exports.resolveSingleOrderArticlePrices = function resolveSingleOrderArticlePrices() {
-  var _article$locationPric, _article$consumerPric, _article$locationPric2, _article$consumerPric2;
+  var _article$locationPric, _article$consumerPric, _ref3, _ref4, _toFiniteNumber, _article$locationPric2, _article$consumerPric2;
   let article = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const locationPriceExclVat = toFiniteNumber(article === null || article === void 0 || (_article$locationPric = article.locationPrices) === null || _article$locationPric === void 0 ? void 0 : _article$locationPric.priceExclVat);
+  const consumerPriceExclVat = toFiniteNumber(article === null || article === void 0 || (_article$consumerPric = article.consumerPrices) === null || _article$consumerPric === void 0 ? void 0 : _article$consumerPric.priceExclVat);
   return {
-    priceExclVat: firstFiniteNumber(article === null || article === void 0 || (_article$locationPric = article.locationPrices) === null || _article$locationPric === void 0 ? void 0 : _article$locationPric.priceExclVat, article === null || article === void 0 || (_article$consumerPric = article.consumerPrices) === null || _article$consumerPric === void 0 ? void 0 : _article$consumerPric.priceExclVat),
-    priceInclVat: firstFiniteNumber(article === null || article === void 0 || (_article$locationPric2 = article.locationPrices) === null || _article$locationPric2 === void 0 ? void 0 : _article$locationPric2.priceInclVat, article === null || article === void 0 || (_article$consumerPric2 = article.consumerPrices) === null || _article$consumerPric2 === void 0 ? void 0 : _article$consumerPric2.priceInclVat)
+    priceExclVat: (_ref3 = locationPriceExclVat !== null && locationPriceExclVat !== void 0 ? locationPriceExclVat : consumerPriceExclVat) !== null && _ref3 !== void 0 ? _ref3 : 0,
+    priceInclVat: (_ref4 = (_toFiniteNumber = toFiniteNumber(article === null || article === void 0 || (_article$locationPric2 = article.locationPrices) === null || _article$locationPric2 === void 0 ? void 0 : _article$locationPric2.priceInclVat)) !== null && _toFiniteNumber !== void 0 ? _toFiniteNumber : toFiniteNumber(article === null || article === void 0 || (_article$consumerPric2 = article.consumerPrices) === null || _article$consumerPric2 === void 0 ? void 0 : _article$consumerPric2.priceInclVat)) !== null && _ref4 !== void 0 ? _ref4 : 0,
+    locationPriceExclVat,
+    consumerPriceExclVat
   };
 };
 
 /**
  * @description Builds the cart input including optional TowMotive vehicle coding discount
  */
-const buildCartInput = _ref3 => {
+const buildCartInput = _ref5 => {
   let {
     selectedCableset,
     selectedCombiset,
@@ -147,7 +150,7 @@ const buildCartInput = _ref3 => {
     vehicleCodingDiscountPercentage = null,
     consumerDiscounts = {},
     touchedConsumerDiscounts = {}
-  } = _ref3;
+  } = _ref5;
   // Only send consumerDiscountPercentage when the user has explicitly set a value.
   // null = user cleared the field → omit entirely so backend applies its defaults.
   // 0 = user typed 0 → send it explicitly.
@@ -173,8 +176,8 @@ const buildCartInput = _ref3 => {
     quantity: 1
   }, isTowmotiveFormula && vehicleCodingDiscountPercentage !== null && vehicleCodingDiscountPercentage !== undefined ? {
     consumerDiscountPercentage: vehicleCodingDiscountPercentage
-  } : discountField(selectedBoardComputer))] : []), ...Object.entries(selectedExtras).map(_ref4 => {
-    let [extraArticleNumber, extraQuantity] = _ref4;
+  } : discountField(selectedBoardComputer))] : []), ...Object.entries(selectedExtras).map(_ref6 => {
+    let [extraArticleNumber, extraQuantity] = _ref6;
     return _objectSpread({
       articleNumber: extraArticleNumber,
       quantity: extraQuantity
@@ -186,12 +189,12 @@ const buildCartInput = _ref3 => {
  * @description Checks if a product is recommended, by checking if it both a towbar and is detachable
  */
 exports.buildCartInput = buildCartInput;
-const checkIfTowbarIsRecommended = _ref5 => {
+const checkIfTowbarIsRecommended = _ref7 => {
   var _product$subgroupName;
   let {
     product,
     category
-  } = _ref5;
+  } = _ref7;
   return category === _constants__.PRODUCT_CATEGORIES.TOWBAR && ((product === null || product === void 0 ? void 0 : product.subgroupName.toLowerCase().includes('afneembaar')) || (product === null || product === void 0 || (_product$subgroupName = product.subgroupName) === null || _product$subgroupName === void 0 ? void 0 : _product$subgroupName.toLowerCase().includes('afneembare')));
 };
 

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

@@ -0,0 +1,39 @@
+"use strict";
+
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pushProspectCreated = exports.createProspectId = void 0;
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
+var _Datalayer = require("../__services__/Datalayer");
+const createProspectId = () => {
+  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
+    return crypto.randomUUID();
+  }
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, char => {
+    const random = Math.random() * 16 | 0;
+    const value = char === 'x' ? random : random & 0x3 | 0x8;
+    return value.toString(16);
+  });
+};
+exports.createProspectId = createProspectId;
+const pushProspectCreated = _ref => {
+  let {
+    formName,
+    prospectId
+  } = _ref;
+  if (!formName || !prospectId) {
+    return;
+  }
+  (0, _Datalayer.pushToDataLayer)({
+    event: 'prospect_created',
+    form_name: formName,
+    prospect_id: prospectId
+  });
+};
+exports.pushProspectCreated = pushProspectCreated;

package/package.json

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