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

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

This commit is contained in:
Joan Sanchez 2022-04-07 12:24:41 +02:00
parent e98374b8dd 0d6446e696
commit fa1fb37795
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/methods/chat/send.js
View File

@ -31,9 +31,9 @@ module.exports = Self => {
const recipient = to.replace('@', ''); const recipient = to.replace('@', '');
if (sender.name != recipient) { if (sender.name != recipient) {
const request = await sendMessage(sender, to, message); await sendMessage(sender, to, message);
return request ? request : false; return true;
} }
return false; return false;

8
modules/claim/back/methods/claim/filter.js
View File

@ -97,11 +97,16 @@ module.exports = Self => {
{'cl.socialName': {like: `%${value}%`}} {'cl.socialName': {like: `%${value}%`}}
] ]
}; };
case 'client':
return {'cl.socialName': {like: `%${value}%`}};
case 'clientFk':
return {'cl.clientFk': value};
case 'id': case 'id':
case 'claimStateFk': case 'claimStateFk':
case 'priority': case 'priority':
return {[`cl.${param}`]: value}; return {[`cl.${param}`]: value};
case 'salesPersonFk': case 'salesPersonFk':
return {'cl.salesPersonFk': value};
case 'attenderFk': case 'attenderFk':
return {'cl.workerFk': value}; return {'cl.workerFk': value};
case 'created': case 'created':
@ -129,7 +134,8 @@ module.exports = Self => {
cs.description, cs.description,
cl.created, cl.created,
cs.priority, cs.priority,
cl.claimStateFk cl.claimStateFk,
c.salesPersonFk
FROM claim cl FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk LEFT JOIN client c ON c.id = cl.clientFk
LEFT JOIN worker w ON w.id = cl.workerFk LEFT JOIN worker w ON w.id = cl.workerFk