From 517c292c17ac3050bee37f6b6b21375a722bb39c Mon Sep 17 00:00:00 2001 From: Alex Turchyn Date: Mon, 4 Sep 2023 10:06:50 +0300 Subject: [PATCH] add submitter name email variable --- app/models/account_config.rb | 4 ++-- lib/replace_email_variables.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/account_config.rb b/app/models/account_config.rb index 39752a09..af6137ce 100644 --- a/app/models/account_config.rb +++ b/app/models/account_config.rb @@ -36,9 +36,9 @@ class AccountConfig < ApplicationRecord '{{account.name}}' }, SUBMITTER_COMPLETED_EMAIL_KEY => { - 'subject' => '{{submitter.email}} has completed the "{{template.name}}" form', + 'subject' => '{{submitter.name}} has completed the "{{template.name}}" form', 'body' => "Hi,\n\n" \ - "{{submitter.email}} has completed the \"{{template.name}}\" form:\n\n" \ + "{{submitter.name}} has completed the \"{{template.name}}\" form:\n\n" \ "{{submission.link}}\n\n" \ "Thanks,\n" \ '{{account.name}}' diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb index b8af0750..f7d16458 100644 --- a/lib/replace_email_variables.rb +++ b/lib/replace_email_variables.rb @@ -5,6 +5,7 @@ module ReplaceEmailVariables SUBMITTER_LINK = '{{submitter.link}}' ACCOUNT_NAME = '{{account.name}}' SUBMITTER_EMAIL = '{{submitter.email}}' + SUBMITTER_NAME = '{{submitter.name}}' SUBMISSION_LINK = '{{submission.link}}' DOCUMENTS_LINKS = '{{documents.links}}' @@ -25,6 +26,7 @@ module ReplaceEmailVariables text = text.gsub(TEMAPLTE_NAME, submitter.template.name) if submitter.template text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email + text = text.gsub(SUBMITTER_NAME, submitter.name || submitter.email || submitter.phone) text = text.gsub(SUBMITTER_LINK, submitter_link) text = text.gsub(SUBMISSION_LINK, submission_link) if submission_link text = text.gsub(DOCUMENTS_LINKS, build_documents_links_text(submitter))