thm-p3-configurator 0.0.403 → 0.0.404

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__/internal/InternalCustomerDetailsForm.js

@@ -33,6 +33,7 @@ var _constants__ = require("../../__constants__");
 var _AuthSessionContext = require("../../__context__/AuthSessionContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 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"));
@@ -187,14 +188,7 @@ 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 authSession = (0, _AuthSessionContext.useAuthSession)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const [companySearchTerm, setCompanySearchTerm] = (0, _react.useState)('');
@@ -263,10 +257,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 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 || !(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 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) => {
@@ -505,6 +504,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 +537,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 +860,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 +913,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:",

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,

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

@@ -51,6 +51,7 @@ var _AuthSessionContext = require("../../__context__/AuthSessionContext");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
+var _countryOptions = require("../../__helpers__/countryOptions");
 var _product = require("../../__helpers__/product");
 var _ui = require("../../__helpers__/ui");
 var _useIsTmg = require("../../__hooks__/useIsTmg");
@@ -156,6 +157,7 @@ const internalAppointmentFormSchema = (0, _yup.object)({
   houseNumberAddition: (0, _yup.string)().nullable(),
   streetName: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   city: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
+  countryId: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   date: (0, _yup.string)().nullable(),
   time: (0, _yup.string)().nullable(),
   customerAgreed: (0, _yup.boolean)().required(_constants__.FORM_ERROR_MESSAGES.required).isTrue(_constants__.FORM_ERROR_MESSAGES.required),
@@ -217,7 +219,7 @@ const getBranchCity = function getBranchCity() {
   return (branch === null || branch === void 0 ? void 0 : branch.city) || (branch === null || branch === void 0 ? void 0 : branch.gemeente) || '';
 };
 const InternalAppointmentForm = _ref => {
-  var _branchTypes$byId$aut, _authSession$branch, _authSession$branch2, _contextCustomer$note2;
+  var _branchTypes$byId$aut, _authSession$branch, _customer$vatNumber, _customer$kvkNumber, _authSession$branch2, _contextCustomer$note2;
   let {
     onSubmit = payload => {},
     isError = false,
@@ -393,14 +395,7 @@ const InternalAppointmentForm = _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 branchType = branchTypes === null || branchTypes === void 0 || (_branchTypes$byId$aut = branchTypes.byId[authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 || (_authSession$branch = _authSession$branch.organisatietype) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch[0]]) === null || _branchTypes$byId$aut === void 0 ? void 0 : _branchTypes$byId$aut.title;
   const {
     marketingChannels,
@@ -443,23 +438,23 @@ const InternalAppointmentForm = _ref => {
     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) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-          payload: {
-            countryId: defaultCountry.value
-          }
-        });
+        updateCustomerField('countryId', defaultCountry.value);
       }
     }
-  }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, dispatch]);
+  }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, updateCustomerField]);
   const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
   const isLeaseOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij;
   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 = isBusinessOwnership && (isNetherlandsSelected || !isNetherlandsSelected && !(customer !== null && customer !== void 0 && customer.vatNumber));
-  const shouldRequireVatNumber = isBusinessOwnership && !isNetherlandsSelected && !(customer !== null && customer !== void 0 && customer.kvkNumber);
+  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 = isBusinessOwnership && (isNetherlandsSelected || !isNetherlandsSelected && !isBelgiumSelected && !(customer !== null && customer !== void 0 && (_customer$vatNumber = customer.vatNumber) !== null && _customer$vatNumber !== void 0 && _customer$vatNumber.trim()));
+  const shouldRequireVatNumber = isBusinessOwnership && (isBelgiumSelected || !isNetherlandsSelected && !isBelgiumSelected && !(customer !== null && customer !== void 0 && (_customer$kvkNumber = customer.kvkNumber) !== null && _customer$kvkNumber !== void 0 && _customer$kvkNumber.trim()));
   const {
     branchById
   } = (0, _queries.useBranchByIdOrWidgetId)(selectedBranch);
@@ -502,7 +497,7 @@ const InternalAppointmentForm = _ref => {
   const handleSubmit = async function handleSubmit() {
     let appointmentType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _constants__.DOSSIER_TYPES.PlannedAppointment;
     try {
-      var _customer$kvkNumber, _customer$vatNumber, _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$houseNumber2, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _ref3, _contextCustomer$anwb, _contextCustomer$note, _customer$zipCode, _customer$companyName, _customer$kvkNumber2, _customer$vatNumber2, _ref4, _vehicle$leaseNumber, _vehicle$leaseNumberU, _customer$companyName2, _customer$kvkNumber3, _customer$vatNumber3;
+      var _customer$kvkNumber2, _customer$vatNumber2, _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$houseNumber2, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _ref3, _contextCustomer$anwb, _contextCustomer$note, _customer$zipCode, _customer$companyName, _customer$kvkNumber3, _customer$vatNumber3, _ref4, _vehicle$leaseNumber, _vehicle$leaseNumberU, _customer$companyName2, _customer$kvkNumber4, _customer$vatNumber4;
       setErrors({});
       if (!model) {
         // Note: this does not throw on error.
@@ -524,8 +519,8 @@ const InternalAppointmentForm = _ref => {
           return;
         }
       }
-      const hasKvkNumber = !!(customer !== null && customer !== void 0 && (_customer$kvkNumber = customer.kvkNumber) !== null && _customer$kvkNumber !== void 0 && _customer$kvkNumber.trim());
-      const hasVatNumber = !!(customer !== null && customer !== void 0 && (_customer$vatNumber = customer.vatNumber) !== null && _customer$vatNumber !== void 0 && _customer$vatNumber.trim());
+      const hasKvkNumber = !!(customer !== null && customer !== void 0 && (_customer$kvkNumber2 = customer.kvkNumber) !== null && _customer$kvkNumber2 !== void 0 && _customer$kvkNumber2.trim());
+      const hasVatNumber = !!(customer !== null && customer !== void 0 && (_customer$vatNumber2 = customer.vatNumber) !== null && _customer$vatNumber2 !== void 0 && _customer$vatNumber2.trim());
       if (isBusinessOwnership) {
         if (isNetherlandsSelected && !hasKvkNumber) {
           setErrors({
@@ -533,7 +528,13 @@ const InternalAppointmentForm = _ref => {
           });
           return;
         }
-        if (!isNetherlandsSelected && !hasKvkNumber && !hasVatNumber) {
+        if (isBelgiumSelected && !hasVatNumber) {
+          setErrors({
+            vatNumber: 'BTW-nummer is verplicht voor zakelijke dossiers in België'
+          });
+          return;
+        }
+        if (!isNetherlandsSelected && !isBelgiumSelected && !hasKvkNumber && !hasVatNumber) {
           setErrors({
             kvkNumber: 'Vul een KVK- of BTW-nummer in',
             vatNumber: 'Vul een KVK- of BTW-nummer in'
@@ -577,8 +578,8 @@ const InternalAppointmentForm = _ref => {
           note: (_contextCustomer$note = contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.note) !== null && _contextCustomer$note !== void 0 ? _contextCustomer$note : undefined,
           zipCode: (_customer$zipCode = customer === null || customer === void 0 ? void 0 : customer.zipCode) !== null && _customer$zipCode !== void 0 ? _customer$zipCode : undefined,
           companyName: activeOwnershipType !== _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? (_customer$companyName = customer === null || customer === void 0 ? void 0 : customer.companyName) !== null && _customer$companyName !== void 0 ? _customer$companyName : undefined : undefined,
-          kvkNumber: (_customer$kvkNumber2 = customer === null || customer === void 0 ? void 0 : customer.kvkNumber) !== null && _customer$kvkNumber2 !== void 0 ? _customer$kvkNumber2 : undefined,
-          vatNumber: (_customer$vatNumber2 = customer === null || customer === void 0 ? void 0 : customer.vatNumber) !== null && _customer$vatNumber2 !== void 0 ? _customer$vatNumber2 : undefined
+          kvkNumber: (_customer$kvkNumber3 = customer === null || customer === void 0 ? void 0 : customer.kvkNumber) !== null && _customer$kvkNumber3 !== void 0 ? _customer$kvkNumber3 : undefined,
+          vatNumber: (_customer$vatNumber3 = customer === null || customer === void 0 ? void 0 : customer.vatNumber) !== null && _customer$vatNumber3 !== void 0 ? _customer$vatNumber3 : undefined
         })),
         customerAgreed,
         appointment,
@@ -630,8 +631,8 @@ const InternalAppointmentForm = _ref => {
       });
       payload.customer = _objectSpread(_objectSpread({}, payload.customer || {}), {}, {
         companyName: activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? (_customer$companyName2 = customer === null || customer === void 0 ? void 0 : customer.companyName) !== null && _customer$companyName2 !== void 0 ? _customer$companyName2 : '' : '',
-        kvkNumber: activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? (_customer$kvkNumber3 = customer === null || customer === void 0 ? void 0 : customer.kvkNumber) !== null && _customer$kvkNumber3 !== void 0 ? _customer$kvkNumber3 : '' : '',
-        vatNumber: activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? (_customer$vatNumber3 = customer === null || customer === void 0 ? void 0 : customer.vatNumber) !== null && _customer$vatNumber3 !== void 0 ? _customer$vatNumber3 : '' : ''
+        kvkNumber: activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? (_customer$kvkNumber4 = customer === null || customer === void 0 ? void 0 : customer.kvkNumber) !== null && _customer$kvkNumber4 !== void 0 ? _customer$kvkNumber4 : '' : '',
+        vatNumber: activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? (_customer$vatNumber4 = customer === null || customer === void 0 ? void 0 : customer.vatNumber) !== null && _customer$vatNumber4 !== void 0 ? _customer$vatNumber4 : '' : ''
       });
       if (existingDossierId && appointmentType === _constants__.DOSSIER_TYPES.PlannedAppointment && typeof invoicePaymentByLeaseCompany === 'boolean') {
         payload.invoicePaymentByLeaseCompany = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? invoicePaymentByLeaseCompany : false;
@@ -771,6 +772,18 @@ const InternalAppointmentForm = _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)(() => {
@@ -1161,13 +1174,7 @@ const InternalAppointmentForm = _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,
     key: "zipCode-".concat(refreshKey),
     isRequired: true,
     label: "Postcode:",
@@ -1219,7 +1226,7 @@ const InternalAppointmentForm = _ref => {
     options: countryOptions,
     name: "country",
     label: "Land:",
-    isRequired: false,
+    isRequired: true,
     isLoading: isLoadingCountries,
     noOptionsMessage: "Geen landen beschikbaar",
     placeholder: "Selecteer een land",
@@ -1229,12 +1236,7 @@ const InternalAppointmentForm = _ref => {
       let {
         value
       } = _ref6;
-      return dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-        payload: {
-          countryId: value
-        }
-      });
+      return updateCustomerField('countryId', value);
     }
   }), /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('modal-title mb-2 mt-3')
@@ -1270,13 +1272,7 @@ const InternalAppointmentForm = _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,
     key: "zipCode-".concat(refreshKey),
     isRequired: true,
     label: "Postcode:",
@@ -1328,7 +1324,7 @@ const InternalAppointmentForm = _ref => {
     options: countryOptions,
     name: "country",
     label: "Land:",
-    isRequired: false,
+    isRequired: true,
     isLoading: isLoadingCountries,
     noOptionsMessage: "Geen landen beschikbaar",
     placeholder: "Selecteer een land",
@@ -1338,12 +1334,7 @@ const InternalAppointmentForm = _ref => {
       let {
         value
       } = _ref7;
-      return dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-        payload: {
-          countryId: value
-        }
-      });
+      return updateCustomerField('countryId', value);
     }
   })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
@@ -1358,13 +1349,7 @@ const InternalAppointmentForm = _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,
     key: "zipCode-".concat(refreshKey),
     isRequired: true,
     label: "Postcode:",
@@ -1416,7 +1401,7 @@ const InternalAppointmentForm = _ref => {
     options: countryOptions,
     name: "country",
     label: "Land:",
-    isRequired: false,
+    isRequired: true,
     isLoading: isLoadingCountries,
     noOptionsMessage: "Geen landen beschikbaar",
     placeholder: "Selecteer een land",
@@ -1426,12 +1411,7 @@ const InternalAppointmentForm = _ref => {
       let {
         value
       } = _ref8;
-      return dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-        payload: {
-          countryId: value
-        }
-      });
+      return updateCustomerField('countryId', value);
     }
   })))))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mb-4')

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

@@ -46,6 +46,7 @@ var _AuthSessionContext = require("../../__context__/AuthSessionContext");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
+var _countryOptions = require("../../__helpers__/countryOptions");
 var _product = require("../../__helpers__/product");
 var _ui = require("../../__helpers__/ui");
 var _useIsTmg = require("../../__hooks__/useIsTmg");
@@ -433,14 +434,7 @@ const InternalQuotationForm = _ref => {
       return (option === null || option === void 0 || (_option$value = option.value) === null || _option$value === void 0 ? void 0 : _option$value.entityId) === (customer === null || customer === void 0 ? void 0 : customer.leasemaatschappijEntityId);
     }) || buildLeaseCompanyOption(customer);
   }, [customer, leaseCompanyOptions]);
-  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 initialCountry = (0, _react.useMemo)(() => {
     if (!(countryOptions !== null && countryOptions !== void 0 && countryOptions.length)) return null;
 

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

@@ -0,0 +1,42 @@
+"use strict";
+
+require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.string.trim.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");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildCountryDropdownOptions = void 0;
+require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.string.trim.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");
+var _constants__ = require("../__constants__");
+const PRIORITY_COUNTRY_LABELS = [_constants__.COUNTRY_NAMES.NETHERLANDS, _constants__.COUNTRY_NAMES.BELGIUM, _constants__.COUNTRY_NAMES.BELGIUM_FALLBACK];
+const normalizeCountryLabel = label => (label || '').trim().toUpperCase();
+const getCountrySortPriority = label => {
+  const normalized = normalizeCountryLabel(label);
+  const index = PRIORITY_COUNTRY_LABELS.findIndex(priorityLabel => normalizeCountryLabel(priorityLabel) === normalized);
+  return index === -1 ? PRIORITY_COUNTRY_LABELS.length : index;
+};
+
+/**
+ * @description Maps Hyper countries to dropdown options: Nederland and België first, then A–Z.
+ */
+const buildCountryDropdownOptions = exports.buildCountryDropdownOptions = function buildCountryDropdownOptions() {
+  let countries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (!(countries !== null && countries !== void 0 && countries.length)) return [];
+  return countries.filter(country => country.title && country.entityId).map(country => ({
+    label: country.title,
+    value: country.entityId
+  })).sort((a, b) => {
+    const priorityDiff = getCountrySortPriority(a.label) - getCountrySortPriority(b.label);
+    if (priorityDiff !== 0) return priorityDiff;
+    return (a.label || '').localeCompare(b.label || '', 'nl', {
+      sensitivity: 'base'
+    });
+  });
+};

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

@@ -3,12 +3,14 @@
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.trim.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");
@@ -32,21 +34,26 @@ var _exportNames = {
   truncateAtPipe: true,
   parseJson: true,
   isBelgianDomain: true,
+  isDutchPostalCode: true,
+  isBelgianPostalCode: true,
+  getCountryOptionForPostalCode: true,
   removeNullishProps: true,
   createSlug: true,
   getProxyApiErrorMessage: true,
   formatMontageTime: true
 };
-exports.withStyle = exports.truncateAtPipe = exports.removeNullishProps = exports.reduceYupErrorsToObject = exports.pushToDataLayer = exports.parseJson = exports.parseDateAndTimeToTimestamp = exports.parseArrayToInputOptions = exports.normalizeArray = exports.isBelgianDomain = exports.groupByKey = exports.getProxyApiErrorMessage = exports.getConfiguratorThemeClassByFormula = exports.getConfiguratorThemeClass = exports.getConfiguratorButtonVariant = exports.formatPrice = exports.formatMontageTime = exports.createSlug = void 0;
+exports.withStyle = exports.truncateAtPipe = exports.removeNullishProps = exports.reduceYupErrorsToObject = exports.pushToDataLayer = exports.parseJson = exports.parseDateAndTimeToTimestamp = exports.parseArrayToInputOptions = exports.normalizeArray = exports.isDutchPostalCode = exports.isBelgianPostalCode = exports.isBelgianDomain = exports.groupByKey = exports.getProxyApiErrorMessage = exports.getCountryOptionForPostalCode = exports.getConfiguratorThemeClassByFormula = exports.getConfiguratorThemeClass = exports.getConfiguratorButtonVariant = exports.formatPrice = exports.formatMontageTime = exports.createSlug = void 0;
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.trim.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.dom-collections.iterator.js");
@@ -292,11 +299,33 @@ const isBelgianDomain = () => {
   const hostname = (_window$location = window.location) === null || _window$location === void 0 || (_window$location = _window$location.hostname) === null || _window$location === void 0 ? void 0 : _window$location.toLowerCase();
   return Boolean(hostname && (hostname === 'be' || hostname.endsWith('.be')));
 };
+exports.isBelgianDomain = isBelgianDomain;
+const isDutchPostalCode = postalCode => {
+  if (!postalCode) return false;
+  const cleanedPostalCode = postalCode.replace(/\s/g, '');
+  return /^[1-9][0-9]{3}[A-Z]{2}$/i.test(cleanedPostalCode);
+};
+exports.isDutchPostalCode = isDutchPostalCode;
+const isBelgianPostalCode = postalCode => {
+  if (!postalCode) return false;
+  const cleanedPostalCode = postalCode.replace(/\s/g, '');
+  return /^[1-9][0-9]{3}$/.test(cleanedPostalCode);
+};
+exports.isBelgianPostalCode = isBelgianPostalCode;
+const normalizeCountryLabel = function normalizeCountryLabel() {
+  let label = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  return label.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase();
+};
+const getCountryOptionForPostalCode = exports.getCountryOptionForPostalCode = function getCountryOptionForPostalCode(postalCode) {
+  let countryOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  const countryName = isDutchPostalCode(postalCode) ? 'NEDERLAND' : isBelgianPostalCode(postalCode) ? 'BELGIE' : null;
+  if (!countryName) return null;
+  return countryOptions.find(option => normalizeCountryLabel(option === null || option === void 0 ? void 0 : option.label) === countryName) || null;
+};
 
 /**
  * @description Removes nullish properties from a passed object
  */
-exports.isBelgianDomain = isBelgianDomain;
 const removeNullishProps = exports.removeNullishProps = function removeNullishProps() {
   let object = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return Object.fromEntries(Object.entries(object).filter(_ref3 => {

package/package.json

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