Merge branch 'dev' into 2974-client_balance

front/core/components/pagination/pagination.html

@@ -1,10 +1,9 @@
 <div ng-if="$ctrl.model.moreRows">
-    <vn-icon-button
+    <vn-button 
         ng-if="!$ctrl.model.isPaging"
-        icon="more_horiz"
-        vn-tooltip="Load more"
+        label="Load more results" 
         ng-click="$ctrl.onLoadClick()">
-    </vn-icon-button>
+    </vn-button>
     <vn-spinner
         ng-if="$ctrl.model.isPaging"
         enable="::true">

front/core/locale/es.yml

@@ -62,5 +62,5 @@ Go up: Ir arriba
 Loading...: Cargando...
 No results found: Sin resultados
 No data: Sin datos
-Load more: Cargar más
-Undo changes: Deshacer cambios
+Undo changes: Deshacer cambios
+Load more results: Cargar más resultados

modules/client/front/summary/index.js

@@ -59,6 +59,8 @@ class Controller extends Summary {
     stateColor(ticket) {
         const ticketState = ticket.ticketState;
 
+        if (!ticketState) return;
+
         if (ticketState.code === 'OK')
             return 'success';
         else if (ticketState.code === 'FREE')

modules/entry/back/methods/entry/getEntry.js

@@ -38,7 +38,7 @@ module.exports = Self => {
                 {
                     relation: 'travel',
                     scope: {
-                        fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk'],
+                        fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk', 'isReceived', 'isDelivered'],
                         include: [
                             {
                                 relation: 'agency',

modules/entry/front/summary/index.html

@@ -34,12 +34,8 @@
             </vn-label-value>
         </vn-one>
         <vn-one>
-            <vn-label-value label="Agency">
-                <span
-                    ng-click="travelDescriptor.show($event, $ctrl.entry.travel.agencyFk)"
-                    class="link">
-                    {{$ctrl.entryData.travel.agency.name}}
-                </span>
+            <vn-label-value label="Agency"
+                value="{{$ctrl.entryData.travel.agency.name}}">
             </vn-label-value>
             <vn-label-value label="Shipped"
                 value="{{$ctrl.entryData.travel.shipped | date: 'dd/MM/yyyy'}}">
@@ -47,12 +43,22 @@
             <vn-label-value label="Warehouse Out"
                 value="{{$ctrl.entryData.travel.warehouseOut.name}}">
             </vn-label-value>
+            <vn-check
+                label="Delivered"
+                ng-model="$ctrl.entryData.travel.isDelivered"
+                disabled="true">
+            </vn-check>
             <vn-label-value label="Landed"
                 value="{{$ctrl.entryData.travel.landed | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Warehouse In"
                 value="{{$ctrl.entryData.travel.warehouseIn.name}}">
             </vn-label-value>
+            <vn-check
+                label="Received"
+                ng-model="$ctrl.entryData.travel.isReceived"
+                disabled="true">
+            </vn-check>
         </vn-one>
         <vn-one>
             <vn-vertical>
@@ -174,7 +180,4 @@
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
-<vn-travel-descriptor-popover
-    vn-id="travel-descriptor">
-</vn-travel-descriptor-popover>
 

modules/ticket/front/sale/index.html

@@ -63,10 +63,10 @@
                     <vn-th shrink id="ticketId">Id</vn-th>
                     <vn-th shrink>Quantity</vn-th>
                     <vn-th>Item</vn-th>
-                    <vn-th>Packing type</vn-th>
                     <vn-th number>Price</vn-th>
                     <vn-th number>Disc</vn-th>
                     <vn-th number>Amount</vn-th>
+                    <vn-th shrink>Packing</vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
@@ -169,9 +169,6 @@
                             </vn-textfield>
                         </field>
                     </vn-td-editable>
-                    <vn-td>
-                        {{::sale.item.itemPackingTypeFk == 'H' ? 'Horizontal' : (sale.item.itemPackingTypeFk == 'V' ? 'Vertical' : '-')}}
-                    </vn-td>
                     <vn-td number>
                         <span ng-class="{'link': $ctrl.isEditable}"
                             translate-attr="{title: $ctrl.isEditable ? 'Edit price' : ''}"
@@ -190,6 +187,9 @@
                     <vn-td number>
                         {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}}
                     </vn-td>
+                    <vn-td shrink>
+                        {{::sale.item.itemPackingTypeFk | dashIfEmpty}}
+                    </vn-td>
                 </vn-tr>
             </vn-tbody>
         </vn-table>

modules/ticket/front/sale/locale/es.yml

@@ -35,4 +35,4 @@ Address: Dirección
 Warehouse: Almacen
 Agency: Agencia
 Shipped: F. envio
-Packing type: Forma de encajado
+Packing: Encajado