ordering-ui-admin-external 1.33.1 → 1.35.0

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

@@ -45,7 +45,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
     onOrderRedirect = props.onOrderRedirect,
     numberOfOrdersBySubstatus = props.numberOfOrdersBySubstatus,
     timeStatus = props.timeStatus,
-    setTimeStatus = props.setTimeStatus;
+    setTimeStatus = props.setTimeStatus,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -135,7 +136,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
     timeStatus: timeStatus,
     ordersAmountByStatus: ordersAmountByStatus,
     setOrdersAmountByStatus: setOrdersAmountByStatus,
-    numberOfOrdersBySubstatus: numberOfOrdersBySubstatus
+    numberOfOrdersBySubstatus: numberOfOrdersBySubstatus,
+    isUseQuery: isUseQuery
   })))), isOpenOrderDetail && /*#__PURE__*/_react.default.createElement(_OrderDetails.OrderDetails, {
     open: isOpenOrderDetail,
     order: detailsOrder,

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

@@ -32,7 +32,8 @@ var DeliveryDashboard = function DeliveryDashboard(props) {
     handleOrdersStatusGroupFilter = props.handleOrdersStatusGroupFilter,
     handleSelectedSubOrderStatus = props.handleSelectedSubOrderStatus,
     ordersAmountByStatus = props.ordersAmountByStatus,
-    setOrdersAmountByStatus = props.setOrdersAmountByStatus;
+    setOrdersAmountByStatus = props.setOrdersAmountByStatus,
+    isUseQuery = props.isUseQuery;
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     interActionMapOrder = _useState2[0],
@@ -48,6 +49,7 @@ var DeliveryDashboard = function DeliveryDashboard(props) {
     }
   };
   return /*#__PURE__*/_react.default.createElement(_styles.DeliveryDashboardContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_styles.FilterContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
+    isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,
     changeOrderStatus: handleOrdersStatusGroupFilter,
     ordersAmountByStatus: ordersAmountByStatus
@@ -58,6 +60,7 @@ var DeliveryDashboard = function DeliveryDashboard(props) {
   })), /*#__PURE__*/_react.default.createElement(_styles.WrapperOrderlist, {
     id: "cardOrders"
   }, /*#__PURE__*/_react.default.createElement(_OrdersDashboardList.OrdersDashboardList, _extends({}, props, {
+    isUseQuery: isUseQuery,
     orderListView: "card",
     selectedOrderCard: interActionMapOrder,
     handleOrderCardClick: handleLocation,

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

@@ -37,7 +37,8 @@ var DriverSelectorUI = function DriverSelectorUI(props) {
     handleAssignDriver = props.handleAssignDriver,
     isTourOpen = props.isTourOpen,
     setCurrentTourStep = props.setCurrentTourStep,
-    handleOpenMessages = props.handleOpenMessages;
+    handleOpenMessages = props.handleOpenMessages,
+    setCommentInfostate = props.setCommentInfostate;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -164,10 +165,21 @@ var DriverSelectorUI = function DriverSelectorUI(props) {
     if (driverId === 'remove') {
       driverId = null;
     }
-    handleAssignDriver({
-      orderId: order.id,
-      driverId: driverId
-    });
+    if (driverId && setCommentInfostate) {
+      setCommentInfostate({
+        open: true,
+        driverId: driverId
+      });
+    } else {
+      setCommentInfostate && setCommentInfostate({
+        open: false,
+        driverId: null
+      });
+      handleAssignDriver({
+        orderId: order.id,
+        driverId: driverId
+      });
+    }
     if (isTourOpen && setCurrentTourStep) {
       handleOpenMessages('chat');
       setTimeout(function () {

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

@@ -21,7 +21,8 @@ var DriversDashboard = function DriversDashboard(props) {
     handleChangeDriver = props.handleChangeDriver,
     handleChangeDriverIsOnline = props.handleChangeDriverIsOnline,
     handleChangeDriversSubFilter = props.handleChangeDriversSubFilter,
-    handleOpenDriverOrders = props.handleOpenDriverOrders;
+    handleOpenDriverOrders = props.handleOpenDriverOrders,
+    assignedOrders = props.assignedOrders;
   var numberOfonlineDrivers = onlineDrivers.length;
   var numberOfofflineDrivers = offlineDrivers.length;
   var numberOfbusyDrivers = driversIsOnline ? onlineDrivers.filter(function (ele) {
@@ -59,7 +60,8 @@ var DriversDashboard = function DriversDashboard(props) {
     selectedDriver: selectedDriver,
     onlineDrivers: onlineDrivers,
     offlineDrivers: offlineDrivers,
-    driversList: driversList
+    driversList: driversList,
+    assignedOrders: assignedOrders
   })));
 };
 exports.DriversDashboard = DriversDashboard;

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

@@ -8,6 +8,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _googleMapReact = _interopRequireWildcard(require("google-map-react"));
 var _DriverMapMarkerAndInfo = require("../DriverMapMarkerAndInfo");
+var _InterActOrderMarker = require("../InterActOrderMarker");
+var _Shared = require("../../Shared");
 var _styles = require("./styles");
 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; }
@@ -20,11 +22,13 @@ 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 DriversLocation = function DriversLocation(props) {
-  var _configState$configs, _configState$configs2, _configState$configs3;
+  var _configState$configs, _configState$configs2, _configState$configs3, _selectedOrder$custom3, _selectedOrder$custom4, _selectedOrder$custom5, _selectedOrder$custom6, _selectedOrder$custom7, _selectedOrder$busine3, _selectedOrder$busine4, _selectedOrder$busine5, _assignedOrders$order4, _assignedOrders$order5;
   var driversIsOnline = props.driversIsOnline,
     onlineDrivers = props.onlineDrivers,
     offlineDrivers = props.offlineDrivers,
-    selectedDriver = props.selectedDriver;
+    selectedDriver = props.selectedDriver,
+    selectedOrder = props.selectedOrder,
+    assignedOrders = props.assignedOrders;
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];
@@ -59,8 +63,9 @@ var DriversLocation = function DriversLocation(props) {
     showDrivers = _useState10[0],
     setShowDrivers = _useState10[1];
   var mapFit = function mapFit() {
+    var _assignedOrders$order, _assignedOrders$order2;
     var bounds = new window.google.maps.LatLngBounds();
-    if (showDrivers.length === 1) {
+    if (showDrivers.length === 1 && !selectedOrder && !(assignedOrders !== null && assignedOrders !== void 0 && (_assignedOrders$order = assignedOrders.orders) !== null && _assignedOrders$order !== void 0 && _assignedOrders$order.length)) {
       var _showDrivers$0$locati, _showDrivers$0$locati2, _showDrivers$, _showDrivers$2;
       setMapCenter(showDrivers[0].location !== null && _typeof(showDrivers[0].location) === 'object' && (_showDrivers$0$locati = showDrivers[0].location) !== null && _showDrivers$0$locati !== void 0 && _showDrivers$0$locati.lat && (_showDrivers$0$locati2 = showDrivers[0].location) !== null && _showDrivers$0$locati2 !== void 0 && _showDrivers$0$locati2.lng ? showDrivers[0].location : typeof showDrivers[0].location === 'string' ? {
         lat: parseFloat((_showDrivers$ = showDrivers[0]) === null || _showDrivers$ === void 0 || (_showDrivers$ = _showDrivers$.location) === null || _showDrivers$ === void 0 ? void 0 : _showDrivers$.split(',')[0].replace(/[^-.0-9]/g, '')),
@@ -75,18 +80,39 @@ var DriversLocation = function DriversLocation(props) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var _driver$location, _driver$location2, _driver$location3, _driver$location4;
         var driver = _step.value;
-        var marker = driver.location !== null && _typeof(driver.location) === 'object' && (_driver$location = driver.location) !== null && _driver$location !== void 0 && _driver$location.lat && (_driver$location2 = driver.location) !== null && _driver$location2 !== void 0 && _driver$location2.lng ? driver.location : typeof (driver === null || driver === void 0 ? void 0 : driver.location) === 'string' ? {
+        var _marker = driver.location !== null && _typeof(driver.location) === 'object' && (_driver$location = driver.location) !== null && _driver$location !== void 0 && _driver$location.lat && (_driver$location2 = driver.location) !== null && _driver$location2 !== void 0 && _driver$location2.lng ? driver.location : typeof (driver === null || driver === void 0 ? void 0 : driver.location) === 'string' ? {
           lat: parseFloat(driver === null || driver === void 0 || (_driver$location3 = driver.location) === null || _driver$location3 === void 0 ? void 0 : _driver$location3.split(',')[0].replace(/[^-.0-9]/g, '')),
           lng: parseFloat(driver === null || driver === void 0 || (_driver$location4 = driver.location) === null || _driver$location4 === void 0 ? void 0 : _driver$location4.split(',')[1].replace(/[^-.0-9]/g, ''))
         } : defaultCenter;
-        var newPoint = new window.google.maps.LatLng(marker.lat, marker.lng);
-        bounds.extend(newPoint);
+        var _newPoint = new window.google.maps.LatLng(_marker.lat, _marker.lng);
+        bounds.extend(_newPoint);
       }
     } catch (err) {
       _iterator.e(err);
     } finally {
       _iterator.f();
     }
+    var marker, newPoint;
+    if (selectedDriver && selectedOrder) {
+      var _selectedOrder$busine, _selectedOrder$busine2, _selectedOrder$custom, _selectedOrder$custom2;
+      marker = (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine = selectedOrder.business) === null || _selectedOrder$busine === void 0 ? void 0 : _selectedOrder$busine.location) !== null ? selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine2 = selectedOrder.business) === null || _selectedOrder$busine2 === void 0 ? void 0 : _selectedOrder$busine2.location : defaultCenter;
+      newPoint = new window.google.maps.LatLng(marker.lat, marker.lng);
+      bounds.extend(newPoint);
+      marker = (selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$custom = selectedOrder.customer) === null || _selectedOrder$custom === void 0 ? void 0 : _selectedOrder$custom.location) !== null && selectedOrder !== null && selectedOrder !== void 0 && (_selectedOrder$custom2 = selectedOrder.customer) !== null && _selectedOrder$custom2 !== void 0 && (_selectedOrder$custom2 = _selectedOrder$custom2.location) !== null && _selectedOrder$custom2 !== void 0 && _selectedOrder$custom2.lat ? selectedOrder.customer.location : defaultCenter;
+      newPoint = new window.google.maps.LatLng(marker.lat, marker.lng);
+      bounds.extend(newPoint);
+    }
+    if (selectedDriver && assignedOrders !== null && assignedOrders !== void 0 && (_assignedOrders$order2 = assignedOrders.orders) !== null && _assignedOrders$order2 !== void 0 && _assignedOrders$order2.length) {
+      assignedOrders.orders.forEach(function (order) {
+        var _order$business, _order$business2, _order$customer, _order$customer2;
+        marker = (order === null || order === void 0 || (_order$business = order.business) === null || _order$business === void 0 ? void 0 : _order$business.location) !== null ? order === null || order === void 0 || (_order$business2 = order.business) === null || _order$business2 === void 0 ? void 0 : _order$business2.location : defaultCenter;
+        newPoint = new window.google.maps.LatLng(marker.lat, marker.lng);
+        bounds.extend(newPoint);
+        marker = (order === null || order === void 0 || (_order$customer = order.customer) === null || _order$customer === void 0 ? void 0 : _order$customer.location) !== null && order !== null && order !== void 0 && (_order$customer2 = order.customer) !== null && _order$customer2 !== void 0 && (_order$customer2 = _order$customer2.location) !== null && _order$customer2 !== void 0 && _order$customer2.lat ? order.customer.location : defaultCenter;
+        newPoint = new window.google.maps.LatLng(marker.lat, marker.lng);
+        bounds.extend(newPoint);
+      });
+    }
     var newBounds = {
       ne: {
         lat: bounds.getNorthEast().lat(),
@@ -111,6 +137,7 @@ var DriversLocation = function DriversLocation(props) {
 
   // Fit bounds on mount, and when the markers change
   (0, _react.useEffect)(function () {
+    var _assignedOrders$order3;
     if (mapLoaded) return;
     if (showDrivers.length === 0) {
       setMapZoom(defaultZoom);
@@ -118,10 +145,14 @@ var DriversLocation = function DriversLocation(props) {
       setMapFitted(false);
       return;
     }
+    if (selectedOrder && selectedDriver || selectedDriver && assignedOrders !== null && assignedOrders !== void 0 && (_assignedOrders$order3 = assignedOrders.orders) !== null && _assignedOrders$order3 !== void 0 && _assignedOrders$order3.length) {
+      mapFit();
+      return;
+    }
     if (!mapFitted) {
       mapFit();
     }
-  }, [showDrivers, mapLoaded, mapFitted]);
+  }, [showDrivers, mapLoaded, mapFitted, selectedOrder, assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.orders]);
   (0, _react.useEffect)(function () {
     if (selectedDriver) {
       setShowDrivers([selectedDriver]);
@@ -140,7 +171,9 @@ var DriversLocation = function DriversLocation(props) {
     if (!(selectedDriver !== null && selectedDriver !== void 0 && selectedDriver.id)) return;
     setMapFitted(false);
   }, [selectedDriver === null || selectedDriver === void 0 ? void 0 : selectedDriver.id]);
-  return /*#__PURE__*/_react.default.createElement(_styles.WrapperMap, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, selectedDriver && (assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.loading) && /*#__PURE__*/_react.default.createElement(_Shared.SpinnerLoader, {
+    primary: true
+  }), /*#__PURE__*/_react.default.createElement(_styles.WrapperMap, {
     ref: mapRef,
     className: "drivers-location"
   }, googleMapsApiKey && /*#__PURE__*/_react.default.createElement(_googleMapReact.default, {
@@ -171,6 +204,34 @@ var DriversLocation = function DriversLocation(props) {
       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
     });
-  })));
+  }), selectedDriver && selectedOrder && /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
+    customer: selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.customer,
+    lat: selectedOrder !== null && selectedOrder !== void 0 && (_selectedOrder$custom3 = selectedOrder.customer) !== null && _selectedOrder$custom3 !== void 0 && (_selectedOrder$custom3 = _selectedOrder$custom3.location) !== null && _selectedOrder$custom3 !== void 0 && _selectedOrder$custom3.lat ? selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$custom4 = selectedOrder.customer) === null || _selectedOrder$custom4 === void 0 || (_selectedOrder$custom4 = _selectedOrder$custom4.location) === null || _selectedOrder$custom4 === void 0 ? void 0 : _selectedOrder$custom4.lat : defaultCenter.lat,
+    lng: selectedOrder !== null && selectedOrder !== void 0 && (_selectedOrder$custom5 = selectedOrder.customer) !== null && _selectedOrder$custom5 !== void 0 && (_selectedOrder$custom5 = _selectedOrder$custom5.location) !== null && _selectedOrder$custom5 !== void 0 && _selectedOrder$custom5.lng ? selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$custom6 = selectedOrder.customer) === null || _selectedOrder$custom6 === void 0 || (_selectedOrder$custom6 = _selectedOrder$custom6.location) === null || _selectedOrder$custom6 === void 0 ? void 0 : _selectedOrder$custom6.lng : defaultCenter.lng,
+    image: selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$custom7 = selectedOrder.customer) === null || _selectedOrder$custom7 === void 0 ? void 0 : _selectedOrder$custom7.photo
+  }), selectedDriver && selectedOrder && /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
+    business: selectedOrder === null || selectedOrder === void 0 ? void 0 : selectedOrder.business,
+    lat: selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine3 = selectedOrder.business) === null || _selectedOrder$busine3 === void 0 || (_selectedOrder$busine3 = _selectedOrder$busine3.location) === null || _selectedOrder$busine3 === void 0 ? void 0 : _selectedOrder$busine3.lat,
+    lng: selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine4 = selectedOrder.business) === null || _selectedOrder$busine4 === void 0 || (_selectedOrder$busine4 = _selectedOrder$busine4.location) === null || _selectedOrder$busine4 === void 0 ? void 0 : _selectedOrder$busine4.lng,
+    image: selectedOrder === null || selectedOrder === void 0 || (_selectedOrder$busine5 = selectedOrder.business) === null || _selectedOrder$busine5 === void 0 ? void 0 : _selectedOrder$busine5.logo
+  }), selectedDriver && (assignedOrders === null || assignedOrders === void 0 || (_assignedOrders$order4 = assignedOrders.orders) === null || _assignedOrders$order4 === void 0 ? void 0 : _assignedOrders$order4.length) > 0 && 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,
+      customer: order === null || order === void 0 ? void 0 : order.customer,
+      lat: order !== null && order !== void 0 && (_order$customer3 = order.customer) !== null && _order$customer3 !== void 0 && (_order$customer3 = _order$customer3.location) !== null && _order$customer3 !== void 0 && _order$customer3.lat ? order === null || order === void 0 || (_order$customer4 = order.customer) === null || _order$customer4 === void 0 || (_order$customer4 = _order$customer4.location) === null || _order$customer4 === void 0 ? void 0 : _order$customer4.lat : defaultCenter.lat,
+      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 && assignedOrders.orders.map(function (order) {
+    var _order$business3, _order$business4, _order$business5;
+    return /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
+      key: order.id,
+      business: order === null || order === void 0 ? void 0 : order.business,
+      lat: order === null || order === void 0 || (_order$business3 = order.business) === null || _order$business3 === void 0 || (_order$business3 = _order$business3.location) === null || _order$business3 === void 0 ? void 0 : _order$business3.lat,
+      lng: order === null || order === void 0 || (_order$business4 = order.business) === null || _order$business4 === void 0 || (_order$business4 = _order$business4.location) === null || _order$business4 === void 0 ? void 0 : _order$business4.lng,
+      image: order === null || order === void 0 || (_order$business5 = order.business) === null || _order$business5 === void 0 ? void 0 : _order$business5.logo
+    });
+  }))));
 };
 exports.DriversLocation = DriversLocation;

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

@@ -37,7 +37,9 @@ var DriversManagerUI = function DriversManagerUI(props) {
   var onDriverRedirect = props.onDriverRedirect,
     handleChangeSearch = props.handleChangeSearch,
     searchValue = props.searchValue,
-    driversIsOnline = props.driversIsOnline;
+    driversIsOnline = props.driversIsOnline,
+    selectedDriver = props.selectedDriver,
+    setSelectedDriver = props.setSelectedDriver;
   var _props$driversList = props.driversList,
     drivers = _props$driversList.drivers,
     loading = _props$driversList.loading;
@@ -59,12 +61,8 @@ var DriversManagerUI = function DriversManagerUI(props) {
     setIsOpenDriverOrders = _useState2[1];
   var _useState3 = (0, _react.useState)(null),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectedDriver = _useState4[0],
-    setSelectedDriver = _useState4[1];
-  var _useState5 = (0, _react.useState)(null),
-    _useState6 = _slicedToArray(_useState5, 2),
-    openDriver = _useState6[0],
-    setOpenDriver = _useState6[1];
+    openDriver = _useState4[0],
+    setOpenDriver = _useState4[1];
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenDriverOrders(false);
     onDriverRedirect();

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

@@ -10,7 +10,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var DriversContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  flex: 1;\n  transition: all 0.5s;\n  padding: 20px;\n  box-sizing: border-box;\n  max-height: 100vh;\n  overflow: auto;\n\n  @media print {\n    display: none;\n  }\n"])));
+var DriversContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  flex: 1;\n  transition: all 0.5s;\n  padding: 20px;\n  box-sizing: border-box;\n  max-height: 100vh;\n  overflow-x: hidden;\n\n  @media print {\n    display: none;\n  }\n"])));
 exports.DriversContainer = DriversContainer;
 var DriversHeader = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n\n  > div:last-child {\n    margin-top: 20px;\n  }\n\n  input {\n    background: ", ";\n    border: none;\n  }\n\n  @media (min-width: 768px) {\n    flex-direction: row;\n    align-items: center;\n    justify-content: space-between;\n\n    > div:last-child {\n      margin-top: 0px;\n    }\n  }\n"])), function (props) {
   return props.theme.colors.secundary;

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

@@ -5,15 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GiftCardsListing = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _InfoShareContext = require("../../../contexts/InfoShareContext");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -36,7 +40,8 @@ var GiftCardsListingUI = function GiftCardsListingUI(props) {
     setActiveStatus = props.setActiveStatus,
     getGiftCards = props.getGiftCards,
     searchValue = props.searchValue,
-    onSearch = props.onSearch;
+    onSearch = props.onSearch,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -44,6 +49,8 @@ var GiftCardsListingUI = function GiftCardsListingUI(props) {
     _useInfoShare2 = _slicedToArray(_useInfoShare, 2),
     isCollapse = _useInfoShare2[0].isCollapse,
     handleMenuCollapse = _useInfoShare2[1].handleMenuCollapse;
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultStatus = query.get('status');
   var handleChangePage = function handleChangePage(page) {
     getGiftCards(page, paginationProps.pageSize);
   };
@@ -51,6 +58,31 @@ var GiftCardsListingUI = function GiftCardsListingUI(props) {
     var expectedPage = Math.ceil(paginationProps.from / pageSize);
     getGiftCards(expectedPage, pageSize);
   };
+  var handleChangeStatus = function handleChangeStatus(status) {
+    setActiveStatus(status);
+    if (isUseQuery) {
+      (0, _utils.addQueryToUrl)({
+        status: status
+      });
+    }
+  };
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery) return;
+    if (defaultStatus) {
+      setActiveStatus(defaultStatus);
+      return;
+    }
+    (0, _utils.addQueryToUrl)({
+      status: 'pending'
+    });
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderTitle, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
@@ -65,12 +97,12 @@ var GiftCardsListingUI = function GiftCardsListingUI(props) {
   }))), /*#__PURE__*/_react.default.createElement(_styles2.TabsWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
     active: activeStatus === 'pending',
     onClick: function onClick() {
-      return setActiveStatus('pending');
+      return handleChangeStatus('pending');
     }
   }, t('ORDER_PENDING', 'Pending')), /*#__PURE__*/_react.default.createElement(_styles2.Tab, {
     active: activeStatus === 'activated',
     onClick: function onClick() {
-      return setActiveStatus('activated');
+      return handleChangeStatus('activated');
     }
   }, t('REDEEMED', 'Redeemed'))), /*#__PURE__*/_react.default.createElement(_styles2.GiftCardsTableWrapper, null, /*#__PURE__*/_react.default.createElement("table", null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('ID', 'ID')), /*#__PURE__*/_react.default.createElement("th", null, t('PURCHASED_BY', 'Purchased by')), /*#__PURE__*/_react.default.createElement("th", null, t('REDEEMED_BY', 'Redeemed by')), /*#__PURE__*/_react.default.createElement("th", null, t('PURCHASED_DATE', 'Purchased date')), /*#__PURE__*/_react.default.createElement("th", null, t('REDEEMED_DATE', 'Redeemed date')))), giftCards.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement(_styles2.GiftCardRow, {
@@ -132,12 +164,21 @@ var GiftCardsListingUI = function GiftCardsListingUI(props) {
   })));
 };
 var GiftCardsListing = function GiftCardsListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultStatus = query.get('status');
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var giftCardsProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: GiftCardsListingUI,
     isSearchById: true,
     isSearchByAuthorName: true,
     isSearchByAuthorEmail: true,
-    isSearchByAuthorPhone: true
+    isSearchByAuthorPhone: true,
+    defaultStatus: defaultStatus,
+    paginationSettings: {
+      initialPage: Number(defaultPage),
+      pageSize: Number(defaultPageSize)
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.GiftCardsList, giftCardsProps);
 };

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

@@ -15,6 +15,7 @@ var _AiOutlineInfoCircle = _interopRequireDefault(require("@meronex/icons/ai/AiO
 var _MdcCloseOctagonOutline = _interopRequireDefault(require("@meronex/icons/mdc/MdcCloseOctagonOutline"));
 var _MdClose = _interopRequireDefault(require("@meronex/icons/md/MdClose"));
 var _reactBootstrap = require("react-bootstrap");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 var _Shared = require("../../Shared");
 var _styles2 = require("../../../styles");
@@ -64,7 +65,6 @@ var MessagesUI = function MessagesUI(props) {
     setCurrentTourStep = props.setCurrentTourStep,
     orderDetailClose = props.orderDetailClose,
     getHistoryComment = props.getHistoryComment;
-  var routerHistory = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -318,9 +318,9 @@ var MessagesUI = function MessagesUI(props) {
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setTabActive(tab);
     if (!isInitialRender) {
-      var orderId = query.get('id');
-      var section = query.get('section');
-      routerHistory.replace("".concat(location.pathname, "?id=").concat(orderId, "&section=").concat(section, "&tab=").concat(tab));
+      (0, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -30,7 +30,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 OrderContactInformation = function OrderContactInformation(props) {
-  var _configs$google_maps_, _order$business, _order$business2, _order$business3, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$business9, _order$business10, _order$business11, _order$business12, _order$business13, _order$business14, _order$business15, _order$customer, _order$customer2, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _order$customer11, _order$customer12, _order$customer13, _ref2, _customerInfoState$cu, _customerInfoState$cu2, _order$customer17, _ref3, _customerInfoState$cu3, _customerInfoState$cu4, _order$customer18, _order$customer$addre, _order$customer19, _configs$country_auto, _order$customer20, _order$customer21, _order$customer22, _order$customer23, _order$customer24, _order$customer25, _order$customer26, _order$customer27, _order$customer28, _order$customer29, _order$customer30, _order$customer31, _order$customer32, _order$customer33, _order$customer34, _order$customer35, _order$customer36, _order$customer37, _order$customer38, _order$customer39, _order$customer40, _order$customer41, _order$customer42, _order$customer43, _order$driver_company, _order$driver_id, _order$driver, _order$driver2, _order$driver3, _order$driver4, _order$driver5, _order$driver6, _order$driver7;
+  var _configs$google_maps_, _order$business, _order$business2, _order$business3, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$business9, _order$business10, _order$business11, _order$business12, _order$business13, _order$business14, _order$business15, _order$customer, _order$customer2, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _order$customer11, _order$customer12, _order$customer13, _ref2, _customerInfoState$cu, _customerInfoState$cu2, _order$customer17, _ref3, _customerInfoState$cu3, _customerInfoState$cu4, _order$customer18, _order$customer$addre, _order$customer19, _configs$country_auto, _ref4, _customerInfoState$cu5, _customerInfoState$cu6, _order$customer20, _order$customer21, _order$customer22, _order$customer23, _order$customer24, _order$customer25, _order$customer26, _order$customer27, _order$customer28, _order$customer29, _order$customer30, _order$customer31, _order$customer32, _order$customer33, _order$customer34, _order$customer35, _order$customer36, _order$customer37, _order$customer38, _order$customer39, _order$customer40, _order$customer41, _order$customer42, _order$customer43, _order$customer44, _order$driver_company, _ref5, _commentInfoState$dri, _order$driver, _order$driver2, _order$driver3, _order$driver4, _order$driver5, _order$driver6, _order$driver7;
   var order = props.order,
     customerInfoState = props.customerInfoState,
     handleChangeCustomerInfoState = props.handleChangeCustomerInfoState,
@@ -39,8 +39,9 @@ var OrderContactInformation = function OrderContactInformation(props) {
     handleOpenMessages = props.handleOpenMessages,
     isServiceOrder = props.isServiceOrder,
     handleUpdateCustomerInfo = props.handleUpdateCustomerInfo,
-    setIsCommentPopup = props.setIsCommentPopup,
-    setAddressState = props.setAddressState;
+    setAddressState = props.setAddressState,
+    setCommentInfostate = props.setCommentInfostate,
+    commentInfoState = props.commentInfoState;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -66,7 +67,6 @@ var OrderContactInformation = function OrderContactInformation(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     isEdit = _useState6[0],
     setIsEdit = _useState6[1];
-  console.log(customerInfoState, 'customerInfoState');
   var pastOrderStatuses = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17];
   var handleReviewCustomer = function handleReviewCustomer(customer) {
     setCurrentCustomer(customer);
@@ -187,22 +187,30 @@ var OrderContactInformation = function OrderContactInformation(props) {
     defaultValue: (_order$customer$addre = order === null || order === void 0 || (_order$customer19 = order.customer) === null || _order$customer19 === void 0 ? void 0 : _order$customer19.address) !== null && _order$customer$addre !== void 0 ? _order$customer$addre : '',
     autoComplete: "new-password",
     countryCode: (configs === null || configs === void 0 || (_configs$country_auto = configs.country_autocomplete) === null || _configs$country_auto === void 0 ? void 0 : _configs$country_auto.value) || '*'
+  }), /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    placeholder: t('NOTES', 'Notes'),
+    defaultValue: (_ref4 = (_customerInfoState$cu5 = customerInfoState === null || customerInfoState === void 0 || (_customerInfoState$cu6 = customerInfoState.customer) === null || _customerInfoState$cu6 === void 0 ? void 0 : _customerInfoState$cu6.address_notes) !== null && _customerInfoState$cu5 !== void 0 ? _customerInfoState$cu5 : order === null || order === void 0 || (_order$customer20 = order.customer) === null || _order$customer20 === void 0 ? void 0 : _order$customer20.address_notes) !== null && _ref4 !== void 0 ? _ref4 : '',
+    onChange: function onChange(e) {
+      handleChangeCustomerInfoState({
+        address_notes: e.target.value
+      });
+    }
   }), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     color: "primary",
     onClick: handleUpdateCustomer
-  }, customerInfoState !== null && customerInfoState !== void 0 && customerInfoState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save'))) : /*#__PURE__*/_react.default.createElement(_styles2.CustomerInfoTable, null, /*#__PURE__*/_react.default.createElement("tbody", null, (order === null || order === void 0 || (_order$customer20 = order.customer) === null || _order$customer20 === void 0 ? void 0 : _order$customer20.cellphone) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('CELLPHONE', 'Phone / Mobile')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
-    href: "tel:".concat(order !== null && order !== void 0 && (_order$customer21 = order.customer) !== null && _order$customer21 !== void 0 && _order$customer21.country_phone_code ? '+' + (order === null || order === void 0 || (_order$customer22 = order.customer) === null || _order$customer22 === void 0 ? void 0 : _order$customer22.country_phone_code) : '').concat(order === null || order === void 0 || (_order$customer23 = order.customer) === null || _order$customer23 === void 0 ? void 0 : _order$customer23.cellphone)
-  }, (order === null || order === void 0 || (_order$customer24 = order.customer) === null || _order$customer24 === void 0 ? void 0 : _order$customer24.country_phone_code) && "+".concat(order === null || order === void 0 || (_order$customer25 = order.customer) === null || _order$customer25 === void 0 ? void 0 : _order$customer25.country_phone_code), " ", order === null || order === void 0 || (_order$customer26 = order.customer) === null || _order$customer26 === void 0 ? void 0 : _order$customer26.cellphone))), (order === null || order === void 0 || (_order$customer27 = order.customer) === null || _order$customer27 === void 0 ? void 0 : _order$customer27.email) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('EMAIL', 'Email')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
-    href: "mailto: ".concat(order === null || order === void 0 || (_order$customer28 = order.customer) === null || _order$customer28 === void 0 ? void 0 : _order$customer28.email)
-  }, order === null || order === void 0 || (_order$customer29 = order.customer) === null || _order$customer29 === void 0 ? void 0 : _order$customer29.email))), !!(order !== null && order !== void 0 && (_order$customer30 = order.customer) !== null && _order$customer30 !== void 0 && _order$customer30.address) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('CHECKOUT_FULL_ADDRESS', 'Full address')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
-    href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer31 = order.customer) === null || _order$customer31 === void 0 ? void 0 : _order$customer31.address),
+  }, customerInfoState !== null && customerInfoState !== void 0 && customerInfoState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save'))) : /*#__PURE__*/_react.default.createElement(_styles2.CustomerInfoTable, null, /*#__PURE__*/_react.default.createElement("tbody", null, (order === null || order === void 0 || (_order$customer21 = order.customer) === null || _order$customer21 === void 0 ? void 0 : _order$customer21.cellphone) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('CELLPHONE', 'Phone / Mobile')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
+    href: "tel:".concat(order !== null && order !== void 0 && (_order$customer22 = order.customer) !== null && _order$customer22 !== void 0 && _order$customer22.country_phone_code ? '+' + (order === null || order === void 0 || (_order$customer23 = order.customer) === null || _order$customer23 === void 0 ? void 0 : _order$customer23.country_phone_code) : '').concat(order === null || order === void 0 || (_order$customer24 = order.customer) === null || _order$customer24 === void 0 ? void 0 : _order$customer24.cellphone)
+  }, (order === null || order === void 0 || (_order$customer25 = order.customer) === null || _order$customer25 === void 0 ? void 0 : _order$customer25.country_phone_code) && "+".concat(order === null || order === void 0 || (_order$customer26 = order.customer) === null || _order$customer26 === void 0 ? void 0 : _order$customer26.country_phone_code), " ", order === null || order === void 0 || (_order$customer27 = order.customer) === null || _order$customer27 === void 0 ? void 0 : _order$customer27.cellphone))), (order === null || order === void 0 || (_order$customer28 = order.customer) === null || _order$customer28 === void 0 ? void 0 : _order$customer28.email) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('EMAIL', 'Email')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
+    href: "mailto: ".concat(order === null || order === void 0 || (_order$customer29 = order.customer) === null || _order$customer29 === void 0 ? void 0 : _order$customer29.email)
+  }, order === null || order === void 0 || (_order$customer30 = order.customer) === null || _order$customer30 === void 0 ? void 0 : _order$customer30.email))), !!(order !== null && order !== void 0 && (_order$customer31 = order.customer) !== null && _order$customer31 !== void 0 && _order$customer31.address) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('CHECKOUT_FULL_ADDRESS', 'Full address')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
+    href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer32 = order.customer) === null || _order$customer32 === void 0 ? void 0 : _order$customer32.address),
     rel: "noopener noreferrer",
     target: "_blank"
-  }, order === null || order === void 0 || (_order$customer32 = order.customer) === null || _order$customer32 === void 0 ? void 0 : _order$customer32.address))), !!(order !== null && order !== void 0 && (_order$customer33 = order.customer) !== null && _order$customer33 !== void 0 && _order$customer33.location) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('LOCATION', 'Location')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
-    href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer34 = order.customer) === null || _order$customer34 === void 0 || (_order$customer34 = _order$customer34.location) === null || _order$customer34 === void 0 ? void 0 : _order$customer34.lat, ",").concat(order === null || order === void 0 || (_order$customer35 = order.customer) === null || _order$customer35 === void 0 || (_order$customer35 = _order$customer35.location) === null || _order$customer35 === void 0 ? void 0 : _order$customer35.lng),
+  }, order === null || order === void 0 || (_order$customer33 = order.customer) === null || _order$customer33 === void 0 ? void 0 : _order$customer33.address))), !!(order !== null && order !== void 0 && (_order$customer34 = order.customer) !== null && _order$customer34 !== void 0 && _order$customer34.location) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('LOCATION', 'Location')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
+    href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer35 = order.customer) === null || _order$customer35 === void 0 || (_order$customer35 = _order$customer35.location) === null || _order$customer35 === void 0 ? void 0 : _order$customer35.lat, ",").concat(order === null || order === void 0 || (_order$customer36 = order.customer) === null || _order$customer36 === void 0 || (_order$customer36 = _order$customer36.location) === null || _order$customer36 === void 0 ? void 0 : _order$customer36.lng),
     rel: "noopener noreferrer",
     target: "_blank"
-  }, order === null || order === void 0 || (_order$customer36 = order.customer) === null || _order$customer36 === void 0 || (_order$customer36 = _order$customer36.location) === null || _order$customer36 === void 0 ? void 0 : _order$customer36.lat, ", ", order === null || order === void 0 || (_order$customer37 = order.customer) === null || _order$customer37 === void 0 || (_order$customer37 = _order$customer37.location) === null || _order$customer37 === void 0 ? void 0 : _order$customer37.lng))), !!(order !== null && order !== void 0 && (_order$customer38 = order.customer) !== null && _order$customer38 !== void 0 && _order$customer38.internal_number) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('INTERNAL_NUMBER', 'Internal number')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer39 = order.customer) === null || _order$customer39 === void 0 ? void 0 : _order$customer39.internal_number)), !!(order !== null && order !== void 0 && (_order$customer40 = order.customer) !== null && _order$customer40 !== void 0 && _order$customer40.address_notes) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('NOTES', 'Notes')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer41 = order.customer) === null || _order$customer41 === void 0 ? void 0 : _order$customer41.address_notes)), !!(order !== null && order !== void 0 && (_order$customer42 = order.customer) !== null && _order$customer42 !== void 0 && _order$customer42.zipcode) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ZIPCODE', 'Zipcode')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer43 = order.customer) === null || _order$customer43 === void 0 ? void 0 : _order$customer43.zipcode)), !!(order !== null && order !== void 0 && order.on_behalf_of) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ON_BEHALF_OF', 'On behalf of')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 ? void 0 : order.on_behalf_of))))))), (order === null || order === void 0 ? void 0 : order.delivery_type) === 1 && !isServiceOrder && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(order !== null && order !== void 0 && order.driver_id) && /*#__PURE__*/_react.default.createElement(_styles2.CompanySelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_COMPANY', 'Driver company')), /*#__PURE__*/_react.default.createElement(_CompanySelector.CompanySelector, {
+  }, order === null || order === void 0 || (_order$customer37 = order.customer) === null || _order$customer37 === void 0 || (_order$customer37 = _order$customer37.location) === null || _order$customer37 === void 0 ? void 0 : _order$customer37.lat, ", ", order === null || order === void 0 || (_order$customer38 = order.customer) === null || _order$customer38 === void 0 || (_order$customer38 = _order$customer38.location) === null || _order$customer38 === void 0 ? void 0 : _order$customer38.lng))), !!(order !== null && order !== void 0 && (_order$customer39 = order.customer) !== null && _order$customer39 !== void 0 && _order$customer39.internal_number) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('INTERNAL_NUMBER', 'Internal number')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer40 = order.customer) === null || _order$customer40 === void 0 ? void 0 : _order$customer40.internal_number)), !!(order !== null && order !== void 0 && (_order$customer41 = order.customer) !== null && _order$customer41 !== void 0 && _order$customer41.address_notes) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('NOTES', 'Notes')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer42 = order.customer) === null || _order$customer42 === void 0 ? void 0 : _order$customer42.address_notes)), !!(order !== null && order !== void 0 && (_order$customer43 = order.customer) !== null && _order$customer43 !== void 0 && _order$customer43.zipcode) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ZIPCODE', 'Zipcode')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer44 = order.customer) === null || _order$customer44 === void 0 ? void 0 : _order$customer44.zipcode)), !!(order !== null && order !== void 0 && order.on_behalf_of) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ON_BEHALF_OF', 'On behalf of')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 ? void 0 : order.on_behalf_of))))))), (order === null || order === void 0 ? void 0 : order.delivery_type) === 1 && !isServiceOrder && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(order !== null && order !== void 0 && order.driver_id) && /*#__PURE__*/_react.default.createElement(_styles2.CompanySelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_COMPANY', 'Driver company')), /*#__PURE__*/_react.default.createElement(_CompanySelector.CompanySelector, {
     small: true,
     isPhoneView: true,
     defaultValue: (_order$driver_company = order === null || order === void 0 ? void 0 : order.driver_company_id) !== null && _order$driver_company !== void 0 ? _order$driver_company : 'default',
@@ -212,17 +220,17 @@ var OrderContactInformation = function OrderContactInformation(props) {
     handleOpenMessages: handleOpenMessages,
     isOrderDrivers: true,
     orderId: order === null || order === void 0 ? void 0 : order.id
-  })), !(order !== null && order !== void 0 && order.driver_company_id) && /*#__PURE__*/_react.default.createElement(_styles2.DriverSelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_ASSIGN', 'Driver assign')), /*#__PURE__*/_react.default.createElement(_DriverSelector.DriverSelector, {
+  })), !(order !== null && order !== void 0 && order.driver_company_id) && !(commentInfoState !== null && commentInfoState !== void 0 && commentInfoState.open) && /*#__PURE__*/_react.default.createElement(_styles2.DriverSelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_ASSIGN', 'Driver assign')), /*#__PURE__*/_react.default.createElement(_DriverSelector.DriverSelector, {
     small: true,
     isPhoneView: true,
-    defaultValue: (_order$driver_id = order === null || order === void 0 ? void 0 : order.driver_id) !== null && _order$driver_id !== void 0 ? _order$driver_id : 'default',
+    defaultValue: (_ref5 = (_commentInfoState$dri = commentInfoState === null || commentInfoState === void 0 ? void 0 : commentInfoState.driverId) !== null && _commentInfoState$dri !== void 0 ? _commentInfoState$dri : order === null || order === void 0 ? void 0 : order.driver_id) !== null && _ref5 !== void 0 ? _ref5 : 'default',
     order: order,
     isTourOpen: isTourOpen,
     setCurrentTourStep: setCurrentTourStep,
     handleOpenMessages: handleOpenMessages,
     isOrderDrivers: true,
     orderId: order === null || order === void 0 ? void 0 : order.id,
-    setIsCommentPopup: setIsCommentPopup
+    setCommentInfostate: setCommentInfostate
   })), /*#__PURE__*/_react.default.createElement(_styles2.DriverInfoContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.DriverInfo, null, /*#__PURE__*/_react.default.createElement(_styles2.PhotoWrapper, null, order !== null && order !== void 0 && (_order$driver = order.driver) !== null && _order$driver !== void 0 && _order$driver.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Photo, {
     bgimage: optimizeImage(order === null || order === void 0 || (_order$driver2 = order.driver) === null || _order$driver2 === void 0 ? void 0 : _order$driver2.photo, 'h_50,c_limit')
   }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), order.driver_id ? /*#__PURE__*/_react.default.createElement(_styles2.InfoContent, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, order === null || order === void 0 || (_order$driver3 = order.driver) === null || _order$driver3 === void 0 ? void 0 : _order$driver3.name, " ", order === null || order === void 0 || (_order$driver4 = order.driver) === null || _order$driver4 === void 0 ? void 0 : _order$driver4.middle_name, " ", order === null || order === void 0 || (_order$driver5 = order.driver) === null || _order$driver5 === void 0 ? void 0 : _order$driver5.lastname, " ", order === null || order === void 0 || (_order$driver6 = order.driver) === null || _order$driver6 === void 0 ? void 0 : _order$driver6.second_lastname), (order === null || order === void 0 || (_order$driver7 = order.driver) === null || _order$driver7 === void 0 ? void 0 : _order$driver7.cellphone) && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
@@ -245,10 +253,10 @@ var OrderContactInformation = function OrderContactInformation(props) {
   })));
 };
 exports.OrderContactInformation = OrderContactInformation;
-var ContextAwareToggle = function ContextAwareToggle(_ref4) {
-  var children = _ref4.children,
-    eventKey = _ref4.eventKey,
-    callback = _ref4.callback;
+var ContextAwareToggle = function ContextAwareToggle(_ref6) {
+  var children = _ref6.children,
+    eventKey = _ref6.eventKey,
+    callback = _ref6.callback;
   var currentEventKey = (0, _react.useContext)(_reactBootstrap.AccordionContext);
   var decoratedOnClick = (0, _reactBootstrap.useAccordionToggle)(eventKey, function () {
     return callback && callback(eventKey);

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

@@ -215,7 +215,7 @@ var StatusBlock = function StatusBlock(props) {
       return handleMiuteChange(e);
     },
     onKeyPress: function onKeyPress(e) {
-      if (!/^[0-9.]$/.test(e.key)) {
+      if (!/^-?\d*$/.test(e.target.value)) {
         e.preventDefault();
       }
     }