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

refs #5475 send email force
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-06-20 15:06:02 +02:00
parent 092471f74e
commit a8fafacb82
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loopback/common/methods/vn-model/printService.js
View File

@ -52,6 +52,6 @@ module.exports = Self => {
const email = new Email(templateName, params); const email = new Email(templateName, params);
return email.send(); return email.send({force: true});
}; };
}; };

7
print/core/email.js
View File

@ -63,12 +63,12 @@ class Email extends Component {
await getAttachments(componentPath, component.attachments); await getAttachments(componentPath, component.attachments);
if (component.components) if (component.components)
await getSubcomponentAttachments(component) await getSubcomponentAttachments(component);
} }
} }
} }
await getSubcomponentAttachments(instance) await getSubcomponentAttachments(instance);
if (this.attachments) if (this.attachments)
await getAttachments(this.path, this.attachments); await getAttachments(this.path, this.attachments);
@ -84,7 +84,8 @@ class Email extends Component {
replyTo: this.args.replyTo || '', replyTo: this.args.replyTo || '',
subject: localeSubject, subject: localeSubject,
html: rendered, html: rendered,
attachments: attachments attachments: attachments,
force: options.force
}; };
return smtp.send(mailOptions); return smtp.send(mailOptions);

4
print/core/smtp.js
View File

@ -10,7 +10,8 @@ module.exports = {
async send(options) { async send(options) {
options.from = `${config.app.senderName} <${config.app.senderEmail}>`; options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
console.log(process.env.NODE_ENV !== 'production' && !options.force);
console.log(process.env.NODE_ENV !== 'production', !options.force);
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const notProductionError = {message: 'This not production, this email not sended'}; const notProductionError = {message: 'This not production, this email not sended'};
await this.mailLog(options, notProductionError); await this.mailLog(options, notProductionError);
@ -19,7 +20,6 @@ module.exports = {
options.to = config.app.senderEmail; options.to = config.app.senderEmail;
} }
let error; let error;
return this.transporter.sendMail(options).catch(err => { return this.transporter.sendMail(options).catch(err => {
error = err; error = err;