thm-p3-configurator 0.0.298 → 0.0.299

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

@@ -32,6 +32,7 @@ var _AddressLookupService = _interopRequireDefault(require("../../__services__/A
 var _LocalStorageWorker = require("../../__services__/LocalStorageWorker");
 var _LinkButton = _interopRequireDefault(require("../Buttons/LinkButton"));
 var _CardWide = _interopRequireDefault(require("../Cards/CardWide"));
+var _CheckboxInput = _interopRequireDefault(require("../Form/CheckboxInput"));
 var _DatePickerInput = _interopRequireDefault(require("../Form/DatePickerInput"));
 var _DropdownInput = _interopRequireDefault(require("../Form/DropdownInput"));
 var _RadioButtons = _interopRequireDefault(require("../Form/RadioButtons"));
@@ -155,7 +156,11 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     appointment,
     internalNote,
     vehicle,
-    webshop
+    webshop,
+    isTowCenterBranch,
+    anderAfleveradres,
+    afhalenInWinkel,
+    singleOrderFormulaCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const {
     branchById
@@ -232,6 +237,29 @@ 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
+   */
+  (0, _react.useEffect)(() => {
+    const shouldEnable = isTowCenterBranch || singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
+    if (shouldEnable && !anderAfleveradres) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+        payload: {
+          anderAfleveradres: true
+        }
+      });
+    }
+    if (shouldEnable && !afhalenInWinkel) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+        payload: {
+          afhalenInWinkel: true
+        }
+      });
+    }
+  }, [isTowCenterBranch, singleOrderFormulaCode, anderAfleveradres, afhalenInWinkel, dispatch]);
   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));
@@ -384,6 +412,23 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
           phoneNumber: (0, _yup.string)().required('Telefoonnummer 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;
+        const requiredFields = {
+          firstName: (0, _yup.string)().required('Voornaam is verplicht'),
+          lastName: (0, _yup.string)().required('Achternaam is verplicht'),
+          streetName: (0, _yup.string)().required('Straatnaam 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')
+        };
+        if (isZakelijk) {
+          requiredFields.companyName = (0, _yup.string)().required('Bedrijfsnaam is verplicht');
+        }
+        validationSchema = validationSchema.shape(requiredFields);
+      }
       await validationSchema.validate(_objectSpread(_objectSpread({}, customer), {}, {
         channelType: (channel === null || channel === void 0 ? void 0 : channel.channelType) || '',
         channelId: (channel === null || channel === void 0 ? void 0 : channel.channelId) || ''
@@ -465,7 +510,33 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     options: Object.values(_constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE),
     isRequired: false,
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['singleOrderOwnershipType']
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }), (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')
+  }, /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
+    name: "anderAfleveradres",
+    label: "Ander afleveradres",
+    initialValue: anderAfleveradres,
+    onChange: value => dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+      payload: {
+        anderAfleveradres: value
+      }
+    }),
+    form: form
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)('col-12 mb-2')
+  }, /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
+    name: "afhalenInWinkel",
+    label: "Afhalen in winkel",
+    initialValue: afhalenInWinkel,
+    onChange: value => dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+      payload: {
+        afhalenInWinkel: value
+      }
+    }),
+    form: form
+  }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mt-2 col-md-6')
   }, /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('modal-title mb-2')
@@ -479,7 +550,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         firstName: value
       }
     }),
-    isRequired: webshop,
+    isRequired: webshop || anderAfleveradres,
     form: form,
     label: "Voornaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['firstName']
@@ -507,7 +578,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         lastName: value
       }
     }),
-    isRequired: webshop,
+    isRequired: webshop || anderAfleveradres,
     form: form,
     label: "Achternaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['lastName']
@@ -578,7 +649,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         setIsCompanyInputFocused(false);
       }, 300);
     },
-    isRequired: false,
+    isRequired: anderAfleveradres,
     form: form,
     label: "Bedrijfsnaam:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['companyName']
@@ -725,7 +796,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         handleAddressLookup(value, customer.houseNumber);
       }
     },
-    isRequired: false,
+    isRequired: anderAfleveradres,
     form: form,
     label: "Postcode:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['zipCode']
@@ -773,7 +844,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         streetName: value
       }
     }),
-    isRequired: false,
+    isRequired: anderAfleveradres,
     form: form,
     label: "Straat:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['streetName']
@@ -787,7 +858,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
         city: value
       }
     }),
-    isRequired: false,
+    isRequired: anderAfleveradres,
     form: form,
     label: "Stad:".concat(addressLookupLoading ? ' (wordt opgezocht...)' : ''),
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['city']
@@ -795,7 +866,7 @@ const InternalCustomerDetailsForm = (_ref, ref) => {
     options: countryOptions,
     name: "country",
     label: "Land:",
-    isRequired: false,
+    isRequired: anderAfleveradres,
     isLoading: isLoadingCountries,
     noOptionsMessage: "Geen landen beschikbaar",
     placeholder: "Selecteer een land",

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

@@ -4,6 +4,7 @@ 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.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
 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");
@@ -15,6 +16,7 @@ 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.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
 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");
@@ -74,7 +76,8 @@ const NormalPageModalContent = _ref => {
   const [_branches, _setBranches] = (0, _react.useState)([]);
   const [{
     licensePlate,
-    model
+    model,
+    singleOrderFormulaCode
   }] = (0, _OrderSessionContext.useOrderSession)();
   const {
     myBranches,
@@ -101,7 +104,6 @@ const NormalPageModalContent = _ref => {
     if (!(_branches !== null && _branches !== void 0 && _branches.length)) return;
     if (selectedBranch) return;
     const shouldAutoSelect = !existingDossierId && !isTMGOrganization && _branches.length === 1;
-    console.log(existingDossierId, isTMGOrganization, _branches.length);
     if (!shouldAutoSelect) return;
     const branchToSelect = (_branches$ = _branches[0]) === null || _branches$ === void 0 ? void 0 : _branches$.entityId;
     if (branchToSelect) {
@@ -113,11 +115,12 @@ const NormalPageModalContent = _ref => {
       });
     }
   }, [_branches, selectedBranch, isLocation, existingDossierId, isTMGOrganization]);
+  const branchOptions = _branches === null || _branches === void 0 ? void 0 : _branches.map(branch => ({
+    label: branch === null || branch === void 0 ? void 0 : branch.name,
+    value: branch === null || branch === void 0 ? void 0 : branch.entityId
+  }));
   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,
-      value: branch === null || branch === void 0 ? void 0 : branch.entityId
-    })),
+    options: branchOptions,
     name: "channel",
     label: "Vestiging:",
     isRequired: true,
@@ -126,11 +129,38 @@ const NormalPageModalContent = _ref => {
     placeholder: "Maak een keuze",
     initialValue: _selectedBranchId,
     onChange: _ref2 => {
+      var _branches$results;
       let {
         label,
         value
       } = _ref2;
-      return setSelectedBranchId(value);
+      setSelectedBranchId(value);
+      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;
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
+          payload: {
+            isTowCenterBranch: isTowCenter
+          }
+        });
+        if (shouldEnable) {
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+            payload: {
+              anderAfleveradres: true
+            }
+          });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+            payload: {
+              afhalenInWinkel: true
+            }
+          });
+        }
+      }
     }
   });
 };
@@ -158,6 +188,9 @@ 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(() => {
@@ -174,6 +207,10 @@ const SingleOrderModalContent = _ref3 => {
     var _branch$formule$code, _branch$formule2;
     branchIdWithFormulaCode.set(branch === null || branch === void 0 ? void 0 : branch.entityId, (_branch$formule$code = branch === null || branch === void 0 || (_branch$formule2 = branch.formule) === null || _branch$formule2 === void 0 ? void 0 : _branch$formule2.code) !== null && _branch$formule$code !== void 0 ? _branch$formule$code : _constants__.CONFIGURATOR_FORMULAS.THC);
   });
+  const branchOptions = filteredBranches === null || filteredBranches === void 0 ? void 0 : filteredBranches.map(branch => ({
+    label: "".concat(branch === null || branch === void 0 ? void 0 : branch.naamVestiging, " - ").concat(branch === null || branch === void 0 ? void 0 : branch.name),
+    value: branch === null || branch === void 0 ? void 0 : branch.entityId
+  }));
   (0, _react.useEffect)(() => {
     if (isLocation && !selectedBranch && !isTMGOrganization) {
       var _authSession$branch;
@@ -207,10 +244,7 @@ const SingleOrderModalContent = _ref3 => {
       setLocalBranchId(undefined);
     }
   }), (formula === _constants__.CONFIGURATOR_FORMULAS.TMG ? singleOrderBranchType : true) && /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
-    options: filteredBranches === null || filteredBranches === void 0 ? void 0 : filteredBranches.map(branch => ({
-      label: "".concat(branch === null || branch === void 0 ? void 0 : branch.naamVestiging, " - ").concat(branch === null || branch === void 0 ? void 0 : branch.name),
-      value: branch === null || branch === void 0 ? void 0 : branch.entityId
-    })),
+    options: branchOptions,
     name: "branch",
     label: "Vestiging:",
     isRequired: true,
@@ -225,12 +259,39 @@ const SingleOrderModalContent = _ref3 => {
       } = _ref5;
       setSelectedBranchId(value);
       setLocalBranchId(value);
+      const formulaCode = branchIdWithFormulaCode.get(value);
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_SINGLE_ORDER_FORMULA_CODE,
         payload: {
-          formulaCode: branchIdWithFormulaCode.get(value)
+          formulaCode
         }
       });
+      const selectedBranchData = filteredBranches === null || filteredBranches === void 0 ? void 0 : filteredBranches.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 || formulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
+        const shouldEnable = isTowCenter || isTmgFormula;
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
+          payload: {
+            isTowCenterBranch: isTowCenter
+          }
+        });
+        if (shouldEnable) {
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+            payload: {
+              anderAfleveradres: true
+            }
+          });
+          dispatch({
+            type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+            payload: {
+              afhalenInWinkel: true
+            }
+          });
+        }
+      }
     }
   }));
 };
@@ -256,8 +317,12 @@ const InternalBranchSelectorModal = () => {
     existingDossierId,
     orderType,
     licensePlate,
-    model
+    model,
+    singleOrderFormulaCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const {
+    branchById
+  } = (0, _queries.useBranchByIdOrWidgetId)(selectedBranch);
   const {
     myBranches,
     isLoadingMyBranches
@@ -278,6 +343,32 @@ const InternalBranchSelectorModal = () => {
     });
     _setSelectedBranchId(onlyBranchId);
   }, [shouldAutoSelect, myBranches, dispatch]);
+  (0, _react.useEffect)(() => {
+    if (!selectedBranch || !branchById) return;
+    const isTowCenter = (branchById === null || branchById === void 0 ? void 0 : branchById.towCenterVestiging) === true;
+    const isTmgFormula = singleOrderFormulaCode === _constants__.CONFIGURATOR_FORMULAS.TMG;
+    const shouldEnable = isTowCenter || isTmgFormula;
+    dispatch({
+      type: _OrderSessionContext.orderSessionActions.SET_IS_TOW_CENTER_BRANCH,
+      payload: {
+        isTowCenterBranch: isTowCenter
+      }
+    });
+    if (shouldEnable) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_ANDER_AFLEVERADRES,
+        payload: {
+          anderAfleveradres: true
+        }
+      });
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_AFHALEN_IN_WINKEL,
+        payload: {
+          afhalenInWinkel: true
+        }
+      });
+    }
+  }, [selectedBranch, branchById, singleOrderFormulaCode, dispatch]);
   const handlePrimaryButtonClicked = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,

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

@@ -174,7 +174,10 @@ const INITIAL_ORDER_SESSION_STATE = {
   },
   invoicePaymentByLeaseCompany: false,
   orderType: null,
-  webshop: null
+  webshop: null,
+  isTowCenterBranch: false,
+  anderAfleveradres: false,
+  afhalenInWinkel: false
 };
 const orderSessionActions = exports.orderSessionActions = {
   INITIALIZE_NEW_ORDER: 'INITIALIZE_NEW_ORDER',
@@ -252,7 +255,10 @@ const orderSessionActions = exports.orderSessionActions = {
   SET_VEHICLE_CODING_DISCOUNT_PERCENTAGE: 'SET_VEHICLE_CODING_DISCOUNT_PERCENTAGE',
   SET_CONSUMER_DISCOUNT_PERCENTAGE: 'SET_CONSUMER_DISCOUNT_PERCENTAGE',
   SET_MONTAGE_RATE: 'SET_MONTAGE_RATE',
-  SET_IS_MONTAGE_TARIFF_FIXED: 'SET_IS_MONTAGE_TARIFF_FIXED'
+  SET_IS_MONTAGE_TARIFF_FIXED: 'SET_IS_MONTAGE_TARIFF_FIXED',
+  SET_IS_TOW_CENTER_BRANCH: 'SET_IS_TOW_CENTER_BRANCH',
+  SET_ANDER_AFLEVERADRES: 'SET_ANDER_AFLEVERADRES',
+  SET_AFHALEN_IN_WINKEL: 'SET_AFHALEN_IN_WINKEL'
 };
 const orderSessionReducer = (state, action) => {
   switch (action.type) {
@@ -1136,6 +1142,33 @@ const orderSessionReducer = (state, action) => {
           webshop
         });
       }
+    case orderSessionActions.SET_IS_TOW_CENTER_BRANCH:
+      {
+        const {
+          isTowCenterBranch
+        } = action.payload;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          isTowCenterBranch
+        });
+      }
+    case orderSessionActions.SET_ANDER_AFLEVERADRES:
+      {
+        const {
+          anderAfleveradres
+        } = action.payload;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          anderAfleveradres
+        });
+      }
+    case orderSessionActions.SET_AFHALEN_IN_WINKEL:
+      {
+        const {
+          afhalenInWinkel
+        } = action.payload;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          afhalenInWinkel
+        });
+      }
     default:
       return state;
   }

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

@@ -152,7 +152,9 @@ const InternalSingleOrderPage = () => {
     licensePlate,
     durationAnswer,
     model,
-    webshop
+    webshop,
+    anderAfleveradres,
+    afhalenInWinkel
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
   if (singleOrderFormulaCode) {
@@ -335,7 +337,10 @@ const InternalSingleOrderPage = () => {
           model: filters.model,
           cart: singleOrderCart,
           vehicle: vehiclePayload,
-          customer,
+          customer: _objectSpread(_objectSpread({}, customer), {}, {
+            anderAfleveradres,
+            afhalenInWinkel
+          }),
           formula,
           webshop,
           branchId: selectedBranch,
@@ -354,7 +359,10 @@ const InternalSingleOrderPage = () => {
           model: filters.model,
           cart: singleOrderCart,
           vehicle: vehiclePayload,
-          customer
+          customer: _objectSpread(_objectSpread({}, customer), {}, {
+            anderAfleveradres,
+            afhalenInWinkel
+          })
         }, formula === _constants__.CONFIGURATOR_FORMULAS.THM ? {
           formula: _constants__.CONFIGURATOR_FORMULAS.TM
         } : {

package/package.json

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