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

refs #5941 fix(sendToSupport): add as a collaborator
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2023-08-21 14:48:05 +02:00
parent 36623c1cae
commit 14d4de0e1f
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/methods/osticket/sendToSupport.js
View File

@ -40,9 +40,7 @@ module.exports = Self => {
const subjectReason = JSON.parse(additionalData?.httpRequest)?.data?.error; const subjectReason = JSON.parse(additionalData?.httpRequest)?.data?.error;
smtp.send({ smtp.send({
to: config.app.reportEmail, to: `${config.app.reportEmail}, ${emailUser.email}`,
from: emailUser.email,
replyTo: emailUser.email,
subject: subject:
'[Support-Salix] ' + '[Support-Salix] ' +
additionalData?.frontPath + ' ' + additionalData?.frontPath + ' ' +

6
print/core/smtp.js
View File

@ -9,7 +9,7 @@ module.exports = {
}, },
async send(options) { async send(options) {
options.from = options.from ?? `${config.app.senderName} <${config.app.senderEmail}>`; options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
const canSend = env === 'production' || !env || options.force; const canSend = env === 'production' || !env || options.force;
@ -19,10 +19,8 @@ module.exports = {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (!env) { if (!env)
options.to = config.app.senderEmail; options.to = config.app.senderEmail;
options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
}
let res; let res;
let error; let error;