completed email bcc sending via to address
This commit is contained in:
@@ -26,18 +26,24 @@ class ProcessSubmitterCompletionJob < ApplicationJob
|
|||||||
|
|
||||||
if submitter.template.account.users.exists?(id: user.id) &&
|
if submitter.template.account.users.exists?(id: user.id) &&
|
||||||
submitter.submission.preferences['send_email'] != false
|
submitter.submission.preferences['send_email'] != false
|
||||||
bcc = submitter.submission.template.account.account_configs
|
SubmitterMailer.completed_email(submitter, user).deliver_later!
|
||||||
.find_by(key: AccountConfig::BCC_EMAILS)&.value
|
|
||||||
|
|
||||||
SubmitterMailer.completed_email(submitter, user, bcc:).deliver_later!
|
bcc = submitter.submission.template.account.account_configs
|
||||||
|
.find_by(key: AccountConfig::BCC_EMAILS)&.value.presence
|
||||||
|
|
||||||
|
SubmitterMailer.completed_email(submitter, user, to: bcc).deliver_later! if bcc
|
||||||
end
|
end
|
||||||
|
|
||||||
to = submitter.submission.submitters.reject { |e| e.preferences['send_email'] == false }
|
to = build_to_addresses(submitter)
|
||||||
.sort_by(&:completed_at).select(&:email?).map(&:friendly_name).join(', ')
|
|
||||||
|
|
||||||
SubmitterMailer.documents_copy_email(submitter, to:).deliver_later! if to.present?
|
SubmitterMailer.documents_copy_email(submitter, to:).deliver_later! if to.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def build_to_addresses(submitter)
|
||||||
|
submitter.submission.submitters.reject { |e| e.preferences['send_email'] == false }
|
||||||
|
.sort_by(&:completed_at).select(&:email?).map(&:friendly_name).join(', ')
|
||||||
|
end
|
||||||
|
|
||||||
def enqueue_next_submitter_request_notification(submitter)
|
def enqueue_next_submitter_request_notification(submitter)
|
||||||
next_submitter_item =
|
next_submitter_item =
|
||||||
submitter.submission.template_submitters.find do |e|
|
submitter.submission.template_submitters.find do |e|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class SubmitterMailer < ApplicationMailer
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def completed_email(submitter, user, bcc: nil)
|
def completed_email(submitter, user, to: nil)
|
||||||
@current_account = submitter.submission.template.account
|
@current_account = submitter.submission.template.account
|
||||||
@submitter = submitter
|
@submitter = submitter
|
||||||
@submission = submitter.submission
|
@submission = submitter.submission
|
||||||
@@ -55,8 +55,7 @@ class SubmitterMailer < ApplicationMailer
|
|||||||
end
|
end
|
||||||
|
|
||||||
mail(from: from_address_for_submitter(submitter),
|
mail(from: from_address_for_submitter(submitter),
|
||||||
to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
|
to: to || (user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name),
|
||||||
bcc:,
|
|
||||||
subject:)
|
subject:)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user