ordering-ui-admin-external 1.43.7 → 1.43.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_bundles/{ordering-ui-admin.116572f8d7be9d39e8a0.js → ordering-ui-admin.d89d65dbfc87632c2b43.js} +2 -2
- package/_modules/components/Orders/OrdersContentHeader/styles.js +13 -10
- package/_modules/components/Orders/OrdersHeaderFilterGroup/index.js +4 -2
- package/_modules/components/Orders/OrdersHeaderFilterGroup/styles.js +3 -2
- package/_modules/components/Orders/OrdersManager/index.js +1 -0
- package/_modules/components/Orders/WebsocketStatus/index.js +3 -1
- package/_modules/components/Stores/BusinessMenu/index.js +12 -2
- package/_modules/components/Users/CustomersListing/index.js +0 -2
- package/_modules/components/Users/UserFilterGroup/index.js +11 -1
- package/_modules/components/Users/UsersListingHeader/index.js +1 -1
- package/package.json +2 -2
- package/src/components/Orders/OrdersContentHeader/styles.js +7 -1
- package/src/components/Orders/OrdersHeaderFilterGroup/index.js +3 -2
- package/src/components/Orders/OrdersHeaderFilterGroup/styles.js +2 -2
- package/src/components/Orders/OrdersManager/index.js +1 -0
- package/src/components/Orders/WebsocketStatus/index.js +1 -1
- package/src/components/Stores/BusinessMenu/index.js +10 -2
- package/src/components/Users/CustomersListing/index.js +0 -2
- package/src/components/Users/UserFilterGroup/index.js +44 -28
- package/src/components/Users/UsersListingHeader/index.js +1 -1
- /package/_bundles/{ordering-ui-admin.116572f8d7be9d39e8a0.js.LICENSE.txt → ordering-ui-admin.d89d65dbfc87632c2b43.js.LICENSE.txt} +0 -0
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.WrapperSearchAndFilter = exports.TopRightSection = exports.SLAControlsWrapper = exports.OrderContentHeaderContainer = exports.HeaderTitle = exports.HeaderSection = void 0;
|
|
8
8
|
var _styledComponents = _interopRequireWildcard(require("styled-components"));
|
|
9
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16;
|
|
9
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
|
|
10
10
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
11
11
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
12
12
|
function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
@@ -24,20 +24,23 @@ var HeaderSection = exports.HeaderSection = _styledComponents.default.div(_templ
|
|
|
24
24
|
var HeaderTitle = exports.HeaderTitle = _styledComponents.default.p(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n color: ", ";\n font-size: 20px;\n font-weight: bold;\n margin: 0px;\n text-transform: capitalize;\n white-space: nowrap;\n\n @media (max-width: 560px) {\n width: calc(100% - 50px);\n }\n"])), function (props) {
|
|
25
25
|
return props.theme.colors.headingColor;
|
|
26
26
|
});
|
|
27
|
-
var TopRightSection = exports.TopRightSection = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n width: 100%;\n display: flex;\n flex-direction: column;\n flex-wrap: wrap;\n ", "\n \n @media (min-width: 768px) {\n flex-direction: row;\n align-items: center;\n }\n"])), function (_ref2) {
|
|
27
|
+
var TopRightSection = exports.TopRightSection = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n width: 100%;\n display: flex;\n flex-direction: column;\n flex-wrap: wrap;\n ", "\n\n ", "\n\n @media (min-width: 768px) {\n flex-direction: row;\n align-items: center;\n }\n"])), function (_ref2) {
|
|
28
28
|
var isCustomLayout = _ref2.isCustomLayout;
|
|
29
29
|
return !isCustomLayout && (0, _styledComponents.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n justify-content: flex-end;\n "])));
|
|
30
|
+
}, function (_ref3) {
|
|
31
|
+
var isCustomLayout = _ref3.isCustomLayout;
|
|
32
|
+
return isCustomLayout && (0, _styledComponents.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n .websocket-container {\n padding-bottom: 10px;\n }\n "])));
|
|
30
33
|
});
|
|
31
|
-
var SLAControlsWrapper = exports.SLAControlsWrapper = _styledComponents.default.div(
|
|
32
|
-
var WrapperSearchAndFilter = exports.WrapperSearchAndFilter = _styledComponents.default.div(
|
|
33
|
-
var fullWidth =
|
|
34
|
-
return fullWidth && (0, _styledComponents.css)(
|
|
34
|
+
var SLAControlsWrapper = exports.SLAControlsWrapper = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n margin-top: 10px;\n\n @media (min-width: 768px) {\n margin-top: 0px;\n }\n"])));
|
|
35
|
+
var WrapperSearchAndFilter = exports.WrapperSearchAndFilter = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n position: relative;\n display: flex;\n align-items: center;\n margin-top: 10px;\n\n ", "\n\n input {\n background: ", ";\n border: none;\n }\n\n > button {\n ", "\n }\n\n @media (min-width: 760px) {\n margin: 20px 0 10px 0;\n }\n\n @media (min-width: 992px) {\n ", "\n }\n"])), function (_ref4) {
|
|
36
|
+
var fullWidth = _ref4.fullWidth;
|
|
37
|
+
return fullWidth && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n width: 100%;\n > div {\n width: 100%;\n\n input {\n width: 100%;\n }\n }\n "])));
|
|
35
38
|
}, function (props) {
|
|
36
39
|
return props.theme.colors.secundary;
|
|
37
40
|
}, function (props) {
|
|
38
41
|
var _props$theme3;
|
|
39
|
-
return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(
|
|
40
|
-
}, function (
|
|
41
|
-
var fullWidth =
|
|
42
|
-
return !fullWidth && (0, _styledComponents.css)(
|
|
42
|
+
return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n margin-right: 8px;\n "]))) : (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n margin-left: 8px;\n "])));
|
|
43
|
+
}, function (_ref5) {
|
|
44
|
+
var fullWidth = _ref5.fullWidth;
|
|
45
|
+
return !fullWidth && (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n margin: 0px;\n "])));
|
|
43
46
|
});
|
|
@@ -34,7 +34,8 @@ var OrdersHeaderFilterGroupUI = function OrdersHeaderFilterGroupUI(props) {
|
|
|
34
34
|
handleChangeDriver = props.handleChangeDriver,
|
|
35
35
|
handleChangeFilterValues = props.handleChangeFilterValues,
|
|
36
36
|
handleChangeExternalId = props.handleChangeExternalId,
|
|
37
|
-
handleChangeGroupUnassigned = props.handleChangeGroupUnassigned
|
|
37
|
+
handleChangeGroupUnassigned = props.handleChangeGroupUnassigned,
|
|
38
|
+
isSelectedOrders = props.isSelectedOrders;
|
|
38
39
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
39
40
|
_useLanguage2 = _slicedToArray(_useLanguage, 1),
|
|
40
41
|
dictionary = _useLanguage2[0].dictionary;
|
|
@@ -79,7 +80,8 @@ var OrdersHeaderFilterGroupUI = function OrdersHeaderFilterGroupUI(props) {
|
|
|
79
80
|
}, [filterValues]);
|
|
80
81
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, {
|
|
81
82
|
ref: wrapperRef,
|
|
82
|
-
wrapperWidth: wrapperSize.width
|
|
83
|
+
wrapperWidth: wrapperSize.width,
|
|
84
|
+
isSelectedOrders: isSelectedOrders
|
|
83
85
|
}, !loading && configFilter.includes('external_id') && /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
|
|
84
86
|
placeholder: (_dictionary$EXTERNAL_ = dictionary === null || dictionary === void 0 ? void 0 : dictionary.EXTERNAL_ID) !== null && _dictionary$EXTERNAL_ !== void 0 ? _dictionary$EXTERNAL_ : 'External Id',
|
|
85
87
|
onChange: handleChangeExternalId,
|
|
@@ -15,8 +15,9 @@ var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObj
|
|
|
15
15
|
}, function (props) {
|
|
16
16
|
return props.theme.colors.headingColor;
|
|
17
17
|
}, function (_ref) {
|
|
18
|
-
var wrapperWidth = _ref.wrapperWidth
|
|
19
|
-
|
|
18
|
+
var wrapperWidth = _ref.wrapperWidth,
|
|
19
|
+
isSelectedOrders = _ref.isSelectedOrders;
|
|
20
|
+
return wrapperWidth < 992 && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n flex-direction: column !important;\n padding: ", ";\n "])), !isSelectedOrders && '15px 10px 0 10px');
|
|
20
21
|
});
|
|
21
22
|
var Option = exports.Option = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n font-weight: 400;\n font-size: 14px;\n line-height: 24px;\n color: ", ";\n display: flex;\n align-items: center;\n padding: 5px;\n"])), function (props) {
|
|
22
23
|
return props.theme.colors.secundaryContrast;
|
|
@@ -233,6 +233,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
|
|
|
233
233
|
setSlaSettingTime: setSlaSettingTime,
|
|
234
234
|
isLateralBar: isLateralBar
|
|
235
235
|
}), /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
|
|
236
|
+
isSelectedOrders: isSelectedOrders,
|
|
236
237
|
driverGroupList: driverGroupList,
|
|
237
238
|
driversList: driversList,
|
|
238
239
|
handleChangeFilterValues: handleChangeFilterValues
|
|
@@ -65,7 +65,9 @@ var SocketStatusUI = function SocketStatusUI(props) {
|
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
}, [reconnectAttemptCount]);
|
|
68
|
-
return /*#__PURE__*/_react.default.createElement(_styles2.Contatiner,
|
|
68
|
+
return /*#__PURE__*/_react.default.createElement(_styles2.Contatiner, {
|
|
69
|
+
className: "websocket-container"
|
|
70
|
+
}, /*#__PURE__*/_react.default.createElement(_styles2.InfoWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
|
|
69
71
|
color: "primary"
|
|
70
72
|
}, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.InfoCircle, null)), isEnabledWhiteLabelModule ? /*#__PURE__*/_react.default.createElement(_styles2.InfoContent, null, t('WEBSOCKET_STATUS_INFO_WITHOUT_LINK', 'Verify the server connection by date and time using the Connection status button. Press update to refresh you dashboard and update the status as well. Need help? Contact our Customer support team.')) : /*#__PURE__*/_react.default.createElement(_styles2.InfoContent, null, t('WEBSOCKET_STATUS_INFO', 'Verify the server connection by date and time using the Connection status button. Press update to refresh you dashboard and update the status as well. Need help? Contact our Customer support team here:'), /*#__PURE__*/_react.default.createElement("a", {
|
|
71
73
|
href: "https://www.ordering.co/contact-ordering",
|
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.BusinessMenu = void 0;
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
var _reactRouterDom = require("react-router-dom");
|
|
10
|
+
var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
|
|
10
11
|
var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
|
|
11
12
|
var _BusinessMenuOptions = require("../BusinessMenuOptions");
|
|
12
13
|
var _Shared = require("../../Shared");
|
|
@@ -15,6 +16,7 @@ var _styles = require("../../../styles");
|
|
|
15
16
|
var _reactBootstrapIcons = require("react-bootstrap-icons");
|
|
16
17
|
var _utils = require("../../../utils");
|
|
17
18
|
var _styles2 = require("./styles");
|
|
19
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
18
20
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
19
21
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
22
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
@@ -171,7 +173,14 @@ var BusinessMenuUI = function BusinessMenuUI(props) {
|
|
|
171
173
|
onSearch: function onSearch(val) {
|
|
172
174
|
return setSearchValue(val);
|
|
173
175
|
}
|
|
174
|
-
})),
|
|
176
|
+
})), (businessMenusState === null || businessMenusState === void 0 ? void 0 : businessMenusState.loading) && _toConsumableArray(Array(4).keys()).map(function (i) {
|
|
177
|
+
return /*#__PURE__*/_react.default.createElement(_styles2.MeunItem, {
|
|
178
|
+
key: i
|
|
179
|
+
}, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
180
|
+
width: 120,
|
|
181
|
+
height: 24
|
|
182
|
+
}));
|
|
183
|
+
}), !(businessMenusState !== null && businessMenusState !== void 0 && businessMenusState.loading) && menuList.map(function (menu, index) {
|
|
175
184
|
return /*#__PURE__*/_react.default.createElement(_styles2.MeunItem, {
|
|
176
185
|
key: menu.id,
|
|
177
186
|
isBorderTop: index === 0,
|
|
@@ -190,7 +199,8 @@ var BusinessMenuUI = function BusinessMenuUI(props) {
|
|
|
190
199
|
}), !isSelectedSharedMenus && /*#__PURE__*/_react.default.createElement(_styles2.AddMenuButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.LinkButton, {
|
|
191
200
|
onClick: function onClick() {
|
|
192
201
|
return handleOpenOptions('option', {});
|
|
193
|
-
}
|
|
202
|
+
},
|
|
203
|
+
disabled: businessMenusState === null || businessMenusState === void 0 ? void 0 : businessMenusState.loading
|
|
194
204
|
}, t('ADD_MENU', 'Add menu')))), width >= 1000 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showOption === 'option' && /*#__PURE__*/_react.default.createElement(_BusinessMenuOptions.BusinessMenuOptions, {
|
|
195
205
|
open: showOption === 'option',
|
|
196
206
|
business: business,
|
|
@@ -239,9 +239,7 @@ var CustomersListing = exports.CustomersListing = function CustomersListing(prop
|
|
|
239
239
|
var customersProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
240
240
|
defaultUserActiveState: defaultUserActiveState,
|
|
241
241
|
UIComponent: CustomersListingUI,
|
|
242
|
-
isSearchByUserEmail: true,
|
|
243
242
|
isSearchByUserPhone: true,
|
|
244
|
-
isSearchByUserName: true,
|
|
245
243
|
paginationSettings: {
|
|
246
244
|
initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
|
|
247
245
|
pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
|
|
@@ -192,7 +192,7 @@ var UserFilterGroupUI = function UserFilterGroupUI(props) {
|
|
|
192
192
|
})
|
|
193
193
|
});
|
|
194
194
|
}
|
|
195
|
-
})))), /*#__PURE__*/_react.default.createElement(_styles2.FormGroup, null, /*#__PURE__*/_react.default.createElement(_styles2.FormControl, null, /*#__PURE__*/_react.default.createElement("label", null, t('COUNTRY_PHONE_CODE', 'Country phone code')), /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {
|
|
195
|
+
})))), !isCustomers && /*#__PURE__*/_react.default.createElement(_styles2.FormGroup, null, /*#__PURE__*/_react.default.createElement(_styles2.FormControl, null, /*#__PURE__*/_react.default.createElement("label", null, t('COUNTRY_PHONE_CODE', 'Country phone code')), /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {
|
|
196
196
|
placeholder: t('SELECT_OPTION', 'Select a option'),
|
|
197
197
|
defaultValue: filterValues === null || filterValues === void 0 ? void 0 : filterValues.countryPhoneCode,
|
|
198
198
|
options: phoneCodeList,
|
|
@@ -284,6 +284,16 @@ var UserFilterGroupUI = function UserFilterGroupUI(props) {
|
|
|
284
284
|
},
|
|
285
285
|
optionInnerMaxHeight: "300px",
|
|
286
286
|
className: "full-select"
|
|
287
|
+
}))), isCustomers && /*#__PURE__*/_react.default.createElement(_styles2.FormGroup, null, /*#__PURE__*/_react.default.createElement(_styles2.FormControl, null, /*#__PURE__*/_react.default.createElement("label", null, t('ID', 'ID')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
|
|
288
|
+
type: "text",
|
|
289
|
+
placeholder: t('ID', 'ID'),
|
|
290
|
+
autoComplete: "off",
|
|
291
|
+
value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.id) || '',
|
|
292
|
+
onChange: function onChange(e) {
|
|
293
|
+
return handleChangeValue({
|
|
294
|
+
id: e.target.value
|
|
295
|
+
});
|
|
296
|
+
}
|
|
287
297
|
}))), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
|
|
288
298
|
color: "primary",
|
|
289
299
|
borderRadius: "8px",
|
|
@@ -62,7 +62,7 @@ var UsersListingHeader = exports.UsersListingHeader = function UsersListingHeade
|
|
|
62
62
|
isCustomLayout: true,
|
|
63
63
|
onSearch: onSearch,
|
|
64
64
|
search: searchValue,
|
|
65
|
-
placeholder: t('SEARCH', 'Search')
|
|
65
|
+
placeholder: isCustomers ? t('SEARCH_BY_CELLPHONE', 'Search by phone') : t('SEARCH', 'Search')
|
|
66
66
|
}), multiFilterValues && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
|
|
67
67
|
color: "black",
|
|
68
68
|
onClick: function onClick() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.43.
|
|
3
|
+
"version": "1.43.9",
|
|
4
4
|
"description": "Ordering UI Admin Components",
|
|
5
5
|
"main": "./_modules/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"lodash": "^4.17.20",
|
|
84
84
|
"moment": "^2.29.1",
|
|
85
85
|
"moment-range": "^4.0.2",
|
|
86
|
-
"ordering-components-admin-external": "1.43.
|
|
86
|
+
"ordering-components-admin-external": "1.43.3",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -71,7 +71,13 @@ export const TopRightSection = styled.div`
|
|
|
71
71
|
${({ isCustomLayout }) => !isCustomLayout && css`
|
|
72
72
|
justify-content: flex-end;
|
|
73
73
|
`}
|
|
74
|
-
|
|
74
|
+
|
|
75
|
+
${({ isCustomLayout }) => isCustomLayout && css`
|
|
76
|
+
.websocket-container {
|
|
77
|
+
padding-bottom: 10px;
|
|
78
|
+
}
|
|
79
|
+
`}
|
|
80
|
+
|
|
75
81
|
@media (min-width: 768px) {
|
|
76
82
|
flex-direction: row;
|
|
77
83
|
align-items: center;
|
|
@@ -17,7 +17,8 @@ const OrdersHeaderFilterGroupUI = (props) => {
|
|
|
17
17
|
handleChangeDriver,
|
|
18
18
|
handleChangeFilterValues,
|
|
19
19
|
handleChangeExternalId,
|
|
20
|
-
handleChangeGroupUnassigned
|
|
20
|
+
handleChangeGroupUnassigned,
|
|
21
|
+
isSelectedOrders
|
|
21
22
|
} = props
|
|
22
23
|
|
|
23
24
|
const [{ dictionary }] = useLanguage()
|
|
@@ -51,7 +52,7 @@ const OrdersHeaderFilterGroupUI = (props) => {
|
|
|
51
52
|
|
|
52
53
|
return (
|
|
53
54
|
<>
|
|
54
|
-
<WrapperRow ref={wrapperRef} wrapperWidth={wrapperSize.width}>
|
|
55
|
+
<WrapperRow ref={wrapperRef} wrapperWidth={wrapperSize.width} isSelectedOrders={isSelectedOrders}>
|
|
55
56
|
{!loading && configFilter.includes('external_id') && (
|
|
56
57
|
<SearchBar
|
|
57
58
|
placeholder={dictionary?.EXTERNAL_ID ?? 'External Id'}
|
|
@@ -62,9 +62,9 @@ export const WrapperRow = styled.div`
|
|
|
62
62
|
flex-direction: row;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
${({ wrapperWidth }) => wrapperWidth < 992 && css`
|
|
65
|
+
${({ wrapperWidth, isSelectedOrders }) => wrapperWidth < 992 && css`
|
|
66
66
|
flex-direction: column !important;
|
|
67
|
-
padding: 15px 10px 0 10px;
|
|
67
|
+
padding: ${!isSelectedOrders && '15px 10px 0 10px'};
|
|
68
68
|
`}
|
|
69
69
|
`
|
|
70
70
|
export const Option = styled.div`
|
|
@@ -196,6 +196,7 @@ const OrdersManagerUI = (props) => {
|
|
|
196
196
|
isLateralBar={isLateralBar}
|
|
197
197
|
/>
|
|
198
198
|
<OrdersHeaderFilterGroup
|
|
199
|
+
isSelectedOrders={isSelectedOrders}
|
|
199
200
|
driverGroupList={driverGroupList}
|
|
200
201
|
driversList={driversList}
|
|
201
202
|
handleChangeFilterValues={handleChangeFilterValues}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React, { useEffect, useState } from 'react'
|
|
2
2
|
import { useLocation } from 'react-router-dom'
|
|
3
|
+
import Skeleton from 'react-loading-skeleton'
|
|
3
4
|
import { useLanguage, BusinessMenu as BusinessMenuController } from 'ordering-components-admin-external'
|
|
4
5
|
import { BusinessMenuOptions } from '../BusinessMenuOptions'
|
|
5
6
|
import { Confirm, Modal, SearchBar } from '../../Shared'
|
|
@@ -160,8 +161,14 @@ const BusinessMenuUI = (props) => {
|
|
|
160
161
|
{t('SELECT_NONE', 'Select none')}
|
|
161
162
|
</Button>
|
|
162
163
|
</SelectButtonGroup> */}
|
|
163
|
-
|
|
164
|
-
|
|
164
|
+
{businessMenusState?.loading && (
|
|
165
|
+
[...Array(4).keys()].map(i => (
|
|
166
|
+
<MeunItem key={i}>
|
|
167
|
+
<Skeleton width={120} height={24} />
|
|
168
|
+
</MeunItem>
|
|
169
|
+
))
|
|
170
|
+
)}
|
|
171
|
+
{!businessMenusState?.loading && menuList.map((menu, index) => (
|
|
165
172
|
<MeunItem
|
|
166
173
|
key={menu.id}
|
|
167
174
|
isBorderTop={index === 0}
|
|
@@ -184,6 +191,7 @@ const BusinessMenuUI = (props) => {
|
|
|
184
191
|
<AddMenuButtonWrapper>
|
|
185
192
|
<LinkButton
|
|
186
193
|
onClick={() => handleOpenOptions('option', {})}
|
|
194
|
+
disabled={businessMenusState?.loading}
|
|
187
195
|
>
|
|
188
196
|
{t('ADD_MENU', 'Add menu')}
|
|
189
197
|
</LinkButton>
|
|
@@ -231,9 +231,7 @@ export const CustomersListing = (props) => {
|
|
|
231
231
|
...props,
|
|
232
232
|
defaultUserActiveState,
|
|
233
233
|
UIComponent: CustomersListingUI,
|
|
234
|
-
isSearchByUserEmail: true,
|
|
235
234
|
isSearchByUserPhone: true,
|
|
236
|
-
isSearchByUserName: true,
|
|
237
235
|
paginationSettings: {
|
|
238
236
|
initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
|
|
239
237
|
pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
|
|
@@ -164,34 +164,36 @@ const UserFilterGroupUI = (props) => {
|
|
|
164
164
|
</FormControl>
|
|
165
165
|
)}
|
|
166
166
|
</FormGroup>
|
|
167
|
-
|
|
168
|
-
<
|
|
169
|
-
<
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
<
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
e.
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
167
|
+
{!isCustomers && (
|
|
168
|
+
<FormGroup>
|
|
169
|
+
<FormControl>
|
|
170
|
+
<label>{t('COUNTRY_PHONE_CODE', 'Country phone code')}</label>
|
|
171
|
+
<DefaultSelect
|
|
172
|
+
placeholder={t('SELECT_OPTION', 'Select a option')}
|
|
173
|
+
defaultValue={filterValues?.countryPhoneCode}
|
|
174
|
+
options={phoneCodeList}
|
|
175
|
+
onChange={val => handleChangeValue({ countryPhoneCode: val })}
|
|
176
|
+
optionInnerMaxHeight='300px'
|
|
177
|
+
className='full-select'
|
|
178
|
+
/>
|
|
179
|
+
</FormControl>
|
|
180
|
+
<FormControl>
|
|
181
|
+
<label>{t('PHONE_NUMBER', 'Phone number')}</label>
|
|
182
|
+
<Input
|
|
183
|
+
type='text'
|
|
184
|
+
placeholder={t('PHONE_NUMBER', 'Phone number')}
|
|
185
|
+
autoComplete='off'
|
|
186
|
+
onKeyPress={(e) => {
|
|
187
|
+
if (!/^[0-9]$/.test(e.key)) {
|
|
188
|
+
e.preventDefault()
|
|
189
|
+
}
|
|
190
|
+
}}
|
|
191
|
+
value={filterValues?.cellphone || ''}
|
|
192
|
+
onChange={(e) => handleChangeValue({ cellphone: e.target.value })}
|
|
193
|
+
/>
|
|
194
|
+
</FormControl>
|
|
195
|
+
</FormGroup>
|
|
196
|
+
)}
|
|
195
197
|
<FormGroup>
|
|
196
198
|
<FormControl>
|
|
197
199
|
<label>{t('PHONE_VERIFIED', 'Phone verified')}</label>
|
|
@@ -276,6 +278,20 @@ const UserFilterGroupUI = (props) => {
|
|
|
276
278
|
)}
|
|
277
279
|
</FormGroup>
|
|
278
280
|
)}
|
|
281
|
+
{isCustomers && (
|
|
282
|
+
<FormGroup>
|
|
283
|
+
<FormControl>
|
|
284
|
+
<label>{t('ID', 'ID')}</label>
|
|
285
|
+
<Input
|
|
286
|
+
type='text'
|
|
287
|
+
placeholder={t('ID', 'ID')}
|
|
288
|
+
autoComplete='off'
|
|
289
|
+
value={filterValues?.id || ''}
|
|
290
|
+
onChange={(e) => handleChangeValue({ id: e.target.value })}
|
|
291
|
+
/>
|
|
292
|
+
</FormControl>
|
|
293
|
+
</FormGroup>
|
|
294
|
+
)}
|
|
279
295
|
<ButtonGroup>
|
|
280
296
|
<Button
|
|
281
297
|
color='primary'
|
|
@@ -68,7 +68,7 @@ export const UsersListingHeader = (props) => {
|
|
|
68
68
|
isCustomLayout
|
|
69
69
|
onSearch={onSearch}
|
|
70
70
|
search={searchValue}
|
|
71
|
-
placeholder={t('SEARCH', 'Search')}
|
|
71
|
+
placeholder={isCustomers ? t('SEARCH_BY_CELLPHONE', 'Search by phone') : t('SEARCH', 'Search')}
|
|
72
72
|
/>
|
|
73
73
|
{multiFilterValues && (
|
|
74
74
|
<IconButton
|