Merge pull request #9750 from RocketChat/livechat-general-fixes

[FIX] Livechat issues on external queue and lead capture
RocketChat · Feb 17, 2018 · bbdd802 · bbdd802
2 parents 4a34938 + d6ce94a
commit bbdd802
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js
@@ -51,7 +51,7 @@ Template.register.events({
 				token: visitor.getToken(),
 				name: $name.val(),
 				email: $email.val(),
-				department: Livechat.deparment || departmentId
+				department: Livechat.department || departmentId
 			};
 			Meteor.call('livechat:registerGuest', guest, function(error, result) {
 				if (error != null) {

diff --git a/packages/rocketchat-livechat/server/hooks/leadCapture.js b/packages/rocketchat-livechat/server/hooks/leadCapture.js
@@ -6,11 +6,7 @@ function validateMessage(message, room) {
 		return false;
 	}
 
-	if (!RocketChat.settings.get('Livechat_Facebook_Enabled')) {
-		return false;
-	}
-
-	// only send the sms by SMS if it is a livechat room with SMS set to true
+	// message valid only if it is a livechat room
 	if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.v && room.v.token)) {
 		return false;
 	}
@@ -29,10 +25,6 @@ function validateMessage(message, room) {
 }
 
 RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
-	if (!RocketChat.settings.get('Livechat_webhook_on_capture')) {
-		return message;
-	}
-
 	if (!validateMessage(message, room)) {
 		return message;
 	}

diff --git a/packages/rocketchat-livechat/server/hooks/sendToCRM.js b/packages/rocketchat-livechat/server/hooks/sendToCRM.js
@@ -50,5 +50,8 @@ RocketChat.callbacks.add('livechat.saveInfo', (room) => {
 }, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-save-info');
 
 RocketChat.callbacks.add('livechat.leadCapture', (room) => {
+	if (!RocketChat.settings.get('Livechat_webhook_on_capture')) {
+		return room;
+	}
 	return sendToCRM('LeadCapture', room, false);
 }, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-lead-capture');
diff --git a/packages/rocketchat-livechat/server/lib/QueueMethods.js b/packages/rocketchat-livechat/server/lib/QueueMethods.js
@@ -141,7 +141,7 @@ RocketChat.QueueMethods = {
 
 		return room;
 	},
-	'External'(guest, message, roomInfo) {
-		return this['Least_Amount'](guest, message, roomInfo); // eslint-disable-line
+	'External'(guest, message, roomInfo, agent) {
+		return this['Least_Amount'](guest, message, roomInfo, agent); // eslint-disable-line
 	}
 };