diff --git a/app/models/submitter.rb b/app/models/submitter.rb index e41b66ce..0af9d211 100644 --- a/app/models/submitter.rb +++ b/app/models/submitter.rb @@ -85,6 +85,14 @@ class Submitter < ApplicationRecord end end + def first_name + name.split(/\s+/, 2).first + end + + def last_name + name.split(/\s+/, 2).last + end + def status_event_at declined_at || completed_at || opened_at || sent_at || created_at end diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb index c35b7bc9..52342117 100644 --- a/lib/replace_email_variables.rb +++ b/lib/replace_email_variables.rb @@ -6,9 +6,11 @@ module ReplaceEmailVariables SUBMITTER_LINK = /\{+submitter\.link\}+/i ACCOUNT_NAME = /\{+account\.name\}+/i SENDER_NAME = /\{+sender\.name\}+/i + SENDER_FIRST_NAME = /\{+sender\.first_name\}+/i SENDER_EMAIL = /\{+sender\.email\}+/i SUBMITTER_EMAIL = /\{+submitter\.email\}+/i SUBMITTER_NAME = /\{+submitter\.name\}+/i + SUBMITTER_FIRST_NAME = /\{+submitter\.first_name\}+/i SUBMITTER_ID = /\{+submitter\.id\}+/i SUBMITTER_SLUG = /\{+submitter\.slug\}+/i SUBMISSION_LINK = /\{+submission\.link\}+/i @@ -28,6 +30,7 @@ module ReplaceEmailVariables text = replace(text, SUBMISSION_ID, html_escape:) { submitter.submission.id } text = replace(text, SUBMITTER_EMAIL, html_escape:) { submitter.email } text = replace(text, SUBMITTER_NAME, html_escape:) { submitter.name || submitter.email || submitter.phone } + text = replace(text, SUBMITTER_FIRST_NAME, html_escape:) { submitter.first_name } text = replace(text, SUBMITTER_LINK, html_escape:) { build_submitter_link(submitter, tracking_event_type) } text = replace(text, SUBMISSION_LINK, html_escape:) do submitter.submission ? build_submission_link(submitter.submission) : '' @@ -37,6 +40,7 @@ module ReplaceEmailVariables text = replace(text, DOCUMENTS_LINK, html_escape:) { build_documents_links_text(submitter, sig) } text = replace(text, ACCOUNT_NAME, html_escape:) { submitter.submission.account.name } text = replace(text, SENDER_NAME, html_escape:) { submitter.submission.created_by_user&.full_name } + text = replace(text, SENDER_FIRST_NAME, html_escape:) { submitter.submission.created_by_user&.first_name } replace(text, SENDER_EMAIL, html_escape:) { submitter.submission.created_by_user&.email.to_s.sub(/\+\w+@/, '@') } end