thm-p3-configurator 0.0.299 → 0.0.300

package/dist/src/shared/__components__/internal/InternalCustomerDetailsForm.js

@@ -9,7 +9,6 @@ require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -17,6 +16,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("core-js/modules/es.promise.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
@@ -162,6 +162,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     afhalenInWinkel,
     singleOrderFormulaCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  console;
   const {
     branchById
   } = (0, _queries.useBranchByIdOrWidgetId)(selectedBranch);
@@ -240,26 +241,48 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
 
   /**
    * @description Auto-set checkboxes when TowCenter branch or TMG formula is selected
+   * Only triggers when isTowCenterBranch or singleOrderFormulaCode changes
+   * User can manually toggle checkboxes after auto-enable
    */
   (0, _react.useEffect)(() => {
     const shouldEnable = isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
-    if (shouldEnable && !anderAfleveradres) {
+    if (shouldEnable) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
         payload: {
           anderAfleveradres: true
         }
       });
-    }
-    if (shouldEnable && !afhalenInWinkel) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
         payload: {
           afhalenInWinkel: true
         }
       });
+      // Set default ownership type to Particulier if not already set
+      if (!(vehicle !== null && vehicle !== void 0 && vehicle.singleOrderOwnershipType) || (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE,
+          payload: {
+            singleOrderOwnershipType: _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Particulier
+          }
+        });
+      }
+    } else {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+        payload: {
+          anderAfleveradres: false
+        }
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+        payload: {
+          afhalenInWinkel: false
+        }
+      });
     }
-  }, [isTowCenterBranch, singleOrderFormulaCode, anderAfleveradres, afhalenInWinkel, dispatch]);
+  }, [isTowCenterBranch, singleOrderFormulaCode, dispatch, vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType]);
   const initialChannel = (0, _react.useMemo)(() => {
     if (!(channel !== null && channel !== void 0 && channel.channelId) || !(marketingChannels !== null && marketingChannels !== void 0 && marketingChannels.length)) return null;
     const selectedChannel = marketingChannels === null || marketingChannels === void 0 ? void 0 : marketingChannels.find(marketingC => (marketingC === null || marketingC === void 0 ? void 0 : marketingC.entityId) === (channel === null || channel === void 0 ? void 0 : channel.channelId));
@@ -413,6 +436,14 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         });
       }
 
+      // When TowCenter or TMG, ownership type is required (Niet van toepassing not allowed)
+      const isTowCenterOrTmg = isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
+      if (isTowCenterOrTmg) {
+        validationSchema = validationSchema.shape({
+          singleOrderOwnershipType: (0, _yup.string)().required('Type is verplicht').notOneOf([_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty], 'Type is verplicht')
+        });
+      }
+
       // When anderAfleveradres is enabled, make address fields required
       if (anderAfleveradres) {
         const isZakelijk = (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk;
@@ -420,6 +451,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
           firstName: (0, _yup.string)().required('Voornaam is verplicht'),
           lastName: (0, _yup.string)().required('Achternaam is verplicht'),
           streetName: (0, _yup.string)().required('Straatnaam is verplicht'),
+          houseNumber: (0, _yup.string)().required('Huisnummer is verplicht'),
           zipCode: (0, _yup.string)().required('Postcode is verplicht'),
           city: (0, _yup.string)().required('Stad is verplicht'),
           countryId: (0, _yup.string)().required('Land is verplicht')
@@ -430,6 +462,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         validationSchema = validationSchema.shape(requiredFields);
       }
       await validationSchema.validate(_objectSpread(_objectSpread({}, customer), {}, {
+        singleOrderOwnershipType: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) || '',
         channelType: (channel === null || channel === void 0 ? void 0 : channel.channelType) || '',
         channelId: (channel === null || channel === void 0 ? void 0 : channel.channelId) || ''
       }), {
@@ -498,7 +531,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   })), /*#__PURE__*/_react.default.createElement(_RadioButtons.default, {
     name: "singleOrderOwnershipType",
     label: "Type:",
-    initialValue: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) || _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty,
+    initialValue: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) || (isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG ? _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Particulier : _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty),
     onChange: val => {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE,
@@ -507,8 +540,8 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         }
       });
     },
-    options: Object.values(_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE),
-    isRequired: false,
+    options: isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG ? Object.values(_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE).filter(option => option !== _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty) : Object.values(_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE),
+    isRequired: isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG,
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['singleOrderOwnershipType']
   }), (isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mb-2')
@@ -816,7 +849,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         handleAddressLookup(customer.zipCode, value);
       }
     },
-    isRequired: false,
+    isRequired: anderAfleveradres,
     form: form,
     label: "Huisnummer:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['houseNumber']

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

@@ -624,7 +624,6 @@ const ProductCartTable = () => {
 
   const showCatalogPrice = !isThc;
   const headerColumns = (0, _cartTable2.getCartTableHeaderColumns)(displayMode, showCatalogPrice);
-  console.log(mainProducts);
   const montageRateInputCell = isThc ? {} : {
     text: renderMontageRateInput(),
     className: _cartTable.CART_TABLE_PRICE_CELL_CLASS

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

@@ -217,7 +217,8 @@ const InternalAppointmentForm = _ref => {
     webshop,
     vehicleCodingDiscountPercentage,
     consumerDiscounts,
-    montageRate
+    montageRate,
+    hasGoedkeuringsnummerActivity
   } = order;
   const [errors, setErrors] = (0, _react.useState)({});
   const [_licensePlate, _setLicensePlate] = (0, _react.useState)();
@@ -816,19 +817,23 @@ const InternalAppointmentForm = _ref => {
       setCompanySearchTerm('');
       setIsCompanyInputFocused(false);
     }
-  }, branch.name)))), /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
+  }, branch.name)))), (branchById === null || branchById === void 0 ? void 0 : branchById.towCenterVestiging) === true && /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: "invoicePaymentByLeaseCompany",
     label: "Factuur betaling door Leasemaatschappij",
     initialValue: invoicePaymentByLeaseCompany,
     onChange: val => {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INVOICE_PAYMENT_BY_LEASE_COMPANY,
-        payload: {
-          invoicePaymentByLeaseCompany: val
-        }
-      });
+      // Only allow if no existingDossierId OR hasGoedkeuringsnummerActivity
+      if (!existingDossierId || hasGoedkeuringsnummerActivity) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_INVOICE_PAYMENT_BY_LEASE_COMPANY,
+          payload: {
+            invoicePaymentByLeaseCompany: val
+          }
+        });
+      }
     },
-    isRequired: false
+    isRequired: false,
+    isDisabled: existingDossierId && !hasGoedkeuringsnummerActivity
   }))), /*#__PURE__*/_react.default.createElement("h5", {
     className: (0, _helpers__.withStyle)('my-2')
   }, "Persoonlijke gegevens"), /*#__PURE__*/_react.default.createElement("div", {

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

@@ -159,6 +159,19 @@ const NormalPageModalContent = _ref => {
               afhalenInWinkel: true
             }
           });
+        } else {
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+            payload: {
+              anderAfleveradres: false
+            }
+          });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+            payload: {
+              afhalenInWinkel: false
+            }
+          });
         }
       }
     }
@@ -284,12 +297,37 @@ const SingleOrderModalContent = _ref3 => {
               anderAfleveradres: true
             }
           });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
+            payload: {
+              isTowCenterBranch: isTowCenter
+            }
+          });
           dispatch({
             type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
             payload: {
               afhalenInWinkel: true
             }
           });
+        } else {
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+            payload: {
+              anderAfleveradres: false
+            }
+          });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
+            payload: {
+              isTowCenterBranch: isTowCenter
+            }
+          });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+            payload: {
+              afhalenInWinkel: false
+            }
+          });
         }
       }
     }
@@ -367,6 +405,19 @@ const InternalBranchSelectorModal = () => {
           afhalenInWinkel: true
         }
       });
+    } else {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+        payload: {
+          anderAfleveradres: false
+        }
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+        payload: {
+          afhalenInWinkel: false
+        }
+      });
     }
   }, [selectedBranch, branchById, singleOrderFormulaCode, dispatch]);
   const handlePrimaryButtonClicked = () => {

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

@@ -177,7 +177,8 @@ const INITIAL_ORDER_SESSION_STATE = {
   webshop: null,
   isTowCenterBranch: false,
   anderAfleveradres: false,
-  afhalenInWinkel: false
+  afhalenInWinkel: false,
+  hasGoedkeuringsnummerActivity: false
 };
 const orderSessionActions = exports.orderSessionActions = {
   INITIALIZE_NEW_ORDER: 'INITIALIZE_NEW_ORDER',

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

@@ -73,7 +73,7 @@ function _toPrimitive(t, r) {
  * @description Covnerts an existing hyper dossier object into a local order session
  */
 const parseDossierToOrderSession = exports.parseDossierToOrderSession = function parseDossierToOrderSession() {
-  var _dossier$statusBeoord, _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$statusDossie, _dossier$statusDossie2, _dossier$lines$some, _dossier$lines, _dossier$vestiging, _dossier$typeEigendom, _dossier$klant, _dossier$klant2, _dossier$klant3, _dossier$klant4, _dossier$klant$postal, _dossier$klant5, _dossier$klant$city, _dossier$klant6, _dossier$klant$street, _dossier$klant7, _dossier$klant$huisnu, _dossier$klant8, _dossier$anwbId, _dossier$bedrijfsnaam, _dossier$placeholderB, _dossier$kvkNummer, _dossier$btwNummer;
+  var _dossier$statusBeoord, _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$statusDossie, _dossier$statusDossie2, _dossier$lines$some, _dossier$lines, _dossier$vestiging, _dossier$typeEigendom, _dossier$klant, _dossier$klant2, _dossier$klant3, _dossier$klant4, _dossier$klant$postal, _dossier$klant5, _dossier$klant$city, _dossier$klant6, _dossier$klant$street, _dossier$klant7, _dossier$klant$huisnu, _dossier$klant8, _dossier$anwbId, _dossier$bedrijfsnaam, _dossier$placeholderB, _dossier$kvkNummer, _dossier$btwNummer, _dossier$hasGoedkeuri;
   let dossier = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
     canAlterQuantity: (dossier === null || dossier === void 0 || (_dossier$statusBeoord = dossier.statusBeoordeling) === null || _dossier$statusBeoord === void 0 ? void 0 : _dossier$statusBeoord.title) === _constants__.STATUS_ASSESSMENT.Open,
@@ -143,7 +143,8 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
       companyNamePlaceholder: (_dossier$placeholderB = dossier === null || dossier === void 0 ? void 0 : dossier.placeholderBedrijfsnaam) !== null && _dossier$placeholderB !== void 0 ? _dossier$placeholderB : undefined,
       kvkNumber: (_dossier$kvkNummer = dossier === null || dossier === void 0 ? void 0 : dossier.kvkNummer) !== null && _dossier$kvkNummer !== void 0 ? _dossier$kvkNummer : undefined,
       vatNumber: (_dossier$btwNummer = dossier === null || dossier === void 0 ? void 0 : dossier.btwNummer) !== null && _dossier$btwNummer !== void 0 ? _dossier$btwNummer : undefined
-    }
+    },
+    hasGoedkeuringsnummerActivity: (_dossier$hasGoedkeuri = dossier === null || dossier === void 0 ? void 0 : dossier.hasGoedkeuringsnummerActivity) !== null && _dossier$hasGoedkeuri !== void 0 ? _dossier$hasGoedkeuri : false
   };
 };
 

package/package.json

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