npm - ordering-ui-admin-external - Versions diffs - 1.42.9 → 1.42.11 - Mend

ordering-ui-admin-external 1.42.9 → 1.42.11

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 (15) hide show

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

@@ -19,7 +19,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = function DriverMapMarkerAndInfo(props) {
   var _driver$drivergroups, _theme$images;
-  var driver = props.driver;
+  var driver = props.driver,
+    timeStatus = props.timeStatus;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -64,7 +65,8 @@ var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = function DriverMap
     },
     onMouseLeave: function onMouseLeave() {
       return setInfoShow(false);
-    }
+    },
+    borderColor: timeStatus === 'delayed' ? '#E63757' : !(driver !== null && driver !== void 0 && driver.available) ? '#6c757d' : driver.busy ? '#007bff' : '#28a745'
   }, driver.photo ? /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {
     bgimage: driver.photo
   }) : /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {

package/_modules/components/Orders/DriverMapMarkerAndInfo/styles.js CHANGED Viewed

@@ -7,20 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.WrapperMapMarker = exports.TextContainer = exports.Text = exports.MapMarkerImg = exports.DriverInfo = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var WrapperMapMarker = exports.WrapperMapMarker = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 50px;\n  height: 50px;\n  background: #9D9B9B;\n  border: 3px solid #F79B16;\n  border-radius: 100%;\n  position: absolute;\n  transform: translate(-50%, -100%);\n  z-index: 1;\n\n  ", "\n\n  &:after {\n    content:'';\n    position: absolute;\n    top: 77%;\n    left: 50%;\n    margin-left: -22px;\n    width: 0;\n    height: 0;\n    border-top: solid 22px #F79B16;\n    ", "\n    border-left: solid 22px transparent;\n    border-right: solid 22px transparent;\n    z-index: 10;\n  }\n"])), function (_ref) {
-  var offline = _ref.offline;
-  return offline && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    border: 3px solid #9D9B9B;\n  "])));
-}, function (_ref2) {
-  var offline = _ref2.offline;
-  return offline && (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n      border-top: solid 22px #9D9B9B;\n    "])));
+var WrapperMapMarker = exports.WrapperMapMarker = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 50px;\n  height: 50px;\n  background: #9D9B9B;\n  border: 3px solid ", ";\n  border-radius: 100%;\n  position: absolute;\n  transform: translate(-50%, -100%);\n  z-index: 1;\n\n  &:after {\n    content:'';\n    position: absolute;\n    top: 77%;\n    left: 50%;\n    margin-left: -22px;\n    width: 0;\n    height: 0;\n    border-top: solid 22px  ", ";\n    border-left: solid 22px transparent;\n    border-right: solid 22px transparent;\n    z-index: 10;\n  }\n"])), function (props) {
+  return props.borderColor;
+}, function (props) {
+  return props.borderColor;
 });
-var MapMarkerImgStyled = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 100%;\n  z-index: 100;\n"])));
+var MapMarkerImgStyled = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 100%;\n  z-index: 100;\n"])));
 var MapMarkerImg = exports.MapMarkerImg = function MapMarkerImg(props) {
   return /*#__PURE__*/_react.default.createElement(MapMarkerImgStyled, _extends({}, props, {
     style: {
@@ -28,12 +26,12 @@ var MapMarkerImg = exports.MapMarkerImg = function MapMarkerImg(props) {
     }
   }), props.children);
 };
-var DriverInfo = exports.DriverInfo = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  background: ", ";\n  position: absolute;\n  border-radius: 5px;\n  padding: 10px;\n  row-gap: 5px;\n  z-index: 200;\n  box-shadow: 0px 2px 2px #00000029;\n  display: flex;\n  flex-direction: column;\n  row-gap: 5px;\n"])), function (props) {
+var DriverInfo = exports.DriverInfo = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  background: ", ";\n  position: absolute;\n  border-radius: 5px;\n  padding: 10px;\n  row-gap: 5px;\n  z-index: 200;\n  box-shadow: 0px 2px 2px #00000029;\n  display: flex;\n  flex-direction: column;\n  row-gap: 5px;\n"])), function (props) {
   var _props$theme$colors;
   return ((_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.backgroundPage) || '#FFF';
 });
-var TextContainer = exports.TextContainer = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  display: flex;\n  column-gap: 10px;\n"])));
-var Text = exports.Text = _styledComponents.default.span(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  ", "\n  font-size: 14px;\n  white-space: nowrap;\n"])), function (_ref3) {
-  var fontWeight = _ref3.fontWeight;
-  return fontWeight && (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n    font-weight: 600;\n  "])));
+var TextContainer = exports.TextContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  column-gap: 10px;\n"])));
+var Text = exports.Text = _styledComponents.default.span(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  ", "\n  font-size: 14px;\n  white-space: nowrap;\n"])), function (_ref) {
+  var fontWeight = _ref.fontWeight;
+  return fontWeight && (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    font-weight: 600;\n  "])));
 });

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

@@ -26,7 +26,7 @@ var DriversLocationPropsAreEqual = function DriversLocationPropsAreEqual(prevPro
   return JSON.stringify(prevProps.selectedDriver) === JSON.stringify(nextProps.selectedDriver) && JSON.stringify(prevProps.assignedOrders) === JSON.stringify(nextProps.assignedOrders) && prevProps.driversIsOnline === nextProps.driversIsOnline && ((_prevProps$onlineDriv = prevProps.onlineDrivers) === null || _prevProps$onlineDriv === void 0 ? void 0 : _prevProps$onlineDriv.length) === ((_nextProps$onlineDriv = nextProps.onlineDrivers) === null || _nextProps$onlineDriv === void 0 ? void 0 : _nextProps$onlineDriv.length) && ((_prevProps$offlineDri = prevProps.offlineDrivers) === null || _prevProps$offlineDri === void 0 ? void 0 : _prevProps$offlineDri.length) === ((_nextProps$offlineDri = nextProps.offlineDrivers) === null || _nextProps$offlineDri === void 0 ? void 0 : _nextProps$offlineDri.length) && JSON.stringify(prevProps.selectedOrder) === JSON.stringify(nextProps.selectedOrder);
 };
 var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo(function (props) {
-  var _configState$configs, _configState$configs2, _configState$configs3, _selectedOrder$custom3, _selectedOrder$custom4, _selectedOrder$custom5, _selectedOrder$custom6, _selectedOrder$custom7, _selectedOrder$busine3, _selectedOrder$busine4, _selectedOrder$busine5, _selectedOrder$driver3, _selectedOrder$driver4, _selectedOrder$driver5, _selectedOrder$driver6, _selectedOrder$driver7, _selectedOrder$driver8, _selectedOrder$driver9, _selectedOrder$driver10, _selectedOrder$driver11, _selectedOrder$driver12, _selectedOrder$driver13, _selectedOrder$driver14, _assignedOrders$order4, _assignedOrders$order5;
+  var _configState$configs, _configState$configs2, _configState$configs3, _selectedOrder$custom3, _selectedOrder$custom4, _selectedOrder$custom5, _selectedOrder$custom6, _selectedOrder$custom7, _selectedOrder$busine3, _selectedOrder$busine4, _selectedOrder$busine5, _selectedOrder$driver3, _selectedOrder$driver4, _selectedOrder$driver5, _selectedOrder$driver6, _selectedOrder$driver7, _selectedOrder$driver8, _selectedOrder$driver9, _selectedOrder$driver10, _selectedOrder$driver11, _selectedOrder$driver12, _selectedOrder$driver13, _selectedOrder$driver14, _assignedOrders$order6, _assignedOrders$order7;
   var driversIsOnline = props.driversIsOnline,
     onlineDrivers = props.onlineDrivers,
     offlineDrivers = props.offlineDrivers,
@@ -209,10 +209,13 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
     },
     yesIWantToUseGoogleMapApiInternals: true
   }, !selectedOrder && showDrivers.length !== 0 && showDrivers.map(function (driver) {
-    var _driver$location5, _driver$location6, _driver$location7, _driver$location8;
+    var _assignedOrders$order4, _assignedOrders$order5, _driver$location5, _driver$location6, _driver$location7, _driver$location8;
     return /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
       key: driver.id,
       driver: driver,
+      timeStatus: (selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.time_status) || (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order4 = assignedOrders.orders) === null || _assignedOrders$order4 === void 0 ? void 0 : _assignedOrders$order4.length) && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order5 = assignedOrders.orders) === null || _assignedOrders$order5 === void 0 ? void 0 : _assignedOrders$order5.some(function (order) {
+        return order.time_status === 'delayed';
+      })) && 'delayed',
       lat: driver.location !== null && _typeof(driver.location) === 'object' && (_driver$location5 = driver.location) !== null && _driver$location5 !== void 0 && _driver$location5.lat ? driver.location.lat : typeof driver.location === 'string' ? parseFloat(driver === null || driver === void 0 || (_driver$location6 = driver.location) === null || _driver$location6 === void 0 ? void 0 : _driver$location6.split(',')[0].replace(/[^-.0-9]/g, '')) : defaultCenter.lat,
       lng: driver.location !== null && _typeof(driver.location) === 'object' && (_driver$location7 = driver.location) !== null && _driver$location7 !== void 0 && _driver$location7.lng ? driver.location.lng : typeof driver.location === 'string' ? parseFloat(driver === null || driver === void 0 || (_driver$location8 = driver.location) === null || _driver$location8 === void 0 ? void 0 : _driver$location8.split(',')[1].replace(/[^-.0-9]/g, '')) : defaultCenter.lng
     });
@@ -228,9 +231,10 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
     image: selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine5 = selectedOrder.business) === null || _selectedOrder$busine5 === void 0 ? void 0 : _selectedOrder$busine5.logo
   }), (selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.driver) && /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
     driver: selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.driver,
+    timeStatus: selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.time_status,
     lat: (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver3 = selectedOrder.driver) === null || _selectedOrder$driver3 === void 0 ? void 0 : _selectedOrder$driver3.location) !== null && _typeof(selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver4 = selectedOrder.driver) === null || _selectedOrder$driver4 === void 0 ? void 0 : _selectedOrder$driver4.location) === 'object' && selectedOrder !== null && selectedOrder !== void 0 && (_selectedOrder$driver5 = selectedOrder.driver) !== null && _selectedOrder$driver5 !== void 0 && (_selectedOrder$driver5 = _selectedOrder$driver5.location) !== null && _selectedOrder$driver5 !== void 0 && _selectedOrder$driver5.lat ? selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver6 = selectedOrder.driver) === null || _selectedOrder$driver6 === void 0 ? void 0 : _selectedOrder$driver6.location.lat : typeof (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver7 = selectedOrder.driver) === null || _selectedOrder$driver7 === void 0 ? void 0 : _selectedOrder$driver7.location) === 'string' ? parseFloat(selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver8 = selectedOrder.driver) === null || _selectedOrder$driver8 === void 0 || (_selectedOrder$driver8 = _selectedOrder$driver8.location) === null || _selectedOrder$driver8 === void 0 ? void 0 : _selectedOrder$driver8.split(',')[0].replace(/[^-.0-9]/g, '')) : defaultCenter.lat,
     lng: (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver9 = selectedOrder.driver) === null || _selectedOrder$driver9 === void 0 ? void 0 : _selectedOrder$driver9.location) !== null && _typeof(selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver10 = selectedOrder.driver) === null || _selectedOrder$driver10 === void 0 ? void 0 : _selectedOrder$driver10.location) === 'object' && selectedOrder !== null && selectedOrder !== void 0 && (_selectedOrder$driver11 = selectedOrder.driver) !== null && _selectedOrder$driver11 !== void 0 && (_selectedOrder$driver11 = _selectedOrder$driver11.location) !== null && _selectedOrder$driver11 !== void 0 && _selectedOrder$driver11.lng ? selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver12 = selectedOrder.driver) === null || _selectedOrder$driver12 === void 0 ? void 0 : _selectedOrder$driver12.location.lng : typeof (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver13 = selectedOrder.driver) === null || _selectedOrder$driver13 === void 0 ? void 0 : _selectedOrder$driver13.location) === 'string' ? parseFloat(selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$driver14 = selectedOrder.driver) === null || _selectedOrder$driver14 === void 0 || (_selectedOrder$driver14 = _selectedOrder$driver14.location) === null || _selectedOrder$driver14 === void 0 ? void 0 : _selectedOrder$driver14.split(',')[1].replace(/[^-.0-9]/g, '')) : defaultCenter.lng
-  }), selectedDriver && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order4 = assignedOrders.orders) === null || _assignedOrders$order4 === void 0 ? void 0 : _assignedOrders$order4.length) > 0 && !selectedOrder && assignedOrders.orders.map(function (order) {
+  }), selectedDriver && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order6 = assignedOrders.orders) === null || _assignedOrders$order6 === void 0 ? void 0 : _assignedOrders$order6.length) > 0 && !selectedOrder && assignedOrders.orders.map(function (order) {
     var _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7;
     return /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
       key: order.id,
@@ -239,7 +243,7 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
       lng: order !== null && order !== void 0 && (_order$customer5 = order.customer) !== null && _order$customer5 !== void 0 && (_order$customer5 = _order$customer5.location) !== null && _order$customer5 !== void 0 && _order$customer5.lng ? order === null || order === void 0 || (_order$customer6 = order.customer) === null || _order$customer6 === void 0 || (_order$customer6 = _order$customer6.location) === null || _order$customer6 === void 0 ? void 0 : _order$customer6.lng : defaultCenter.lng,
       image: order === null || order === void 0 || (_order$customer7 = order.customer) === null || _order$customer7 === void 0 ? void 0 : _order$customer7.photo
     });
-  }), selectedDriver && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order5 = assignedOrders.orders) === null || _assignedOrders$order5 === void 0 ? void 0 : _assignedOrders$order5.length) > 0 && !selectedOrder && assignedOrders.orders.map(function (order) {
+  }), selectedDriver && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order7 = assignedOrders.orders) === null || _assignedOrders$order7 === void 0 ? void 0 : _assignedOrders$order7.length) > 0 && !selectedOrder && assignedOrders.orders.map(function (order) {
     var _order$business3, _order$business4, _order$business5;
     return /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
       key: order.id,

package/_modules/themes/origin/src/components/DriverMapMarkerAndInfo/index.js CHANGED Viewed

@@ -19,7 +19,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = function DriverMapMarkerAndInfo(props) {
   var _driver$drivergroups, _theme$images;
-  var driver = props.driver;
+  var driver = props.driver,
+    timeStatus = props.timeStatus;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -68,7 +69,8 @@ var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = function DriverMap
     },
     onMouseLeave: function onMouseLeave() {
       return setInfoShow(false);
-    }
+    },
+    borderColor: timeStatus === 'delayed' ? '#E63757' : !(driver !== null && driver !== void 0 && driver.available) ? '#6c757d' : driver.busy ? '#007bff' : '#28a745'
   }, driver.photo ? /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {
     bgimage: driver.photo
   }) : /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {

package/_modules/themes/origin/src/components/DriverMapMarkerAndInfo/styles.js CHANGED Viewed

@@ -7,20 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.WrapperMapMarker = exports.TextContainer = exports.Text = exports.MapMarkerImg = exports.DriverInfo = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var WrapperMapMarker = exports.WrapperMapMarker = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 40px;\n  height: 40px;\n  background: ", ";\n  border: 5px solid #F79B16;\n  box-shadow: 0px 3px 6px #00000029;\n  border-radius: 6px;\n  position: absolute;\n  transform: translate(-50%, -50%);\n  z-index: 1;\n\n  ", "\n"])), function (props) {
+var WrapperMapMarker = exports.WrapperMapMarker = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 40px;\n  height: 40px;\n  background: ", ";\n  border: 5px solid ", ";\n  box-shadow: 0px 3px 6px #00000029;\n  border-radius: 6px;\n  position: absolute;\n  transform: translate(-50%, -50%);\n  z-index: 1;\n"])), function (props) {
   var _props$theme$colors;
   return ((_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.backgroundPage) || '#FFF';
-}, function (_ref) {
-  var offline = _ref.offline;
-  return offline && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    border: 5px solid #9D9B9B;\n  "])));
+}, function (props) {
+  return props.borderColor;
 });
-var MapMarkerImgStyled = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 5px;\n"])));
+var MapMarkerImgStyled = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  object-fit: cover;\n  background-position: center;\n  border-radius: 5px;\n"])));
 var MapMarkerImg = exports.MapMarkerImg = function MapMarkerImg(props) {
   return /*#__PURE__*/_react.default.createElement(MapMarkerImgStyled, _extends({}, props, {
     style: {
@@ -28,12 +27,12 @@ var MapMarkerImg = exports.MapMarkerImg = function MapMarkerImg(props) {
     }
   }), props.children);
 };
-var DriverInfo = exports.DriverInfo = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  background: ", ";\n  position: absolute;\n  border-radius: 5px;\n  padding: 10px;\n  row-gap: 5px;\n  z-index: 2;\n  box-shadow: 0px 2px 2px #00000029;\n  display: flex;\n  flex-direction: column;\n  row-gap: 5px;\n"])), function (props) {
+var DriverInfo = exports.DriverInfo = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  background: ", ";\n  position: absolute;\n  border-radius: 5px;\n  padding: 10px;\n  row-gap: 5px;\n  z-index: 2;\n  box-shadow: 0px 2px 2px #00000029;\n  display: flex;\n  flex-direction: column;\n  row-gap: 5px;\n"])), function (props) {
   var _props$theme$colors2;
   return ((_props$theme$colors2 = props.theme.colors) === null || _props$theme$colors2 === void 0 ? void 0 : _props$theme$colors2.backgroundPage) || '#FFF';
 });
-var TextContainer = exports.TextContainer = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  display: flex;\n  column-gap: 10px;\n"])));
-var Text = exports.Text = _styledComponents.default.span(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  ", "\n  font-size: 14px;\n  white-space: nowrap;\n"])), function (_ref2) {
-  var fontWeight = _ref2.fontWeight;
-  return fontWeight && (0, _styledComponents.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n    font-weight: 600;\n  "])));
+var TextContainer = exports.TextContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  column-gap: 10px;\n"])));
+var Text = exports.Text = _styledComponents.default.span(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  ", "\n  font-size: 14px;\n  white-space: nowrap;\n"])), function (_ref) {
+  var fontWeight = _ref.fontWeight;
+  return fontWeight && (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    font-weight: 600;\n  "])));
 });

package/_modules/themes/origin/src/components/DriversLocation/index.js CHANGED Viewed

@@ -251,6 +251,7 @@ var DriversLocation = exports.DriversLocation = function DriversLocation(props)
     return /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
       key: driver.id,
       driver: driver,
+      timeStatus: interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.time_status,
       lat: driver.location !== null ? driver.location.lat : defaultCenter.lat,
       lng: driver.location !== null ? driver.location.lng : defaultCenter.lng
     });
@@ -258,6 +259,7 @@ var DriversLocation = exports.DriversLocation = function DriversLocation(props)
     return /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
       key: driver.id,
       driver: driver,
+      timeStatus: interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.time_status,
       lat: driver.location !== null ? driver.location.lat : defaultCenter.lat,
       lng: driver.location !== null ? driver.location.lng : defaultCenter.lng
     });
@@ -265,6 +267,7 @@ var DriversLocation = exports.DriversLocation = function DriversLocation(props)
     return /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
       key: driver.id,
       driver: driver,
+      timeStatus: interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.time_status,
       lat: driver.location !== null ? driver.location.lat : defaultCenter.lat,
       lng: driver.location !== null ? driver.location.lng : defaultCenter.lng
     });
@@ -280,6 +283,7 @@ var DriversLocation = exports.DriversLocation = function DriversLocation(props)
     image: interActionMapOrder === null || interActionMapOrder === void 0 || (_interActionMapOrder$13 = interActionMapOrder.customer) === null || _interActionMapOrder$13 === void 0 ? void 0 : _interActionMapOrder$13.photo
   }), !(driverAvailable === 'online' || driverAvailable === 'offline') && interActionMapOrder !== null && (interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.driver) !== null && /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
     driver: interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.driver,
+    timeStatus: interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.time_status,
     lat: interActionOrderDriverLocation ? interActionOrderDriverLocation === null || interActionOrderDriverLocation === void 0 ? void 0 : interActionOrderDriverLocation.lat : defaultCenter.lat,
     lng: interActionOrderDriverLocation ? interActionOrderDriverLocation === null || interActionOrderDriverLocation === void 0 ? void 0 : interActionOrderDriverLocation.lng : defaultCenter.lng,
     image: interActionMapOrder === null || interActionMapOrder === void 0 || (_interActionMapOrder$14 = interActionMapOrder.driver) === null || _interActionMapOrder$14 === void 0 ? void 0 : _interActionMapOrder$14.photo

package/package.json CHANGED Viewed

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

package/src/components/Orders/DriverMapMarkerAndInfo/index.js CHANGED Viewed

@@ -11,7 +11,8 @@ import {
 } from './styles'
 export const DriverMapMarkerAndInfo = (props) => {
   const {
-    driver
+    driver,
+    timeStatus
   } = props
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -67,6 +68,13 @@ export const DriverMapMarkerAndInfo = (props) => {
         offline={!(driver.enabled && driver.available && !driver.busy)}
         onMouseOver={() => setInfoShow(true)}
         onMouseLeave={() => setInfoShow(false)}
+        borderColor={timeStatus === 'delayed'
+          ? '#E63757'
+          : !driver?.available
+            ? '#6c757d'
+            : driver.busy
+              ? '#007bff'
+              : '#28a745'}
       >
         {driver.photo ? (
           <MapMarkerImg bgimage={driver.photo} />

package/src/components/Orders/DriverMapMarkerAndInfo/styles.js CHANGED Viewed

@@ -5,16 +5,12 @@ export const WrapperMapMarker = styled.div`
   width: 50px;
   height: 50px;
   background: #9D9B9B;
-  border: 3px solid #F79B16;
+  border: 3px solid ${props => props.borderColor};
   border-radius: 100%;
   position: absolute;
   transform: translate(-50%, -100%);
   z-index: 1;
-  ${({ offline }) => offline && css`
-    border: 3px solid #9D9B9B;
-  `}
   &:after {
     content:'';
     position: absolute;
@@ -23,10 +19,7 @@ export const WrapperMapMarker = styled.div`
     margin-left: -22px;
     width: 0;
     height: 0;
-    border-top: solid 22px #F79B16;
-    ${({ offline }) => offline && css`
-      border-top: solid 22px #9D9B9B;
-    `}
+    border-top: solid 22px  ${props => props.borderColor};
     border-left: solid 22px transparent;
     border-right: solid 22px transparent;
     z-index: 10;

package/src/components/Orders/DriversLocation/index.js CHANGED Viewed

@@ -197,6 +197,7 @@ export const DriversLocation = React.memo((props) => {
                 <DriverMapMarkerAndInfo
                   key={driver.id}
                   driver={driver}
+                  timeStatus={selectedOrder?.time_status || (assignedOrders?.orders?.length && assignedOrders?.orders?.some(order => order.time_status === 'delayed') && 'delayed')}
                   lat={
                     (driver.location !== null && typeof driver.location === 'object' && driver.location?.lat)
                       ? driver.location.lat
@@ -232,6 +233,7 @@ export const DriversLocation = React.memo((props) => {
             {selectedOrder?.driver && (
               <DriverMapMarkerAndInfo
                 driver={selectedOrder?.driver}
+                timeStatus={selectedOrder?.time_status}
                 lat={
                   (selectedOrder?.driver?.location !== null && typeof selectedOrder?.driver?.location === 'object' && selectedOrder?.driver?.location?.lat)
                     ? selectedOrder?.driver?.location.lat

package/src/themes/origin/src/components/DriverMapMarkerAndInfo/index.js CHANGED Viewed

@@ -11,7 +11,8 @@ import {
 } from './styles'
 export const DriverMapMarkerAndInfo = (props) => {
   const {
-    driver
+    driver,
+    timeStatus
   } = props
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -67,6 +68,13 @@ export const DriverMapMarkerAndInfo = (props) => {
         offline={!(driver.enabled && driver.available && !driver.busy)}
         onMouseOver={() => setInfoShow(true)}
         onMouseLeave={() => setInfoShow(false)}
+        borderColor={timeStatus === 'delayed'
+          ? '#E63757'
+          : !driver?.available
+            ? '#6c757d'
+            : driver.busy
+              ? '#007bff'
+              : '#28a745'}
       >
         {driver.photo ? (
           <MapMarkerImg bgimage={driver.photo} />

package/src/themes/origin/src/components/DriverMapMarkerAndInfo/styles.js CHANGED Viewed

@@ -4,16 +4,12 @@ export const WrapperMapMarker = styled.div`
   width: 40px;
   height: 40px;
   background: ${props => props.theme.colors?.backgroundPage || '#FFF'};
-  border: 5px solid #F79B16;
+  border: 5px solid ${props => props.borderColor};
   box-shadow: 0px 3px 6px #00000029;
   border-radius: 6px;
   position: absolute;
   transform: translate(-50%, -50%);
   z-index: 1;
-  ${({ offline }) => offline && css`
-    border: 5px solid #9D9B9B;
-  `}
 `
 const MapMarkerImgStyled = styled.div`
   display: flex;

package/src/themes/origin/src/components/DriversLocation/index.js CHANGED Viewed

@@ -192,6 +192,7 @@ export const DriversLocation = (props) => {
             <DriverMapMarkerAndInfo
               key={driver.id}
               driver={driver}
+              timeStatus={interActionMapOrder?.time_status}
               lat={driver.location !== null ? driver.location.lat : defaultCenter.lat}
               lng={driver.location !== null ? driver.location.lng : defaultCenter.lng}
             />
@@ -201,6 +202,7 @@ export const DriversLocation = (props) => {
             <DriverMapMarkerAndInfo
               key={driver.id}
               driver={driver}
+              timeStatus={interActionMapOrder?.time_status}
               lat={driver.location !== null ? driver.location.lat : defaultCenter.lat}
               lng={driver.location !== null ? driver.location.lng : defaultCenter.lng}
             />
@@ -210,6 +212,7 @@ export const DriversLocation = (props) => {
             <DriverMapMarkerAndInfo
               key={driver.id}
               driver={driver}
+              timeStatus={interActionMapOrder?.time_status}
               lat={driver.location !== null ? driver.location.lat : defaultCenter.lat}
               lng={driver.location !== null ? driver.location.lng : defaultCenter.lng}
             />
@@ -235,6 +238,7 @@ export const DriversLocation = (props) => {
         {!(driverAvailable === 'online' || driverAvailable === 'offline') && interActionMapOrder !== null && interActionMapOrder?.driver !== null && (
           <InterActOrderMarker
             driver={interActionMapOrder?.driver}
+            timeStatus={interActionMapOrder?.time_status}
             lat={interActionOrderDriverLocation ? interActionOrderDriverLocation?.lat : defaultCenter.lat}
             lng={interActionOrderDriverLocation ? interActionOrderDriverLocation?.lng : defaultCenter.lng}
             image={interActionMapOrder?.driver?.photo}

/package/_bundles/{ordering-ui-admin.2b02fd282298d9889d94.js.LICENSE.txt → ordering-ui-admin.f1fc22aa29940039807a.js.LICENSE.txt} RENAMED Viewed

File without changes