feat: Display reply time in widget (#1349)

Fixes #1132
2020-10-18 23:32:22 +05:30
parent bd11b2ec58
commit 85514cae8d
43 changed files with 707 additions and 345 deletions
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -19,7 +19,7 @@ class MessageTemplates::HookExecutionService
  end

  def should_send_greeting?
-    first_message_from_contact? && conversation.inbox.greeting_enabled?
+    first_message_from_contact? && conversation.inbox.greeting_enabled? && conversation.inbox.greeting_message.present?
  end

  def email_collect_was_sent?
--- a/app/services/message_templates/template/greeting.rb
+++ b/app/services/message_templates/template/greeting.rb
@@ -17,10 +17,6 @@ class MessageTemplates::Template::Greeting

  def greeting_message_params
    content = @conversation.inbox&.greeting_message
-    if content.blank?
-      content = I18n.t('conversations.templates.greeting_message_body',
-                       account_name: account.name)
-    end

    {
      account_id: @conversation.account_id,