ordering-ui-admin-external 1.40.2 → 1.40.4

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

@@ -110,6 +110,17 @@ var Order = exports.Order = /*#__PURE__*/_react.default.memo(function (props) {
         className: "bold"
       }, getOrderStatus(order.status))));
     }
+    if (column === 'agent') {
+      var _order$agent, _order$agent2;
+      return /*#__PURE__*/_react.default.createElement("td", {
+        className: "statusInfo",
+        key: "agentInfo".concat(i, "-").concat(index)
+      }, /*#__PURE__*/_react.default.createElement(_styles.InfoWrapper, null, /*#__PURE__*/_react.default.createElement("div", {
+        className: "info"
+      }, /*#__PURE__*/_react.default.createElement("p", {
+        className: "bold"
+      }, order === null || order === void 0 || (_order$agent = order.agent) === null || _order$agent === void 0 ? void 0 : _order$agent.name), /*#__PURE__*/_react.default.createElement("p", null, order === null || order === void 0 || (_order$agent2 = order.agent) === null || _order$agent2 === void 0 ? void 0 : _order$agent2.email))));
+    }
     if (column === 'cartGroupId') {
       return /*#__PURE__*/_react.default.createElement("td", {
         className: "orderGroupId",

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

@@ -98,6 +98,9 @@ var OrdersTable = exports.OrdersTable = /*#__PURE__*/(0, _react.memo)(function (
   }, {
     value: 'orderNumber',
     content: t('INVOICE_ORDER_NO', 'Order No.')
+  }, {
+    value: 'agent',
+    content: t('AGENT', 'Agent')
   }, {
     value: 'cartGroupId',
     content: t('GROUP_ORDER', 'Group Order')

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

@@ -4,9 +4,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperPagination = exports.WrapperImage = exports.WrapOrderStatusSelector = exports.Timestatus = exports.Timer = exports.Table = exports.StatusInfo = exports.PriorityDot = exports.OrdersCountWrapper = exports.OrdersContainer = exports.OrderType = exports.OrderTbody = exports.OrderNumberContainer = exports.LogisticStatusDot = exports.DriversInfo = exports.DragTh = exports.CustomerInfo = exports.CheckBox = exports.BusinessInfo = void 0;
+exports.WrapperPagination = exports.WrapperImage = exports.WrapOrderStatusSelector = exports.Timestatus = exports.Timer = exports.Table = exports.StatusInfo = exports.PriorityDot = exports.OrdersCountWrapper = exports.OrdersContainer = exports.OrderType = exports.OrderTbody = exports.OrderNumberContainer = exports.LogisticStatusDot = exports.InfoWrapper = exports.DriversInfo = exports.DragTh = exports.CustomerInfo = exports.CheckBox = exports.BusinessInfo = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54, _templateObject55, _templateObject56, _templateObject57;
 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) } })); }
@@ -194,4 +194,8 @@ var DragTh = exports.DragTh = _styledComponents.default.th(_templateObject53 ||
   return selectedDragOver && (0, _styledComponents.css)(_templateObject54 || (_templateObject54 = _taggedTemplateLiteral(["\n    border: 1px solid ", ";\n  "])), function (props) {
     return props.theme.colors.primary;
   });
+});
+var InfoWrapper = exports.InfoWrapper = _styledComponents.default.div(_templateObject55 || (_templateObject55 = _taggedTemplateLiteral(["\n  position: relative;\n  ", "\n  .bold {\n    max-width: 150px;\n    font-weight: 600;\n    margin: 0;\n  }\n  &:hover > div {\n    visibility: visible;\n    opacity: 1;\n  }\n"])), function (props) {
+  var _props$theme8;
+  return (_props$theme8 = props.theme) !== null && _props$theme8 !== void 0 && _props$theme8.rtl ? (0, _styledComponents.css)(_templateObject56 || (_templateObject56 = _taggedTemplateLiteral(["\n    margin-left: 4px;\n  "]))) : (0, _styledComponents.css)(_templateObject57 || (_templateObject57 = _taggedTemplateLiteral(["\n    margin-right: 4px;\n  "])));
 });

package/_modules/components/Settings/index.js

@@ -177,6 +177,12 @@ Object.defineProperty(exports, "SettingsDetail", {
     return _SettingsDetail.SettingsDetail;
   }
 });
+Object.defineProperty(exports, "SettingsImage", {
+  enumerable: true,
+  get: function get() {
+    return _SettingsImage.SettingsImage;
+  }
+});
 Object.defineProperty(exports, "SettingsList", {
   enumerable: true,
   get: function get() {
@@ -195,6 +201,12 @@ Object.defineProperty(exports, "SettingsSelectUI", {
     return _SettingsSelectUI.SettingsSelectUI;
   }
 });
+Object.defineProperty(exports, "SitesAuthSettings", {
+  enumerable: true,
+  get: function get() {
+    return _SitesAuthSettings.SitesAuthSettings;
+  }
+});
 Object.defineProperty(exports, "WebhookDelaySelector", {
   enumerable: true,
   get: function get() {
@@ -254,4 +266,6 @@ var _LanguageTransSpread = require("./LanguageTransSpread");
 var _LanguageTransTable = require("./LanguageTransTable");
 var _MultiCountrySettings = require("./MultiCountrySettings");
 var _CardFieldsSetting = require("./CardFieldsSetting");
-var _GuestCheckoutFieldsSetting = require("./GuestCheckoutFieldsSetting");
+var _GuestCheckoutFieldsSetting = require("./GuestCheckoutFieldsSetting");
+var _SitesAuthSettings = require("./SitesAuthSettings");
+var _SettingsImage = require("./SettingsImage");

package/_modules/components/Stores/ProductExtras/index.js

@@ -37,6 +37,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ProductExtrasUI = function ProductExtrasUI(props) {
+  var _extrasState$extras4;
   var productState = props.productState,
     extrasState = props.extrasState,
     isAddMode = props.isAddMode,
@@ -219,7 +220,8 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
   (0, _react.useEffect)(function () {
     var extraId = query.get('extra');
     if (extraId) {
-      var initExtra = extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras.find(function (extra) {
+      var _extrasState$extras3;
+      var initExtra = extrasState === null || extrasState === void 0 || (_extrasState$extras3 = extrasState.extras) === null || _extrasState$extras3 === void 0 ? void 0 : _extrasState$extras3.find(function (extra) {
         return extra.id === Number(extraId);
       });
       initExtra && handleOpenExtraDetails(null, initExtra, true);
@@ -231,7 +233,7 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
     onClick: function onClick() {
       return handleOpenAddForm();
     }
-  }, t('ADD_PRODUCT_OPTION', 'Add product option'))), (extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras) && (extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras.sort(function (a, b) {
+  }, t('ADD_PRODUCT_OPTION', 'Add product option'))), (extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras) && (extrasState === null || extrasState === void 0 || (_extrasState$extras4 = extrasState.extras) === null || _extrasState$extras4 === void 0 ? void 0 : _extrasState$extras4.sort(function (a, b) {
     return a.rank - b.rank;
   }).map(function (extra, index) {
     var _theme$images$icons, _extraIds$includes;

package/_modules/index.js

@@ -1179,6 +1179,12 @@ Object.defineProperty(exports, "GoogleGpsButton", {
     return _Delivery.GoogleGpsButton;
   }
 });
+Object.defineProperty(exports, "GuestCheckoutFieldsSetting", {
+  enumerable: true,
+  get: function get() {
+    return _Settings.GuestCheckoutFieldsSetting;
+  }
+});
 Object.defineProperty(exports, "HomePage", {
   enumerable: true,
   get: function get() {
@@ -2151,6 +2157,12 @@ Object.defineProperty(exports, "SettingsDetail", {
     return _Settings.SettingsDetail;
   }
 });
+Object.defineProperty(exports, "SettingsImage", {
+  enumerable: true,
+  get: function get() {
+    return _Settings.SettingsImage;
+  }
+});
 Object.defineProperty(exports, "SettingsList", {
   enumerable: true,
   get: function get() {
@@ -2205,6 +2217,12 @@ Object.defineProperty(exports, "SingleBusinessSubCateogries", {
     return _Stores.SingleBusinessSubCateogries;
   }
 });
+Object.defineProperty(exports, "SitesAuthSettings", {
+  enumerable: true,
+  get: function get() {
+    return _Settings.SitesAuthSettings;
+  }
+});
 Object.defineProperty(exports, "SpinnerLoader", {
   enumerable: true,
   get: function get() {

package/package.json

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

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { BusinessInfo, CheckBox, CustomerInfo, LogisticStatusDot, OrderNumberContainer, OrdersCountWrapper, PriorityDot, StatusInfo, Timer, Timestatus, WrapperImage } from './styles'
+import { BusinessInfo, CheckBox, CustomerInfo, LogisticStatusDot, OrderNumberContainer, OrdersCountWrapper, PriorityDot, StatusInfo, Timer, Timestatus, WrapperImage, InfoWrapper } from './styles'
 import RiCheckboxFill from '@meronex/icons/ri/RiCheckboxFill'
 import RiCheckboxBlankLine from '@meronex/icons/ri/RiCheckboxBlankLine'
 import { useLanguage, useUtils } from 'ordering-components-admin-external'
@@ -119,6 +119,18 @@ export const Order = React.memo((props) => {
               </td>
             )
           }
+          if (column === 'agent') {
+            return (
+              <td className='statusInfo' key={`agentInfo${i}-${index}`}>
+                <InfoWrapper>
+                  <div className='info'>
+                    <p className='bold'>{order?.agent?.name}</p>
+                    <p>{order?.agent?.email}</p>
+                  </div>
+                </InfoWrapper>
+              </td>
+            )
+          }
           if (column === 'cartGroupId') {
             return (
               <td className='orderGroupId' key={`cart_group_id${i}-${index}`}>

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

@@ -95,6 +95,10 @@ export const OrdersTable = memo((props) => {
       value: 'orderNumber',
       content: t('INVOICE_ORDER_NO', 'Order No.')
     },
+    {
+      value: 'agent',
+      content: t('AGENT', 'Agent')
+    },
     {
       value: 'cartGroupId',
       content: t('GROUP_ORDER', 'Group Order')

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

@@ -411,3 +411,20 @@ export const DragTh = styled.th`
     border: 1px solid ${props => props.theme.colors.primary};
   `}
 `
+export const InfoWrapper = styled.div`
+  position: relative;
+  ${props => props.theme?.rtl ? css`
+    margin-left: 4px;
+  ` : css`
+    margin-right: 4px;
+  `}
+  .bold {
+    max-width: 150px;
+    font-weight: 600;
+    margin: 0;
+  }
+  &:hover > div {
+    visibility: visible;
+    opacity: 1;
+  }
+`

package/src/components/Settings/index.js

@@ -34,6 +34,8 @@ import { LanguageTransTable } from './LanguageTransTable'
 import { MultiCountrySettings } from './MultiCountrySettings'
 import { CardFieldsSetting } from './CardFieldsSetting'
 import { GuestCheckoutFieldsSetting } from './GuestCheckoutFieldsSetting'
+import { SitesAuthSettings } from './SitesAuthSettings'
+import { SettingsImage } from './SettingsImage'
 export {
   Cms,
   IntegrationListing,
@@ -70,5 +72,7 @@ export {
   LanguageTransTable,
   MultiCountrySettings,
   CardFieldsSetting,
-  GuestCheckoutFieldsSetting
+  GuestCheckoutFieldsSetting,
+  SitesAuthSettings,
+  SettingsImage
 }

package/src/components/Stores/ProductExtras/index.js

@@ -153,7 +153,7 @@ const ProductExtrasUI = (props) => {
   useEffect(() => {
     const extraId = query.get('extra')
     if (extraId) {
-      const initExtra = extrasState?.extras.find(extra => extra.id === Number(extraId))
+      const initExtra = extrasState?.extras?.find(extra => extra.id === Number(extraId))
       initExtra && handleOpenExtraDetails(null, initExtra, true)
     }
   }, [])
@@ -171,7 +171,7 @@ const ProductExtrasUI = (props) => {
             {t('ADD_PRODUCT_OPTION', 'Add product option')}
           </Button>
         </Header>
-        {extrasState?.extras && extrasState?.extras.sort((a, b) => a.rank - b.rank).map((extra, index) => {
+        {extrasState?.extras && extrasState?.extras?.sort((a, b) => a.rank - b.rank).map((extra, index) => {
           const isLastExtra = index === extrasState.extras.length - 1
           return (
             <ExtraOption

package/src/index.js

@@ -205,7 +205,10 @@ import {
   LanguageTransSpread,
   LanguageTransTable,
   MultiCountrySettings,
-  CardFieldsSetting
+  CardFieldsSetting,
+  GuestCheckoutFieldsSetting,
+  SitesAuthSettings,
+  SettingsImage
 } from './components/Settings'
 import {
   BusinessBrandListing,
@@ -626,6 +629,10 @@ export {
   LanguageTransTable,
   MultiCountrySettings,
   CardFieldsSetting,
+  GuestCheckoutFieldsSetting,
+  SitesAuthSettings,
+  SettingsImage,
+
   Support,
 
   BusinessBrandListing,