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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +12 -3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dec25d423 - Show all commits

15
modules/route/back/methods/route/driverRouteEmail.js
View File

@ -39,6 +39,8 @@ module.exports = Self => {
const {reportMail} = agencyMode(); const {reportMail} = agencyMode();
let user; let user;
let account; let account;
let userEmail;
ctx.args.recipients = reportMail ? reportMail.split(',').map(email => email.trim()) : [];
if (workerFk) { if (workerFk) {
user = await models.VnUser.findById(workerFk, { user = await models.VnUser.findById(workerFk, {
@ -48,10 +50,17 @@ module.exports = Self => {
account = await models.Account.findById(workerFk); account = await models.Account.findById(workerFk);
} }
if (user?.active && account) ctx.args.recipient = user.emailUser().email; if (user?.active && account)
else ctx.args.recipient = reportMail; userEmail = user.emailUser().email;
if (userEmail)
ctx.args.recipients.push(userEmail);
ctx.args.recipients = [...new Set(ctx.args.recipients)];
if (!ctx.args.recipients.length)
throw new UserError('An email is necessary');
if (!ctx.args.recipient) throw new UserError('An email is necessary');
return Self.sendTemplate(ctx, 'driver-route'); return Self.sendTemplate(ctx, 'driver-route');
}; };
}; };