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

multiple zone with cashier terminal call waiter noti

Browse Source
This commit is contained in:
phyusin
2018-10-11 10:22:35 +06:30
parent d913c074e0
commit 8897f1d052
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/rooms_controller.rb
View File

@@ -4,7 +4,7 @@ class Origami::RoomsController < BaseOrigamiController
@rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.completed_sale("cashier")
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
# @shift = ShiftSale.current_open_shift(current_user.id)
@shift = ShiftSale.current_open_shift(current_user.id)
@webview = false
if check_mobile
@webview = true
@@ -23,7 +23,8 @@ class Origami::RoomsController < BaseOrigamiController
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@customers = Customer.pluck("customer_id, name")
@room = DiningFacility.find(params[:room_id])
@shift = ShiftSale.current_open_shift(current_user.id)
@status_order = ""
@status_sale = ""
@sale_array = Array.new