diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index cd4d099a..537803b1 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -30,40 +30,8 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    # bookings = Booking.all
-    # if !bookings.today.nil?
-    #   @order_items_count = Hash.new
-      # bookings.each do |booking|
-      #   if booking.sale_id.nil? && booking.booking_status != 'moved'
-      #     if !booking.booking_orders.empty?
-      #       booking.booking_orders.each do |booking_order|
-      #         order = Order.find(booking_order.order_id)
-      #         if !order.order_items.empty?
-      #           if !@order_items_count.key?(booking.dining_facility_id)
-      #             @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-      #           else
-      #             @order_items_count[booking.dining_facility_id] += order.order_items.count
-      #           end
-      #         end
-      #       end
-      #     end
-      #   else
-      #     if !booking.sale_id.nil?
-      #       sale = Sale.find(booking.sale_id)
-      #       if sale.sale_status !='completed'
-      #         if !@order_items_count.key?(booking.dining_facility_id)
-      #           @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-      #         else
-      #           @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-      #         end
-      #       end
-      #     end
-      #   end
-      # end
-    # end
-    @dining_booking = @dining.bookings.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and booking_status != 'moved'",DateTime.now.strftime('%Y-%m-%d'))
-    Rails.logger.info "Input Count SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS"
-    Rails.logger.info @dining_booking.count
+    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+
     @dining_booking.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 6e91c0d3..41b09c93 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -15,23 +15,9 @@ class Origami::MovetableController < BaseOrigamiController
     @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
+    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
 
-    #     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|
+    @dining_booking.each do |booking|
          if booking.sale_id.nil?
             @order_items = Array.new
             if booking.booking_status != 'moved'
@@ -81,8 +67,11 @@ class Origami::MovetableController < BaseOrigamiController
 
   def moving
     change_to = params[:change_to] #new
-    change_from = params[:change_from] #original
-    bookings = Booking.where('dining_facility_id=?',change_from)
+    change_from = params[:change_from] #original    
+
+    # bookings = Booking.where('dining_facility_id=?',change_from)
+
+    bookings = Booking.where("((DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}')) AND dining_facility_id='#{change_from}'")
 
     booking_array = Array.new
     order_items = Array.new
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index cab68e3d..f0c69d71 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -32,39 +32,8 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
-    # bookings = Booking.all
-    # if !bookings.today.nil?
-    #   @order_items_count = Hash.new
-    #   bookings.each do |booking|
-    #     if booking.sale_id.nil? && booking.booking_status != 'moved'
-    #       if !booking.booking_orders.empty?
-    #         booking.booking_orders.each do |booking_order|
-    #           order = Order.find(booking_order.order_id)
-    #           if !order.order_items.empty?
-    #             if !@order_items_count.key?(booking.dining_facility_id)
-    #               @order_items_count.store(booking.dining_facility_id, order.order_items.count)
-    #             else
-    #               @order_items_count[booking.dining_facility_id] += order.order_items.count
-    #             end
-    #           end
-    #         end
-    #       end
-    #     else
-    #       if !booking.sale_id.nil?
-    #         sale = Sale.find(booking.sale_id)
-    #         if sale.sale_status !='completed'
-    #           if !@order_items_count.key?(booking.dining_facility_id)
-    #             @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
-    #           else
-    #             @order_items_count[booking.dining_facility_id] = sale.sale_items.count
-    #           end
-    #         end
-    #       end
-    #     end
-    #   end
-    # end
-    
-    @room.bookings.active.each do |booking|
+    @dining_room = @room.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+    @dining_room.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
            # @assigned_order_items = Array.new