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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Nweni
2017-06-17 11:35:26 +06:30
parent 29b76adba7 2cf9c6947c
commit 1b7f90ccfe
15 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/settings/order_queue_stations/_form.html.erb
View File

@@ -4,6 +4,7 @@
<div class="form-inputs">
<%= f.input :station_name %>
<%= f.input :is_active %>
<%= f.input :auto_print %>
<%= f.input :printer_name %>
<%= f.input :font_size %>
<%= f.input :print_copy %>

2
app/views/settings/order_queue_stations/index.html.erb
View File

@@ -17,6 +17,7 @@
<tr>
<th>Station name</th>
<th>Is active</th>
<th>Auto Print</th>
<th>Print copy</th>
<th>Printer name</th>
<th>Cut per item</th>
@@ -31,6 +32,7 @@
<tr>
<td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td>
<td><%= settings_order_queue_station.is_active %></td>
<td><%= settings_order_queue_station.auto_print %></td>
<td><%= settings_order_queue_station.print_copy %></td>
<td><%= settings_order_queue_station.printer_name %></td>
<td><%= settings_order_queue_station.cut_per_item %></td>

5
app/views/settings/order_queue_stations/show.html.erb
View File

@@ -18,6 +18,11 @@
<%= @settings_order_queue_station.is_active %>
</p>
<p>
<strong>Auto Print:</strong>
<%= @settings_order_queue_station.auto_print %>
</p>
<p>
<strong>Processing items:</strong>
<%= @settings_order_queue_station.processing_items %>

13
app/views/transactions/orders/show.html.erb
View File

@@ -8,6 +8,11 @@
<li class="active">
<a href="<%= transactions_orders_path %>"><%= @order.order_id %></a>
</li>
<span style="float: right">
<a href="<%= transactions_orders_path%>" class="btn btn-primary btn-sm">
<i class="fa fa-arrow-left fa-xs"></i> Back
</a>
</span>
</ol>
</div>
</div>
@@ -46,7 +51,7 @@
<th>Qty</th>
<th> Unit Price</th>
<th>Total Price</th>
<th>Option</th>
<!-- <th>Option</th> -->
<th>Status</th>
<th>Order By</th>
<th>Created at</th>
@@ -62,7 +67,7 @@
<td><%= order.qty %></td>
<td><%= order.price %></td>
<td><%= order.qty * order.price %></td>
<td> <%= order.options %> </td>
<!-- <td> <%= order.options %> </td> -->
<td> <%= order.order_item_status %> </td>
<td> <%= order.item_order_by %> </td>
<td> <%= order.created_at.strftime("%d-%m-%Y") %> </td>
@@ -75,11 +80,11 @@
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- <div class="col-lg-1 col-md-1 col-sm-1">
<a href="<%= transactions_orders_path%>" class="btn btn-primary">
<i class="fa fa-arrow-left fa-xs"></i> Back
</a>
</div>
</div> -->
</div>

27
app/views/transactions/sales/show.html.erb
View File

@@ -8,11 +8,24 @@
<li class="active">
<a href="<%= transactions_sale_path(@sale.sale_id) %>"><%= @sale.sale_id %></a>
</li>
<span style="float: right">
<a href="<%= transactions_sales_path%>" class="btn btn-primary btn-sm">
<i class="fa fa-arrow-left fa-lg"></i> Back
</a>
<a href="<%= transactions_void_path(@sale)%>" class="btn btn-danger btn-sm">
<i class="fa fa-trash fa-lg"></i> Void Sale
</a>
<a href="<%= transactions_manual_complete_sale_path(@sale)%>" class="btn btn-success btn-sm" disabled>
<i class="fa fa-invoice fa-lg"></i> Complete Sale
</a>
</span>
</ol>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-md-10 col-sm-10">
<div class="col-lg-12 col-md-12 col-sm-12">
<!-- Column One -->
<!-- Nav tabs -->
@@ -29,7 +42,7 @@
</ul>
<!-- Nav tabs - End -->
<div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
<div class="tab-content" style="min-height:670px; max-height:670px;">
<div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
<div class="table-responsive">
@@ -53,7 +66,7 @@
<td><%= @sale.receipt_no %></td>
<td><%= @sale.cashier_name rescue '-' %></td>
<td> <%= @sale.sale_status %> </td>
<td> <%= @sale.requested_at.strftime("%d-%m-%Y") %> </td>
<td> <%= @sale.requested_at %> </td>
</tr>
<tr style="border-top:2px solid #000">
<th>Sale item name</th>
@@ -85,7 +98,7 @@
<% @sale.sale_taxes.each do |r|%>
<tr>
<td colspan=2 style="text-align:center"></td>
<td><%= r.tax_name %>(<%= r.tax_rate %>)</td>
<td><%= r.tax_name %> </td>
<td colspan="2"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
</tr>
<% end %>
@@ -226,19 +239,19 @@
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<!-- <div class="col-lg-2 col-md-2 col-sm-2">
<a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary btn-lg">
<i class="fa fa-arrow-left fa-lg"></i> Back
</a>
<!-- Temporary No Needs -->
<a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-danger btn-lg">
<i class="fa fa-trash fa-lg"></i> Void Sale
</a>
<a href="<%= transactions_manual_complete_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-success btn-lg">
<i class="fa fa-invoice fa-lg"></i> Complete Sale
</a>
</div>
</div> -->
</div>