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

Update

Browse Source
This commit is contained in:
Nweni
2017-06-17 16:00:56 +06:30
parent b2ed77947e
commit e55ab32fad
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/OQS.js
View File

@@ -17,6 +17,7 @@
//= require cable //= require cable
$(document).ready(function(){ $(document).ready(function(){
// auto refresh every 10 seconds // auto refresh every 10 seconds
// setTimeout(function(){ // setTimeout(function(){
// window.location.reload(1); // window.location.reload(1);

3
app/controllers/oqs/home_controller.rb
View File

@@ -44,7 +44,7 @@ class Oqs::HomeController < BaseOqsController
# Query for OQS with status # Query for OQS with status
def queue_items_query(status) def queue_items_query(status)
AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at") AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id .joins("left join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id
left join dining_facilities as df on df.zone_id = oqpz.zone_id left join dining_facilities as df on df.zone_id = oqpz.zone_id
left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
@@ -55,4 +55,3 @@ class Oqs::HomeController < BaseOqsController
.order("odt.item_name DESC") .order("odt.item_name DESC")
end end
end end

2
app/views/origami/payments/show.html.erb
View File

@@ -235,7 +235,7 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons --> <!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button> <button type="button" class="btn btn-primary btn-lg btn-block"> FOC </button>
<button type="button" class="btn btn-primary btn-lg btn-block"> Void </button> <button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button> <button type="button" class="btn btn-primary btn-lg btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
</div> </div>