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

23
app/views/origami/home/index.html.erb
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

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

@@ -23,13 +23,13 @@
<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>
<span class="pull-right font-12"><%= sale.sale_status %></span>
</div>
</div>
<% end %>
@@ -37,8 +37,8 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane active" 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 active" id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
@@ -46,7 +46,7 @@
<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 style="font-size:12px;"></div>
</div>
</div>
@@ -54,7 +54,7 @@
<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 %>
@@ -70,8 +70,8 @@
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane" 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" id="rooms" role="tabpanel">
<div class="card-columns">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
@@ -79,9 +79,9 @@
<div class="card-block">
<%= room.name %>
<% if room.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<span class="pull-right font-12"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<span class="pull-right font-12"> new</span>
<% end %>
</div>
</div>
@@ -97,9 +97,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">
@@ -118,7 +117,6 @@
<div class="col-lg-5 col-md-5 col-sm-5">
<div class="card">
<div class="card-header">
<% if @status_order == 'order' && @status_sale != 'sale' %>
<div id="save_order_id" data-order="<%= @obj_order.order_id %>">
<strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %></div>
@@ -127,25 +125,23 @@
<% end %>
</div>
<div class="card-block">
<div class="card-title row">
<div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no">
<div class="card-title">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %>
<%= @sale_array[0].receipt_no rescue '' %>
<% if @status_sale == 'sale' %>
<%= @sale_array[0].receipt_no rescue '' %>
<% end %>
</span></p>
<% end %>
</span></p>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
</p>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
</p>
</div>
</div>
<div class="card-title row">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
<p>Customer : <%= @sale_array[0].customer.name rescue '' %></p>
@@ -154,8 +150,10 @@
<p>Customer : <%= @customer.name rescue "" %></p>
<% end %>
</div>
</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>
@@ -251,10 +249,9 @@
</td>
</tr>
<% end %>
<tr class="rebate_amount"></tr>
<!-- <tr class="rebate_amount"></tr> -->
</table>
</div>
<br>
<%
if @status_sale == 'sale'
@@ -314,7 +311,7 @@
<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>
<button type="button" id="add_order" class="btn btn-primary btn-block">Add Order</button>
<% if @dining.bookings.length >= 1 %>
<% if @status_order == 'order' && @status_sale != 'sale' %>