ordering-ui-admin-external 1.43.51 → 1.43.53

package/_modules/components/Delivery/DriversGroupDrivers/index.js

@@ -12,6 +12,7 @@ var _styles = require("../../../styles");
 var _DriverTemporalSchedule = require("../DriverTemporalSchedule");
 var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 var _styles2 = require("./styles");
+var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -105,7 +106,7 @@ var DriversGroupDrivers = exports.DriversGroupDrivers = function DriversGroupDri
         return (_driver === null || _driver === void 0 ? void 0 : _driver.id) === driver.id && (_driver === null || _driver === void 0 ? void 0 : _driver.temporarily_activated);
       }),
       onChange: function onChange(e) {
-        return handleSelectDriverTemporary(driver === null || driver === void 0 ? void 0 : driver.id, e.target.checked);
+        return handleSelectDriverTemporary(driver === null || driver === void 0 ? void 0 : driver.id, e.target.checked, (0, _moment.default)().endOf('day').utc().format('YYYY-MM-DD HH:mm:ss'));
       }
     }), /*#__PURE__*/_react.default.createElement(_styles2.DriverTemporaryContainer, null, /*#__PURE__*/_react.default.createElement("p", {
       onClick: function onClick() {

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

@@ -428,9 +428,9 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
       key: message.id
     }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", {
       dangerouslySetInnerHTML: {
-        __html: t('ORDER_PLACED_FOR_VIA', 'Order placed for _for_ via _via_.').replace('_for_', '<b>' + (order === null || order === void 0 ? void 0 : order.delivery_datetime_utc) ? parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime_utc) : parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime, {
+        __html: t('ORDER_PLACED_FOR_VIA', 'Order placed for _for_ via _via_.').replace('_for_', '<b>' + (order !== null && order !== void 0 && order.delivery_datetime_utc ? parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime_utc) : parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime, {
           utc: false
-        }) + '</b>').replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
+        }) + " (".concat(t('BUSINESS_TIME', 'Business time'), ")")) + '</b>').replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
       }
     }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "), message === null || message === void 0 || (_message$author = message.author) === null || _message$author === void 0 ? void 0 : _message$author.name, " ", message === null || message === void 0 || (_message$author2 = message.author) === null || _message$author2 === void 0 ? void 0 : _message$author2.lastname), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('USER_AGENT', 'User agent'), ": "), message === null || message === void 0 ? void 0 : message.user_agent), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('IP', 'IP'), ": "), message === null || message === void 0 ? void 0 : message.ip), /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message === null || message === void 0 ? void 0 : message.created_at)))), message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
       key: message.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.51",
+  "version": "1.43.53",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {

package/src/components/Delivery/DriversGroupDrivers/index.js

@@ -16,6 +16,7 @@ import {
   DriverInfoContainer,
   DriverTemporaryContainer
 } from './styles'
+import moment from 'moment'
 
 export const DriversGroupDrivers = (props) => {
   const {
@@ -106,7 +107,7 @@ export const DriversGroupDrivers = (props) => {
               <>
                 <Checkbox
                   checked={selectedDriverTemporaryIds?.some((_driver) => _driver?.id === driver.id && _driver?.temporarily_activated)}
-                  onChange={e => handleSelectDriverTemporary(driver?.id, e.target.checked)}
+                  onChange={e => handleSelectDriverTemporary(driver?.id, e.target.checked, moment().endOf('day').utc().format('YYYY-MM-DD HH:mm:ss'))}
                 />
                 <DriverTemporaryContainer>
                   <p onClick={() => handleOpenModal(selectedDriverTemporaryIds.find((_driver) => (_driver?.id === driver?.id)) ?? { id: driver?.id, temporarily_activated: true, temporary_at: null })}>{t('DRIVER_TEMPORAL', 'Temporal driver')}</p>

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

@@ -477,9 +477,9 @@ export const MessagesUI = (props) => {
                               <p
                                 dangerouslySetInnerHTML={{
                                   __html: t('ORDER_PLACED_FOR_VIA', 'Order placed for _for_ via _via_.')
-                                    .replace('_for_', '<b>' + order?.delivery_datetime_utc
+                                    .replace('_for_', '<b>' + (order?.delivery_datetime_utc
                                       ? parseDate(order?.delivery_datetime_utc)
-                                      : parseDate(order?.delivery_datetime, { utc: false }) + '</b>')
+                                      : (parseDate(order?.delivery_datetime, { utc: false }) + ` (${t('BUSINESS_TIME', 'Business time')})`)) + '</b>')
                                     .replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
                                 }}
                               />