thm-p3-configurator 0.0.278 → 0.0.281

package/dist/src/shared/App.js

@@ -75,6 +75,6 @@ const App = () => {
     defaultCountry: APP_CONFIG.country
   }, /*#__PURE__*/_react.default.createElement(_OrderSessionContext.OrderSessionController, null, /*#__PURE__*/_react.default.createElement(_reactQuery.QueryClientProvider, {
     client: _queryClient.default
-  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), /*#__PURE__*/_react.default.createElement(_pages__.default, null))))))))));
+  }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), APP_CONFIG.nodeEnv === 'development' && APP_CONFIG.internal === true && /*#__PURE__*/_react.default.createElement(_TEST_ONLY_INTERNAL_ROUTES.default, null))))))))));
 };
 var _default = exports.default = App;

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

@@ -52,7 +52,9 @@ const DatePickerInput = _ref => {
     name,
     isRequired,
     label,
-    errorMessage
+    errorMessage,
+    minDate = new Date(),
+    maxDate
   } = _ref;
   const [value, setValue] = (0, _react.useState)();
   const [isTouched, setIsTouched] = (0, _react.useState)(false);
@@ -86,7 +88,8 @@ const DatePickerInput = _ref => {
       e.preventDefault();
     },
     wrapperClassName: (0, _helpers__.withStyle)('react-datepicker-wrapper'),
-    minDate: new Date(),
+    minDate: minDate,
+    maxDate: maxDate,
     locale: "nl",
     onFocus: handleFocus,
     onChange: date => handleChange(date),

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

@@ -41,7 +41,11 @@ const InternalPriceCalculationSelector = () => {
     name: 'Prijsberekeningsdatum',
     isRequired: true,
     label: "Prijsberekeningsdatum:",
-    initialValue: priceCalculationDate ? new Date(priceCalculationDate) : null,
+    initialValue: priceCalculationDate ? new Date(priceCalculationDate) : null
+    // Allow any date (past and future) for price calculation.
+    ,
+
+    minDate: null,
     isStrict: false
   });
 };

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.278",
+  "version": "0.0.281",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",