thm-p3-configurator 0.0.302 → 0.0.303

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

@@ -240,12 +240,13 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
   }, [isTmg, marketingChannels, channel === null || channel === void 0 ? void 0 : channel.channelId, dispatch]);
 
   /**
-   * @description Auto-set checkboxes when TowCenter branch or TMG formula is selected
-   * Only triggers when isTowCenterBranch or singleOrderFormulaCode changes
+   * @description Auto-set checkboxes when TowCenter branch or TMG organization
+   * - If TMG organization: always enable (ignore towCenterVestiging)
+   * - If NOT TMG: check isTowCenterBranch (from towCenterVestiging)
    * User can manually toggle checkboxes after auto-enable
    */
   (0, _react.useEffect)(() => {
-    const shouldEnable = isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
+    const shouldEnable = isTmg || isTowCenterBranch;
     if (shouldEnable) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
@@ -282,7 +283,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         }
       });
     }
-  }, [isTowCenterBranch, singleOrderFormulaCode, dispatch, vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType]);
+  }, [isTmg, isTowCenterBranch, 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));
@@ -437,7 +438,7 @@ 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;
+      const isTowCenterOrTmg = isTmg || isTowCenterBranch;
       if (isTowCenterOrTmg) {
         validationSchema = validationSchema.shape({
           singleOrderOwnershipType: (0, _yup.string)().required('Type is verplicht').notOneOf([_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty], 'Type is verplicht')
@@ -531,7 +532,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) || (isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG ? _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Particulier : _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Empty),
+    initialValue: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.singleOrderOwnershipType) || (isTmg || isTowCenterBranch ? _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,
@@ -540,10 +541,10 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         }
       });
     },
-    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,
+    options: isTmg || isTowCenterBranch ? 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: isTmg || isTowCenterBranch,
     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", {
+  }), (isTmg || isTowCenterBranch) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mb-2')
   }, /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: "anderAfleveradres",

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

@@ -76,8 +76,7 @@ const NormalPageModalContent = _ref => {
   const [_branches, _setBranches] = (0, _react.useState)([]);
   const [{
     licensePlate,
-    model,
-    singleOrderFormulaCode
+    model
   }] = (0, _OrderSessionContext.useOrderSession)();
   const {
     myBranches,
@@ -138,8 +137,7 @@ const NormalPageModalContent = _ref => {
       const selectedBranchData = isTMGOrganization ? branches === null || branches === void 0 || (_branches$results = branches.results) === null || _branches$results === void 0 ? void 0 : _branches$results.find(b => b.entityId === value) : myBranches === null || myBranches === void 0 ? void 0 : myBranches.find(b => b.entityId === value);
       if (selectedBranchData) {
         const isTowCenter = (selectedBranchData === null || selectedBranchData === void 0 ? void 0 : selectedBranchData.towCenterVestiging) === true;
-        const isTmgFormula = formula === _constants__.CONFIGURATOR_FORMULAS.TMG || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
-        const shouldEnable = isTowCenter || isTmgFormula;
+        const shouldEnable = isTMGOrganization || isTowCenter;
         dispatch({
           type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
           payload: {
@@ -201,9 +199,6 @@ const SingleOrderModalContent = _ref3 => {
     limit: 500,
     offset: 0
   });
-  const [{
-    singleOrderFormulaCode
-  }] = (0, _OrderSessionContext.useOrderSession)();
 
   // Filter branches based on formula if not TMG
   const filteredBranches = _react.default.useMemo(() => {
@@ -355,8 +350,7 @@ const InternalBranchSelectorModal = () => {
     existingDossierId,
     orderType,
     licensePlate,
-    model,
-    singleOrderFormulaCode
+    model
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const {
     branchById
@@ -384,9 +378,7 @@ const InternalBranchSelectorModal = () => {
   (0, _react.useEffect)(() => {
     if (!selectedBranch || !branchById) return;
     const isTowCenter = (branchById === null || branchById === void 0 ? void 0 : branchById.towCenterVestiging) === true;
-    const isTmgFormula = isTMGOrganization === true;
-    const shouldEnable = isTowCenter || isTmgFormula;
-    console.log(isTowCenter, isTmgFormula, shouldEnable);
+    const shouldEnable = isTMGOrganization || isTowCenter;
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
       payload: {
@@ -420,7 +412,7 @@ const InternalBranchSelectorModal = () => {
         }
       });
     }
-  }, [selectedBranch, branchById, singleOrderFormulaCode, isTMGOrganization, dispatch]);
+  }, [selectedBranch, branchById, isTMGOrganization, dispatch]);
   const handlePrimaryButtonClicked = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,

package/package.json

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