ordering-ui-admin-external 1.32.3 → 1.33.0

package/_modules/components/Settings/Settings/index.js

@@ -20,8 +20,9 @@ var _AddressFieldsSetting = require("../AddressFieldsSetting");
 var _LanguageSetting = require("../LanguageSetting");
 var _SitesAuthSettings = require("../SitesAuthSettings");
 var _MultiCountrySettings = require("../MultiCountrySettings");
-var _styles2 = require("./styles");
 var _CardFieldsSetting = require("../CardFieldsSetting");
+var _GuestCheckoutFieldsSetting = require("../GuestCheckoutFieldsSetting");
+var _styles2 = require("./styles");
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -211,6 +212,16 @@ var SettingsUI = function SettingsUI(props) {
     description: t('CHECKOUT_FIELDS_DESC'),
     icon: /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckCircleFill, null),
     active: isOpenSettingDetails === 'checkout'
+  })), /*#__PURE__*/_react.default.createElement(_styles2.SettingItemWrapper, {
+    className: "col-md-4 col-sm-6",
+    onClick: function onClick() {
+      return handleOpenSettingDetails('guest_checkout');
+    }
+  }, /*#__PURE__*/_react.default.createElement(_SettingItemUI.SettingItemUI, {
+    title: t('GUEST_CHECKOUT_FIELDS', 'Guest checkout fields'),
+    description: t('GUEST_CHECKOUT_FIELDS_DESC', 'Which fields do you want to show on the guest checkout page?'),
+    icon: /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckCircleFill, null),
+    active: isOpenSettingDetails === 'guest_checkout'
   })), /*#__PURE__*/_react.default.createElement(_styles2.SettingItemWrapper, {
     className: "col-md-4 col-sm-6",
     onClick: function onClick() {
@@ -308,7 +319,7 @@ var SettingsUI = function SettingsUI(props) {
       return handleBackRedirect();
     },
     showExpandIcon: true
-  }, isOpenSettingDetails === 'checkout' && /*#__PURE__*/_react.default.createElement(_CheckoutFieldsSetting.CheckoutFieldsSetting, null), isOpenSettingDetails === 'address' && /*#__PURE__*/_react.default.createElement(_AddressFieldsSetting.AddressFieldsSetting, null), isOpenSettingDetails === 'card' && /*#__PURE__*/_react.default.createElement(_CardFieldsSetting.CardFieldsSetting, null), isOpenSettingDetails === 'language' && /*#__PURE__*/_react.default.createElement(_LanguageSetting.LanguageSetting, null)));
+  }, isOpenSettingDetails === 'checkout' && /*#__PURE__*/_react.default.createElement(_CheckoutFieldsSetting.CheckoutFieldsSetting, null), isOpenSettingDetails === 'guest_checkout' && /*#__PURE__*/_react.default.createElement(_GuestCheckoutFieldsSetting.GuestCheckoutFieldsSetting, null), isOpenSettingDetails === 'address' && /*#__PURE__*/_react.default.createElement(_AddressFieldsSetting.AddressFieldsSetting, null), isOpenSettingDetails === 'card' && /*#__PURE__*/_react.default.createElement(_CardFieldsSetting.CardFieldsSetting, null), isOpenSettingDetails === 'language' && /*#__PURE__*/_react.default.createElement(_LanguageSetting.LanguageSetting, null)));
 };
 var Settings = function Settings(props) {
   var settingsProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/Settings/index.js

@@ -63,6 +63,12 @@ Object.defineProperty(exports, "EmailSetting", {
     return _EmailSetting.EmailSetting;
   }
 });
+Object.defineProperty(exports, "GuestCheckoutFieldsSetting", {
+  enumerable: true,
+  get: function get() {
+    return _GuestCheckoutFieldsSetting.GuestCheckoutFieldsSetting;
+  }
+});
 Object.defineProperty(exports, "InsertImage", {
   enumerable: true,
   get: function get() {
@@ -240,4 +246,5 @@ var _InsertImage = require("./InsertImage");
 var _LanguageTransSpread = require("./LanguageTransSpread");
 var _LanguageTransTable = require("./LanguageTransTable");
 var _MultiCountrySettings = require("./MultiCountrySettings");
-var _CardFieldsSetting = require("./CardFieldsSetting");
+var _CardFieldsSetting = require("./CardFieldsSetting");
+var _GuestCheckoutFieldsSetting = require("./GuestCheckoutFieldsSetting");

package/_modules/components/Shared/PushTokens/index.js

@@ -0,0 +1,77 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PushTokens = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
+var _Pagination = require("../Pagination");
+var _styles = require("./styles");
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 PushTokens = function PushTokens(props) {
+  var userId = props.userId,
+    pushTokens = props.pushTokens;
+  var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
+    _useLanguage2 = _slicedToArray(_useLanguage, 2),
+    t = _useLanguage2[1];
+  var _useUtils = (0, _orderingComponentsAdminExternal.useUtils)(),
+    _useUtils2 = _slicedToArray(_useUtils, 1),
+    parseDate = _useUtils2[0].parseDate;
+  var numberPerPage = 10;
+  var _useState = (0, _react.useState)(1),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentPage = _useState2[0],
+    setCurrentPage = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentPageTokens = _useState4[0],
+    setCurrentPageTokens = _useState4[1];
+  var sortedTokens = (0, _react.useMemo)(function () {
+    var _tokens = _toConsumableArray(pushTokens);
+    return _tokens.sort(function (a, b) {
+      return b.id - a.id;
+    });
+  }, [pushTokens]);
+  var handleChangePage = function handleChangePage(pageNumber) {
+    setCurrentPage(pageNumber);
+  };
+  (0, _react.useEffect)(function () {
+    var indexOfLastPost = currentPage * numberPerPage;
+    var indexOfFirstPost = indexOfLastPost - numberPerPage;
+    var _currentProducts = sortedTokens.slice(indexOfFirstPost, indexOfLastPost);
+    setCurrentPageTokens(_currentProducts);
+  }, [sortedTokens, currentPage]);
+  (0, _react.useEffect)(function () {
+    setCurrentPage(1);
+  }, [userId]);
+  return /*#__PURE__*/_react.default.createElement(_styles.Container, null, sortedTokens.length > 0 ? /*#__PURE__*/_react.default.createElement(_styles.TableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Table, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('USER_ID_NUMBER', 'User ID')), /*#__PURE__*/_react.default.createElement("th", null, t('TOKEN', 'Token')), /*#__PURE__*/_react.default.createElement("th", null, t('APP', 'App')), /*#__PURE__*/_react.default.createElement("th", null, t('CREATED_AT', 'Created at')), /*#__PURE__*/_react.default.createElement("th", null, t('UPDATED_AT', 'Updated at')))), currentPageTokens.map(function (token) {
+    return /*#__PURE__*/_react.default.createElement("tbody", {
+      key: token.id
+    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, token === null || token === void 0 ? void 0 : token.user_id), /*#__PURE__*/_react.default.createElement("td", null, token === null || token === void 0 ? void 0 : token.token), /*#__PURE__*/_react.default.createElement("td", null, token === null || token === void 0 ? void 0 : token.app), /*#__PURE__*/_react.default.createElement("td", null, parseDate(token === null || token === void 0 ? void 0 : token.created_at, {
+      utc: false
+    })), /*#__PURE__*/_react.default.createElement("td", null, parseDate(token === null || token === void 0 ? void 0 : token.updated_at, {
+      utc: false
+    }))));
+  }))) : /*#__PURE__*/_react.default.createElement("p", {
+    className: "no-data"
+  }, t('NO_DATA', 'No Data')), (sortedTokens === null || sortedTokens === void 0 ? void 0 : sortedTokens.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperPagination, null, /*#__PURE__*/_react.default.createElement(_Pagination.Pagination, {
+    isHidePagecontrol: true,
+    currentPage: currentPage,
+    totalPages: Math.ceil(sortedTokens.length / numberPerPage),
+    handleChangePage: handleChangePage
+  })));
+};
+exports.PushTokens = PushTokens;

package/_modules/components/Shared/PushTokens/styles.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WrapperPagination = exports.TableWrapper = exports.Table = exports.Container = void 0;
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+var Container = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  p.no-data {\n    font-size: 14px;\n    margin: 20px 0;\n  }\n"])));
+exports.Container = Container;
+var TableWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  overflow: auto;\n"])));
+exports.TableWrapper = TableWrapper;
+var Table = _styledComponents.default.table(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 100%;\n  min-width: 900px;\n  color: ", ";\n\n  thead {\n    tr {\n      border-bottom: solid 1px ", ";\n      th {\n        padding: 13px 0;\n        font-size: 12px;\n        &:nth-child(2) {\n          width: 35%;\n          padding-left: 15px;\n          padding-right: 15px;\n          box-sizing: border-box;\n        }\n        &:nth-child(3),\n        &:nth-child(4),\n        &:nth-child(5)\n        {\n          width: 19%;\n        }\n      }\n    }\n  }\n\n  tbody {\n    border-bottom: 1px solid ", ";\n    td {\n      padding: 13px 0;\n      font-size: 12px;\n\n      &:nth-child(2) {\n        width: 35%;\n        padding-left: 15px;\n        padding-right: 15px;\n        box-sizing: border-box;\n      }\n\n      &:nth-child(3),\n      &:nth-child(4),\n      &:nth-child(5) {\n        width: 19%;\n      }\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;
+});
+exports.Table = Table;
+var WrapperPagination = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  padding: 20px 0;\n"])));
+exports.WrapperPagination = WrapperPagination;

package/_modules/components/Shared/index.js

@@ -129,6 +129,12 @@ Object.defineProperty(exports, "ProtectedRoute", {
     return _ProtectedRoute.ProtectedRoute;
   }
 });
+Object.defineProperty(exports, "PushTokens", {
+  enumerable: true,
+  get: function get() {
+    return _PushTokens.PushTokens;
+  }
+});
 Object.defineProperty(exports, "RangeCalendar", {
   enumerable: true,
   get: function get() {
@@ -230,6 +236,7 @@ var _Pagination = require("./Pagination");
 var _PaginationButton = require("./PaginationButton");
 var _Personalization = require("./Personalization");
 var _ProtectedRoute = require("./ProtectedRoute");
+var _PushTokens = require("./PushTokens");
 var _Schedule = require("./Schedule");
 var _SearchBar = require("./SearchBar");
 var _RangeCalendar = require("./RangeCalendar");

package/_modules/components/Stores/BusinessDeviceDetail/index.js

@@ -183,7 +183,8 @@ var BusinessDeviceDetailUI = function BusinessDeviceDetailUI(props) {
     searchValue: businessSearchVal,
     handleChangeSearch: function handleChangeSearch(val) {
       return setBusinessSearchVal(val);
-    }
+    },
+    isDisabled: !!selectedDevice
   })), ((formState === null || formState === void 0 || (_formState$changes8 = formState.changes) === null || _formState$changes8 === void 0 ? void 0 : _formState$changes8.business_id) || (selectedDevice === null || selectedDevice === void 0 ? void 0 : selectedDevice.business_id)) && /*#__PURE__*/_react.default.createElement(_styles2.SelectWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('BUSINESS_OWNER', 'Business owner')), businessList !== null && businessList !== void 0 && businessList.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     height: 44
   }) : /*#__PURE__*/_react.default.createElement(_FirstSelect.Select, {

package/_modules/components/Stores/ProductIngredient/index.js

@@ -74,7 +74,7 @@ var ProductIngredient = function ProductIngredient(props) {
     borderRadius: "8px",
     color: "lightPrimary",
     onClick: function onClick() {
-      return handleOpenIngredient(null);
+      return handleOpenIngredient(null, true);
     }
   }, t('ADD_INGREDIENT', 'Add ingredient'))), (product === null || product === void 0 ? void 0 : product.ingredients) && (product === null || product === void 0 ? void 0 : product.ingredients.map(function (ingredient) {
     return /*#__PURE__*/_react.default.createElement(_styles2.IngredientOption, {
@@ -86,7 +86,7 @@ var ProductIngredient = function ProductIngredient(props) {
     }, /*#__PURE__*/_react.default.createElement("span", null, ingredient === null || ingredient === void 0 ? void 0 : ingredient.name), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null));
   })), /*#__PURE__*/_react.default.createElement(_styles2.AddIngredientButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.LinkButton, {
     onClick: function onClick() {
-      return handleOpenIngredient(null);
+      return handleOpenIngredient(null, true);
     }
   }, t('ADD_INGREDIENT', 'Add ingredient')))), width >= 1000 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, openDetails && /*#__PURE__*/_react.default.createElement(_ProductIngredientDetails.ProductIngredientDetails, _extends({}, props, {
     ingredient: currentIngredient,

package/_modules/components/Users/UserDetails/index.js

@@ -37,7 +37,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 UserDetailsUI = function UserDetailsUI(props) {
-  var _userState$user, _userState$user2, _userState$user3, _userState$user4, _userState$user5, _adminUserState$user, _userState$user6, _adminUserState$user2, _userState$user7, _userState$user8, _userState$user9, _userState$user10, _userState$user11, _userState$user12, _userState$user13, _userState$user14;
+  var _userState$user, _userState$user2, _userState$user3, _userState$user4, _userState$user5, _adminUserState$user, _userState$user6, _adminUserState$user2, _userState$user7, _userState$user8, _userState$user9, _userState$user10, _userState$user11, _userState$user12, _userState$user13, _userState$user14, _userState$user15, _userState$user16;
   var isManagers = props.isManagers,
     userState = props.userState,
     setExtraOpen = props.setExtraOpen,
@@ -166,7 +166,10 @@ var UserDetailsUI = function UserDetailsUI(props) {
     handleCustomOrderDetail: setExtraOpen
   })), currentMenuSelected === 'metafields' && /*#__PURE__*/_react.default.createElement(_UserMetaFields.UserMetaFields, {
     userId: (_userState$user14 = userState.user) === null || _userState$user14 === void 0 ? void 0 : _userState$user14.id
-  }), currentMenuSelected === 'personalization' && /*#__PURE__*/_react.default.createElement(_styles2.PersonalizationWrapper, null, /*#__PURE__*/_react.default.createElement(_Personalization.Personalization, null))), /*#__PURE__*/_react.default.createElement(_Shared.Confirm, {
+  }), currentMenuSelected === 'personalization' && /*#__PURE__*/_react.default.createElement(_styles2.PersonalizationWrapper, null, /*#__PURE__*/_react.default.createElement(_Personalization.Personalization, null)), currentMenuSelected === 'push_tokens' && /*#__PURE__*/_react.default.createElement(_Shared.PushTokens, {
+    userId: (_userState$user15 = userState.user) === null || _userState$user15 === void 0 ? void 0 : _userState$user15.id,
+    pushTokens: ((_userState$user16 = userState.user) === null || _userState$user16 === void 0 ? void 0 : _userState$user16.push_tokens) || []
+  })), /*#__PURE__*/_react.default.createElement(_Shared.Confirm, {
     width: "700px",
     title: t('WEB_APPNAME', 'Ordering'),
     content: confirm.content,

package/_modules/components/Users/UserDetailsMenu/index.js

@@ -57,6 +57,9 @@ var UserDetailsMenu = function UserDetailsMenu(props) {
   }, {
     key: 'personalization',
     content: t('PERSONALIZATION', 'Personalization')
+  }, {
+    key: 'push_tokens',
+    content: t('PUSH_TOKENS', 'Push tokens')
   }];
   var professionalMenuList = [{
     key: 'profile',

package/index-template.js

@@ -42,6 +42,7 @@ import lalamove from './template/assets/images/lala-move.png'
 import pickerExpress from './template/assets/images/picker-express.png'
 import importMenu from './template/assets/images/import-menu.png'
 import importedMenu from './template/assets/images/imported-menu.png'
+import googleCalendarIcon from './template/assets/images/google-calendar-icon.png'
 
 /**
  * project statuses
@@ -297,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.5',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.6',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [
@@ -397,7 +398,8 @@ theme.images = {
     lalamove,
     pickerExpress,
     importMenu,
-    importedMenu
+    importedMenu,
+    googleCalendarIcon
   },
   project: {
     active: projectActive,

package/index.html

@@ -19,7 +19,7 @@
 
 <body>
   <div id="app"></div>
-  <script> (function () { var qs, js, q, s, d = document, gi = d.getElementById, ce = d.createElement, gt = d.getElementsByTagName, id = "typef_orm_share", b = "https://embed.typeform.com/"; if (!gi.call(d, id)) { js = ce.call(d, "script"); js.id = id; js.src = b + "embed.js"; q = gt.call(d, "script")[0]; q.parentNode.insertBefore(js, q) } })() </script>
+  <script> (function () { var qs, js, q, s, d = document, gi = d.getElementById, ce = d.createElement, gt = d.getElementsByTagName, id = "typef_orm_share", b = "https://embed.typeform.com/"; if (!gi.call(d, id)) { js = ce.call(d, "script"); js.id = id; js.src = b + "embed.js"; q = gt.call(d, "script")[0]; q?.parentNode?.insertBefore(js, q) } })() </script>
 </body>
 
-</html>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.32.3",
+  "version": "1.33.0",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.32.2",
+    "ordering-components-admin-external": "1.33.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/BusinessIntelligence/AnalyticsOrdersAcceptSpend/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage, useUtils } from 'ordering-components-admin-external'
+import { useLanguage } from 'ordering-components-admin-external'
 import GiAlarmClock from '@meronex/icons/gi/GiAlarmClock'
 import {
   Container,
@@ -19,7 +19,6 @@ export const AnalyticsOrdersAcceptSpend = (props) => {
   } = props
 
   const [, t] = useLanguage()
-  const [{ parseNumber }] = useUtils()
 
   return (
     <Container>
@@ -42,7 +41,7 @@ export const AnalyticsOrdersAcceptSpend = (props) => {
           dataList?.data ? (
             <OrdersAcceptSpendContent>
               <TimeContentWrapper>
-                <h1>{dataList?.data && convertHMS(parseNumber(((dataList?.data * 1)), { separator: '.' }))}</h1>
+                <h1>{dataList?.data && convertHMS(dataList?.data * 1)}</h1>
               </TimeContentWrapper>
               <ReviewContentWrapper>
                 <ReviewBlock>

package/src/components/BusinessIntelligence/AnalyticsSpendList/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage, useUtils } from 'ordering-components-admin-external'
+import { useLanguage } from 'ordering-components-admin-external'
 import GiAlarmClock from '@meronex/icons/gi/GiAlarmClock'
 import {
   Container,
@@ -20,7 +20,6 @@ export const AnalyticsSpendList = (props) => {
   } = props
 
   const [, t] = useLanguage()
-  const [{ parseNumber }] = useUtils()
 
   return (
     <Container>
@@ -43,7 +42,7 @@ export const AnalyticsSpendList = (props) => {
           dataList?.data ? (
             <AnalyticsSpendListContent>
               <TimeContentWrapper>
-                <h1>{convertHMS(parseNumber((dataList?.data * 1), { separator: '.' }))}</h1>
+                <h1>{convertHMS(dataList?.data * 1)}</h1>
               </TimeContentWrapper>
               <ReviewContentWrapper>
                 <ReviewBlock>

package/src/components/Delivery/DriversGroupLogs/index.js

@@ -44,7 +44,11 @@ export const DriversGroupLogsUI = (props) => {
       { key: 'autoassign_max_radius', content: t('MAX_RADIUS', 'Maximum radius in meters') },
       { key: 'autoassign_autoreject_time', content: t('AUTO_REJECT_ORDER_GROUP_AFTER', 'Auto reject Orders After') },
       { key: 'autoassign_max_orders', content: t('MAX_AMOUNT_ORDERS_PER_DRIVER', 'Maximum amount of orders per drivers') },
-      { key: 'autoassign_max_in_pending', content: t('ORDER_PENDING', 'Pending') }
+      { key: 'autoassign_max_in_pending', content: t('ORDER_PENDING', 'Pending') },
+      { key: 'available', content: t('AVAILABLE', 'Available') },
+      { key: 'enabled', content: t('ENABLED', 'Enabled') },
+      { key: 'last_available_at', content: t('LAST_AVAILABLE_AT', 'Last available at') },
+      { key: 'busy', content: t('BUSY', 'Busy') }
     ]
     const found = attributes.find(attribute => attribute.key === key)
     if (found) {
@@ -150,16 +154,16 @@ export const DriversGroupLogsUI = (props) => {
                                 <td>{getAttributeName(item?.attribute)}</td>
                                 <td>
                                   {
-                                    typeof item?.new !== 'undefined'
+                                    (typeof item?.new !== 'undefined' && item?.new !== null)
                                       ? `${item?.new}`
-                                      : item?.added.length > 0 ? item?.added.toString() : t('NONE', 'None')
+                                      : item?.added?.length > 0 ? item?.added?.toString() : t('NONE', 'None')
                                   }
                                 </td>
                                 <td>
                                   {
-                                    typeof item?.old !== 'undefined'
+                                    (typeof item?.old !== 'undefined' && item?.old !== null)
                                       ? `${item?.old}`
-                                      : item?.removed.length > 0 ? item?.removed.toString() : t('NONE', 'None')
+                                      : item?.removed?.length > 0 ? item?.removed?.toString() : t('NONE', 'None')
                                   }
                                 </td>
                               </tr>

package/src/components/Delivery/DriversGroupLogs/styles.js

@@ -34,7 +34,7 @@ export const Table = styled.table`
           box-sizing: border-box;
         }
         &:nth-child(3) {
-          width: 35%
+          width: 35%;
           padding-left: 15px;
           padding-right: 15px;
           box-sizing: border-box;
@@ -161,10 +161,12 @@ export const EventTypeContainer = styled.div`
   ${props => props.theme?.rtl ? css`
     padding-right: 15px;
     margin-right: 15px;
+    margin-left: 10px;
     border-right: 1px solid ${props => props.theme.colors.borderColor};
   ` : css`
     padding-left: 15px;
     margin-left: 15px;
+    margin-right: 10px;
     border-left: 1px solid ${props => props.theme.colors.borderColor};
   `}
 `

package/src/components/Delivery/UserDetails/index.js

@@ -6,7 +6,7 @@ import { Dropdown, DropdownButton } from 'react-bootstrap'
 import { useLanguage, UserDetails as UserDetailsController } from 'ordering-components-admin-external'
 import { OrdersManager } from '../../Orders/OrdersManager'
 import { AddressList } from '../AddressList'
-import { Personalization, Modal, Schedule } from '../../Shared'
+import { Personalization, Modal, Schedule, PushTokens } from '../../Shared'
 import { UserDetailsMenu } from '../UserDetailsMenu'
 import { UserProfileForm } from '../UserProfileForm'
 import { UserMetaFields } from '../../Users'
@@ -210,6 +210,12 @@ export const UserDetailsUI = (props) => {
               handleCustomOrderDetail={setExtraOpen}
             />
           )}
+          {currentMenuSelected === 'push_tokens' && (
+            <PushTokens
+              userId={userState?.user?.id}
+              pushTokens={userState?.user?.push_tokens || []}
+            />
+          )}
         </>
       )}
       <Modal

package/src/components/Delivery/UserDetailsMenu/index.js

@@ -20,7 +20,8 @@ export const UserDetailsMenu = (props) => {
     { key: 'driver_group', content: t('DRIVER_GROUP', 'Driver group') },
     { key: 'saved_places', content: t('SAVED_PLACES', 'Saved places') },
     { key: 'schedule', content: t('SCHEDULE', 'Schedule') },
-    { key: 'logs', content: t('LOGS', 'Logs') }
+    { key: 'logs', content: t('LOGS', 'Logs') },
+    { key: 'push_tokens', content: t('PUSH_TOKENS', 'Push tokens') }
     // { key: 'metafields', content: t('METAFIELDS', 'Metafields') },
     // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }
   ] : [

package/src/components/OrderingProducts/SiteTheme/ThemeOption.js

@@ -68,13 +68,20 @@ export const ThemeOption = (props) => {
         )}
         <h5>{getTitle(name)}</h5>
       </OptionHeader>
-      {((optionObject?.value_type === 'integer' || optionObject?.value_type === 'string') && !optionObject?.options && !validHexColor(valueObject)) && (
+      {((optionObject?.value_type === 'integer' || optionObject?.value_type === 'string' || name === 'borderRadius') && !optionObject?.options && !validHexColor(valueObject)) && (
         <Input
           defaultValue={valueObject}
           onChange={e => handleChangeValue(e.target.value)}
+          onInput={(e) => {
+            if (name === 'borderRadius') {
+            e.target.value = (Number(e.target.value) > 99 || e.target.value === '.' || (e.target.value.match(/\./g) || []).length > 1)
+              ? e.target.value.slice(0, -1)
+              : e.target.value.match(`^[${e.target.value === '0' ? '1' : '0'}-9/.]{1,9}$`)
+            }
+          }}
         />
       )}
-      {(optionObject?.value_type === 'string' && validHexColor(valueObject)) && (
+      {(optionObject?.value_type === 'string' && name !== 'borderRadius' && validHexColor(valueObject)) && (
         <ColorPickerContainer>
           <ColorPicker
             defaultColor={valueObject}
@@ -98,7 +105,7 @@ export const ThemeOption = (props) => {
           handleChangeValue={handleChangeValue}
         />
       )}
-      {typeof optionObject !== 'string' && Object.keys(optionObject).filter(subOption => subOption !== 'value_type' && subOption !== 'options').map(subOption => (
+      {(!optionObject?.value_type && !optionObject?.components) && Object.keys(optionObject).filter(subOption => subOption !== 'value_type' && subOption !== 'options').map(subOption => (
         <React.Fragment key={subOption}>
           {subOption !== 'components' && (
             <ThemeOption
@@ -113,6 +120,19 @@ export const ThemeOption = (props) => {
           )}
         </React.Fragment>
       ))}
+        {optionObject?.components && Object?.keys(optionObject?.components)?.map(subOption => (
+        <React.Fragment key={subOption}>
+            <ThemeOption
+              name={subOption}
+              optionObject={optionObject?.components[subOption]}
+              valueObject={valueObject?.components[subOption]}
+              path={path + '.' + subOption}
+              themeValues={themeValues}
+              setThemeValues={setThemeValues}
+              handleAddThemeGallery={handleAddThemeGallery}
+            />
+        </React.Fragment>
+      ))}
     </OptionContainer>
   )
 }

package/src/components/Orders/AllInOne/DriversManager/styles.js

@@ -45,7 +45,13 @@ export const FilterContainer = styled.div`
 `
 export const WrapperDriversList = styled.div`
   overflow-x: hidden;
+  .driver-info-container {
+    p.name {
+      min-width: 50%;
+      max-width: 50%;
+    }
+  }
   @media (min-width: 992px) {
-    max-height: calc(var(--vh, 1vh) * 100 - 410px);
+    max-height: min(calc(var(--vh, 1vh) * 100 - 410px), 770px);
   }
 `

package/src/components/Orders/AllInOne/index.js

@@ -194,7 +194,6 @@ const OrdersManagerUI = (props) => {
           citiesList={citiesList}
           paymethodsList={paymethodsList}
           businessesList={businessesList}
-          filterValues={filterValues}
           handleChangeSearch={handleChangeSearch}
           handleChangeFilterValues={handleChangeFilterValues}
           selectedOrderIds={selectedOrderIds}

package/src/components/Orders/CreateCustomOrder/index.js

@@ -6,7 +6,8 @@ import { Button } from '../../../styles'
 
 export const CreateCustomOrder = (props) => {
   const {
-    handleOpenCustomOrderDetail
+    handleOpenCustomOrderDetail,
+    handleOpenOrderDetail
   } = props
 
   const [, t] = useLanguage()
@@ -37,6 +38,7 @@ export const CreateCustomOrder = (props) => {
             handleParentSidebarMove={val => setMoveDistance(val)}
             handleOpenCustomOrderDetail={handleOpenCustomOrderDetail}
             onClose={() => setOpenSidebar(false)}
+            handleOpenOrderDetail={handleOpenOrderDetail}
           />
         </SideBar>
       )}

package/src/components/Orders/DriverMapMarkerAndInfo/index.js

@@ -58,7 +58,7 @@ export const DriverMapMarkerAndInfo = (props) => {
               <Text fontWeight='bold'>
                 {t('LAST_LOCATION', 'Last location')}:
               </Text>
-              <Text>{parseDate(driver.last_location_at, { utc: false })}</Text>
+              <Text>{parseDate(driver.last_location_at)}</Text>
             </TextContainer>
           )}
         </DriverInfo>

package/src/components/Orders/DriversList/index.js

@@ -55,9 +55,11 @@ export const DriversList = (props) => {
             <DriverCard
               key={i}
             >
-              <WrapperImage>
-                <Skeleton width={45} height={45} />
-              </WrapperImage>
+              {!hidePhoto && (
+                <WrapperImage>
+                  <Skeleton width={45} height={45} />
+                </WrapperImage>
+              )}
               <DriverInfo>
                 <div>
                   <Skeleton width={100} />
@@ -80,18 +82,20 @@ export const DriversList = (props) => {
                   <Image bgimage={optimizeImage(driver?.photo || theme.images?.icons?.noDriver, 'h_50,c_limit')} />
                 </WrapperImage>
               )}
-              <DriverInfo>
-                <div>
-                  <p>{driver.name} {driver.lastname}</p>
+              <DriverInfo hidePhoto={hidePhoto}>
+                <div className='driver-info-container'>
+                  <p className='name'>{driver.name} {driver.lastname}</p>
                   <BsDot />
-                  <LinkButton
-                    className='driver-orders'
-                    disabled={!driver?.assigned_orders_count || driver?.assigned_orders_count === 0}
-                    onClick={() => onOpenDriverOrdersDetail(driver)}
-                  >
-                    {driver?.assigned_orders_count} {t('ORDERS', 'Orders')}
-                  </LinkButton>
-                  <p className='text-red'>{(driver?.busy && `(${t('BUSY', 'Busy')})`)}</p>
+                  <div>
+                    <LinkButton
+                      className='driver-orders'
+                      disabled={!driver?.assigned_orders_count || driver?.assigned_orders_count === 0}
+                      onClick={() => onOpenDriverOrdersDetail(driver)}
+                    >
+                      {driver?.assigned_orders_count} {t('ORDERS', 'Orders')}
+                    </LinkButton>
+                    <span className='text-red'>{(driver?.busy && `(${t('BUSY', 'Busy')})`)}</span>
+                  </div>
                 </div>
                 {driver?.qualification && (
                   <WrapperStar width={getStarWidth(driver?.qualification)} />