ordering-ui-admin-external 1.27.1 → 1.28.1

package/_modules/components/Delivery/DriversGroupGeneralForm/index.js

@@ -22,13 +22,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriversGroupGeneralForm = function DriversGroupGeneralForm(props) {
-  var _configState$configs, _configState$configs$, _ref, _changesState$name, _driversGroupState$dr, _changesState$adminis, _driversGroupState$dr2, _changesState$type, _driversGroupState$dr3, _driversGroupState$dr4, _changesState$priorit, _driversGroupState$dr5;
+  var _ref, _changesState$name, _driversGroupState$dr, _changesState$adminis, _driversGroupState$dr2, _changesState$type, _driversGroupState$dr3, _driversGroupState$dr4, _changesState$priorit, _driversGroupState$dr5;
   var driversGroupState = props.driversGroupState,
     driversManagers = props.driversManagers,
     changesState = props.changesState,
     handleChangesState = props.handleChangesState,
-    useAdvanced = props.useAdvanced,
-    setUseAdvanced = props.setUseAdvanced,
     handleUpdateDriversGroup = props.handleUpdateDriversGroup,
     handleAddDriversGroup = props.handleAddDriversGroup,
     actionDisabled = props.actionDisabled,
@@ -48,13 +46,9 @@ var DriversGroupGeneralForm = function DriversGroupGeneralForm(props) {
     _useState2 = _slicedToArray(_useState, 2),
     alertState = _useState2[0],
     setAlertState = _useState2[1];
-  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
-    _useConfig2 = _slicedToArray(_useConfig, 1),
-    configState = _useConfig2[0];
   var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
     _useSession2 = _slicedToArray(_useSession, 1),
     user = _useSession2[0].user;
-  var autoAssignType = configState === null || configState === void 0 ? void 0 : (_configState$configs = configState.configs) === null || _configState$configs === void 0 ? void 0 : (_configState$configs$ = _configState$configs.autoassign_type) === null || _configState$configs$ === void 0 ? void 0 : _configState$configs$.value;
   var typeOptions = [{
     value: 0,
     content: t('IN_HOUSE_DRIVERS', 'In house drivers')
@@ -81,16 +75,6 @@ var DriversGroupGeneralForm = function DriversGroupGeneralForm(props) {
     value: 2,
     content: t('URGENT', 'Urgent')
   }];
-  var handleLogistic = function handleLogistic(checked) {
-    setUseAdvanced(checked);
-    if (checked) return;
-    var changes = {
-      autoassign_amount_drivers: 0,
-      orders_group_max_orders: 0
-    };
-    if (!driversGroupState.driversGroup) return;
-    handleUpdateDriversGroup(changes);
-  };
   var onSubmit = function onSubmit() {
     if (driversGroupState.driversGroup) {
       if ((changesState === null || changesState === void 0 ? void 0 : changesState.drivers) === '[]') {
@@ -195,12 +179,7 @@ var DriversGroupGeneralForm = function DriversGroupGeneralForm(props) {
         priority: val
       });
     }
-  })), driversGroupState.driversGroup && autoAssignType !== 'basic' && /*#__PURE__*/_react.default.createElement(_styles2.CheckboxContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
-    checked: useAdvanced,
-    onChange: function onChange(e) {
-      return handleLogistic(e.target.checked);
-    }
-  }), /*#__PURE__*/_react.default.createElement("p", null, t('USE_ADVANCED_LOGISTIC', 'Use advanced logistic'))), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  })), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "primary",
     type: "submit",

package/_modules/components/Delivery/DriversGroupGeneralForm/styles.js

@@ -4,9 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InputWrapper = exports.Container = exports.CheckboxContainer = void 0;
+exports.InputWrapper = exports.Container = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -18,9 +18,4 @@ exports.Container = Container;
 var InputWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  margin-bottom: 35px;\n\n  label {\n    font-size: 14px;\n  }\n\n  div {\n    font-size: 14px;\n  }\n\n  .select {\n    padding: 11px 0;\n    border: none;\n    background-color: ", ";\n  }\n  .list {\n    .options {\n      > div {\n        > div {\n          padding: 7px 10px;\n        }\n      }\n    }\n  }\n"])), function (props) {
   return props.theme.colors.secundary;
 });
-exports.InputWrapper = InputWrapper;
-var CheckboxContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  p {\n    font-size: 14px;\n    margin: 0px;\n    ", "\n  }\n"])), function (props) {
-  var _props$theme;
-  return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n      padding-right: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n      padding-left: 10px;\n    "])));
-});
-exports.CheckboxContainer = CheckboxContainer;
+exports.InputWrapper = InputWrapper;

package/_modules/components/Delivery/DriversGroupsList/index.js

@@ -104,22 +104,23 @@ var DriversGroupsList = function DriversGroupsList(props) {
     }
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DriversGroupsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.TableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.GroupsTable, {
-    "data-tour": "tour_delivery_completed"
+    "data-tour": "tour_delivery_completed",
+    disabled: isFromStore
   }, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
     onClick: function onClick() {
       return handleAllSelectGroup();
     },
     isChecked: !driversGroupsState.loading && selectedGroupList.length === driversGroupsState.groups.length
-  }, !driversGroupsState.loading && selectedGroupList.length === driversGroupsState.groups.length ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null)), /*#__PURE__*/_react.default.createElement("span", null, t('ID', 'ID')))), /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupNameContainer, {
+  }, !isFromStore && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !driversGroupsState.loading && selectedGroupList.length === driversGroupsState.groups.length ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null))), /*#__PURE__*/_react.default.createElement("span", null, t('ID', 'ID')))), /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupNameContainer, {
     isHeader: true
   }, /*#__PURE__*/_react.default.createElement("p", null, t('GROUP', 'Group')))), /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.DriverManagerContainer, {
     isHeader: true
   }, t('DRIVER_MANAGER', 'Driver manager'))), /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.DriverGroupTypeContainer, {
     isHeader: true
-  }, t('TYPE', 'Type'))), /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, t('ACTIONS', 'Actions'))))), driversGroupsState.loading ? _toConsumableArray(Array(groupsPerPage).keys()).map(function (i) {
+  }, t('TYPE', 'Type'))), !isFromStore && /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, t('ACTIONS', 'Actions'))))), driversGroupsState.loading ? _toConsumableArray(Array(groupsPerPage).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement("tbody", {
       key: i
-    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupIdWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupIdWrapper, null, !isFromStore && /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
       width: 18,
       height: 18
     }), /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
@@ -140,7 +141,7 @@ var DriversGroupsList = function DriversGroupsList(props) {
       width: 80
     }))))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.DriverGroupTypeContainer, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
       width: 70
-    }))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.EnableWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+    }))), !isFromStore && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.EnableWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
       width: 50
     }))))));
   }) : currentGroups.map(function (group) {
@@ -151,7 +152,7 @@ var DriversGroupsList = function DriversGroupsList(props) {
       onClick: function onClick(e) {
         return handleClickDriverGroup(e, group);
       }
-    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
+    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.GroupIdWrapper, null, !isFromStore && /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
       className: "group-checkbox",
       onClick: function onClick() {
         return handleSelectGroup(group.id);
@@ -161,7 +162,7 @@ var DriversGroupsList = function DriversGroupsList(props) {
       bgimage: group === null || group === void 0 ? void 0 : (_group$administrator2 = group.administrator) === null || _group$administrator2 === void 0 ? void 0 : _group$administrator2.photo
     }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), /*#__PURE__*/_react.default.createElement(_styles2.InfoBlock, null, /*#__PURE__*/_react.default.createElement("p", {
       className: "bold"
-    }, group === null || group === void 0 ? void 0 : (_group$administrator3 = group.administrator) === null || _group$administrator3 === void 0 ? void 0 : _group$administrator3.name, " ", group === null || group === void 0 ? void 0 : (_group$administrator4 = group.administrator) === null || _group$administrator4 === void 0 ? void 0 : _group$administrator4.lastname), /*#__PURE__*/_react.default.createElement("p", null, group === null || group === void 0 ? void 0 : (_group$administrator5 = group.administrator) === null || _group$administrator5 === void 0 ? void 0 : _group$administrator5.email)))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.DriverGroupTypeContainer, null, getTypeTag(group === null || group === void 0 ? void 0 : group.type))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.EnableWrapper, {
+    }, group === null || group === void 0 ? void 0 : (_group$administrator3 = group.administrator) === null || _group$administrator3 === void 0 ? void 0 : _group$administrator3.name, " ", group === null || group === void 0 ? void 0 : (_group$administrator4 = group.administrator) === null || _group$administrator4 === void 0 ? void 0 : _group$administrator4.lastname), /*#__PURE__*/_react.default.createElement("p", null, group === null || group === void 0 ? void 0 : (_group$administrator5 = group.administrator) === null || _group$administrator5 === void 0 ? void 0 : _group$administrator5.email)))), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.DriverGroupTypeContainer, null, getTypeTag(group === null || group === void 0 ? void 0 : group.type))), !isFromStore && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.EnableWrapper, {
       className: "group-enabled"
     }, /*#__PURE__*/_react.default.createElement("span", null, t('ENABLE', 'Enable')), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
       disabled: actionDisabled,

package/_modules/components/Delivery/DriversGroupsList/styles.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.WrapperImage = exports.TableWrapper = exports.PagesBottomContainer = exports.InfoBlock = exports.Image = exports.GroupsTable = exports.GroupNameContainer = exports.GroupIdWrapper = exports.EnableWrapper = exports.DriversGroupsContainer = exports.DriverManagerContainer = exports.DriverGroupTypeContainer = exports.CheckBoxWrapper = exports.BorderWrapper = exports.ActionsContainer = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -17,59 +17,62 @@ var DriversGroupsContainer = _styledComponents.default.div(_templateObject || (_
 exports.DriversGroupsContainer = DriversGroupsContainer;
 var TableWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  overflow: auto;\n"])));
 exports.TableWrapper = TableWrapper;
-var GroupsTable = _styledComponents.default.table(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: calc(100% - 10px);\n  min-width: 900px;\n  color: ", ";\n\n  td, th {\n    padding: 13px 0;\n    font-size: 12px;\n  }\n\n  thead {\n    tr {\n      border-bottom: solid 1px ", ";\n    }\n  }\n\n  tbody {\n    border-bottom: 1px solid ", ";\n    cursor: pointer;\n\n    &:hover {\n      background-color: ", ";\n    }\n    &.active {\n      background-color: ", ";\n      td {\n        border-top: 1px solid ", ";\n        border-bottom: 1px solid ", ";\n      }\n    }\n  }\n"])), function (props) {
+var GroupsTable = _styledComponents.default.table(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: calc(100% - 10px);\n  min-width: 900px;\n  color: ", ";\n\n  td, th {\n    padding: 13px 0;\n    font-size: 12px;\n  }\n\n  thead {\n    tr {\n      border-bottom: solid 1px ", ";\n    }\n  }\n\n  tbody {\n    border-bottom: 1px solid ", ";\n    ", "\n  }\n"])), function (props) {
   var _props$theme$colors;
   return (_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.headingColor;
 }, function (props) {
   return props.theme.colors.disabled;
 }, function (props) {
   return props.theme.colors.borderColor;
-}, function (props) {
-  return props.theme.colors.lightPrimary;
-}, function (props) {
-  return props.theme.colors.lightPrimary;
-}, function (props) {
-  return props.theme.colors.primary;
-}, function (props) {
-  return props.theme.colors.primary;
+}, function (_ref) {
+  var disabled = _ref.disabled;
+  return !disabled && (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n      &.active {\n        background-color: ", ";\n        td {\n          border-top: 1px solid ", ";\n          border-bottom: 1px solid ", ";\n        }\n      }\n    "])), function (props) {
+    return props.theme.colors.lightPrimary;
+  }, function (props) {
+    return props.theme.colors.lightPrimary;
+  }, function (props) {
+    return props.theme.colors.primary;
+  }, function (props) {
+    return props.theme.colors.primary;
+  });
 });
 exports.GroupsTable = GroupsTable;
-var BorderWrapper = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-size: 12px;\n  ", "\n"])), function (_ref) {
-  var isHeader = _ref.isHeader;
-  return isHeader ? (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    font-weight: 700;\n  "]))) : (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    height: 40px;\n    display: flex;\n    align-items: center;\n    ", "  \n  "])), function (props) {
+var BorderWrapper = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 12px;\n  ", "\n"])), function (_ref2) {
+  var isHeader = _ref2.isHeader;
+  return isHeader ? (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    font-weight: 700;\n  "]))) : (0, _styledComponents.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n    height: 40px;\n    display: flex;\n    align-items: center;\n    ", "  \n  "])), function (props) {
     var _props$theme;
-    return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n      margin-left: 20px;\n      padding-left: 10px;\n      border-left: 1px solid ", ";\n    "])), function (props) {
+    return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n      margin-left: 20px;\n      padding-left: 10px;\n      border-left: 1px solid ", ";\n    "])), function (props) {
       return props.theme.colors.borderColor;
-    }) : (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n      margin-right: 20px;\n      padding-right: 10px;\n      border-right: 1px solid ", ";\n    "])), function (props) {
+    }) : (0, _styledComponents.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n      margin-right: 20px;\n      padding-right: 10px;\n      border-right: 1px solid ", ";\n    "])), function (props) {
       return props.theme.colors.borderColor;
     });
   });
 });
 exports.BorderWrapper = BorderWrapper;
-var GroupNameContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  > p {\n    font-size: 12px;\n    margin: 0px;\n  }\n"])));
+var GroupNameContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  > p {\n    font-size: 12px;\n    margin: 0px;\n  }\n"])));
 exports.GroupNameContainer = GroupNameContainer;
-var CheckBoxWrapper = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  svg {\n    font-size: 24px;\n    color: #B1BCCC;\n  }\n\n  ", "\n"])), function (_ref2) {
-  var isChecked = _ref2.isChecked;
-  return isChecked && (0, _styledComponents.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n    svg {\n      color: ", ";\n    }\n  "])), function (props) {
+var CheckBoxWrapper = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  svg {\n    font-size: 24px;\n    color: #B1BCCC;\n  }\n\n  ", "\n"])), function (_ref3) {
+  var isChecked = _ref3.isChecked;
+  return isChecked && (0, _styledComponents.css)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n    svg {\n      color: ", ";\n    }\n  "])), function (props) {
     var _props$theme$colors2;
     return (_props$theme$colors2 = props.theme.colors) === null || _props$theme$colors2 === void 0 ? void 0 : _props$theme$colors2.primary;
   });
 });
 exports.CheckBoxWrapper = CheckBoxWrapper;
-var DriverManagerContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  font-size: 12px;\n  font-weight: 700;\n\n  > div:first-child {\n    ", "\n  }\n"])), function (props) {
+var DriverManagerContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  font-size: 12px;\n  font-weight: 700;\n\n  > div:first-child {\n    ", "\n  }\n"])), function (props) {
   var _props$theme2;
-  return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n      margin-left: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n      margin-right: 10px;\n    "])));
+  return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n      margin-left: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n      margin-right: 10px;\n    "])));
 });
 exports.DriverManagerContainer = DriverManagerContainer;
-var WrapperImage = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  max-width: 45px;\n  max-height: 45px;\n  height: 45px;\n  width: 45px;\n  ", "\n  border-radius: 10px;\n\n  svg {\n    width: 100%;\n    height: 100%;\n    padding: 7px;\n    box-sizing: border-box;\n    border-radius: 50%;\n  }\n\n  ", "\n"])), function (_ref3) {
-  var isSkeleton = _ref3.isSkeleton;
-  return !isSkeleton && (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n    border: 1px solid #E3E3E3;\n  "])));
+var WrapperImage = _styledComponents.default.div(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  max-width: 45px;\n  max-height: 45px;\n  height: 45px;\n  width: 45px;\n  ", "\n  border-radius: 10px;\n\n  svg {\n    width: 100%;\n    height: 100%;\n    padding: 7px;\n    box-sizing: border-box;\n    border-radius: 50%;\n  }\n\n  ", "\n"])), function (_ref4) {
+  var isSkeleton = _ref4.isSkeleton;
+  return !isSkeleton && (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n    border: 1px solid #E3E3E3;\n  "])));
 }, function (props) {
   var _props$theme3;
-  return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n    margin-left: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n    margin-right: 10px;\n  "])));
+  return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n    margin-left: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n    margin-right: 10px;\n  "])));
 });
 exports.WrapperImage = WrapperImage;
-var ImageStyled = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 8px;\n"])));
+var ImageStyled = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 8px;\n"])));
 var Image = function Image(props) {
   return /*#__PURE__*/_react.default.createElement(ImageStyled, _extends({}, props, {
     style: {
@@ -78,27 +81,27 @@ var Image = function Image(props) {
   }), props.children);
 };
 exports.Image = Image;
-var InfoBlock = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  p {\n    margin: 5px 0 0 0;\n    font-size: 12px;\n    color: ", ";\n  }\n  p.bold {\n    margin: 0px;\n    font-size: 13px;\n    font-weight: 600;\n    color: ", ";\n  }\n"])), function (props) {
+var InfoBlock = _styledComponents.default.div(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n  p {\n    margin: 5px 0 0 0;\n    font-size: 12px;\n    color: ", ";\n  }\n  p.bold {\n    margin: 0px;\n    font-size: 13px;\n    font-weight: 600;\n    color: ", ";\n  }\n"])), function (props) {
   return props.theme.colors.lightGray;
 }, function (props) {
   return props.theme.colors.headingColor;
 });
 exports.InfoBlock = InfoBlock;
-var DriverGroupTypeContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n  ", "\n"])), function (_ref4) {
-  var isHeader = _ref4.isHeader;
-  return isHeader && (0, _styledComponents.css)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n    font-weight: 700;\n  "])));
+var DriverGroupTypeContainer = (0, _styledComponents.default)(BorderWrapper)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n  ", "\n"])), function (_ref5) {
+  var isHeader = _ref5.isHeader;
+  return isHeader && (0, _styledComponents.css)(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["\n    font-weight: 700;\n  "])));
 });
 exports.DriverGroupTypeContainer = DriverGroupTypeContainer;
-var ActionsContainer = _styledComponents.default.div(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  padding-top: 8px;\n  padding-bottom: 8px;\n"])));
+var ActionsContainer = _styledComponents.default.div(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  padding-top: 8px;\n  padding-bottom: 8px;\n"])));
 exports.ActionsContainer = ActionsContainer;
-var EnableWrapper = _styledComponents.default.div(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  width: fit-content;\n\n  span {\n    font-size: 12px;\n    color: ", ";\n\n    ", "\n  }\n"])), function (props) {
+var EnableWrapper = _styledComponents.default.div(_templateObject25 || (_templateObject25 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  width: fit-content;\n\n  span {\n    font-size: 12px;\n    color: ", ";\n\n    ", "\n  }\n"])), function (props) {
   return props.theme.colors.headingColor;
 }, function (props) {
   var _props$theme4;
-  return (_props$theme4 = props.theme) !== null && _props$theme4 !== void 0 && _props$theme4.rtl ? (0, _styledComponents.css)(_templateObject25 || (_templateObject25 = _taggedTemplateLiteral(["\n      padding-left: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject26 || (_templateObject26 = _taggedTemplateLiteral(["\n      padding-right: 10px;\n    "])));
+  return (_props$theme4 = props.theme) !== null && _props$theme4 !== void 0 && _props$theme4.rtl ? (0, _styledComponents.css)(_templateObject26 || (_templateObject26 = _taggedTemplateLiteral(["\n      padding-left: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject27 || (_templateObject27 = _taggedTemplateLiteral(["\n      padding-right: 10px;\n    "])));
 });
 exports.EnableWrapper = EnableWrapper;
-var PagesBottomContainer = _styledComponents.default.div(_templateObject27 || (_templateObject27 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  flex-wrap: wrap;\n  row-gap: 10px;\n  margin: 15px 0 38px 0;\n"])));
+var PagesBottomContainer = _styledComponents.default.div(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  flex-wrap: wrap;\n  row-gap: 10px;\n  margin: 15px 0 38px 0;\n"])));
 exports.PagesBottomContainer = PagesBottomContainer;
-var GroupIdWrapper = _styledComponents.default.div(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  > span {\n    margin: 0 20px;\n  }\n"])));
+var GroupIdWrapper = _styledComponents.default.div(_templateObject29 || (_templateObject29 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  > span {\n    margin: 0 20px;\n  }\n"])));
 exports.GroupIdWrapper = GroupIdWrapper;

package/_modules/components/Delivery/UserAddForm/index.js

@@ -39,7 +39,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var UserAddFormUI = function UserAddFormUI(props) {
-  var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _formState$changes2, _formState$changes3, _formState$changes4, _validationFields$fie5, _formState$changes5, _props$afterMidElemen, _props$afterMidCompon, _session$user;
+  var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _formState$changes2, _formState$changes3, _formState$changes4, _validationFields$fie5, _formState$result10, _formState$result11, _formState$result11$r, _formState$changes$ex, _formState$changes5, _formState$changes6, _props$afterMidElemen, _props$afterMidCompon, _session$user;
   var formState = props.formState,
     showField = props.showField,
     cleanFormState = props.cleanFormState,
@@ -367,9 +367,21 @@ var UserAddFormUI = function UserAddFormUI(props) {
       }),
       autoComplete: "off"
     }));
-  }), isDriversPage && /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {
+  }), isDriversPage && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    name: "external_id",
+    className: "form",
+    placeholder: t('EXTERNAL_ID', 'External Id'),
+    defaultValue: formState !== null && formState !== void 0 && (_formState$result10 = formState.result) !== null && _formState$result10 !== void 0 && _formState$result10.result ? formState === null || formState === void 0 ? void 0 : (_formState$result11 = formState.result) === null || _formState$result11 === void 0 ? void 0 : (_formState$result11$r = _formState$result11.result) === null || _formState$result11$r === void 0 ? void 0 : _formState$result11$r.external_id : (_formState$changes$ex = formState === null || formState === void 0 ? void 0 : (_formState$changes5 = formState.changes) === null || _formState$changes5 === void 0 ? void 0 : _formState$changes5.external_id) !== null && _formState$changes$ex !== void 0 ? _formState$changes$ex : '',
+    onChange: handleChangeInput,
+    autoComplete: "off",
+    onKeyPress: function onKeyPress(e) {
+      if (!/^[0-9]$/.test(e.key)) {
+        e.preventDefault();
+      }
+    }
+  }), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {
     placeholder: t('SELECT_TIMEZONE', 'Select a timezone'),
-    defaultValue: formState === null || formState === void 0 ? void 0 : (_formState$changes5 = formState.changes) === null || _formState$changes5 === void 0 ? void 0 : _formState$changes5.timezone,
+    defaultValue: formState === null || formState === void 0 ? void 0 : (_formState$changes6 = formState.changes) === null || _formState$changes6 === void 0 ? void 0 : _formState$changes6.timezone,
     options: timezonesOptions,
     onChange: function onChange(val) {
       return handleChangeSwtich('timezone', val);
@@ -380,7 +392,7 @@ var UserAddFormUI = function UserAddFormUI(props) {
     searchBarIsNotLazyLoad: true,
     searchValue: timezoneSearchValue,
     handleChangeSearch: setTimezoneSearchValue
-  })), !!showInputPhoneNumber && /*#__PURE__*/_react.default.createElement(_Shared.InputPhoneNumber, {
+  }))), !!showInputPhoneNumber && /*#__PURE__*/_react.default.createElement(_Shared.InputPhoneNumber, {
     value: userPhoneNumber,
     setValue: handleChangePhoneNumber,
     handleIsValid: setIsValidPhoneNumber

package/_modules/components/Delivery/UserFormDetails/index.js

@@ -30,7 +30,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var UserFormDetailsUI = function UserFormDetailsUI(props) {
-  var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _validationFields$fie11, _ref4, _formState$changes$ti, _formState$changes6, _ref5, _formState$changes$dr, _formState$changes7;
+  var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _validationFields$fie11, _ref4, _formState$changes$ex, _formState$changes6, _ref5, _formState$changes$ti, _formState$changes7, _ref6, _formState$changes$dr, _formState$changes8;
   var formState = props.formState,
     showField = props.showField,
     cleanFormState = props.cleanFormState,
@@ -295,11 +295,23 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
       }),
       autoComplete: "off"
     }));
-  }), isDriversPage && /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
+  }), isDriversPage && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    name: "external_id",
+    className: "form",
+    placeholder: t('EXTERNAL_ID', 'External Id'),
+    defaultValue: (_ref4 = (_formState$changes$ex = formState === null || formState === void 0 ? void 0 : (_formState$changes6 = formState.changes) === null || _formState$changes6 === void 0 ? void 0 : _formState$changes6.external_id) !== null && _formState$changes$ex !== void 0 ? _formState$changes$ex : user && (user === null || user === void 0 ? void 0 : user.external_id)) !== null && _ref4 !== void 0 ? _ref4 : '',
+    onChange: handleChangeInput,
+    autoComplete: "off",
+    onKeyPress: function onKeyPress(e) {
+      if (!/^[0-9]$/.test(e.key)) {
+        e.preventDefault();
+      }
+    }
+  }), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     isTimezone: true
   }, /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {
     placeholder: t('SELECT_TIMEZONE', 'Select a timezone'),
-    defaultValue: (_ref4 = (_formState$changes$ti = formState === null || formState === void 0 ? void 0 : (_formState$changes6 = formState.changes) === null || _formState$changes6 === void 0 ? void 0 : _formState$changes6.timezone) !== null && _formState$changes$ti !== void 0 ? _formState$changes$ti : user === null || user === void 0 ? void 0 : user.timezone) !== null && _ref4 !== void 0 ? _ref4 : '',
+    defaultValue: (_ref5 = (_formState$changes$ti = formState === null || formState === void 0 ? void 0 : (_formState$changes7 = formState.changes) === null || _formState$changes7 === void 0 ? void 0 : _formState$changes7.timezone) !== null && _formState$changes$ti !== void 0 ? _formState$changes$ti : user === null || user === void 0 ? void 0 : user.timezone) !== null && _ref5 !== void 0 ? _ref5 : '',
     options: timezonesOptions,
     onChange: function onChange(val) {
       return handleChangeSwtich('timezone', val);
@@ -310,7 +322,7 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
     searchBarIsNotLazyLoad: true,
     searchValue: timezoneSearchValue,
     handleChangeSearch: setTimezoneSearchValue
-  })), !!showInputPhoneNumber && /*#__PURE__*/_react.default.createElement(_Shared.InputPhoneNumber, {
+  }))), !!showInputPhoneNumber && /*#__PURE__*/_react.default.createElement(_Shared.InputPhoneNumber, {
     user: user,
     value: userPhoneNumber,
     setValue: handleChangePhoneNumber,
@@ -333,7 +345,7 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
       return setPasswordSee(!passwordSee);
     }
   }, !passwordSee ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Eye, null) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.EyeSlash, null))), isDriversPage && /*#__PURE__*/_react.default.createElement(_styles2.DriverZoneRestrictionWrapper, null, /*#__PURE__*/_react.default.createElement("span", null, ('DRIVER_ZONE_RESTRICTION', 'Driver Zone Restriccion')), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
-    defaultChecked: (_ref5 = (_formState$changes$dr = formState === null || formState === void 0 ? void 0 : (_formState$changes7 = formState.changes) === null || _formState$changes7 === void 0 ? void 0 : _formState$changes7.driver_zone_restriction) !== null && _formState$changes$dr !== void 0 ? _formState$changes$dr : user === null || user === void 0 ? void 0 : user.driver_zone_restriction) !== null && _ref5 !== void 0 ? _ref5 : false,
+    defaultChecked: (_ref6 = (_formState$changes$dr = formState === null || formState === void 0 ? void 0 : (_formState$changes8 = formState.changes) === null || _formState$changes8 === void 0 ? void 0 : _formState$changes8.driver_zone_restriction) !== null && _formState$changes$dr !== void 0 ? _formState$changes$dr : user === null || user === void 0 ? void 0 : user.driver_zone_restriction) !== null && _ref6 !== void 0 ? _ref6 : false,
     onChange: function onChange(val) {
       return handleChangeSwtich('driver_zone_restriction', val);
     }

package/_modules/components/MyProducts/AdvancedSettings/index.js

@@ -352,9 +352,17 @@ var AdvancedSettings = function AdvancedSettings(props) {
     path: 'third_party_code.body'
   }];
   var buttonList = [{
-    name: t('BORDER_RADIUS', 'Border Radius'),
+    name: t('BUTTON_COLOR', 'Button color'),
+    type: 'input',
+    path: 'general.components.buttons.color'
+  }, {
+    name: t('BORDER_RADIUS', 'Border radius'),
     type: 'input',
     path: 'general.components.buttons.borderRadius'
+  }, {
+    name: t('BUTTON_TEXT_COLOR', 'Button text color'),
+    type: 'input',
+    path: 'general.components.buttons.buttonTextColor'
   }];
   var homeImageFullScreen = [{
     name: t('HOMEPAGE_IMAGE_FULLSCREEN', 'Homepage image fullscreen'),

package/_modules/components/MyProducts/OrderingWebsite/index.js

@@ -198,6 +198,10 @@ var OrderingWebsiteUI = function OrderingWebsiteUI(props) {
     setSelectedSubSetting(setting);
     ((_orderingTheme$themes = orderingTheme.themes[0]) === null || _orderingTheme$themes === void 0 ? void 0 : _orderingTheme$themes.values) && setAdvancedValues(JSON.parse(JSON.stringify((_orderingTheme$themes2 = orderingTheme.themes[0]) === null || _orderingTheme$themes2 === void 0 ? void 0 : _orderingTheme$themes2.values)));
   };
+  var handleChangeTab = function handleChangeTab(key) {
+    setSelectedSetting(key);
+    setSelectedSubSetting('');
+  };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderTitleContainer, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
@@ -223,7 +227,7 @@ var OrderingWebsiteUI = function OrderingWebsiteUI(props) {
       key: setting.key,
       active: selectedSetting === setting.key,
       onClick: function onClick() {
-        return !(orderingTheme !== null && orderingTheme !== void 0 && orderingTheme.loading) && setSelectedSetting(setting.key);
+        return !(orderingTheme !== null && orderingTheme !== void 0 && orderingTheme.loading) && handleChangeTab(setting.key);
       }
     }, setting.name);
   })))), selectedSetting === 'basic' && /*#__PURE__*/_react.default.createElement(_styles2.FormWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.InnerBlock, null, /*#__PURE__*/_react.default.createElement(_styles2.TitleWrapper, null, /*#__PURE__*/_react.default.createElement("h4", null, t('WEBSITE_SETTINGS', 'Website settings')), /*#__PURE__*/_react.default.createElement(_styles2.CustomDomainInfo, null, /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
@@ -513,7 +517,7 @@ var OrderingWebsiteUI = function OrderingWebsiteUI(props) {
       return handleUpdateSiteTheme();
     },
     disabled: orderingTheme === null || orderingTheme === void 0 ? void 0 : orderingTheme.loading
-  }, t('SAVE', 'Save'))), selectedSetting === 'advanced' && /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.TitleWrapper, {
+  }, t('SAVE', 'Save'))), selectedSetting === 'advanced' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.TitleWrapper, {
     isMargin: true
   }, /*#__PURE__*/_react.default.createElement("h4", null, t('SETTINGS', 'Settings')), /*#__PURE__*/_react.default.createElement(_styles2.CustomDomainInfo, null, /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "primary"
@@ -539,7 +543,7 @@ var OrderingWebsiteUI = function OrderingWebsiteUI(props) {
     advancedValues: advancedValues,
     setAdvancedValues: setAdvancedValues,
     handleUpdateSiteTheme: handleUpdateSiteTheme
-  })), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('ORDERING', 'Ordering'),
     content: alertState.content,
     acceptText: t('ACCEPT', 'Accept'),

package/_modules/components/OrderingProducts/SiteTheme/index.js

@@ -28,7 +28,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var SiteThemeUI = function SiteThemeUI(props) {
-  var _themeStructure$selec, _themeStructure$selec2, _themeStructure$selec3, _themeValues$selected, _themeStructure$selec4;
+  var _themeStructure$selec, _themeStructure$selec2, _themeStructure$selec3, _themeValues$selected, _themeStructure$selec4, _Object$keys, _themeStructure$selec5;
   var siteThemesState = props.siteThemesState,
     themesList = props.themesList,
     actionState = props.actionState,
@@ -157,7 +157,7 @@ var SiteThemeUI = function SiteThemeUI(props) {
     onChange: function onChange(e) {
       return handleHidePage(e.target.checked);
     }
-  }), /*#__PURE__*/_react.default.createElement("h4", null, t('HIDDEN', 'Hidden'))), /*#__PURE__*/_react.default.createElement(_styles2.PageBlockTitle, null, t('PAGE_BLOCKS', 'Page blocks')), Object.keys((_themeStructure$selec4 = themeStructure[selectedPage]) === null || _themeStructure$selec4 === void 0 ? void 0 : _themeStructure$selec4.components).map(function (block) {
+  }), /*#__PURE__*/_react.default.createElement("h4", null, t('HIDDEN', 'Hidden'))), /*#__PURE__*/_react.default.createElement(_styles2.PageBlockTitle, null, t('PAGE_BLOCKS', 'Page blocks')), !!((_themeStructure$selec4 = themeStructure[selectedPage]) !== null && _themeStructure$selec4 !== void 0 && _themeStructure$selec4.components) && ((_Object$keys = Object.keys((_themeStructure$selec5 = themeStructure[selectedPage]) === null || _themeStructure$selec5 === void 0 ? void 0 : _themeStructure$selec5.components)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (block) {
     var _components$block, _components$block2, _components$block3, _components$block4, _components$block5;
     var components = themeStructure[selectedPage].components;
     return /*#__PURE__*/_react.default.createElement(_styles2.BlockContainer, {
@@ -207,7 +207,7 @@ var SiteThemeUI = function SiteThemeUI(props) {
         handleAddThemeGallery: handleAddThemeGallery
       });
     })));
-  }))), /*#__PURE__*/_react.default.createElement(_styles2.UpdateButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  })))), /*#__PURE__*/_react.default.createElement(_styles2.UpdateButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "primary",
     onClick: function onClick() {

package/_modules/components/Orders/DeliveriesManager/index.js

@@ -44,7 +44,9 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
     handleSelectedSubOrderStatus = props.handleSelectedSubOrderStatus,
     onOrderRedirect = props.onOrderRedirect,
     numberOfOrdersByStatus = props.numberOfOrdersByStatus,
-    numberOfOrdersBySubstatus = props.numberOfOrdersBySubstatus;
+    numberOfOrdersBySubstatus = props.numberOfOrdersBySubstatus,
+    timeStatus = props.timeStatus,
+    setTimeStatus = props.setTimeStatus;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -65,14 +67,10 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     filterModalOpen = _useState8[0],
     setFilterModalOpen = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+  var _useState9 = (0, _react.useState)(60000),
     _useState10 = _slicedToArray(_useState9, 2),
-    timeStatus = _useState10[0],
-    setTimeStatus = _useState10[1];
-  var _useState11 = (0, _react.useState)(60000),
-    _useState12 = _slicedToArray(_useState11, 2),
-    slaSettingTime = _useState12[0],
-    setSlaSettingTime = _useState12[1];
+    slaSettingTime = _useState10[0],
+    setSlaSettingTime = _useState10[1];
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];

package/_modules/components/Orders/OrdersManager/index.js

@@ -57,7 +57,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setSelectedOrderIds = props.setSelectedOrderIds,
     numberOfOrdersByStatus = props.numberOfOrdersByStatus,
     allowColumns = props.allowColumns,
-    setAllowColumns = props.setAllowColumns;
+    setAllowColumns = props.setAllowColumns,
+    timeStatus = props.timeStatus,
+    setTimeStatus = props.setTimeStatus;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -100,18 +102,14 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     alertState = _useState16[0],
     setAlertState = _useState16[1];
-  var _useState17 = (0, _react.useState)(null),
+  var _useState17 = (0, _react.useState)(60000),
     _useState18 = _slicedToArray(_useState17, 2),
-    timeStatus = _useState18[0],
-    setTimeStatus = _useState18[1];
-  var _useState19 = (0, _react.useState)(60000),
+    slaSettingTime = _useState18[0],
+    setSlaSettingTime = _useState18[1];
+  var _useState19 = (0, _react.useState)(0),
     _useState20 = _slicedToArray(_useState19, 2),
-    slaSettingTime = _useState20[0],
-    setSlaSettingTime = _useState20[1];
-  var _useState21 = (0, _react.useState)(0),
-    _useState22 = _slicedToArray(_useState21, 2),
-    totalSelectedOrder = _useState22[0],
-    setTotalSelectedOrder = _useState22[1];
+    totalSelectedOrder = _useState20[0],
+    setTotalSelectedOrder = _useState20[1];
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenOrderDetail(false);
     setDetailsOrder(null);