ordering-ui-admin-external 1.43.52 → 1.43.54

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

@@ -26,7 +26,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
-  var _theme$images$icons, _theme$images$icons2, _theme$images$icons3, _theme$images$icons4, _theme$images$icons5, _changesState$autoass, _ref, _changesState$autoass2, _ref2, _changesState$autoass3, _changesState$autoass4, _changesState$autoass5, _autoRejectOrderGroup, _autoRejectOrderGroup2, _autoRejectOrderGroup3, _ref3, _changesState$autoass6, _ref4, _changesState$autoass7, _ref5, _changesState$autoass8, _changesState$autoass9;
+  var _theme$images$icons, _theme$images$icons2, _theme$images$icons3, _theme$images$icons4, _theme$images$icons5, _changesState$autoass, _ref, _changesState$autoass2, _ref2, _changesState$autoass3, _changesState$autoass4, _changesState$autoass5, _autoRejectOrderGroup, _autoRejectOrderGroup2, _autoRejectOrderGroup3, _ref3, _changesState$autoass6, _ref4, _changesState$autoass7, _ref5, _changesState$autoass8, _changesState$autoass9, _changesState$autorej;
   var autoAssign = props.autoAssign,
     autoRejectOrderGroup = props.autoRejectOrderGroup,
     onSelectAssign = props.onSelectAssign,
@@ -195,7 +195,16 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
         autoassign_groupable_individual_orders_only: e.target.checked
       });
     }
-  }), /*#__PURE__*/_react.default.createElement("span", null, t('DO_NOT_ASSIGN_MORE_THAN_1_ORDER_IF_ORDER_CAN_NOT_GROUPED', 'Do not assign more than 1 order IF the order can’t be grouped'))));
+  }), /*#__PURE__*/_react.default.createElement("span", null, t('DO_NOT_ASSIGN_MORE_THAN_1_ORDER_IF_ORDER_CAN_NOT_GROUPED', 'Do not assign more than 1 order IF the order can’t be grouped'))), /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, {
+    isPadding: true
+  }, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
+    checked: (_changesState$autorej = changesState === null || changesState === void 0 ? void 0 : changesState.autoreject_after_expiration) !== null && _changesState$autorej !== void 0 ? _changesState$autorej : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoreject_after_expiration,
+    onChange: function onChange(e) {
+      return onChangeSave({
+        autoreject_after_expiration: e.target.checked
+      });
+    }
+  }), /*#__PURE__*/_react.default.createElement("span", null, t('AUTOREJECT_AFTER_EXPIRATION', 'Autoreject after expiration'))));
 };
 var DriversGroupAutoassign = exports.DriversGroupAutoassign = function DriversGroupAutoassign(props) {
   var driversGroupAutoassignProps = _objectSpread(_objectSpread({}, props), {}, {

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/package.json

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

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

@@ -226,6 +226,13 @@ const DriversGroupAutoassignUI = (props) => {
         />
         <span>{t('DO_NOT_ASSIGN_MORE_THAN_1_ORDER_IF_ORDER_CAN_NOT_GROUPED', 'Do not assign more than 1 order IF the order can’t be grouped')}</span>
       </CheckboxWrapper>
+      <CheckboxWrapper isPadding>
+        <Checkbox
+          checked={changesState?.autoreject_after_expiration ?? curDriversGroup?.autoreject_after_expiration}
+          onChange={e => onChangeSave({ autoreject_after_expiration: e.target.checked })}
+        />
+        <span>{t('AUTOREJECT_AFTER_EXPIRATION', 'Autoreject after expiration')}</span>
+      </CheckboxWrapper>
     </AutoassignContainer>
   )
 }

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>