Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section

front/salix/components/descriptor/style.scss

@@ -11,8 +11,8 @@ vn-descriptor-content {
         & > img[ng-src] {
             min-height: 16em;
             display: block;
-            height: 100%;
-            width: 100%;
+            width: 256px;
+            height: 256px;
         }
 
         vn-float-button {

modules/order/back/methods/order/filter.js

@@ -155,7 +155,8 @@ module.exports = Self => {
                 co.code companyCode,
                 zed.zoneFk,
                 zed.hourTheoretical,
-                zed.hourEffective
+                zed.hourEffective,
+                am.name AS agencyName
             FROM hedera.order o
                 LEFT JOIN address a ON a.id = o.address_id
                 LEFT JOIN agencyMode am ON am.id = o.agency_id

modules/order/front/index/index.html

@@ -15,8 +15,8 @@
                 <vn-th field="isConfirmed" center>Confirmed</vn-th>
                 <vn-th field="created" center expand>Created</vn-th>
                 <vn-th field="landed" default-order="DESC" center expand>Landed</vn-th>
-                <vn-th field="created" center translate-attr="{title: 'Theoretical hour'}">T. Hour</vn-th>
-                <vn-th field="created" center>Real hour</vn-th>
+                <vn-th field="created" center>Hour</vn-th>
+                <vn-th field="agencyName" center>Agency</vn-th>
                 <vn-th center>Total</vn-th>
             </vn-tr>
         </vn-thead>
@@ -52,8 +52,11 @@
                         {{::order.landed | date:'dd/MM/yyyy'}}
                     </span>
                 </vn-td>
-                <vn-td shrink>{{::order.hourTheoretical | date: 'HH:mm' | dashIfEmpty}}</vn-td>
-                <vn-td shrink>{{::ticket.hourEffective | date: 'HH:mm' | dashIfEmpty}}</vn-td>
+                <vn-td shrink>{{::(order.hourTheoretical 
+                        ? order.hourTheoretical
+                        : order.hourEffective) | dashIfEmpty
+                        }}</vn-td>
+                <vn-td expand>{{::order.agencyName}}</vn-td>
                 <vn-td number>{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}</vn-td>
                 <vn-td shrink>
                     <vn-icon-button

modules/ticket/front/descriptor-menu/index.js

@@ -60,7 +60,8 @@ class Controller extends Section {
                 }
             },
             {relation: 'ship'},
-            {relation: 'stowaway'}]
+            {relation: 'stowaway'},
+            {relation: 'invoiceOut'}]
         };
 
         return this.$http.get(`Tickets/${this.ticketId}`, {filter})