ordering-ui-admin-external 1.12.1 → 1.12.2
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.a1e7fb8ab6d1a5c40e77.js → ordering-ui-admin.3f380e987c44f5f45979.js} +2 -2
- package/_bundles/{ordering-ui-admin.a1e7fb8ab6d1a5c40e77.js.LICENSE.txt → ordering-ui-admin.3f380e987c44f5f45979.js.LICENSE.txt} +0 -0
- package/_modules/components/Orders/OrdersTable/index.js +22 -3
- package/package.json +2 -2
- package/src/components/Orders/OrdersTable/index.js +25 -0
|
File without changes
|
|
@@ -91,6 +91,9 @@ var OrdersTable = function OrdersTable(props) {
|
|
|
91
91
|
}, {
|
|
92
92
|
value: 'orderNumber',
|
|
93
93
|
content: t('INVOICE_ORDER_NO', 'Order No.')
|
|
94
|
+
}, {
|
|
95
|
+
value: 'cartGroupId',
|
|
96
|
+
content: t('GROUP_ORDER', 'Group Order')
|
|
94
97
|
}, {
|
|
95
98
|
value: 'dateTime',
|
|
96
99
|
content: t('DATE_TIME', 'Date and time')
|
|
@@ -459,7 +462,7 @@ var OrdersTable = function OrdersTable(props) {
|
|
|
459
462
|
alt: "six dots"
|
|
460
463
|
}), /*#__PURE__*/_react.default.createElement("span", null, (_allowColumns$column6 = allowColumns[column]) === null || _allowColumns$column6 === void 0 ? void 0 : _allowColumns$column6.title)));
|
|
461
464
|
})))), orderList.loading || !allowColumns ? _toConsumableArray(Array(10).keys()).map(function (i) {
|
|
462
|
-
var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$total;
|
|
465
|
+
var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$cartGro, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$total;
|
|
463
466
|
return /*#__PURE__*/_react.default.createElement(_styles.OrderTbody, {
|
|
464
467
|
key: i
|
|
465
468
|
}, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$slaBar2 = allowColumns.slaBar) === null || _allowColumns$slaBar2 === void 0 ? void 0 : _allowColumns$slaBar2.visable) && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.Timestatus, null)), /*#__PURE__*/_react.default.createElement("td", {
|
|
@@ -476,7 +479,15 @@ var OrdersTable = function OrdersTable(props) {
|
|
|
476
479
|
width: 100
|
|
477
480
|
})), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$dateTim3 = allowColumns.dateTime) === null || _allowColumns$dateTim3 === void 0 ? void 0 : _allowColumns$dateTim3.visable) && /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
478
481
|
width: 120
|
|
479
|
-
})))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$
|
|
482
|
+
})))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$cartGro = allowColumns.cartGroupId) === null || _allowColumns$cartGro === void 0 ? void 0 : _allowColumns$cartGro.visable) && /*#__PURE__*/_react.default.createElement("td", {
|
|
483
|
+
className: "statusInfo"
|
|
484
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, /*#__PURE__*/_react.default.createElement("div", {
|
|
485
|
+
className: "info"
|
|
486
|
+
}, /*#__PURE__*/_react.default.createElement("p", {
|
|
487
|
+
className: "bold"
|
|
488
|
+
}, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
489
|
+
width: 100
|
|
490
|
+
}))))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$status = allowColumns.status) === null || _allowColumns$status === void 0 ? void 0 : _allowColumns$status.visable) && !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
|
|
480
491
|
className: "statusInfo"
|
|
481
492
|
}, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, /*#__PURE__*/_react.default.createElement("div", {
|
|
482
493
|
className: "info"
|
|
@@ -625,6 +636,14 @@ var OrdersTable = function OrdersTable(props) {
|
|
|
625
636
|
className: "bold"
|
|
626
637
|
}, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value)));
|
|
627
638
|
}
|
|
639
|
+
if (column === 'cartGroupId') {
|
|
640
|
+
return /*#__PURE__*/_react.default.createElement("td", {
|
|
641
|
+
className: "orderGroupId",
|
|
642
|
+
key: "cart_group_id".concat(i, "-").concat(index)
|
|
643
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, (order === null || order === void 0 ? void 0 : order.cart_group_id) && /*#__PURE__*/_react.default.createElement("p", {
|
|
644
|
+
className: "bold"
|
|
645
|
+
}, t('No', 'No'), ". ", order === null || order === void 0 ? void 0 : order.cart_group_id)));
|
|
646
|
+
}
|
|
628
647
|
if (column === 'business') {
|
|
629
648
|
var _order$business, _theme$images, _theme$images$dummies, _order$business2, _order$business3, _order$business3$city;
|
|
630
649
|
return /*#__PURE__*/_react.default.createElement("td", {
|
|
@@ -735,7 +754,7 @@ var OrdersTable = function OrdersTable(props) {
|
|
|
735
754
|
utc: false
|
|
736
755
|
}))));
|
|
737
756
|
}
|
|
738
|
-
})));
|
|
757
|
+
}), /*#__PURE__*/_react.default.createElement("td", null)));
|
|
739
758
|
}))), pagination && /*#__PURE__*/_react.default.createElement(_styles.WrapperPagination, null, /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
|
|
740
759
|
currentPage: pagination.currentPage,
|
|
741
760
|
totalPages: Math.ceil((pagination === null || pagination === void 0 ? void 0 : pagination.total) / pagination.pageSize),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.12.
|
|
3
|
+
"version": "1.12.2",
|
|
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.12.
|
|
86
|
+
"ordering-components-admin-external": "1.12.3",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -79,6 +79,10 @@ export const OrdersTable = (props) => {
|
|
|
79
79
|
value: 'orderNumber',
|
|
80
80
|
content: t('INVOICE_ORDER_NO', 'Order No.')
|
|
81
81
|
},
|
|
82
|
+
{
|
|
83
|
+
value: 'cartGroupId',
|
|
84
|
+
content: t('GROUP_ORDER', 'Group Order')
|
|
85
|
+
},
|
|
82
86
|
{
|
|
83
87
|
value: 'dateTime',
|
|
84
88
|
content: t('DATE_TIME', 'Date and time')
|
|
@@ -446,6 +450,15 @@ export const OrdersTable = (props) => {
|
|
|
446
450
|
</div>
|
|
447
451
|
</OrderNumberContainer>
|
|
448
452
|
</td>
|
|
453
|
+
{allowColumns?.cartGroupId?.visable && (
|
|
454
|
+
<td className='statusInfo'>
|
|
455
|
+
<StatusInfo>
|
|
456
|
+
<div className='info'>
|
|
457
|
+
<p className='bold'><Skeleton width={100} /></p>
|
|
458
|
+
</div>
|
|
459
|
+
</StatusInfo>
|
|
460
|
+
</td>
|
|
461
|
+
)}
|
|
449
462
|
{allowColumns?.status?.visable && !isSelectedOrders && (
|
|
450
463
|
<td className='statusInfo'>
|
|
451
464
|
<StatusInfo>
|
|
@@ -602,6 +615,17 @@ export const OrdersTable = (props) => {
|
|
|
602
615
|
</td>
|
|
603
616
|
)
|
|
604
617
|
}
|
|
618
|
+
if (column === 'cartGroupId') {
|
|
619
|
+
return (
|
|
620
|
+
<td className='orderGroupId' key={`cart_group_id${i}-${index}`}>
|
|
621
|
+
<StatusInfo>
|
|
622
|
+
{order?.cart_group_id && (
|
|
623
|
+
<p className='bold'>{t('No', 'No')}. {order?.cart_group_id}</p>
|
|
624
|
+
)}
|
|
625
|
+
</StatusInfo>
|
|
626
|
+
</td>
|
|
627
|
+
)
|
|
628
|
+
}
|
|
605
629
|
if (column === 'business') {
|
|
606
630
|
return (
|
|
607
631
|
<td className='businessInfo' key={`businessInfo${i}-${index}`}>
|
|
@@ -738,6 +762,7 @@ export const OrdersTable = (props) => {
|
|
|
738
762
|
)
|
|
739
763
|
}
|
|
740
764
|
})}
|
|
765
|
+
<td />
|
|
741
766
|
</tr>
|
|
742
767
|
</OrderTbody>
|
|
743
768
|
))
|