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 into doemal_ordering

Browse Source
This commit is contained in:
EikhantMon
2018-06-25 17:54:10 +06:30
parent 6ed1f4ba03 1e5677ff48
commit e96a66ff34
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,8 +61,10 @@ class Origami::HomeController < BaseOrigamiController
# end # end
# end # end
# end # end
@dining_booking = @dining.bookings.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and booking_status != 'moved'",DateTime.now.strftime('%Y-%m-%d'))
@dining.bookings.active.each do |booking| Rails.logger.info "Input Count SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS"
Rails.logger.info @dining_booking.count
@dining_booking.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new @order_items = Array.new
# @assigned_order_items = Array.new # @assigned_order_items = Array.new