update room in origami
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
class Origami::RoomsController < BaseOrigamiController
|
||||
|
||||
before_action :set_dining, only: [:show]
|
||||
|
||||
def index
|
||||
@tables = Table.all.active.order('status desc')
|
||||
@rooms = Room.all.active.order('status desc')
|
||||
@@ -7,18 +9,19 @@ class Origami::RoomsController < BaseOrigamiController
|
||||
@orders = Order.all.order('date desc')
|
||||
# @shift = ShiftSale.current_open_shift(current_user.id)
|
||||
end
|
||||
|
||||
|
||||
def show
|
||||
@tables = Table.all.active.order('status desc')
|
||||
@rooms = Room.all.active.order('status desc')
|
||||
@complete = Sale.where("sale_status != 'new'")
|
||||
@orders = Order.all.order('date desc')
|
||||
@room = DiningFacility.find(params[:room_id])
|
||||
|
||||
# @room = DiningFacility.find(params[:room_id])
|
||||
|
||||
@status = ""
|
||||
@sale_array = Array.new
|
||||
|
||||
@room.bookings.active.each do |booking|
|
||||
@dining.bookings.active.each do |booking|
|
||||
if booking.sale_id.nil? && booking.booking_status != 'moved'
|
||||
@order_items = Array.new
|
||||
booking.booking_orders.each do |booking_order|
|
||||
@@ -74,5 +77,10 @@ class Origami::RoomsController < BaseOrigamiController
|
||||
# end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_dining
|
||||
@dining = DiningFacility.find(params[:room_id])
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user