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

move table

Browse Source
This commit is contained in:
Nweni
2017-06-22 16:31:41 +06:30
parent 09252ba055
commit 0c0e44c808
8 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,22 +17,25 @@ class Origami::HomeController < BaseOrigamiController
@status_order = ""
@status_sale = ""
@sale_array = Array.new
@dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new
@order_items = Array.new
booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id)
@obj_order = order
@date = order.created_at
order.order_items.each do |item|
@order_items.push(item)
if (order.status == "new")
@obj_order = order
@date = order.created_at
order.order_items.each do |item|
@order_items.push(item)
end
end
end
@status_order = 'order'
else
sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed"
puts "enter"
@sale_array.push(sale)
if @status_order == 'order'
@status_order = 'sale'

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

@@ -44,7 +44,7 @@ class Origami::MovetableController < BaseOrigamiController
bookings = Booking.where('dining_facility_id=?',change_from)
booking_array = Array.new
bookings.each do | booking |
if booking.sale_id.nil? || booking.sale.sale_status != 'completed'
if booking.sale_id.nil? || booking.sale.sale_status != 'completed' || booking.booking_status != 'moved'
booking_array.push(booking)
end
end