didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust email variables

Browse Source
This commit is contained in:
Pete Matsyburka
2023-12-15 10:24:33 +02:00
parent ea74b59535
commit 1c77a1ee90
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/mailers/submitter_mailer.rb
+1 -1
View File
@@ -127,7 +127,7 @@ class SubmitterMailer < ApplicationMailer
end end
def from_address_for_submitter(submitter) def from_address_for_submitter(submitter)
if submitter.submission.created_by_user&.role == 'integration' && if submitter.submission.source.in?(%w[api embed]) &&
(from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence) (from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
from_email from_email
else else
app/views/submitter_mailer/invitation_email.html.erb
+3 -2
View File
@@ -1,6 +1,7 @@
<% if @email_config || @body.present? %> <% if @email_config || @body.present? %>
<%= auto_link(simple_format(h(ReplaceEmailVariables.call(@body.presence || @email_config.value['body'], submitter: @submitter)))) %> <% body = (@body.presence || @email_config.value['body']).to_s %>
<% if !(@body.presence || @email_config.value['body']).include?(ReplaceEmailVariables::SUBMITTER_LINK) %> <%= auto_link(simple_format(h(ReplaceEmailVariables.call(body, submitter: @submitter)))) %>
<% if !body.include?(ReplaceEmailVariables::SUBMITTER_LINK) && !body.include?(ReplaceEmailVariables::SUBMITTER_ID) && !body.include?(ReplaceEmailVariables::SUBMISSION_LINK) && !body.include?(ReplaceEmailVariables::TEMPLATE_ID) %>
<p><%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %></p> <p><%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %></p>
<% end %> <% end %>
<% else %> <% else %>
lib/replace_email_variables.rb
+4 -4
View File
@@ -1,8 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
module ReplaceEmailVariables module ReplaceEmailVariables
TEMAPLTE_NAME = '{{template.name}}' TEMPLATE_NAME = '{{template.name}}'
TEMAPLTE_ID = '{{template.id}}' TEMPLATE_ID = '{{template.id}}'
SUBMITTER_LINK = '{{submitter.link}}' SUBMITTER_LINK = '{{submitter.link}}'
ACCOUNT_NAME = '{{account.name}}' ACCOUNT_NAME = '{{account.name}}'
SUBMITTER_EMAIL = '{{submitter.email}}' SUBMITTER_EMAIL = '{{submitter.email}}'
@@ -22,8 +22,8 @@ module ReplaceEmailVariables
submission_link = build_submission_link(submitter.submission) if submitter.submission submission_link = build_submission_link(submitter.submission) if submitter.submission
text = text.gsub(TEMAPLTE_NAME, submitter.template.name) if submitter.template text = text.gsub(TEMPLATE_NAME, submitter.template.name) if submitter.template
text = text.gsub(TEMAPLTE_ID, submitter.template.id.to_s) if submitter.template text = text.gsub(TEMPLATE_ID, submitter.template.id.to_s) if submitter.template
text = text.gsub(SUBMITTER_ID, submitter.id.to_s) text = text.gsub(SUBMITTER_ID, submitter.id.to_s)
text = text.gsub(SUBMISSION_ID, submitter.submission.id.to_s) if submitter.submission text = text.gsub(SUBMISSION_ID, submitter.submission.id.to_s) if submitter.submission
text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email