diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb index 1e322711..83dee459 100644 --- a/app/jobs/process_submitter_completion_job.rb +++ b/app/jobs/process_submitter_completion_job.rb @@ -26,12 +26,14 @@ class ProcessSubmitterCompletionJob < ApplicationJob user = submission.created_by_user || submitter.template.author - if submitter.template.account.users.exists?(id: user.id) && + if submitter.account.users.exists?(id: user.id) && submission.preferences['send_email'] != false - SubmitterMailer.completed_email(submitter, user).deliver_later! + if user.user_configs.find_by(key: UserConfig::RECEIVE_COMPLETED_EMAIL)&.value != false + SubmitterMailer.completed_email(submitter, user).deliver_later! + end bcc = submission.preferences['bcc_completed'].presence || - submission.template.account.account_configs + submission.account.account_configs .find_by(key: AccountConfig::BCC_EMAILS)&.value.presence bcc.to_s.scan(User::EMAIL_REGEXP).each do |to| diff --git a/app/models/user_config.rb b/app/models/user_config.rb index fb9d65d2..789ebc98 100644 --- a/app/models/user_config.rb +++ b/app/models/user_config.rb @@ -22,6 +22,7 @@ # class UserConfig < ApplicationRecord SIGNATURE_KEY = 'signature' + RECEIVE_COMPLETED_EMAIL = 'receive_completed_email' belongs_to :user