Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
408b511e6d
|
@ -33,6 +33,8 @@ module.exports = function(TicketState) {
|
|||
TicketState.app.models.Employee.findOne({where: {userFk: ctx.req.accessToken.userId}}, function(err, emp){
|
||||
if(!err)
|
||||
changeState(emp.id, tickets, state, cb);
|
||||
else
|
||||
cb(err, null);
|
||||
});
|
||||
|
||||
TicketState.disconnectFromService("client");
|
||||
|
|
|
@ -15,6 +15,8 @@ module.exports = function(Warehouse) {
|
|||
Warehouse.find(where(), function(err, warehouses){
|
||||
if(!err)
|
||||
cb(null, warehouses);
|
||||
else
|
||||
cb(err, null);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue