npm - ordering-ui-admin-external - Versions diffs - 1.17.0 → 1.19.0 - Mend

ordering-ui-admin-external 1.17.0 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (87) hide show

package/_modules/components/MyProducts/AppResources/index.js ADDED Viewed

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AppResources = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
+var _styles = require("../AdvancedSettings/styles");
+var _ImageBox = require("../AdvancedSettings/ImageBox");
+var _styles2 = require("./styles");
+var _styles3 = require("../../../styles");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 AppResources = function AppResources(props) {
+  var _advancedValues$andro, _advancedValues$andro2, _advancedValues$andro3, _advancedValues$andro4, _advancedValues$andro5, _advancedValues$andro6, _advancedValues$andro7, _advancedValues$andro8, _advancedValues$andro9, _advancedValues$andro10, _advancedValues$andro11, _advancedValues$andro12, _advancedValues$andro13, _advancedValues$andro14, _advancedValues$andro15, _advancedValues$andro16, _advancedValues$andro17, _advancedValues$andro18, _advancedValues$andro19, _advancedValues$andro20, _advancedValues$andro21, _advancedValues$andro22, _advancedValues$andro23, _advancedValues$andro24, _advancedValues$andro25, _advancedValues$andro26, _advancedValues$andro27, _advancedValues$andro28, _advancedValues$andro29, _advancedValues$andro30, _advancedValues$andro31, _advancedValues$andro32, _advancedValues$andro33, _advancedValues$andro34, _advancedValues$andro35, _advancedValues$andro36, _advancedValues$andro37, _advancedValues$andro38, _advancedValues$andro39, _advancedValues$andro40, _advancedValues$ios, _advancedValues$ios$c, _advancedValues$ios$c2, _advancedValues$ios$c3, _advancedValues$ios$c4, _advancedValues$ios2, _advancedValues$ios2$, _advancedValues$ios2$2, _advancedValues$ios2$3, _advancedValues$ios2$4, _advancedValues$ios3, _advancedValues$ios3$, _advancedValues$ios3$2, _advancedValues$ios3$3, _advancedValues$ios3$4, _advancedValues$ios4, _advancedValues$ios4$, _advancedValues$ios4$2, _advancedValues$ios4$3, _advancedValues$ios4$4, _advancedValues$ios5, _advancedValues$ios5$, _advancedValues$ios5$2, _advancedValues$ios5$3, _advancedValues$ios5$4, _advancedValues$ios6, _advancedValues$ios6$, _advancedValues$ios6$2;
+  var handleUpdateSiteTheme = props.handleUpdateSiteTheme,
+    advancedValues = props.advancedValues,
+    setAdvancedValues = props.setAdvancedValues;
+  var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
+    _useLanguage2 = _slicedToArray(_useLanguage, 2),
+    t = _useLanguage2[1];
+  var updateObject = function updateObject(object, newValue, path) {
+    var stack = path.split('.');
+    while (stack.length > 1) {
+      object = object[stack.shift()];
+    }
+    object[stack.shift()] = newValue;
+  };
+  var handleUpdateThemeValue = function handleUpdateThemeValue(value, path) {
+    var _advancedValues = JSON.parse(JSON.stringify(advancedValues));
+    updateObject(_advancedValues, value, path);
+    setAdvancedValues(_advancedValues);
+  };
+  return /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles.BoxLayout, null, /*#__PURE__*/_react.default.createElement("h2", null, t('ANDROID_SPLASH', 'Android splash')), /*#__PURE__*/_react.default.createElement("h2", null, t('PORTRAIT', 'Portrait')), /*#__PURE__*/_react.default.createElement(_styles2.ImageGroup, null, /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "ldpi",
+    ratio: "200 x 320 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro = advancedValues.android) === null || _advancedValues$andro === void 0 ? void 0 : (_advancedValues$andro2 = _advancedValues$andro.components) === null || _advancedValues$andro2 === void 0 ? void 0 : (_advancedValues$andro3 = _advancedValues$andro2.portrait) === null || _advancedValues$andro3 === void 0 ? void 0 : (_advancedValues$andro4 = _advancedValues$andro3.dimensions) === null || _advancedValues$andro4 === void 0 ? void 0 : (_advancedValues$andro5 = _advancedValues$andro4.idpi) === null || _advancedValues$andro5 === void 0 ? void 0 : _advancedValues$andro5.image,
+    path: "android.components.portrait.dimensions.idpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xhdpi",
+    ratio: "720 x 1280 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro6 = advancedValues.android) === null || _advancedValues$andro6 === void 0 ? void 0 : (_advancedValues$andro7 = _advancedValues$andro6.components) === null || _advancedValues$andro7 === void 0 ? void 0 : (_advancedValues$andro8 = _advancedValues$andro7.portrait) === null || _advancedValues$andro8 === void 0 ? void 0 : (_advancedValues$andro9 = _advancedValues$andro8.dimensions) === null || _advancedValues$andro9 === void 0 ? void 0 : (_advancedValues$andro10 = _advancedValues$andro9.xhdpi) === null || _advancedValues$andro10 === void 0 ? void 0 : _advancedValues$andro10.image,
+    path: "android.components.portrait.dimensions.xhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xxhdpi/hdpi",
+    ratio: "960 x 1600 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro11 = advancedValues.android) === null || _advancedValues$andro11 === void 0 ? void 0 : (_advancedValues$andro12 = _advancedValues$andro11.components) === null || _advancedValues$andro12 === void 0 ? void 0 : (_advancedValues$andro13 = _advancedValues$andro12.portrait) === null || _advancedValues$andro13 === void 0 ? void 0 : (_advancedValues$andro14 = _advancedValues$andro13.dimensions) === null || _advancedValues$andro14 === void 0 ? void 0 : (_advancedValues$andro15 = _advancedValues$andro14.xxhdpi) === null || _advancedValues$andro15 === void 0 ? void 0 : _advancedValues$andro15.image,
+    path: "android.components.portrait.dimensions.xxhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xxxhdpi/mdpi",
+    ratio: "1280 x 1920 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro16 = advancedValues.android) === null || _advancedValues$andro16 === void 0 ? void 0 : (_advancedValues$andro17 = _advancedValues$andro16.components) === null || _advancedValues$andro17 === void 0 ? void 0 : (_advancedValues$andro18 = _advancedValues$andro17.portrait) === null || _advancedValues$andro18 === void 0 ? void 0 : (_advancedValues$andro19 = _advancedValues$andro18.dimensions) === null || _advancedValues$andro19 === void 0 ? void 0 : (_advancedValues$andro20 = _advancedValues$andro19.xxxhdpi) === null || _advancedValues$andro20 === void 0 ? void 0 : _advancedValues$andro20.image,
+    path: "android.components.portrait.dimensions.xxxhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  })), /*#__PURE__*/_react.default.createElement("h2", null, t('LANDSCAPE', 'Landscape')), /*#__PURE__*/_react.default.createElement(_styles2.ImageGroup, null, /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "ldpi",
+    ratio: "200 x 320 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro21 = advancedValues.android) === null || _advancedValues$andro21 === void 0 ? void 0 : (_advancedValues$andro22 = _advancedValues$andro21.components) === null || _advancedValues$andro22 === void 0 ? void 0 : (_advancedValues$andro23 = _advancedValues$andro22.landscape) === null || _advancedValues$andro23 === void 0 ? void 0 : (_advancedValues$andro24 = _advancedValues$andro23.dimensions) === null || _advancedValues$andro24 === void 0 ? void 0 : (_advancedValues$andro25 = _advancedValues$andro24.idpi) === null || _advancedValues$andro25 === void 0 ? void 0 : _advancedValues$andro25.image,
+    path: "android.components.landscape.dimensions.idpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xhdpi",
+    ratio: "720 x 1280 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro26 = advancedValues.android) === null || _advancedValues$andro26 === void 0 ? void 0 : (_advancedValues$andro27 = _advancedValues$andro26.components) === null || _advancedValues$andro27 === void 0 ? void 0 : (_advancedValues$andro28 = _advancedValues$andro27.landscape) === null || _advancedValues$andro28 === void 0 ? void 0 : (_advancedValues$andro29 = _advancedValues$andro28.dimensions) === null || _advancedValues$andro29 === void 0 ? void 0 : (_advancedValues$andro30 = _advancedValues$andro29.xhdpi) === null || _advancedValues$andro30 === void 0 ? void 0 : _advancedValues$andro30.image,
+    path: "android.components.landscape.dimensions.xhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xxhdpi/hdpi",
+    ratio: "960 x 1600 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro31 = advancedValues.android) === null || _advancedValues$andro31 === void 0 ? void 0 : (_advancedValues$andro32 = _advancedValues$andro31.components) === null || _advancedValues$andro32 === void 0 ? void 0 : (_advancedValues$andro33 = _advancedValues$andro32.landscape) === null || _advancedValues$andro33 === void 0 ? void 0 : (_advancedValues$andro34 = _advancedValues$andro33.dimensions) === null || _advancedValues$andro34 === void 0 ? void 0 : (_advancedValues$andro35 = _advancedValues$andro34.xxhdpi) === null || _advancedValues$andro35 === void 0 ? void 0 : _advancedValues$andro35.image,
+    path: "android.components.landscape.dimensions.xxhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "xxxhdpi/mdpi",
+    ratio: "1280 x 1920 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$andro36 = advancedValues.android) === null || _advancedValues$andro36 === void 0 ? void 0 : (_advancedValues$andro37 = _advancedValues$andro36.components) === null || _advancedValues$andro37 === void 0 ? void 0 : (_advancedValues$andro38 = _advancedValues$andro37.landscape) === null || _advancedValues$andro38 === void 0 ? void 0 : (_advancedValues$andro39 = _advancedValues$andro38.dimensions) === null || _advancedValues$andro39 === void 0 ? void 0 : (_advancedValues$andro40 = _advancedValues$andro39.xxxhdpi) === null || _advancedValues$andro40 === void 0 ? void 0 : _advancedValues$andro40.image,
+    path: "android.components.landscape.dimensions.xxxhdpi.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }))), /*#__PURE__*/_react.default.createElement(_styles.BoxLayout, null, /*#__PURE__*/_react.default.createElement("h2", null, t('iOS_SPLASH', 'iOS splash')), /*#__PURE__*/_react.default.createElement("h2", null, t('PORTRAIT', 'Portrait')), /*#__PURE__*/_react.default.createElement(_styles2.ImageGroup, null, /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "Ipad",
+    ratio: "1536 x 2048 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios = advancedValues.ios) === null || _advancedValues$ios === void 0 ? void 0 : (_advancedValues$ios$c = _advancedValues$ios.components) === null || _advancedValues$ios$c === void 0 ? void 0 : (_advancedValues$ios$c2 = _advancedValues$ios$c.portrait) === null || _advancedValues$ios$c2 === void 0 ? void 0 : (_advancedValues$ios$c3 = _advancedValues$ios$c2.dimensions) === null || _advancedValues$ios$c3 === void 0 ? void 0 : (_advancedValues$ios$c4 = _advancedValues$ios$c3.ipad) === null || _advancedValues$ios$c4 === void 0 ? void 0 : _advancedValues$ios$c4.image,
+    path: "ios.components.portrait.dimensions.ipad.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "Iphone 3/4",
+    ratio: "640 x 960 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios2 = advancedValues.ios) === null || _advancedValues$ios2 === void 0 ? void 0 : (_advancedValues$ios2$ = _advancedValues$ios2.components) === null || _advancedValues$ios2$ === void 0 ? void 0 : (_advancedValues$ios2$2 = _advancedValues$ios2$.portrait) === null || _advancedValues$ios2$2 === void 0 ? void 0 : (_advancedValues$ios2$3 = _advancedValues$ios2$2.dimensions) === null || _advancedValues$ios2$3 === void 0 ? void 0 : (_advancedValues$ios2$4 = _advancedValues$ios2$3.iphone) === null || _advancedValues$ios2$4 === void 0 ? void 0 : _advancedValues$ios2$4.image,
+    path: "ios.components.portrait.dimensions.iphone.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "Iphone 5/6 plus",
+    ratio: "640 x 960 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios3 = advancedValues.ios) === null || _advancedValues$ios3 === void 0 ? void 0 : (_advancedValues$ios3$ = _advancedValues$ios3.components) === null || _advancedValues$ios3$ === void 0 ? void 0 : (_advancedValues$ios3$2 = _advancedValues$ios3$.portrait) === null || _advancedValues$ios3$2 === void 0 ? void 0 : (_advancedValues$ios3$3 = _advancedValues$ios3$2.dimensions) === null || _advancedValues$ios3$3 === void 0 ? void 0 : (_advancedValues$ios3$4 = _advancedValues$ios3$3.iphone_plus) === null || _advancedValues$ios3$4 === void 0 ? void 0 : _advancedValues$ios3$4.image,
+    path: "ios.components.portrait.dimensions.iphone_plus.image",
+    handleChangePhoto: handleUpdateThemeValue
+  })), /*#__PURE__*/_react.default.createElement("h2", null, t('LANDSCAPE', 'Landscape')), /*#__PURE__*/_react.default.createElement(_styles2.ImageGroup, null, /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "Ipad",
+    ratio: "2048 x 1536 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios4 = advancedValues.ios) === null || _advancedValues$ios4 === void 0 ? void 0 : (_advancedValues$ios4$ = _advancedValues$ios4.components) === null || _advancedValues$ios4$ === void 0 ? void 0 : (_advancedValues$ios4$2 = _advancedValues$ios4$.landscape) === null || _advancedValues$ios4$2 === void 0 ? void 0 : (_advancedValues$ios4$3 = _advancedValues$ios4$2.dimensions) === null || _advancedValues$ios4$3 === void 0 ? void 0 : (_advancedValues$ios4$4 = _advancedValues$ios4$3.ipad) === null || _advancedValues$ios4$4 === void 0 ? void 0 : _advancedValues$ios4$4.image,
+    path: "ios.components.landscape.dimensions.ipad.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }), /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: "Iphone",
+    ratio: "2208 x 1242 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios5 = advancedValues.ios) === null || _advancedValues$ios5 === void 0 ? void 0 : (_advancedValues$ios5$ = _advancedValues$ios5.components) === null || _advancedValues$ios5$ === void 0 ? void 0 : (_advancedValues$ios5$2 = _advancedValues$ios5$.landscape) === null || _advancedValues$ios5$2 === void 0 ? void 0 : (_advancedValues$ios5$3 = _advancedValues$ios5$2.dimensions) === null || _advancedValues$ios5$3 === void 0 ? void 0 : (_advancedValues$ios5$4 = _advancedValues$ios5$3.iphone) === null || _advancedValues$ios5$4 === void 0 ? void 0 : _advancedValues$ios5$4.image,
+    path: "ios.components.landscape.dimensions.iphone.image",
+    handleChangePhoto: handleUpdateThemeValue
+  })), /*#__PURE__*/_react.default.createElement("h2", null, t('ANY', 'Any')), /*#__PURE__*/_react.default.createElement(_styles2.ImageGroup, null, /*#__PURE__*/_react.default.createElement(_ImageBox.ImageBox, {
+    title: t('ANY', 'Any'),
+    ratio: "2732 x 2732 px",
+    photo: advancedValues === null || advancedValues === void 0 ? void 0 : (_advancedValues$ios6 = advancedValues.ios) === null || _advancedValues$ios6 === void 0 ? void 0 : (_advancedValues$ios6$ = _advancedValues$ios6.components) === null || _advancedValues$ios6$ === void 0 ? void 0 : (_advancedValues$ios6$2 = _advancedValues$ios6$.any) === null || _advancedValues$ios6$2 === void 0 ? void 0 : _advancedValues$ios6$2.image,
+    path: "ios.components.any.image",
+    handleChangePhoto: handleUpdateThemeValue
+  }))), /*#__PURE__*/_react.default.createElement(_styles2.ButtonWrapper, null, /*#__PURE__*/_react.default.createElement(_styles3.Button, {
+    color: "primary",
+    borderRadius: "8px",
+    onClick: function onClick() {
+      return handleUpdateSiteTheme(advancedValues);
+    }
+  }, t('SAVE', 'Save'))));
+};
+exports.AppResources = AppResources;

package/_modules/components/MyProducts/OrderingWebsite/index.js CHANGED Viewed

@@ -33,7 +33,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 OrderingWebsiteUI = function OrderingWebsiteUI(props) {
-  var _themeValues$website_, _themeValues$website_2, _themeValues$website_3, _themeValues$website_4, _themeValues$website_5, _themeValues$website_6, _themeValues$images, _themeValues$images$c, _themeValues$images$c2, _themeValues$images$c3, _themeValues$images2, _themeValues$images2$, _themeValues$images2$2, _themeValues$images2$3, _themeValues$images3, _themeValues$images3$, _themeValues$images3$2, _themeValues$images3$3, _themeValues$images4, _themeValues$images4$, _themeValues$images4$2, _themeValues$images4$3, _themeValues$images5, _themeValues$images5$, _themeValues$images5$2, _themeValues$images5$3, _themeValues$images6, _themeValues$images6$, _themeValues$images6$2, _themeValues$images6$3, _themeValues$images7, _themeValues$images7$, _themeValues$images7$2, _themeValues$images7$3, _themeValues$images8, _themeValues$images8$, _themeValues$images8$2, _themeValues$images8$3, _themeValues$images9, _themeValues$images9$, _themeValues$images9$2, _themeValues$images9$3, _themeValues$images12, _themeValues$images13, _themeValues$theme_se, _themeValues$theme_se2, _themeValues$theme_se3, _themeValues$theme_se4, _themeValues$theme_se5, _themeValues$theme_se6, _themeValues$theme_se7, _themeValues$theme_se8, _themeValues$theme_se9;
+  var _themeValues$website_, _themeValues$website_2, _themeValues$website_3, _themeValues$website_4, _themeValues$website_5, _themeValues$website_6, _themeValues$website_7, _themeValues$website_8, _themeValues$website_9, _themeValues$website_10, _themeValues$website_11, _themeValues$website_12, _themeValues$website_13, _themeValues$website_14, _themeValues$website_15, _themeValues$website_16, _themeValues$website_17, _themeValues$website_18, _themeValues$website_19, _themeValues$website_20, _themeValues$images, _themeValues$images$c, _themeValues$images$c2, _themeValues$images$c3, _themeValues$images2, _themeValues$images2$, _themeValues$images2$2, _themeValues$images2$3, _themeValues$images3, _themeValues$images3$, _themeValues$images3$2, _themeValues$images3$3, _themeValues$images4, _themeValues$images4$, _themeValues$images4$2, _themeValues$images4$3, _themeValues$images5, _themeValues$images5$, _themeValues$images5$2, _themeValues$images5$3, _themeValues$images6, _themeValues$images6$, _themeValues$images6$2, _themeValues$images6$3, _themeValues$images7, _themeValues$images7$, _themeValues$images7$2, _themeValues$images7$3, _themeValues$images8, _themeValues$images8$, _themeValues$images8$2, _themeValues$images8$3, _themeValues$images9, _themeValues$images9$, _themeValues$images9$2, _themeValues$images9$3, _themeValues$images12, _themeValues$images13, _themeValues$theme_se, _themeValues$theme_se2, _themeValues$theme_se3, _themeValues$theme_se4, _themeValues$theme_se5, _themeValues$theme_se6, _themeValues$theme_se7, _themeValues$theme_se8, _themeValues$theme_se9;
   var themeValues = props.themeValues,
     orderingTheme = props.orderingTheme,
     setThemeValues = props.setThemeValues,
@@ -247,7 +247,52 @@ var OrderingWebsiteUI = function OrderingWebsiteUI(props) {
     onClick: function onClick() {
       return window.open('https://www.ordering.co/custom-domain-change', '_blank');
     }
-  }, t('REQUEST_CUSTOM_DOMAIN', 'Request custom domain'))))), /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement("h4", null, t('IMAGES', 'Images')), /*#__PURE__*/_react.default.createElement(_styles2.InnerBlock, null, orderingTheme !== null && orderingTheme !== void 0 && orderingTheme.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+  }, t('REQUEST_CUSTOM_DOMAIN', 'Request custom domain'))))), /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.InnerBlock, null, /*#__PURE__*/_react.default.createElement("h4", null, t('WEBSITE_THEME', 'Website Theme')), orderingTheme !== null && orderingTheme !== void 0 && orderingTheme.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+    height: 20,
+    width: 150
+  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.RadioItem, {
+    onClick: function onClick() {
+      return handleChangeValue('marketplace', 'website_theme', 'type');
+    }
+  }, (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_7 = themeValues.website_theme) === null || _themeValues$website_7 === void 0 ? void 0 : (_themeValues$website_8 = _themeValues$website_7.components) === null || _themeValues$website_8 === void 0 ? void 0 : _themeValues$website_8.type) === 'marketplace' ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.RecordCircleFill, {
+    className: "active"
+  }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Circle, null), /*#__PURE__*/_react.default.createElement("span", null, t('MARKETPLACE', 'Marketplace'))), /*#__PURE__*/_react.default.createElement(_styles2.RadioItem, {
+    onClick: function onClick() {
+      return handleChangeValue('franchise', 'website_theme', 'type');
+    }
+  }, (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_9 = themeValues.website_theme) === null || _themeValues$website_9 === void 0 ? void 0 : (_themeValues$website_10 = _themeValues$website_9.components) === null || _themeValues$website_10 === void 0 ? void 0 : _themeValues$website_10.type) === 'franchise' ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.RecordCircleFill, {
+    className: "active"
+  }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Circle, null), /*#__PURE__*/_react.default.createElement("span", null, t('REPORT_HEADER_FRANCHISES', 'Franchise'))), (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_11 = themeValues.website_theme) === null || _themeValues$website_11 === void 0 ? void 0 : (_themeValues$website_12 = _themeValues$website_11.components) === null || _themeValues$website_12 === void 0 ? void 0 : _themeValues$website_12.type) === 'franchise' && /*#__PURE__*/_react.default.createElement(_styles2.SlugWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('FRANCHISE_SLUG', 'Franchise slug')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    name: "name",
+    placeholder: t('SLUG', 'Slug'),
+    value: (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_13 = themeValues.website_theme) === null || _themeValues$website_13 === void 0 ? void 0 : (_themeValues$website_14 = _themeValues$website_13.components) === null || _themeValues$website_14 === void 0 ? void 0 : _themeValues$website_14.franchise_slug) || '',
+    onChange: function onChange(e) {
+      return handleChangeValue(e.target.value, 'website_theme', 'franchise_slug');
+    },
+    onKeyPress: function onKeyPress(e) {
+      if (e.which === 32) {
+        e.preventDefault();
+      }
+    }
+  })), /*#__PURE__*/_react.default.createElement(_styles2.RadioItem, {
+    onClick: function onClick() {
+      return handleChangeValue('single_store', 'website_theme', 'type');
+    }
+  }, (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_15 = themeValues.website_theme) === null || _themeValues$website_15 === void 0 ? void 0 : (_themeValues$website_16 = _themeValues$website_15.components) === null || _themeValues$website_16 === void 0 ? void 0 : _themeValues$website_16.type) === 'single_store' ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.RecordCircleFill, {
+    className: "active"
+  }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Circle, null), /*#__PURE__*/_react.default.createElement("span", null, t('SINGLE_STORE', 'Single Store'))), (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_17 = themeValues.website_theme) === null || _themeValues$website_17 === void 0 ? void 0 : (_themeValues$website_18 = _themeValues$website_17.components) === null || _themeValues$website_18 === void 0 ? void 0 : _themeValues$website_18.type) === 'single_store' && /*#__PURE__*/_react.default.createElement(_styles2.SlugWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('BUSINESS_SLUG', 'Business slug')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    name: "name",
+    placeholder: t('SLUG', 'Slug'),
+    value: (themeValues === null || themeValues === void 0 ? void 0 : (_themeValues$website_19 = themeValues.website_theme) === null || _themeValues$website_19 === void 0 ? void 0 : (_themeValues$website_20 = _themeValues$website_19.components) === null || _themeValues$website_20 === void 0 ? void 0 : _themeValues$website_20.business_slug) || '',
+    onChange: function onChange(e) {
+      return handleChangeValue(e.target.value, 'website_theme', 'business_slug');
+    },
+    onKeyPress: function onKeyPress(e) {
+      if (e.which === 32) {
+        e.preventDefault();
+      }
+    }
+  }))))), /*#__PURE__*/_react.default.createElement(_styles2.InputFormWrapper, null, /*#__PURE__*/_react.default.createElement("h4", null, t('IMAGES', 'Images')), /*#__PURE__*/_react.default.createElement(_styles2.InnerBlock, null, orderingTheme !== null && orderingTheme !== void 0 && orderingTheme.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     height: 100,
     width: 100,
     style: {

package/_modules/components/MyProducts/OrderingWebsite/styles.js CHANGED Viewed

@@ -4,9 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WebsiteWrapper = exports.WebsiteButtonWrapper = exports.UploadImageIconContainer = exports.UploadImageIcon = exports.TemporalDomail = exports.Tabs = exports.TabWrapper = exports.Tab = exports.MoreSettingsHeader = exports.LogoImage = exports.InputFormWrapper = exports.InnerBlock = exports.InfoWrapper = exports.InfoContent = exports.ImgInfoWrapper = exports.ImageFormGroup = exports.HeaderTitleContainer = exports.HeaderInfoWrapper = exports.FormWrapper = exports.FormGroup = exports.ContentWrapper = exports.Container = exports.ColorPickerWrapper = exports.CheckBoxWrapper = exports.BackgroundImage = void 0;
+exports.WebsiteWrapper = exports.WebsiteButtonWrapper = exports.UploadImageIconContainer = exports.UploadImageIcon = exports.TemporalDomail = exports.Tabs = exports.TabWrapper = exports.Tab = exports.SlugWrapper = exports.RadioItem = exports.MoreSettingsHeader = exports.LogoImage = exports.InputFormWrapper = exports.InnerBlock = exports.InfoWrapper = exports.InfoContent = exports.ImgInfoWrapper = exports.ImageFormGroup = exports.HeaderTitleContainer = exports.HeaderInfoWrapper = exports.FormWrapper = exports.FormGroup = exports.ContentWrapper = exports.Container = exports.ColorPickerWrapper = exports.CheckBoxWrapper = exports.BackgroundImage = 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;
+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;
 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) } })); }
@@ -118,4 +118,14 @@ var InfoContent = _styledComponents.default.div(_templateObject36 || (_templateO
 }, function (props) {
   return props.theme.rtl && (0, _styledComponents.css)(_templateObject38 || (_templateObject38 = _taggedTemplateLiteral(["\n      right: 0px;\n      left: initial;\n    "])));
 });
-exports.InfoContent = InfoContent;
+exports.InfoContent = InfoContent;
+var RadioItem = _styledComponents.default.div(_templateObject39 || (_templateObject39 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  padding: 12px 0;\n  cursor: pointer;\n\n  svg {\n    font-size: 16px;\n    color: ", ";\n    &.active {\n      color: ", ";\n    }\n    margin-right: 20px;\n    ", "\n  }\n  span {\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 24px;\n  }\n"])), function (props) {
+  return props.theme.colors.secundaryLight;
+}, function (props) {
+  return props.theme.colors.primary;
+}, function (props) {
+  return props.theme.rtl && (0, _styledComponents.css)(_templateObject40 || (_templateObject40 = _taggedTemplateLiteral(["\n      margin-left: 20px;\n      margin-right: 0px;\n    "])));
+});
+exports.RadioItem = RadioItem;
+var SlugWrapper = _styledComponents.default.div(_templateObject41 || (_templateObject41 = _taggedTemplateLiteral(["\n  margin-bottom: 20px;\n  label {\n    display: block;\n    margin-bottom: 12px;\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 24px;\n  }\n  > input, textarea {\n    width: 100%;\n  }\n"])));
+exports.SlugWrapper = SlugWrapper;

package/_modules/components/OrderingProducts/SiteTheme/index.js CHANGED Viewed

@@ -100,12 +100,16 @@ var SiteThemeUI = function SiteThemeUI(props) {
     setThemeOptions(_themeOptions);
   }, [themesList]);
   var recursiveAssign = function recursiveAssign(a, b) {
-    if (Object(b) !== b) return b;
-    if (Object(a) !== a) a = {};
-    for (var key in b) {
-      a[key] = recursiveAssign(a[key], b[key]);
+    if (b) {
+      if (Object(b) !== b) return b;
+      if (Object(a) !== a) a = {};
+      for (var key in b) {
+        a[key] = recursiveAssign(a[key], b[key]);
+      }
+      return a;
+    } else {
+      return a;
     }
-    return a;
   };
   (0, _react.useEffect)(function () {
     var _siteThemesState$resu, _siteThemesState$resu2, _siteThemesState$resu3, _siteThemesState$resu4, _siteThemesState$resu5;
@@ -176,11 +180,11 @@ var SiteThemeUI = function SiteThemeUI(props) {
     }), Object.keys(components[block]).filter(function (option) {
       return option !== 'components' && option !== 'value_type';
     }).map(function (option) {
-      var _themeValues$selected2, _themeValues$selected3;
+      var _themeValues$selected2, _themeValues$selected3, _themeValues$selected4;
       var optionObject = components[block][option];
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
         key: option
-      }, typeof ((_themeValues$selected2 = themeValues[selectedPage].components) === null || _themeValues$selected2 === void 0 ? void 0 : (_themeValues$selected3 = _themeValues$selected2[block]) === null || _themeValues$selected3 === void 0 ? void 0 : _themeValues$selected3[option]) !== 'undefined' && /*#__PURE__*/_react.default.createElement(_ThemeOption.ThemeOption, {
+      }, typeof ((_themeValues$selected2 = themeValues[selectedPage]) === null || _themeValues$selected2 === void 0 ? void 0 : (_themeValues$selected3 = _themeValues$selected2.components) === null || _themeValues$selected3 === void 0 ? void 0 : (_themeValues$selected4 = _themeValues$selected3[block]) === null || _themeValues$selected4 === void 0 ? void 0 : _themeValues$selected4[option]) !== 'undefined' && /*#__PURE__*/_react.default.createElement(_ThemeOption.ThemeOption, {
         name: option,
         optionObject: optionObject,
         valueObject: themeValues[selectedPage].components[block][option],
@@ -190,13 +194,13 @@ var SiteThemeUI = function SiteThemeUI(props) {
         handleAddThemeGallery: handleAddThemeGallery
       }));
     }), ((_components$block4 = components[block]) === null || _components$block4 === void 0 ? void 0 : _components$block4.components) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Object.keys((_components$block5 = components[block]) === null || _components$block5 === void 0 ? void 0 : _components$block5.components).map(function (component) {
-      var _components$block6, _themeValues$selected4;
+      var _components$block6, _themeValues$selected5;
       var componentObject = (_components$block6 = components[block]) === null || _components$block6 === void 0 ? void 0 : _components$block6.components[component];
       return /*#__PURE__*/_react.default.createElement(_ThemeComponent.ThemeComponent, {
         key: component,
         name: component,
         componentObject: componentObject,
-        valueObject: (_themeValues$selected4 = themeValues[selectedPage].components[block]) === null || _themeValues$selected4 === void 0 ? void 0 : _themeValues$selected4.components[component],
+        valueObject: (_themeValues$selected5 = themeValues[selectedPage].components[block]) === null || _themeValues$selected5 === void 0 ? void 0 : _themeValues$selected5.components[component],
         themeValues: themeValues,
         setThemeValues: setThemeValues,
         path: [selectedPage, 'components', block, 'components', component].join('.'),

package/_modules/components/Orders/DeliveriesManager/index.js CHANGED Viewed

@@ -133,7 +133,7 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
     open: isOpenOrderDetail,
     order: detailsOrder,
     orderId: orderDetailId,
-    driversList: driversList,
+    drivers: driversList.drivers,
     onClose: function onClose() {
       return handleBackRedirect();
     }

package/_modules/components/Orders/Messages/index.js CHANGED Viewed

@@ -43,7 +43,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 filterSpecialStatus = ['prepared_in', 'delivered_in', 'delivery_datetime'];
 var MessagesUI = function MessagesUI(props) {
   var _order$business, _order$customer, _order$driver, _theme$images, _theme$images$icons, _order$business6, _order$business7, _order$customer6, _order$customer7, _order$customer8, _order$driver6, _order$driver7, _order$driver8;
   var isChat = props.isChat,
@@ -63,7 +62,8 @@ var MessagesUI = function MessagesUI(props) {
     handleReadMessages = props.handleReadMessages,
     isTourOpen = props.isTourOpen,
     setCurrentTourStep = props.setCurrentTourStep,
-    orderDetailClose = props.orderDetailClose;
+    orderDetailClose = props.orderDetailClose,
+    getHistoryComment = props.getHistoryComment;
   var routerHistory = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -149,15 +149,14 @@ var MessagesUI = function MessagesUI(props) {
     var quickMsg = message ? "".concat(message, " ").concat(msg) : msg;
     setValue('message', quickMsg);
     setMessage(quickMsg);
-  };
-  (0, _react.useEffect)(function () {
     var msgElement = messageInputRef === null || messageInputRef === void 0 ? void 0 : messageInputRef.current;
     if (msgElement) {
+      msgElement.value = quickMsg;
       msgElement.focus();
       msgElement.selectionStart = msgElement.selectionEnd = msgElement.value.length;
       msgElement.scrollLeft = msgElement.scrollWidth;
     }
-  }, [message]);
+  };
   (0, _react.useEffect)(function () {
     if (user.level === 0) setMessageList(adminMessageList);else if (user.level === 2) setMessageList(storeMessageList);else setMessageList([]);
   }, [user]);
@@ -228,76 +227,6 @@ var MessagesUI = function MessagesUI(props) {
       console.log(error);
     };
   };
-  var getStatus = function getStatus(status) {
-    switch (status) {
-      case 0:
-        return t('PENDING', 'Pending');
-      case 1:
-        return t('COMPLETED_BY_ADMIN', 'Completed by admin');
-      case 2:
-        return t('REJECTED_BY_ADMIN', 'Rejected by admin');
-      case 3:
-        return t('ORDER_STATUS_IN_BUSINESS', 'Driver arrived to business');
-      case 4:
-        return t('PREPARATION_COMPLETED', 'Preparation Completed');
-      case 5:
-        return t('REJECTED_BY_BUSINESS', 'Rejected by business');
-      case 6:
-        return t('REJECTED_BY_DRIVER', 'Rejected by driver');
-      case 7:
-        return t('ACCEPTED_BY_BUSINESS', 'Accepted by Business');
-      case 8:
-        return t('ACCEPTED_BY_DRIVER', 'Accepted by Driver');
-      case 9:
-        return t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver');
-      case 10:
-        return t('PICK_UP_FAILED_BY_DRIVER', 'Pick up failed by driver');
-      case 11:
-        return t('DELIVERY_COMPLETED_BY_DRIVER', 'Delivery completed by driver');
-      case 12:
-        return t('DELIVERY_FAILED_BY_DRIVER', 'Delivery failed by driver');
-      case 13:
-        return t('PREORDER', 'Preorder');
-      case 14:
-        return t('ORDER_NOT_READY', 'Order not ready');
-      case 15:
-        return t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', 'Pickup completed by customer');
-      case 16:
-        return t('ORDER_STATUS_CANCELLED_BY_CUSTOMER', 'Cancelled by customer');
-      case 17:
-        return t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', 'Not picked by customer');
-      case 18:
-        return t('ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', 'Driver almost arrived to business');
-      case 19:
-        return t('ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', 'Driver almost arrived to customer');
-      case 20:
-        return t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', 'Customer almost arrived to business');
-      case 21:
-        return t('ORDER_CUSTOMER_ARRIVED_BUSINESS', 'Customer arrived to business');
-      case 22:
-        return t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver');
-      case 23:
-        return t('ORDER_DRIVER_ON_WAY', 'Driver on way');
-      default:
-        return status;
-    }
-  };
-  var getLogisticTagStatus = function getLogisticTagStatus(status) {
-    switch (status) {
-      case 0:
-        return t('PENDING', 'Pending');
-      case 1:
-        return t('IN_PROGRESS', 'In Progress');
-      case 2:
-        return t('IN_QUEUE', 'In Queue');
-      case 3:
-        return t('EXPIRED', 'Logistic expired');
-      case 4:
-        return t('RESOLVED', 'Resolved');
-      default:
-        return status;
-    }
-  };
   var getLevel = function getLevel(level) {
     switch (level) {
       case 0:
@@ -314,9 +243,6 @@ var MessagesUI = function MessagesUI(props) {
         return t('DRIVER_MANAGER', 'Driver Manager');
     }
   };
-  var getVehicleSmmary = function getVehicleSmmary(vehicle) {
-    return (vehicle === null || vehicle === void 0 ? void 0 : vehicle.type) + ' ' + (vehicle === null || vehicle === void 0 ? void 0 : vehicle.model) + ' ' + (vehicle === null || vehicle === void 0 ? void 0 : vehicle.car_registration) + ' ' + (vehicle === null || vehicle === void 0 ? void 0 : vehicle.color);
-  };
   var clearInputs = function clearInputs() {
     var input = messageInputRef === null || messageInputRef === void 0 ? void 0 : messageInputRef.current;
     if (input) {
@@ -491,34 +417,39 @@ var MessagesUI = function MessagesUI(props) {
   })), tabActive === 'logistic_information' && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogisticInformation, null, /*#__PURE__*/_react.default.createElement(_OrderLogisticInformation.OrderLogisticInformation, {
     orderId: order.id
   }))), filteredMessages.length > 0 && filteredMessages.map(function (message) {
-    var _message$change, _message$change2, _message$change3, _message$change4, _message$change5, _message$author, _message$author2, _message$author$name, _message$author3, _message$author$lastn, _message$author4, _message$driver, _message$driver2, _message$change6, _message$change7, _message$change8, _message$change9, _message$change10, _message$change11, _message$change12, _message$change13, _message$change14, _message$author5, _message$author6, _message$author$name2, _message$author7, _message$author$lastn2, _message$author8, _message$driver3, _message$driver4, _order$business2, _order$customer2, _order$driver2, _order$business3, _order$customer3, _order$driver3, _order$business4, _order$customer4, _order$driver4, _order$business5, _order$customer5, _order$driver5;
+    var _message$author, _message$author2, _message$author3, _message$author4, _order$business2, _order$customer2, _order$driver2, _order$business3, _order$customer3, _order$driver3, _order$business4, _order$customer4, _order$driver4, _order$business5, _order$customer5, _order$driver5;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: message.id
-    }, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
+    }, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
+      key: message.id
+    }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", {
+      dangerouslySetInnerHTML: {
+        __html: t('ORDER_PLACED_FOR_VIA', 'Order placed for _for_ via _via_.').replace('_for_', '<b>' + parseDate(order.delivery_datetime) + '</b>').replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
+      }
+    }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "), message === null || message === void 0 ? void 0 : (_message$author = message.author) === null || _message$author === void 0 ? void 0 : _message$author.name, " ", message === null || message === void 0 ? void 0 : (_message$author2 = message.author) === null || _message$author2 === void 0 ? void 0 : _message$author2.lastname), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('USER_AGENT', 'User agent'), ": "), message === null || message === void 0 ? void 0 : message.user_agent), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('IP', 'IP'), ": "), message === null || message === void 0 ? void 0 : message.ip), /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message === null || message === void 0 ? void 0 : message.created_at)))), message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
       key: message.id,
       style: {
         display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
       }
-    }, ((_message$change = message.change) === null || _message$change === void 0 ? void 0 : _message$change.attribute) !== 'driver_id' ? /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, t('ORDER', 'Order'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, t(message.change.attribute)), " ", ' ', t('CHANGED_FROM', 'Changed from'), " ", ' ', message.change.old !== null && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, ((_message$change2 = message.change) === null || _message$change2 === void 0 ? void 0 : _message$change2.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.old, 10)) : getStatus(parseInt(message.change.old, 10))), " ", ' '), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('TO', 'to'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, message.change.old === null && message.change.attribute === 'delivery_in' ? 'null' : ((_message$change3 = message.change) === null || _message$change3 === void 0 ? void 0 : _message$change3.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.new, 10)) : getStatus(parseInt(message.change.new, 10))), message !== null && message !== void 0 && (_message$change4 = message.change) !== null && _message$change4 !== void 0 && _message$change4.comment ? "\n'".concat(message === null || message === void 0 ? void 0 : (_message$change5 = message.change) === null || _message$change5 === void 0 ? void 0 : _message$change5.comment, "'") : '', ((message === null || message === void 0 ? void 0 : (_message$author = message.author) === null || _message$author === void 0 ? void 0 : _message$author.name) || (message === null || message === void 0 ? void 0 : (_message$author2 = message.author) === null || _message$author2 === void 0 ? void 0 : _message$author2.lastname)) && /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement("strong", null, "Author: "), ((_message$author$name = message === null || message === void 0 ? void 0 : (_message$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.name) !== null && _message$author$name !== void 0 ? _message$author$name : '') + ' ' + ((_message$author$lastn = message === null || message === void 0 ? void 0 : (_message$author4 = message.author) === null || _message$author4 === void 0 ? void 0 : _message$author4.lastname) !== null && _message$author$lastn !== void 0 ? _message$author$lastn : ''))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
-      placement: "top",
-      overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
-    }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))) : /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.change.new !== null ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, (_message$driver = message.driver) === null || _message$driver === void 0 ? void 0 : _message$driver.name, " ", ' ', " ", ((_message$driver2 = message.driver) === null || _message$driver2 === void 0 ? void 0 : _message$driver2.lastname) && message.driver.lastname), t('WAS_ASSIGNED_AS_DRIVER', 'was assigned as driver'), message.comment && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("br", null), " ", message.comment.length)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('DRIVER_UNASSIGNED', 'The driver was unnasigned'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
+    }, getHistoryComment(message) && /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("div", {
+      dangerouslySetInnerHTML: {
+        __html: getHistoryComment(message)
+      }
+    }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
       placement: "top",
       overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
-    }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))))), isChat && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 1 && ((_message$change6 = message.change) === null || _message$change6 === void 0 ? void 0 : _message$change6.attribute) !== 'comment' && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
+    }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))))), isChat && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
       key: message.id
-    }, ((_message$change7 = message.change) === null || _message$change7 === void 0 ? void 0 : _message$change7.attribute) !== 'driver_id' ? /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, t('ORDER', 'Order'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, t(message.change.attribute)), " ", ' ', t('CHANGED_FROM', 'Changed from'), " ", ' ', filterSpecialStatus.includes(message.change.attribute) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.change.old === null ? /*#__PURE__*/_react.default.createElement("strong", null, "0") : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, message.change.old), " ", ' '), /*#__PURE__*/_react.default.createElement("div", {
+    }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'Via'), ' ', /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), ' '), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "), message === null || message === void 0 ? void 0 : (_message$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.name, " ", message === null || message === void 0 ? void 0 : (_message$author4 = message.author) === null || _message$author4 === void 0 ? void 0 : _message$author4.lastname), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('USER_AGENT', 'User agent'), ": "), message === null || message === void 0 ? void 0 : message.user_agent), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('IP', 'IP'), ": "), message === null || message === void 0 ? void 0 : message.ip), /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message === null || message === void 0 ? void 0 : message.created_at)))), message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
+      key: message.id,
       style: {
-        whiteSpace: 'pre'
+        display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
       }
-    }, t('TO', 'to'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, message.change.new), " ", ' ', t('MINUTES', 'Minutes'))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.change.old !== null && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, ((_message$change8 = message.change) === null || _message$change8 === void 0 ? void 0 : _message$change8.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.old, 10)) : ((_message$change9 = message.change) === null || _message$change9 === void 0 ? void 0 : _message$change9.attribute) === 'vehicle' ? getVehicleSmmary(message.change.old) : getStatus(parseInt(message.change.old, 10))), ' '), /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        whiteSpace: 'pre'
+    }, getHistoryComment(message) && /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("div", {
+      dangerouslySetInnerHTML: {
+        __html: getHistoryComment(message)
       }
-    }, t('TO', 'to'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, message.change.old === null && message.change.attribute === 'delivery_in' ? 'null' : ((_message$change10 = message.change) === null || _message$change10 === void 0 ? void 0 : _message$change10.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.new, 10)) : ((_message$change11 = message.change) === null || _message$change11 === void 0 ? void 0 : _message$change11.attribute) === 'vehicle' ? getVehicleSmmary(message.change.new) : getStatus(parseInt(message.change.new, 10))), /*#__PURE__*/_react.default.createElement("strong", null, message !== null && message !== void 0 && (_message$change12 = message.change) !== null && _message$change12 !== void 0 && _message$change12.comment ? "\n".concat(t('COMMENT', 'Comment:')) : ''), message !== null && message !== void 0 && (_message$change13 = message.change) !== null && _message$change13 !== void 0 && _message$change13.comment ? " ".concat(message === null || message === void 0 ? void 0 : (_message$change14 = message.change) === null || _message$change14 === void 0 ? void 0 : _message$change14.comment) : '', ((message === null || message === void 0 ? void 0 : (_message$author5 = message.author) === null || _message$author5 === void 0 ? void 0 : _message$author5.name) || (message === null || message === void 0 ? void 0 : (_message$author6 = message.author) === null || _message$author6 === void 0 ? void 0 : _message$author6.lastname)) && /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement("strong", null, "Author: "), ((_message$author$name2 = message === null || message === void 0 ? void 0 : (_message$author7 = message.author) === null || _message$author7 === void 0 ? void 0 : _message$author7.name) !== null && _message$author$name2 !== void 0 ? _message$author$name2 : '') + ' ' + ((_message$author$lastn2 = message === null || message === void 0 ? void 0 : (_message$author8 = message.author) === null || _message$author8 === void 0 ? void 0 : _message$author8.lastname) !== null && _message$author$lastn2 !== void 0 ? _message$author$lastn2 : '')))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
-      placement: "top",
-      overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
-    }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))) : /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.change.new !== null ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, (_message$driver3 = message.driver) === null || _message$driver3 === void 0 ? void 0 : _message$driver3.name, " ", ' ', " ", ((_message$driver4 = message.driver) === null || _message$driver4 === void 0 ? void 0 : _message$driver4.lastname) && message.driver.lastname), t('WAS_ASSIGNED_AS_DRIVER', 'was assigned as driver'), message.comment && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("br", null), " ", message.comment.length)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('DRIVER_UNASSIGNED', 'The driver was unnasigned'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
+    }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
       placement: "top",
       overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
     }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at))))), message.type === 2 && user.id === message.author_id && /*#__PURE__*/_react.default.createElement(_styles.MessageCustomer, null, /*#__PURE__*/_react.default.createElement(_styles.BubbleCustomer, null, /*#__PURE__*/_react.default.createElement(_styles.MessageSender, null, message.author.name, " (", order.customer_id === message.author.id ? getLevel(3) : getLevel(message.author.level), ")"), message.comment, /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {

package/_modules/components/Orders/OrderBill/index.js CHANGED Viewed

@@ -166,7 +166,7 @@ var OrderBill = function OrderBill(props) {
     }, /*#__PURE__*/_react.default.createElement("td", null, t((_offer$name2 = offer.name) === null || _offer$name2 === void 0 ? void 0 : (_offer$name2$toUpperC = _offer$name2.toUpperCase()) === null || _offer$name2$toUpperC === void 0 ? void 0 : _offer$name2$toUpperC.replaceAll(' ', '_'), offer.name), offer.rate_type === 1 && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(offer === null || offer === void 0 ? void 0 : offer.rate, parsePrice), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 ? void 0 : (_offer$summary2 = offer.summary) === null || _offer$summary2 === void 0 ? void 0 : _offer$summary2.discount, {
       currency: order === null || order === void 0 ? void 0 : order.currency
     })));
-  })), (order === null || order === void 0 ? void 0 : (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(order === null || order === void 0 ? void 0 : (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price, {
+  })), typeof (order === null || order === void 0 ? void 0 : (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) === 'number' && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(order === null || order === void 0 ? void 0 : (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price, {
     currency: order === null || order === void 0 ? void 0 : order.currency
   }))), (order === null || order === void 0 ? void 0 : (_order$offers6 = order.offers) === null || _order$offers6 === void 0 ? void 0 : _order$offers6.length) > 0 && (order === null || order === void 0 ? void 0 : (_order$offers7 = order.offers) === null || _order$offers7 === void 0 ? void 0 : (_order$offers7$filter = _order$offers7.filter(function (offer) {
     return (offer === null || offer === void 0 ? void 0 : offer.target) === 2;
@@ -189,10 +189,10 @@ var OrderBill = function OrderBill(props) {
   }, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", {
     colSpan: "2"
   }, t('PAYMENTS', 'Payments')))), /*#__PURE__*/_react.default.createElement("tbody", null, order === null || order === void 0 ? void 0 : (_order$payment_events2 = order.payment_events) === null || _order$payment_events2 === void 0 ? void 0 : _order$payment_events2.map(function (event, i) {
-    var _walletName$event$wal, _event$wallet_event, _event$wallet_event$w, _event$paymethod, _event$paymethod$name, _event$paymethod$name2, _event$paymethod2, _event$paymethod3;
+    var _walletName$event$wal, _event$wallet_event, _event$wallet_event$w, _event$paymethod, _event$paymethod$name, _event$paymethod$name2, _event$paymethod2, _event$data, _event$data2, _event$data2$gateway, _event$data3, _event$data3$gateway, _walletName$event$dat, _event$data4, _event$paymethod3;
     return /*#__PURE__*/_react.default.createElement("tr", {
       key: i
-    }, /*#__PURE__*/_react.default.createElement("td", null, event !== null && event !== void 0 && event.wallet_event ? (_walletName$event$wal = walletName[event === null || event === void 0 ? void 0 : (_event$wallet_event = event.wallet_event) === null || _event$wallet_event === void 0 ? void 0 : (_event$wallet_event$w = _event$wallet_event.wallet) === null || _event$wallet_event$w === void 0 ? void 0 : _event$wallet_event$w.type]) === null || _walletName$event$wal === void 0 ? void 0 : _walletName$event$wal.name : t(event === null || event === void 0 ? void 0 : (_event$paymethod = event.paymethod) === null || _event$paymethod === void 0 ? void 0 : (_event$paymethod$name = _event$paymethod.name) === null || _event$paymethod$name === void 0 ? void 0 : (_event$paymethod$name2 = _event$paymethod$name.toUpperCase()) === null || _event$paymethod$name2 === void 0 ? void 0 : _event$paymethod$name2.replaceAll(' ', '_'), event === null || event === void 0 ? void 0 : (_event$paymethod2 = event.paymethod) === null || _event$paymethod2 === void 0 ? void 0 : _event$paymethod2.name)), /*#__PURE__*/_react.default.createElement("td", null, (event === null || event === void 0 ? void 0 : (_event$paymethod3 = event.paymethod) === null || _event$paymethod3 === void 0 ? void 0 : _event$paymethod3.gateway) === 'cash' && order !== null && order !== void 0 && order.cash ? parsePrice(order === null || order === void 0 ? void 0 : order.cash, {
+    }, /*#__PURE__*/_react.default.createElement("td", null, event !== null && event !== void 0 && event.wallet_event ? (_walletName$event$wal = walletName[event === null || event === void 0 ? void 0 : (_event$wallet_event = event.wallet_event) === null || _event$wallet_event === void 0 ? void 0 : (_event$wallet_event$w = _event$wallet_event.wallet) === null || _event$wallet_event$w === void 0 ? void 0 : _event$wallet_event$w.type]) === null || _walletName$event$wal === void 0 ? void 0 : _walletName$event$wal.name : event !== null && event !== void 0 && event.paymethod ? t(event === null || event === void 0 ? void 0 : (_event$paymethod = event.paymethod) === null || _event$paymethod === void 0 ? void 0 : (_event$paymethod$name = _event$paymethod.name) === null || _event$paymethod$name === void 0 ? void 0 : (_event$paymethod$name2 = _event$paymethod$name.toUpperCase()) === null || _event$paymethod$name2 === void 0 ? void 0 : _event$paymethod$name2.replaceAll(' ', '_'), event === null || event === void 0 ? void 0 : (_event$paymethod2 = event.paymethod) === null || _event$paymethod2 === void 0 ? void 0 : _event$paymethod2.name) : event !== null && event !== void 0 && (_event$data = event.data) !== null && _event$data !== void 0 && _event$data.gateway ? t(event === null || event === void 0 ? void 0 : (_event$data2 = event.data) === null || _event$data2 === void 0 ? void 0 : (_event$data2$gateway = _event$data2.gateway) === null || _event$data2$gateway === void 0 ? void 0 : _event$data2$gateway.toUpperCase(), event === null || event === void 0 ? void 0 : (_event$data3 = event.data) === null || _event$data3 === void 0 ? void 0 : (_event$data3$gateway = _event$data3.gateway) === null || _event$data3$gateway === void 0 ? void 0 : _event$data3$gateway.replaceAll('_', ' ')) : (_walletName$event$dat = walletName[event === null || event === void 0 ? void 0 : (_event$data4 = event.data) === null || _event$data4 === void 0 ? void 0 : _event$data4.wallet_currency]) === null || _walletName$event$dat === void 0 ? void 0 : _walletName$event$dat.name), /*#__PURE__*/_react.default.createElement("td", null, (event === null || event === void 0 ? void 0 : (_event$paymethod3 = event.paymethod) === null || _event$paymethod3 === void 0 ? void 0 : _event$paymethod3.gateway) === 'cash' && order !== null && order !== void 0 && order.cash ? parsePrice(order === null || order === void 0 ? void 0 : order.cash, {
       currency: order === null || order === void 0 ? void 0 : order.currency
     }) : "-".concat(parsePrice(event === null || event === void 0 ? void 0 : event.amount, {
       currency: order === null || order === void 0 ? void 0 : order.currency

package/_modules/components/Orders/OrderNotification/index.js CHANGED Viewed

@@ -31,7 +31,8 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 _reactToastify.toast.configure();
 var OrderNotificationUI = function OrderNotificationUI(props) {
-  var isOnlyDelivery = props.isOnlyDelivery;
+  var isOnlyDelivery = props.isOnlyDelivery,
+    customerId = props.customerId;
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];
@@ -51,6 +52,7 @@ var OrderNotificationUI = function OrderNotificationUI(props) {
     registerOrderIds = _useState4[0],
     setRegisterOrderIds = _useState4[1];
   var handleNotification = function handleNotification(order) {
+    if (customerId && (order === null || order === void 0 ? void 0 : order.customer_id) !== customerId) return;
     if (isOnlyDelivery && (order === null || order === void 0 ? void 0 : order.delivery_type) !== 1) return;
     var _registerOrderIds = _toConsumableArray(registerOrderIds);
     if (!_registerOrderIds.includes(order.id)) {
@@ -116,7 +118,7 @@ var OrderNotificationUI = function OrderNotificationUI(props) {
     return function () {
       events.off('order_added', handleNotification);
     };
-  }, [configState, registerOrderIds]);
+  }, [configState, registerOrderIds, customerId]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     width: "750px",
     open: notificationModalOpen,

package/_modules/components/Orders/OrdersManager/index.js CHANGED Viewed

@@ -275,7 +275,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setIsTourFlag: setIsTourFlag,
     setIsTourOpen: setIsTourOpen,
     drivers: driversList.drivers
-  }), /*#__PURE__*/_react.default.createElement(_OrderNotification.OrderNotification, null), totalSelectedOrder > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperIndicator, null, selectedOrderIds.length, "/", totalSelectedOrder), /*#__PURE__*/_react.default.createElement(_WizardOrders.WizardOrders, {
+  }), /*#__PURE__*/_react.default.createElement(_OrderNotification.OrderNotification, {
+    customerId: props.customerId
+  }), totalSelectedOrder > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperIndicator, null, selectedOrderIds.length, "/", totalSelectedOrder), /*#__PURE__*/_react.default.createElement(_WizardOrders.WizardOrders, {
     isTourOpen: isTourOpen,
     setIsTourOpen: setIsTourOpen,
     currentStep: currentTourStep,