Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

modules/client/front/summary/index.html

@@ -292,7 +292,7 @@
                 <vn-thead>
                     <vn-tr>
                         <vn-th field="id" number>Id</vn-th>
-                        <vn-th field="nickname" expand>Client</vn-th>
+                        <vn-th field="nickname" expand>Nickname</vn-th>
                         <vn-th field="packages" shrink>Packages</vn-th>
                         <vn-th field="shipped" shrink-date>Date</vn-th>
                         <vn-th>State</vn-th>
@@ -325,7 +325,7 @@
                             <span
                                 ng-show="::ticket.refFk"
                                 title="{{::ticket.refFk}}"
-                                vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
+                                vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOut.id)"
                                 class="link">
                                 {{::ticket.refFk}}
                             </span>

modules/client/front/summary/index.js

@@ -7,7 +7,8 @@ class Controller extends Summary {
         super($element, $);
 
         this.ticketFilter = {
-            include: {
+            include: [
+                {
                     relation: 'ticketState',
                     scope: {
                         fields: ['stateFk', 'code', 'alertLevel'],
@@ -15,7 +16,14 @@ class Controller extends Summary {
                             relation: 'state'
                         }
                     }
+                },
+                {
+                    relation: 'invoiceOut',
+                    scope: {
+                        fields: ['id']
                     }
+                }
+            ]
         };
     }
     $onChanges() {

modules/ticket/front/summary/index.html

@@ -126,6 +126,7 @@
                         <vn-th number>Price</vn-th>
                         <vn-th number>Discount</vn-th>
                         <vn-th number>Amount</vn-th>
+                        <vn-th shrink>Packing</vn-th>
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
@@ -190,6 +191,9 @@
                         <vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td>
                         <vn-td number>{{::sale.discount}} %</vn-td>
                         <vn-td number>{{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}</vn-td>
+                        <vn-td shrink>
+                            {{::sale.item.itemPackingTypeFk | dashIfEmpty}}
+                        </vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>