ordering-ui-admin-external 1.36.5 → 1.36.6

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.
@@ -21,7 +21,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
21
21
  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; }
22
22
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
23
23
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
24
- var OrderStatusFilterBar = function OrderStatusFilterBar(props) {
24
+ var OrderStatusFilterBar = /*#__PURE__*/(0, _react.memo)(function (props) {
25
25
  var _ordersAmountByStatus, _ordersAmountByStatus2, _ordersAmountByStatus3, _ordersAmountByStatus4;
26
26
  var isUseQuery = props.isUseQuery,
27
27
  selectedOrderStatus = props.selectedOrderStatus,
@@ -74,5 +74,5 @@ var OrderStatusFilterBar = function OrderStatusFilterBar(props) {
74
74
  return changeSelectedOrderStatus('cancelled');
75
75
  }
76
76
  }, t('CANCELLED', 'cancelled'), /*#__PURE__*/_react.default.createElement("span", null, "(", !isNaN(ordersAmountByStatus === null || ordersAmountByStatus === void 0 ? void 0 : ordersAmountByStatus.cancelled) && (ordersAmountByStatus === null || ordersAmountByStatus === void 0 ? void 0 : ordersAmountByStatus.cancelled) !== null ? (_ordersAmountByStatus4 = ordersAmountByStatus === null || ordersAmountByStatus === void 0 ? void 0 : ordersAmountByStatus.cancelled) !== null && _ordersAmountByStatus4 !== void 0 ? _ordersAmountByStatus4 : 0 : /*#__PURE__*/_react.default.createElement(_CgSpinnerTwoAlt.default, null), ")")))));
77
- };
77
+ });
78
78
  exports.OrderStatusFilterBar = OrderStatusFilterBar;
@@ -1,10 +1,11 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.OrdersContentHeader = void 0;
7
- var _react = _interopRequireDefault(require("react"));
8
+ var _react = _interopRequireWildcard(require("react"));
8
9
  var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
9
10
  var _Shared = require("../../Shared");
10
11
  var _OrdersFilterGroup = require("../OrdersFilterGroup");
@@ -18,14 +19,15 @@ var _useWindowSize2 = require("../../../hooks/useWindowSize");
18
19
  var _GoogleMapsApiKeySettingButton = require("../GoogleMapsApiKeySettingButton");
19
20
  var _WebsocketStatus = require("../WebsocketStatus");
20
21
  var _styles2 = require("./styles");
21
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
22
+ 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); }
23
+ 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; }
22
24
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
23
25
  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."); }
24
26
  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); }
25
27
  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; }
26
28
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
27
29
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
28
- var OrdersContentHeader = function OrdersContentHeader(props) {
30
+ var OrdersContentHeader = /*#__PURE__*/(0, _react.memo)(function (props) {
29
31
  var _configState$configs;
30
32
  var isDisableTitle = props.isDisableTitle,
31
33
  isSelectedOrders = props.isSelectedOrders,
@@ -99,5 +101,5 @@ var OrdersContentHeader = function OrdersContentHeader(props) {
99
101
  searchValue: searchValue,
100
102
  handleChangeSearch: handleChangeSearch
101
103
  })))));
102
- };
104
+ });
103
105
  exports.OrdersContentHeader = OrdersContentHeader;
@@ -1,17 +1,39 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.OrdersDashboard = void 0;
7
- var _react = _interopRequireDefault(require("react"));
8
+ var _react = _interopRequireWildcard(require("react"));
9
+ var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
8
10
  var _OrdersDashboardList = require("../OrdersDashboardList");
9
11
  var _styles = require("./styles");
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
+ 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); }
13
+ 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; }
11
14
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
12
- var OrdersDashboard = function OrdersDashboard(props) {
13
- return /*#__PURE__*/_react.default.createElement(_styles.OrdersManageContainer, null, /*#__PURE__*/_react.default.createElement(_OrdersDashboardList.OrdersDashboardList, _extends({}, props, {
15
+ 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; }
16
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
17
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
18
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
19
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
20
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
21
+ 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."); }
22
+ 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); }
23
+ 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; }
24
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
25
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
26
+ var OrdersDashboard = /*#__PURE__*/(0, _react.memo)(function (props) {
27
+ var _configs$optimize_ord;
28
+ var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
29
+ _useConfig2 = _slicedToArray(_useConfig, 1),
30
+ configs = _useConfig2[0].configs;
31
+ var ordersDashboardListProps = _objectSpread({}, props);
32
+ if (configs !== null && configs !== void 0 && configs.optimize_order_data && (configs === null || configs === void 0 || (_configs$optimize_ord = configs.optimize_order_data) === null || _configs$optimize_ord === void 0 ? void 0 : _configs$optimize_ord.value) === '1') {
33
+ ordersDashboardListProps.propsToFetch = ['app_id', 'business', 'business_id', 'created_at', 'customer', 'customer_id', 'delivery_type', 'driver_group_id', 'driver_id', 'driver', 'delivery_datetime', 'delivery_datetime_utc', 'external_id', 'eta_time', 'id', 'logistic_status', 'logistic_attemps', 'uuid', 'order_group', 'order_group_id', 'priority', 'summary', 'status', 'time_status', 'total'];
34
+ }
35
+ return /*#__PURE__*/_react.default.createElement(_styles.OrdersManageContainer, null, /*#__PURE__*/_react.default.createElement(_OrdersDashboardList.OrdersDashboardList, _extends({}, ordersDashboardListProps, {
14
36
  orderListView: "table"
15
37
  })));
16
- };
38
+ });
17
39
  exports.OrdersDashboard = OrdersDashboard;
@@ -28,7 +28,7 @@ var OrdersDashboardList = function OrdersDashboardList(props) {
28
28
  var defaultPage = query.get('page') || 1;
29
29
  var defaultPageSize = query.get('pageSize') || 10;
30
30
  var OrdersCommonControlProps = _objectSpread(_objectSpread({}, props), {}, {
31
- UIComponent: _OrdersListing.MemoizedOrdersListing,
31
+ UIComponent: _OrdersListing.OrdersListing,
32
32
  useDefualtSessionManager: true,
33
33
  orderBy: isMessagesView ? orderByOption : 'id',
34
34
  orderDirection: isMessagesView ? orderByOption === 'id' ? 'desc' : 'asc' : 'desc',
@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.OrdersListing = exports.MemoizedOrdersListing = void 0;
7
+ exports.OrdersListing = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
10
10
  var _styledComponents = require("styled-components");
@@ -20,7 +20,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
20
20
  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; }
21
21
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
22
22
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
23
- var OrdersListing = function OrdersListing(props) {
23
+ var OrdersListing = /*#__PURE__*/(0, _react.memo)(function (props) {
24
24
  var _theme$images;
25
25
  var hidePhoto = props.hidePhoto,
26
26
  isSelectedOrders = props.isSelectedOrders,
@@ -107,7 +107,7 @@ var OrdersListing = function OrdersListing(props) {
107
107
  }
108
108
  }, t('FILTERS', 'Filters'))) : /*#__PURE__*/_react.default.createElement("p", null, t('MOBILE_NO_ORDERS', 'No Orders yet.')))) : /*#__PURE__*/_react.default.createElement(_styles2.WrapperOrderListContent, {
109
109
  maxHeight: orderListView !== 'table'
110
- }, orderListView === 'table' ? /*#__PURE__*/_react.default.createElement(_OrdersTable.MemoizedOrdersTable, {
110
+ }, orderListView === 'table' ? /*#__PURE__*/_react.default.createElement(_OrdersTable.OrdersTable, {
111
111
  hidePhoto: hidePhoto,
112
112
  setSelectedOrderIds: setSelectedOrderIds,
113
113
  isSelectedOrders: isSelectedOrders,
@@ -148,7 +148,5 @@ var OrdersListing = function OrdersListing(props) {
148
148
  isDelivery: isDelivery,
149
149
  isUseQuery: isUseQuery
150
150
  }))));
151
- };
152
- exports.OrdersListing = OrdersListing;
153
- var MemoizedOrdersListing = /*#__PURE__*/_react.default.memo(OrdersListing);
154
- exports.MemoizedOrdersListing = MemoizedOrdersListing;
151
+ });
152
+ exports.OrdersListing = OrdersListing;
@@ -66,6 +66,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
66
66
  var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
67
67
  _useSession2 = _slicedToArray(_useSession, 1),
68
68
  user = _useSession2[0].user;
69
+ var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
70
+ _useConfig2 = _slicedToArray(_useConfig, 1),
71
+ configs = _useConfig2[0].configs;
69
72
  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
70
73
  var _useState = (0, _react.useState)(false),
71
74
  _useState2 = _slicedToArray(_useState, 2),
@@ -136,12 +139,13 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
136
139
  });
137
140
  };
138
141
  var handleOpenOrderDetail = function handleOpenOrderDetail(order) {
142
+ var _configs$optimize_ord;
139
143
  var isKeydown = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
140
144
  if (isTourOpen && currentTourStep === 4 && !isKeydown) {
141
145
  setIsTourOpen(false);
142
146
  return;
143
147
  }
144
- setDetailsOrder(order);
148
+ (!(configs !== null && configs !== void 0 && configs.optimize_order_data) || (configs === null || configs === void 0 || (_configs$optimize_ord = configs.optimize_order_data) === null || _configs$optimize_ord === void 0 ? void 0 : _configs$optimize_ord.value) === '0') && setDetailsOrder(order);
145
149
  setOrderDetailId(order.id);
146
150
  setIsOpenOrderDetail(true);
147
151
  if (!isSelectedOrders) {
@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.OrdersTable = exports.MemoizedOrdersTable = void 0;
7
+ exports.OrdersTable = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _moment = _interopRequireDefault(require("moment"));
10
10
  var _RiCheckboxBlankLine = _interopRequireDefault(require("@meronex/icons/ri/RiCheckboxBlankLine"));
@@ -34,7 +34,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
34
34
  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; }
35
35
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
36
36
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
37
- var OrdersTable = function OrdersTable(props) {
37
+ var OrdersTable = /*#__PURE__*/(0, _react.memo)(function (props) {
38
38
  var _configState$configs, _configState$configs2, _orderList$orders3;
39
39
  var hidePhoto = props.hidePhoto,
40
40
  isSelectedOrders = props.isSelectedOrders,
@@ -842,7 +842,5 @@ var OrdersTable = function OrdersTable(props) {
842
842
  defaultPageSize: pagination.pageSize,
843
843
  handleChangePageSize: handleChangePageSize
844
844
  })));
845
- };
846
- exports.OrdersTable = OrdersTable;
847
- var MemoizedOrdersTable = /*#__PURE__*/_react.default.memo(OrdersTable);
848
- exports.MemoizedOrdersTable = MemoizedOrdersTable;
845
+ });
846
+ exports.OrdersTable = OrdersTable;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.36.5",
3
+ "version": "1.36.6",
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.36.2",
86
+ "ordering-components-admin-external": "1.36.3",
87
87
  "polished": "^3.6.7",
88
88
  "prop-types": "^15.7.2",
89
89
  "react-big-calendar": "^1.4.2",
@@ -1,4 +1,4 @@
1
- import React, { useEffect } from 'react'
1
+ import React, { memo, useEffect } from 'react'
2
2
  import { useLanguage } from 'ordering-components-admin-external'
3
3
  import { DragScroll } from '../../Shared'
4
4
  import CgSpinnerTwoAlt from '@meronex/icons/cg/CgSpinnerTwoAlt'
@@ -10,7 +10,7 @@ import {
10
10
  Tab
11
11
  } from './styles'
12
12
 
13
- export const OrderStatusFilterBar = (props) => {
13
+ export const OrderStatusFilterBar = memo((props) => {
14
14
  const {
15
15
  isUseQuery,
16
16
  selectedOrderStatus,
@@ -106,4 +106,4 @@ export const OrderStatusFilterBar = (props) => {
106
106
  </OrderStatusFilterContainer>
107
107
  </>
108
108
  )
109
- }
109
+ })
@@ -1,4 +1,4 @@
1
- import React from 'react'
1
+ import React, { memo } from 'react'
2
2
  import { useLanguage, useConfig } from 'ordering-components-admin-external'
3
3
  import { SearchBar } from '../../Shared'
4
4
  import { OrdersFilterGroup } from '../OrdersFilterGroup'
@@ -21,7 +21,7 @@ import {
21
21
  WrapperSearchAndFilter
22
22
  } from './styles'
23
23
 
24
- export const OrdersContentHeader = (props) => {
24
+ export const OrdersContentHeader = memo((props) => {
25
25
  const {
26
26
  isDisableTitle,
27
27
  isSelectedOrders,
@@ -130,4 +130,4 @@ export const OrdersContentHeader = (props) => {
130
130
  </OrderContentHeaderContainer>
131
131
  </>
132
132
  )
133
- }
133
+ })
@@ -1,16 +1,24 @@
1
- import React from 'react'
1
+ import React, { memo } from 'react'
2
+ import { useConfig } from 'ordering-components-admin-external'
2
3
  import { OrdersDashboardList } from '../OrdersDashboardList'
3
4
  import {
4
5
  OrdersManageContainer
5
6
  } from './styles'
6
7
 
7
- export const OrdersDashboard = (props) => {
8
+ export const OrdersDashboard = memo((props) => {
9
+ const [{ configs }] = useConfig()
10
+ const ordersDashboardListProps = {
11
+ ...props
12
+ }
13
+ if ((configs?.optimize_order_data && (configs?.optimize_order_data?.value === '1'))) {
14
+ ordersDashboardListProps.propsToFetch = ['app_id', 'business', 'business_id', 'created_at', 'customer', 'customer_id', 'delivery_type', 'driver_group_id', 'driver_id', 'driver', 'delivery_datetime', 'delivery_datetime_utc', 'external_id', 'eta_time', 'id', 'logistic_status', 'logistic_attemps', 'uuid', 'order_group', 'order_group_id', 'priority', 'summary', 'status', 'time_status', 'total']
15
+ }
8
16
  return (
9
17
  <OrdersManageContainer>
10
18
  <OrdersDashboardList
11
- {...props}
19
+ {...ordersDashboardListProps}
12
20
  orderListView='table'
13
21
  />
14
22
  </OrdersManageContainer>
15
23
  )
16
- }
24
+ })
@@ -1,7 +1,7 @@
1
1
  import React from 'react'
2
2
  import { useLocation } from 'react-router-dom'
3
3
  import { DashboardOrdersList as OrdersListController } from 'ordering-components-admin-external'
4
- import { MemoizedOrdersListing } from '../OrdersListing'
4
+ import { OrdersListing } from '../OrdersListing'
5
5
 
6
6
  export const OrdersDashboardList = (props) => {
7
7
  const {
@@ -20,7 +20,7 @@ export const OrdersDashboardList = (props) => {
20
20
 
21
21
  const OrdersCommonControlProps = {
22
22
  ...props,
23
- UIComponent: MemoizedOrdersListing,
23
+ UIComponent: OrdersListing,
24
24
  useDefualtSessionManager: true,
25
25
  orderBy: isMessagesView ? orderByOption : 'id',
26
26
  orderDirection: isMessagesView
@@ -102,4 +102,3 @@ export const OrdersDashboardList = (props) => {
102
102
  </>
103
103
  )
104
104
  }
105
-
@@ -1,7 +1,7 @@
1
- import React, { useState, useEffect } from 'react'
1
+ import React, { memo, useState, useEffect } from 'react'
2
2
  import { useLanguage } from 'ordering-components-admin-external'
3
3
  import { useTheme } from 'styled-components'
4
- import { MemoizedOrdersTable } from '../OrdersTable'
4
+ import { OrdersTable } from '../OrdersTable'
5
5
  import { OrdersCards } from '../OrdersCards'
6
6
  import { Button } from '../../../styles'
7
7
 
@@ -11,7 +11,7 @@ import {
11
11
  InnerNoneOrdersContainer
12
12
  } from './styles'
13
13
 
14
- export const OrdersListing = (props) => {
14
+ export const OrdersListing = memo((props) => {
15
15
  const {
16
16
  hidePhoto,
17
17
  isSelectedOrders,
@@ -119,7 +119,7 @@ export const OrdersListing = (props) => {
119
119
  maxHeight={orderListView !== 'table'}
120
120
  >
121
121
  {orderListView === 'table' ? (
122
- <MemoizedOrdersTable
122
+ <OrdersTable
123
123
  hidePhoto={hidePhoto}
124
124
  setSelectedOrderIds={setSelectedOrderIds}
125
125
  isSelectedOrders={isSelectedOrders}
@@ -170,6 +170,4 @@ export const OrdersListing = (props) => {
170
170
  )}
171
171
  </>
172
172
  )
173
- }
174
-
175
- export const MemoizedOrdersListing = React.memo(OrdersListing)
173
+ })
@@ -1,6 +1,6 @@
1
1
  import React, { useState, useEffect } from 'react'
2
2
  import { useLocation } from 'react-router-dom'
3
- import { useLanguage, useSession, OrdersManage as OrdersManageController } from 'ordering-components-admin-external'
3
+ import { useConfig, useLanguage, useSession, OrdersManage as OrdersManageController } from 'ordering-components-admin-external'
4
4
  import { OrderStatusFilterBar } from '../OrderStatusFilterBar'
5
5
  import { OrdersContentHeader } from '../OrdersContentHeader'
6
6
  import { OrderDetails } from '../OrderDetails'
@@ -54,6 +54,7 @@ const OrdersManagerUI = (props) => {
54
54
 
55
55
  const [, t] = useLanguage()
56
56
  const [{ user }] = useSession()
57
+ const [{ configs }] = useConfig()
57
58
 
58
59
  const query = new URLSearchParams(useLocation().search)
59
60
  const [isOpenOrderDetail, setIsOpenOrderDetail] = useState(false)
@@ -97,7 +98,7 @@ const OrdersManagerUI = (props) => {
97
98
  setIsTourOpen(false)
98
99
  return
99
100
  }
100
- setDetailsOrder(order)
101
+ (!configs?.optimize_order_data || (configs?.optimize_order_data?.value === '0')) && setDetailsOrder(order)
101
102
  setOrderDetailId(order.id)
102
103
  setIsOpenOrderDetail(true)
103
104
  if (!isSelectedOrders) {
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useState } from 'react'
1
+ import React, { memo, useEffect, useState } from 'react'
2
2
  import moment from 'moment'
3
3
  import RiCheckboxBlankLine from '@meronex/icons/ri/RiCheckboxBlankLine'
4
4
  import RiCheckboxFill from '@meronex/icons/ri/RiCheckboxFill'
@@ -35,7 +35,7 @@ import {
35
35
  DragTh
36
36
  } from './styles'
37
37
 
38
- export const OrdersTable = (props) => {
38
+ export const OrdersTable = memo((props) => {
39
39
  const {
40
40
  hidePhoto,
41
41
  isSelectedOrders,
@@ -884,6 +884,4 @@ export const OrdersTable = (props) => {
884
884
  )}
885
885
  </>
886
886
  )
887
- }
888
-
889
- export const MemoizedOrdersTable = React.memo(OrdersTable)
887
+ })