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

ui code review and edited

Browse Source
This commit is contained in:
Yan
2017-08-30 19:04:06 +06:30
parent c7018ee774
commit 3e8ead6a32
15 changed files with 454 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,12 +21,12 @@
<div class="tab-content" >
<!--- Panel 0 - Completed Orders -->
<div class="tab-pane" id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining" id="completed" role="tabpanel">
<div class="card-columns">
<% @complete.each do |sale| %>
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
<%= sale.receipt_no %><span class="pull-right font-12"><%= sale.sale_status %></span>
</div>
</div>
<% end %>
@@ -34,22 +34,22 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane " id="tables" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining" id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<span class="pull-right font-12"> billed</span>
</div>
</div>
<% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<span class="pull-right font-12"> new</span>
</div>
</div>
<% end %>
@@ -65,8 +65,8 @@
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane active" id="rooms" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining active" id="rooms" role="tabpanel">
<div class="card-columns">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
@@ -74,7 +74,7 @@
<div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<span class="pull-right font-12"> billed</span>
<div style="font-size:12px;"></div>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="card rooms blue text-white" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<span class="pull-right font-12"> new</span>
</div>
</div>
<% end %>
@@ -98,8 +98,8 @@
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane" id="orders" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns">
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
<div class="card-block">
@@ -152,7 +152,7 @@
</div>
</div>
<div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
<div class="card-text order-info">
<table class="table table-striped" id="order-items-table">
<thead>
<tr>
@@ -301,7 +301,7 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-block" id='back' >Back</button>
<button type="button" class="btn btn-primary btn-block" id='back'><i class="fa fa-arrow-left"></i> Back</button>
<% if @room.bookings.length >= 1 %>
<% if @status_order == 'order' && @status_sale != 'sale' %>
<!-- <button type="button" class="btn btn-primary btn-block" >Add Order</button> -->