ordering-ui-admin-external 1.22.3 → 1.22.4
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.
- package/_bundles/{ordering-ui-admin.cda42fc4842c0730a9a2.js → ordering-ui-admin.01d12122a3446879b78e.js} +2 -2
- package/_modules/components/Orders/OrderDetails/index.js +1 -1
- package/_modules/components/Orders/OrdersCards/index.js +1 -1
- package/_modules/components/Orders/OrdersTable/index.js +1 -1
- package/package.json +2 -2
- package/src/components/Orders/OrderDetails/index.js +5 -1
- package/src/components/Orders/OrdersCards/index.js +5 -1
- package/src/components/Orders/OrdersTable/index.js +5 -1
- /package/_bundles/{ordering-ui-admin.cda42fc4842c0730a9a2.js.LICENSE.txt → ordering-ui-admin.01d12122a3446879b78e.js.LICENSE.txt} +0 -0
|
@@ -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,
|
|
@@ -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",
|
|
@@ -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
|
+
"version": "1.22.4",
|
|
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.
|
|
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",
|
|
@@ -339,7 +339,11 @@ const OrderDetailsUI = (props) => {
|
|
|
339
339
|
<div>
|
|
340
340
|
<h2>{t('ORDER_STATUS_TEXT', 'Order status')}</h2>
|
|
341
341
|
<p>
|
|
342
|
-
{
|
|
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>
|
|
@@ -212,7 +212,11 @@ export const OrdersCards = (props) => {
|
|
|
212
212
|
<p>{getOrderStatus(order.status)?.value}</p>
|
|
213
213
|
<div>
|
|
214
214
|
<p>
|
|
215
|
-
{
|
|
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'
|
|
@@ -647,7 +647,11 @@ export const OrdersTable = (props) => {
|
|
|
647
647
|
)}
|
|
648
648
|
{allowColumns?.dateTime?.visable && (
|
|
649
649
|
<p className='date'>
|
|
650
|
-
{
|
|
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>
|