diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 98533b8c3..c9286ef43 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -625,7 +625,7 @@ export default { }, ordersIndex: { searchResult: 'vn-order-index vn-card > vn-table > div > vn-tbody > a.vn-tr', - firstSearchResultTotal: 'vn-order-index vn-card > vn-table > div > vn-tbody vn-tr vn-td:nth-child(9)', + firstSearchResultTotal: 'vn-order-index vn-card > vn-table > div > vn-tbody vn-tr vn-td:nth-child(7)', searchResultDate: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(4)', searchResultAddress: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(6)', searchButton: 'vn-searchbar vn-icon[icon="search"]', diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 5b6af92b1..cdd54859f 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -156,6 +156,7 @@ module.exports = Self => { c.name clientName, c.salesPersonFk, u.nickname workerNickname, + u.name name, co.code companyCode FROM hedera.order o LEFT JOIN address a ON a.id = o.address_id diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 148531f2d..a28979646 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -13,10 +13,8 @@ Client Sales person Confirmed - Created from Created Landed - Company Total @@ -37,7 +35,7 @@ - {{::order.workerNickname | dashIfEmpty}} + {{::order.name | dashIfEmpty}} @@ -46,10 +44,8 @@ disabled="true"> - {{::order.sourceApp}} {{::order.created | date: 'dd/MM/yyyy HH:mm'}} {{::order.landed | date:'dd/MM/yyyy'}} - {{::order.companyCode}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}} + + +