senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle additional orders info for wiaas

Browse Source
This commit is contained in:
Almira Krdzic
2018-08-09 12:20:20 +02:00
parent b8653ad18b 5d84f53ea7
commit b9b1181bf4
46 changed files with 381 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/containers/orders/OrdersDataContainer.jsx
View File

@@ -13,10 +13,8 @@ class OrdersDataContainer extends Component {
this.props.dispatch(getHistoryOrders());
}
checkIfOrdersExistForUser(orders) {
return orders.every((order) => {
return true;//'isMyOrder' in order && !order.isMyOrder;
})
hasCurrentCustomerOrders(orders) {
return orders.some((order) => order.isMyOrder);
}
render() {
@@ -38,7 +36,7 @@ class OrdersDataContainer extends Component {
<OrderList orders={orders} type={type}/>
}
{
((orders && orders.length === 0 && !isLoading) || (orders && !this.checkIfOrdersExistForUser(orders))) &&
((orders && orders.length === 0 && !isLoading) || (orders && !this.hasCurrentCustomerOrders(orders))) &&
<Alert color="info">{orderTexts.labels.NO_RECORDS}</Alert>
}
</WiaasBox>