ui code review and edited

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

View File

@@ -21,13 +21,13 @@
<div class="tab-content" >
<!--- Panel 0 - Completed Orders -->
<div class="tab-pane" id="Completed" role="tabpanel" style="max-height:670px; 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>
<span class="pull-right"><%= sale.sale_status %></span>
</div>
</div>
<% end %>
@@ -35,8 +35,8 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane active" id="tables" role="tabpanel" style="max-height:670px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining active" id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
@@ -67,8 +67,8 @@
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane" id="rooms" role="tabpanel" style="max-height:670px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="tab-pane dining" id="rooms" role="tabpanel">
<div class="card-columns">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
<div class="card rooms red text-white" data-id="<%= room.id %>">
@@ -88,8 +88,8 @@
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane" id="orders" role="tabpanel" style="max-height:670px; 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">
@@ -104,13 +104,12 @@
<!-- tabs - End -->
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<button id="refreshbutton" type="button" class="btn btn-block" style="border-radius:5px;color:#fff;background-color:red;"> Refresh off </button>
<button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button>
<button id="cash_in" type="button" class="btn btn-block btn-primary"> Cash In </button>
<button id="cash_out" type="button" class="btn btn-block btn-primary"> Cash Out </button>
<!-- Temporary Disabled -->
<button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier </button>
<button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier</button>
<%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
<button id="back" type="button" class="btn btn-block btn-primary"><i class="fa fa-home fa-lg"></i> Back