Skip to content

[NEW] Add new Livechat appearance setting to set the conversation finished message #15577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 2 commits into from
Oct 18, 2019
Merged

[NEW] Add new Livechat appearance setting to set the conversation finished message #15577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8abaf74
Add new Livechat appearance setting.
renatobecker Oct 14, 2019
3aa39f2
Merge branch 'develop' into livechat-new-appearance-setting
renatobecker Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/livechat/client/views/app/livechatAppearance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ <h2>{{_ "Settings"}}</h2>
<span class="rc-switch__text">{{_ "Show_email_field"}}</span>
</label>
<div class="input-line">
<label for="registrationFormMessage">{{_ "Livechat_Registration_form_message"}}</label>
<label for="registrationFormMessage">{{_ "Livechat_registration_form_message"}}</label>
<textarea class="preview-settings rc-input__element" name="registrationFormMessage" id="registrationFormMessage">{{registrationFormMessage}}</textarea>
</div>
</fieldset>
Expand All @@ -122,6 +122,10 @@ <h2>{{_ "Settings"}}</h2>
<label for="conversationFinishedMessage">{{_ "Conversation_finished_message"}}</label>
<textarea class="preview-settings rc-input__element" name="conversationFinishedMessage" id="conversationFinishedMessage">{{conversationFinishedMessage}}</textarea>
</div>
<div class="input-line">
<label for="conversationFinishedText">{{_ "Conversation_finished_text"}}</label>
<textarea class="preview-settings rc-input__element" name="conversationFinishedText" id="conversationFinishedText">{{conversationFinishedText}}</textarea>
</div>
</fieldset>
<div class="rc-button__group submit">
<button class="rc-button rc-button--danger reset-settings" type="button"><i class="icon-ccw"></i>{{_ "Reset"}}</button>
Expand Down
15 changes: 15 additions & 0 deletions app/livechat/client/views/app/livechatAppearance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ Template.livechatAppearance.helpers({
conversationFinishedMessage() {
return Template.instance().conversationFinishedMessage.get();
},
conversationFinishedText() {
return Template.instance().conversationFinishedText.get();
},
registrationFormEnabled() {
if (Template.instance().registrationFormEnabled.get()) {
return 'checked';
Expand Down Expand Up @@ -120,6 +123,7 @@ Template.livechatAppearance.onCreated(function() {
this.colorOffline = new ReactiveVar(null);
this.offlineEmail = new ReactiveVar(null);
this.conversationFinishedMessage = new ReactiveVar(null);
this.conversationFinishedText = new ReactiveVar(null);
this.registrationFormEnabled = new ReactiveVar(null);
this.registrationFormNameFieldEnabled = new ReactiveVar(null);
this.registrationFormEmailFieldEnabled = new ReactiveVar(null);
Expand Down Expand Up @@ -173,6 +177,10 @@ Template.livechatAppearance.onCreated(function() {
const setting = LivechatAppearance.findOne('Livechat_conversation_finished_message');
this.conversationFinishedMessage.set(setting && setting.value);
});
this.autorun(() => {
const setting = LivechatAppearance.findOne('Livechat_conversation_finished_text');
this.conversationFinishedText.set(setting && setting.value);
});
this.autorun(() => {
const setting = LivechatAppearance.findOne('Livechat_registration_form_message');
this.registrationFormMessage.set(setting && setting.value);
Expand Down Expand Up @@ -238,6 +246,9 @@ Template.livechatAppearance.events({
const settingConversationFinishedMessage = LivechatAppearance.findOne('Livechat_conversation_finished_message');
instance.conversationFinishedMessage.set(settingConversationFinishedMessage && settingConversationFinishedMessage.value);

const settingConversationFinishedText = LivechatAppearance.findOne('Livechat_conversation_finished_text');
instance.conversationFinishedText.set(settingConversationFinishedText && settingConversationFinishedText.value);

const settingRegistrationFormEnabled = LivechatAppearance.findOne('Livechat_registration_form');
instance.registrationFormEnabled.set(settingRegistrationFormEnabled && settingRegistrationFormEnabled.value);

Expand Down Expand Up @@ -301,6 +312,10 @@ Template.livechatAppearance.events({
_id: 'Livechat_conversation_finished_message',
value: s.trim(instance.conversationFinishedMessage.get()),
},
{
_id: 'Livechat_conversation_finished_text',
value: s.trim(instance.conversationFinishedText.get()),
},
{
_id: 'Livechat_registration_form',
value: instance.registrationFormEnabled.get(),
Expand Down
1 change: 1 addition & 0 deletions app/livechat/server/api/lib/livechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export function settings() {
offlineSuccessMessage: initSettings.Livechat_offline_success_message,
offlineUnavailableMessage: initSettings.Livechat_offline_form_unavailable,
conversationFinishedMessage: initSettings.Livechat_conversation_finished_message,
conversationFinishedText: initSettings.Livechat_conversation_finished_text,
transcriptMessage: initSettings.Livechat_transcript_message,
registrationFormMessage: initSettings.Livechat_registration_form_message,
dataProcessingConsentText: initSettings.Livechat_data_processing_consent_text,
Expand Down
8 changes: 8 additions & 0 deletions app/livechat/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ Meteor.startup(function() {
i18nLabel: 'Conversation_finished_message',
});

settings.add('Livechat_conversation_finished_text', '', {
type: 'string',
multiline: true,
group: 'Livechat',
public: true,
i18nLabel: 'Conversation_finished_text',
});

settings.add('Livechat_registration_form', true, {
type: 'boolean',
group: 'Livechat',
Expand Down
1 change: 1 addition & 0 deletions app/livechat/server/lib/Livechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ export const Livechat = {
'Livechat_fileupload_enabled',
'FileUpload_Enabled',
'Livechat_conversation_finished_message',
'Livechat_conversation_finished_text',
'Livechat_name_field_registration_form',
'Livechat_email_field_registration_form',
'Livechat_registration_form_message',
Expand Down
2 changes: 2 additions & 0 deletions app/livechat/server/methods/getInitialData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Meteor.methods({
videoCall: null,
fileUpload: null,
conversationFinishedMessage: null,
conversationFinishedText: null,
nameFieldRegistrationForm: null,
emailFieldRegistrationForm: null,
registrationFormMessage: null,
Expand Down Expand Up @@ -79,6 +80,7 @@ Meteor.methods({
info.transcript = initSettings.Livechat_enable_transcript;
info.transcriptMessage = initSettings.Livechat_transcript_message;
info.conversationFinishedMessage = initSettings.Livechat_conversation_finished_message;
info.conversationFinishedText = initSettings.Livechat_conversation_finished_text;
info.nameFieldRegistrationForm = initSettings.Livechat_name_field_registration_form;
info.emailFieldRegistrationForm = initSettings.Livechat_email_field_registration_form;
info.registrationFormMessage = initSettings.Livechat_registration_form_message;
Expand Down
1 change: 1 addition & 0 deletions app/livechat/server/methods/saveAppearance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Meteor.methods({
'Livechat_offline_title_color',
'Livechat_offline_email',
'Livechat_conversation_finished_message',
'Livechat_conversation_finished_text',
'Livechat_registration_form',
'Livechat_name_field_registration_form',
'Livechat_email_field_registration_form',
Expand Down
1 change: 1 addition & 0 deletions app/livechat/server/publications/livechatAppearance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Meteor.publish('livechat:appearance', function() {
'Livechat_offline_title_color',
'Livechat_offline_email',
'Livechat_conversation_finished_message',
'Livechat_conversation_finished_text',
'Livechat_registration_form',
'Livechat_name_field_registration_form',
'Livechat_email_field_registration_form',
Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,9 @@
"Conversation": "Conversation",
"Conversations": "Conversations",
"Conversation_closed": "Conversation closed: __comment__.",
"Conversation_finished": "Conversation Finished",
"Conversation_finished_message": "Conversation Finished Message",
"Conversation_finished_text": "Conversation Finished Text",
"Conversations_per_day": "Conversations per Day",
"conversation_with_s": "the conversation with %s",
"Convert_Ascii_Emojis": "Convert ASCII to Emoji",
Expand Down Expand Up @@ -3423,4 +3425,4 @@
"Your_question": "Your question",
"Your_server_link": "Your server link",
"Your_workspace_is_ready": "Your workspace is ready to use 🎉"
}
}
6 changes: 4 additions & 2 deletions packages/rocketchat-i18n/i18n/pt-BR.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,9 @@
"Conversation": "Conversa",
"Conversations": "Conversas",
"Conversation_closed": "Chat encerrado: __comment__.",
"Conversation_finished_message": "Mensagem finalizada da conversação",
"Conversation_finished": "Conversa concluída",
"Conversation_finished_message": "Mensagem de conversa concluída",
"Conversation_finished_text": "Texto de conversa concluída",
"Conversations_per_day": "Conversas por dia",
"conversation_with_s": "a conversa com %s",
"Convert_Ascii_Emojis": "Converter ASCII para Emoji",
Expand Down Expand Up @@ -3235,4 +3237,4 @@
"Your_question": "A sua pergunta",
"Your_server_link": "O link do seu servidor",
"Your_workspace_is_ready": "O seu espaço de trabalho está pronto a usar 🎉"
}
}