update room

app/controllers/origami/rooms_controller.rb

@@ -1,7 +1,5 @@
 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')
@@ -16,18 +14,19 @@ class Origami::RoomsController < BaseOrigamiController
     @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 = ""
+    @status_order = ""
+    @status_sale = ""
     @sale_array = Array.new
 
-    @dining.bookings.active.each do |booking|
+    @room.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|
               order = Order.find(booking_order.order_id)
               if (order.status == "new")
-                @obj = order
+                @obj_order = order
                 @customer = order.customer
                 @date = order.created_at
                 order.order_items.each do |item|
@@ -35,17 +34,18 @@ class Origami::RoomsController < BaseOrigamiController
                 end
               end
            end
-           @status = 'order'
+           @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed" && sale.sale_status != 'void'
+             puts "enter"
              @sale_array.push(sale)
-             if @status == 'order'
-               @status = 'sale'
+             if @status_order == 'order'
+               @status_order = 'sale'
              end
              @date = sale.created_at
-             @status = 'sale'
-             @obj = sale
+             @status_sale = 'sale'
+             @obj_sale = sale
              @customer = sale.customer
            end
          end
@@ -77,10 +77,5 @@ class Origami::RoomsController < BaseOrigamiController
     # end
   end
 
-  private
-
-def set_dining
-   @dining = DiningFacility.find(params[:room_id])
-end
 
 end