ordering-ui-admin-external 1.16.3 → 1.18.0

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

@@ -11,7 +11,9 @@ var _orderingComponentsAdminExternal = require("ordering-components-admin-extern
 var _styledComponents = require("styled-components");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _CustomerWalletEvents = require("../CustomerWalletEvents");
-var _styles = require("./styles");
+var _styles = require("../../../styles");
+var _Shared = require("../../Shared");
+var _styles2 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -29,7 +31,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
   var _walletState$wallet, _user$loyalty_level$i, _user$loyalty_level, _user$loyalty_level2;
   var walletState = props.walletState,
-    user = props.user;
+    user = props.user,
+    handleChangeInput = props.handleChangeInput,
+    actionState = props.actionState,
+    addWalletState = props.addWalletState,
+    reduceWalletState = props.reduceWalletState,
+    handleAddWalletMoney = props.handleAddWalletMoney,
+    handleReduceWalletMoney = props.handleReduceWalletMoney;
   var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -40,6 +48,13 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showOption = _useState2[0],
     setShowOption = _useState2[1];
+  var _useState3 = (0, _react.useState)({
+      open: false,
+      content: []
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    alertState = _useState4[0],
+    setAlertState = _useState4[1];
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setShowOption(tab);
     if (!isInitialRender) {
@@ -57,26 +72,53 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
       handleTabClick(showOption);
     }
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement("h1", null, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tabs, null, /*#__PURE__*/_react.default.createElement(_styles.Tab, {
+  var onAddWalletMoney = function onAddWalletMoney() {
+    if (!(addWalletState !== null && addWalletState !== void 0 && addWalletState.amount)) {
+      setAlertState({
+        open: true,
+        content: [t('VALIDATION_ERROR_REQUIRED', 'The amount is required').replace('_attribute_', t('AMOUNT', 'Amount'))]
+      });
+      return;
+    }
+    handleAddWalletMoney();
+  };
+  var onReduceWalletMoney = function onReduceWalletMoney() {
+    if (!(reduceWalletState !== null && reduceWalletState !== void 0 && reduceWalletState.amount)) {
+      setAlertState({
+        open: true,
+        content: [t('VALIDATION_ERROR_REQUIRED', 'The amount is required').replace('_attribute_', t('AMOUNT', 'Amount'))]
+      });
+      return;
+    }
+    handleReduceWalletMoney();
+  };
+  (0, _react.useEffect)(function () {
+    if (actionState.loading || !actionState.error) return;
+    setAlertState({
+      open: true,
+      content: actionState.error
+    });
+  }, [actionState]);
+  return /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement("h1", null, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles2.Tabs, null, /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
     active: showOption === 'points_wallet',
     onClick: function onClick() {
       return handleTabClick('points_wallet');
     }
-  }, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tab, {
+  }, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
     active: showOption === 'history',
     onClick: function onClick() {
       return handleTabClick('history');
     }
-  }, t('TRANSACTION_HISTORY', 'Transaction history'))), showOption === 'points_wallet' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, walletState !== null && walletState !== void 0 && walletState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWalletContainer, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+  }, t('TRANSACTION_HISTORY', 'Transaction history'))), showOption === 'points_wallet' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, walletState !== null && walletState !== void 0 && walletState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.PointsWalletContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.PointsWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 70,
     height: 20
   })), /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 30,
     height: 15
-  }))), /*#__PURE__*/_react.default.createElement(_styles.LoyaltyLevel, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_styles2.LoyaltyLevel, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 70,
     height: 20
-  })), /*#__PURE__*/_react.default.createElement(_styles.LoyaltyLevelContent, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+  })), /*#__PURE__*/_react.default.createElement(_styles2.LoyaltyLevelContent, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     height: 150,
     style: {
       width: '100%'
@@ -84,10 +126,85 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
   }), /*#__PURE__*/_react.default.createElement("h3", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 100,
     height: 23
-  })))))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWalletContainer, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, ((_walletState$wallet = walletState.wallet) === null || _walletState$wallet === void 0 ? void 0 : _walletState$wallet.balance) || 0), /*#__PURE__*/_react.default.createElement("p", null, t('POINTS', 'Points'))), (user === null || user === void 0 ? void 0 : user.loyalty_level) && /*#__PURE__*/_react.default.createElement(_styles.LoyaltyLevel, null, /*#__PURE__*/_react.default.createElement("h2", null, t('LEVEL', 'Level')), /*#__PURE__*/_react.default.createElement(_styles.LoyaltyLevelContent, null, /*#__PURE__*/_react.default.createElement("img", {
+  })))))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.PointsWalletContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.PointsWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, ((_walletState$wallet = walletState.wallet) === null || _walletState$wallet === void 0 ? void 0 : _walletState$wallet.balance) || 0), /*#__PURE__*/_react.default.createElement("p", null, t('POINTS', 'Points'))), (user === null || user === void 0 ? void 0 : user.loyalty_level) && /*#__PURE__*/_react.default.createElement(_styles2.LoyaltyLevel, null, /*#__PURE__*/_react.default.createElement("h2", null, t('LEVEL', 'Level')), /*#__PURE__*/_react.default.createElement(_styles2.LoyaltyLevelContent, null, /*#__PURE__*/_react.default.createElement("img", {
     src: (_user$loyalty_level$i = user === null || user === void 0 ? void 0 : (_user$loyalty_level = user.loyalty_level) === null || _user$loyalty_level === void 0 ? void 0 : _user$loyalty_level.image) !== null && _user$loyalty_level$i !== void 0 ? _user$loyalty_level$i : theme.images.general.level,
     alt: ""
-  }), /*#__PURE__*/_react.default.createElement("h3", null, user === null || user === void 0 ? void 0 : (_user$loyalty_level2 = user.loyalty_level) === null || _user$loyalty_level2 === void 0 ? void 0 : _user$loyalty_level2.name)))))), showOption === 'history' && /*#__PURE__*/_react.default.createElement(_CustomerWalletEvents.CustomerWalletEvents, props));
+  }), /*#__PURE__*/_react.default.createElement("h3", null, user === null || user === void 0 ? void 0 : (_user$loyalty_level2 = user.loyalty_level) === null || _user$loyalty_level2 === void 0 ? void 0 : _user$loyalty_level2.name))), /*#__PURE__*/_react.default.createElement(_styles2.SectionContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('ADD_WALLET_MONEY', 'Add wallet money')), /*#__PURE__*/_react.default.createElement(_styles2.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('INDICATE_THE_AMOUNT_TO_ADD', 'Indicate the amount to add')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    type: "number",
+    name: "amount",
+    placeholder: t('POINTS', 'Points'),
+    onKeyPress: function onKeyPress(e) {
+      if (!/^[0-9.]$/.test(e.key)) {
+        e.preventDefault();
+      }
+    },
+    value: (addWalletState === null || addWalletState === void 0 ? void 0 : addWalletState.amount) || '',
+    onChange: function onChange(e) {
+      return handleChangeInput(e, true);
+    }
+  })), /*#__PURE__*/_react.default.createElement(_styles2.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('COMMENT', 'Comment')), /*#__PURE__*/_react.default.createElement(_styles.TextArea, {
+    name: "description",
+    rows: 3,
+    value: (addWalletState === null || addWalletState === void 0 ? void 0 : addWalletState.description) || '',
+    onChange: function onChange(e) {
+      return handleChangeInput(e, true);
+    },
+    placeholder: t('WRITE_SHORT_COMMENT', 'Write a short comment')
+  })), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+    borderRadius: "8px",
+    color: "primary",
+    onClick: function onClick() {
+      return onAddWalletMoney();
+    },
+    disabled: actionState.loading || Object.keys(addWalletState).length === 0
+  }, t('ADD', 'Add'))), /*#__PURE__*/_react.default.createElement(_styles2.SectionContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('REDUCE_WALLET_MONEY', 'Reduce wallet money')), /*#__PURE__*/_react.default.createElement(_styles2.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('INDICATE_THE_AMOUNT_TO_REDUCE', 'Indicate the amount to reduce')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    type: "number",
+    name: "amount",
+    placeholder: t('POINTS', 'Points'),
+    value: (reduceWalletState === null || reduceWalletState === void 0 ? void 0 : reduceWalletState.amount) || '',
+    onChange: function onChange(e) {
+      return handleChangeInput(e, false);
+    },
+    onKeyPress: function onKeyPress(e) {
+      if (!/^[0-9.]$/.test(e.key)) {
+        e.preventDefault();
+      }
+    }
+  })), /*#__PURE__*/_react.default.createElement(_styles2.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('COMMENT', 'Comment')), /*#__PURE__*/_react.default.createElement(_styles.TextArea, {
+    rows: 3,
+    name: "description",
+    value: (reduceWalletState === null || reduceWalletState === void 0 ? void 0 : reduceWalletState.description) || '',
+    onChange: function onChange(e) {
+      return handleChangeInput(e, false);
+    },
+    placeholder: t('WRITE_SHORT_COMMENT', 'Write a short comment')
+  })), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+    borderRadius: "8px",
+    color: "black",
+    onClick: function onClick() {
+      return onReduceWalletMoney();
+    },
+    disabled: actionState.loading || Object.keys(reduceWalletState).length === 0
+  }, t('REDUCE', 'Reduce')))))), showOption === 'history' && /*#__PURE__*/_react.default.createElement(_CustomerWalletEvents.CustomerWalletEvents, props), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+    width: "800px",
+    title: t('LOGIN'),
+    content: alertState.content,
+    acceptText: t('ACCEPT'),
+    open: alertState.open,
+    onClose: function onClose() {
+      return setAlertState({
+        open: false,
+        content: []
+      });
+    },
+    onAccept: function onAccept() {
+      return setAlertState({
+        open: false,
+        content: []
+      });
+    },
+    closeOnBackdrop: false
+  }));
 };
 var CustomerPointsWallet = function CustomerPointsWallet(props) {
   var customerPointsWalletProps = _objectSpread(_objectSpread({}, props), {}, {

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

@@ -4,15 +4,15 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Tabs = exports.Tab = exports.PointsWrapper = exports.PointsWalletContainer = exports.LoyaltyLevelContent = exports.LoyaltyLevel = exports.LevelWrapper = exports.EqualWrapper = exports.Container = void 0;
+exports.Tabs = exports.Tab = exports.SectionContainer = exports.PointsWrapper = exports.PointsWalletContainer = exports.LoyaltyLevelContent = exports.LoyaltyLevel = exports.LevelWrapper = exports.FormController = exports.EqualWrapper = exports.Container = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16;
 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) } })); }
 var Container = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 20px;\n  width: 100%;\n\n  > h1 {\n    font-size: 20px;\n    font-weight: 700;\n    margin-top: 0;\n    margin-bottom: 7px;\n  }\n"])));
 exports.Container = Container;
-var PointsWalletContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding-top: 30px;\n"])));
+var PointsWalletContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 30px 0;\n"])));
 exports.PointsWalletContainer = PointsWalletContainer;
 var PointsWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  h2 {\n    font-weight: 500;\n    font-size: 24px;\n    line-height: 36px;\n    margin: 0px;\n  }\n  p {\n    margin: 0px;\n    font-size: 14px;\n    line-height: 24px;\n  }\n"])));
 exports.PointsWrapper = PointsWrapper;
@@ -46,4 +46,8 @@ exports.LoyaltyLevel = LoyaltyLevel;
 var LoyaltyLevelContent = _styledComponents.default.div(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 359px;\n\n  img {\n    width: 100%;\n    object-fit: cover;\n  }\n\n  h3 {\n    font-weight: 600;\n    font-size: 28px;\n    line-height: 42px;\n    color: ", ";\n    margin-top: 15px;\n    text-align: center;\n  }\n"])), function (props) {
   return props.theme.colors.primary;
 });
-exports.LoyaltyLevelContent = LoyaltyLevelContent;
+exports.LoyaltyLevelContent = LoyaltyLevelContent;
+var SectionContainer = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  margin-top: 54px;\n  margin-bottom: 30px;\n  > p {\n    font-size: 16px;\n    font-weight: 600;\n    margin-top: 0;\n    margin-bottom: 22px;\n  }\n  > button {\n    height: 44px;\n  }\n"])));
+exports.SectionContainer = SectionContainer;
+var FormController = _styledComponents.default.div(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  margin-bottom: 26px;\n\n  label {\n    font-size: 14px;\n    margin-bottom: 10px;\n  }\n\n  input,\n  textarea {\n    font-size: 14px;\n  }\n\n  input::-webkit-outer-spin-button,\n  input::-webkit-inner-spin-button {\n    -webkit-appearance: none;\n    margin: 0;\n  }\n\n  input[type=number] {\n    -moz-appearance: textfield;\n  }\n"])));
+exports.FormController = FormController;

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

@@ -84,6 +84,13 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     openUserAddForm = _useState8[0],
     setOpenUserAddForm = _useState8[1];
+  var _useState9 = (0, _react.useState)({
+      open: false,
+      content: []
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    alertState = _useState10[0],
+    setAlertState = _useState10[1];
   var isEnabledAppointmentsFeature = configs === null || configs === void 0 ? void 0 : (_configs$appointments = configs.appointments) === null || _configs$appointments === void 0 ? void 0 : _configs$appointments.value;
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenUserDetails(false);
@@ -122,6 +129,13 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
       setIsOpenUserDetails(true);
     }
   }, [usersList]);
+  (0, _react.useEffect)(function () {
+    if (!(usersList !== null && usersList !== void 0 && usersList.error)) return;
+    setAlertState({
+      open: true,
+      content: usersList === null || usersList === void 0 ? void 0 : usersList.error
+    });
+  }, [usersList === null || usersList === void 0 ? void 0 : usersList.error]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersListingContainer, null, isEnabledAppointmentsFeature ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_UsersListingHeader.UsersListingHeader, {
     isProfessionals: true,
     title: headerTitle,
@@ -188,7 +202,25 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     onClose: function onClose() {
       return setOpenUserAddForm(false);
     }
-  })));
+  })), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+    title: t('WEB_APPNAME', 'Ordering'),
+    content: alertState.content,
+    acceptText: t('ACCEPT', 'Accept'),
+    open: alertState.open,
+    onClose: function onClose() {
+      return setAlertState({
+        open: false,
+        content: []
+      });
+    },
+    onAccept: function onAccept() {
+      return setAlertState({
+        open: false,
+        content: []
+      });
+    },
+    closeOnBackdrop: false
+  }));
 };
 var ProfessionalListing = function ProfessionalListing(props) {
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);

package/_modules/index.js

@@ -663,6 +663,12 @@ Object.defineProperty(exports, "CampaignWhatsapp", {
     return _Marketing.CampaignWhatsapp;
   }
 });
+Object.defineProperty(exports, "CardFieldsSetting", {
+  enumerable: true,
+  get: function get() {
+    return _Settings.CardFieldsSetting;
+  }
+});
 Object.defineProperty(exports, "ChatBusinessesList", {
   enumerable: true,
   get: function get() {

package/package.json

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

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

@@ -49,7 +49,8 @@ const DeliveryUsersListingUI = (props) => {
     handleSuccessAddUser,
     handleSuccessDeleteUser,
     actionDisabled,
-    driversGroupsState
+    driversGroupsState,
+    setSelectedUsers
   } = props
 
   const history = useHistory()
@@ -195,6 +196,7 @@ const DeliveryUsersListingUI = (props) => {
           handleOpenUserDetails={handleOpenUserDetails}
           handleOpenUserAddForm={handleOpenUserAddForm}
           actionDisabled={actionDisabled}
+          setSelectedUsers={setSelectedUsers}
         />
       </UsersListingContainer>
 

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

@@ -128,7 +128,7 @@ export const DriversGroupLogistics = (props) => {
           <LogisticsConfigItem
             active={showConfig === 'GROUP_ORDERS'}
             onClick={() => handleOpenConfig('GROUP_ORDERS')}
-          >a
+          >
             <span>{t('GROUP_ORDERS', 'Group Orders')}</span>
             <ChevronRight />
           </LogisticsConfigItem>

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

@@ -71,6 +71,8 @@ const DriversGroupLogsUI = (props) => {
     }
   }, [logsList.logs, paginationProps])
 
+  console.log(logsList)
+
   return (
     <>
       <DriversGroupLogsContainer

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

@@ -21,7 +21,8 @@ import {
   ActionsContainer,
   EnableWrapper,
   PagesBottomContainer,
-  AddNewGroupButton
+  AddNewGroupButton,
+  GroupIdWrapper
 } from './styles'
 
 export const DriversGroupsList = (props) => {
@@ -100,7 +101,7 @@ export const DriversGroupsList = (props) => {
             <thead>
               <tr>
                 <th>
-                  <GroupNameContainer isHeader>
+                  <GroupIdWrapper>
                     <CheckBoxWrapper
                       onClick={() => handleAllSelectGroup()}
                       isChecked={!driversGroupsState.loading && (selectedGroupList.length === driversGroupsState.groups.length)}
@@ -111,6 +112,11 @@ export const DriversGroupsList = (props) => {
                           : <MdCheckBoxOutlineBlank />
                       }
                     </CheckBoxWrapper>
+                    <span>{t('ID', 'ID')}</span>
+                  </GroupIdWrapper>
+                </th>
+                <th>
+                  <GroupNameContainer isHeader>
                     <p>{t('GROUP', 'Group')}</p>
                   </GroupNameContainer>
                 </th>
@@ -135,6 +141,12 @@ export const DriversGroupsList = (props) => {
               [...Array(groupsPerPage).keys()].map(i => (
                 <tbody key={i}>
                   <tr>
+                    <td>
+                      <GroupIdWrapper>
+                        <Skeleton width={18} height={18} />
+                        <Skeleton width={40} style={{ margin: '0px 5px' }} />
+                      </GroupIdWrapper>
+                    </td>
                     <td>
                       <GroupNameContainer>
                         <Skeleton width={100} />
@@ -175,7 +187,7 @@ export const DriversGroupsList = (props) => {
                 >
                   <tr>
                     <td>
-                      <GroupNameContainer>
+                      <GroupIdWrapper>
                         <CheckBoxWrapper
                           className='group-checkbox'
                           onClick={() => handleSelectGroup(group.id)}
@@ -187,6 +199,11 @@ export const DriversGroupsList = (props) => {
                               : <MdCheckBoxOutlineBlank />
                           }
                         </CheckBoxWrapper>
+                        <span>{group?.id}</span>
+                      </GroupIdWrapper>
+                    </td>
+                    <td>
+                      <GroupNameContainer>
                         <p>{group?.name}</p>
                       </GroupNameContainer>
                     </td>

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

@@ -17,15 +17,6 @@ export const GroupsTable = styled.table`
   td, th {
     padding: 13px 0;
     font-size: 12px;
-    &:first-child {
-      width: 30%;
-    }
-
-    &:nth-child(2),    
-    &:nth-child(3),    
-    &:nth-child(4) {
-      width: 18%;
-    }
   }
 
   thead {
@@ -83,11 +74,6 @@ export const GroupNameContainer = styled(BorderWrapper)`
 
 export const CheckBoxWrapper = styled.div`
   cursor: pointer;
-  ${props => props.theme?.rtl ? css`
-    margin-left: 20px;
-  ` : css`
-    margin-right: 20px;
-  `}
   svg {
     font-size: 24px;
     color: #B1BCCC;
@@ -229,3 +215,12 @@ export const AddNewGroupButton = styled.div`
     pointer-events: none;
   `}
 `
+
+export const GroupIdWrapper = styled.div`
+  display: flex;
+  align-items: center;
+
+  > span {
+    margin: 0 20px;
+  }
+`