ordering-ui-admin-external 1.38.3 → 1.38.5

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

@@ -260,12 +260,7 @@ var HomeUI = function HomeUI(props) {
       }));
     }));
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.HomeContainer, null, width > 997 && !isEnabledWhiteLabelModule && /*#__PURE__*/_react.default.createElement(_styles.OrderingButtonWrapper, null, /*#__PURE__*/_react.default.createElement("span", null, t('WHAT_DO_YOU_WANT_SEE_ORDERING', 'What do you want to see in ordering?')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
-    color: "primary",
-    onClick: function onClick() {
-      return setShowForm(true);
-    }
-  }, t('CLICK_HERE', 'Click here'))), /*#__PURE__*/_react.default.createElement(_styles.Breadcrumb, null, isCollapse && /*#__PURE__*/_react.default.createElement(_Buttons.IconButton, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.HomeContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Breadcrumb, null, isCollapse && /*#__PURE__*/_react.default.createElement(_Buttons.IconButton, {
     color: "black",
     onClick: function onClick() {
       return handleMenuCollapse(false);
@@ -284,12 +279,7 @@ var HomeUI = function HomeUI(props) {
   }, t('VISIT_MY_WEBSITE', 'Visit my Website')))), /*#__PURE__*/_react.default.createElement("img", {
     src: (_project$projectStatu4 = project[(_projectStatus$projec9 = projectStatus.project) === null || _projectStatus$projec9 === void 0 ? void 0 : _projectStatus$projec9.current_status]) === null || _project$projectStatu4 === void 0 ? void 0 : _project$projectStatu4.image,
     alt: ""
-  }))), width < 997 && !isEnabledWhiteLabelModule && /*#__PURE__*/_react.default.createElement(_styles.OrderingButtonBlock, null, /*#__PURE__*/_react.default.createElement("h2", null, t('WHAT_DO_YOU_WANT', 'What do you want to'), /*#__PURE__*/_react.default.createElement("span", null, " ".concat(t('SEE_IN_ORDERING', 'see in ordering')), "?")), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
-    color: "primary",
-    onClick: function onClick() {
-      return setShowForm(true);
-    }
-  }, t('CLICK_HERE', 'Click here'))), /*#__PURE__*/_react.default.createElement(_styles.ParagraphHeaders, null, /*#__PURE__*/_react.default.createElement("p", null, t('REPORTS', 'Reports')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
+  }))), /*#__PURE__*/_react.default.createElement(_styles.ParagraphHeaders, null, /*#__PURE__*/_react.default.createElement("p", null, t('REPORTS', 'Reports')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
     color: "lightPrimary",
     onClick: function onClick() {
       return handleGoToPage({

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

@@ -14,6 +14,14 @@ var _styledComponents = require("styled-components");
 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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -27,9 +35,15 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
   var driversList = props.driversList,
     interActionMapOrder = props.interActionMapOrder;
   var theme = (0, _styledComponents.useTheme)();
+  var _useApi = (0, _orderingComponentsAdminExternal.useApi)(),
+    _useApi2 = _slicedToArray(_useApi, 1),
+    ordering = _useApi2[0];
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
+    _useSession2 = _slicedToArray(_useSession, 1),
+    session = _useSession2[0];
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];
@@ -154,10 +168,6 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
   // Fit bounds on mount, and when the markers change
   (0, _react.useEffect)(function () {
     if (driversList.loading || driversList.drivers.length === 0 || mapLoaded) return;
-    var _onlineDrivers = driversList.drivers.filter(function (driver) {
-      return driver.enabled && driver.available && !driver.busy;
-    });
-    setActiveDrivers(_onlineDrivers);
     if (interActionMapOrder !== null) {
       var _iterator3 = _createForOfIteratorHelper(driversList.drivers),
         _step3;
@@ -179,6 +189,94 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
       mapFit();
     }
   }, [interActionMapOrder, mapLoaded, driversList, mapFitted]);
+  (0, _react.useEffect)(function () {
+    var _ref, _ref2;
+    if (!interActionMapOrder || interActionMapOrder !== null && interActionMapOrder !== void 0 && interActionMapOrder.driver) return;
+    var getControls = function getControls(_x) {
+      return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order) {
+        var _yield$ordering$setAc, _yield$ordering$setAc2, errorResponse, response, error, result, driversControls, _result$drivers;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return ordering.setAccessToken(session === null || session === void 0 ? void 0 : session.token).controls(order === null || order === void 0 ? void 0 : order.id).get();
+            case 2:
+              _yield$ordering$setAc = _context.sent;
+              _yield$ordering$setAc2 = _yield$ordering$setAc.content;
+              errorResponse = _yield$ordering$setAc2.error;
+              response = _yield$ordering$setAc2.result;
+              _context.next = 8;
+              return errorResponse;
+            case 8:
+              error = _context.sent;
+              _context.next = 11;
+              return response;
+            case 11:
+              result = _context.sent;
+              if (error) {
+                _context.next = 16;
+                break;
+              }
+              driversControls = [];
+              if (Array.isArray(result === null || result === void 0 ? void 0 : result.drivers) && (result === null || result === void 0 ? void 0 : result.drivers.length) > 0) {
+                driversControls = result === null || result === void 0 || (_result$drivers = result.drivers) === null || _result$drivers === void 0 ? void 0 : _result$drivers.filter(function (driver) {
+                  return driver.available && !driver.busy;
+                });
+              }
+              return _context.abrupt("return", driversControls);
+            case 16:
+              return _context.abrupt("return", error);
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }))).apply(this, arguments);
+    };
+    var fetchData = function fetchData() {
+      return (_ref2 = _ref2 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var driversControls;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(interActionMapOrder !== null)) {
+                _context2.next = 6;
+                break;
+              }
+              setActiveDrivers([]);
+              _context2.next = 4;
+              return getControls(interActionMapOrder);
+            case 4:
+              driversControls = _context2.sent;
+              setActiveDrivers(driversControls);
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))).apply(this, arguments);
+    };
+    fetchData();
+  }, [interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.id]);
+  (0, _react.useEffect)(function () {
+    if (activeDrivers.length === 0) return;
+    var _driverAvailableList = driversList.drivers.filter(function (driver) {
+      return driver.enabled && driver.available && !driver.busy;
+    });
+    var _onlineDrivers = activeDrivers.map(function (controlDriver) {
+      var matchingDriver = _driverAvailableList.find(function (driver) {
+        return driver.id === controlDriver.id;
+      });
+      if (matchingDriver !== null && matchingDriver !== void 0 && matchingDriver.location) {
+        return _objectSpread(_objectSpread({}, controlDriver), {}, {
+          location: matchingDriver === null || matchingDriver === void 0 ? void 0 : matchingDriver.location
+        });
+      } else {
+        return controlDriver;
+      }
+    });
+    setActiveDrivers(_onlineDrivers);
+  }, [driversList]);
   (0, _react.useEffect)(function () {
     setMapFitted(false);
   }, [interActionMapOrder]);
@@ -233,15 +331,15 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
       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,
       image: driver === null || driver === void 0 ? void 0 : driver.photo
     });
-  })), interActionMapOrder !== null && (interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.driver) === null && activeDrivers.length > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperOnlineDrivers, null, /*#__PURE__*/_react.default.createElement("p", null, t('ACTIVE_DRIVERS', 'Drivers online')), /*#__PURE__*/_react.default.createElement(_styles.OnlineDrivers, null, /*#__PURE__*/_react.default.createElement(_Shared.AutoScroll, {
+  })), interActionMapOrder !== null && (interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.driver) === null && activeDrivers.length >= 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperOnlineDrivers, null, /*#__PURE__*/_react.default.createElement("p", null, activeDrivers.length === 0 ? t('NO_DRIVERS_AVAILABLE_FOR_ORDER', 'No Drivers Available for Order') : t('ACTIVE_DRIVERS', 'Drivers online')), activeDrivers.length > 0 && /*#__PURE__*/_react.default.createElement(_styles.OnlineDrivers, null, /*#__PURE__*/_react.default.createElement(_Shared.AutoScroll, {
     innerScroll: true
-  }, activeDrivers.length > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, activeDrivers.map(function (driver) {
+  }, activeDrivers.map(function (driver) {
     var _theme$images;
     return /*#__PURE__*/_react.default.createElement(_styles.WrapDriverInfo, {
       key: driver.id
     }, /*#__PURE__*/_react.default.createElement(_styles.WrapperDriverImage, null, /*#__PURE__*/_react.default.createElement(_styles.DriverImage, {
       bgimage: (driver === null || driver === void 0 ? void 0 : driver.photo) || (theme === null || theme === void 0 || (_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.icons) === null || _theme$images === void 0 ? void 0 : _theme$images.noDriver)
     })), /*#__PURE__*/_react.default.createElement(_styles.DriverInfo, null, /*#__PURE__*/_react.default.createElement("p", null, driver.name, " ", driver.lastname), /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER', 'Driver'))));
-  }))))));
+  })))));
 };
 exports.DeliveriesLocation = DeliveriesLocation;

package/package.json

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

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

@@ -237,12 +237,6 @@ const HomeUI = (props) => {
   return (
     <>
       <HomeContainer>
-        {width > 997 && !isEnabledWhiteLabelModule && (
-          <OrderingButtonWrapper>
-            <span>{t('WHAT_DO_YOU_WANT_SEE_ORDERING', 'What do you want to see in ordering?')}</span>
-            <Button color='primary' onClick={() => setShowForm(true)}>{t('CLICK_HERE', 'Click here')}</Button>
-          </OrderingButtonWrapper>
-        )}
         <Breadcrumb>
           {isCollapse && (
             <IconButton
@@ -300,17 +294,6 @@ const HomeUI = (props) => {
             )}
           </>
         )}
-
-        {width < 997 && !isEnabledWhiteLabelModule && (
-          <OrderingButtonBlock>
-            <h2>
-              {t('WHAT_DO_YOU_WANT', 'What do you want to')}
-              <span>{` ${t('SEE_IN_ORDERING', 'see in ordering')}`}?</span>
-            </h2>
-            <Button color='primary' onClick={() => setShowForm(true)}>{t('CLICK_HERE', 'Click here')}</Button>
-          </OrderingButtonBlock>
-        )}
-
         <ParagraphHeaders>
           <p>{t('REPORTS', 'Reports')}</p>
           <Button

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react'
-import { useConfig, useLanguage } from 'ordering-components-admin-external'
+import { useConfig, useLanguage, useApi, useSession } from 'ordering-components-admin-external'
 import GoogleMapReact, { fitBounds } from 'google-map-react'
 import { DriverMapMarkerAndInfo } from '../DriverMapMarkerAndInfo'
 import { InterActOrderMarker } from '../InterActOrderMarker'
@@ -23,8 +23,11 @@ export const DeliveriesLocation = (props) => {
   } = props
 
   const theme = useTheme()
+  const [ordering] = useApi()
   const [, t] = useLanguage()
+  const [session] = useSession()
   const [configState] = useConfig()
+
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
 
   const defaultLatitude = Number(configState?.configs?.location_default_latitude?.value)
@@ -124,10 +127,6 @@ export const DeliveriesLocation = (props) => {
   // Fit bounds on mount, and when the markers change
   useEffect(() => {
     if (driversList.loading || driversList.drivers.length === 0 || mapLoaded) return
-    const _onlineDrivers = driversList.drivers.filter(
-      (driver) => driver.enabled && driver.available && !driver.busy
-    )
-    setActiveDrivers(_onlineDrivers)
     if (interActionMapOrder !== null) {
       for (const driver of driversList.drivers) {
         if (driver.id === interActionMapOrder?.driver?.id) {
@@ -140,6 +139,47 @@ export const DeliveriesLocation = (props) => {
     }
   }, [interActionMapOrder, mapLoaded, driversList, mapFitted])
 
+  useEffect(() => {
+    if (!interActionMapOrder || interActionMapOrder?.driver) return
+    const getControls = async (order) => {
+      const { content: { error: errorResponse, result: response } } = await ordering.setAccessToken(session?.token).controls(order?.id).get()
+      const error = await errorResponse
+      const result = await response
+      if (!error) {
+        let driversControls = []
+        if (Array.isArray(result?.drivers) && result?.drivers.length > 0) {
+          driversControls = (result?.drivers?.filter((driver) => driver.available && !driver.busy))
+        }
+        return driversControls
+      }
+      return error
+    }
+
+    const fetchData = async () => {
+      if (interActionMapOrder !== null) {
+        setActiveDrivers([])
+        const driversControls = await getControls(interActionMapOrder)
+        setActiveDrivers(driversControls)
+      }
+    }
+
+    fetchData()
+  }, [interActionMapOrder?.id])
+
+  useEffect(() => {
+    if (activeDrivers.length === 0) return
+    const _driverAvailableList = driversList.drivers.filter((driver) => driver.enabled && driver.available && !driver.busy)
+    const _onlineDrivers = activeDrivers.map((controlDriver) => {
+      const matchingDriver = _driverAvailableList.find((driver) => driver.id === controlDriver.id)
+      if (matchingDriver?.location) {
+        return { ...controlDriver, location: matchingDriver?.location }
+      } else {
+        return controlDriver
+      }
+    })
+    setActiveDrivers(_onlineDrivers)
+  }, [driversList])
+
   useEffect(() => {
     setMapFitted(false)
   }, [interActionMapOrder])
@@ -232,28 +272,26 @@ export const DeliveriesLocation = (props) => {
         </GoogleMapReact>
       )}
 
-      {interActionMapOrder !== null && interActionMapOrder?.driver === null && activeDrivers.length > 0 && (
+      {interActionMapOrder !== null && interActionMapOrder?.driver === null && activeDrivers.length >= 0 && (
         <WrapperOnlineDrivers>
-          <p>{t('ACTIVE_DRIVERS', 'Drivers online')}</p>
-          <OnlineDrivers>
-            <AutoScroll innerScroll>
-              {activeDrivers.length > 0 && (
-                <>
-                  {activeDrivers.map(driver => (
-                    <WrapDriverInfo key={driver.id}>
-                      <WrapperDriverImage>
-                        <DriverImage bgimage={driver?.photo || theme?.images?.icons?.noDriver} />
-                      </WrapperDriverImage>
-                      <DriverInfo>
-                        <p>{driver.name} {driver.lastname}</p>
-                        <p>{t('DRIVER', 'Driver')}</p>
-                      </DriverInfo>
-                    </WrapDriverInfo>
-                  ))}
-                </>
-              )}
-            </AutoScroll>
-          </OnlineDrivers>
+          <p>{activeDrivers.length === 0 ? t('NO_DRIVERS_AVAILABLE_FOR_ORDER', 'No Drivers Available for Order') : t('ACTIVE_DRIVERS', 'Drivers online')}</p>
+          {activeDrivers.length > 0 && (
+            <OnlineDrivers>
+              <AutoScroll innerScroll>
+                {activeDrivers.map(driver => (
+                  <WrapDriverInfo key={driver.id}>
+                    <WrapperDriverImage>
+                      <DriverImage bgimage={driver?.photo || theme?.images?.icons?.noDriver} />
+                    </WrapperDriverImage>
+                    <DriverInfo>
+                      <p>{driver.name} {driver.lastname}</p>
+                      <p>{t('DRIVER', 'Driver')}</p>
+                    </DriverInfo>
+                  </WrapDriverInfo>
+                ))}
+              </AutoScroll>
+            </OnlineDrivers>
+          )}
         </WrapperOnlineDrivers>
       )}
     </WrapperMap>