From f1b26133cffe5ed5fa81d76a68e605734afa7e03 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Wed, 17 Jun 2020 13:25:12 +0200
Subject: [PATCH] refactor order index

---
 e2e/helpers/selectors.js                   | 2 +-
 modules/order/back/methods/order/filter.js | 1 +
 modules/order/front/index/index.html       | 6 +-----
 modules/order/front/summary/index.html     | 4 ++++
 4 files changed, 7 insertions(+), 6 deletions(-)

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 @@
                 <vn-th field="clientFk">Client</vn-th>
                 <vn-th field="salesPersonFk">Sales person</vn-th>
                 <vn-th field="isConfirmed" center>Confirmed</vn-th>
-                <vn-th field="sourceApp">Created from</vn-th>
                 <vn-th field="created" center>Created</vn-th>
                 <vn-th field="landed" default-order="DESC" center>Landed</vn-th>
-                <vn-th field="companyFk">Company</vn-th>
                 <vn-th center>Total</vn-th>
             </vn-tr>
         </vn-thead>
@@ -37,7 +35,7 @@
                     <span
                         vn-click-stop="workerDescriptor.show($event, order.salesPersonFk)"
                         class="link" >
-                        {{::order.workerNickname | dashIfEmpty}}
+                        {{::order.name | dashIfEmpty}}
                     </span>
                 </vn-td>
                 <vn-td center> 
@@ -46,10 +44,8 @@
                         disabled="true">
                     </vn-check>
                 </vn-td>
-                <vn-td>{{::order.sourceApp}}</vn-td>
                 <vn-td center>{{::order.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td center>{{::order.landed | date:'dd/MM/yyyy'}}</vn-td>
-                <vn-td>{{::order.companyCode}}</vn-td>
                 <vn-td number>{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}</vn-td>
                 <vn-td shrink>
                     <vn-icon-button
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index cafd49f8a..2f7399dec 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -11,6 +11,9 @@
             <vn-check label="Confirmed" disabled="true"
                 ng-model="$ctrl.summary.isConfirmed">
             </vn-check>
+            <vn-label-value label="Company" 
+                value="{{$ctrl.summary.address.companyFk}}">
+            </vn-label-value>
         </vn-one>
         <vn-one>
             <vn-label-value label="Created" 
@@ -21,6 +24,7 @@
             </vn-label-value>
             <vn-label-value label="Address" 
                 value="{{$ctrl.formattedAddress}}">
+            </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{$ctrl.summary.address.phone}}">
             </vn-label-value>