KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix: automation email improvement (#6061)

Browse source
This commit is contained in:
Tejaswini Chile 2022-12-19 13:21:33 +05:30 committed by GitHub
parent 38587b3aa1
commit 5541d9e00b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
View file

@ -99,6 +99,13 @@ export const AUTOMATIONS = {
inputType: 'search_select',
filterOperators: OPERATOR_TYPES_1,
},
{
key: 'mail_subject',
name: 'Email Subject',
attributeI18nKey: 'MAIL_SUBJECT',
inputType: 'plain_text',
filterOperators: OPERATOR_TYPES_2,
},
{
key: 'country_code',
name: 'Country',
@ -190,6 +197,13 @@ export const AUTOMATIONS = {
inputType: 'search_select',
filterOperators: OPERATOR_TYPES_1,
},
{
key: 'mail_subject',
name: 'Email Subject',
attributeI18nKey: 'MAIL_SUBJECT',
inputType: 'plain_text',
filterOperators: OPERATOR_TYPES_2,
},
{
key: 'country_code',
name: 'Country',

3
app/models/automation_rule.rb
View file

@ -29,7 +29,8 @@ class AutomationRule < ApplicationRecord
scope :active, -> { where(active: true) }
CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id].freeze
CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
mail_subject].freeze
ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation send_attachment
change_status resolve_conversation snooze_conversation send_email_transcript].freeze

14
lib/automation_rules/conditions.json
View file

@ -63,6 +63,13 @@
"filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
"attribute_type": "additional_attributes"
},
"mail_subject": {
"attribute_name": "Email Subject",
"input_type": "textbox",
"data_type": "text",
"filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
"attribute_type": "additional_attributes"
},
"country_code": {
"attribute_name": "Country Name",
"input_type": "textbox",
@ -142,6 +149,13 @@
"filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
"attribute_type": "additional_attributes"
},
"mail_subject": {
"attribute_name": "Email Subject",
"input_type": "textbox",
"data_type": "text",
"filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
"attribute_type": "additional_attributes"
},
"country_code": {
"attribute_name": "Country Name",
"input_type": "textbox",

8
spec/listeners/automation_rule_listener_spec.rb
View file

@ -258,7 +258,13 @@ describe AutomationRuleListener do
end
it 'triggers automation rule send email to the team' do
expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
message_delivery = instance_double(ActionMailer::MessageDelivery)
expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation).with(
conversation, team,
'Please pay attention to this conversation, its from high priority customer'
).and_return(message_delivery)
allow(message_delivery).to receive(:deliver_now)
listener.conversation_updated(event)
end