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

conflic data

Browse Source
This commit is contained in:
San Wai Lwin
2018-02-09 10:17:56 +06:30
parent 625ee9bd34
commit 860e8db202
29 changed files with 622 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.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.all.order('date desc')
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@sale = Sale.find(params[:sale_id])
@order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
@booking = BookingOrder.find_by_order_id(@order).booking_id