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

update zone json

Browse Source
This commit is contained in:
Aung Myo
2018-07-01 15:54:44 +06:30
parent 0897068e5b
commit 985604cd1f
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/home_controller.rb
View File

@@ -20,7 +20,7 @@ class Origami::HomeController < BaseOrigamiController
@tables = Table.unscoped.all.active.order('status desc')
@rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@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')
@status_order = ""
@status_sale = ""