Merge branch 'dev' of http://git.verdnatura.es/salix into dev

client/ticket/src/expedition/index.html

@@ -27,7 +27,7 @@
                     <vn-tr ng-repeat="expedition in expeditions">
                         <vn-td pad-medium-h style="width:30px;color:#FFA410;">
                             <vn-icon-button icon="delete"
-                                on-click="$ctrl.deleteExpedition(expedition)"
+                                ng-click="$ctrl.deleteExpedition(expedition)"
                                 vn-tooltip="Delete expedition">
                             </vn-icon-button>
                         </vn-td>

client/ticket/src/expedition/index.js

@@ -30,8 +30,8 @@ class Controller {
                     warehouseFk: ${this.ticket.warehouseFk},
                     ticketFk: ${this.ticket.id}
                 })`,
-                tooltip: 'Item diary'
-            }
+                tooltip: 'Item diary',
+            },
         };
         this.$scope.descriptor.itemFk = itemFk;
         this.$scope.descriptor.parent = event.target;
@@ -49,6 +49,6 @@ ngModule.component('vnTicketExpedition', {
     template: require('./index.html'),
     controller: Controller,
     bindings: {
-        ticket: '<'
-    }
+        ticket: '<',
+    },
 });

services/ticket/common/methods/expedition/filter.js

@@ -1,6 +1,6 @@
 const ParameterizedSQL = require('vn-loopback/node_modules/loopback-connector').ParameterizedSQL;
 
-module.exports = Self => {
+module.exports = (Self) => {
     Self.remoteMethod('filter', {
         description: 'Find all instances of the model matched by filter from the data source.',
         accessType: 'READ',
@@ -9,22 +9,23 @@ module.exports = Self => {
                 arg: 'filter',
                 type: 'Object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-                http: {source: 'query'}
-            }
+                http: {source: 'query'},
+            },
         ],
         returns: {
             type: ['Object'],
-            root: true
+            root: true,
         },
         http: {
             path: `/filter`,
-            verb: 'GET'
-        }
+            verb: 'GET',
+        },
     });
 
-    Self.filter = async filter => {
-        let stmt = new ParameterizedSQL(
+    Self.filter = async (filter) => {
+        const stmt = new ParameterizedSQL(
             `SELECT 
+                e.id,
                 e.ticketFk,
                 e.isBox,
                 i1.name namePackage,