ordering-ui-admin-external 1.35.6 → 1.36.0

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

@@ -144,6 +144,7 @@ var ImporterFormUI = function ImporterFormUI(props) {
     document.getElementById('meta-field-form').reset();
   };
   var handleSelectOption = function handleSelectOption(val) {
+    if (!val) return;
     setImportType(val);
   };
   var closeAlert = function closeAlert() {
@@ -421,7 +422,7 @@ var ImporterFormUI = function ImporterFormUI(props) {
     disabled: formState.loading,
     autoComplete: "off",
     value: (mappingState === null || mappingState === void 0 ? void 0 : mappingState['external_extra_option_suboption_id']) || ''
-  })))))), !isAdvanedOptions && importType !== 8 && /*#__PURE__*/_react.default.createElement(_styles2.FiledListWrapper, {
+  })))))), importType !== 8 && /*#__PURE__*/_react.default.createElement(_styles2.FiledListWrapper, {
     disabled: isDefaultImporter
   }, /*#__PURE__*/_react.default.createElement("label", null, t('FIELDS', 'Fields')), Object.keys(fieldList).length > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Object.entries(fieldList).map(function (value, i) {
     return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Row, {

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

@@ -38,18 +38,21 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 PaymentOption = function PaymentOption(props) {
-  var _sitesState$sites, _localState$sites, _businessPaymethod$si, _businessPaymethod$pa2, _businessPaymethod$pa3, _sitesState$sites4, _sitesState$sites5;
+  var _sitesState$sites, _localState$sites, _businessPaymethod$si, _businessPaymethod$pa2, _businessPaymethod$pa3, _sitesState$sites4, _sitesState$sites5, _deviceState$devices, _deviceState$devices2;
   var open = props.open,
     onClose = props.onClose,
     orderTypes = props.orderTypes,
     sitesState = props.sitesState,
+    deviceState = props.deviceState,
     changesState = props.changesState,
     handleChangeBusinessPaymentState = props.handleChangeBusinessPaymentState,
     cleanChangesState = props.cleanChangesState,
     actionState = props.actionState,
     handleSaveClick = props.handleSaveClick,
     businessPaymethod = props.businessPaymethod,
-    handleDeletePaymethod = props.handleDeletePaymethod;
+    handleDeletePaymethod = props.handleDeletePaymethod,
+    selectedPaymethodGateway = props.selectedPaymethodGateway;
+  var allowDevicesPaymethods = ['cash', 'card_delivery'];
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -75,7 +78,8 @@ var PaymentOption = function PaymentOption(props) {
     setConfirm = _useState6[1];
   var _useState7 = (0, _react.useState)({
       allowed_order_types: businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.allowed_order_types,
-      sites: businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.sites
+      sites: businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.sites,
+      devices: businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.devices
     }),
     _useState8 = _slicedToArray(_useState7, 2),
     localState = _useState8[0],
@@ -157,8 +161,9 @@ var PaymentOption = function PaymentOption(props) {
     var changes = {};
     if (changesState !== null && changesState !== void 0 && changesState.allowed_order_types) changes.allowed_order_types = changesState === null || changesState === void 0 ? void 0 : changesState.allowed_order_types;
     if (changesState !== null && changesState !== void 0 && changesState.sites) changes.sites = changesState === null || changesState === void 0 ? void 0 : changesState.sites;
+    if (changesState !== null && changesState !== void 0 && changesState.devices && allowDevicesPaymethods.includes(selectedPaymethodGateway)) changes.devices = changesState === null || changesState === void 0 ? void 0 : changesState.devices;
     if (Object.keys(changes).length > 0) setLocalState(JSON.parse(JSON.stringify(changes)));
-  }, [changesState === null || changesState === void 0 ? void 0 : changesState.allowed_order_types, changesState === null || changesState === void 0 ? void 0 : changesState.sites]);
+  }, [changesState === null || changesState === void 0 ? void 0 : changesState.allowed_order_types, changesState === null || changesState === void 0 ? void 0 : changesState.sites, changesState === null || changesState === void 0 ? void 0 : changesState.devices]);
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setPaymentTabs(tab);
     if (!isInitialRender) {
@@ -200,7 +205,12 @@ var PaymentOption = function PaymentOption(props) {
     onClick: function onClick() {
       return handleTabClick(1);
     }
-  }, t('ORDER_TYPE', 'Order type'))), paymentTabs === 0 && (sitesState === null || sitesState === void 0 || (_sitesState$sites5 = sitesState.sites) === null || _sitesState$sites5 === void 0 ? void 0 : _sitesState$sites5.length) > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles3.TabOption, {
+  }, t('ORDER_TYPE', 'Order type')), allowDevicesPaymethods.includes(selectedPaymethodGateway) && /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
+    active: paymentTabs === 2,
+    onClick: function onClick() {
+      return handleTabClick(2);
+    }
+  }, t('DEVICES', 'Devices'))), paymentTabs === 0 && (sitesState === null || sitesState === void 0 || (_sitesState$sites5 = sitesState.sites) === null || _sitesState$sites5 === void 0 ? void 0 : _sitesState$sites5.length) > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles3.TabOption, {
     key: "all",
     onClick: function onClick() {
       return setPaymethodInfo({
@@ -238,7 +248,22 @@ var PaymentOption = function PaymentOption(props) {
     }, (_ref3 = (_localState$allowed_o = localState === null || localState === void 0 ? void 0 : localState.allowed_order_types) !== null && _localState$allowed_o !== void 0 ? _localState$allowed_o : businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.allowed_order_types) !== null && _ref3 !== void 0 && _ref3.includes(type.value) ? /*#__PURE__*/_react.default.createElement(_RiCheckboxFill.default, {
       className: "fill"
     }) : /*#__PURE__*/_react.default.createElement(_RiCheckboxBlankLine.default, null), /*#__PURE__*/_react.default.createElement(_styles3.TabOptionName, null, type.text));
-  }), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  }), paymentTabs === 2 && allowDevicesPaymethods.includes(selectedPaymethodGateway) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (deviceState === null || deviceState === void 0 || (_deviceState$devices = deviceState.devices) === null || _deviceState$devices === void 0 ? void 0 : _deviceState$devices.length) > 0 && (deviceState === null || deviceState === void 0 ? void 0 : deviceState.devices.map(function (device) {
+    var _ref4, _localState$devices, _businessPaymethod$de;
+    return /*#__PURE__*/_react.default.createElement(_styles3.TabOption, {
+      key: device.id,
+      onClick: function onClick() {
+        return setPaymethodInfo({
+          key: 'devices',
+          value: device.id
+        });
+      }
+    }, (_ref4 = (_localState$devices = localState === null || localState === void 0 ? void 0 : localState.devices) !== null && _localState$devices !== void 0 ? _localState$devices : businessPaymethod === null || businessPaymethod === void 0 || (_businessPaymethod$de = businessPaymethod.devices) === null || _businessPaymethod$de === void 0 ? void 0 : _businessPaymethod$de.map(function (s) {
+      return s.id;
+    })) !== null && _ref4 !== void 0 && _ref4.includes(device.id) ? /*#__PURE__*/_react.default.createElement(_RiCheckboxFill.default, {
+      className: "fill"
+    }) : /*#__PURE__*/_react.default.createElement(_RiCheckboxBlankLine.default, null), /*#__PURE__*/_react.default.createElement(_styles3.TabOptionName, null, device.name));
+  })), (deviceState === null || deviceState === void 0 || (_deviceState$devices2 = deviceState.devices) === null || _deviceState$devices2 === void 0 ? void 0 : _deviceState$devices2.length) === 0 && /*#__PURE__*/_react.default.createElement(_styles3.EmptyMessage, null, t('NO_ASSIGNED_DEVICES', 'There are no assigned devices'))), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "5px",
     color: "primary",
     disabled: actionState.loading || Object.keys(changesState).length === 0,

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

@@ -4,10 +4,10 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TabOptionName = exports.TabOption = exports.Header = exports.Container = exports.CloseButton = exports.ActionSelectorWrapper = void 0;
+exports.TabOptionName = exports.TabOption = exports.Header = exports.EmptyMessage = exports.Container = exports.CloseButton = exports.ActionSelectorWrapper = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _polished = require("polished");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
 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) } })); }
@@ -55,4 +55,6 @@ var TabOptionName = _styledComponents.default.span(_templateObject9 || (_templat
   var _props$theme2;
   return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n    margin-right: 10px;\n  "]))) : (0, _styledComponents.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n    margin-left: 10px;\n  "])));
 });
-exports.TabOptionName = TabOptionName;
+exports.TabOptionName = TabOptionName;
+var EmptyMessage = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  padding: 15px 0;\n"])));
+exports.EmptyMessage = EmptyMessage;

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

@@ -40,7 +40,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 PaymentOptionSquareUI = function PaymentOptionSquareUI(props) {
-  var _businessPaymethod$pa2, _businessPaymethod$pa3, _sitesState$sites, _ref2, _squareData$sandbox, _ref3, _squareData$data$appl, _squareData$data, _businessPaymethod$da, _ref4, _squareData$data$loca, _squareData$data2, _businessPaymethod$da2, _ref5, _squareData$data$clie, _squareData$data3, _businessPaymethod$da3, _ref6, _squareData$data_sand, _squareData$data_sand2, _businessPaymethod$da4, _ref7, _squareData$data_sand3, _squareData$data_sand4, _businessPaymethod$da5, _ref8, _squareData$data_sand5, _squareData$data_sand6, _businessPaymethod$da6, _sitesState$sites2;
+  var _businessPaymethod$pa2, _businessPaymethod$pa3, _sitesState$sites, _ref2, _squareData$sandbox, _ref3, _squareData$data$appl, _squareData$data, _businessPaymethod$da, _ref4, _squareData$data$loca, _squareData$data2, _businessPaymethod$da2, _ref5, _squareData$data$clie, _squareData$data3, _businessPaymethod$da3, _ref6, _squareData$data_sand, _squareData$data_sand2, _businessPaymethod$da4, _ref7, _squareData$data_sand3, _squareData$data_sand4, _businessPaymethod$da5, _ref8, _squareData$data_sand5, _squareData$data_sand6, _businessPaymethod$da6, _sitesState$sites2, _deviceState$devices, _deviceState$devices2;
   var open = props.open,
     onClose = props.onClose,
     businessPaymethod = props.businessPaymethod,
@@ -55,7 +55,9 @@ var PaymentOptionSquareUI = function PaymentOptionSquareUI(props) {
     handleSavePaymethod = props.handleSavePaymethod,
     handleChangeDataInput = props.handleChangeDataInput,
     handleChangeSanboxDataInput = props.handleChangeSanboxDataInput,
-    handleChangeSandbox = props.handleChangeSandbox;
+    handleChangeSandbox = props.handleChangeSandbox,
+    deviceState = props.deviceState,
+    EmptyMessage = props.EmptyMessage;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -183,7 +185,12 @@ var PaymentOptionSquareUI = function PaymentOptionSquareUI(props) {
     onClick: function onClick() {
       return handleTabClick(2);
     }
-  }, t('ORDER_TYPE', 'Order type'))), paymentTabs === 0 && /*#__PURE__*/_react.default.createElement(_styles4.SquareInfoContainer, null, /*#__PURE__*/_react.default.createElement(_styles4.SquareButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  }, t('ORDER_TYPE', 'Order type')), /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
+    active: paymentTabs === 3,
+    onClick: function onClick() {
+      return handleTabClick(3);
+    }
+  }, t('DEVICES', 'Devices'))), paymentTabs === 0 && /*#__PURE__*/_react.default.createElement(_styles4.SquareInfoContainer, null, /*#__PURE__*/_react.default.createElement(_styles4.SquareButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "primary",
     onClick: handleConnectSquare
@@ -256,7 +263,22 @@ var PaymentOptionSquareUI = function PaymentOptionSquareUI(props) {
     }, (_ref10 = (_changesState$allowed = changesState === null || changesState === void 0 ? void 0 : changesState.allowed_order_types) !== null && _changesState$allowed !== void 0 ? _changesState$allowed : businessPaymethod === null || businessPaymethod === void 0 ? void 0 : businessPaymethod.allowed_order_types) !== null && _ref10 !== void 0 && _ref10.includes(type.value) ? /*#__PURE__*/_react.default.createElement(_RiCheckboxFill.default, {
       className: "fill"
     }) : /*#__PURE__*/_react.default.createElement(_RiCheckboxBlankLine.default, null), /*#__PURE__*/_react.default.createElement(_styles3.TabOptionName, null, type.text));
-  }), /*#__PURE__*/_react.default.createElement(_Shared.Confirm, {
+  }), paymentTabs === 3 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (deviceState === null || deviceState === void 0 || (_deviceState$devices = deviceState.devices) === null || _deviceState$devices === void 0 ? void 0 : _deviceState$devices.length) > 0 && (deviceState === null || deviceState === void 0 ? void 0 : deviceState.devices.map(function (device) {
+    var _ref11, _changesState$devices, _businessPaymethod$de;
+    return /*#__PURE__*/_react.default.createElement(_styles3.TabOption, {
+      key: device.id,
+      onClick: function onClick() {
+        return setPaymethodInfo({
+          key: 'devices',
+          value: device.id
+        });
+      }
+    }, (_ref11 = (_changesState$devices = changesState === null || changesState === void 0 ? void 0 : changesState.devices) !== null && _changesState$devices !== void 0 ? _changesState$devices : businessPaymethod === null || businessPaymethod === void 0 || (_businessPaymethod$de = businessPaymethod.devices) === null || _businessPaymethod$de === void 0 ? void 0 : _businessPaymethod$de.map(function (s) {
+      return s.id;
+    })) !== null && _ref11 !== void 0 && _ref11.includes(device.id) ? /*#__PURE__*/_react.default.createElement(_RiCheckboxFill.default, {
+      className: "fill"
+    }) : /*#__PURE__*/_react.default.createElement(_RiCheckboxBlankLine.default, null), /*#__PURE__*/_react.default.createElement(_styles3.TabOptionName, null, device.name));
+  })), (deviceState === null || deviceState === void 0 || (_deviceState$devices2 = deviceState.devices) === null || _deviceState$devices2 === void 0 ? void 0 : _deviceState$devices2.length) === 0 && /*#__PURE__*/_react.default.createElement(EmptyMessage, null, t('NO_ASSIGNED_DEVICES', 'There are no assigned devices'))), /*#__PURE__*/_react.default.createElement(_Shared.Confirm, {
     width: "700px",
     title: t('WEB_APPNAME', 'Ordering'),
     content: confirm.content,

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

@@ -4,10 +4,10 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SquareInfoContainer = exports.SquareButtonWrapper = exports.SandboxWrapper = exports.Header = exports.FormController = exports.FormContainer = exports.Container = exports.CloseButton = exports.ActionSelectorWrapper = void 0;
+exports.SquareInfoContainer = exports.SquareButtonWrapper = exports.SandboxWrapper = exports.Header = exports.FormController = exports.FormContainer = exports.EmptyMessage = exports.Container = exports.CloseButton = exports.ActionSelectorWrapper = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _polished = require("polished");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16;
 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) } })); }
@@ -59,4 +59,6 @@ var SandboxWrapper = _styledComponents.default.div(_templateObject13 || (_templa
   var _props$theme3;
   return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n      margin-right: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n      margin-left: 10px;\n    "])));
 });
-exports.SandboxWrapper = SandboxWrapper;
+exports.SandboxWrapper = SandboxWrapper;
+var EmptyMessage = _styledComponents.default.div(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  padding: 15px 0;\n"])));
+exports.EmptyMessage = EmptyMessage;

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

@@ -268,7 +268,7 @@ var ProductDetailsAdvancedUI = function ProductDetailsAdvancedUI(props) {
     }
     if (formState !== null && formState !== void 0 && (_formState$changes2 = formState.changes) !== null && _formState$changes2 !== void 0 && _formState$changes2.minimum_per_order && formState !== null && formState !== void 0 && (_formState$changes3 = formState.changes) !== null && _formState$changes3 !== void 0 && _formState$changes3.maximum_per_order && !((formState === null || formState === void 0 || (_formState$changes4 = formState.changes) === null || _formState$changes4 === void 0 ? void 0 : _formState$changes4.maximum_per_order) === null || (formState === null || formState === void 0 || (_formState$changes5 = formState.changes) === null || _formState$changes5 === void 0 ? void 0 : _formState$changes5.maximum_per_order) === '0')) {
       var _formState$changes6, _formState$changes7;
-      if (Number(formState === null || formState === void 0 || (_formState$changes6 = formState.changes) === null || _formState$changes6 === void 0 ? void 0 : _formState$changes6.minimum_per_order) >= Number(formState === null || formState === void 0 || (_formState$changes7 = formState.changes) === null || _formState$changes7 === void 0 ? void 0 : _formState$changes7.maximum_per_order)) {
+      if (Number(formState === null || formState === void 0 || (_formState$changes6 = formState.changes) === null || _formState$changes6 === void 0 ? void 0 : _formState$changes6.minimum_per_order) > Number(formState === null || formState === void 0 || (_formState$changes7 = formState.changes) === null || _formState$changes7 === void 0 ? void 0 : _formState$changes7.maximum_per_order)) {
         valid = false;
         setAlertState({
           open: true,

package/_modules/index.js

@@ -639,12 +639,6 @@ Object.defineProperty(exports, "CampaignDetail", {
     return _Marketing.CampaignDetail;
   }
 });
-Object.defineProperty(exports, "CampaignDetailContent", {
-  enumerable: true,
-  get: function get() {
-    return _Marketing.CampaignDetailContent;
-  }
-});
 Object.defineProperty(exports, "CampaignDetailGeneral", {
   enumerable: true,
   get: function get() {

package/index-template.js

@@ -298,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.8',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.9',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [

package/package.json

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

package/src/components/BusinessIntelligence/AnalyticsAvailableTimes/index.js

@@ -13,6 +13,7 @@ import { Bar } from 'react-chartjs-2'
 import Skeleton from 'react-loading-skeleton'
 import moment from 'moment'
 import { Modal } from '../../Shared'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsAvailableTimes = (props) => {
   const {
@@ -193,7 +194,10 @@ export const AnalyticsAvailableTimes = (props) => {
         </ChartHeaderContainer>
         {
           availableTimesList?.loading ? (
-            <Skeleton height={150} />
+            <div>
+              <Skeleton height={150} />
+              <GraphLoadingMessage />
+            </div>
           ) : (
             (availableTimesList?.data?.available?.length > 0 || availableTimesList?.data?.not_available?.length > 0) ? (
               <BarChartWrapper>

package/src/components/BusinessIntelligence/AnalyticsBusyTimes/index.js

@@ -13,6 +13,7 @@ import {
   BarChartWrapper,
   EmptyContent
 } from './styles'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsBusyTimes = (props) => {
   const {
@@ -193,7 +194,10 @@ export const AnalyticsBusyTimes = (props) => {
         </ChartHeaderContainer>
         {
           busyTimesList?.loading ? (
-            <Skeleton height={150} />
+            <div>
+              <Skeleton height={150} />
+              <GraphLoadingMessage />
+            </div>
           ) : (
             (busyTimesList?.data?.busy?.length > 0 || busyTimesList?.data?.not_busy?.length > 0) ? (
               <BarChartWrapper>

package/src/components/BusinessIntelligence/AnalyticsCustomerSatisfaction/index.js

@@ -15,6 +15,7 @@ import {
   EmptyContent,
   CustomerSatisfactionContent
 } from './styles'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 const Score = ({ star, text }) => (
   <ScoreDiv>
@@ -83,6 +84,7 @@ export const AnalyticsCustomerSatisfaction = (props) => {
                 </div>
               ))
             }
+            <GraphLoadingMessage />
           </SkeletonContainerWrapper>
         ) : (
           <CustomerSatisfactionWrapper>

package/src/components/BusinessIntelligence/AnalyticsDriverOrders/index.js

@@ -15,6 +15,7 @@ import {
   ChartFooterContainer,
   EmptyContent
 } from './styles'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsDriverOrders = (props) => {
   const {
@@ -175,7 +176,10 @@ export const AnalyticsDriverOrders = (props) => {
         <ChartContentWrapper>
           {
             chartDataList?.loading ? (
-              <Skeleton height={150} />
+              <div>
+                <Skeleton height={150} />
+                <GraphLoadingMessage />
+              </div>
             ) : (
               ((isOrders ? chartDataList?.data?.dataset?.dataset?.data : chartDataList?.data?.dataset?.dataset[0]?.data)?.length > 0 && dataOptions) ? <Line data={dataOptions} options={options} ref={chartRef} /> : <EmptyContent>{t('NO_DATA', 'No Data')}</EmptyContent>
             )

package/src/components/BusinessIntelligence/AnalyticsOrdersAcceptSpend/index.js

@@ -12,6 +12,7 @@ import {
 } from './styles'
 import Skeleton from 'react-loading-skeleton'
 import { convertHMS } from '../../../utils'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsOrdersAcceptSpend = (props) => {
   const {
@@ -36,6 +37,7 @@ export const AnalyticsOrdersAcceptSpend = (props) => {
               <Skeleton width={80} height={80} />
               <Skeleton width={60} height={20} />
             </ReviewContentWrapper>
+            <GraphLoadingMessage />
           </OrdersAcceptSpendContent>
         ) : (
           dataList?.data ? (

package/src/components/BusinessIntelligence/AnalyticsOrdersOrSales/index.js

@@ -14,6 +14,7 @@ import { Line } from 'react-chartjs-2'
 import { useLanguage, useUtils } from 'ordering-components-admin-external'
 import Skeleton from 'react-loading-skeleton'
 import { Modal } from '../../Shared'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsOrdersOrSales = (props) => {
   const {
@@ -143,7 +144,10 @@ export const AnalyticsOrdersOrSales = (props) => {
         <ChartContentWrapper>
           {
             chartDataList?.loading ? (
-              <Skeleton height={150} />
+              <div>
+                <Skeleton height={150} />
+                <GraphLoadingMessage />
+              </div>
             ) : (
               (chartDataList?.data.length > 0 && dataOptions) ? <Line data={dataOptions} options={options} ref={chartRef} /> : <EmptyContent>{t('NO_DATA', 'No Data')}</EmptyContent>
             )

package/src/components/BusinessIntelligence/AnalyticsOrdersStatus/index.js

@@ -11,6 +11,7 @@ import {
 import BsDownload from '@meronex/icons/bs/BsDownload'
 import { Bar } from 'react-chartjs-2'
 import Skeleton from 'react-loading-skeleton'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsOrdersStatus = (props) => {
   const {
@@ -160,7 +161,10 @@ export const AnalyticsOrdersStatus = (props) => {
       </OrderStatusHeader>
       {
         orderStatusList?.loading ? (
-          <Skeleton height={150} />
+          <div>
+            <Skeleton height={150} />
+            <GraphLoadingMessage />
+          </div>
         ) : (
           orderStatusList?.data.length > 0 ? (
             <BarChartWrapper>

package/src/components/BusinessIntelligence/AnalyticsProductCategories/index.js

@@ -13,6 +13,7 @@ import {
 } from './styles'
 import BsDownload from '@meronex/icons/bs/BsDownload'
 import Skeleton from 'react-loading-skeleton'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsProductCategories = (props) => {
   const {
@@ -63,6 +64,7 @@ export const AnalyticsProductCategories = (props) => {
                 </div>
               ))
             }
+            <GraphLoadingMessage />
           </SkeletonContainerWrapper>
         ) : (
           <ProductCategoryContentWrapper>

package/src/components/BusinessIntelligence/AnalyticsRegisterUsers/index.js

@@ -14,6 +14,7 @@ import { useLanguage } from 'ordering-components-admin-external'
 import Skeleton from 'react-loading-skeleton'
 import moment from 'moment'
 import { Modal } from '../../Shared'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsRegisterUsers = (props) => {
   const {
@@ -205,7 +206,10 @@ export const AnalyticsRegisterUsers = (props) => {
         <RegisterUserChartWrapper>
           {
             registerUsersList?.loading ? (
-              <Skeleton height={150} />
+              <div>
+                <Skeleton height={150} />
+                <GraphLoadingMessage />
+              </div>
             ) : (
               registerUsersList?.data?.length > 0 ? (
                 <Line data={defaultData} options={options} ref={chartRef} />

package/src/components/BusinessIntelligence/AnalyticsSpendList/index.js

@@ -12,6 +12,7 @@ import {
 } from './styles'
 import Skeleton from 'react-loading-skeleton'
 import { convertHMS } from '../../../utils'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsSpendList = (props) => {
   const {
@@ -37,6 +38,7 @@ export const AnalyticsSpendList = (props) => {
               <Skeleton width={80} height={80} />
               <Skeleton width={80} height={20} />
             </ReviewContentWrapper>
+            <GraphLoadingMessage />
           </AnalyticsSpendListContent>
         ) : (
           dataList?.data ? (

package/src/components/BusinessIntelligence/AnalyticsSpendTimes/index.js

@@ -14,6 +14,7 @@ import { Line } from 'react-chartjs-2'
 import { useLanguage } from 'ordering-components-admin-external'
 import Skeleton from 'react-loading-skeleton'
 import { Modal } from '../../Shared'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsSpendTimes = (props) => {
   const {
@@ -276,7 +277,10 @@ export const AnalyticsSpendTimes = (props) => {
         <ChartContentWrapper>
           {
             chartDataList?.loading ? (
-              <Skeleton height={150} />
+              <div>
+                <Skeleton height={150} />
+                <GraphLoadingMessage />
+              </div>
             ) : (
               chartDataList?.data.length > 0 ? <Line data={defaultData} options={options} ref={chartRef} /> : <EmptyContent>{t('NO_DATA', 'No Data')}</EmptyContent>
             )

package/src/components/BusinessIntelligence/AnalyticsTopOrders/index.js

@@ -15,6 +15,7 @@ import {
 } from './styles'
 import BsDownload from '@meronex/icons/bs/BsDownload'
 import Skeleton from 'react-loading-skeleton'
+import { GraphLoadingMessage } from '../GraphLoadingMessage'
 
 export const AnalyticsTopOrders = (props) => {
   const {
@@ -60,6 +61,7 @@ export const AnalyticsTopOrders = (props) => {
                 </div>
               ))
             }
+            <GraphLoadingMessage />
           </SkeletonContainerWrapper>
         ) : (
           <TopOrdersContainerWrapper>

package/src/components/BusinessIntelligence/DriverAnalytics/index.js

@@ -202,7 +202,7 @@ const DriverAnalyticsUI = (props) => {
         </div>
         <div className='col-md-12 col-lg-6'>
           <AnalyticsSpendList
-            title={t('ORDER_COMPLETE_SPEND', 'Time spent since order accepted to pickup and deliver the order')}
+            title={t('ARRIVED_PICKUP_SPEND', 'Time spend since the driver in business until he picks up the order')}
             dataList={arrivedPickUpSpendList}
           />
         </div>

package/src/components/BusinessIntelligence/GraphLoadingMessage/index.js

@@ -0,0 +1,15 @@
+import React from 'react'
+import { useLanguage } from 'ordering-components-admin-external'
+import CgSpinnerTwoAlt from '@meronex/icons/cg/CgSpinnerTwoAlt'
+import { LoadingMessage } from './styles'
+
+export const GraphLoadingMessage = () => {
+  const [, t] = useLanguage()
+
+  return (
+    <LoadingMessage>
+      <CgSpinnerTwoAlt />
+      {t('WAIT_WHILE_LOADING_ALL_INFORMATION', 'please wait while we load all the information')}
+    </LoadingMessage>
+  )
+}

package/src/components/BusinessIntelligence/GraphLoadingMessage/styles.js

@@ -0,0 +1,20 @@
+import styled from 'styled-components'
+
+export const LoadingMessage = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  color: ${props => props.theme.colors.lightGray};
+  margin-top: 10px;
+
+  @keyframes spinner-content {
+    0% { transform: rotate(0) }
+    100% { transform: rotate(360deg) }
+  }
+
+  svg {
+    margin: 0 5px;
+    animation: spinner-content 1.85s linear infinite;
+  }
+`

package/src/components/Home/HomePage/index.js

@@ -45,7 +45,8 @@ import {
   OrderingButtonWrapper,
   OrderingButtonBlock,
   CloseButtonWrapper,
-  HubspotFormWrapper
+  HubspotFormWrapper,
+  OnboardingLessonsContainer
 } from './styles'
 
 const HomeUI = (props) => {
@@ -96,6 +97,9 @@ const HomeUI = (props) => {
     if (location === 'canny') {
       window.open('https://feedback.ordering.co', '_blank')
     }
+    if (location === 'onboarding') {
+      window.open(`https://calendly.com/luisana/group-onboarding-conference?month=${moment().format('YYYY-MM')}`, '_blank')
+    }
   }
 
   const generateData = () => {
@@ -378,6 +382,13 @@ const HomeUI = (props) => {
                 </WidgeBlock>
               </AssistanceBody>
             </AssistanceWidgets>
+            {!isEnabledWhiteLabelModule && (
+              <OnboardingLessonsContainer>
+                <h1>{t('ONBOARDING_LESSONS', 'On-boarding Lessons')}</h1>
+                <p>{t('BOOK_TRAINING_TOTDAY', 'Book your training today')}</p>
+                <Button outline color='primary' onClick={() => goToLink('onboarding')}>{t('SCHEDULE_TODAY', 'Schedule Today')}</Button>
+              </OnboardingLessonsContainer>
+            )}
           </>
         )}
         {sessionState?.user?.level === 0 && (

package/src/components/Home/HomePage/styles.js

@@ -587,3 +587,32 @@ export const HubspotFormWrapper = styled.div`
   min-height: 445px;
   position: relative;
 `
+
+export const OnboardingLessonsContainer = styled.div`
+  background-color: ${props => props.theme.colors.lightPrimary};
+  padding: 50px 15px;
+  margin: 20px 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  h1 {
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 36px;
+    text-align: center;
+  }
+  p {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    text-align: center;
+    margin: 8px 0 17px 0;
+  }
+  button {
+    border-radius: 7.6px;
+    padding: 10px;
+    line-height: 20px;
+    min-width: 216px;
+  }
+`