Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/assets/javascripts/channels/checkin.js
+++ b/app/assets/javascripts/channels/checkin.js
@@ -6,6 +6,9 @@ App.order = App.cable.subscriptions.create('CheckinChannel', {
  disconnected: function() {},

  received: function(data) {        	
+  	var hostname = location.hostname.trim();
+    if(data.from == "" || hostname == data.from)
+    { 
 	$.each(data.table,function(key,value){      
 		if($('.table_'+value.table_id).hasClass('blue')){
 			$('.table_'+value.table_id).removeClass('blue');
@@ -22,5 +25,6 @@ App.order = App.cable.subscriptions.create('CheckinChannel', {
 		$('.new_text_'+value.table_id).removeClass('hide');
 	});  		  
 }
+}
 });