diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js index 0a9e7821..ab8e0898 100644 --- a/app/assets/javascripts/channels/bill.js +++ b/app/assets/javascripts/channels/bill.js @@ -6,12 +6,9 @@ App.order = App.cable.subscriptions.create('BillChannel', { disconnected: function() {}, received: function(data) { - $('.table_'+data.table.id).removeClass('blue'); $('.table_'+data.table.id).addClass('red'); $('.new_text_'+data.table.id).removeClass('hide') - - }, - + } }); diff --git a/app/assets/javascripts/channels/order.js b/app/assets/javascripts/channels/order.js index 691834e1..dccb86d7 100644 --- a/app/assets/javascripts/channels/order.js +++ b/app/assets/javascripts/channels/order.js @@ -6,12 +6,9 @@ App.order = App.cable.subscriptions.create('OrderChannel', { disconnected: function() {}, received: function(data) { - $('.table_'+data.table.id).removeClass('green'); $('.table_'+data.table.id).addClass('blue'); $('.new_text_'+data.table.id).removeClass('hide') - - }, - + } }); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 42fac2a4..312438bb 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -43,18 +43,18 @@ <% if table.status == 'occupied' %> <% if table.get_booking.nil? %> -
+
<%= table.name %> - billed + billed
<% else %> -
+
<%= table.name %> - new + new
<% end %> @@ -76,13 +76,13 @@ <% @rooms.each do |room| %> <% if room.status == 'occupied' %> -
+
<%= room.name %> <% if room.get_booking.nil? %> - billed + billed <% else %> - new + new <% end %>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 1fed161c..c4cd7505 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -39,17 +39,17 @@ <% @tables.each do |table| %> <% if table.status == 'occupied' %> <% if table.get_booking.nil? %> -
+
<%= table.name %> - billed + billed
<% else %> -
+
<%= table.name %> - new + new
<% end %> @@ -72,18 +72,18 @@ <% if room.status == 'occupied' %> <% if room.get_booking.nil? %> -
+
<%= room.name %> - billed + billed
<% else %> -
+
<%= room.name %> - new + new
<% end %>