diff --git a/packages/component-email-templating/src/templates/partials/invLowerContent.hbs b/packages/component-email-templating/src/templates/partials/invLowerContent.hbs index 2e391bc6b161adfc49bee25dd7db227001cab266..0fae75fbf7b61ff6975a08ce97b119d32e066354 100644 --- a/packages/component-email-templating/src/templates/partials/invLowerContent.hbs +++ b/packages/component-email-templating/src/templates/partials/invLowerContent.hbs @@ -1,10 +1,6 @@ <table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;"> <tr> <td style="padding:30px 23px 0px 23px;background-color:#ffffff;" height="100%" valign="top" bgcolor="#ffffff"> - <p data-pm-slice="1 1 []"> - <a href="{{ detailsLink }}">See more information</a> - </p> - <p data-pm-slice="1 1 []"> </p> {{#unless resend }} diff --git a/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js b/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js index a69f9cc38885fa623e105b82497e5662aea98a90..471138e772df784be27fbeac442644d324fbfee7 100644 --- a/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js +++ b/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js @@ -4,6 +4,7 @@ const Email = require('@pubsweet/component-email-templating') const unsubscribeSlug = config.get('unsubscribe.url') const inviteReviewerPath = config.get('invite-reviewer.url') +const { staffEmail, name: journalName } = config.get('journal') const { services, Fragment } = require('pubsweet-component-helper-service') @@ -68,8 +69,10 @@ module.exports = { author => `${author.firstName} ${author.lastName}`, ) + const handlingEditor = get(collection, 'handlingEditor', {}) const email = new Email({ type: 'user', + fromEmail: `${handlingEditor.name} <${staffEmail}>`, toUser: { email: invitedUser.email, name: `${invitedUser.lastName}`, @@ -79,10 +82,11 @@ module.exports = { abstract, agreeLink, declineLink, + signatureJournal: journalName, + signatureName: handlingEditor.name, authorsList: authorsList.join(', '), subject: `${subjectBaseText} invitation`, detailsLink: services.createUrl(baseUrl, detailsPath), - signatureName: get(collection, 'handlingEditor.name', 'Hindawi'), unsubscribeLink: services.createUrl(baseUrl, unsubscribeSlug, { id: invitedUser.id, token: invitedUser.accessTokens.unsubscribe, diff --git a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js index 7f9cd6d34ccf5b3e8ee5e61f9eb498175f965e4c..c2c04f72476a23ce91749544a279e10a459b16c3 100644 --- a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js +++ b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js @@ -3,7 +3,7 @@ const { get } = require('lodash') const Email = require('@pubsweet/component-email-templating') const unsubscribeSlug = config.get('unsubscribe.url') -const fromEmail = config.get('journal.staffEmail') +const staffEmail = config.get('journal.staffEmail') const journalName = config.get('journal.name') const { @@ -41,7 +41,7 @@ module.exports = { const eicName = await userHelper.getEiCName() const email = new Email({ - fromEmail, + fromEmail: `${handlingEditor.name} <${staffEmail}>`, type: 'user', content: { ctaText: 'MANUSCRIPT DETAILS', @@ -67,6 +67,7 @@ module.exports = { if (['reviewer-accepted', 'reviewer-declined'].includes(emailType)) { const heUser = await UserModel.find(handlingEditor.id) + email.fromEmail = `${eicName} <${staffEmail}>` sendHandlingEditorEmail({ email, eicName,