adjust integration submissions

pull/150/merge
Pete Matsyburka 2 years ago
parent f1e0d5d137
commit 7351ae0a77

@ -25,10 +25,12 @@ class SubmitterMailer < ApplicationMailer
DEFAULT_INVITATION_SUBJECT DEFAULT_INVITATION_SUBJECT
end end
mail(to: @submitter.friendly_name, mail(
from: from_address_for_submitter(submitter), to: @submitter.friendly_name,
subject:, from: from_address_for_submitter(submitter),
reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name) subject:,
reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
)
end end
def completed_email(submitter, user, bcc: nil) def completed_email(submitter, user, bcc: nil)
@ -53,7 +55,7 @@ class SubmitterMailer < ApplicationMailer
end end
mail(from: from_address_for_submitter(submitter), mail(from: from_address_for_submitter(submitter),
to: user.friendly_name, to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
bcc:, bcc:,
subject:) subject:)
end end
@ -125,6 +127,11 @@ class SubmitterMailer < ApplicationMailer
end end
def from_address_for_submitter(submitter) def from_address_for_submitter(submitter)
submitter.submission.created_by_user&.friendly_name || submitter.submission.template.author.friendly_name if submitter.submission.created_by_user&.role == 'integration' &&
(from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
from_email
else
(submitter.submission.created_by_user || submitter.submission.template.author).friendly_name
end
end end
end end

@ -70,9 +70,11 @@ module Submissions
composer.column(columns: 1) do |column| composer.column(columns: 1) do |column|
column.text("Envelope ID: #{submission.id}", font_size: 12, padding: [20, 0, 10, 0], position: :float) column.text("Envelope ID: #{submission.id}", font_size: 12, padding: [20, 0, 10, 0], position: :float)
column.formatted_text([
{ link: verify_url, text: 'Verify', style: :link } unless submission.source_embed?
], font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right) column.formatted_text([{ link: verify_url, text: 'Verify', style: :link }],
font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right)
end
end end
composer.draw_box(divider) composer.draw_box(divider)

Loading…
Cancel
Save