diff --git a/Gemfile.lock b/Gemfile.lock
index e4b905ea..5c0f8a10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,7 +122,6 @@ GEM
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
     pdf-core (0.7.0)
-    pg (0.21.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -261,7 +260,6 @@ DEPENDENCIES
   kaminari (~> 1.0.1)
   listen (~> 3.0.5)
   mysql2 (>= 0.3.18, < 0.5)
-  pg
   prawn
   prawn-table
   puma (~> 3.0)
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 3f70ad01..1b0aa491 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -35,7 +35,7 @@ class Origami::HomeController < BaseOrigamiController
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed"
+           if sale.sale_status != "completed" && sale.sale_status != 'void'
              puts "enter"
              @sale_array.push(sale)
              if @status_order == 'order'
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 73f298ec..6342aee4 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -288,7 +288,7 @@
       <button type="button" class="btn btn-primary btn-block" id='move' disabled="">Move</button>
       <button type="button" id="request_bills" class="btn btn-primary btn-block" disabled> Req.Bill</button>
       <button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
-      <button type="button" class="btn btn-primary btn-block" > Void </button>
+      <button type="button" id="void" class="btn btn-primary btn-block" > Void </button>
    <% end %>
    <!-- Cashier Buttons -->
 
@@ -454,5 +454,23 @@ $('#edit').on('click',function(){
   var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
   window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit";
 })
+    
+    $('#void').on('click',function () {
+        var sure = confirm("Are you sure want to Void");
+        if (sure == true) {
+            var sale_id = $('#sale_id').val();
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+                type: 'POST',
+                url: ajax_url,
+                success: function () {
+                    window.location.href = '/origami/';
+                }
+            })
+        } else {
+
+        }
+
+    })
 
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index bf5d6483..db4acb5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -110,6 +110,9 @@ Rails.application.routes.draw do
     get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
     get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
 
+    #---------Void --------------#
+    post 'sale/:sale_id/void' => 'void#overall_void'
+
     #---------Add Customer --------------#
     #resources :customers
     get '/:sale_id/customers', to: "customers#add_customer"
diff --git a/dump.rdb b/dump.rdb
index 211fd505..041df177 100644
Binary files a/dump.rdb and b/dump.rdb differ