update room in origami

This commit is contained in:
Aung Myo
2017-08-03 12:05:54 +06:30
parent 39a314bc9a
commit 518314c772
3 changed files with 13 additions and 18 deletions

View File

@@ -35,20 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController
end
end
end
def moving
change_to = params[:change_to] #new
change_from = params[:change_from] #original
bookings = Booking.where('dining_facility_id=?',change_from)
booking_array = Array.new
bookings.each do | booking |
if booking.sale_id.nil? && booking.booking_status != 'moved'
booking_array.push(booking)
end
end
@get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
end
end

View File

@@ -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

View File

@@ -0,0 +1,2 @@
json.status true
json.get_type @get_type