Merge branch 'master' into cloud

2017-12-13 18:30:39 +06:30
parent b3b443735a 974c5df830
commit 6507ad1eb5
11 changed files with 114 additions and 27 deletions
--- a/app/assets/javascripts/channels/checkin.js
+++ b/app/assets/javascripts/channels/checkin.js
@@ -0,0 +1,25 @@
+App.order = App.cable.subscriptions.create('CheckinChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {  
+  	if((data.table != undefined) && (data.table.length > 0)){
+  		$.each(data.table,function(key,value){
+  			if($('.table_'+value.table_id).hasClass('blue')){
+  				$('.table_'+value.table_id).removeClass('blue');
+			    $('.table_'+value.table_id).addClass('orange');
+  			}
+  			else if($('.table_'+value.table_id).hasClass('red')){
+  				$('.table_'+value.table_id).removeClass('red');
+			    $('.table_'+value.table_id).addClass('orange');
+  			}
+  			$('.new_text_'+value.table_id).removeClass('hide');
+  		});
+  		
+  	} 
+ }
+});
+