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

Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details

This commit is contained in:
Vicent Llopis 2022-11-04 08:03:55 +00:00
parent e1d187ef68 f53b74c04c
commit 158fc56555
2 changed files with 2 additions and 44188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/worker/back/methods/worker-time-control-mail/checkInbox.js
View File

@ -58,8 +58,7 @@ module.exports = Self => {
emailBody = bufferCopy.toUpperCase().trim(); emailBody = bufferCopy.toUpperCase().trim();
const bodyPositionOK = emailBody.match(/\bOK\b/i); const bodyPositionOK = emailBody.match(/\bOK\b/i);
const bodyPositionIndex = (bodyPositionOK.index == 0 || bodyPositionOK.index == 122); if (bodyPositionOK != null && (bodyPositionOK.index == 0 || bodyPositionOK.index == 122))
if (bodyPositionOK != null && bodyPositionIndex)
isEmailOk = true; isEmailOk = true;
else else
isEmailOk = false; isEmailOk = false;
@ -157,7 +156,7 @@ module.exports = Self => {
let [user] = await Self.rawSql(`SELECT u.id,u.name FROM account.user u let [user] = await Self.rawSql(`SELECT u.id,u.name FROM account.user u
LEFT JOIN account.mailForward m on m.account = u.id LEFT JOIN account.mailForward m on m.account = u.id
WHERE forwardTo =? OR WHERE forwardTo =? OR
CONCAT(u.name,'@verdnatura.es') = ?`, CONCAT(u.name,'@verdnatura.es') = ?`,
[userEmail[0], userEmail[0]]); [userEmail[0], userEmail[0]]);

44185
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff