diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index dfaabc08..429813a1 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -27,9 +27,9 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -51,7 +51,7 @@ class Origami::HomeController < BaseOrigamiController
               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
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
@@ -59,6 +59,9 @@ class Origami::HomeController < BaseOrigamiController
       end
     end
 
+    puts "@order_items_count"
+    puts @order_items_count.to_json
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index c12300a2..08970fed 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -13,9 +13,9 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -37,7 +37,7 @@ class Origami::OrdersController < BaseOrigamiController
               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
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index cf0668d6..72517cc9 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -22,10 +22,10 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-
-    @order_items_count = Hash.new
+    
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -47,7 +47,7 @@ class Origami::RoomsController < BaseOrigamiController
               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
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
               end
             end
           end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index f9ad89a4..f9fbe55a 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -40,16 +40,25 @@ class Origami::VoidController < BaseOrigamiController
       # end
 
       table_avaliable = true
+      table_count = 0
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|
-        if !booking.sale.nil? 
-          if booking.sale.sale_status == 'new'
+        if booking.booking_status != 'moved'
+          if booking.sale_id
+            if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+              table_avaliable = false
+              table_count += 1
+            else
+              table_avaliable = true
+            end
+          else
             table_avaliable = false
+            table_count += 1
           end
         end
       end
 
-      if table_avaliable
+      if table_avaliable && table_count == 0
         table.status = 'available'
         table.save
       end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 9e9873d2..5211061e 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummaryPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index baab15b8..619b81ab 100644
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummarySetPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index 87aba403..b4b850fa 100644
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSummarySlimPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0