ordering-ui-admin-external 1.22.3 → 1.22.5

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 (11) hide show
  1. package/_bundles/{ordering-ui-admin.cda42fc4842c0730a9a2.js → ordering-ui-admin.de284e3a7bc450dcb936.js} +2 -2
  2. package/_modules/components/CartRecovery/RecoveryGeneral/index.js +6 -6
  3. package/_modules/components/Orders/OrderDetails/index.js +1 -1
  4. package/_modules/components/Orders/OrdersCards/index.js +1 -1
  5. package/_modules/components/Orders/OrdersTable/index.js +1 -1
  6. package/package.json +2 -2
  7. package/src/components/CartRecovery/RecoveryGeneral/index.js +7 -7
  8. package/src/components/Orders/OrderDetails/index.js +5 -1
  9. package/src/components/Orders/OrdersCards/index.js +5 -1
  10. package/src/components/Orders/OrdersTable/index.js +5 -1
  11. /package/_bundles/{ordering-ui-admin.cda42fc4842c0730a9a2.js.LICENSE.txt → ordering-ui-admin.de284e3a7bc450dcb936.js.LICENSE.txt} +0 -0
package/_modules/components/CartRecovery/RecoveryGeneral/index.js CHANGED
@@ -84,7 +84,7 @@ var RecoveryGeneral = function RecoveryGeneral(props) {
84
84
  var value = evt.target.value;
85
85
  setCurPreorderTime(_objectSpread(_objectSpread({}, curPreorderTime), {}, _defineProperty({}, type, value)));
86
86
  var preorderTime = 0;
87
- if (type === 'hour') preorderTime = parseInt(value) * 60 + parseInt(curPreorderTime === null || curPreorderTime === void 0 ? void 0 : curPreorderTime.minute);else preorderTime = parseInt(curPreorderTime === null || curPreorderTime === void 0 ? void 0 : curPreorderTime.hour) * 60 + parseInt(value);
87
+ if (type === 'hour') preorderTime = parseInt(value) * 3600 + parseInt(curPreorderTime === null || curPreorderTime === void 0 ? void 0 : curPreorderTime.minute) * 60;else preorderTime = parseInt(curPreorderTime === null || curPreorderTime === void 0 ? void 0 : curPreorderTime.hour) * 3600 + parseInt(value) * 60;
88
88
  handleChangeItem({
89
89
  times: [preorderTime],
90
90
  launch_type: 'times'
@@ -93,7 +93,7 @@ var RecoveryGeneral = function RecoveryGeneral(props) {
93
93
  var handleChangeDay = function handleChangeDay(value) {
94
94
  setCurDayTime(value);
95
95
  handleChangeItem({
96
- times: [value * 24 * 60],
96
+ times: [value * 24 * 3600],
97
97
  launch_type: 'times'
98
98
  });
99
99
  };
@@ -115,15 +115,15 @@ var RecoveryGeneral = function RecoveryGeneral(props) {
115
115
  var _recoveryActionState$, _recoveryActionState$2, _recoveryActionState$3, _recoveryActionState$4, _recoveryActionState$5, _recoveryActionState$6;
116
116
  setTimeList();
117
117
  setCurPreorderTime({
118
- hour: recoveryActionState !== null && recoveryActionState !== void 0 && (_recoveryActionState$ = recoveryActionState.action) !== null && _recoveryActionState$ !== void 0 && _recoveryActionState$.times ? parseInt((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$2 = recoveryActionState.action) === null || _recoveryActionState$2 === void 0 ? void 0 : _recoveryActionState$2.times[0]) / 60) : '0',
119
- minute: recoveryActionState !== null && recoveryActionState !== void 0 && (_recoveryActionState$3 = recoveryActionState.action) !== null && _recoveryActionState$3 !== void 0 && _recoveryActionState$3.times ? (recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$4 = recoveryActionState.action) === null || _recoveryActionState$4 === void 0 ? void 0 : _recoveryActionState$4.times[0]) % 60 : '0'
118
+ hour: recoveryActionState !== null && recoveryActionState !== void 0 && (_recoveryActionState$ = recoveryActionState.action) !== null && _recoveryActionState$ !== void 0 && _recoveryActionState$.times ? parseInt((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$2 = recoveryActionState.action) === null || _recoveryActionState$2 === void 0 ? void 0 : _recoveryActionState$2.times[0]) / 3600) : '0',
119
+ minute: recoveryActionState !== null && recoveryActionState !== void 0 && (_recoveryActionState$3 = recoveryActionState.action) !== null && _recoveryActionState$3 !== void 0 && _recoveryActionState$3.times ? (recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$4 = recoveryActionState.action) === null || _recoveryActionState$4 === void 0 ? void 0 : _recoveryActionState$4.times[0]) % 3600 / 60 : '0'
120
120
  });
121
121
  if (!(recoveryActionState !== null && recoveryActionState !== void 0 && (_recoveryActionState$5 = recoveryActionState.action) !== null && _recoveryActionState$5 !== void 0 && _recoveryActionState$5.times)) return;
122
- if ((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$6 = recoveryActionState.action) === null || _recoveryActionState$6 === void 0 ? void 0 : _recoveryActionState$6.times[0]) / 60 < 24) {
122
+ if ((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$6 = recoveryActionState.action) === null || _recoveryActionState$6 === void 0 ? void 0 : _recoveryActionState$6.times[0]) / 3600 < 24) {
123
123
  setIsTime(true);
124
124
  } else {
125
125
  setIsTime(false);
126
- setCurDayTime(parseInt((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : recoveryActionState.action.times[0]) / 60 / 24));
126
+ setCurDayTime(parseInt((recoveryActionState === null || recoveryActionState === void 0 ? void 0 : recoveryActionState.action.times[0]) / 3600 / 24));
127
127
  }
128
128
  }, [recoveryActionState === null || recoveryActionState === void 0 ? void 0 : recoveryActionState.action]);
129
129
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('NAME', 'Name')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
package/_modules/components/Orders/OrderDetails/index.js CHANGED
@@ -490,7 +490,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
490
490
  printRef: printRef
491
491
  }), /*#__PURE__*/_react.default.createElement(_styles2.OrderStatus, {
492
492
  isDisabled: isTourOpen && currentTourStep === 1
493
- }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('ORDER_STATUS_TEXT', 'Order status')), /*#__PURE__*/_react.default.createElement("p", null, parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime, {
493
+ }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('ORDER_STATUS_TEXT', 'Order status')), /*#__PURE__*/_react.default.createElement("p", null, 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, {
494
494
  utc: false
495
495
  })), /*#__PURE__*/_react.default.createElement("p", null, order === null || order === void 0 ? void 0 : order.eta_time, " ", t('MIN', 'min'))), /*#__PURE__*/_react.default.createElement(_styles2.OrderStatusSelectorWrapper, null, /*#__PURE__*/_react.default.createElement(_OrderStatusTypeSelector.OrderStatusTypeSelector, {
496
496
  isFirstSelect: true,
package/_modules/components/Orders/OrdersCards/index.js CHANGED
@@ -264,7 +264,7 @@ var OrdersCards = function OrdersCards(props) {
264
264
  onClick: function onClick(e) {
265
265
  return handleOrderClick(e, order);
266
266
  }
267
- }, /*#__PURE__*/_react.default.createElement(_styles.CardHeading, null, /*#__PURE__*/_react.default.createElement(_styles.OrderHeader, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement("span", null, t('INVOICE_ORDER_NO', 'Order No.'), " ", order === null || order === void 0 ? void 0 : order.id)), /*#__PURE__*/_react.default.createElement("p", null, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime, {
267
+ }, /*#__PURE__*/_react.default.createElement(_styles.CardHeading, null, /*#__PURE__*/_react.default.createElement(_styles.OrderHeader, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement("span", null, t('INVOICE_ORDER_NO', 'Order No.'), " ", order === null || order === void 0 ? void 0 : order.id)), /*#__PURE__*/_react.default.createElement("p", null, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, 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, {
268
268
  utc: false
269
269
  })), /*#__PURE__*/_react.default.createElement(_styles.ViewDetails, {
270
270
  className: "view-details",
package/_modules/components/Orders/OrdersTable/index.js CHANGED
@@ -674,7 +674,7 @@ var OrdersTable = function OrdersTable(props) {
674
674
  className: "bold"
675
675
  }, t('INVOICE_ORDER_NO', 'Order No.'), " ", order === null || order === void 0 ? void 0 : order.id), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$dateTim5 = allowColumns.dateTime) === null || _allowColumns$dateTim5 === void 0 ? void 0 : _allowColumns$dateTim5.visable) && /*#__PURE__*/_react.default.createElement("p", {
676
676
  className: "date"
677
- }, parseDate(order === null || order === void 0 ? void 0 : order.delivery_datetime, {
677
+ }, 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, {
678
678
  utc: false
679
679
  })))));
680
680
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.22.3",
3
+ "version": "1.22.5",
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.22.1",
86
+ "ordering-components-admin-external": "1.22.2",
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/RecoveryGeneral/index.js CHANGED
@@ -75,14 +75,14 @@ export const RecoveryGeneral = (props) => {
75
75
  [type]: value
76
76
  })
77
77
  let preorderTime = 0
78
- if (type === 'hour') preorderTime = parseInt(value) * 60 + parseInt(curPreorderTime?.minute)
79
- else preorderTime = parseInt(curPreorderTime?.hour) * 60 + parseInt(value)
78
+ if (type === 'hour') preorderTime = parseInt(value) * 3600 + parseInt(curPreorderTime?.minute) * 60
79
+ else preorderTime = parseInt(curPreorderTime?.hour) * 3600 + parseInt(value) * 60
80
80
  handleChangeItem({ times: [preorderTime], launch_type: 'times' })
81
81
  }
82
82
 
83
83
  const handleChangeDay = (value) => {
84
84
  setCurDayTime(value)
85
- handleChangeItem({ times: [value * 24 * 60], launch_type: 'times' })
85
+ handleChangeItem({ times: [value * 24 * 3600], launch_type: 'times' })
86
86
  }
87
87
 
88
88
  const handleSubmitBtnClick = () => {
@@ -102,16 +102,16 @@ export const RecoveryGeneral = (props) => {
102
102
  useEffect(() => {
103
103
  setTimeList()
104
104
  setCurPreorderTime({
105
- hour: recoveryActionState?.action?.times ? (parseInt(recoveryActionState?.action?.times[0] / 60)) : '0',
106
- minute: recoveryActionState?.action?.times ? (recoveryActionState?.action?.times[0] % 60) : '0'
105
+ hour: recoveryActionState?.action?.times ? (parseInt(recoveryActionState?.action?.times[0] / 3600)) : '0',
106
+ minute: recoveryActionState?.action?.times ? (recoveryActionState?.action?.times[0] % 3600 / 60) : '0'
107
107
  })
108
108
  if (!recoveryActionState?.action?.times) return
109
109
 
110
- if (recoveryActionState?.action?.times[0] / 60 < 24) {
110
+ if (recoveryActionState?.action?.times[0] / 3600 < 24) {
111
111
  setIsTime(true)
112
112
  } else {
113
113
  setIsTime(false)
114
- setCurDayTime(parseInt(recoveryActionState?.action.times[0] / 60 / 24))
114
+ setCurDayTime(parseInt(recoveryActionState?.action.times[0] / 3600 / 24))
115
115
  }
116
116
  }, [recoveryActionState?.action])
117
117
 
package/src/components/Orders/OrderDetails/index.js CHANGED
@@ -339,7 +339,11 @@ const OrderDetailsUI = (props) => {
339
339
  <div>
340
340
  <h2>{t('ORDER_STATUS_TEXT', 'Order status')}</h2>
341
341
  <p>
342
- {parseDate(order?.delivery_datetime, { utc: false })}
342
+ {
343
+ order?.delivery_datetime_utc
344
+ ? parseDate(order?.delivery_datetime_utc)
345
+ : parseDate(order?.delivery_datetime, { utc: false })
346
+ }
343
347
  </p>
344
348
  <p>{order?.eta_time} {t('MIN', 'min')}</p>
345
349
  </div>
package/src/components/Orders/OrdersCards/index.js CHANGED
@@ -212,7 +212,11 @@ export const OrdersCards = (props) => {
212
212
  <p>{getOrderStatus(order.status)?.value}</p>
213
213
  <div>
214
214
  <p>
215
- {parseDate(order?.delivery_datetime, { utc: false })}
215
+ {
216
+ order?.delivery_datetime_utc
217
+ ? parseDate(order?.delivery_datetime_utc)
218
+ : parseDate(order?.delivery_datetime, { utc: false })
219
+ }
216
220
  </p>
217
221
  <ViewDetails
218
222
  className='view-details'
package/src/components/Orders/OrdersTable/index.js CHANGED
@@ -647,7 +647,11 @@ export const OrdersTable = (props) => {
647
647
  )}
648
648
  {allowColumns?.dateTime?.visable && (
649
649
  <p className='date'>
650
- {parseDate(order?.delivery_datetime, { utc: false })}
650
+ {
651
+ order?.delivery_datetime_utc
652
+ ? parseDate(order?.delivery_datetime_utc)
653
+ : parseDate(order?.delivery_datetime, { utc: false })
654
+ }
651
655
  </p>
652
656
  )}
653
657
  </div>