From 518314c772803a074b805780d78db1c0d51c4150 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 3 Aug 2017 12:05:54 +0630
Subject: [PATCH] update room in origami

---
 app/controllers/origami/moveroom_controller.rb  | 15 ---------------
 app/controllers/origami/rooms_controller.rb     | 14 +++++++++++---
 app/views/origami/moveroom/moving.json.jbuilder |  2 ++
 3 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 app/views/origami/moveroom/moving.json.jbuilder

diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index dea36463..ef1c286a 100644
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -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
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index d7092692..de06ef62 100644
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -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
diff --git a/app/views/origami/moveroom/moving.json.jbuilder b/app/views/origami/moveroom/moving.json.jbuilder
new file mode 100644
index 00000000..acdac2e9
--- /dev/null
+++ b/app/views/origami/moveroom/moving.json.jbuilder
@@ -0,0 +1,2 @@
+json.status true
+json.get_type @get_type
\ No newline at end of file