Fix: SMTP IMAP configuration from email
This fix should allow emails from the "Email" inbox to show from as "Name <email@example.com>". if SMTP within Inbox is disabled.
This commit is contained in:
parent
a8cfcbc168
commit
5da0b0667f
1 changed files with 5 additions and 1 deletions
|
@ -40,6 +40,10 @@ module ConversationReplyMailerHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def email_smtp_enabled
|
def email_smtp_enabled
|
||||||
|
@inbox.inbox_type == 'Email' && @channel.smtp_enabled
|
||||||
|
end
|
||||||
|
|
||||||
|
def email_imap_enabled
|
||||||
@inbox.inbox_type == 'Email' && @channel.imap_enabled
|
@inbox.inbox_type == 'Email' && @channel.imap_enabled
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -48,6 +52,6 @@ module ConversationReplyMailerHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def email_reply_to
|
def email_reply_to
|
||||||
email_smtp_enabled ? @channel.smtp_email : reply_email
|
email_imap_enabled ? @channel.imap_email : reply_email
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue