thm-p3-configurator 0.0.405 → 0.0.406

package/dist/src/shared/__api__/__tests__/queryKeyFactory.test.js

@@ -90,7 +90,7 @@ describe('queryKeyFactory', () => {
   });
   it('includes formula in brands and build-years keys', () => {
     expect((0, _queryKeyFactory.getBrandsQueryKey)('TMG')).toEqual(['brands', 'TMG']);
-    expect((0, _queryKeyFactory.getBrandsQueryKey)('THCB')).toEqual(['brands', 'THCB']);
+    expect((0, _queryKeyFactory.getBrandsQueryKey)('TBE')).toEqual(['brands', 'TBE']);
     expect((0, _queryKeyFactory.getBuildYearsQueryKey)({
       brand: 'Volvo',
       formula: 'TMG'

package/dist/src/shared/__components__/Form/DatePickerInput.js

@@ -54,7 +54,9 @@ const DatePickerInput = _ref => {
     label,
     errorMessage,
     minDate = new Date(),
-    maxDate
+    maxDate,
+    filterDate,
+    includeDates
   } = _ref;
   const [value, setValue] = (0, _react.useState)(null);
   const [isTouched, setIsTouched] = (0, _react.useState)(false);
@@ -112,6 +114,8 @@ const DatePickerInput = _ref => {
     },
     minDate: minDate,
     maxDate: maxDate,
+    filterDate: filterDate,
+    includeDates: includeDates,
     locale: "nl",
     onFocus: handleFocus,
     onChange: date => handleChange(date),

package/dist/src/shared/__components__/Form/TimePickerInput.js

@@ -1,19 +1,27 @@
 "use strict";
 
 require("core-js/modules/es.weak-map.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/web.dom-collections.iterator.js");
 require("core-js/modules/es.weak-map.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");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
 var _nl = _interopRequireDefault(require("date-fns/locale/nl"));
+var _dateFns = require("date-fns");
 var _setHours = _interopRequireDefault(require("date-fns/setHours"));
 var _setMinutes = _interopRequireDefault(require("date-fns/setMinutes"));
 var _moment = _interopRequireDefault(require("moment"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDatepicker = _interopRequireWildcard(require("react-datepicker"));
+var _openingHours = require("../../__helpers__/openingHours");
 var _helpers__ = require("../../__helpers__");
 var _ErrorMessage = _interopRequireDefault(require("./ErrorMessage"));
 function _getRequireWildcardCache(e) {
@@ -46,30 +54,127 @@ function _interopRequireDefault(e) {
     default: e
   };
 }
+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);
+}
 (0, _reactDatepicker.registerLocale)('nl', _nl.default);
+const getTimeInMinutes = date => {
+  if (!date) {
+    return null;
+  }
+  const value = new Date(date);
+  return value.getHours() * 60 + value.getMinutes();
+};
 const TimePickerInput = _ref => {
+  var _openToDate$getTime, _openToDate$getTime2, _resolvedOpenToDate$g, _resolvedOpenToDate$g2, _minTime$getTime, _minTime$getTime2, _maxTime$getTime, _maxTime$getTime2;
   let {
     initialValue,
+    value: controlledValue,
     onChange,
     name,
     isRequired,
     label,
     isStrict = false,
+    isDisabled = false,
+    minTime: minTimeProp = null,
+    maxTime: maxTimeProp = null,
+    openToDate = null,
     errorMessage
   } = _ref;
-  const [value, setValue] = (0, _react.useState)(null);
+  const isControlled = controlledValue !== undefined;
+  const [internalValue, setInternalValue] = (0, _react.useState)(null);
   const [isTouched, setIsTouched] = (0, _react.useState)(false);
+  const strictMinTime = isStrict ? (0, _setHours.default)((0, _setMinutes.default)(new Date(), 0), 6) : null;
+  const strictMaxTime = isStrict ? (0, _setHours.default)((0, _setMinutes.default)(new Date(), 0), 20) : null;
+  const minTime = minTimeProp !== null && minTimeProp !== void 0 ? minTimeProp : strictMinTime;
+  const maxTime = maxTimeProp !== null && maxTimeProp !== void 0 ? maxTimeProp : strictMaxTime;
+  const resolvedOpenToDate = (0, _react.useMemo)(() => openToDate ? new Date(openToDate) : null, [(_openToDate$getTime = openToDate === null || openToDate === void 0 || (_openToDate$getTime2 = openToDate.getTime) === null || _openToDate$getTime2 === void 0 ? void 0 : _openToDate$getTime2.call(openToDate)) !== null && _openToDate$getTime !== void 0 ? _openToDate$getTime : openToDate]);
+  const pickerMinDate = (0, _react.useMemo)(() => resolvedOpenToDate ? (0, _dateFns.startOfDay)(resolvedOpenToDate) : (0, _dateFns.startOfDay)(new Date()), [(_resolvedOpenToDate$g = resolvedOpenToDate === null || resolvedOpenToDate === void 0 || (_resolvedOpenToDate$g2 = resolvedOpenToDate.getTime) === null || _resolvedOpenToDate$g2 === void 0 ? void 0 : _resolvedOpenToDate$g2.call(resolvedOpenToDate)) !== null && _resolvedOpenToDate$g !== void 0 ? _resolvedOpenToDate$g : resolvedOpenToDate]);
+  const selectedValue = isControlled ? controlledValue !== null && controlledValue !== void 0 ? controlledValue : null : internalValue;
+  const initialTimestamp = initialValue instanceof Date ? initialValue.getTime() : initialValue ? new Date(initialValue).getTime() : null;
   (0, _react.useEffect)(() => {
-    if ((0, _moment.default)().isValid(initialValue)) {
-      setValue(initialValue);
+    if (isControlled) {
+      return;
+    }
+    if (initialTimestamp && (0, _moment.default)(initialTimestamp).isValid()) {
+      setInternalValue(new Date(initialTimestamp));
+      return;
     }
-  }, [initialValue]);
+    setInternalValue(null);
+  }, [isControlled, initialTimestamp]);
+  const filterTime = (0, _react.useCallback)(time => {
+    if (!minTime && !maxTime) {
+      return true;
+    }
+    const selectedMinutes = getTimeInMinutes(time);
+    if (selectedMinutes == null) {
+      return false;
+    }
+    const minMinutes = getTimeInMinutes(minTime);
+    if (minMinutes != null && selectedMinutes < minMinutes) {
+      return false;
+    }
+    const maxMinutes = getTimeInMinutes(maxTime);
+    if (maxMinutes != null && selectedMinutes > maxMinutes) {
+      return false;
+    }
+    return true;
+  }, [(_minTime$getTime = minTime === null || minTime === void 0 || (_minTime$getTime2 = minTime.getTime) === null || _minTime$getTime2 === void 0 ? void 0 : _minTime$getTime2.call(minTime)) !== null && _minTime$getTime !== void 0 ? _minTime$getTime : minTime, (_maxTime$getTime = maxTime === null || maxTime === void 0 || (_maxTime$getTime2 = maxTime.getTime) === null || _maxTime$getTime2 === void 0 ? void 0 : _maxTime$getTime2.call(maxTime)) !== null && _maxTime$getTime !== void 0 ? _maxTime$getTime : maxTime]);
   const handleFocus = () => {
+    if (isDisabled) {
+      return;
+    }
     setIsTouched(true);
   };
   const handleChange = date => {
-    setValue(date);
-    onChange(date);
+    if (isDisabled) {
+      return;
+    }
+    const nextValue = date && resolvedOpenToDate ? (0, _openingHours.copyTimeToDate)(date, resolvedOpenToDate) : date;
+    if (!isControlled) {
+      setInternalValue(nextValue);
+    }
+    onChange(nextValue);
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('form-group')
@@ -80,10 +185,14 @@ const TimePickerInput = _ref => {
     className: isTouched && errorMessage ? (0, _helpers__.withStyle)('is-invalid') : ''
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('form-group__icon-field'),
-    style: {
+    style: _objectSpread({
       position: 'relative',
       width: '100%'
-    }
+    }, isDisabled ? {
+      pointerEvents: 'none',
+      opacity: 0.65,
+      cursor: 'not-allowed'
+    } : {})
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "fal fa-clock",
     "aria-hidden": "true",
@@ -107,13 +216,14 @@ const TimePickerInput = _ref => {
     timeCaption: name,
     id: name,
     name: name,
-    selected: value,
+    disabled: isDisabled,
+    selected: selectedValue,
     onKeyDown: e => {
       e.preventDefault();
     },
-    minDate: new Date(),
-    minTime: isStrict ? (0, _setHours.default)((0, _setMinutes.default)(new Date(), 0), 6) : null,
-    maxTime: isStrict ? (0, _setHours.default)((0, _setMinutes.default)(new Date(), 0), 20) : null,
+    minDate: pickerMinDate,
+    openToDate: resolvedOpenToDate !== null && resolvedOpenToDate !== void 0 ? resolvedOpenToDate : undefined,
+    filterTime: minTime || maxTime ? filterTime : undefined,
     locale: "nl",
     onFocus: handleFocus,
     wrapperClassName: (0, _helpers__.withStyle)('react-datepicker-wrapper'),

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

@@ -32,7 +32,9 @@ var _queries = require("../../__api__/queries");
 var _constants__ = require("../../__constants__");
 var _AuthSessionContext = require("../../__context__/AuthSessionContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
+var _openingHours = require("../../__helpers__/openingHours");
 var _helpers__ = require("../../__helpers__");
+var _countryOptions = require("../../__helpers__/countryOptions");
 var _useIsTmg = require("../../__hooks__/useIsTmg");
 var _AddressLookupService = _interopRequireDefault(require("../../__services__/AddressLookupService"));
 var _LinkButton = _interopRequireDefault(require("../Buttons/LinkButton"));
@@ -160,7 +162,7 @@ const customerDetailsFormSchema = (0, _yup.object)({
   })
 });
 const InternalCustomerDetailsForm = (_ref, ref) => {
-  var _customer$vatNumber, _customer$kvkNumber, _branchTypes$byId$aut, _authSession$branch, _authSession$branch2;
+  var _appointment$time$get, _appointment$time, _appointment$time$get2, _appointment$date$get, _appointment$date, _appointment$date$get2, _customer$vatNumber, _customer$kvkNumber, _branchTypes$byId$aut, _authSession$branch, _authSession$branch2, _ref5, _appointment$date$get3, _appointment$date2, _appointment$date2$ge;
   let {
     errors = {},
     onValidationError,
@@ -187,14 +189,13 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     countries,
     isLoadingCountries
   } = (0, _queries.useCountriesQuery)();
-  const countryOptions = (0, _react.useMemo)(() => {
-    var _countries$results;
-    if (!(countries !== null && countries !== void 0 && (_countries$results = countries.results) !== null && _countries$results !== void 0 && _countries$results.length)) return [];
-    return countries.results.map(country => ({
-      label: country.title,
-      value: country.entityId
-    }));
-  }, [countries]);
+  const countryOptions = (0, _react.useMemo)(() => (0, _countryOptions.buildCountryDropdownOptions)(countries === null || countries === void 0 ? void 0 : countries.results), [countries]);
+  const appointmentTimeValue = (0, _react.useMemo)(() => {
+    if (!(appointment !== null && appointment !== void 0 && appointment.time) || !(appointment !== null && appointment !== void 0 && appointment.date)) {
+      return null;
+    }
+    return (0, _openingHours.copyTimeToDate)(new Date(appointment.time), new Date(appointment.date));
+  }, [(_appointment$time$get = appointment === null || appointment === void 0 || (_appointment$time = appointment.time) === null || _appointment$time === void 0 || (_appointment$time$get2 = _appointment$time.getTime) === null || _appointment$time$get2 === void 0 ? void 0 : _appointment$time$get2.call(_appointment$time)) !== null && _appointment$time$get !== void 0 ? _appointment$time$get : appointment === null || appointment === void 0 ? void 0 : appointment.time, (_appointment$date$get = appointment === null || appointment === void 0 || (_appointment$date = appointment.date) === null || _appointment$date === void 0 || (_appointment$date$get2 = _appointment$date.getTime) === null || _appointment$date$get2 === void 0 ? void 0 : _appointment$date$get2.call(_appointment$date)) !== null && _appointment$date$get !== void 0 ? _appointment$date$get : appointment === null || appointment === void 0 ? void 0 : appointment.date]);
   const authSession = (0, _AuthSessionContext.useAuthSession)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const [companySearchTerm, setCompanySearchTerm] = (0, _react.useState)('');
@@ -263,10 +264,15 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   const needsCustomerDeliveryIdentity = isDirectDeliveryEnabled;
   const isNetherlandsSelected = (0, _react.useMemo)(() => {
     if (!(selectedCountry !== null && selectedCountry !== void 0 && selectedCountry.label)) return false;
-    return selectedCountry.label.toUpperCase() === 'NEDERLAND';
+    return selectedCountry.label.toUpperCase() === _constants__.COUNTRY_NAMES.NETHERLANDS;
   }, [selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.label]);
-  const shouldRequireKvkNumber = needsCustomerDeliveryIdentity && isBusinessOwnership && (isNetherlandsSelected || !(customer !== null && customer !== void 0 && (_customer$vatNumber = customer.vatNumber) !== null && _customer$vatNumber !== void 0 && _customer$vatNumber.trim()));
-  const shouldRequireVatNumber = needsCustomerDeliveryIdentity && isBusinessOwnership && !isNetherlandsSelected && !(customer !== null && customer !== void 0 && (_customer$kvkNumber = customer.kvkNumber) !== null && _customer$kvkNumber !== void 0 && _customer$kvkNumber.trim());
+  const isBelgiumSelected = (0, _react.useMemo)(() => {
+    if (!(selectedCountry !== null && selectedCountry !== void 0 && selectedCountry.label)) return false;
+    const normalizedCountryLabel = selectedCountry.label.trim().toUpperCase();
+    return normalizedCountryLabel === _constants__.COUNTRY_NAMES.BELGIUM || normalizedCountryLabel === _constants__.COUNTRY_NAMES.BELGIUM_FALLBACK;
+  }, [selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.label]);
+  const shouldRequireKvkNumber = needsCustomerDeliveryIdentity && isBusinessOwnership && (isNetherlandsSelected || !isNetherlandsSelected && !isBelgiumSelected && !(customer !== null && customer !== void 0 && (_customer$vatNumber = customer.vatNumber) !== null && _customer$vatNumber !== void 0 && _customer$vatNumber.trim()));
+  const shouldRequireVatNumber = needsCustomerDeliveryIdentity && isBusinessOwnership && (isBelgiumSelected || !isNetherlandsSelected && !isBelgiumSelected && !(customer !== null && customer !== void 0 && (_customer$kvkNumber = customer.kvkNumber) !== null && _customer$kvkNumber !== void 0 && _customer$kvkNumber.trim()));
 
   // Helper to update customer data for the active ownership type
   const updateCustomerField = (0, _react.useCallback)((field, value) => {
@@ -341,13 +347,15 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     enabled: isBusinessOwnership
   });
   (0, _react.useEffect)(() => {
-    if (!(customer !== null && customer !== void 0 && customer.countryId) && countryOptions !== null && countryOptions !== void 0 && countryOptions.length) {
-      const defaultCountry = countryOptions.find(option => option.label === 'NEDERLAND');
-      if (defaultCountry) {
-        updateCustomerField('countryId', defaultCountry.value);
-      }
+    if (customer !== null && customer !== void 0 && customer.countryId || !(countryOptions !== null && countryOptions !== void 0 && countryOptions.length)) {
+      return;
     }
-  }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, updateCustomerField]);
+    const inferredCountry = (0, _helpers__.getCountryOptionForPostalCode)(customer === null || customer === void 0 ? void 0 : customer.zipCode, countryOptions);
+    const defaultCountry = inferredCountry || countryOptions.find(option => option.label === 'NEDERLAND');
+    if (defaultCountry) {
+      updateCustomerField('countryId', defaultCountry.value);
+    }
+  }, [customer === null || customer === void 0 ? void 0 : customer.countryId, customer === null || customer === void 0 ? void 0 : customer.zipCode, countryOptions, updateCustomerField]);
   (0, _react.useEffect)(() => {
     if (checkboxAvailability.shouldForceDirectDelivery && !Boolean(anderAfleveradres)) {
       dispatch({
@@ -505,6 +513,18 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
 
     setAddressLookupTimeoutId(newTimeoutId);
   };
+  const handlePostalCodeChange = value => {
+    updateCustomerField('zipCode', value);
+    const inferredCountry = (0, _helpers__.getCountryOptionForPostalCode)(value, countryOptions);
+    if (inferredCountry && inferredCountry.value !== (customer === null || customer === void 0 ? void 0 : customer.countryId)) {
+      updateCustomerField('countryId', inferredCountry.value);
+    }
+
+    // Trigger address lookup if house number is also available
+    if (customer.houseNumber) {
+      handleAddressLookup(value, customer.houseNumber);
+    }
+  };
 
   // Cleanup timeout on unmount
   (0, _react.useEffect)(() => {
@@ -526,7 +546,13 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
           });
           return false;
         }
-        if (!isNetherlandsSelected && !hasKvkNumber && !hasVatNumber) {
+        if (isBelgiumSelected && !hasVatNumber) {
+          onValidationError === null || onValidationError === void 0 || onValidationError({
+            vatNumber: 'BTW-nummer is verplicht voor zakelijke dossiers in België'
+          });
+          return false;
+        }
+        if (!isNetherlandsSelected && !isBelgiumSelected && !hasKvkNumber && !hasVatNumber) {
           onValidationError === null || onValidationError === void 0 || onValidationError({
             kvkNumber: 'Vul een KVK- of BTW-nummer in',
             vatNumber: 'Vul een KVK- of BTW-nummer in'
@@ -843,13 +869,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     placeholder: "",
     value: customer.zipCode,
     name: "zipCode",
-    onChange: value => {
-      updateCustomerField('zipCode', value);
-      // Trigger address lookup if house number is also available
-      if (customer.houseNumber) {
-        handleAddressLookup(value, customer.houseNumber);
-      }
-    },
+    onChange: handlePostalCodeChange,
     isRequired: isDirectDeliveryEnabled,
     key: "zipCode-".concat(refreshKey),
     form: form,
@@ -902,6 +922,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['city']
   }), /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
+    key: "country-".concat((customer === null || customer === void 0 ? void 0 : customer.countryId) || 'default'),
     options: countryOptions,
     name: "country",
     label: "Land:",
@@ -958,25 +979,35 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   }, "Gegevens voor de afspraak", /*#__PURE__*/_react.default.createElement("br", null)), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 col-md-6')
   }, /*#__PURE__*/_react.default.createElement(_DatePickerInput.default, {
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_APPOINTMENT_DATE,
-      payload: {
-        date: value
-      }
-    }),
+    onChange: value => {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_APPOINTMENT_DATE,
+        payload: {
+          date: value
+        }
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_APPOINTMENT_TIME,
+        payload: {
+          time: null
+        }
+      });
+    },
     name: 'Datum',
     label: "Datum",
     initialValue: appointment !== null && appointment !== void 0 && appointment.date ? new Date(appointment === null || appointment === void 0 ? void 0 : appointment.date) : null,
     isStrict: false,
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['date']
   }), /*#__PURE__*/_react.default.createElement(_TimePickerInput.default, {
-    onChange: value => dispatch({
+    key: "appointment-time-".concat((_ref5 = (_appointment$date$get3 = appointment === null || appointment === void 0 || (_appointment$date2 = appointment.date) === null || _appointment$date2 === void 0 || (_appointment$date2$ge = _appointment$date2.getTime) === null || _appointment$date2$ge === void 0 ? void 0 : _appointment$date2$ge.call(_appointment$date2)) !== null && _appointment$date$get3 !== void 0 ? _appointment$date$get3 : appointment === null || appointment === void 0 ? void 0 : appointment.date) !== null && _ref5 !== void 0 ? _ref5 : 'none'),
+    value: appointmentTimeValue,
+    onChange: time => dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_APPOINTMENT_TIME,
       payload: {
-        time: value
+        time
       }
     }),
-    initialValue: appointment !== null && appointment !== void 0 && appointment.time ? new Date(appointment === null || appointment === void 0 ? void 0 : appointment.time) : null,
+    openToDate: appointment !== null && appointment !== void 0 && appointment.date ? new Date(appointment.date) : null,
     name: 'Tijd',
     label: "Tijd",
     isStrict: false,

package/dist/src/shared/__constants__/__tests__/index.test.js

@@ -2,19 +2,19 @@
 
 var _index = require("../index");
 describe('__constants__/formula helpers', () => {
-  it('keeps THCB exact when normalizing branch formulas', () => {
-    expect((0, _index.mapBranchFormulaToConfiguratorFormula)('THCB')).toBe(_index.CONFIGURATOR_FORMULAS.THCB);
-    expect((0, _index.mapBranchFormulaToConfiguratorFormula)('Trekhaakcentrum Business')).toBe(_index.CONFIGURATOR_FORMULAS.THCB);
+  it('keeps TBE exact when normalizing branch formulas', () => {
+    expect((0, _index.mapBranchFormulaToConfiguratorFormula)('TBE')).toBe(_index.CONFIGURATOR_FORMULAS.TBE);
+    expect((0, _index.mapBranchFormulaToConfiguratorFormula)('Trekhaakcentrum Business')).toBe(_index.CONFIGURATOR_FORMULAS.TBE);
   });
   it('normalizes known formula titles and codes without collapsing unknown codes', () => {
     expect((0, _index.getConfiguratorFormulaCode)('Trekhaakcentrum')).toBe(_index.CONFIGURATOR_FORMULAS.THC);
     expect((0, _index.getConfiguratorFormulaCode)('TowMotive')).toBe(_index.CONFIGURATOR_FORMULAS.TOW);
-    expect((0, _index.getConfiguratorFormulaCode)('thcb')).toBe(_index.CONFIGURATOR_FORMULAS.THCB);
+    expect((0, _index.getConfiguratorFormulaCode)('tbe')).toBe(_index.CONFIGURATOR_FORMULAS.TBE);
     expect((0, _index.getConfiguratorFormulaCode)('abc')).toBe('ABC');
   });
-  it('treats THCB as THC-family for theme decisions only', () => {
+  it('treats TBE as THC-family for theme decisions only', () => {
     expect((0, _index.isThcFamilyFormula)(_index.CONFIGURATOR_FORMULAS.THC)).toBe(true);
-    expect((0, _index.isThcFamilyFormula)(_index.CONFIGURATOR_FORMULAS.THCB)).toBe(true);
-    expect((0, _index.getThemeFormulaForConfiguratorFormula)(_index.CONFIGURATOR_FORMULAS.THCB)).toBe(_index.CONFIGURATOR_FORMULAS.THC);
+    expect((0, _index.isThcFamilyFormula)(_index.CONFIGURATOR_FORMULAS.TBE)).toBe(true);
+    expect((0, _index.getThemeFormulaForConfiguratorFormula)(_index.CONFIGURATOR_FORMULAS.TBE)).toBe(_index.CONFIGURATOR_FORMULAS.THC);
   });
 });

package/dist/src/shared/__constants__/index.js

@@ -6,7 +6,7 @@ require("core-js/modules/es.string.trim.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapBranchFormulaToConfiguratorFormula = exports.isThcFamilyFormula = exports.getThemeFormulaForConfiguratorFormula = exports.getConfiguratorFormulaCode = exports.VESTIGING_TYPE_ID = exports.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE = exports.VEHICLE_OWNERSHIP_TYPE = exports.VEHICLE_CODING_SUBGROUP_NAME = exports.USER_GEOLOCATION_KEY = exports.TOWMOTIVE_ORGANIZATION_TYPE = exports.TMG_ORGANIZATION_TYPE = exports.StockStatus = exports.STATUS_ASSESSMENT = exports.PRODUCT_CATEGORIES = exports.PRIVATE_SINGLE_ORDER_SESSION_KEY = exports.PARTNER_PORTAL_PAGE_TITLES_BY_THEME = exports.PARTNER_PORTAL_CHANNEL_TITLE = exports.ORDER_SESSION_KEY = exports.NO_PRODUCTS_CONTACT_DETAILS_BY_FORMULA = exports.NAVIGATION_STEPS_INTERNAL = exports.NAVIGATION_STEPS_EXTERNAL = exports.NAVIGATION_BUTTONS = exports.MOUSE_EXIT_INTENT_THROTTLE = exports.MOUSE_EXIT_INTENT_OFFSET = exports.LOCATION_TYPE = exports.LOCATION_CHANGE_BUTTON_LABEL = exports.LOCALE = exports.LEASE_TYPE_ID = exports.FORM_ERROR_MESSAGES = exports.EXECUTION_HELP_CONTACT_DETAILS_BY_FORMULA = exports.DOSSIER_TYPES = exports.DISCOUNT_TYPES = exports.DEFAULT_MAP_LONGITUDE = exports.DEFAULT_MAP_LATITUDE = exports.DEFAULT_ARTICLE_BRAND = exports.DAY_NAMES = exports.CONFIGURATOR_FORMULAS = exports.BRANCH_THEME_BY_FORMULA = exports.BRANCH_FORMULAS = exports.BOARD_COMPUTER_DISABLED_KEY = exports.ApiStockStatus = exports.AUTH_SESSION_KEY = exports.ARTICLE_SPECS_TRANSLATIONS = exports.ARTICLES_SYSTEM_FIELDS = exports.API_ERROR_CODES = exports.ALL_EXPERIMENTS = exports.ACTIVE_VARIANTS = void 0;
+exports.mapBranchFormulaToConfiguratorFormula = exports.isThcFamilyFormula = exports.getThemeFormulaForConfiguratorFormula = exports.getConfiguratorFormulaCode = exports.VESTIGING_TYPE_ID = exports.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE = exports.VEHICLE_OWNERSHIP_TYPE = exports.VEHICLE_CODING_SUBGROUP_NAME = exports.USER_GEOLOCATION_KEY = exports.TOWMOTIVE_ORGANIZATION_TYPE = exports.TMG_ORGANIZATION_TYPE = exports.StockStatus = exports.STATUS_ASSESSMENT = exports.PRODUCT_CATEGORIES = exports.PRIVATE_SINGLE_ORDER_SESSION_KEY = exports.PARTNER_PORTAL_PAGE_TITLES_BY_THEME = exports.PARTNER_PORTAL_CHANNEL_TITLE = exports.ORDER_SESSION_KEY = exports.NO_PRODUCTS_CONTACT_DETAILS_BY_FORMULA = exports.NAVIGATION_STEPS_INTERNAL = exports.NAVIGATION_STEPS_EXTERNAL = exports.NAVIGATION_BUTTONS = exports.MOUSE_EXIT_INTENT_THROTTLE = exports.MOUSE_EXIT_INTENT_OFFSET = exports.LOCATION_TYPE = exports.LOCATION_CHANGE_BUTTON_LABEL = exports.LOCALE = exports.LEASE_TYPE_ID = exports.FORM_ERROR_MESSAGES = exports.EXECUTION_HELP_CONTACT_DETAILS_BY_FORMULA = exports.DOSSIER_TYPES = exports.DISCOUNT_TYPES = exports.DEFAULT_MAP_LONGITUDE = exports.DEFAULT_MAP_LATITUDE = exports.DEFAULT_ARTICLE_BRAND = exports.DAY_NAMES = exports.COUNTRY_NAMES = exports.CONFIGURATOR_FORMULAS = exports.BRANCH_THEME_BY_FORMULA = exports.BRANCH_FORMULAS = exports.BOARD_COMPUTER_DISABLED_KEY = exports.ApiStockStatus = exports.AUTH_SESSION_KEY = exports.ARTICLE_SPECS_TRANSLATIONS = exports.ARTICLES_SYSTEM_FIELDS = exports.API_ERROR_CODES = exports.ALL_EXPERIMENTS = exports.ACTIVE_VARIANTS = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.trim.js");
@@ -27,6 +27,11 @@ const FORM_ERROR_MESSAGES = exports.FORM_ERROR_MESSAGES = {
   licensePlateMin: 'Kenteken moet minimaal 6 characters bevatten',
   licensePlateMax: 'Kenteken mag maximaal 8 characters bevatten'
 };
+const COUNTRY_NAMES = exports.COUNTRY_NAMES = {
+  NETHERLANDS: 'NEDERLAND',
+  BELGIUM: 'BELGIË',
+  BELGIUM_FALLBACK: 'BELGIE'
+};
 const BRANCH_FORMULAS = exports.BRANCH_FORMULAS = {
   Trekhaakcentrum: 'Trekhaakcentrum',
   TowMotiveGroup: 'TowMotive Group',
@@ -228,7 +233,7 @@ const ApiStockStatus = exports.ApiStockStatus = {
 const CONFIGURATOR_FORMULAS = exports.CONFIGURATOR_FORMULAS = {
   THM: 'THM',
   THC: 'THC',
-  THCB: 'THCB',
+  TBE: 'TBE',
   TMG: 'TMG',
   TOW: 'TOW',
   TM: 'TOW',
@@ -267,10 +272,10 @@ const getConfiguratorFormulaCode = formula => {
     case 'thc':
     case 'trekhaakcentrum':
       return CONFIGURATOR_FORMULAS.THC;
-    case 'thcb':
+    case 'tbe':
     case 'trekhaakcentrum belgie':
     case 'trekhaakcentrum business':
-      return CONFIGURATOR_FORMULAS.THCB;
+      return CONFIGURATOR_FORMULAS.TBE;
     case 'thm':
     case 'trekhaakmontage':
       return CONFIGURATOR_FORMULAS.THM;
@@ -281,7 +286,7 @@ const getConfiguratorFormulaCode = formula => {
 exports.getConfiguratorFormulaCode = getConfiguratorFormulaCode;
 const isThcFamilyFormula = formula => {
   const normalizedFormula = getConfiguratorFormulaCode(formula);
-  return normalizedFormula === CONFIGURATOR_FORMULAS.THC || normalizedFormula === CONFIGURATOR_FORMULAS.THCB;
+  return normalizedFormula === CONFIGURATOR_FORMULAS.THC || normalizedFormula === CONFIGURATOR_FORMULAS.TBE;
 };
 exports.isThcFamilyFormula = isThcFamilyFormula;
 const getThemeFormulaForConfiguratorFormula = formula => {
@@ -307,7 +312,7 @@ const NO_PRODUCTS_CONTACT_DETAILS_BY_FORMULA = exports.NO_PRODUCTS_CONTACT_DETAI
     companyName: 'Trekhaakcentrum',
     logoAltText: 'Trekhaakcentrum Logo'
   },
-  [CONFIGURATOR_FORMULAS.THCB]: {
+  [CONFIGURATOR_FORMULAS.TBE]: {
     email: 'order@trekhaakcentrum.nl',
     phoneDisplay: '+31 162 - 490 910',
     phoneHref: 'tel:+31162490910',
@@ -345,7 +350,7 @@ const EXECUTION_HELP_CONTACT_DETAILS_BY_FORMULA = exports.EXECUTION_HELP_CONTACT
     phoneDisplay: '+31 85 202 0660',
     phoneHref: 'tel:+31852020660'
   },
-  [CONFIGURATOR_FORMULAS.THCB]: {
+  [CONFIGURATOR_FORMULAS.TBE]: {
     phoneDisplay: '+31 85 202 0660',
     phoneHref: 'tel:+31852020660'
   }

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

@@ -612,11 +612,13 @@ const ProductCartTable = () => {
       var _p$priceInfo14;
       return t + Number((p === null || p === void 0 || (_p$priceInfo14 = p.priceInfo) === null || _p$priceInfo14 === void 0 ? void 0 : _p$priceInfo14.salesPrice) || 0);
     }, 0) : 0;
+    const apiMontageSubtotalIncl = (totals === null || totals === void 0 ? void 0 : totals.subtotalMontageInclVat) != null ? Number(totals.subtotalMontageInclVat) : null;
+    const mainSubtotalIncl = !isToggled && apiMontageSubtotalIncl !== null && Number.isFinite(apiMontageSubtotalIncl) ? apiMontageSubtotalIncl : mainInclVat + montageInclVat;
     return {
       main: {
         purchase: mainPurchase,
         margin: mainMargin,
-        inclVat: mainInclVat + montageInclVat,
+        inclVat: mainSubtotalIncl,
         exclVat: mainExclVat + montageExclVat + marketCorrectionExclVat,
         tmg: {
           catalog: tmgCatalog,