From 64bdb534ee879970c05b2f71f78ee5e36a3d2c39 Mon Sep 17 00:00:00 2001 From: John Manuel Derecho Date: Mon, 7 Aug 2023 17:53:10 +0800 Subject: [PATCH 001/256] feat: setting to Add Previous Message in the email reply --- .../api/v1/accounts/inboxes_controller.rb | 2 +- .../dashboard/i18n/locale/en/inboxMgmt.json | 6 +++ .../dashboard/settings/inbox/Settings.vue | 26 +++++++++- .../shared/mixins/specs/automationFixtures.js | 2 + app/mailers/conversation_reply_mailer.rb | 1 + app/models/inbox.rb | 49 ++++++++++--------- app/views/api/v1/models/_inbox.json.jbuilder | 1 + .../email_reply.html.erb | 14 ++++++ ...3110_add_reply_with_original_to_message.rb | 5 ++ db/schema.rb | 3 +- 10 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 db/migrate/20230807093110_add_reply_with_original_to_message.rb diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb index 011faaf280085..39f683e42c8d2 100644 --- a/app/controllers/api/v1/accounts/inboxes_controller.rb +++ b/app/controllers/api/v1/accounts/inboxes_controller.rb @@ -122,7 +122,7 @@ def update_channel_feature_flags end def inbox_attributes - [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled, + [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :enable_reply_with_original_message, :csat_survey_enabled, :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved, :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name] end diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json index 99ac944a86436..d1780f0ff49cd 100644 --- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json +++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json @@ -290,6 +290,12 @@ "SUBTITLE": "Provide the email address where your customers send support requests.", "PLACEHOLDER": "Email" }, + "REPLY_WITH_ORIGINAL_MESSAGE_TOGGLE": { + "LABEL": "Show sender their original message when replying", + "HELP_TEXT": "This setting will copy their previous message when replying so that sender can see what the agent is replying to", + "ENABLED": "Enabled", + "DISABLED": "Disabled" + }, "SUBMIT_BUTTON": "Create Email Channel", "API": { "ERROR_MESSAGE": "We were not able to save the email channel" diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue index ca1368baf4528..aa0c195f75a2f 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue @@ -208,7 +208,28 @@ }}

- + From eac573fe571f34a3cfdbfff41890598ac9f300e0 Mon Sep 17 00:00:00 2001 From: John Manuel Derecho Date: Wed, 9 Aug 2023 11:20:42 +0800 Subject: [PATCH 011/256] fixes --- .../routes/dashboard/settings/inbox/Settings.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue index c15bcfabf5ea4..e60c44b0f42fb 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue @@ -214,7 +214,7 @@ 'INBOX_MGMT.ADD.EMAIL_CHANNEL.REPLY_WITH_ORIGINAL_MESSAGE_TOGGLE.LABEL' ) }} -