diff --git a/packages/component-email/src/routes/emails/notifications.js b/packages/component-email/src/routes/emails/notifications.js index 98db2ecdabd1243129093fb56da08c575f0a3cb0..66f2dfa15e913d0c846988cddfb6e252ae6db9ca 100644 --- a/packages/component-email/src/routes/emails/notifications.js +++ b/packages/component-email/src/routes/emails/notifications.js @@ -5,7 +5,7 @@ const resetPath = config.get('invite-reset-password.url') const { Email, services } = require('pubsweet-component-helper-service') -const { helpers } = require('./helpers') +const { sendNewUserEmail, sendSignupEmail } = require('./helpers') module.exports = { async sendNotifications({ user, baseUrl, role, UserModel }) { @@ -33,9 +33,9 @@ module.exports = { }) if (role) { - helpers.sendNewUserEmail({ email, role }) + sendNewUserEmail({ email, role }) } else { - helpers.sendSignupEmail({ email, baseUrl, user }) + sendSignupEmail({ email, baseUrl, user }) } }, } diff --git a/packages/component-helper-service/src/services/email/Email.js b/packages/component-helper-service/src/services/email/Email.js index 037773fdfddea89c019f14797dac08c53c7e8c79..d161f2129776cda9669c1ea787a5e7cac1d4191a 100644 --- a/packages/component-helper-service/src/services/email/Email.js +++ b/packages/component-helper-service/src/services/email/Email.js @@ -4,7 +4,7 @@ const helpers = require('./helpers') const SendEmail = require('@pubsweet/component-send-email') const logger = require('@pubsweet/logger') -const mainFromEmail = config.get('mailer.from') +const mainFromEmail = config.get('journal.staffEmail') class Email { constructor({ type = 'system', diff --git a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js index 5ddd51df6341fcfea294beec63a3a12200f5cb33..c15717402311b42c516697898d97d2767ff44b5a 100644 --- a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js +++ b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js @@ -2,6 +2,8 @@ const config = require('config') const { get } = require('lodash') const unsubscribeSlug = config.get('unsubscribe.url') +const fromEmail = config.get('journal.staffEmail') +const journalName = config.get('journal.name') const { User, @@ -39,14 +41,16 @@ module.exports = { const eicName = await userHelper.getEiCName() const email = new Email({ + fromEmail, type: 'user', content: { + ctaText: 'MANUSCRIPT DETAILS', + signatureJournal: journalName, signatureName: handlingEditor.name, ctaLink: services.createUrl( baseUrl, `/projects/${collection.id}/versions/${fragment.id}/details`, ), - ctaText: 'MANUSCRIPT DETAILS', }, }) @@ -98,6 +102,7 @@ const sendHandlingEditorEmail = ({ id: handlingEditor.id, }) email.content.signatureName = eicName + email.content.signatureJournal = '' const { html, text } = email.getBody({ body: getEmailCopy({