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

Merge pull request '2305 - Added noReply param' (#298) from 2305-replyTo_param into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
This commit is contained in:
Bernat Exposito 2020-06-05 11:58:16 +00:00
parent 3a24732d78 e25b87213b
commit f6953747d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
print/core/email.js
View File

@ -72,9 +72,10 @@ class Email extends Component {
await getAttachments(this.path, this.attachments); await getAttachments(this.path, this.attachments);
const localeSubject = await this.getSubject(); const localeSubject = await this.getSubject();
const replyTo = this.args.replyTo || this.args.auth.email;
const options = { const options = {
to: this.args.recipient, to: this.args.recipient,
replyTo: this.args.auth.email, replyTo: replyTo,
subject: localeSubject, subject: localeSubject,
html: rendered, html: rendered,
attachments: attachments attachments: attachments

3
print/methods/closure.js
View File

@ -58,7 +58,8 @@ module.exports = app => {
const args = Object.assign({ const args = Object.assign({
ticketId: ticket.id, ticketId: ticket.id,
recipientId: ticket.clientFk, recipientId: ticket.clientFk,
recipient: ticket.recipient recipient: ticket.recipient,
replyTo: ticket.salesPersonEmail
}, reqArgs); }, reqArgs);
const email = new Email('delivery-note-link', args); const email = new Email('delivery-note-link', args);