LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

bug: Fix emails if assignee is nil (#1106)

Browse Source
This commit is contained in:
Pranav Raj S
2020-07-31 15:57:19 +05:30
committed by GitHub
parent 4b773f2a0e
commit 1dd3573c39
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/mailers/conversation_reply_mailer.rb
View File

@@ -49,6 +49,10 @@ class ConversationReplyMailer < ApplicationMailer
private
def assignee_name
@assignee_name ||= @agent&.available_name || 'Notifications'
end
def mail_subject
subject_line = I18n.t('conversations.reply.email_subject')
"[##{@conversation.display_id}] #{subject_line}"
@@ -56,7 +60,7 @@ class ConversationReplyMailer < ApplicationMailer
def reply_email
if inbound_email_enabled?
"#{@agent.available_name} <reply+#{@conversation.uuid}@#{current_domain}>"
"#{assignee_name} <reply+#{@conversation.uuid}@#{current_domain}>"
else
@agent&.email
end
@@ -64,9 +68,9 @@ class ConversationReplyMailer < ApplicationMailer
def from_email
if inbound_email_enabled?
"#{@agent.available_name} <#{account_support_email}>"
"#{assignee_name} <#{account_support_email}>"
else
"#{@agent.available_name} <#{ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')}>"
"#{assignee_name} <#{ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')}>"
end
end