ordering-ui-admin-external 1.5.1 → 1.6.0

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

@@ -8,8 +8,6 @@ exports.UsersList = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
-var _MdCheckBoxOutlineBlank = _interopRequireDefault(require("@meronex/icons/md/MdCheckBoxOutlineBlank"));
-var _MdCheckBox = _interopRequireDefault(require("@meronex/icons/md/MdCheckBox"));
 var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
@@ -40,7 +38,8 @@ var UsersList = function UsersList(props) {
     selectedUsers = props.selectedUsers,
     handleSelectedUsers = props.handleSelectedUsers,
     handleOpenUserDetails = props.handleOpenUserDetails,
-    handleOpenUserAddForm = props.handleOpenUserAddForm;
+    handleOpenUserAddForm = props.handleOpenUserAddForm,
+    setSelectedUsers = props.setSelectedUsers;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -54,6 +53,10 @@ var UsersList = function UsersList(props) {
     _useState2 = _slicedToArray(_useState, 2),
     confirmAdmin = _useState2[0],
     setConfirmAdmin = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isAllChecked = _useState4[0],
+    setIsAllChecked = _useState4[1];
   var getUserType = function getUserType(type) {
     var userTypes = [{
       key: 0,
@@ -109,6 +112,32 @@ var UsersList = function UsersList(props) {
       });
     }
   };
+  var handleSelecteAllUser = function handleSelecteAllUser() {
+    var _usersList$users;
+    var userIds = (_usersList$users = usersList.users) === null || _usersList$users === void 0 ? void 0 : _usersList$users.reduce(function (ids, user) {
+      return [].concat(_toConsumableArray(ids), [user.id]);
+    }, []);
+    if (!isAllChecked) {
+      setSelectedUsers([].concat(_toConsumableArray(selectedUsers), _toConsumableArray(userIds)));
+    } else {
+      var userIdsToDeleteSet = new Set(userIds);
+      var updatedSelectedOrderIds = selectedUsers.filter(function (name) {
+        return !userIdsToDeleteSet.has(name);
+      });
+      setSelectedUsers(updatedSelectedOrderIds);
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var _usersList$users2;
+    if (usersList.loading) return;
+    var userIds = (_usersList$users2 = usersList.users) === null || _usersList$users2 === void 0 ? void 0 : _usersList$users2.reduce(function (ids, user) {
+      return [].concat(_toConsumableArray(ids), [user.id]);
+    }, []);
+    var _isAllChecked = userIds.every(function (elem) {
+      return selectedUsers.includes(elem);
+    });
+    setIsAllChecked(_isAllChecked);
+  }, [usersList.users, selectedUsers]);
   (0, _react.useEffect)(function () {
     if (usersList.loading || usersList.users.length > 0 || paginationProps.totalPages <= 1) return;
     if (paginationProps.currentPage !== paginationProps.totalPages) {
@@ -117,7 +146,13 @@ var UsersList = function UsersList(props) {
       handleChangePage(paginationProps.currentPage - 1);
     }
   }, [usersList.users, paginationProps]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('USER', 'User')), /*#__PURE__*/_react.default.createElement("th", null, t('PHONE', 'Phone')), /*#__PURE__*/_react.default.createElement("th", null, t('TYPE', 'Type')), /*#__PURE__*/_react.default.createElement("th", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.AllCheckWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
+    className: "all-checkbox",
+    isChecked: !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked,
+    onClick: function onClick() {
+      return handleSelecteAllUser();
+    }
+  }, !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckSquareFill, null) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Square, null)), t('USER', 'User'))), /*#__PURE__*/_react.default.createElement("th", null, t('PHONE', 'Phone')), /*#__PURE__*/_react.default.createElement("th", null, t('TYPE', 'Type')), /*#__PURE__*/_react.default.createElement("th", {
     className: "amout-orders "
   }, t('AMOUNT_OF_ORDERS', 'Amount of orders')), /*#__PURE__*/_react.default.createElement("th", null, t('ACTION', 'Action')))), usersList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement("tbody", {
@@ -160,7 +195,7 @@ var UsersList = function UsersList(props) {
       onClick: function onClick() {
         return handleSelectedUsers(user.id);
       }
-    }, selectedUsers.includes(user.id) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null)), /*#__PURE__*/_react.default.createElement(_styles2.WrapperImage, null, user !== null && user !== void 0 && user.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Image, {
+    }, selectedUsers.includes(user.id) ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckSquareFill, null) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Square, null)), /*#__PURE__*/_react.default.createElement(_styles2.WrapperImage, null, user !== null && user !== void 0 && user.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Image, {
       bgimage: optimizeImage(user === null || user === void 0 ? void 0 : user.photo, 'h_50,c_limit')
     }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), /*#__PURE__*/_react.default.createElement(_styles2.InfoBlock, null, /*#__PURE__*/_react.default.createElement("p", {
       className: "bold"

package/_modules/components/Users/UsersList/styles.js

@@ -4,10 +4,10 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperPagination = exports.WrapperImage = exports.VerifiedItemsContainer = exports.VerifiedItem = exports.UsersTable = exports.UsersConatiner = exports.UsersBottomContainer = exports.UserTypeWrapper = exports.UserTableWrapper = exports.UserMainInfo = exports.UserEnableWrapper = exports.InfoBlock = exports.Image = exports.CheckBoxWrapper = exports.AddNewUserButton = void 0;
+exports.WrapperPagination = exports.WrapperImage = exports.VerifiedItemsContainer = exports.VerifiedItem = exports.UsersTable = exports.UsersConatiner = exports.UsersBottomContainer = exports.UserTypeWrapper = exports.UserTableWrapper = exports.UserMainInfo = exports.UserEnableWrapper = exports.InfoBlock = exports.Image = exports.CheckBoxWrapper = exports.AllCheckWrapper = exports.AddNewUserButton = 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, _templateObject29, _templateObject30, _templateObject31, _templateObject32;
+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, _templateObject30, _templateObject31, _templateObject32, _templateObject33;
 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 }; }
@@ -60,12 +60,12 @@ var UserMainInfo = _styledComponents.default.div(_templateObject9 || (_templateO
   });
 });
 exports.UserMainInfo = UserMainInfo;
-var CheckBoxWrapper = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  ", "\n  svg {\n    font-size: 24px;\n    color: #B1BCCC;\n  }\n\n  ", "\n"])), function (props) {
+var CheckBoxWrapper = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  ", "\n  svg {\n    font-size: 16px;\n    color: #B1BCCC;\n  }\n\n  ", "\n"])), function (props) {
   var _props$theme3;
   return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n    margin-left: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n    margin-right: 10px;\n  "])));
 }, function (_ref2) {
   var isChecked = _ref2.isChecked;
-  return isChecked && (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n    svg {\n      color: ", ";\n    }\n"])), function (props) {
+  return isChecked && (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _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;
   });
@@ -115,4 +115,6 @@ var VerifiedItemsContainer = _styledComponents.default.div(_templateObject30 ||
   var _props$theme7;
   return (_props$theme7 = props.theme) !== null && _props$theme7 !== void 0 && _props$theme7.rtl ? (0, _styledComponents.css)(_templateObject31 || (_templateObject31 = _taggedTemplateLiteral(["\n    left: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject32 || (_templateObject32 = _taggedTemplateLiteral(["\n    right: 10px;\n  "])));
 });
-exports.VerifiedItemsContainer = VerifiedItemsContainer;
+exports.VerifiedItemsContainer = VerifiedItemsContainer;
+var AllCheckWrapper = _styledComponents.default.div(_templateObject33 || (_templateObject33 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n"])));
+exports.AllCheckWrapper = AllCheckWrapper;

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

@@ -52,7 +52,8 @@ var UsersListingUI = function UsersListingUI(props) {
     onUserRedirect = props.onUserRedirect,
     handleSuccessUpdate = props.handleSuccessUpdate,
     handleSuccessAddUser = props.handleSuccessAddUser,
-    handleSuccessDeleteUser = props.handleSuccessDeleteUser;
+    handleSuccessDeleteUser = props.handleSuccessDeleteUser,
+    setSelectedUsers = props.setSelectedUsers;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -143,7 +144,8 @@ var UsersListingUI = function UsersListingUI(props) {
     handleSelectedUsers: handleSelectedUsers,
     userDetailsId: (openUser === null || openUser === void 0 ? void 0 : openUser.id) || queryId,
     handleOpenUserDetails: handleOpenUserDetails,
-    handleOpenUserAddForm: handleOpenUserAddForm
+    handleOpenUserAddForm: handleOpenUserAddForm,
+    setSelectedUsers: setSelectedUsers
   })), isOpenUserDetails && /*#__PURE__*/_react.default.createElement(_UserDetailsLateralBar.UserDetailsLateralBar, {
     isManagers: true,
     open: isOpenUserDetails,

package/_modules/contexts/ThemeContext/index.js

@@ -42,7 +42,7 @@ var ThemeProvider = function ThemeProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     theme = _useState2[0],
     setTheme = _useState2[1];
-  var GlobalStyle = (0, _styledComponents.createGlobalStyle)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\n    @media (min-width: 578px) {\n      /** Mozilla scrollbar*/\n      * {\n        scrollbar-color: #CCC !important;\n        scrollbar-width: thin !important;\n      }\n\n      /** Scrollbar for browser based on webkit */\n      ::-webkit-scrollbar {\n        width: 6px;\n        height: 6px;\n      }\n      ::-webkit-scrollbar-thumb {\n        background: #CCCCCC;\n      }\n      ::-webkit-scrollbar-thumb:hover {\n        background: #AFAFAF;\n      }\n      ::-webkit-scrollbar-thumb:active {\n        background: #6b6b6b;\n      }\n      ::-webkit-scrollbar-track {\n        background: rgba(204, 204, 204, 0.3);\n      }\n    }\n\n    body {\n      font-family: '", "', sans-serif;\n      margin: 0;\n      background-color: ", ";\n      color: ", ";\n\n      ", "\n    }\n\n    input, textarea, button {\n      font-family: inherit;\n    }\n\n    * {\n      box-sizing: border-box;\n    }\n\n    .dxc-tooltip {\n      z-index: 9999;\n    }\n\n    .popup-backdrop {\n      background-color: rgba(0, 0, 0, 0.4);\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 3000;\n    }\n\n    .popup-component {\n      background-color: rgba(0, 0, 0, 0.3);\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n\n    .ghostDragging {\n      border-radius: 8px;\n      background: ", ";\n      box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n      border: 1px solid ", ";\n      font-size: 14px;\n      padding: 10px 19px;\n      width: fit-content;\n      min-width: 200px;\n      font-size: 14px;\n      position: fixed;\n    }\n\n    #___reactour {\n      > div:first-child {\n        opacity: 0.7;\n        color: #000;\n        z-index: 2000;\n      }\n\n      span[data-tour-elem=badge] {\n        display: none;\n      }\n      div[data-tour-elem=controls] {\n        display: none;\n      }\n    }\n  "])), ((_theme$fonts$primary = theme.fonts.primary) === null || _theme$fonts$primary === void 0 ? void 0 : _theme$fonts$primary.name) || 'Helvetica', function (props) {
+  var GlobalStyle = (0, _styledComponents.createGlobalStyle)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\n    @media (min-width: 578px) {\n      /** Mozilla scrollbar*/\n      * {\n        scrollbar-color: #CCC !important;\n        scrollbar-width: thin !important;\n      }\n\n      /** Scrollbar for browser based on webkit */\n      ::-webkit-scrollbar {\n        width: 6px;\n        height: 6px;\n      }\n      ::-webkit-scrollbar-thumb {\n        background: #CCCCCC;\n      }\n      ::-webkit-scrollbar-thumb:hover {\n        background: #AFAFAF;\n      }\n      ::-webkit-scrollbar-thumb:active {\n        background: #6b6b6b;\n      }\n      ::-webkit-scrollbar-track {\n        background: rgba(204, 204, 204, 0.3);\n      }\n    }\n\n    body {\n      font-family: '", "', sans-serif;\n      margin: 0;\n      background-color: ", ";\n      color: ", ";\n\n      ", "\n    }\n\n    input, textarea, button {\n      font-family: inherit;\n    }\n\n    * {\n      box-sizing: border-box;\n    }\n\n    .dxc-tooltip {\n      z-index: 9999;\n    }\n\n    .popup-backdrop {\n      background-color: rgba(0, 0, 0, 0.4);\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 3000;\n    }\n\n    .modal-backdrop {\n      display: none;\n    }\n\n    .popup-component {\n      background-color: rgba(0, 0, 0, 0.3);\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n\n    .ghostDragging {\n      border-radius: 8px;\n      background: ", ";\n      box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n      border: 1px solid ", ";\n      font-size: 14px;\n      padding: 10px 19px;\n      width: fit-content;\n      min-width: 200px;\n      font-size: 14px;\n      position: fixed;\n    }\n\n    #___reactour {\n      > div:first-child {\n        opacity: 0.7;\n        color: #000;\n        z-index: 2000;\n      }\n\n      span[data-tour-elem=badge] {\n        display: none;\n      }\n      div[data-tour-elem=controls] {\n        display: none;\n      }\n    }\n  "])), ((_theme$fonts$primary = theme.fonts.primary) === null || _theme$fonts$primary === void 0 ? void 0 : _theme$fonts$primary.name) || 'Helvetica', function (props) {
     var _props$theme$colors;
     return ((_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.backgroundPage) || '#FFFFFF';
   }, function (props) {

package/_modules/index.js

@@ -699,6 +699,12 @@ Object.defineProperty(exports, "CountrySelector", {
     return _Settings.CountrySelector;
   }
 });
+Object.defineProperty(exports, "CustomerApp", {
+  enumerable: true,
+  get: function get() {
+    return _MyProducts.CustomerApp;
+  }
+});
 Object.defineProperty(exports, "CustomerCashWallet", {
   enumerable: true,
   get: function get() {
@@ -783,6 +789,12 @@ Object.defineProperty(exports, "DriverAnalytics", {
     return _BusinessIntelligence.DriverAnalytics;
   }
 });
+Object.defineProperty(exports, "DriverApp", {
+  enumerable: true,
+  get: function get() {
+    return _MyProducts.DriverApp;
+  }
+});
 Object.defineProperty(exports, "DriverGroupSetting", {
   enumerable: true,
   get: function get() {
@@ -1407,6 +1419,12 @@ Object.defineProperty(exports, "OrderingProductsListing", {
     return _OrderingProducts.OrderingProductsListing;
   }
 });
+Object.defineProperty(exports, "OrderingWebsite", {
+  enumerable: true,
+  get: function get() {
+    return _MyProducts.OrderingWebsite;
+  }
+});
 Object.defineProperty(exports, "OrdersCards", {
   enumerable: true,
   get: function get() {
@@ -1725,6 +1743,12 @@ Object.defineProperty(exports, "ProfessionalListing", {
     return _Users.ProfessionalListing;
   }
 });
+Object.defineProperty(exports, "ProfilePage", {
+  enumerable: true,
+  get: function get() {
+    return _Profile.ProfilePage;
+  }
+});
 Object.defineProperty(exports, "ProtectedRoute", {
   enumerable: true,
   get: function get() {
@@ -1905,6 +1929,12 @@ Object.defineProperty(exports, "ReportsUsers", {
     return _BusinessIntelligence.ReportsUsers;
   }
 });
+Object.defineProperty(exports, "ResetPassword", {
+  enumerable: true,
+  get: function get() {
+    return _Login.ResetPassword;
+  }
+});
 Object.defineProperty(exports, "ReviewCustomer", {
   enumerable: true,
   get: function get() {
@@ -2037,6 +2067,12 @@ Object.defineProperty(exports, "SpinnerLoader", {
     return _Shared.SpinnerLoader;
   }
 });
+Object.defineProperty(exports, "StoreApp", {
+  enumerable: true,
+  get: function get() {
+    return _MyProducts.StoreApp;
+  }
+});
 Object.defineProperty(exports, "Support", {
   enumerable: true,
   get: function get() {
@@ -2273,11 +2309,13 @@ var _Settings = require("./components/Settings");
 var _Stores = require("./components/Stores");
 var _Users = require("./components/Users");
 var _Loyalty = require("./components/Loyalty");
+var _MyProducts = require("./components/MyProducts");
 var _CartRecovery = require("./components/CartRecovery");
 var _Downloads = require("./components/Downloads");
 var _Layout = require("./components/Layout");
 var _SidebarMenu = require("./components/SidebarMenu");
 var _NotNetworkConnectivity = require("./components/NotNetworkConnectivity");
+var _Profile = require("./components/Profile");
 var _Shared = require("./components/Shared");
 var _LogoutButton = require("./components/LogoutButton");
 var _LanguageSelector = require("./components/LanguageSelector");

package/index-template.js

@@ -138,9 +138,17 @@ import android from './template/assets/images/icons/android.svg'
 /**
  * sounds
  */
- import notificationOgg from './template/assets/sounds/notification.ogg'
- import notificationMp3 from './template/assets/sounds/notification.mp3'
- 
+import notificationOgg from './template/assets/sounds/notification.ogg'
+import notificationMp3 from './template/assets/sounds/notification.mp3'
+
+/**
+ * my products
+ */
+import myCustomerApp from './template/assets/images/myProducts/customer-app.png'
+import myStoreApp from './template/assets/images/myProducts/store-app.png'
+import myDriverApp from './template/assets/images/myProducts/driver-app.png'
+import orderingWebsite from './template/assets/images/myProducts/ordering-website.png'
+
 if (!(window?.location?.hostname === 'localhost')) {
   Sentry.init({
     environment: process.env.NODE_ENV,
@@ -231,6 +239,12 @@ theme.images = {
     completed: orderCompleted,
     cancelled: orderCancelled
   },
+  myProducts: {
+    customerApp: myCustomerApp,
+    storeApp: myStoreApp,
+    driverApp: myDriverApp,
+    orderingWebsite: orderingWebsite
+  },
   icons: {
     ordersList: ordersList,
     shop: shop,
@@ -300,7 +314,11 @@ const RouteApp = () => {
       ...settings.api,
       language: language
     },
-    project: window.localStorage.getItem('project') !== null ? window.localStorage.getItem('project') : null
+    project: settings?.use_project_domain
+      ? '_'
+      : window.localStorage.getItem('project') !== null
+        ? window.localStorage.getItem('project')
+        : null
   })
 
   return (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.5.1",
+  "version": "1.6.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.5.0",
+    "ordering-components-admin-external": "1.6.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

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

@@ -208,6 +208,12 @@ export const UserFormDetailsUI = (props) => {
     })
   }, [formMethods])
 
+  useEffect(() => {
+    if (user?.id) {
+      cleanFormState && cleanFormState({ changes: {} })
+    }
+  }, [user?.id])
+
   return (
     <>
       <FormInput onSubmit={formMethods.handleSubmit(onSubmit)}>
@@ -223,11 +229,7 @@ export const UserFormDetailsUI = (props) => {
                       name={field.code}
                       className='form'
                       placeholder={t(field.code.toUpperCase(), field?.name)}
-                      defaultValue={
-                        formState?.result?.result
-                          ? formState?.result?.result[field.code]
-                          : formState?.changes[field.code] ?? (user && user[field.code]) ?? ''
-                      }
+                      value={formState?.changes[field.code] ?? (user && user[field.code]) ?? ''}
                       onChange={handleChangeInputEmail}
                       ref={(e) => {
                         emailInput.current = e
@@ -241,11 +243,7 @@ export const UserFormDetailsUI = (props) => {
                       name={field.code}
                       className='form'
                       placeholder={t(field.code.toUpperCase(), field?.name)}
-                      defaultValue={
-                        formState?.result?.result
-                          ? formState?.result?.result[field.code]
-                          : formState?.changes[field.code] ?? (user && user[field.code]) ?? ''
-                      }
+                      value={formState?.changes[field.code] ?? (user && user[field.code]) ?? ''}
                       onChange={handleChangeInput}
                       ref={formMethods.register({
                         required: isRequiredField(field.code)

package/src/components/Login/LoginForm/index.js

@@ -44,7 +44,8 @@ const LoginFormUI = (props) => {
     loginTab,
     isPopup,
     isReCaptchaEnable,
-    handleReCaptcha
+    handleReCaptcha,
+    useProjectDomain
   } = props
   const [, t] = useLanguage()
   const [ordering] = useApi()
@@ -180,24 +181,26 @@ const LoginFormUI = (props) => {
             isPopup={isPopup}
             onSubmit={handleSubmit(onSubmit)}
           >
-            <InputWithIcon>
-              <Input
-                type='text'
-                name='project'
-                aria-label='project'
-                placeholder={t('PROJECT', 'Project')}
-                ref={register({
-                  required: t(
-                    'VALIDATION_ERROR_REQUIRED',
-                    'Project is required'
-                  ).replace('_attribute_', t('PROJECT', 'Project'))
-                })}
-                onChange={(e) => hanldeChangeProject(e)}
-                autoComplete='off'
-                autoCapitalize='off'
-              />
-              <MdExitToApp />
-            </InputWithIcon>
+            {!useProjectDomain && (
+              <InputWithIcon>
+                <Input
+                  type='text'
+                  name='project'
+                  aria-label='project'
+                  placeholder={t('PROJECT', 'Project')}
+                  ref={register({
+                    required: t(
+                      'VALIDATION_ERROR_REQUIRED',
+                      'Project is required'
+                    ).replace('_attribute_', t('PROJECT', 'Project'))
+                  })}
+                  onChange={(e) => hanldeChangeProject(e)}
+                  autoComplete='off'
+                  autoCapitalize='off'
+                />
+                <MdExitToApp />
+              </InputWithIcon>
+            )}
 
             {useLoginByEmail && loginTab === 'email' && (
               <InputWithIcon>
@@ -321,7 +324,7 @@ export const LoginForm = (props) => {
   const loginControllerProps = {
     ...props,
     UIComponent: LoginFormUI,
-    allowedLevels: [0, 2, 5]
+    allowedLevels: [0, 2, 5, 8]
   }
   return <LoginFormController {...loginControllerProps} />
 }