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

print format updating

Browse Source
This commit is contained in:
Yan
2017-06-14 10:15:35 +06:30
parent b133129389
commit b7f1a0a029
6 changed files with 123 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,14 +64,12 @@
<p class="card-text">
Receipt No :
<span class="orders-receipt-no">
<%= cpo.receipt_no %>
<%= cpo.sale_status %>
</span>
</p>
<p class="card-text">
Order Status :
<span class="orders-order-status">
<%= cpo.order_status %>
</span>
<span class="orders-order-status"><%= cpo.order_status %></span>
</small>
</p>
</div>
@@ -84,10 +82,11 @@
<!--- Panel 1 - Table Orders -->
<div class="tab-pane active" id="tables" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@booking_orders.each do |bko|
# No Show completed
puts bko.sale_status
if bko.sale_status == 'completed'
next
end
@@ -132,9 +131,7 @@
</p>
<p class="card-text">
Order Status :
<span class="orders-order-status">
<%= bko.order_status %>
</span>
<span class="orders-order-status"><%= bko.order_status %></span>
</small>
</p>
</div>
@@ -196,9 +193,7 @@
</p>
<p class="card-text">
Order Status :
<span class="orders-order-status">
<%= rmo.order_status %>
</span>
<span class="orders-order-status"><%= rmo.order_status %></span>
</small>
</p>
</div>
@@ -214,6 +209,7 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@orders.each do |odr|
puts odr
# No Show completed
if odr.sale_status == 'completed'
next
@@ -258,9 +254,7 @@
</p>
<p class="card-text">
Order Status :
<span class="orders-order-status">
<%= odr.order_status %>
</span>
<span class="orders-order-status"><%= odr.order_status %></span>
</small>
</p>
</div>
@@ -310,14 +304,14 @@
<th class="item-attr">Price</td>
</tr>
</thead>
<tbody>
<tbody>
<%
# For Sale Items
sub_total = 0
if @selected_item_type == "Sale"
@selected_item.sale_items.each do |sale_item|
sub_total += (sale_item.qty*sale_item.unit_price)
%>
%>
<tr>
<td class='item-name'><%= sale_item.product_name %></td>
<td class='item-attr'><%= sale_item.qty %></td>
@@ -329,8 +323,7 @@
%>
<%
# For Order Items
sub_total = 0
# For Order Items
if @selected_item_type == "Order"
@selected_item.order_items.each do |order_item|
sub_total += (order_item.qty*order_item.unit_price)
@@ -385,13 +378,12 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Add Order</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" id="customer" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
<button type="button" id="customer" class="btn btn-primary btn-lg btn-block">Customer</button>
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
<!-- Cashier Buttons -->
<button type="button" id="discount" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
<button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
<button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block">Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>