Pull from master

This commit is contained in:
San Wai Lwin
2018-05-18 16:26:03 +06:30
parent 610d39847e
commit c1525be826
12 changed files with 58 additions and 32 deletions

View File

@@ -6,15 +6,19 @@ App.order = App.cable.subscriptions.create('BillChannel', {
disconnected: function() {},
received: function(data) {
if($('.table_'+data.table.id).hasClass('blue')){
$('.table_'+data.table.id).removeClass('blue');
$('.table_'+data.table.id).addClass('red');
}else{
$('.table_'+data.table.id).removeClass('orange');
$('.table_'+data.table.id).addClass('red');
}
$('.new_text_'+data.table.id).removeClass('hide');
$('.new_text_'+data.table.id).text('billed');
var hostname = location.hostname.trim();
if(data.from == "" || hostname == data.from)
{
if($('.table_'+data.table.id).hasClass('blue')){
$('.table_'+data.table.id).removeClass('blue');
$('.table_'+data.table.id).addClass('red');
}else{
$('.table_'+data.table.id).removeClass('orange');
$('.table_'+data.table.id).addClass('red');
}
$('.new_text_'+data.table.id).removeClass('hide');
$('.new_text_'+data.table.id).text('billed');
}
}
});

View File

@@ -1,6 +1,4 @@
App.order = App.cable.subscriptions.create('OrderChannel', {
// App.messages = App.cable.subscriptions.create('MessagesChannel', {
connected: function() {},
disconnected: function() {},