ordering-ui-admin-external 1.42.11 → 1.42.12

package/_modules/components/Orders/OrdersListing/index.js

@@ -13,9 +13,15 @@ var _OrdersCards = require("../OrdersCards");
 var _styles = require("../../../styles");
 var _AiOutlineInfoCircle = _interopRequireDefault(require("@meronex/icons/ai/AiOutlineInfoCircle"));
 var _styles2 = require("./styles");
+var _Shared = require("../../Shared");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 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; }
+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; }
+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; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -75,6 +81,73 @@ var OrdersListing = exports.OrdersListing = /*#__PURE__*/(0, _react.memo)(functi
       handleSetOpenOrderDetail(true);
     }
   };
+  var optionsDefault = [{
+    value: 'status',
+    content: t('STATUS', 'Status')
+  }, {
+    value: 'orderNumber',
+    content: t('INVOICE_ORDER_NO', 'Order No.')
+  }, {
+    value: 'agent',
+    content: t('AGENT', 'Agent')
+  }, {
+    value: 'cartGroupId',
+    content: t('GROUP_ORDER', 'Group Order')
+  }, {
+    value: 'driverGroupId',
+    content: t('EXPORT_DRIVER_GROUP_ID', 'Driver Group Id')
+  }, {
+    value: 'dateTime',
+    content: t('DATE_TIME', 'Date and time')
+  }, {
+    value: 'business',
+    content: t('BUSINESS', 'Business')
+  }, {
+    value: 'customer',
+    content: t('CUSTOMER', 'Customer')
+  }, {
+    value: 'driver',
+    content: t('DRIVER', 'Driver')
+  }, {
+    value: 'advanced',
+    content: t('ADVANCED_LOGISTICS', 'Advance Logistics')
+  }, {
+    value: 'timer',
+    content: t('SLA_TIMER', 'SLA’s timer')
+  }, {
+    value: 'eta',
+    content: t('ETA', 'ETA')
+  }, {
+    value: 'total',
+    content: t('EXPORT_TOTAL', 'Total')
+  }, {
+    value: 'externalId',
+    content: t('EXTERNAL_ID', 'External id')
+  }, {
+    value: 'channel',
+    content: t('CHANNEL', 'Channel')
+  }];
+  var handleChangeAllowColumns = function handleChangeAllowColumns(type) {
+    var _column2;
+    var _column = {};
+    if (type === 'channel') {
+      _column = {
+        visable: allowColumns[type].visable,
+        title: t('CHANNEL', 'Channel'),
+        className: 'channelInfo',
+        draggable: true,
+        colSpan: 1,
+        order: 12
+      };
+    } else {
+      _column = allowColumns[type];
+    }
+    var updatedAllowColumns = _objectSpread(_objectSpread({}, allowColumns), {}, _defineProperty({}, type, _objectSpread(_objectSpread({}, _column), {}, {
+      visable: !((_column2 = _column) !== null && _column2 !== void 0 && _column2.visable)
+    })));
+    setAllowColumns(updatedAllowColumns);
+    saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)));
+  };
   (0, _react.useEffect)(function () {
     if (orderList.loading || !messageListView) return;
     if (orderList.orders.length === 0 || messageOrder) return;
@@ -116,7 +189,15 @@ var OrdersListing = exports.OrdersListing = /*#__PURE__*/(0, _react.memo)(functi
   }, t('FILTERS', 'Filters'))) : /*#__PURE__*/_react.default.createElement("p", null, t('MOBILE_NO_ORDERS', 'No Orders yet.')))) : /*#__PURE__*/_react.default.createElement(_styles2.WrapperOrderListContent, {
     maxHeight: orderListView !== 'table',
     onDoubleClick: handleDobleClick
-  }, orderListView === 'table' ? /*#__PURE__*/_react.default.createElement(_OrdersTable.OrdersTable, {
+  }, orderListView === 'table' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, allowColumns && !(Object.keys(allowColumns).filter(function (col) {
+    var _allowColumns$col, _allowColumns$col2;
+    return ((_allowColumns$col = allowColumns[col]) === null || _allowColumns$col === void 0 ? void 0 : _allowColumns$col.visable) && ((_allowColumns$col2 = allowColumns[col]) === null || _allowColumns$col2 === void 0 ? void 0 : _allowColumns$col2.order) !== 0;
+  }).length === 0) && /*#__PURE__*/_react.default.createElement(_styles2.ColumnPopoverContainer, null, /*#__PURE__*/_react.default.createElement(_Shared.ColumnAllowSettingPopover, {
+    allowColumns: allowColumns,
+    optionsDefault: optionsDefault,
+    handleChangeAllowColumns: handleChangeAllowColumns,
+    isOrder: true
+  })), /*#__PURE__*/_react.default.createElement(_OrdersTable.OrdersTable, {
     hidePhoto: hidePhoto,
     setSelectedOrderIds: setSelectedOrderIds,
     isSelectedOrders: isSelectedOrders,
@@ -141,7 +222,7 @@ var OrdersListing = exports.OrdersListing = /*#__PURE__*/(0, _react.memo)(functi
     saveUserSettings: saveUserSettings,
     isUseQuery: isUseQuery,
     franchisesList: props.franchisesList
-  }) : /*#__PURE__*/_react.default.createElement(_OrdersCards.OrdersCards, {
+  })) : /*#__PURE__*/_react.default.createElement(_OrdersCards.OrdersCards, {
     isMessagesView: isMessagesView,
     orderList: orderList,
     pagination: pagination,

package/_modules/components/Orders/OrdersListing/styles.js

@@ -4,9 +4,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperOrderListContent = exports.WrapperNoneOrders = exports.InnerNoneOrdersContainer = exports.InfoMessage = void 0;
+exports.WrapperOrderListContent = exports.WrapperNoneOrders = exports.InnerNoneOrdersContainer = exports.InfoMessage = exports.ColumnPopoverContainer = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14;
 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); }
 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; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -42,4 +42,5 @@ var InfoMessage = exports.InfoMessage = _styledComponents.default.div(_templateO
 }, function (props) {
   var _props$theme2;
   return ((_props$theme2 = props.theme) === null || _props$theme2 === void 0 ? void 0 : _props$theme2.rtl) && (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n      left: 0px;\n      right: initial;\n    "])));
-});
+});
+var ColumnPopoverContainer = exports.ColumnPopoverContainer = _styledComponents.default.div(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n  position: relative;\n  button {\n    right: 0px;\n    position: absolute;\n    transform: translateY(-3px);\n    z-index: 1000;\n    background: white;\n    padding: 0 10px;\n  }\n"])));

package/_modules/components/Orders/OrdersTable/index.js

@@ -448,15 +448,7 @@ var OrdersTable = exports.OrdersTable = /*#__PURE__*/(0, _react.memo)(function (
       }, /*#__PURE__*/_react.default.createElement("img", {
         src: (_theme$images$icons2 = theme.images.icons) === null || _theme$images$icons2 === void 0 ? void 0 : _theme$images$icons2.sixDots,
         alt: "six dots"
-      }), /*#__PURE__*/_react.default.createElement("span", null, (_allowColumns$column6 = allowColumns[column]) === null || _allowColumns$column6 === void 0 ? void 0 : _allowColumns$column6.title))), /*#__PURE__*/_react.default.createElement("th", {
-        className: "orderPrice",
-        key: "noDragTh-".concat(i)
-      }, /*#__PURE__*/_react.default.createElement(_Shared.ColumnAllowSettingPopover, {
-        allowColumns: allowColumns,
-        optionsDefault: optionsDefault,
-        handleChangeAllowColumns: handleChangeAllowColumns,
-        isOrder: true
-      })));
+      }), /*#__PURE__*/_react.default.createElement("span", null, (_allowColumns$column6 = allowColumns[column]) === null || _allowColumns$column6 === void 0 ? void 0 : _allowColumns$column6.title))));
     }
     return (column !== 'timer' || column === 'timer' && (groupStatus === 'pending' || groupStatus === 'inProgress')) && /*#__PURE__*/_react.default.createElement(_styles.DragTh, {
       key: "dragTh-".concat(i),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.42.11",
+  "version": "1.42.12",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {

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

@@ -10,8 +10,10 @@ import {
   WrapperNoneOrders,
   WrapperOrderListContent,
   InnerNoneOrdersContainer,
-  InfoMessage
+  InfoMessage,
+  ColumnPopoverContainer
 } from './styles'
+import { ColumnAllowSettingPopover } from '../../Shared'
 
 export const OrdersListing = memo((props) => {
   const {
@@ -67,6 +69,84 @@ export const OrdersListing = memo((props) => {
     }
   }
 
+  const optionsDefault = [
+    {
+      value: 'status',
+      content: t('STATUS', 'Status')
+    },
+    {
+      value: 'orderNumber',
+      content: t('INVOICE_ORDER_NO', 'Order No.')
+    },
+    {
+      value: 'agent',
+      content: t('AGENT', 'Agent')
+    },
+    {
+      value: 'cartGroupId',
+      content: t('GROUP_ORDER', 'Group Order')
+    },
+    {
+      value: 'driverGroupId',
+      content: t('EXPORT_DRIVER_GROUP_ID', 'Driver Group Id')
+    },
+    {
+      value: 'dateTime',
+      content: t('DATE_TIME', 'Date and time')
+    },
+    {
+      value: 'business',
+      content: t('BUSINESS', 'Business')
+    },
+    {
+      value: 'customer',
+      content: t('CUSTOMER', 'Customer')
+    },
+    {
+      value: 'driver',
+      content: t('DRIVER', 'Driver')
+    },
+    {
+      value: 'advanced',
+      content: t('ADVANCED_LOGISTICS', 'Advance Logistics')
+    },
+    {
+      value: 'timer',
+      content: t('SLA_TIMER', 'SLA’s timer')
+    },
+    {
+      value: 'eta',
+      content: t('ETA', 'ETA')
+    },
+    {
+      value: 'total',
+      content: t('EXPORT_TOTAL', 'Total')
+    },
+    {
+      value: 'externalId',
+      content: t('EXTERNAL_ID', 'External id')
+    },
+    {
+      value: 'channel',
+      content: t('CHANNEL', 'Channel')
+    }
+  ]
+
+  const handleChangeAllowColumns = (type) => {
+    let _column = {}
+    if (type === 'channel') {
+      _column = { visable: allowColumns[type].visable, title: t('CHANNEL', 'Channel'), className: 'channelInfo', draggable: true, colSpan: 1, order: 12 }
+    } else {
+      _column = allowColumns[type]
+    }
+    const updatedAllowColumns = {
+      ...allowColumns,
+      [type]: { ..._column, visable: !_column?.visable }
+    }
+    setAllowColumns(updatedAllowColumns)
+    saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)))
+  }
+
   useEffect(() => {
     if (orderList.loading || !messageListView) return
     if (orderList.orders.length === 0 || messageOrder) return
@@ -128,33 +208,46 @@ export const OrdersListing = memo((props) => {
               maxHeight={orderListView !== 'table'}
               onDoubleClick={handleDobleClick}
             >
+
               {orderListView === 'table' ? (
-                <OrdersTable
-                  hidePhoto={hidePhoto}
-                  setSelectedOrderIds={setSelectedOrderIds}
-                  isSelectedOrders={isSelectedOrders}
-                  orderList={orderList}
-                  pagination={pagination}
-                  selectedOrderIds={selectedOrderIds}
-                  orderDetailId={orderDetailId}
-                  loadMoreOrders={loadMoreOrders}
-                  getPageOrders={getPageOrders}
-                  handleUpdateOrderStatus={handleUpdateOrderStatus}
-                  handleSelectedOrderIds={handleSelectedOrderIds}
-                  handleOpenOrderDetail={handleOpenOrderDetail}
-                  currentTourStep={currentTourStep}
-                  isTourOpen={isTourOpen}
-                  handleOpenTour={handleOpenTour}
-                  setIsTourOpen={setIsTourOpen}
-                  slaSettingTime={slaSettingTime}
-                  groupStatus={groupStatus}
-                  allowColumns={allowColumns}
-                  setAllowColumns={setAllowColumns}
-                  handleDrop={handleDrop}
-                  saveUserSettings={saveUserSettings}
-                  isUseQuery={isUseQuery}
-                  franchisesList={props.franchisesList}
-                />
+                <>
+                  {allowColumns && !(Object.keys(allowColumns).filter(col => allowColumns[col]?.visable && allowColumns[col]?.order !== 0).length === 0) && (
+                    <ColumnPopoverContainer>
+                      <ColumnAllowSettingPopover
+                        allowColumns={allowColumns}
+                        optionsDefault={optionsDefault}
+                        handleChangeAllowColumns={handleChangeAllowColumns}
+                        isOrder
+                      />
+                    </ColumnPopoverContainer>
+                  )}
+                  <OrdersTable
+                    hidePhoto={hidePhoto}
+                    setSelectedOrderIds={setSelectedOrderIds}
+                    isSelectedOrders={isSelectedOrders}
+                    orderList={orderList}
+                    pagination={pagination}
+                    selectedOrderIds={selectedOrderIds}
+                    orderDetailId={orderDetailId}
+                    loadMoreOrders={loadMoreOrders}
+                    getPageOrders={getPageOrders}
+                    handleUpdateOrderStatus={handleUpdateOrderStatus}
+                    handleSelectedOrderIds={handleSelectedOrderIds}
+                    handleOpenOrderDetail={handleOpenOrderDetail}
+                    currentTourStep={currentTourStep}
+                    isTourOpen={isTourOpen}
+                    handleOpenTour={handleOpenTour}
+                    setIsTourOpen={setIsTourOpen}
+                    slaSettingTime={slaSettingTime}
+                    groupStatus={groupStatus}
+                    allowColumns={allowColumns}
+                    setAllowColumns={setAllowColumns}
+                    handleDrop={handleDrop}
+                    saveUserSettings={saveUserSettings}
+                    isUseQuery={isUseQuery}
+                    franchisesList={props.franchisesList}
+                  />
+                </>
               ) : (
                 <OrdersCards
                   isMessagesView={isMessagesView}

package/src/components/Orders/OrdersListing/styles.js

@@ -107,3 +107,15 @@ export const InfoMessage = styled.div`
     }
   }
 `
+
+export const ColumnPopoverContainer = styled.div`
+  position: relative;
+  button {
+    right: 0px;
+    position: absolute;
+    transform: translateY(-3px);
+    z-index: 1000;
+    background: white;
+    padding: 0 10px;
+  }
+`

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

@@ -267,7 +267,7 @@ export const OrdersTable = memo((props) => {
       _column = { visable:allowColumns[type].visable ,title: t('CHANNEL', 'Channel'), className: 'channelInfo', draggable: true, colSpan: 1, order: 12 }
      }else{
       _column = allowColumns[type]
-     }
+    }
     const updatedAllowColumns = {
       ...allowColumns,
       [type]: { ..._column, visable: !_column?.visable }
@@ -460,14 +460,6 @@ export const OrdersTable = memo((props) => {
                                   </div>
                                 </DragTh>
                               )}
-                              <th className='orderPrice' key={`noDragTh-${i}`}>
-                                <ColumnAllowSettingPopover
-                                  allowColumns={allowColumns}
-                                  optionsDefault={optionsDefault}
-                                  handleChangeAllowColumns={handleChangeAllowColumns}
-                                  isOrder
-                                />
-                              </th>
                             </React.Fragment>
                           )
                         }