From 1c77a1ee9016ecb54345bc6c4933401f7d8633b7 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 15 Dec 2023 10:24:33 +0200 Subject: [PATCH] adjust email variables --- app/mailers/submitter_mailer.rb | 2 +- app/views/submitter_mailer/invitation_email.html.erb | 5 +++-- lib/replace_email_variables.rb | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/mailers/submitter_mailer.rb b/app/mailers/submitter_mailer.rb index 2b7ec09e..6941d607 100644 --- a/app/mailers/submitter_mailer.rb +++ b/app/mailers/submitter_mailer.rb @@ -127,7 +127,7 @@ class SubmitterMailer < ApplicationMailer end 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 else diff --git a/app/views/submitter_mailer/invitation_email.html.erb b/app/views/submitter_mailer/invitation_email.html.erb index 3758aa67..36d0970c 100644 --- a/app/views/submitter_mailer/invitation_email.html.erb +++ b/app/views/submitter_mailer/invitation_email.html.erb @@ -1,6 +1,7 @@ <% if @email_config || @body.present? %> - <%= auto_link(simple_format(h(ReplaceEmailVariables.call(@body.presence || @email_config.value['body'], submitter: @submitter)))) %> - <% if !(@body.presence || @email_config.value['body']).include?(ReplaceEmailVariables::SUBMITTER_LINK) %> + <% body = (@body.presence || @email_config.value['body']).to_s %> + <%= 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) %>

<%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %>

<% end %> <% else %> diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb index 41f3a5a5..ecf568ee 100644 --- a/lib/replace_email_variables.rb +++ b/lib/replace_email_variables.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true module ReplaceEmailVariables - TEMAPLTE_NAME = '{{template.name}}' - TEMAPLTE_ID = '{{template.id}}' + TEMPLATE_NAME = '{{template.name}}' + TEMPLATE_ID = '{{template.id}}' SUBMITTER_LINK = '{{submitter.link}}' ACCOUNT_NAME = '{{account.name}}' SUBMITTER_EMAIL = '{{submitter.email}}' @@ -22,8 +22,8 @@ module ReplaceEmailVariables submission_link = build_submission_link(submitter.submission) if submitter.submission - text = text.gsub(TEMAPLTE_NAME, submitter.template.name) if submitter.template - text = text.gsub(TEMAPLTE_ID, submitter.template.id.to_s) if submitter.template + text = text.gsub(TEMPLATE_NAME, submitter.template.name) 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(SUBMISSION_ID, submitter.submission.id.to_s) if submitter.submission text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email