ordering-ui-admin-external 1.41.4 → 1.42.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/_bundles/{ordering-ui-admin.05647a8e92a1798b3c9a.js → ordering-ui-admin.637ae3a9ddea00b2aa19.js} +2 -2
  2. package/_modules/components/CartRecovery/OpenCartBill/index.js +1 -1
  3. package/_modules/components/Delivery/DriversGroupsListing/index.js +9 -1
  4. package/_modules/components/Delivery/UserAddForm/index.js +0 -1
  5. package/_modules/components/Orders/CreateCustomOrder/CartBill/index.js +1 -1
  6. package/_modules/components/Orders/DeliveriesLocation/index.js +8 -4
  7. package/_modules/components/Orders/DriversLocation/index.js +1 -1
  8. package/_modules/components/Orders/Messages/index.js +7 -6
  9. package/_modules/components/Orders/OrderBill/index.js +2 -4
  10. package/_modules/components/Orders/OrdersFilterGroup/index.js +44 -0
  11. package/_modules/components/Settings/SettingsList/index.js +1 -1
  12. package/_modules/components/SidebarMenu/index.js +35 -49
  13. package/index-template.js +1 -1
  14. package/package.json +2 -2
  15. package/src/components/CartRecovery/OpenCartBill/index.js +1 -1
  16. package/src/components/Delivery/DriversGroupsListing/index.js +10 -1
  17. package/src/components/Delivery/UserAddForm/index.js +0 -3
  18. package/src/components/Orders/CreateCustomOrder/CartBill/index.js +1 -1
  19. package/src/components/Orders/DeliveriesLocation/index.js +7 -3
  20. package/src/components/Orders/DriversLocation/index.js +1 -1
  21. package/src/components/Orders/Messages/index.js +6 -5
  22. package/src/components/Orders/OrderBill/index.js +1 -4
  23. package/src/components/Orders/OrdersFilterGroup/index.js +33 -1
  24. package/src/components/Settings/SettingsList/index.js +2 -1
  25. package/src/components/SidebarMenu/index.js +34 -11
  26. /package/_bundles/{ordering-ui-admin.05647a8e92a1798b3c9a.js.LICENSE.txt → ordering-ui-admin.637ae3a9ddea00b2aa19.js.LICENSE.txt} +0 -0
package/_modules/components/CartRecovery/OpenCartBill/index.js CHANGED
@@ -103,7 +103,7 @@ var OpenCartBill = exports.OpenCartBill = function OpenCartBill(props) {
103
103
  return /*#__PURE__*/_react.default.createElement("tr", {
104
104
  key: offer.id
105
105
  }, /*#__PURE__*/_react.default.createElement("td", null, offer.name, (offer === null || offer === void 0 ? void 0 : offer.rate_type) === 1 && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(offer === null || offer === void 0 ? void 0 : offer.rate, parsePrice), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 || (_offer$summary3 = offer.summary) === null || _offer$summary3 === void 0 ? void 0 : _offer$summary3.discount)));
106
- })), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1)))))), /*#__PURE__*/_react.default.createElement("table", {
106
+ })), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)))))), /*#__PURE__*/_react.default.createElement("table", {
107
107
  className: "total"
108
108
  }, /*#__PURE__*/_react.default.createElement("tbody", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('TOTAL', 'Total')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((cart === null || cart === void 0 ? void 0 : cart.total) >= 0 ? cart === null || cart === void 0 ? void 0 : cart.total : 0))))), (cart === null || cart === void 0 || (_cart$payment_events = cart.payment_events) === null || _cart$payment_events === void 0 ? void 0 : _cart$payment_events.length) > 0 && /*#__PURE__*/_react.default.createElement("table", {
109
109
  className: "payments"
package/_modules/components/Delivery/DriversGroupsListing/index.js CHANGED
@@ -349,9 +349,17 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
349
349
  }));
350
350
  };
351
351
  var DriversGroupsListing = exports.DriversGroupsListing = function DriversGroupsListing(props) {
352
+ var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
353
+ var defaultPage = query.get('page') || 1;
354
+ var defaultPageSize = query.get('pageSize') || 10;
352
355
  var driversGroupsListProps = _objectSpread(_objectSpread({}, props), {}, {
353
356
  isDriversMangersRequired: true,
354
- UIComponent: DriversGroupsListingUI
357
+ UIComponent: DriversGroupsListingUI,
358
+ paginationSettings: {
359
+ initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
360
+ pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
361
+ controlType: 'pages'
362
+ }
355
363
  });
356
364
  return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.DriversGroupsList, driversGroupsListProps);
357
365
  };
package/_modules/components/Delivery/UserAddForm/index.js CHANGED
@@ -283,7 +283,6 @@ var UserAddFormUI = function UserAddFormUI(props) {
283
283
  }, [validationFields, emailInput.current]);
284
284
  (0, _react.useEffect)(function () {
285
285
  formMethods.register('email', {
286
- required: isRequiredField('email') ? t('VALIDATION_ERROR_EMAIL_REQUIRED', 'The field Email is required').replace('_attribute_', t('EMAIL', 'Email')) : null,
287
286
  pattern: {
288
287
  value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
289
288
  message: t('INVALID_ERROR_EMAIL', 'Invalid email address').replace('_attribute_', t('EMAIL', 'Email'))
package/_modules/components/Orders/CreateCustomOrder/CartBill/index.js CHANGED
@@ -250,7 +250,7 @@ var CartBill = exports.CartBill = function CartBill(props) {
250
250
  return onRemoveOffer(offer === null || offer === void 0 ? void 0 : offer.id);
251
251
  }
252
252
  }))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 || (_offer$summary3 = offer.summary) === null || _offer$summary3 === void 0 ? void 0 : _offer$summary3.discount)));
253
- })), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1)))))), isCouponEnabled && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && /*#__PURE__*/_react.default.createElement(_styles.CouponContainer, null, /*#__PURE__*/_react.default.createElement(_CouponControl.CouponControl, {
253
+ })), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)))))), isCouponEnabled && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && /*#__PURE__*/_react.default.createElement(_styles.CouponContainer, null, /*#__PURE__*/_react.default.createElement(_CouponControl.CouponControl, {
254
254
  businessId: cart === null || cart === void 0 ? void 0 : cart.business_id,
255
255
  price: cart === null || cart === void 0 ? void 0 : cart.total
256
256
  })), /*#__PURE__*/_react.default.createElement("table", {
package/_modules/components/Orders/DeliveriesLocation/index.js CHANGED
@@ -31,8 +31,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
31
31
  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; } }
32
32
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
33
33
  var DeliveriesLocationPropsAreEqual = function DeliveriesLocationPropsAreEqual(prevProps, nextProps) {
34
- var _prevProps$interActio, _nextProps$interActio, _prevProps$interActio2, _nextProps$interActio2, _prevProps$interActio3;
35
- return ((_prevProps$interActio = prevProps.interActionMapOrder) === null || _prevProps$interActio === void 0 ? void 0 : _prevProps$interActio.id) === ((_nextProps$interActio = nextProps.interActionMapOrder) === null || _nextProps$interActio === void 0 ? void 0 : _nextProps$interActio.id) && JSON.stringify((_prevProps$interActio2 = prevProps.interActionMapOrder) === null || _prevProps$interActio2 === void 0 ? void 0 : _prevProps$interActio2.driver) === JSON.stringify((_nextProps$interActio2 = nextProps.interActionMapOrder) === null || _nextProps$interActio2 === void 0 ? void 0 : _nextProps$interActio2.driver) && (JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) || !((_prevProps$interActio3 = prevProps.interActionMapOrder) !== null && _prevProps$interActio3 !== void 0 && _prevProps$interActio3.id));
34
+ var _prevProps$interActio, _nextProps$interActio, _prevProps$interActio2, _nextProps$interActio2;
35
+ return ((_prevProps$interActio = prevProps.interActionMapOrder) === null || _prevProps$interActio === void 0 ? void 0 : _prevProps$interActio.id) === ((_nextProps$interActio = nextProps.interActionMapOrder) === null || _nextProps$interActio === void 0 ? void 0 : _nextProps$interActio.id) && JSON.stringify((_prevProps$interActio2 = prevProps.interActionMapOrder) === null || _prevProps$interActio2 === void 0 ? void 0 : _prevProps$interActio2.driver) === JSON.stringify((_nextProps$interActio2 = nextProps.interActionMapOrder) === null || _nextProps$interActio2 === void 0 ? void 0 : _nextProps$interActio2.driver) && JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList);
36
36
  };
37
37
  var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.default.memo(function (props) {
38
38
  var _configState$configs, _configState$configs2, _configState$configs3, _interActionMapOrder$6, _interActionMapOrder$7, _interActionMapOrder$8, _interActionMapOrder$9, _interActionMapOrder$10, _interActionMapOrder$11, _interActionMapOrder$12, _interActionMapOrder$13, _interActionMapOrder$14;
@@ -268,10 +268,14 @@ var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.defaul
268
268
  fetchData();
269
269
  }, [interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.id]);
270
270
  (0, _react.useEffect)(function () {
271
- if (activeDrivers.length === 0) return;
271
+ if (activeDrivers.length === 0 && interActionMapOrder) return;
272
272
  var _driverAvailableList = driversList.drivers.filter(function (driver) {
273
273
  return driver.enabled && driver.available && !driver.busy;
274
274
  });
275
+ if (!interActionMapOrder) {
276
+ setActiveDrivers(_driverAvailableList);
277
+ return;
278
+ }
275
279
  var _onlineDrivers = activeDrivers.map(function (controlDriver) {
276
280
  var matchingDriver = _driverAvailableList.find(function (driver) {
277
281
  return driver.id === controlDriver.id;
@@ -332,7 +336,7 @@ var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.defaul
332
336
  lat: interActionOrderDriverLocation !== null && _typeof(interActionOrderDriverLocation) === 'object' && interActionOrderDriverLocation !== null && interActionOrderDriverLocation !== void 0 && interActionOrderDriverLocation.lat ? interActionOrderDriverLocation.lat : typeof interActionOrderDriverLocation === 'string' ? parseFloat(interActionOrderDriverLocation === null || interActionOrderDriverLocation === void 0 ? void 0 : interActionOrderDriverLocation.split(',')[0].replace(/[^-.0-9]/g, '')) : defaultCenter.lat,
333
337
  lng: interActionOrderDriverLocation !== null && _typeof(interActionOrderDriverLocation) === 'object' && interActionOrderDriverLocation !== null && interActionOrderDriverLocation !== void 0 && interActionOrderDriverLocation.lng ? interActionOrderDriverLocation.lng : typeof interActionOrderDriverLocation === 'string' ? parseFloat(interActionOrderDriverLocation === null || interActionOrderDriverLocation === void 0 ? void 0 : interActionOrderDriverLocation.split(',')[1].replace(/[^-.0-9]/g, '')) : defaultCenter.lng,
334
338
  image: interActionMapOrder === null || interActionMapOrder === void 0 || (_interActionMapOrder$14 = interActionMapOrder.driver) === null || _interActionMapOrder$14 === void 0 ? void 0 : _interActionMapOrder$14.photo
335
- }), interActionMapOrder !== null && (interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.driver) === null && activeDrivers.length > 0 && activeDrivers.map(function (driver) {
339
+ }), interActionMapOrder === null && activeDrivers.length > 0 && activeDrivers.map(function (driver) {
336
340
  var _driver$location5, _driver$location6, _driver$location7, _driver$location8;
337
341
  return /*#__PURE__*/_react.default.createElement(_InterActOrderMarker.InterActOrderMarker, {
338
342
  key: driver.id,
package/_modules/components/Orders/DriversLocation/index.js CHANGED
@@ -208,7 +208,7 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
208
208
  return handleMapChange(data);
209
209
  },
210
210
  yesIWantToUseGoogleMapApiInternals: true
211
- }, !selectedOrder && selectedDriver && showDrivers.length !== 0 && showDrivers.map(function (driver) {
211
+ }, !selectedOrder && showDrivers.length !== 0 && showDrivers.map(function (driver) {
212
212
  var _driver$location5, _driver$location6, _driver$location7, _driver$location8;
213
213
  return /*#__PURE__*/_react.default.createElement(_DriverMapMarkerAndInfo.DriverMapMarkerAndInfo, {
214
214
  key: driver.id,
package/_modules/components/Orders/Messages/index.js CHANGED
@@ -45,7 +45,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
45
45
  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; } }
46
46
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
47
47
  var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
48
- var _configs$change_order, _order$business, _order$customer, _order$driver, _theme$images, _order$business6, _order$business7, _order$customer6, _order$customer7, _order$customer8, _order$driver6, _order$driver7, _order$driver8;
48
+ var _configs$change_order, _configs$order_logboo, _order$business, _order$customer, _order$driver, _theme$images, _order$business6, _order$business7, _order$customer6, _order$customer7, _order$customer8, _order$driver6, _order$driver7, _order$driver8;
49
49
  var isChat = props.isChat,
50
50
  order = props.order,
51
51
  messages = props.messages,
@@ -117,12 +117,13 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
117
117
  _useState14 = _slicedToArray(_useState13, 2),
118
118
  isChatDisabled = _useState14[0],
119
119
  setIsChatDisabled = _useState14[1];
120
- var previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17];
120
+ var previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17];
121
121
  var chatDisabled = previousStatus.includes(order === null || order === void 0 ? void 0 : order.status);
122
122
  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
123
123
  _useConfig2 = _slicedToArray(_useConfig, 1),
124
124
  configs = _useConfig2[0].configs;
125
125
  var showExternalId = (configs === null || configs === void 0 || (_configs$change_order = configs.change_order_id) === null || _configs$change_order === void 0 ? void 0 : _configs$change_order.value) === '1';
126
+ var hideLogBookMessages = (configs === null || configs === void 0 || (_configs$order_logboo = configs.order_logbook_enabled) === null || _configs$order_logboo === void 0 ? void 0 : _configs$order_logboo.value) === '0';
126
127
  var adminMessageList = [{
127
128
  key: 'message_1',
128
129
  text: t('ADMIN_MESSAGE_1', 'admin_message_1')
@@ -424,7 +425,7 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
424
425
  var _message$author, _message$author2, _message$author3, _message$author4, _order$business2, _order$customer2, _order$driver2, _order$business3, _order$customer3, _order$driver3, _order$business4, _order$customer4, _order$driver4, _order$business5, _order$customer5, _order$driver5;
425
426
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
426
427
  key: message.id
427
- }, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
428
+ }, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && !hideLogBookMessages && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
428
429
  key: message.id
429
430
  }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", {
430
431
  dangerouslySetInnerHTML: {
@@ -432,7 +433,7 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
432
433
  utc: false
433
434
  }) + '</b>').replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
434
435
  }
435
- }), /*#__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, {
436
+ }), /*#__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 && !hideLogBookMessages && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
436
437
  key: message.id,
437
438
  style: {
438
439
  display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
@@ -444,9 +445,9 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
444
445
  }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
445
446
  placement: "top",
446
447
  overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
447
- }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))))), isChat && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
448
+ }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))))), isChat && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && !hideLogBookMessages && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
448
449
  key: message.id
449
- }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'Via'), ' ', /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), ' '), /*#__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$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.name, " ", message === null || message === void 0 || (_message$author4 = message.author) === null || _message$author4 === void 0 ? void 0 : _message$author4.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, {
450
+ }, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'Via'), ' ', /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), ' '), /*#__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$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.name, " ", message === null || message === void 0 || (_message$author4 = message.author) === null || _message$author4 === void 0 ? void 0 : _message$author4.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 && !hideLogBookMessages && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
450
451
  key: message.id,
451
452
  style: {
452
453
  display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
package/_modules/components/Orders/OrderBill/index.js CHANGED
@@ -193,11 +193,9 @@ var OrderBill = exports.OrderBill = function OrderBill(props) {
193
193
  })));
194
194
  })), ((order === null || order === void 0 || (_order$summary14 = order.summary) === null || _order$summary14 === void 0 ? void 0 : _order$summary14.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', ((order === null || order === void 0 || (_order$summary15 = order.summary) === null || _order$summary15 === void 0 ? void 0 : _order$summary15.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(order === null || order === void 0 ? void 0 : order.driver_tip, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((_order$summary$driver = order === null || order === void 0 || (_order$summary16 = order.summary) === null || _order$summary16 === void 0 ? void 0 : _order$summary16.driver_tip) !== null && _order$summary$driver !== void 0 ? _order$summary$driver : order === null || order === void 0 ? void 0 : order.totalDriverTip, {
195
195
  currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
196
- }))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value), {
196
+ }))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value), {
197
197
  currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
198
- }) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1, {
199
- currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
200
- })))))), /*#__PURE__*/_react.default.createElement("table", {
198
+ }))))), /*#__PURE__*/_react.default.createElement("table", {
201
199
  className: "total"
202
200
  }, /*#__PURE__*/_react.default.createElement("tbody", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('TOTAL', 'Total')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((order === null || order === void 0 || (_order$summary17 = order.summary) === null || _order$summary17 === void 0 ? void 0 : _order$summary17.total) || (order === null || order === void 0 ? void 0 : order.total), {
203
201
  currency: (0, _utils.getCurrenySymbol)(order === null || order === void 0 ? void 0 : order.currency)
package/_modules/components/Orders/OrdersFilterGroup/index.js CHANGED
@@ -214,6 +214,50 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
214
214
  autoComplete: "off",
215
215
  value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.externalId) || '',
216
216
  onChange: handleChangeExternalId
217
+ })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
218
+ type: "text",
219
+ placeholder: t('CUSTOMER_NAME', 'Customer Name'),
220
+ autoComplete: "off",
221
+ value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.customerName) || '',
222
+ onChange: function onChange(e) {
223
+ var _e$target;
224
+ return handleChangeChildFilterValue({
225
+ customerName: e === null || e === void 0 || (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value
226
+ });
227
+ }
228
+ }), /*#__PURE__*/_react.default.createElement(_styles.Input, {
229
+ type: "text",
230
+ placeholder: t('CUSTOMER_LASTNAME', 'Customer Lastname'),
231
+ autoComplete: "off",
232
+ value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.customerLastname) || '',
233
+ onChange: function onChange(e) {
234
+ var _e$target2;
235
+ return handleChangeChildFilterValue({
236
+ customerLastname: e === null || e === void 0 || (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value
237
+ });
238
+ }
239
+ })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
240
+ type: "text",
241
+ placeholder: t('CUSTOMER_EMAIL', 'Customer Email'),
242
+ autoComplete: "off",
243
+ value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.customerEmail) || '',
244
+ onChange: function onChange(e) {
245
+ var _e$target3;
246
+ return handleChangeChildFilterValue({
247
+ customerEmail: e === null || e === void 0 || (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value
248
+ });
249
+ }
250
+ }), /*#__PURE__*/_react.default.createElement(_styles.Input, {
251
+ type: "text",
252
+ placeholder: t('CUSTOMER_CELLPHONE', 'Customer Cellphone'),
253
+ autoComplete: "off",
254
+ value: (filterValues === null || filterValues === void 0 ? void 0 : filterValues.customerCellphone) || '',
255
+ onChange: function onChange(e) {
256
+ var _e$target4;
257
+ return handleChangeChildFilterValue({
258
+ customerCellphone: e === null || e === void 0 || (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : _e$target4.value
259
+ });
260
+ }
217
261
  })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_DriversGroupTypeSelector.DriversGroupTypeSelector, {
218
262
  driverGroupList: driverGroupList,
219
263
  handleChangeGroup: handleChangeGroup,
package/_modules/components/Settings/SettingsList/index.js CHANGED
@@ -226,7 +226,7 @@ var SettingsListUI = exports.SettingsListUI = function SettingsListUI(props) {
226
226
  saveConfig: saveConfig
227
227
  }), config.type === 6 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.FormGroupText, {
228
228
  className: "form-group"
229
- }, /*#__PURE__*/_react.default.createElement("label", null, config === null || config === void 0 ? void 0 : config.name), (config === null || config === void 0 ? void 0 : config.description) && /*#__PURE__*/_react.default.createElement(_styles2.Description, null, config === null || config === void 0 ? void 0 : config.description, " ", [1312, 1315, 1316].includes(config === null || config === void 0 ? void 0 : config.id) && "(".concat(t('MINUTES', 'Minutes'), ")")), " ", config === null || config === void 0 || (_config$value = config.value) === null || _config$value === void 0 || (_config$value = _config$value.split('|')) === null || _config$value === void 0 || (_config$value = _config$value.filter(function (value) {
229
+ }, /*#__PURE__*/_react.default.createElement("label", null, config === null || config === void 0 ? void 0 : config.name), (config === null || config === void 0 ? void 0 : config.description) && /*#__PURE__*/_react.default.createElement(_styles2.Description, null, config === null || config === void 0 ? void 0 : config.description, " ", [1312, 1315, 1316].includes(config === null || config === void 0 ? void 0 : config.id) && "(".concat(t('MINUTES', 'Minutes'), ")")), config === null || config === void 0 || (_config$value = config.value) === null || _config$value === void 0 || (_config$value = _config$value.split('|')) === null || _config$value === void 0 || (_config$value = _config$value.filter(function (value) {
230
230
  return valuesTypeSix.includes(value === null || value === void 0 ? void 0 : value.split(',')[0]);
231
231
  })) === null || _config$value === void 0 ? void 0 : _config$value.map(function (value, i, hash) {
232
232
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
package/_modules/components/SidebarMenu/index.js CHANGED
@@ -34,7 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
34
34
  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; } }
35
35
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
36
36
  var SidebarMenuUI = function SidebarMenuUI(props) {
37
- var _configs$powered_by_o, _configs$appointments, _sessionState$user, _sessionState$user2, _sessionState$user3, _sessionState$user4, _sessionState$user5, _sessionState$user6, _sessionState$user7, _configs$dashboard_lo, _theme$images, _sessionState$user8, _sessionState$user9, _sessionState$user10, _sessionState$user11, _sessionState$user16, _sessionState$user17, _sessionState$user18, _sessionState$user19, _sessionState$user21, _sessionState$user22, _sessionState$user23, _sessionState$user24, _sessionState$user25, _sessionState$user26, _sessionState$user27, _sessionState$user28, _sessionState$user29, _sessionState$user30, _sessionState$user31, _sessionState$user32, _sessionState$user33, _sessionState$user34, _sessionState$user35, _sessionState$user36, _sessionState$user37, _sessionState$user38, _sessionState$user39;
37
+ var _configs$powered_by_o, _configs$appointments, _sessionState$user, _sessionState$user2, _sessionState$user3, _sessionState$user4, _sessionState$user5, _sessionState$user6, _sessionState$user7, _configs$dashboard_lo, _theme$images, _sessionState$user8, _sessionState$user9, _sessionState$user10, _sessionState$user11, _sessionState$user16, _sessionState$user17, _sessionState$user18, _sessionState$user19, _sessionState$user21, _sessionState$user22, _sessionState$user23, _sessionState$user24, _sessionState$user25, _sessionState$user26, _sessionState$user27, _sessionState$user28, _sessionState$user29, _sessionState$user30, _sessionState$user31, _sessionState$user32, _sessionState$user33, _sessionState$user34, _sessionState$user35, _sessionState$user36, _sessionState$user37;
38
38
  var getBillingToken = props.getBillingToken,
39
39
  billingUrl = props.billingUrl;
40
40
  var location = (0, _reactRouterDom.useLocation)();
@@ -314,19 +314,35 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
314
314
  title: t('PROMOTION_AUTOMATION', 'Promotions automation'),
315
315
  pageName: 'enterprise_promotions',
316
316
  url: '/marketing/promotions-enterprise'
317
- },
317
+ }, {
318
+ id: 2,
319
+ title: t('AD_BANNERS', 'Ad banners'),
320
+ pageName: 'ad_banners',
321
+ url: '/marketing/ad-banners'
322
+ }, {
323
+ id: 3,
324
+ title: t('LOYALTY_AUTOMATION', 'Loyalty automation'),
325
+ pageName: 'rewards_programs',
326
+ url: '/loyalty/rewards-programs'
327
+ }, {
328
+ id: 4,
329
+ title: t('OPEN_CARTS', 'Open carts'),
330
+ pageName: 'open_carts',
331
+ url: '/cart-recovery/open-carts'
332
+ }, {
333
+ id: 5,
334
+ title: t('CART_RECOVERY_AUTOMATION', 'Cart recovery automation'),
335
+ pageName: 'recovery_actions',
336
+ url: '/cart-recovery/recovery-actions'
337
+ }
318
338
  // {
319
- // id: 2,
339
+ // id: 6,
320
340
  // title: t('CAMPAIGN', 'Campaign'),
321
341
  // pageName: 'campaign',
322
342
  // url: '/marketing/campaign'
323
- // },
324
- {
325
- id: 3,
326
- title: t('AD_BANNERS', 'Ad banners'),
327
- pageName: 'ad_banners',
328
- url: '/marketing/ad-banners'
329
- }];
343
+ // }
344
+ ];
345
+
330
346
  var handleGoToPage = function handleGoToPage(data) {
331
347
  if (windowSize.width < 768) {
332
348
  handleMenuCollapse(true);
@@ -522,8 +538,8 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
522
538
  }, (0, _utils.firstLetterCapital)(item.title));
523
539
  })))), (sessionState === null || sessionState === void 0 || (_sessionState$user29 = sessionState.user) === null || _sessionState$user29 === void 0 ? void 0 : _sessionState$user29.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
524
540
  eventKey: "8",
525
- active: location.pathname === '/marketing/promotions-enterprise' || location.pathname === '/marketing/campaign' || location.pathname === '/marketing/ad-banners'
526
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.GraphUp, null), /*#__PURE__*/_react.default.createElement("span", null, t('MARKETING', 'Marketing'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
541
+ active: location.pathname === '/marketing/promotions-enterprise' || location.pathname === '/marketing/campaign' || location.pathname === '/marketing/ad-banners' || location.pathname === '/loyalty/rewards-programs' || location.pathname === '/loyalty/levels' || location.pathname === '/loyalty/reports' || location.pathname === '/cart-recovery/open-carts' || location.pathname === '/cart-recovery/recovery-actions'
542
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.GraphUp, null), /*#__PURE__*/_react.default.createElement("span", null, t('MARKETING_LOYALTY', 'Marketing & Loyalty'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
527
543
  eventKey: "8"
528
544
  }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, marketingSubmenus.map(function (item) {
529
545
  return /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
@@ -535,37 +551,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
535
551
  });
536
552
  }
537
553
  }, (0, _utils.firstLetterCapital)(item.title));
538
- })))), (sessionState === null || sessionState === void 0 || (_sessionState$user30 = sessionState.user) === null || _sessionState$user30 === void 0 ? void 0 : _sessionState$user30.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
539
- eventKey: "9",
540
- active: location.pathname === '/loyalty/rewards-programs' || location.pathname === '/loyalty/levels' || location.pathname === '/loyalty/reports'
541
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Award, null), /*#__PURE__*/_react.default.createElement("span", null, t('LOYALTY', 'Loyalty'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
542
- eventKey: "9"
543
- }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, loyaltySubMenus.map(function (item) {
544
- return /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
545
- key: item.id,
546
- active: location.pathname.includes(item.url),
547
- onClick: function onClick() {
548
- return handleGoToPage({
549
- page: item.pageName
550
- });
551
- }
552
- }, (0, _utils.firstLetterCapital)(item.title));
553
- })))), (sessionState === null || sessionState === void 0 || (_sessionState$user31 = sessionState.user) === null || _sessionState$user31 === void 0 ? void 0 : _sessionState$user31.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
554
- eventKey: "10",
555
- active: location.pathname === '/cart-recovery/open-carts' || location.pathname === '/cart-recovery/recovery-actions'
556
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Cart3, null), /*#__PURE__*/_react.default.createElement("span", null, t('CART_RECOVERY', 'Cart recovery'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
557
- eventKey: "10"
558
- }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, cartRecoveryMenus.map(function (item) {
559
- return /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
560
- key: item.id,
561
- active: location.pathname.includes(item.url),
562
- onClick: function onClick() {
563
- return handleGoToPage({
564
- page: item.pageName
565
- });
566
- }
567
- }, (0, _utils.firstLetterCapital)(item.title));
568
- })))), (sessionState === null || sessionState === void 0 || (_sessionState$user32 = sessionState.user) === null || _sessionState$user32 === void 0 ? void 0 : _sessionState$user32.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('SALES_CHANNELS_AND_PRODUCTS', 'Sales channels and products')), /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
554
+ })))), (sessionState === null || sessionState === void 0 || (_sessionState$user30 = sessionState.user) === null || _sessionState$user30 === void 0 ? void 0 : _sessionState$user30.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('SALES_CHANNELS_AND_PRODUCTS', 'Sales channels and products')), /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
569
555
  eventKey: "12",
570
556
  active: location.pathname === '/my-products/ordering-website' || location.pathname === '/my-products/customer-app' || location.pathname === '/my-products/store-app' || location.pathname === '/my-products/driver-app' || location.pathname === '/my-products/pos-app' || location.pathname === '/my-products/call-center-app' || location.pathname === '/my-products/kiosk-app' || location.pathname === '/my-products/custom-project'
571
557
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.BagCheck, null), /*#__PURE__*/_react.default.createElement("span", null, t('MY_PRODUCTS', 'My products'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -582,7 +568,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
582
568
  }, item.title);
583
569
  })))))), /*#__PURE__*/_react.default.createElement("div", {
584
570
  className: "d-flex flex-column mt-4"
585
- }, /*#__PURE__*/_react.default.createElement(_styles.LanguageSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_LanguageSelector.LanguageSelector, null)), (sessionState === null || sessionState === void 0 || (_sessionState$user33 = sessionState.user) === null || _sessionState$user33 === void 0 ? void 0 : _sessionState$user33.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
571
+ }, /*#__PURE__*/_react.default.createElement(_styles.LanguageSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_LanguageSelector.LanguageSelector, null)), (sessionState === null || sessionState === void 0 || (_sessionState$user31 = sessionState.user) === null || _sessionState$user31 === void 0 ? void 0 : _sessionState$user31.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
586
572
  eventKey: "5",
587
573
  active: location.pathname === '/settings/basic' || location.pathname === '/settings/operation' || location.pathname === '/settings/plugin' || location.pathname === '/settings/pages' || location.pathname === '/settings/integrations' || location.pathname === '/settings/places' || location.pathname === '/settings/advanced' || location.pathname === '/settings/language' || location.pathname === '/settings/logs'
588
574
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Gear, null), /*#__PURE__*/_react.default.createElement("span", null, t('SETTINGS', 'Settings'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -597,7 +583,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
597
583
  });
598
584
  }
599
585
  }, (0, _utils.firstLetterCapital)(item.title));
600
- }))))), (sessionState === null || sessionState === void 0 || (_sessionState$user34 = sessionState.user) === null || _sessionState$user34 === void 0 ? void 0 : _sessionState$user34.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
586
+ }))))), (sessionState === null || sessionState === void 0 || (_sessionState$user32 = sessionState.user) === null || _sessionState$user32 === void 0 ? void 0 : _sessionState$user32.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
601
587
  className: "d-flex align-items-center",
602
588
  variant: location.pathname === '/support' && 'primary',
603
589
  onClick: function onClick() {
@@ -605,7 +591,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
605
591
  page: 'support'
606
592
  });
607
593
  }
608
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Headset, null), /*#__PURE__*/_react.default.createElement("span", null, t('SUPPORT', 'Support'))), (sessionState === null || sessionState === void 0 || (_sessionState$user35 = sessionState.user) === null || _sessionState$user35 === void 0 ? void 0 : _sessionState$user35.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
594
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Headset, null), /*#__PURE__*/_react.default.createElement("span", null, t('SUPPORT', 'Support'))), (sessionState === null || sessionState === void 0 || (_sessionState$user33 = sessionState.user) === null || _sessionState$user33 === void 0 ? void 0 : _sessionState$user33.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
609
595
  className: "d-flex align-items-center",
610
596
  variant: false,
611
597
  onClick: function onClick() {
@@ -622,12 +608,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
622
608
  page: 'profile'
623
609
  });
624
610
  }
625
- }, sessionState !== null && sessionState !== void 0 && (_sessionState$user36 = sessionState.user) !== null && _sessionState$user36 !== void 0 && _sessionState$user36.photo ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Image, {
626
- src: sessionState === null || sessionState === void 0 || (_sessionState$user37 = sessionState.user) === null || _sessionState$user37 === void 0 ? void 0 : _sessionState$user37.photo,
611
+ }, sessionState !== null && sessionState !== void 0 && (_sessionState$user34 = sessionState.user) !== null && _sessionState$user34 !== void 0 && _sessionState$user34.photo ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Image, {
612
+ src: sessionState === null || sessionState === void 0 || (_sessionState$user35 = sessionState.user) === null || _sessionState$user35 === void 0 ? void 0 : _sessionState$user35.photo,
627
613
  width: "30px",
628
614
  height: "30px",
629
615
  roundedCircle: true
630
- }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PersonFill, null), /*#__PURE__*/_react.default.createElement("span", null, sessionState === null || sessionState === void 0 || (_sessionState$user38 = sessionState.user) === null || _sessionState$user38 === void 0 ? void 0 : _sessionState$user38.name, " ", sessionState === null || sessionState === void 0 || (_sessionState$user39 = sessionState.user) === null || _sessionState$user39 === void 0 ? void 0 : _sessionState$user39.lastname)), /*#__PURE__*/_react.default.createElement(_LogoutButton.LogoutButton, null))))));
616
+ }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PersonFill, null), /*#__PURE__*/_react.default.createElement("span", null, sessionState === null || sessionState === void 0 || (_sessionState$user36 = sessionState.user) === null || _sessionState$user36 === void 0 ? void 0 : _sessionState$user36.name, " ", sessionState === null || sessionState === void 0 || (_sessionState$user37 = sessionState.user) === null || _sessionState$user37 === void 0 ? void 0 : _sessionState$user37.lastname)), /*#__PURE__*/_react.default.createElement(_LogoutButton.LogoutButton, null))))));
631
617
  };
632
618
  var ContextAwareToggle = function ContextAwareToggle(_ref2) {
633
619
  var children = _ref2.children,
package/index-template.js CHANGED
@@ -298,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
298
298
  integrations: [
299
299
  new Integrations.BrowserTracing()
300
300
  ],
301
- release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.2.0',
301
+ release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.3.0',
302
302
  // Release health
303
303
  autoSessionTracking: true,
304
304
  ignoreErrors: [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.41.4",
3
+ "version": "1.42.0",
4
4
  "description": "Ordering UI Admin Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
@@ -83,7 +83,7 @@
83
83
  "lodash": "^4.17.20",
84
84
  "moment": "^2.29.1",
85
85
  "moment-range": "^4.0.2",
86
- "ordering-components-admin-external": "1.41.2",
86
+ "ordering-components-admin-external": "1.42.0",
87
87
  "polished": "^3.6.7",
88
88
  "prop-types": "^15.7.2",
89
89
  "react-big-calendar": "^1.4.2",
package/src/components/CartRecovery/OpenCartBill/index.js CHANGED
@@ -175,7 +175,7 @@ export const OpenCartBill = (props) => {
175
175
  <td>
176
176
  {t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
177
177
  </td>
178
- <td>{parseFloat(extraValueAdjustment?.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment?.value)) : `- ${parsePrice(parseFloat(extraValueAdjustment?.value) * -1)}`}</td>
178
+ <td>{parsePrice(parseFloat(extraValueAdjustment?.value))}</td>
179
179
  </tr>
180
180
  )}
181
181
  </tbody>
package/src/components/Delivery/DriversGroupsListing/index.js CHANGED
@@ -299,10 +299,19 @@ const DriversGroupsListingUI = (props) => {
299
299
  }
300
300
 
301
301
  export const DriversGroupsListing = (props) => {
302
+ const query = new URLSearchParams(useLocation().search)
303
+ const defaultPage = query.get('page') || 1
304
+ const defaultPageSize = query.get('pageSize') || 10
305
+
302
306
  const driversGroupsListProps = {
303
307
  ...props,
304
308
  isDriversMangersRequired: true,
305
- UIComponent: DriversGroupsListingUI
309
+ UIComponent: DriversGroupsListingUI,
310
+ paginationSettings: {
311
+ initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
312
+ pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
313
+ controlType: 'pages'
314
+ }
306
315
  }
307
316
  return (
308
317
  <DriversGroupsListController {...driversGroupsListProps} />
package/src/components/Delivery/UserAddForm/index.js CHANGED
@@ -231,9 +231,6 @@ const UserAddFormUI = (props) => {
231
231
 
232
232
  useEffect(() => {
233
233
  formMethods.register('email', {
234
- required: isRequiredField('email')
235
- ? t('VALIDATION_ERROR_EMAIL_REQUIRED', 'The field Email is required').replace('_attribute_', t('EMAIL', 'Email'))
236
- : null,
237
234
  pattern: {
238
235
  value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
239
236
  message: t('INVALID_ERROR_EMAIL', 'Invalid email address').replace('_attribute_', t('EMAIL', 'Email'))
package/src/components/Orders/CreateCustomOrder/CartBill/index.js CHANGED
@@ -236,7 +236,7 @@ export const CartBill = (props) => {
236
236
  <td>
237
237
  {t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
238
238
  </td>
239
- <td>{parseFloat(extraValueAdjustment?.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment?.value)) : `- ${parsePrice(parseFloat(extraValueAdjustment?.value) * -1)}`}</td>
239
+ <td>{parsePrice(parseFloat(extraValueAdjustment?.value))}</td>
240
240
  </tr>
241
241
  )}
242
242
  </tbody>
package/src/components/Orders/DeliveriesLocation/index.js CHANGED
@@ -19,7 +19,7 @@ import {
19
19
  const DeliveriesLocationPropsAreEqual = (prevProps, nextProps) => {
20
20
  return prevProps.interActionMapOrder?.id === nextProps.interActionMapOrder?.id &&
21
21
  JSON.stringify(prevProps.interActionMapOrder?.driver) === JSON.stringify(nextProps.interActionMapOrder?.driver) &&
22
- (JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) || !prevProps.interActionMapOrder?.id)
22
+ JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList)
23
23
  }
24
24
 
25
25
  export const DeliveriesLocation = React.memo((props) => {
@@ -173,8 +173,12 @@ export const DeliveriesLocation = React.memo((props) => {
173
173
  }, [interActionMapOrder?.id])
174
174
 
175
175
  useEffect(() => {
176
- if (activeDrivers.length === 0) return
176
+ if (activeDrivers.length === 0 && interActionMapOrder) return
177
177
  const _driverAvailableList = driversList.drivers.filter((driver) => driver.enabled && driver.available && !driver.busy)
178
+ if (!interActionMapOrder) {
179
+ setActiveDrivers(_driverAvailableList)
180
+ return
181
+ }
178
182
  const _onlineDrivers = activeDrivers.map((controlDriver) => {
179
183
  const matchingDriver = _driverAvailableList.find((driver) => driver.id === controlDriver.id)
180
184
  if (matchingDriver?.location) {
@@ -253,7 +257,7 @@ export const DeliveriesLocation = React.memo((props) => {
253
257
  />
254
258
  )}
255
259
 
256
- {interActionMapOrder !== null && interActionMapOrder?.driver === null && activeDrivers.length > 0 && (
260
+ {interActionMapOrder === null && activeDrivers.length > 0 && (
257
261
  activeDrivers.map((driver) => (
258
262
  <InterActOrderMarker
259
263
  key={driver.id}
package/src/components/Orders/DriversLocation/index.js CHANGED
@@ -192,7 +192,7 @@ export const DriversLocation = React.memo((props) => {
192
192
  onChange={(data) => handleMapChange(data)}
193
193
  yesIWantToUseGoogleMapApiInternals
194
194
  >
195
- {!selectedOrder && selectedDriver && (showDrivers.length !== 0) &&
195
+ {!selectedOrder && (showDrivers.length !== 0) &&
196
196
  showDrivers.map((driver) => (
197
197
  <DriverMapMarkerAndInfo
198
198
  key={driver.id}