From feb1d662577f4bd7831a417447b07356a5ee7e8f Mon Sep 17 00:00:00 2001
From: Zin Lin Phyo <zinlin.phyo@code2lab.com>
Date: Mon, 26 Jun 2017 18:00:48 +0630
Subject: [PATCH] overall void

---
 Gemfile.lock                               |   2 --
 app/controllers/origami/home_controller.rb |   2 +-
 app/views/origami/home/show.html.erb       |  20 +++++++++++++++++++-
 config/routes.rb                           |   3 +++
 dump.rdb                                   | Bin 18163 -> 18262 bytes
 5 files changed, 23 insertions(+), 4 deletions(-)

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 211fd505548a6a60b85596d4201ab6d1155b4f22..041df177e5969bb1b252b44f32d8d3f28339ced3 100644
GIT binary patch
delta 3514
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
QmhL?oS<?2agJ1plzZ)(1)Bpeg

delta 3196
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