thm-p3-configurator 0.0.304 → 0.0.306

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

@@ -171,6 +171,23 @@ const internalAppointmentFormSchema = (0, _yup.object)({
 /**
  * TODO: Split this component - file is too long at the moment.
  */
+// Empty customer state template
+const getEmptyCustomerState = () => ({
+  firstName: '',
+  infix: '',
+  lastName: '',
+  email: '',
+  phoneNumber: '',
+  zipCode: '',
+  houseNumber: '',
+  houseNumberAddition: '',
+  streetName: '',
+  city: '',
+  companyName: '',
+  kvkNumber: '',
+  vatNumber: '',
+  countryId: ''
+});
 const InternalAppointmentForm = _ref => {
   var _branchTypes$byId$aut, _authSession$branch, _marketingChannels$fi;
   let {
@@ -188,7 +205,7 @@ const InternalAppointmentForm = _ref => {
   const [addressLookupTimeoutId, setAddressLookupTimeoutId] = (0, _react.useState)(null);
   const {
     customerAgreed,
-    customer,
+    customer: contextCustomer,
     licensePlate,
     licensePlateBrandModel,
     model,
@@ -218,8 +235,100 @@ const InternalAppointmentForm = _ref => {
     vehicleCodingDiscountPercentage,
     consumerDiscounts,
     montageRate,
-    hasGoedkeuringsnummerActivity
+    hasGoedkeuringsnummerActivity,
+    isTowCenterBranch
   } = order;
+
+  // Track the original ownership type from context
+  const [originalOwnershipType] = (0, _react.useState)(() => (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) || _constants__.VEHICLE_OWNERSHIP_TYPE.Particulier);
+
+  // Current active ownership type (local state for tab switching)
+  const [activeOwnershipType, setActiveOwnershipType] = (0, _react.useState)(originalOwnershipType);
+
+  // Separate customer state for each ownership type
+  const [customerDataPerType, setCustomerDataPerType] = (0, _react.useState)(() => {
+    const emptyState = getEmptyCustomerState();
+    const initialCustomerData = {
+      firstName: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.firstName) || '',
+      infix: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.infix) || '',
+      lastName: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.lastName) || '',
+      email: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.email) || '',
+      phoneNumber: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.phoneNumber) || '',
+      zipCode: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.zipCode) || '',
+      houseNumber: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.houseNumber) || '',
+      houseNumberAddition: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.houseNumberAddition) || '',
+      streetName: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.streetName) || '',
+      city: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.city) || '',
+      companyName: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.companyName) || '',
+      kvkNumber: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.kvkNumber) || '',
+      vatNumber: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.vatNumber) || '',
+      countryId: (contextCustomer === null || contextCustomer === void 0 ? void 0 : contextCustomer.countryId) || ''
+    };
+
+    // Only the original ownership type gets the initial data
+    return {
+      [_constants__.VEHICLE_OWNERSHIP_TYPE.Particulier]: originalOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Particulier ? _objectSpread({}, initialCustomerData) : _objectSpread({}, emptyState),
+      [_constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk]: originalOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? _objectSpread({}, initialCustomerData) : _objectSpread({}, emptyState),
+      [_constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij]: originalOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? _objectSpread({}, initialCustomerData) : _objectSpread({}, emptyState)
+    };
+  });
+
+  // Get customer data for the active ownership type
+  const customer = customerDataPerType[activeOwnershipType];
+
+  // Helper to update customer data for the active ownership type
+  const updateCustomerField = (0, _react.useCallback)((field, value) => {
+    setCustomerDataPerType(prev => _objectSpread(_objectSpread({}, prev), {}, {
+      [activeOwnershipType]: _objectSpread(_objectSpread({}, prev[activeOwnershipType]), {}, {
+        [field]: value
+      })
+    }));
+  }, [activeOwnershipType]);
+
+  // Sync active ownership type to context when it changes
+  (0, _react.useEffect)(() => {
+    if (activeOwnershipType !== (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType)) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_OWNERSHIP_TYPE,
+        payload: {
+          ownershipType: activeOwnershipType
+        }
+      });
+    }
+  }, [activeOwnershipType, vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType, dispatch]);
+
+  // Sync customer data to context when it changes (for the active tab)
+  (0, _react.useEffect)(() => {
+    const currentData = customerDataPerType[activeOwnershipType];
+    // Batch update context with current tab's customer data
+    Object.entries(currentData).forEach(_ref2 => {
+      let [field, value] = _ref2;
+      const actionMap = {
+        firstName: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_FIRST_NAME,
+        infix: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
+        lastName: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
+        email: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
+        phoneNumber: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
+        zipCode: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
+        houseNumber: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
+        houseNumberAddition: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
+        streetName: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
+        city: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
+        companyName: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
+        kvkNumber: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_KVK_NUMBER,
+        vatNumber: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_VAT_NUMBER,
+        countryId: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID
+      };
+      if (actionMap[field]) {
+        dispatch({
+          type: actionMap[field],
+          payload: {
+            [field]: value
+          }
+        });
+      }
+    });
+  }, [activeOwnershipType, customerDataPerType, dispatch]);
   const [errors, setErrors] = (0, _react.useState)({});
   const [_licensePlate, _setLicensePlate] = (0, _react.useState)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
@@ -291,7 +400,7 @@ const InternalAppointmentForm = _ref => {
       }
     }
   }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, dispatch]);
-  const isBusinessOwnership = (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
+  const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
   const isNetherlandsSelected = (0, _react.useMemo)(() => {
     if (!(selectedCountry !== null && selectedCountry !== void 0 && selectedCountry.label)) return false;
     return selectedCountry.label.toUpperCase() === 'NEDERLAND';
@@ -339,7 +448,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, _customer$note, _customer$zipCode, _customer$companyName, _customer$kvkNumber2, _customer$vatNumber2, _ref2;
+      var _customer$kvkNumber, _customer$vatNumber, _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$houseNumber2, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _customer$note, _customer$zipCode, _customer$companyName, _customer$kvkNumber2, _customer$vatNumber2, _ref3;
       setErrors({});
       if (!model) {
         // Note: this does not throw on error.
@@ -353,7 +462,7 @@ const InternalAppointmentForm = _ref => {
       }
 
       // Validate lease number for lease company vehicles
-      if ((vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij) {
+      if (activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij) {
         if ((!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber) || (vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumber) === '') && !(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumberUnknown)) {
           setErrors(prev => _objectSpread(_objectSpread({}, prev), {}, {
             leaseNumber: _constants__.FORM_ERROR_MESSAGES.leaseNumber || 'Goedkeuringsnummer is verplicht of geef aan dat het onbekend is'
@@ -381,7 +490,7 @@ const InternalAppointmentForm = _ref => {
 
       // Note: this throws on error.
       internalAppointmentFormSchema.validateSync(_objectSpread(_objectSpread(_objectSpread({}, vehicle), customer), {}, {
-        ownershipType: vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType,
+        ownershipType: activeOwnershipType,
         // Note: add string fallback here to prevent null check in Yup throwing weird errors
         // However: dont submit empty strings to the API because the API doesnt accept empty strings in place of `undefined`
         // Rule in custom API: a field can be optional (can be undefined), but once you fill it in with a value, that value has to be truthy.
@@ -421,7 +530,7 @@ const InternalAppointmentForm = _ref => {
         appointment,
         appointmentType,
         channel,
-        licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
+        licensePlate: (_ref3 = licensePlate || _licensePlate) === null || _ref3 === void 0 ? void 0 : _ref3.replace(/-/g, ''),
         model,
         chassisNumber,
         priceCalculationDate,
@@ -468,10 +577,11 @@ const InternalAppointmentForm = _ref => {
     branchesByType,
     isLoadingBranchesByType
   } = (0, _queries.useBranchesByType)({
-    isTmg: isTmg,
+    isTmg,
+    isTowCenterBranch,
     searchTerm: companySearchTerm,
     formula,
-    ownershipType: vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType,
+    ownershipType: activeOwnershipType,
     organisationType: branchType
   });
 
@@ -480,66 +590,21 @@ const InternalAppointmentForm = _ref => {
    */
   const handleAutofillButtonClicked = () => {
     var _branchById$kvkNumber, _branchById$vatNumber;
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-      payload: {
-        companyName: branchById === null || branchById === void 0 ? void 0 : branchById.name
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
-      payload: {
-        email: branchById === null || branchById === void 0 ? void 0 : branchById.email
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: branchById === null || branchById === void 0 ? void 0 : branchById.phone
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-      payload: {
-        zipCode: branchById === null || branchById === void 0 ? void 0 : branchById.postalCode
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-      payload: {
-        streetName: branchById === null || branchById === void 0 ? void 0 : branchById.street
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-      payload: {
-        city: branchById === null || branchById === void 0 ? void 0 : branchById.city
-      }
-    });
+    updateCustomerField('companyName', (branchById === null || branchById === void 0 ? void 0 : branchById.name) || '');
+    updateCustomerField('email', (branchById === null || branchById === void 0 ? void 0 : branchById.email) || '');
+    updateCustomerField('phoneNumber', (branchById === null || branchById === void 0 ? void 0 : branchById.phone) || '');
+    updateCustomerField('zipCode', (branchById === null || branchById === void 0 ? void 0 : branchById.postalCode) || '');
+    updateCustomerField('streetName', (branchById === null || branchById === void 0 ? void 0 : branchById.street) || '');
+    updateCustomerField('city', (branchById === null || branchById === void 0 ? void 0 : branchById.city) || '');
+    updateCustomerField('houseNumber', (branchById === null || branchById === void 0 ? void 0 : branchById.street2) || '');
     const kvkNumber = (_branchById$kvkNumber = branchById === null || branchById === void 0 ? void 0 : branchById.kvkNumber) !== null && _branchById$kvkNumber !== void 0 ? _branchById$kvkNumber : branchById === null || branchById === void 0 ? void 0 : branchById.kvkNummer;
     if (kvkNumber) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_KVK_NUMBER,
-        payload: {
-          kvkNumber
-        }
-      });
+      updateCustomerField('kvkNumber', kvkNumber);
     }
     const vatNumber = (_branchById$vatNumber = branchById === null || branchById === void 0 ? void 0 : branchById.vatNumber) !== null && _branchById$vatNumber !== void 0 ? _branchById$vatNumber : branchById === null || branchById === void 0 ? void 0 : branchById.btwNummer;
     if (vatNumber) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_VAT_NUMBER,
-        payload: {
-          vatNumber
-        }
-      });
+      updateCustomerField('vatNumber', vatNumber);
     }
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-      payload: {
-        houseNumber: branchById === null || branchById === void 0 ? void 0 : branchById.street2
-      }
-    });
   };
   const handleClearAllCustomerFields = () => {
     // Set a new timestamp to force re-renders
@@ -550,84 +615,12 @@ const InternalAppointmentForm = _ref => {
     inputs.forEach(input => {
       input.value = '';
     });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_FIRST_NAME,
-      payload: {
-        firstName: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
-      payload: {
-        infix: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
-      payload: {
-        lastName: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
-      payload: {
-        email: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-      payload: {
-        zipCode: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-      payload: {
-        houseNumber: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
-      payload: {
-        houseNumberAddition: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-      payload: {
-        streetName: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-      payload: {
-        city: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-      payload: {
-        companyName: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_KVK_NUMBER,
-      payload: {
-        kvkNumber: ''
-      }
-    });
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_VAT_NUMBER,
-      payload: {
-        vatNumber: ''
-      }
-    });
+
+    // Clear all customer fields in the local state for the active ownership type
+    const emptyState = getEmptyCustomerState();
+    setCustomerDataPerType(prev => _objectSpread(_objectSpread({}, prev), {}, {
+      [activeOwnershipType]: emptyState
+    }));
   };
   const initialChannel = channel !== null && channel !== void 0 && channel.channelId ? {
     label: marketingChannels === null || marketingChannels === void 0 || (_marketingChannels$fi = marketingChannels.find(marketingC => (marketingC === null || marketingC === void 0 ? void 0 : marketingC.entityId) === (channel === null || channel === void 0 ? void 0 : channel.channelId))) === null || _marketingChannels$fi === void 0 ? void 0 : _marketingChannels$fi.title,
@@ -644,18 +637,8 @@ const InternalAppointmentForm = _ref => {
       const addressInfo = await addressLookupService.lookup(postcode, houseNumber);
       if (addressInfo && addressInfo.street && addressInfo.city) {
         // Auto-fill street and city fields
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-          payload: {
-            streetName: addressInfo.street
-          }
-        });
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-          payload: {
-            city: addressInfo.city
-          }
-        });
+        updateCustomerField('streetName', addressInfo.street);
+        updateCustomerField('city', addressInfo.city);
       }
     } catch (error) {
       console.error('Address lookup failed:', error);
@@ -719,12 +702,12 @@ const InternalAppointmentForm = _ref => {
     placeholder: "Maak een keuze",
     errorMessage: (errors === null || errors === void 0 ? void 0 : errors['channelType']) || (errors === null || errors === void 0 ? void 0 : errors['channelId']),
     initialValue: initialChannel,
-    onChange: _ref3 => {
+    onChange: _ref4 => {
       var _value$kanaalType;
       let {
         label,
         value
-      } = _ref3;
+      } = _ref4;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MARKETING_CHANNEL,
         payload: {
@@ -739,31 +722,22 @@ const InternalAppointmentForm = _ref => {
   }) : null, /*#__PURE__*/_react.default.createElement(_RadioButtons.default, {
     name: "ownershipType",
     label: "Type:",
-    initialValue: vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType,
+    initialValue: activeOwnershipType,
     onChange: val => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_OWNERSHIP_TYPE,
-        payload: {
-          ownershipType: val
-        }
-      });
+      // Switch to the new ownership type - each type maintains its own separate state
+      setActiveOwnershipType(val);
     },
     options: Object.values(_constants__.VEHICLE_OWNERSHIP_TYPE),
     isRequired: true,
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['ownershipType']
-  }), (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  }), activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('company-search-container position-relative mt-2 mb-2')
   }, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "Zoek leasemaatschappijen...",
     value: customer.companyName,
     name: "companyName",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-        payload: {
-          companyName: value
-        }
-      });
+      updateCustomerField('companyName', value);
 
       // Also update search term if value is different
       if (value !== companySearchTerm) {
@@ -808,12 +782,7 @@ const InternalAppointmentForm = _ref => {
       e.preventDefault();
 
       // Only set company name for lease companies, no other autofills
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-        payload: {
-          companyName: branch.name
-        }
-      });
+      updateCustomerField('companyName', branch.name);
       setCompanySearchTerm('');
       setIsCompanyInputFocused(false);
     }
@@ -822,8 +791,8 @@ const InternalAppointmentForm = _ref => {
     label: "Factuur betaling door Leasemaatschappij",
     initialValue: invoicePaymentByLeaseCompany,
     onChange: val => {
-      // Only allow if no existingDossierId OR hasGoedkeuringsnummerActivity
-      if (!existingDossierId || hasGoedkeuringsnummerActivity) {
+      // Only allow enabling if hasGoedkeuringsnummerActivity (note with Goedkeuringsnummer attached to dossier)
+      if (hasGoedkeuringsnummerActivity) {
         dispatch({
           type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INVOICE_PAYMENT_BY_LEASE_COMPANY,
           payload: {
@@ -833,23 +802,18 @@ const InternalAppointmentForm = _ref => {
       }
     },
     isRequired: false,
-    isDisabled: existingDossierId && !hasGoedkeuringsnummerActivity
+    isDisabled: !hasGoedkeuringsnummerActivity
   }))), /*#__PURE__*/_react.default.createElement("h5", {
     className: (0, _helpers__.withStyle)('my-2')
   }, "Persoonlijke gegevens"), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 col-md-6 mb-2')
-  }, (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h6", {
+  }, activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('modal-title mb-2')
   }, "Gegevens klant:"), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: customer.firstName,
     name: "firstName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_FIRST_NAME,
-      payload: {
-        firstName: value
-      }
-    }),
+    onChange: value => updateCustomerField('firstName', value),
     isRequired: true,
     form: "appointment",
     label: "Voornaam:",
@@ -859,12 +823,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.infix,
     name: "infix",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
-      payload: {
-        infix: value
-      }
-    }),
+    onChange: value => updateCustomerField('infix', value),
     isRequired: false,
     form: "appointment",
     label: "Tussenvoegsel:",
@@ -873,12 +832,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.lastName,
     name: "lastName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
-      payload: {
-        lastName: value
-      }
-    }),
+    onChange: value => updateCustomerField('lastName', value),
     isRequired: true,
     form: "appointment",
     label: "Achternaam:",
@@ -887,12 +841,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.email,
     name: "email",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
-      payload: {
-        email: value
-      }
-    }),
+    onChange: value => updateCustomerField('email', value),
     isRequired: true,
     form: "appointment",
     label: "E-mailadres:",
@@ -901,26 +850,16 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.phoneNumber,
     name: "phoneNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: value
-      }
-    }),
+    onChange: value => updateCustomerField('phoneNumber', value),
     isRequired: true,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber'],
     key: "phoneNumber-".concat(refreshKey)
-  })) : (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })) : activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: customer.firstName,
     name: "firstName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_FIRST_NAME,
-      payload: {
-        firstName: value
-      }
-    }),
+    onChange: value => updateCustomerField('firstName', value),
     key: "firstName-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -930,12 +869,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.infix,
     name: "infix",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
-      payload: {
-        infix: value
-      }
-    }),
+    onChange: value => updateCustomerField('infix', value),
     key: "infix-".concat(refreshKey),
     isRequired: false,
     form: "appointment",
@@ -945,12 +879,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.lastName,
     name: "lastName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
-      payload: {
-        lastName: value
-      }
-    }),
+    onChange: value => updateCustomerField('lastName', value),
     key: "lastName-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -960,12 +889,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.email,
     name: "email",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
-      payload: {
-        email: value
-      }
-    }),
+    onChange: value => updateCustomerField('email', value),
     key: "email-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -975,12 +899,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.phoneNumber,
     name: "phoneNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: value
-      }
-    }),
+    onChange: value => updateCustomerField('phoneNumber', value),
     isRequired: true,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber'],
@@ -989,12 +908,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.firstName,
     name: "firstName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_FIRST_NAME,
-      payload: {
-        firstName: value
-      }
-    }),
+    onChange: value => updateCustomerField('firstName', value),
     key: "firstName-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -1004,12 +918,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.infix,
     name: "infix",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INFIX,
-      payload: {
-        infix: value
-      }
-    }),
+    onChange: value => updateCustomerField('infix', value),
     key: "infix-".concat(refreshKey),
     isRequired: false,
     form: "appointment",
@@ -1019,12 +928,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.lastName,
     name: "lastName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_LAST_NAME,
-      payload: {
-        lastName: value
-      }
-    }),
+    onChange: value => updateCustomerField('lastName', value),
     key: "lastName-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -1034,12 +938,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.email,
     name: "email",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_EMAIL,
-      payload: {
-        email: value
-      }
-    }),
+    onChange: value => updateCustomerField('email', value),
     key: "email-".concat(refreshKey),
     isRequired: true,
     form: "appointment",
@@ -1047,7 +946,7 @@ const InternalAppointmentForm = _ref => {
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['email']
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 col-md-6')
-  }, (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h6", {
+  }, activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('modal-title mb-2')
   }, "Gegevens bedrijf:"), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('company-search-container position-relative mb-3')
@@ -1066,12 +965,7 @@ const InternalAppointmentForm = _ref => {
     name: "companyName",
     onChange: value => {
       // Update company name in state
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-        payload: {
-          companyName: value
-        }
-      });
+      updateCustomerField('companyName', value);
 
       // Also update search term if value is different
       if (value !== companySearchTerm) {
@@ -1117,77 +1011,32 @@ const InternalAppointmentForm = _ref => {
     onMouseDown: e => {
       var _branch$vatNumber, _branch$kvkNumber;
       e.preventDefault();
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COMPANY_NAME,
-        payload: {
-          companyName: branch.name
-        }
-      });
+      updateCustomerField('companyName', branch.name);
       if (branch.postalCode) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-          payload: {
-            zipCode: branch.postalCode
-          }
-        });
+        updateCustomerField('zipCode', branch.postalCode);
       }
       if (branch.street) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-          payload: {
-            streetName: branch.street
-          }
-        });
+        updateCustomerField('streetName', branch.street);
       }
       if (branch.city) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-          payload: {
-            city: branch.city
-          }
-        });
+        updateCustomerField('city', branch.city);
       }
       if (branch.street2) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-          payload: {
-            houseNumber: branch.street2
-          }
-        });
+        updateCustomerField('houseNumber', branch.street2);
       }
       const vatNumber = (_branch$vatNumber = branch.vatNumber) !== null && _branch$vatNumber !== void 0 ? _branch$vatNumber : branch.btwNummer;
       if (vatNumber) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_VAT_NUMBER,
-          payload: {
-            vatNumber
-          }
-        });
+        updateCustomerField('vatNumber', vatNumber);
       }
       const kvkNumber = (_branch$kvkNumber = branch.kvkNumber) !== null && _branch$kvkNumber !== void 0 ? _branch$kvkNumber : branch.kvkNummer;
       if (kvkNumber) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_KVK_NUMBER,
-          payload: {
-            kvkNumber
-          }
-        });
+        updateCustomerField('kvkNumber', kvkNumber);
       }
       if (branch.huisnummerToevoeging) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
-          payload: {
-            houseNumberAddition: branch.huisnummerToevoeging
-          }
-        });
+        updateCustomerField('houseNumberAddition', branch.huisnummerToevoeging);
       }
       if (branch.country && branch.country.entityId) {
-        dispatch({
-          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-          payload: {
-            countryId: branch.country.entityId
-          }
-        });
+        updateCustomerField('countryId', branch.country.entityId);
         setRefreshKey(Date.now());
       }
       setCompanySearchTerm('');
@@ -1197,12 +1046,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.kvkNumber,
     name: "kvkNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_KVK_NUMBER,
-      payload: {
-        kvkNumber: value
-      }
-    }),
+    onChange: value => updateCustomerField('kvkNumber', value),
     key: "kvkNumber-".concat(refreshKey),
     isRequired: shouldRequireKvkNumber,
     form: "quotation",
@@ -1212,12 +1056,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.vatNumber,
     name: "vatNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_VAT_NUMBER,
-      payload: {
-        vatNumber: value
-      }
-    }),
+    onChange: value => updateCustomerField('vatNumber', value),
     key: "vatNumber-".concat(refreshKey),
     isRequired: shouldRequireVatNumber,
     form: "quotation",
@@ -1228,12 +1067,7 @@ const InternalAppointmentForm = _ref => {
     value: customer.zipCode,
     name: "zipCode",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-        payload: {
-          zipCode: value
-        }
-      });
+      updateCustomerField('zipCode', value);
       // Trigger address lookup if house number is also available
       if (customer.houseNumber) {
         handleAddressLookup(value, customer.houseNumber);
@@ -1248,12 +1082,7 @@ const InternalAppointmentForm = _ref => {
     value: customer.houseNumber,
     name: "houseNumber",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-        payload: {
-          houseNumber: value
-        }
-      });
+      updateCustomerField('houseNumber', value);
       // Trigger address lookup if postcode is also available
       if (customer.zipCode) {
         handleAddressLookup(customer.zipCode, value);
@@ -1267,12 +1096,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.houseNumberAddition,
     name: "houseNumberAddition",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
-      payload: {
-        houseNumberAddition: value
-      }
-    }),
+    onChange: value => updateCustomerField('houseNumberAddition', value),
     key: "houseNumberAddition-".concat(refreshKey),
     isRequired: false,
     label: "Huisnummer toevoeging:",
@@ -1281,12 +1105,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Adres wordt opgezocht...' : '',
     value: customer.streetName,
     name: "streetName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-      payload: {
-        streetName: value
-      }
-    }),
+    onChange: value => updateCustomerField('streetName', value),
     key: "streetName-".concat(refreshKey),
     isRequired: true,
     label: "Straat:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1295,12 +1114,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Stad wordt opgezocht...' : '',
     value: customer.city,
     name: "city",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-      payload: {
-        city: value
-      }
-    }),
+    onChange: value => updateCustomerField('city', value),
     key: "city-".concat(refreshKey),
     isRequired: true,
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1316,10 +1130,10 @@ const InternalAppointmentForm = _ref => {
     placeholder: "Selecteer een land",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['countryId'],
     initialValue: (countryOptions === null || countryOptions === void 0 ? void 0 : countryOptions.find(option => option.value === (customer === null || customer === void 0 ? void 0 : customer.countryId))) || null,
-    onChange: _ref4 => {
+    onChange: _ref5 => {
       let {
         value
-      } = _ref4;
+      } = _ref5;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
         payload: {
@@ -1327,17 +1141,12 @@ const InternalAppointmentForm = _ref => {
         }
       });
     }
-  })) : (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })) : activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: customer.zipCode,
     name: "zipCode",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-        payload: {
-          zipCode: value
-        }
-      });
+      updateCustomerField('zipCode', value);
       // Trigger address lookup if house number is also available
       if (customer.houseNumber) {
         handleAddressLookup(value, customer.houseNumber);
@@ -1352,12 +1161,7 @@ const InternalAppointmentForm = _ref => {
     value: customer.houseNumber,
     name: "houseNumber",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-        payload: {
-          houseNumber: value
-        }
-      });
+      updateCustomerField('houseNumber', value);
       // Trigger address lookup if postcode is also available
       if (customer.zipCode) {
         handleAddressLookup(customer.zipCode, value);
@@ -1371,12 +1175,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.houseNumberAddition,
     name: "houseNumberAddition",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
-      payload: {
-        houseNumberAddition: value
-      }
-    }),
+    onChange: value => updateCustomerField('houseNumberAddition', value),
     key: "houseNumberAddition-".concat(refreshKey),
     isRequired: false,
     label: "Huisnummer toevoeging:",
@@ -1385,12 +1184,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Adres wordt opgezocht...' : '',
     value: customer.streetName,
     name: "streetName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-      payload: {
-        streetName: value
-      }
-    }),
+    onChange: value => updateCustomerField('streetName', value),
     key: "streetName-".concat(refreshKey),
     isRequired: true,
     label: "Straat:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1399,12 +1193,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Stad wordt opgezocht...' : '',
     value: customer.city,
     name: "city",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-      payload: {
-        city: value
-      }
-    }),
+    onChange: value => updateCustomerField('city', value),
     key: "city-".concat(refreshKey),
     isRequired: true,
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1420,10 +1209,10 @@ const InternalAppointmentForm = _ref => {
     placeholder: "Selecteer een land",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['countryId'],
     initialValue: (countryOptions === null || countryOptions === void 0 ? void 0 : countryOptions.find(option => option.value === (customer === null || customer === void 0 ? void 0 : customer.countryId))) || null,
-    onChange: _ref5 => {
+    onChange: _ref6 => {
       let {
         value
-      } = _ref5;
+      } = _ref6;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
         payload: {
@@ -1435,12 +1224,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.phoneNumber,
     name: "phoneNumber",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_PHONE_NUMBER,
-      payload: {
-        phoneNumber: value
-      }
-    }),
+    onChange: value => updateCustomerField('phoneNumber', value),
     isRequired: true,
     label: "Telefoonnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['phoneNumber'],
@@ -1450,12 +1234,7 @@ const InternalAppointmentForm = _ref => {
     value: customer.zipCode,
     name: "zipCode",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_ZIP_CODE,
-        payload: {
-          zipCode: value
-        }
-      });
+      updateCustomerField('zipCode', value);
       // Trigger address lookup if house number is also available
       if (customer.houseNumber) {
         handleAddressLookup(value, customer.houseNumber);
@@ -1470,12 +1249,7 @@ const InternalAppointmentForm = _ref => {
     value: customer.houseNumber,
     name: "houseNumber",
     onChange: value => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER,
-        payload: {
-          houseNumber: value
-        }
-      });
+      updateCustomerField('houseNumber', value);
       // Trigger address lookup if postcode is also available
       if (customer.zipCode) {
         handleAddressLookup(customer.zipCode, value);
@@ -1489,12 +1263,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: "",
     value: customer.houseNumberAddition,
     name: "houseNumberAddition",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_HOUSE_NUMBER_ADDITION,
-      payload: {
-        houseNumberAddition: value
-      }
-    }),
+    onChange: value => updateCustomerField('houseNumberAddition', value),
     key: "houseNumberAddition-".concat(refreshKey),
     isRequired: false,
     label: "Huisnummer toevoeging:",
@@ -1503,12 +1272,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Adres wordt opgezocht...' : '',
     value: customer.streetName,
     name: "streetName",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_STREET_NAME,
-      payload: {
-        streetName: value
-      }
-    }),
+    onChange: value => updateCustomerField('streetName', value),
     key: "streetName-".concat(refreshKey),
     isRequired: true,
     label: "Straat:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1517,12 +1281,7 @@ const InternalAppointmentForm = _ref => {
     placeholder: addressLookupLoading ? 'Stad wordt opgezocht...' : '',
     value: customer.city,
     name: "city",
-    onChange: value => dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_CITY,
-      payload: {
-        city: value
-      }
-    }),
+    onChange: value => updateCustomerField('city', value),
     key: "city-".concat(refreshKey),
     isRequired: true,
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
@@ -1538,10 +1297,10 @@ const InternalAppointmentForm = _ref => {
     placeholder: "Selecteer een land",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['countryId'],
     initialValue: (countryOptions === null || countryOptions === void 0 ? void 0 : countryOptions.find(option => option.value === (customer === null || customer === void 0 ? void 0 : customer.countryId))) || null,
-    onChange: _ref6 => {
+    onChange: _ref7 => {
       let {
         value
-      } = _ref6;
+      } = _ref7;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
         payload: {
@@ -1557,7 +1316,7 @@ const InternalAppointmentForm = _ref => {
     className: (0, _helpers__.withStyle)('modal-title col-12 mb-2')
   }, "Gegevens van de auto ", /*#__PURE__*/_react.default.createElement("br", null)), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12')
-  }, (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  }, activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "leaseNumber",
     placeholder: "",
     value: vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumber,