From d6f2bf99c17871a1c7507a9aed818a7e2d07e629 Mon Sep 17 00:00:00 2001
From: murtaza98 <m.patrawala@somaiya.edu>
Date: Sat, 6 Jun 2020 22:08:34 +0530
Subject: [PATCH 1/2] [NEW] Livechat Setting to show/hide Feedback Form on the
 Widget

---
 .../client/views/app/livechatAppearance.html      | 10 ++++++++++
 .../client/views/app/livechatAppearance.js        | 15 +++++++++++++++
 app/livechat/server/api/lib/livechat.js           |  1 +
 app/livechat/server/config.js                     |  8 ++++++++
 app/livechat/server/lib/Livechat.js               |  1 +
 5 files changed, 35 insertions(+)

diff --git a/app/livechat/client/views/app/livechatAppearance.html b/app/livechat/client/views/app/livechatAppearance.html
index 531bbfabbe4e4..a4bcbe99569ba 100644
--- a/app/livechat/client/views/app/livechatAppearance.html
+++ b/app/livechat/client/views/app/livechatAppearance.html
@@ -71,6 +71,16 @@ <h2>{{_ "Settings"}}</h2>
 						<textarea class="preview-settings rc-input__element" name="offlineSuccessMessage" id="offlineSuccessMessage">{{offlineSuccessMessage}}</textarea>
 					</div>
 				</fieldset>
+				<fieldset>
+					<legend>{{_ "Livechat_feedback_form"}}</legend>
+					<label class="rc-switch__label">
+						<input class="rc-switch__input js-input-check" type="checkbox" name="feedbackFormEnabled" {{feedbackFormEnabled}}/>
+						<span class="rc-switch__button">
+							<span class="rc-switch__button-inside"></span>
+						</span>
+						<span class="rc-switch__text">{{_ "Enabled"}}</span>
+					</label>
+				</fieldset>
 				<fieldset>
 					<legend>{{_ "Livechat_registration_form"}}</legend>
 					<!--
diff --git a/app/livechat/client/views/app/livechatAppearance.js b/app/livechat/client/views/app/livechatAppearance.js
index 6fcca80a9e1be..1e4fffa336891 100644
--- a/app/livechat/client/views/app/livechatAppearance.js
+++ b/app/livechat/client/views/app/livechatAppearance.js
@@ -104,6 +104,11 @@ Template.livechatAppearance.helpers({
 	registrationFormMessage() {
 		return Template.instance().registrationFormMessage.get();
 	},
+	feedbackFormEnabled() {
+		if (Template.instance().feedbackFormEnabled.get()) {
+			return 'checked';
+		}
+	},
 });
 
 Template.livechatAppearance.onCreated(async function() {
@@ -126,6 +131,7 @@ Template.livechatAppearance.onCreated(async function() {
 	this.registrationFormNameFieldEnabled = new ReactiveVar(null);
 	this.registrationFormEmailFieldEnabled = new ReactiveVar(null);
 	this.registrationFormMessage = new ReactiveVar(null);
+	this.feedbackFormEnabled = new ReactiveVar(null);
 
 	const { appearance } = await APIClient.v1.get('livechat/appearance');
 	this.appearance.set(appearance);
@@ -147,6 +153,7 @@ Template.livechatAppearance.onCreated(async function() {
 	const livechatNameFieldRegistrationForm = getSettingFromAppearance(this, 'Livechat_name_field_registration_form');
 	const livechatEmailFieldRegistrationForm = getSettingFromAppearance(this, 'Livechat_email_field_registration_form');
 	const conversationFinishedText = getSettingFromAppearance(this, 'Livechat_conversation_finished_text');
+	const livechatFeedbackForm = getSettingFromAppearance(this, 'Livechat_feedback_form');
 
 	this.title.set(livechatTitle && livechatTitle.value);
 	this.color.set(livechatTitleColor && livechatTitleColor.value);
@@ -165,6 +172,7 @@ Template.livechatAppearance.onCreated(async function() {
 	this.registrationFormNameFieldEnabled.set(livechatNameFieldRegistrationForm && livechatNameFieldRegistrationForm.value);
 	this.registrationFormEmailFieldEnabled.set(livechatEmailFieldRegistrationForm && livechatEmailFieldRegistrationForm.value);
 	this.conversationFinishedText.set(conversationFinishedText && conversationFinishedText.value);
+	this.feedbackFormEnabled.set(livechatFeedbackForm && livechatFeedbackForm.value);
 });
 
 Template.livechatAppearance.events({
@@ -228,6 +236,9 @@ Template.livechatAppearance.events({
 
 		const settingRegistrationFormMessage = getSettingFromAppearance(instance, 'Livechat_registration_form_message');
 		instance.registrationFormMessage.set(settingRegistrationFormMessage && settingRegistrationFormMessage.value);
+
+		const settingFeedbackFormEnabled = getSettingFromAppearance(instance, 'Livechat_feedback_form');
+		instance.feedbackFormEnabled.set(settingFeedbackFormEnabled && settingFeedbackFormEnabled.value);
 	},
 	'submit .rocket-form'(e, instance) {
 		e.preventDefault();
@@ -300,6 +311,10 @@ Template.livechatAppearance.events({
 				_id: 'Livechat_registration_form_message',
 				value: s.trim(instance.registrationFormMessage.get()),
 			},
+			{
+				_id: 'Livechat_feedback_form',
+				value: instance.feedbackFormEnabled.get(),
+			},
 		];
 
 		Meteor.call('livechat:saveAppearance', settings, (err/* , success*/) => {
diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
index 4626ce819b35c..adb0c14040aa3 100644
--- a/app/livechat/server/api/lib/livechat.js
+++ b/app/livechat/server/api/lib/livechat.js
@@ -111,6 +111,7 @@ export function settings() {
 			forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent,
 			showConnecting: initSettings.Livechat_Show_Connecting,
 			agentHiddenInfo: initSettings.Livechat_show_agent_info === false,
+			showFeedbackForm: initSettings.Livechat_feedback_form,
 		},
 		theme: {
 			title: initSettings.Livechat_title,
diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
index 6bba3e28d524b..89ea959ef78ea 100644
--- a/app/livechat/server/config.js
+++ b/app/livechat/server/config.js
@@ -139,6 +139,14 @@ Meteor.startup(function() {
 		i18nLabel: 'Conversation_finished_text',
 	});
 
+	settings.add('Livechat_feedback_form', false, {
+		type: 'boolean',
+		group: 'Omnichannel',
+		section: 'Livechat',
+		public: true,
+		i18nLabel: 'Show Feedback form',
+	});
+
 	settings.add('Livechat_registration_form', true, {
 		type: 'boolean',
 		group: 'Omnichannel',
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index ae5004a845004..dafe617541f2e 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -451,6 +451,7 @@ export const Livechat = {
 			'Livechat_force_accept_data_processing_consent',
 			'Livechat_data_processing_consent_text',
 			'Livechat_show_agent_info',
+			'Livechat_feedback_form',
 		]).forEach((setting) => {
 			rcSettings[setting._id] = setting.value;
 		});

From df9476d12e8ebb44137d877425be1f9d548ff5d5 Mon Sep 17 00:00:00 2001
From: murtaza98 <m.patrawala@somaiya.edu>
Date: Sat, 6 Jun 2020 23:15:22 +0530
Subject: [PATCH 2/2] add translation for Livechat show feedback form setting

---
 app/livechat/server/config.js              | 2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
index 89ea959ef78ea..20a1ad8533bb1 100644
--- a/app/livechat/server/config.js
+++ b/app/livechat/server/config.js
@@ -144,7 +144,7 @@ Meteor.startup(function() {
 		group: 'Omnichannel',
 		section: 'Livechat',
 		public: true,
-		i18nLabel: 'Show Feedback form',
+		i18nLabel: 'Show_feedback_form',
 	});
 
 	settings.add('Livechat_registration_form', true, {
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 4fb6734518702..71ee818626725 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3142,6 +3142,7 @@
   "Show_Avatars": "Show Avatars",
   "Show_counter": "Show counter",
   "Show_email_field": "Show email field",
+  "Show_feedback_form": "Show Feedback Form",
   "Show_more": "Show more",
   "Show_name_field": "Show name field",
   "show_offline_users": "show offline users",