From 400e01b76be56427bf9f98ef69259613037d742c Mon Sep 17 00:00:00 2001 From: Mihail Hagiu <mihail.hagiu@thinslices.com> Date: Wed, 9 Jan 2019 10:03:17 +0200 Subject: [PATCH] fix(withEditorialDecision): Changed line --- .../src/routes/fragmentsInvitations/emails/invitations.js | 4 ++-- .../src/routes/fragmentsInvitations/jobs/reminders.js | 7 +++---- .../src/components/UIComponents/withEditorialDecision.js | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js b/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js index 6b9b96c94..36d9723cc 100644 --- a/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js +++ b/packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js @@ -117,9 +117,9 @@ module.exports = { await email.sendEmail() - forOwn(daysList, (day, order) => + forOwn(daysList, (days, order) => scheduleReminderJob({ - day, + days, order, email, timeUnit, diff --git a/packages/component-invite/src/routes/fragmentsInvitations/jobs/reminders.js b/packages/component-invite/src/routes/fragmentsInvitations/jobs/reminders.js index 29176ae7b..fa425c29d 100644 --- a/packages/component-invite/src/routes/fragmentsInvitations/jobs/reminders.js +++ b/packages/component-invite/src/routes/fragmentsInvitations/jobs/reminders.js @@ -6,19 +6,18 @@ const { getEmailCopy } = require('../emails/emailCopy') const Email = require('@pubsweet/component-email-templating') const scheduleReminderJob = async ({ - day, + days, email, order, userId, subject, timeUnit, - daysList, titleText, invitationId, expectedDate, }) => { const executionDate = moment() - .add(day, timeUnit) + .add(days, timeUnit) .toISOString() const queue = `reminders-${userId}-${invitationId}` @@ -33,7 +32,7 @@ const scheduleReminderJob = async ({ email.content.subject = subject const params = { - day, + days, timeUnit, executionDate, emailProps: cloneDeep(email), diff --git a/packages/components-faraday/src/components/UIComponents/withEditorialDecision.js b/packages/components-faraday/src/components/UIComponents/withEditorialDecision.js index c5772f620..6143319f8 100644 --- a/packages/components-faraday/src/components/UIComponents/withEditorialDecision.js +++ b/packages/components-faraday/src/components/UIComponents/withEditorialDecision.js @@ -20,7 +20,9 @@ export default compose( hideModal() setSuccess( decision.step === 'eqs' - ? `Manuscript accepted. Thank you for your technical check!` + ? `Manuscript ${ + decision.agree ? 'accepted' : 'declined' + }. Thank you for your technical check!` : 'Manuscript decision submitted. Thank you!', ) }) -- GitLab