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

update slim scroll

Browse Source
This commit is contained in:
Aung Myo
2017-10-11 17:53:29 +06:30
parent 12bf1dfc19
commit 6e47fbfe41
11 changed files with 288 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/origami/home/index.html.erb
View File

@@ -20,9 +20,9 @@
</ul>
<!-- Nav tabs - End -->
<div class="tab-content" >
<div class="tab-content" id="custom-slimscroll">
<!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="Completed" role="tabpanel">
<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 %>">

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

@@ -21,7 +21,8 @@
</li>
</ul>
<!-- Nav tabs - End -->
<div class="tab-content">
<div id="custom-slimscroll">
<div class="tab-content" >
<!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="completed" role="tabpanel">
@@ -38,7 +39,7 @@
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane dining active" id="tables" role="tabpanel">
<div class="tab-pane dining active " id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
@@ -112,6 +113,7 @@
</div>
</div>
</div>
</div>
<!-- tabs - End -->
</div>
<!-- Column One -->
@@ -131,32 +133,33 @@
<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">
Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %>
<%= @sale_array[0].receipt_no rescue '' %>
<% end %>
</span></p>
</span>
<br>
</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>
Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
<br>
</div>
</div>
<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>
Customer : <%= @sale_array[0].customer.name rescue '' %>
<% else %>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name rescue "" %></p>
Customer : <%= @customer.name rescue "" %>
<% end %>
</div>
</div>
</div>
<div class="card-text order-info">
<div id="order-detail-slimscroll">
<div class="card-text order-info" >
<table class="table table-striped" id="order-items-table">
<thead>
<tr>
@@ -221,6 +224,7 @@
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<tr>