git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bill cable add and add ... for origami pages

Browse Source
This commit is contained in:
Yan
2017-09-11 16:37:50 +06:30
parent c131a4eff2
commit c3b38a860c
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/channels/bill.js
View File

@@ -6,12 +6,9 @@ App.order = App.cable.subscriptions.create('BillChannel', {
disconnected: function() {}, disconnected: function() {},
received: function(data) { received: function(data) {
$('.table_'+data.table.id).removeClass('blue'); $('.table_'+data.table.id).removeClass('blue');
$('.table_'+data.table.id).addClass('red'); $('.table_'+data.table.id).addClass('red');
$('.new_text_'+data.table.id).removeClass('hide') $('.new_text_'+data.table.id).removeClass('hide')
}
},
}); });

5
app/assets/javascripts/channels/order.js
View File

@@ -6,12 +6,9 @@ App.order = App.cable.subscriptions.create('OrderChannel', {
disconnected: function() {}, disconnected: function() {},
received: function(data) { received: function(data) {
$('.table_'+data.table.id).removeClass('green'); $('.table_'+data.table.id).removeClass('green');
$('.table_'+data.table.id).addClass('blue'); $('.table_'+data.table.id).addClass('blue');
$('.new_text_'+data.table.id).removeClass('hide') $('.new_text_'+data.table.id).removeClass('hide')
}
},
}); });

14
app/views/origami/home/show.html.erb
View File

@@ -43,18 +43,18 @@
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<span class="pull-right font-12"> billed</span> <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
<div style="font-size:12px;"></div> <div style="font-size:12px;"></div>
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>"> <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<span class="pull-right font-12"> new</span> <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -76,13 +76,13 @@
<% @rooms.each do |room| %> <% @rooms.each do |room| %>
<% if room.status == 'occupied' %> <% if room.status == 'occupied' %>
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if room.get_booking.nil? %> <% if room.get_booking.nil? %>
<span class="pull-right font-12"> billed</span> <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
<% else %> <% else %>
<span class="pull-right font-12"> new</span> <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
<% end %> <% end %>
</div> </div>
</div> </div>

16
app/views/origami/rooms/show.html.erb
View File

@@ -39,17 +39,17 @@
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<span class="pull-right font-12"> billed</span> <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>"> <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<span class="pull-right font-12"> new</span> <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -72,18 +72,18 @@
<% if room.status == 'occupied' %> <% if room.status == 'occupied' %>
<% if room.get_booking.nil? %> <% if room.get_booking.nil? %>
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<span class="pull-right font-12"> billed</span> <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
<div style="font-size:12px;"></div> <div style="font-size:12px;"></div>
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="card rooms blue text-white" data-id="<%= room.id %>"> <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<span class="pull-right font-12"> new</span> <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
</div> </div>
</div> </div>
<% end %> <% end %>