thm-p3-configurator 0.0.65 → 0.0.67

package/dist/src/shared/__api__/mutations.js

@@ -137,6 +137,7 @@ const useCreatePrivateQuotationMutation = () => {
       vehicle,
       customer,
       channel,
+      chassisNumber,
       licensePlate,
       model,
       answers,
@@ -151,6 +152,7 @@ const useCreatePrivateQuotationMutation = () => {
       isExitIntent,
       model,
       vehicle,
+      chassisNumber,
       licensePlate,
       channel,
       formula,
@@ -187,6 +189,7 @@ const useCreatePrivateAppointmentMutation = () => {
       model,
       answers,
       cart,
+      chassisNumber,
       selectBoardComputerUpdate,
       branchId,
       formula,
@@ -199,6 +202,7 @@ const useCreatePrivateAppointmentMutation = () => {
       vehicle,
       licensePlate,
       channel,
+      chassisNumber,
       formula,
       discount,
       answers,
@@ -279,6 +283,7 @@ const useUpdatePrivateAppointmentByIdMutation = id => {
       channel,
       appointment,
       licensePlate,
+      chassisNumber,
       model,
       answers,
       cart,
@@ -295,6 +300,7 @@ const useUpdatePrivateAppointmentByIdMutation = id => {
         model,
         vehicle,
         licensePlate,
+        chassisNumber,
         channel,
         formula,
         discount,

package/dist/src/shared/__containers__/VehicleData.js

@@ -26,7 +26,10 @@ function _interopRequireDefault(e) {
     default: e
   };
 }
-const VehicleData = () => {
+const VehicleData = _ref => {
+  let {
+    isFilter = false
+  } = _ref;
   const [{
     licensePlate,
     model,
@@ -53,7 +56,7 @@ const VehicleData = () => {
   });
   const history = (0, _reactRouter.useHistory)();
   return /*#__PURE__*/_react.default.createElement(_ExpandableCard.default, {
-    title: "Uw voertuig",
+    title: isFilter ? 'Voertuig' : 'Uw voertuig',
     expandLabel: "Toon voertuiggegevens",
     collapseLabel: "Verberg voertuiggegevens",
     isDefaultExpanded: true,
@@ -70,7 +73,7 @@ const VehicleData = () => {
     }, /*#__PURE__*/_react.default.createElement(_LicensePlateInput.default, {
       initialValue: licensePlate,
       isReadOnly: true
-    })), /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
+    })), !isFilter && /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
       isDisabled: false,
       label: 'Wijzig voertuig',
       onClick: () => {
@@ -79,8 +82,8 @@ const VehicleData = () => {
       className: (0, _helpers__.withStyle)('license-plate__edit link-primary col-12'),
       type: "button"
     })),
-    expandedBody: Object.entries(vehicleDetails).map(_ref => {
-      let [key, value] = _ref;
+    expandedBody: Object.entries(vehicleDetails).map(_ref2 => {
+      let [key, value] = _ref2;
       if (!value) {
         return null;
       }

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

@@ -159,6 +159,7 @@ const InternalAppointmentForm = _ref => {
     licensePlate,
     model,
     vehicle,
+    chassisNumber,
     channel,
     durationAnswer,
     selectedBoardComputer,
@@ -226,14 +227,15 @@ const InternalAppointmentForm = _ref => {
     try {
       var _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _customer$note, _customer$zipCode, _ref2;
       setErrors([]);
-
-      // Note: this does not throw on error.
-      const licensePlateErrors = validateLicensePlate();
-      if (licensePlateErrors) {
-        setErrors(prev => _objectSpread(_objectSpread({}, prev), {}, {
-          licensePlate: licensePlateErrors
-        }));
-        return;
+      if (!model) {
+        // Note: this does not throw on error.
+        const licensePlateErrors = validateLicensePlate();
+        if (licensePlateErrors) {
+          setErrors(prev => _objectSpread(_objectSpread({}, prev), {}, {
+            licensePlate: licensePlateErrors
+          }));
+          return;
+        }
       }
 
       // Note: this throws on error.
@@ -269,6 +271,7 @@ const InternalAppointmentForm = _ref => {
         channel,
         licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
         model,
+        chassisNumber,
         priceCalculationDate,
         answers: (0, _helpers__.removeNullishProps)({
           duration: durationAnswer,
@@ -550,7 +553,7 @@ const InternalAppointmentForm = _ref => {
     }),
     isRequired: false,
     form: "quotation",
-    label: "Code van de leasemaatschappij:",
+    label: "Goedkeuringsnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['leaseNumber']
   }), !licensePlate && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
     placeholder: "",
@@ -561,6 +564,20 @@ const InternalAppointmentForm = _ref => {
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    placeholder: "",
+    initialValue: vehicle === null || vehicle === void 0 ? void 0 : vehicle.chassisNumber,
+    name: "chassisNumber",
+    onChange: value => dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_CHASSIS_NUMBER,
+      payload: {
+        chassisNumber: value
+      }
+    }),
+    isRequired: false,
+    form: "quotation",
+    label: "Chassisnummer:",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['chassisNumber']
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('my-2 fw-bold')
   }, "Opties aanwezig:"), productSpecifications !== null && productSpecifications !== void 0 && productSpecifications.length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ' ', /*#__PURE__*/_react.default.createElement("ul", null, productSpecifications === null || productSpecifications === void 0 ? void 0 : productSpecifications.map(specification => /*#__PURE__*/_react.default.createElement("li", {

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

@@ -1,5 +1,6 @@
 "use strict";
 
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -10,6 +11,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -82,21 +84,29 @@ const NormalPageModalContent = _ref => {
   });
   (0, _react.useEffect)(() => {
     const branchesToSet = isTMGOrganization ? branches === null || branches === void 0 ? void 0 : branches.results : myBranches;
-    if (branchesToSet) {
+    if (!branchesToSet) return;
+
+    // Only update if the branches have actually changed
+    if (JSON.stringify(_branches) !== JSON.stringify(branchesToSet)) {
       _setBranches(branchesToSet);
     }
-  }, [isTMGOrganization, branches === null || branches === void 0 ? void 0 : branches.results, myBranches, isLoadingMyBranches, isLoadingBranches]);
+  }, [isTMGOrganization, branches === null || branches === void 0 ? void 0 : branches.results, myBranches]);
   (0, _react.useEffect)(() => {
     var _branches$;
-    const shouldAutoSelect = !isLocation && !existingDossierId && !isTMGOrganization && (_branches === null || _branches === void 0 ? void 0 : _branches.length) === 1 && !selectedBranch;
+    if (!(_branches !== null && _branches !== void 0 && _branches.length)) return;
+    if (selectedBranch) return;
+    const shouldAutoSelect = !isLocation && !existingDossierId && !isTMGOrganization && _branches.length === 1;
     if (!shouldAutoSelect) return;
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,
-      payload: {
-        branchId: (_branches$ = _branches[0]) === null || _branches$ === void 0 ? void 0 : _branches$.entityId
-      }
-    });
-  }, [selectedBranch, branchTypes, isLocation, existingDossierId, _branches, dispatch, isTMGOrganization]);
+    const branchToSelect = (_branches$ = _branches[0]) === null || _branches$ === void 0 ? void 0 : _branches$.entityId;
+    if (branchToSelect) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,
+        payload: {
+          branchId: branchToSelect
+        }
+      });
+    }
+  }, [_branches, selectedBranch, isLocation, existingDossierId, isTMGOrganization]);
   return /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
     options: _branches === null || _branches === void 0 ? void 0 : _branches.map(branch => ({
       label: branch === null || branch === void 0 ? void 0 : branch.name,

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

@@ -121,6 +121,7 @@ const internalQuotationFormSchema = (0, _yup.object)({
   ownershipType: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   leaseNumber: (0, _yup.string)().nullable(),
   firstName: (0, _yup.string)().nullable(),
+  chassisNumber: (0, _yup.string)().nullable(),
   channelType: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   channelId: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   infix: (0, _yup.string)().nullable(),
@@ -141,6 +142,7 @@ const InternalQuotationForm = _ref => {
     customer,
     licensePlate,
     model,
+    chassisNumber,
     executionAnswer1,
     executionAnswer2,
     priceCalculationDate,
@@ -191,14 +193,15 @@ const InternalQuotationForm = _ref => {
     try {
       var _customer$firstName, _customer$lastName, _customer$phoneNumber, _customer$houseNumber, _customer$streetName, _customer$countryId, _customer$city, _customer$email, _customer$note, _customer$zipCode, _ref2;
       setErrors(null);
-
-      // Note: this does not throw on error.
-      const licensePlateErrors = validateLicensePlate();
-      if (licensePlateErrors) {
-        setErrors(prev => _objectSpread(_objectSpread({}, prev), {}, {
-          licensePlate: licensePlateErrors
-        }));
-        return;
+      if (!model) {
+        // Note: this does not throw on error.
+        const licensePlateErrors = validateLicensePlate();
+        if (licensePlateErrors) {
+          setErrors(prev => _objectSpread(_objectSpread({}, prev), {}, {
+            licensePlate: licensePlateErrors
+          }));
+          return;
+        }
       }
 
       // Note: this throws on error.
@@ -226,6 +229,7 @@ const InternalQuotationForm = _ref => {
           note: (_customer$note = customer === null || customer === void 0 ? void 0 : customer.note) !== null && _customer$note !== void 0 ? _customer$note : undefined,
           zipCode: (_customer$zipCode = customer === null || customer === void 0 ? void 0 : customer.zipCode) !== null && _customer$zipCode !== void 0 ? _customer$zipCode : undefined
         }),
+        chassisNumber: chassisNumber !== null && chassisNumber !== void 0 ? chassisNumber : undefined,
         channel,
         licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
         model,
@@ -407,6 +411,20 @@ const InternalQuotationForm = _ref => {
     form: "quotation",
     label: "Kenteken:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['licensePlate']
+  }), (vehicle === null || vehicle === void 0 ? void 0 : vehicle.ownershipType) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij && /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+    placeholder: "",
+    initialValue: vehicle === null || vehicle === void 0 ? void 0 : vehicle.chassisNumber,
+    name: "chassisNumber",
+    onChange: value => dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_CHASSIS_NUMBER,
+      payload: {
+        chassisNumber: value
+      }
+    }),
+    isRequired: false,
+    form: "quotation",
+    label: "Chassisnummer:",
+    errorMessage: errors === null || errors === void 0 ? void 0 : errors['chassisNumber']
   }), isError && /*#__PURE__*/_react.default.createElement(_ErrorMessage.default, {
     message: 'Er is een fout opgetreden bij het maken van de offerte, probeer het opnieuw.'
   }), /*#__PURE__*/_react.default.createElement("div", {

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

@@ -185,7 +185,6 @@ function InternalSingleOrderFilters(_ref) {
     placeholder: "Maak een keuze",
     onChange: option => {
       setSelectedArticleSubGroup(option.value);
-      setSelectedArticleGroup(null);
     },
     className: "w-100"
   })), /*#__PURE__*/_react.default.createElement("div", {

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

@@ -211,6 +211,7 @@ const orderSessionActions = exports.orderSessionActions = {
   SET_DISCOUNT_AMOUNT: 'SET_DISCOUNT_AMOUNT',
   SET_DISCOUNT_PERCENTAGE: 'SET_DISCOUNT_PERCENTAGE',
   CLEAR_DISCOUNT: 'CLEAR_DISCOUNT',
+  SET_VEHICLE_CHASSIS_NUMBER: 'SET_VEHICLE_CHASSIS_NUMBER',
   SET_FRANCHISE_NAME: 'SET_FRANCHISE_NAME',
   SET_PRICE_CALCULATION_DATE: 'SET_PRICE_CALCULATION_DATE',
   SET_CUSTOMER_AGREED: 'SET_CUSTOMER_AGREED'
@@ -238,6 +239,7 @@ const orderSessionReducer = (state, action) => {
             executionAnswer1: null,
             executionAnswer2: null,
             durationOptions: [],
+            chassisNumber: null,
             execution1Options: [],
             execution2Options: [],
             selectedExtras: {},
@@ -285,6 +287,15 @@ const orderSessionReducer = (state, action) => {
           isTouched: true
         });
       }
+    case orderSessionActions.SET_VEHICLE_CHASSIS_NUMBER:
+      {
+        const {
+          chassisNumber
+        } = action.payload;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          chassisNumber
+        });
+      }
     case orderSessionActions.SET_SINGLE_ORDER_FORMULA_CODE:
       {
         const {

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

@@ -32,6 +32,7 @@ var _InternalSingleOrderCart = _interopRequireDefault(require("../../__container
 var _InternalSingleOrderFilters = _interopRequireDefault(require("../../__containers__/internal/InternalSingleOrderFilters"));
 var _InternalSingleOrderProductOverview = _interopRequireDefault(require("../../__containers__/internal/InternalSingleOrderProductOverview"));
 var _InternalSingleOrderSuccessModal = _interopRequireDefault(require("../../__containers__/internal/InternalSingleOrderSuccessModal"));
+var _VehicleData = _interopRequireDefault(require("../../__containers__/VehicleData"));
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
@@ -143,7 +144,9 @@ const InternalSingleOrderPage = () => {
     selectedBranch,
     appointment,
     internalNote,
-    singleOrderFormulaCode
+    singleOrderFormulaCode,
+    licensePlate,
+    model
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
   if (singleOrderFormulaCode) {
@@ -295,7 +298,9 @@ const InternalSingleOrderPage = () => {
     onValidationError: handleCustomerValidationError
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-3")
-  }, /*#__PURE__*/_react.default.createElement(_InternalSingleOrderCart.default, {
+  }, (licensePlate || model) && /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
+    isFilter: true
+  }), /*#__PURE__*/_react.default.createElement(_InternalSingleOrderCart.default, {
     resetOrderSession: resetOrderSession,
     removeFromCart: removeFromCart,
     handleQuantityChange: handleQuantityChange,

package/package.json

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