diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index 04620543..09ece35f 100755
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -34,25 +34,25 @@ class Origami::MoveroomController < BaseOrigamiController
               end
            end
            @status_order = 'order'
-         else
-          sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
-             @sale_array.push(sale)
-             if @status_order == 'order'
-               @status_order = 'sale'
-             end
-             @booking= booking
-             @date = sale.created_at
-             @status_sale = 'sale'
-             @obj_sale = sale
-             @customer = sale.customer
-             accounts = @customer.tax_profiles
-             @account_arr =[]
-             accounts.each do |acc|
-              account = TaxProfile.find(acc)
-              @account_arr.push(account)
-             end
-           end
+         # else
+         #  sale = Sale.find(booking.sale_id)
+         #   if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
+         #     @sale_array.push(sale)
+         #     if @status_order == 'order'
+         #       @status_order = 'sale'
+         #     end
+         #     @booking= booking
+         #     @date = sale.created_at
+         #     @status_sale = 'sale'
+         #     @obj_sale = sale
+         #     @customer = sale.customer
+         #     accounts = @customer.tax_profiles
+         #     @account_arr =[]
+         #     accounts.each do |acc|
+         #      account = TaxProfile.find(acc)
+         #      @account_arr.push(account)
+         #     end
+         #   end
          end
     end
   end
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 52f76c67..6e91c0d3 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -14,45 +14,67 @@ class Origami::MovetableController < BaseOrigamiController
     @status_order = ""
     @status_sale = ""
     @sale_array = Array.new
+
+    # if !bookings.nil?
+    #   bookings.each do | booking |
+    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
+    #       booking_array.push(booking)
+    #     end
+
+    #     booking.booking_orders.each do |booking_order|
+    #       order = Order.find(booking_order.order_id)
+    #       if order.status == 'new'  
+    #         order.order_items.each do |order_item|
+    #           order_items.push(order_item)
+    #         end
+    #       end  
+    #     end
+    #   end
+    # end
     @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
-              @customer = order.customer
-              @date = order.created_at
-              @booking= booking
-              order.order_items.each do |item|
-                @order_items.push(item)
-              end
-              accounts = @customer.tax_profiles
-              @account_arr =[]
-              accounts.each do |acc|
-                account = TaxProfile.find(acc)
-                @account_arr.push(account)
-              end
-           end
+            if booking.booking_status != 'moved'
+               booking.booking_orders.each do |booking_order|
+                  order = Order.find(booking_order.order_id)
+                  @obj_order = order
+                  @customer = order.customer
+                  @date = order.created_at
+                  @booking= booking
+                  if order.status == 'new'
+                    order.order_items.each do |item|
+                      @order_items.push(item)
+                    end
+                  end
+                  
+                  accounts = @customer.tax_profiles
+                  @account_arr =[]
+                  accounts.each do |acc|
+                    account = TaxProfile.find(acc)
+                    @account_arr.push(account)
+                  end
+               end
+            end
            @status_order = 'order'
-         else
-          sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
-             @sale_array.push(sale)
-             if @status_order == 'order'
-               @status_order = 'sale'
-             end
-             @booking= booking
-             @date = sale.created_at
-             @status_sale = 'sale'
-             @obj_sale = sale
-             @customer = sale.customer
-             accounts = @customer.tax_profiles
-             @account_arr =[]
-             accounts.each do |acc|
-              account = TaxProfile.find(acc)
-              @account_arr.push(account)
-             end
-           end
+         # else
+         #  sale = Sale.find(booking.sale_id)
+         #   if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
+         #     @sale_array.push(sale)
+         #     if @status_order == 'order'
+         #       @status_order = 'sale'
+         #     end
+         #     @booking= booking
+         #     @date = sale.created_at
+         #     @status_sale = 'sale'
+         #     @obj_sale = sale
+         #     @customer = sale.customer
+         #     accounts = @customer.tax_profiles
+         #     @account_arr =[]
+         #     accounts.each do |acc|
+         #      account = TaxProfile.find(acc)
+         #      @account_arr.push(account)
+         #     end
+         #   end
          end
     end
   end