update room in origami
This commit is contained in:
@@ -35,20 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
end
|
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
|
end
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
class Origami::RoomsController < BaseOrigamiController
|
class Origami::RoomsController < BaseOrigamiController
|
||||||
|
|
||||||
|
before_action :set_dining, only: [:show]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@tables = Table.all.active.order('status desc')
|
@tables = Table.all.active.order('status desc')
|
||||||
@rooms = Room.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')
|
@orders = Order.all.order('date desc')
|
||||||
# @shift = ShiftSale.current_open_shift(current_user.id)
|
# @shift = ShiftSale.current_open_shift(current_user.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@tables = Table.all.active.order('status desc')
|
@tables = Table.all.active.order('status desc')
|
||||||
@rooms = Room.all.active.order('status desc')
|
@rooms = Room.all.active.order('status desc')
|
||||||
@complete = Sale.where("sale_status != 'new'")
|
@complete = Sale.where("sale_status != 'new'")
|
||||||
@orders = Order.all.order('date desc')
|
@orders = Order.all.order('date desc')
|
||||||
@room = DiningFacility.find(params[:room_id])
|
|
||||||
|
# @room = DiningFacility.find(params[:room_id])
|
||||||
|
|
||||||
@status = ""
|
@status = ""
|
||||||
@sale_array = Array.new
|
@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'
|
if booking.sale_id.nil? && booking.booking_status != 'moved'
|
||||||
@order_items = Array.new
|
@order_items = Array.new
|
||||||
booking.booking_orders.each do |booking_order|
|
booking.booking_orders.each do |booking_order|
|
||||||
@@ -74,5 +77,10 @@ class Origami::RoomsController < BaseOrigamiController
|
|||||||
# end
|
# end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def set_dining
|
||||||
|
@dining = DiningFacility.find(params[:room_id])
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
2
app/views/origami/moveroom/moving.json.jbuilder
Normal file
2
app/views/origami/moveroom/moving.json.jbuilder
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
json.status true
|
||||||
|
json.get_type @get_type
|
||||||
Reference in New Issue
Block a user