thm-p3-configurator 0.0.93 → 0.0.94

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

@@ -47,6 +47,7 @@ const CheckboxInput = _ref => {
     isRequired,
     name,
     initialValue = false,
+    isDisabled = false,
     onChange,
     label,
     form,
@@ -68,6 +69,7 @@ const CheckboxInput = _ref => {
     type: "checkbox",
     id: name,
     name: name,
+    disabled: isDisabled,
     form: form,
     checked: isChecked,
     required: isRequired,

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

@@ -241,6 +241,16 @@ 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 ((!(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'
+          }));
+          return;
+        }
+      }
+
       // Note: this throws on error.
       internalAppointmentFormSchema.validateSync(_objectSpread(_objectSpread(_objectSpread({}, vehicle), customer), {}, {
         // Note: add string fallback here to prevent null check in Yup throwing weird errors
@@ -562,12 +572,12 @@ const InternalAppointmentForm = _ref => {
     isRequired: false,
     form: "quotation",
     label: "Goedkeuringsnummer:",
-    errorMessage: errors === null || errors === void 0 ? void 0 : errors['leaseNumber']
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['leaseNumber'],
+    isDisabled: vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumberUnknown
   }), /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: "leaseNumberUnknown",
     initialValue: vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumberUnknown,
     onChange: val => {
-      vehicle.leaseNumber = null;
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_LEASE_NUMBER_UNKNOWN,
         payload: {
@@ -575,7 +585,8 @@ const InternalAppointmentForm = _ref => {
         }
       });
     },
-    label: "Goedkeuringsnummer onbekend"
+    label: "Goedkeuringsnummer onbekend",
+    isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
   })), (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("h5", {
     className: (0, _helpers__.withStyle)('mt-4')
   }, "Gegevens bedrijf"), /*#__PURE__*/_react.default.createElement(_TextInput.default, {

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

@@ -231,6 +231,16 @@ const InternalQuotationForm = _ref => {
         }
       }
 
+      // Validate lease number for lease company vehicles
+      if ((vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _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'
+          }));
+          return;
+        }
+      }
+
       // Note: this throws on error.
       internalQuotationFormSchema.validateSync(_objectSpread(_objectSpread(_objectSpread({}, vehicle), customer), {}, {
         // Note: add string fallback here to prevent null check in Yup throwing weird errors
@@ -439,12 +449,12 @@ const InternalQuotationForm = _ref => {
     isRequired: false,
     form: "quotation",
     label: "Goedkeuringsnummer:",
-    errorMessage: errors === null || errors === void 0 ? void 0 : errors['leaseNumber']
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['leaseNumber'],
+    isDisabled: vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumberUnknown
   }), /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: "leaseNumberUnknown",
     initialValue: vehicle === null || vehicle === void 0 ? void 0 : vehicle.leaseNumberUnknown,
     onChange: val => {
-      vehicle.leaseNumber = null;
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_LEASE_NUMBER_UNKNOWN,
         payload: {
@@ -452,7 +462,8 @@ const InternalQuotationForm = _ref => {
         }
       });
     },
-    label: "Goedkeuringsnummer onbekend"
+    label: "Goedkeuringsnummer onbekend",
+    isDisabled: !!(vehicle !== null && vehicle !== void 0 && vehicle.leaseNumber)
   })), (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("h5", {
     className: (0, _helpers__.withStyle)('mt-4')
   }, "Gegevens bedrijf"), /*#__PURE__*/_react.default.createElement(_TextInput.default, {

package/dist/src/shared/__context__/OrderSessionContext.js

@@ -135,7 +135,8 @@ const INITIAL_ORDER_SESSION_STATE = {
   customerAgreed: undefined,
   vehicle: {
     ownershipType: _constants__.VEHICLE_OWNERSHIP_TYPE.Particulier,
-    leaseNumber: ''
+    leaseNumber: '',
+    leaseNumberUnknown: true
   },
   discountAmount: null,
   discountPercentage: null,

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

@@ -103,7 +103,8 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
     discountCode: dossier === null || dossier === void 0 ? void 0 : dossier.discountCode,
     vehicle: {
       ownershipType: dossier === null || dossier === void 0 || (_dossier$typeEigendom = dossier.typeEigendomAuto) === null || _dossier$typeEigendom === void 0 ? void 0 : _dossier$typeEigendom.title,
-      leaseNumber: dossier === null || dossier === void 0 ? void 0 : dossier.goedkeuringsnummerLeasemaatschappij
+      leaseNumber: dossier === null || dossier === void 0 ? void 0 : dossier.goedkeuringsnummerLeasemaatschappij,
+      leaseNumberUnknown: dossier === null || dossier === void 0 ? void 0 : dossier.goedkeuringsnummerOnbekend
     },
     discountPercentage: dossier === null || dossier === void 0 ? void 0 : dossier.kortingspercentage,
     discountAmount: (dossier === null || dossier === void 0 ? void 0 : dossier.kortingsbedragInclBtw) || null,

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

@@ -124,8 +124,9 @@ const InternalSessionEditPage = props => {
   const history = (0, _reactRouter.useHistory)();
   const hydrateOrderSessionByDossier = (0, _react.useCallback)(async dossierById => {
     try {
-      var _orderRes$data, _orderRes$data2;
-      const session = (0, _dossier.parseDossierToOrderSession)(dossierById);
+      var _dossierById$akkoordO, _orderRes$data, _orderRes$data2;
+      let session = (0, _dossier.parseDossierToOrderSession)(dossierById);
+      session.customerAgreed = (_dossierById$akkoordO = dossierById === null || dossierById === void 0 ? void 0 : dossierById.akkoordOpmerkingen) !== null && _dossierById$akkoordO !== void 0 ? _dossierById$akkoordO : false;
       const orderRes = await _orderApi.orderApi.getOrder(new URLSearchParams((0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, session), {}, {
         formula
       }))).toString());

package/package.json

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