verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 69 Releases Wiki Activity

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

This commit is contained in:
Dani Herrero 2017-06-15 12:00:57 +02:00
parent 1ca5e20494 80b9815a57
commit 408b511e6d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/production/common/methods/ticket-state/change-state.js
View File

@ -33,6 +33,8 @@ module.exports = function(TicketState) {
TicketState.app.models.Employee.findOne({where: {userFk: ctx.req.accessToken.userId}}, function(err, emp){ TicketState.app.models.Employee.findOne({where: {userFk: ctx.req.accessToken.userId}}, function(err, emp){
if(!err) if(!err)
changeState(emp.id, tickets, state, cb); changeState(emp.id, tickets, state, cb);
else
cb(err, null);
}); });
TicketState.disconnectFromService("client"); TicketState.disconnectFromService("client");

2
services/production/common/methods/warehouse/list-warehouses.js
View File

@ -15,6 +15,8 @@ module.exports = function(Warehouse) {
Warehouse.find(where(), function(err, warehouses){ Warehouse.find(where(), function(err, warehouses){
if(!err) if(!err)
cb(null, warehouses); cb(null, warehouses);
else
cb(err, null);
}); });
}; };