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

Chore: Feature lock email settings in UI (#1065)

Browse Source 
* Chore: Feature lock email settings in UI

The email settings under account settings needed to be
feature locked in a way different from teh current way for it
to be enabled for accounts in a self hosted scenario.

Some refactorings were also done along with this change.

1. There was a feature flag defined in code in account model called
domain_emails_enabled was used to check if the inbound emails was
enabled for the account. But there was already a feature flag called
"inbound_emails" defined in features.yml. So changed to use this to
check if inbound emails are enabled for an account.
2. Renamed and re-purposed existing `domain_emails_enabled` to
`custom_email_domain_enabled` to use for feature toggling the UI
for email settings.
3. To enable & disable multiple features using the featurable concern
we were passing an array of values. Changed this to accept a comma
separated set of values.

* Chore: Feature lock email settings in UI

Fixed the specs for accounts controller & removed
unneccessary code from Account seetings component in UI

* Chore: Convert newlines to <br>s

Removed the layout used while sending replies in
conversation continuity.

Converted the newlines in the messages to <br/> tags
for the correct HTML rendering.

* Chore: Bug fix in reply email domain

Renamed the function custom_email_domain_enabled  to
inbound_email_enabled.

Fixed bug on setting reply emails's domain.
This commit is contained in:
Sony Mathew
2020-07-19 23:08:07 +05:30
committed by GitHub
parent 7607e8edb4
commit 96efc44b82
13 changed files with 47 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/mailers/conversation_reply_mailer.rb
View File

@@ -1,6 +1,6 @@
class ConversationReplyMailer < ApplicationMailer
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
layout 'mailer'
layout :choose_layout
def reply_with_summary(conversation, message_queued_time)
return unless smtp_config_set_or_development?
@@ -54,16 +54,16 @@ class ConversationReplyMailer < ApplicationMailer
end
def reply_email
if custom_domain_email_enabled?
"#{@agent.name} <reply+#{@conversation.uuid}@#{@account.domain}>"
if inbound_email_enabled?
"#{@agent.name} <reply+#{@conversation.uuid}@#{current_domain}>"
else
@agent&.email
end
end
def from_email
if custom_domain_email_enabled?
"#{@agent.name} <#{@account_support_email}>"
if inbound_email_enabled?
"#{@agent.name} <#{account_support_email}>"
else
"#{@agent.name} <#{ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')}>"
end
@@ -77,8 +77,8 @@ class ConversationReplyMailer < ApplicationMailer
"<account/#{@account.id}/conversation/#{@conversation.uuid}@#{current_domain}>"
end
def custom_domain_email_enabled?
@custom_domain_email_enabled ||= @account.domain_emails_enabled? && current_domain.present? && account_support_email.present?
def inbound_email_enabled?
@inbound_email_enabled ||= @account.feature_enabled?('inbound_emails') && current_domain.present? && account_support_email.present?
end
def current_domain
@@ -96,4 +96,10 @@ class ConversationReplyMailer < ApplicationMailer
ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
end
end
def choose_layout
return false if action_name == 'reply_without_summary'
'mailer'
end
end