ordering-ui-admin-external 1.21.1 → 1.22.0

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

@@ -0,0 +1,111 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BusinessQRCodeOptions = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _styledComponents = require("styled-components");
+var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
+var _BsChevronRight = _interopRequireDefault(require("@meronex/icons/bs/BsChevronRight"));
+var _Shared = require("../../Shared");
+var _useWindowSize2 = require("../../../hooks/useWindowSize");
+var _BusinessQRCodeOption = require("../BusinessQRCodeOption");
+var _styles = 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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
+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; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var BusinessQRCodeOptionsUI = function BusinessQRCodeOptionsUI(props) {
+  var setIsExtendExtraOpen = props.setIsExtendExtraOpen,
+    siteState = props.siteState;
+  var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
+    _useLanguage2 = _slicedToArray(_useLanguage, 2),
+    t = _useLanguage2[1];
+  var theme = (0, _styledComponents.useTheme)();
+  var _useWindowSize = (0, _useWindowSize2.useWindowSize)(),
+    width = _useWindowSize.width;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpen = _useState2[0],
+    setIsOpen = _useState2[1];
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    itemSelected = _useState4[0],
+    setItemSelected = _useState4[1];
+  var publishingItems = [{
+    key: 'pick_up',
+    value: 2,
+    title: t('QR_CODE_FOR_PICKUP', 'QR Code for Pickup')
+  }, {
+    key: 'eat_in',
+    value: 3,
+    title: t('QR_CODE_FOR_EATIN', 'QR Code for Eat in')
+  }, {
+    key: 'curbside',
+    value: 4,
+    title: t('QR_CODE_FOR_CURBSIDE', 'QR Code for Curbside')
+  }, {
+    key: 'driver_thru',
+    value: 5,
+    title: t('QR_CODE_FOR_DRIVE_THRU', 'QR Code for Drive Thru')
+  }];
+  var handleAction = function handleAction(value) {
+    var item = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    setItemSelected(item);
+    setIsExtendExtraOpen(value);
+    setIsOpen(value);
+  };
+  return /*#__PURE__*/_react.default.createElement(_styles.MainContainer, null, /*#__PURE__*/_react.default.createElement(_styles.PublishingContainer, null, /*#__PURE__*/_react.default.createElement("h1", null, t('PUBLISHING', 'Publishing')), /*#__PURE__*/_react.default.createElement(_styles.PublishingListWrapper, null, publishingItems.map(function (item, i) {
+    return /*#__PURE__*/_react.default.createElement(_styles.PublishingOptionContainer, {
+      key: i,
+      onClick: function onClick() {
+        return handleAction(true, item);
+      },
+      active: item.key === (itemSelected === null || itemSelected === void 0 ? void 0 : itemSelected.key)
+    }, /*#__PURE__*/_react.default.createElement(_styles.PublishingOption, null, /*#__PURE__*/_react.default.createElement(_styles.PublishingName, null, item === null || item === void 0 ? void 0 : item.title)), /*#__PURE__*/_react.default.createElement(_BsChevronRight.default, {
+      style: {
+        color: theme.colors.lightGray
+      }
+    }));
+  }))), width >= 1000 ? isOpen && /*#__PURE__*/_react.default.createElement(_BusinessQRCodeOption.BusinessQRCodeOption, {
+    business: props.business,
+    open: isOpen,
+    item: itemSelected,
+    onClose: function onClose() {
+      return handleAction(false);
+    }
+  }) : isOpen && /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
+    width: "80%",
+    open: isOpen,
+    onClose: function onClose() {
+      return handleAction(false);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_BusinessQRCodeOption.BusinessQRCodeOption, {
+    business: props.business,
+    siteState: siteState,
+    open: isOpen,
+    item: itemSelected,
+    onClose: function onClose() {
+      return handleAction(false);
+    }
+  })));
+};
+var BusinessQRCodeOptions = function BusinessQRCodeOptions(props) {
+  var businessQRcodeOptionsProps = _objectSpread(_objectSpread({}, props), {}, {
+    UIComponent: BusinessQRCodeOptionsUI
+  });
+  return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.BusinessQRCodeOptions, businessQRcodeOptionsProps);
+};
+exports.BusinessQRCodeOptions = BusinessQRCodeOptions;

package/_modules/components/Stores/BusinessQRCodeOptions/styles.js

@@ -0,0 +1,48 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PublishingOptionContainer = exports.PublishingOption = exports.PublishingName = exports.PublishingListWrapper = exports.PublishingContainer = exports.MainContainer = void 0;
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+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 MainContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  height: 100%;\n"])));
+exports.MainContainer = MainContainer;
+var PublishingContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  height: 100%;\n  overflow-x: hidden;\n  flex: 1;\n  h1 {\n    color: ", ";\n    font-size: 20px;\n    font-weight: 700;\n  }\n  @media (min-width: 576px) {\n    padding: 20px;\n  }\n"])), function (props) {
+  return props.theme.colors.headingColor;
+});
+exports.PublishingContainer = PublishingContainer;
+var PublishingListWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  border-top: 1px solid ", ";\n  margin: 20px 0;\n"])), function (props) {
+  return props.theme.colors.borderColor;
+});
+exports.PublishingListWrapper = PublishingListWrapper;
+var PublishingOptionContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  border-bottom: 1px solid ", ";\n  padding: 12px 18px;\n  ", "\n"])), function (props) {
+  return props.theme.colors.borderColor;
+}, function (_ref) {
+  var active = _ref.active;
+  return active && (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    border-top: 1px solid ", ";\n    border-bottom: 1px solid ", ";\n    background-color: ", ";\n  "])), function (props) {
+    return props.theme.colors.primary;
+  }, function (props) {
+    return props.theme.colors.primary;
+  }, function (props) {
+    return props.theme.colors.backgroundInfo;
+  });
+});
+exports.PublishingOptionContainer = PublishingOptionContainer;
+var PublishingOption = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: flex-start;\n  flex-direction: column;\n  cursor: pointer;\n  color: ", ";\n  \n  > svg {\n    font-size: 20px;\n    &.fill {\n      color: ", ";\n    }\n  }\n"])), function (props) {
+  return props.theme.colors.headingColor;
+}, function (props) {
+  return props.theme.colors.primary;
+});
+exports.PublishingOption = PublishingOption;
+var PublishingName = _styledComponents.default.span(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  color: ", ";\n  font-size: 14px;\n  ", "\n"])), function (props) {
+  return props.theme.colors.headingColor;
+}, function (props) {
+  var _props$theme;
+  return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n    margin-left: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n    margin-right: 10px;\n  "])));
+});
+exports.PublishingName = PublishingName;

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

@@ -91,7 +91,7 @@ var BusinessSummary = function BusinessSummary(props) {
     var _businessState$busine2;
     window.open("https://".concat(ordering.project, ".tryordering.com/store/").concat(businessState === null || businessState === void 0 ? void 0 : (_businessState$busine2 = businessState.business) === null || _businessState$busine2 === void 0 ? void 0 : _businessState$busine2.slug), '_blank');
   };
-  var itemsExcluded = !!spoonityConfig ? ['publishing'] : ['publishing', 'spoonity_key'];
+  var itemsExcluded = !!spoonityConfig ? ['publishing', 'personalization'] : ['publishing', 'spoonity_key', 'personalization'];
   var businessConfigs = [{
     key: 'store_details',
     value: t('STORE_DETAILS', 'Store details')

package/_modules/components/Stores/index.js

@@ -273,6 +273,18 @@ Object.defineProperty(exports, "BusinessPublishing", {
     return _BusinessPublishing.BusinessPublishing;
   }
 });
+Object.defineProperty(exports, "BusinessQRCodeOption", {
+  enumerable: true,
+  get: function get() {
+    return _BusinessQRCodeOption.BusinessQRCodeOption;
+  }
+});
+Object.defineProperty(exports, "BusinessQRCodeOptions", {
+  enumerable: true,
+  get: function get() {
+    return _BusinessQRCodeOptions.BusinessQRCodeOptions;
+  }
+});
 Object.defineProperty(exports, "BusinessSalesChannel", {
   enumerable: true,
   get: function get() {
@@ -686,6 +698,8 @@ var _BusinessTypes = require("./BusinessTypes");
 var _BusinessVideos = require("./BusinessVideos");
 var _BusinessWebhooks = require("./BusinessWebhooks");
 var _BusinessWidgets = require("./BusinessWidgets");
+var _BusinessQRCodeOption = require("./BusinessQRCodeOption");
+var _BusinessQRCodeOptions = require("./BusinessQRCodeOptions");
 var _SeoOptions = require("./SeoOptions");
 var _AddBusinessForm = require("./AddBusinessForm");
 var _WizardBusiness = require("./WizardBusiness");

package/_modules/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getMinutes = exports.getIconCard = exports.getHours = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
+exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getMinutes = exports.getIconCard = exports.getHours = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _FaCcMastercard = _interopRequireDefault(require("@meronex/icons/fa/FaCcMastercard"));
 var _FaCcVisa = _interopRequireDefault(require("@meronex/icons/fa/FaCcVisa"));
@@ -358,9 +358,31 @@ var checkPreSiteUrl = function checkPreSiteUrl(url, fallback) {
 };
 
 /**
- * default value for bitton
+ * Function to validate URL
+ * @param {string} url URL of page
  */
 exports.checkPreSiteUrl = checkPreSiteUrl;
+var checkValidUrlFormat = function checkValidUrlFormat(url) {
+  if (!url) return;
+  var pattern = new RegExp('^(https?:\\/\\/)?' +
+  // protocol
+  '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' +
+  // domain name
+  '((\\d{1,3}\\.){3}\\d{1,3}))' +
+  // OR ip (v4) address
+  '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' +
+  // port and path
+  '(\\?[;&a-z\\d%_.~+=-]*)?' +
+  // query string
+  '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+
+  return pattern.test(url);
+};
+
+/**
+ * default value for bitton
+ */
+exports.checkValidUrlFormat = checkValidUrlFormat;
 var ribbonValues = {
   color: '#0083FE',
   text: 'ribbon',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.21.1",
+  "version": "1.22.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.21.0",
+    "ordering-components-admin-external": "1.22.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",
@@ -100,6 +100,7 @@
     "react-otp-input": "^2.4.0",
     "react-phone-number-input": "^3.1.23",
     "react-popper": "^2.3.0",
+    "react-qr-code": "^2.0.11",
     "react-summernote": "^2.0.2",
     "react-to-print": "^2.14.6",
     "react-toastify": "^6.1.0",

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

@@ -14,7 +14,7 @@ import {
   DataListTable
 } from './styles'
 
-const DriversGroupLogsUI = (props) => {
+export const DriversGroupLogsUI = (props) => {
   const {
     logsList,
     paginationProps,
@@ -71,8 +71,6 @@ const DriversGroupLogsUI = (props) => {
     }
   }, [logsList.logs, paginationProps])
 
-  console.log(logsList)
-
   return (
     <>
       <DriversGroupLogsContainer
@@ -133,7 +131,7 @@ const DriversGroupLogsUI = (props) => {
                       </td>
                       <td>
                         <DataListTable>
-                          {(typeof log?.data === 'object' ? Object.values(log?.data) : log?.data).map((item, i) => (
+                          {log?.data && (typeof log?.data === 'object' ? Object.values(log?.data) : log?.data).map((item, i) => (
                             <tbody key={i}>
                               <tr>
                                 <td>{getAttributeName(item?.attribute)}</td>

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

@@ -0,0 +1,8 @@
+import React from 'react'
+import { DriversLogs as DriversLogsController } from 'ordering-components-admin-external'
+
+export const DriversLogs = (props) => {
+  return (
+    <DriversLogsController {...props} />
+  )
+}

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

@@ -10,6 +10,8 @@ import { Personalization, Modal, Schedule } from '../../Shared'
 import { UserDetailsMenu } from '../UserDetailsMenu'
 import { UserProfileForm } from '../UserProfileForm'
 import { UserMetaFields } from '../../Users'
+import { DriversLogs } from '../DriversLogs'
+import { DriversGroupLogsUI } from '../DriversGroupLogs'
 import { DriverGroupSetting } from '../DriverGroupSetting'
 import { ArrowsAngleContract, ArrowsAngleExpand, ThreeDots } from 'react-bootstrap-icons'
 import { Switch, Button, IconButton } from '../../../styles'
@@ -195,6 +197,12 @@ export const UserDetailsUI = (props) => {
               </ActionsForm>
             </ScheduleSection>
           )}
+          {currentMenuSelected === 'logs' && (
+            <DriversLogs
+              userId={userState.user?.id}
+              UIComponent={DriversGroupLogsUI}
+            />
+          )}
           {currentMenuSelected === 'orders' && (
             <OrdersManager
               isSelectedOrders

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

@@ -19,7 +19,8 @@ export const UserDetailsMenu = (props) => {
     { key: 'profile', content: t('PROFILE', 'Profile') },
     { key: 'driver_group', content: t('DRIVER_GROUP', 'Driver group') },
     { key: 'saved_places', content: t('SAVED_PLACES', 'Saved places') },
-    { key: 'schedule', content: t('SCHEDULE', 'Schedule') }
+    { key: 'schedule', content: t('SCHEDULE', 'Schedule') },
+    { key: 'logs', content: t('LOGS', 'Logs') }
     // { key: 'metafields', content: t('METAFIELDS', 'Metafields') },
     // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }
   ] : [

package/src/components/MyProducts/AdvancedSettings/OrderType.js

@@ -28,9 +28,9 @@ export const OrderType = (props) => {
         />
       </FormControl>
       <FormControl>
-        <label>{t('CALL_TO_ACTION', 'Call to action')}</label>
+        <label>{t('EXPORT_CALL_TO_ACTION', 'Call to action')}</label>
         <Input
-          placeholder={t('CALL_TO_ACTION', 'Call to action')}
+          placeholder={t('EXPORT_CALL_TO_ACTION', 'Call to action')}
           defaultValue={typeValues?.call_to_action || ''}
           onChange={(e) => handleUpdateThemeValue(e.target.value, [path, 'call_to_action'].join('.'))}
         />

package/src/components/MyProducts/AdvancedSettings/index.js

@@ -47,7 +47,7 @@ export const AdvancedSettings = (props) => {
     { name: '', type: 'hidden', path: 'business_listing_view.hidden' },
     { name: t('BUSINESS_LISTING_IMAGE', 'Business listing image'), type: 'image', path: 'business_listing_view.components.business_hero.components.image' },
     { name: t('PREVIOUS_ORDERS_BLOCK', 'Previous orders block'), type: 'hidden', path: 'business_listing_view.components.previous_orders_block.hidden' },
-    { name: t('Highest_rated_business_block', 'Highest rated business block'), type: 'hidden', path: 'business_listing_view.components.highest_rated_business_block.hidden' },
+    { name: t('HIGHEST_RATED_BUSINESS_BLOCK', 'Highest rated business block'), type: 'hidden', path: 'business_listing_view.components.highest_rated_business_block.hidden' },
     { name: t('CATEGORIES_BLOCK', 'Categories block'), type: 'hidden', path: 'business_listing_view.components.categories.hidden' },
     { name: t('AMOUNT_OF_BUSINESSES_TO_DISPLAY_PER_ROW', 'Amount of businesses to display per row:'), type: 'position', path: 'business_listing_view.components.layout.rows' },
     { name: t('SEARCH_BOX', 'Search box'), type: 'hidden', path: 'business_listing_view.components.search.hidden' },
@@ -123,39 +123,38 @@ export const AdvancedSettings = (props) => {
 
   const myAccountList = [
     { name: t('USER_IMAGE', 'User image'), type: 'hidden', path: 'profile.components.picture.hidden' },
-    { name: t('BIRTHDAY', 'Birthday'), type: 'hidden', path: 'profile.components.birthday.hidden' },
+    { name: t('EXPORT_BIRTHDAY', 'Birthday'), type: 'hidden', path: 'profile.components.birthday.hidden' },
     { name: t('LANGUAGES', 'Languages'), type: 'hidden', path: 'profile.components.languages.hidden' },
     { name: t('ADDRESS_LIST', 'Address list'), type: 'hidden', path: 'profile.components.address_list.hidden' }
   ]
 
   const activeOrderBlockList = [
-    { name: t('MAP', 'Map'), type: 'hidden', path: 'orders.components.map.hidden' },
     { name: t('BUSINESS_LOGO', 'Business logo'), type: 'hidden', path: 'orders.components.business_logo.hidden' },
-    { name: t('BUSINESS_NAME', 'Business name'), type: 'hidden', path: 'orders.components.business_name.hidden' },
+    { name: t('EXPORT_BUSINESS_NAME', 'Business name'), type: 'hidden', path: 'orders.components.business_name.hidden' },
     { name: t('ORDER_NUMBER', 'Order number'), type: 'hidden', path: 'orders.components.order_number.hidden' },
     { name: t('ORDER_DATE', 'Order date'), type: 'hidden', path: 'orders.components.date.hidden' },
-    { name: t('REVIEW_ORDER_BUTTON', 'Review order button'), type: 'hidden', path: 'orders.components.review_order_button.hidden' },
-    { name: t('REORDER_BUTTON', 'Reorder button'), type: 'hidden', path: 'orders.components.reorder_button.hidden' },
+    { name: t('EXPORT_REVIEW_ORDER_BUTTON', 'Review order button'), type: 'hidden', path: 'orders.components.review_order_button.hidden' },
+    { name: t('EXPORT_REORDER_BUTTON', 'Reorder button'), type: 'hidden', path: 'orders.components.reorder_button.hidden' },
     { name: t('FAVORITE_BUTTON', 'Favorite button'), type: 'hidden', path: 'orders.components.favorite.hidden' },
     { name: t('ORDER_STATUS', 'Order status'), type: 'hidden', path: 'orders.components.order_status.hidden' },
-    { name: t('PREVIOUS_ORDER_BLOCK', 'Previous order block'), type: 'hidden', path: 'orders.components.past_orders.hidden' },
-    { name: t('BUSINESS_TAB', 'Business tab'), type: 'hidden', path: 'orders.components.business_tab.hidden' },
-    { name: t('PRODUCTS_TAB', 'Products tab'), type: 'hidden', path: 'orders.components.products_tab.hidden' }
+    { name: t('EXPORT_PREVIOUS_ORDER_BLOCK', 'Previous order block'), type: 'hidden', path: 'orders.components.past_orders.hidden' },
+    { name: t('EXPORT_BUSINESS_TAB', 'Business tab'), type: 'hidden', path: 'orders.components.business_tab.hidden' },
+    { name: t('EXPORT_PRODUCTS_TAB', 'Products tab'), type: 'hidden', path: 'orders.components.products_tab.hidden' }
   ]
 
   const menuOptionList = [
-    { name: t('BROWSE_AND_SEARCH', 'Browse and search'), type: 'hidden', path: 'bar_menu.components.browse.hidden' },
-    { name: t('WALLET', 'Wallet'), type: 'hidden', path: 'bar_menu.components.wallet.hidden' },
+    { name: t('EXPORT_BROWSE_AND_SEARCH', 'Browse and search'), type: 'hidden', path: 'bar_menu.components.browse.hidden' },
+    { name: t('WALLETS', 'Wallets'), type: 'hidden', path: 'bar_menu.components.wallet.hidden' },
     { name: t('PROMOTIONS', 'Promotions'), type: 'hidden', path: 'bar_menu.components.promotions.hidden' },
     { name: t('MESSAGES', 'Messages'), type: 'hidden', path: 'bar_menu.components.messages.hidden' },
     { name: t('HELP', 'Help'), type: 'hidden', path: 'bar_menu.components.help.hidden' },
-    { name: t('SECURITY', 'Security'), type: 'hidden', path: 'bar_menu.components.sessions.hidden' },
-    { name: t('MY_FAVORITES', 'My favorites'), type: 'hidden', path: 'bar_menu.components.favorites.hidden' }
+    { name: t('EXPORT_SECURITY', 'Security'), type: 'hidden', path: 'bar_menu.components.sessions.hidden' },
+    { name: t('EXPORT_MY_FAVORITES', 'My favorites'), type: 'hidden', path: 'bar_menu.components.favorites.hidden' }
   ]
 
   const thirdPartyCodeList = [
-    { name: t('HEAD', 'Head'), type: 'input', path: 'third_party_code.head' },
-    { name: t('BODY', 'Body'), type: 'input', path: 'third_party_code.body' }
+    { name: t('EXPORT_HEAD', 'Head'), type: 'input', path: 'third_party_code.head' },
+    { name: t('EXPORT_BODY', 'Body'), type: 'input', path: 'third_party_code.body' }
   ]
 
   const buttonList = [

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

@@ -47,7 +47,8 @@ export const OrdersListing = (props) => {
     allowColumns,
     setAllowColumns,
     handleDrop,
-    isDelivery
+    isDelivery,
+    saveUserSettings
   } = props
 
   const theme = useTheme()
@@ -130,6 +131,7 @@ export const OrdersListing = (props) => {
                   allowColumns={allowColumns}
                   setAllowColumns={setAllowColumns}
                   handleDrop={handleDrop}
+                  saveUserSettings={saveUserSettings}
                 />
               ) : (
                 <OrdersCards

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

@@ -53,7 +53,8 @@ export const OrdersTable = (props) => {
     groupStatus,
     allowColumns,
     setAllowColumns,
-    handleDrop
+    handleDrop,
+    saveUserSettings
   } = props
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -232,12 +233,15 @@ export const OrdersTable = (props) => {
   }
 
   const handleChangeAllowColumns = (type) => {
-    console.log(type, 'type', allowColumns)
     const _column = allowColumns[type]
-    setAllowColumns({
+    const updatedAllowColumns = {
       ...allowColumns,
       [type]: { ..._column, visable: !_column?.visable }
-    })
+    }
+    setAllowColumns(updatedAllowColumns)
+    if (type === 'externalId') {
+      saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)))
+    }
   }
 
   const handleClickOrder = (order, e) => {

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

@@ -214,10 +214,11 @@ export const BusinessDeliveryZoneInformation = (props) => {
                 disabled={!isMyZone}
                 placeholder={`1 - 99 ${configState?.configs?.distance_unit?.value}`}
                 name='distance'
-                maxLength={2}
                 value={formState.changes?.data?.distance ?? zone?.data?.distance ?? ''}
                 onInput={(e) => {
-                  e.target.value = e.target.value.match(`^[${e.target.value === '0' ? '1' : '0'}-9]{1,2}$`)
+                  e.target.value = (Number(e.target.value) > 99 || e.target.value === '.' || (e.target.value.match(/\./g) || []).length > 1)
+                    ? e.target.value.slice(0, -1)
+                    : e.target.value.match(`^[${e.target.value === '0' ? '1' : '0'}-9/.]{1,9}$`)
                 }}
                 onChange={e => handleChangeInput(e, configState?.configs?.distance_unit?.value)}
                 ref={register({

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

@@ -27,6 +27,7 @@ import {
   BarContainer
 } from './styles'
 import { BusinessSalesChannel } from '../BusinessSalesChannel'
+import { BusinessQRCodeOptions } from '../BusinessQRCodeOptions'
 
 export const BusinessDetailsUI = (props) => {
   const {
@@ -305,6 +306,12 @@ export const BusinessDetailsUI = (props) => {
               setIsExtendExtraOpen={setIsExtendExtraOpen}
             />
           )} */}
+          {selectedItem === 'publishing' && isAdmin && (
+            <BusinessQRCodeOptions
+              business={businessState?.business}
+              setIsExtendExtraOpen={setIsExtendExtraOpen}
+            />
+          )}
           {selectedItem === 'sales_channels' && (
             <BusinessSalesChannel
               business={businessState?.business}