move table

app/controllers/origami/home_controller.rb

@@ -15,9 +15,10 @@ class Origami::HomeController < BaseOrigamiController
     @complete = Sale.all
     @orders = Order.all.order('date desc')
     @status_order = ""
+    @order_items = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
-           @order_items = Array.new
+
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
               @obj_order = order

app/controllers/origami/movetable_controller.rb

@@ -8,9 +8,10 @@ class Origami::MovetableController < BaseOrigamiController
 
     @status_order = ""
     @dining = DiningFacility.find(params[:dining_id])
+    @order_items = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
-           @order_items = Array.new
+
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
               @obj_order = order

app/controllers/origami/orders_controller.rb

@@ -4,7 +4,12 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all
-    @orders = Order.all.order('date desc')
+    @orders = Order.all.order('status desc')
     @order = Order.find(params[:order_id])
+    sale_order = SaleOrder.find_by_order_id(@order.order_id)
+    if sale_order
+      sale = Sale.find(sale_order.sale_id)
+      @sale_status = sale.sale_status
+    end
   end
 end