thm-p3-configurator 0.0.277 → 0.0.279

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

@@ -342,7 +342,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;
+      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;
       setErrors({});
       if (!model) {
         // Note: this does not throw on error.
@@ -425,8 +425,7 @@ const InternalAppointmentForm = _ref => {
         appointment,
         appointmentType,
         channel,
-        licensePlate: licensePlate ? licensePlate.replace(/-/g, '') : undefined,
-        licensePlateBrandModel: !licensePlate && model && (_licensePlate || licensePlateBrandModel) ? (_licensePlate || licensePlateBrandModel).replace(/-/g, '') : undefined,
+        licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
         model,
         chassisNumber,
         priceCalculationDate,
@@ -724,12 +723,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: _ref2 => {
+    onChange: _ref3 => {
       var _value$kanaalType;
       let {
         label,
         value
-      } = _ref2;
+      } = _ref3;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MARKETING_CHANNEL,
         payload: {
@@ -1383,10 +1382,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: _ref3 => {
+    onChange: _ref4 => {
       let {
         value
-      } = _ref3;
+      } = _ref4;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
         payload: {
@@ -1487,10 +1486,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: {
@@ -1605,10 +1604,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: {
@@ -1654,27 +1653,37 @@ const InternalAppointmentForm = _ref => {
     },
     label: "Goedkeuringsnummer onbekend",
     isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
-  })), licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), !model ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !licensePlate && !licensePlateBrandModel && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    key: "licensePlate",
+    placeholder: "",
+    value: _licensePlate,
+    name: "licensePlate",
+    onChange: value => _setLicensePlate(value),
+    isRequired: false,
+    form: "quotation",
+    label: "Kenteken:",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (licensePlate || licensePlateBrandModel) && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "licensePlateReadOnly",
     placeholder: "",
-    value: licensePlate,
+    value: licensePlate || licensePlateBrandModel || '',
     name: "licensePlateReadOnly",
     onChange: () => {},
     isRequired: false,
     form: "quotation",
     label: "Kenteken:",
     isDisabled: true
-  }), !licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "licensePlate",
     placeholder: "",
-    value: _licensePlate !== undefined ? _licensePlate : licensePlateBrandModel || '',
+    value: _licensePlate || licensePlateBrandModel || '',
     name: "licensePlate",
     onChange: value => _setLicensePlate(value),
     isRequired: false,
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
-  }), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "chassisNumber",
     placeholder: "",
     value: vehicle === null || vehicle === void 0 ? void 0 : vehicle.chassisNumber,

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

@@ -194,7 +194,7 @@ const InternalQuotationForm = _ref => {
   const [errors, setErrors] = (0, _react.useState)({});
   const [companySearchTerm, setCompanySearchTerm] = (0, _react.useState)('');
   const [isCompanyInputFocused, setIsCompanyInputFocused] = (0, _react.useState)(false);
-  const [_licensePlate, _setLicensePlate] = (0, _react.useState)();
+  const [_licensePlate, _setLicensePlate] = (0, _react.useState)(licensePlate);
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const {
     branchTypes
@@ -309,7 +309,7 @@ const InternalQuotationForm = _ref => {
    */
   const handleSubmit = async () => {
     try {
-      var _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$houseNumber2, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _customer$note, _customer$zipCode, _customer$companyName;
+      var _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$houseNumber2, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _customer$note, _customer$zipCode, _customer$companyName, _ref2;
       setErrors(null);
       if (!model) {
         // Note: this does not throw on error.
@@ -367,8 +367,7 @@ const InternalQuotationForm = _ref => {
         })),
         chassisNumber: chassisNumber !== null && chassisNumber !== void 0 ? chassisNumber : undefined,
         channel,
-        licensePlate: licensePlate ? licensePlate.replace(/-/g, '') : undefined,
-        licensePlateBrandModel: !licensePlate && model && (_licensePlate || licensePlateBrandModel) ? (_licensePlate || licensePlateBrandModel).replace(/-/g, '') : undefined,
+        licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
         model,
         answers: (0, _helpers__.removeNullishProps)({
           duration: durationAnswer,
@@ -529,12 +528,12 @@ const InternalQuotationForm = _ref => {
     placeholder: "Maak een keuze",
     errorMessage: (errors === null || errors === void 0 ? void 0 : errors['channelId']) || (errors === null || errors === void 0 ? void 0 : errors['channelType']),
     initialValue: initialChannel,
-    onChange: _ref2 => {
+    onChange: _ref3 => {
       var _value$kanaalType;
       let {
         label,
         value
-      } = _ref2;
+      } = _ref3;
       return dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MARKETING_CHANNEL,
         payload: {
@@ -950,26 +949,35 @@ const InternalQuotationForm = _ref => {
     },
     label: "Goedkeuringsnummer onbekend",
     isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
-  })), licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), !model ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !licensePlate && !licensePlateBrandModel && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    placeholder: "",
+    value: _licensePlate,
+    name: "licensePlate",
+    onChange: value => _setLicensePlate(value),
+    isRequired: false,
+    form: "quotation",
+    label: "Kenteken:",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (licensePlate || licensePlateBrandModel) && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     key: "licensePlateReadOnly",
     placeholder: "",
-    value: licensePlate,
+    value: licensePlate || licensePlateBrandModel || '',
     name: "licensePlateReadOnly",
     onChange: () => {},
     isRequired: false,
     form: "quotation",
     label: "Kenteken:",
     isDisabled: true
-  }), !licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
-    value: _licensePlate !== undefined ? _licensePlate : licensePlateBrandModel || '',
+    value: _licensePlate || licensePlateBrandModel || '',
     name: "licensePlate",
     onChange: value => _setLicensePlate(value),
     isRequired: false,
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
-  }), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+  })), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
     value: vehicle === null || vehicle === void 0 ? void 0 : vehicle.chassisNumber,
     name: "chassisNumber",

package/dist/src/shared/__hooks__/useCheckEmailExists.js

@@ -14,7 +14,12 @@ var _react = require("react");
 var _authenticatedProxyApi = require("../__api__/authenticatedProxyApi");
 const useCheckEmailExists = () => {
   const [isChecking, setIsChecking] = (0, _react.useState)(false);
-  const checkEmailExists = async email => {
+  const checkEmailExists = async function checkEmailExists(email) {
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const {
+      excludeDossierId,
+      excludeCustomerId
+    } = options;
     if (!email || !email.trim()) {
       return {
         status: 'error',
@@ -30,12 +35,24 @@ const useCheckEmailExists = () => {
         limit: 1
       });
       if (response.status === 200 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.results) {
-        var _matchingDossier$klan, _matchingDossier$klan2;
+        var _matchingDossier6, _matchingDossier7, _matchingDossier8;
         const hasMatchingDossier = response.data.results.length > 0;
-        const matchingDossier = hasMatchingDossier ? response.data.results[0] : null;
-        const matchingCustomerId = (matchingDossier === null || matchingDossier === void 0 || (_matchingDossier$klan = matchingDossier.klant) === null || _matchingDossier$klan === void 0 ? void 0 : _matchingDossier$klan.entityId) || (matchingDossier === null || matchingDossier === void 0 || (_matchingDossier$klan2 = matchingDossier.klant) === null || _matchingDossier$klan2 === void 0 ? void 0 : _matchingDossier$klan2.id) || (matchingDossier === null || matchingDossier === void 0 ? void 0 : matchingDossier.klant) || null;
+        let matchingDossier = hasMatchingDossier ? response.data.results[0] : null;
+
+        // Filter out self-matches if exclusion options are provided
+        if (matchingDossier) {
+          var _matchingDossier, _matchingDossier2, _matchingDossier3, _matchingDossier4, _matchingDossier5;
+          const matchingDossierId = ((_matchingDossier = matchingDossier) === null || _matchingDossier === void 0 ? void 0 : _matchingDossier.entityId) || ((_matchingDossier2 = matchingDossier) === null || _matchingDossier2 === void 0 ? void 0 : _matchingDossier2.dossierId) || null;
+          const matchingCustomerId = ((_matchingDossier3 = matchingDossier) === null || _matchingDossier3 === void 0 || (_matchingDossier3 = _matchingDossier3.klant) === null || _matchingDossier3 === void 0 ? void 0 : _matchingDossier3.entityId) || ((_matchingDossier4 = matchingDossier) === null || _matchingDossier4 === void 0 || (_matchingDossier4 = _matchingDossier4.klant) === null || _matchingDossier4 === void 0 ? void 0 : _matchingDossier4.id) || ((_matchingDossier5 = matchingDossier) === null || _matchingDossier5 === void 0 ? void 0 : _matchingDossier5.klant) || null;
+
+          // Skip if this is a self-match
+          if (excludeDossierId && matchingDossierId === excludeDossierId || excludeCustomerId && matchingCustomerId === excludeCustomerId) {
+            matchingDossier = null;
+          }
+        }
+        const matchingCustomerId = matchingDossier ? ((_matchingDossier6 = matchingDossier) === null || _matchingDossier6 === void 0 || (_matchingDossier6 = _matchingDossier6.klant) === null || _matchingDossier6 === void 0 ? void 0 : _matchingDossier6.entityId) || ((_matchingDossier7 = matchingDossier) === null || _matchingDossier7 === void 0 || (_matchingDossier7 = _matchingDossier7.klant) === null || _matchingDossier7 === void 0 ? void 0 : _matchingDossier7.id) || ((_matchingDossier8 = matchingDossier) === null || _matchingDossier8 === void 0 ? void 0 : _matchingDossier8.klant) || null : null;
         setIsChecking(false);
-        if (hasMatchingDossier) {
+        if (matchingDossier) {
           return {
             status: 'success',
             emailExists: true,

package/dist/src/shared/__pages__/internal/InternalAppointmentPage.js

@@ -195,12 +195,17 @@ const InternalAppointmentPage = () => {
     }
   };
   const handleSubmit = async payload => {
-    var _dossierById$klant, _payload$customer;
-    const originalEmail = (dossierById === null || dossierById === void 0 || (_dossierById$klant = dossierById.klant) === null || _dossierById$klant === void 0 ? void 0 : _dossierById$klant.email2) || '';
+    var _dossierById$klant, _dossierById$klant2, _payload$customer;
+    const originalEmail = (dossierById === null || dossierById === void 0 ? void 0 : dossierById.email2) || (dossierById === null || dossierById === void 0 ? void 0 : dossierById.email1) || (dossierById === null || dossierById === void 0 || (_dossierById$klant = dossierById.klant) === null || _dossierById$klant === void 0 ? void 0 : _dossierById$klant.email2) || (dossierById === null || dossierById === void 0 || (_dossierById$klant2 = dossierById.klant) === null || _dossierById$klant2 === void 0 ? void 0 : _dossierById$klant2.email1) || '';
     const normalizedOriginalEmail = originalEmail.trim().toLowerCase();
     const normalizedCurrentEmail = (((_payload$customer = payload.customer) === null || _payload$customer === void 0 ? void 0 : _payload$customer.email) || '').trim().toLowerCase();
     if (normalizedCurrentEmail && normalizedCurrentEmail !== normalizedOriginalEmail) {
-      const emailCheckResult = await checkEmailExists(payload.customer.email);
+      var _dossierById$klant3, _dossierById$klant4;
+      const currentCustomerId = (dossierById === null || dossierById === void 0 || (_dossierById$klant3 = dossierById.klant) === null || _dossierById$klant3 === void 0 ? void 0 : _dossierById$klant3.entityId) || (dossierById === null || dossierById === void 0 || (_dossierById$klant4 = dossierById.klant) === null || _dossierById$klant4 === void 0 ? void 0 : _dossierById$klant4.id) || (dossierById === null || dossierById === void 0 ? void 0 : dossierById.klant) || null;
+      const emailCheckResult = await checkEmailExists(payload.customer.email, {
+        excludeDossierId: existingDossierId,
+        excludeCustomerId: currentCustomerId
+      });
       if (emailCheckResult.status === 'success' && emailCheckResult.emailExists) {
         setPendingPayload(payload);
         setEmailConflictData(emailCheckResult);

package/dist/src/shared/__pages__/internal/InternalQuotationPage.js

@@ -162,12 +162,17 @@ const InternalQuotationPage = () => {
     }
   };
   const handleSubmit = async payload => {
-    var _dossierById$klant, _payload$customer;
-    const originalEmail = (dossierById === null || dossierById === void 0 || (_dossierById$klant = dossierById.klant) === null || _dossierById$klant === void 0 ? void 0 : _dossierById$klant.email2) || '';
+    var _dossierById$klant, _dossierById$klant2, _payload$customer;
+    const originalEmail = (dossierById === null || dossierById === void 0 ? void 0 : dossierById.email2) || (dossierById === null || dossierById === void 0 ? void 0 : dossierById.email1) || (dossierById === null || dossierById === void 0 || (_dossierById$klant = dossierById.klant) === null || _dossierById$klant === void 0 ? void 0 : _dossierById$klant.email2) || (dossierById === null || dossierById === void 0 || (_dossierById$klant2 = dossierById.klant) === null || _dossierById$klant2 === void 0 ? void 0 : _dossierById$klant2.email1) || '';
     const normalizedOriginalEmail = originalEmail.trim().toLowerCase();
     const normalizedCurrentEmail = (((_payload$customer = payload.customer) === null || _payload$customer === void 0 ? void 0 : _payload$customer.email) || '').trim().toLowerCase();
     if (normalizedCurrentEmail && normalizedCurrentEmail !== normalizedOriginalEmail) {
-      const emailCheckResult = await checkEmailExists(payload.customer.email);
+      var _dossierById$klant3, _dossierById$klant4;
+      const currentCustomerId = (dossierById === null || dossierById === void 0 || (_dossierById$klant3 = dossierById.klant) === null || _dossierById$klant3 === void 0 ? void 0 : _dossierById$klant3.entityId) || (dossierById === null || dossierById === void 0 || (_dossierById$klant4 = dossierById.klant) === null || _dossierById$klant4 === void 0 ? void 0 : _dossierById$klant4.id) || (dossierById === null || dossierById === void 0 ? void 0 : dossierById.klant) || null;
+      const emailCheckResult = await checkEmailExists(payload.customer.email, {
+        excludeDossierId: existingDossierId,
+        excludeCustomerId: currentCustomerId
+      });
       if (emailCheckResult.status === 'success' && emailCheckResult.emailExists) {
         setPendingPayload(payload);
         setEmailConflictData(emailCheckResult);

package/package.json

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