diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 687d9fa5..0c41115f 100644
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -9,6 +9,11 @@ class Origami::VoidController < BaseOrigamiController
       sale.sale_status = 'void'
       sale.save
 
+      # update count for shift sale
+      shift = ShiftSale.current_open_shift(sale.cashier_id)
+      shift.total_void = shift.total_void + 1
+      shift.save
+
       bookings = sale.bookings
       bookings.each do |booking|
         orders = booking.orders
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index b3455e27..300935d9 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -288,6 +288,7 @@ class SalePayment < ApplicationRecord
 
   end
 
+  # update for cashier shift
   def update_shift
     shift = ShiftSale.current_open_shift(self.sale.cashier_id)
     if !shift.nil?
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index b9c5aa28..5716ed7d 100644
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -52,8 +52,9 @@ class ShiftSale < ApplicationRecord
     self.cash_sales = self.cash_sales.to_f + cash.to_f
     self.credit_sales = self.credit_sales.to_i + credit.to_f
     self.other_sales = self.other_sales.to_i + other_sales.to_f
-    self.nett_sales = self.grand_total.to_i -  self.commercial_taxes
+    self.nett_sales = saleobj.total_amount.to_f  #self.grand_total.to_i -  self.commercial_taxes
     self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
+    self.total_receipt = self.total_receipt + 1
     self.save
 
   end
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 5eb4afe6..879dd7ae 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -190,6 +190,8 @@
 	    <button id="remove-item-discount" class="btn btn-warning btn-block action-btn">RemoveItem Discount</button>
 	    <button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button>
 		<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
+		<hr />		
+		<button id="member-discount" class="btn green btn-block action-btn">Member Discount</button>
     </div>
   </div>
 </div>
@@ -418,6 +420,33 @@ $(document).ready(function(){
 			}
 		});
 	});
+
+	// Pay Discount for membership
+	$("#member-discount").on('click', function(e){
+		e.preventDefault();
+		var sale_id = $('#sale-id').text();
+		var sub_total = $('#order-sub-total').text();		
+		var ajax_url = "/origami/" + sale_id + "/member_discount";	
+
+		// Selected Account
+		var account_types = JSON.stringify(get_selected_account_types());
+		var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
+
+		$.ajax({
+			type: "POST",
+		    url: ajax_url,
+		    data: params,
+		    success:function(result){			    		    			    
+		    	alert("Successfully Discount!");
+		    	if(result.table_type == "Table"){
+		    		window.location.href = "/origami/table/" + result.table_id
+		    	}
+		    	else {
+		    		window.location.href = "/origami/room/" + result.table_id
+		    	}		    	
+		    }
+		});
+	});
 });
 
 /* Remove Selection */
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 68fb80e4..6bdadd85 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -105,8 +105,7 @@
  </div>
  <div class="col-lg-2 col-md-2 col-sm-2">
    <button id="refreshbutton" type="button" class="btn btn-block" style="border-radius:5px;color:#fff;background-color:red;"> Refresh off </button>
-   <!-- TEMP Disable for BITP -->
-  <!--  <button id="cash_in" type="button" class="btn btn-block btn-primary"  style="border-radius:5px;color:#fff;"> Cash In </button> -->
+   <button id="cash_in" type="button" class="btn btn-block btn-primary"  style="border-radius:5px;color:#fff;"> Cash In </button>
    <button id="cash_out" type="button" class="btn btn-block btn-primary"  style="border-radius:5px;color:#fff;"> Cash Out </button>
    <button id="close_cashier" type="button" class="btn btn-block btn-primary"  style="border-radius:5px;color:#fff;"> Close Cashier </button>
  </div>
diff --git a/config/routes.rb b/config/routes.rb
index 2b7db5eb..f4dd5b13 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,6 +104,9 @@ Rails.application.routes.draw do
     get "/:id/remove_all_discount" => "discounts#remove_all_discount"
     post "/:id/remove_discount_items" => "discounts#remove_discount_items"
 
+    # Discount for Member
+    post "/:id/member_discount" => "discounts#member_discount"
+
     get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
 
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index 18323c9d..405e497b 100644
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/db/migrate/20170626191519_create_shift_sales.rb
@@ -21,6 +21,8 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
       t.integer :dining_count, :default => 0
       t.integer :takeaway_count, :default => 0
       t.integer :member_count, :default => 0
+      t.integer :total_receipt, :default => 0
+      t.integer :total_void, :default => 0
       t.timestamps
     end
   end
diff --git a/db/migrate/20170701101420_create_sales.rb b/db/migrate/20170701101420_create_sales.rb
index 6d3f33f9..d0e70287 100644
--- a/db/migrate/20170701101420_create_sales.rb
+++ b/db/migrate/20170701101420_create_sales.rb
@@ -13,6 +13,7 @@ class CreateSales < ActiveRecord::Migration[5.1]
       t.string  :payment_status, :null => false, :default => "outstanding"
       t.string  :sale_status, :null => false, :default => "new"
       t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.string :discount_type, :default => "overall"
       t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.string  :tax_type, :null => false , :dfault => "exclusive_tax"
diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake
index 2ff305fd..50ffe256 100644
--- a/lib/tasks/menu_import.rake
+++ b/lib/tasks/menu_import.rake
@@ -8,47 +8,47 @@ beverage = Account.create({title: "Beverage", account_type: "1"})
 # soup base
 menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1,created_by: "SYSTEM DEFAULT"})
   # single pot
-  menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "小辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item01 = SimpleMenuItem.create({item_code:"010010", name: "Beauty Collagen Broth", alt_name: "胶原蛋白养颜美容锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item02 = SimpleMenuItem.create({item_code:"010011", name: "Spicy Nourishing Broth", alt_name: "滋补养生香辣锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item03 = SimpleMenuItem.create({item_code:"010012", name: "Herbal Drunken Chicken Broth", alt_name: "养生药膳醉鸡锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item04 = SimpleMenuItem.create({item_code:"010013", name: "Cooling Coconut Broth", alt_name: "清凉解热雪耳椰子锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item05 = SimpleMenuItem.create({item_code:"010014", name: "Lonevity Wild Pine Mushroom Broth", alt_name: "长生抗癌松茸菌锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  menu_category1_menu_item06 = SimpleMenuItem.create({item_code:"010015", name: "Vitamin C Tomato Sweet Corn Broth", alt_name: "维他命C番茄玉米锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })  
+  menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item01 = SimpleMenuItem.create({item_code:"010010", name: "Beauty Collagen Broth", alt_name: "胶原蛋白养颜美容锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item02 = SimpleMenuItem.create({item_code:"010011", name: "Spicy Nourishing Broth", alt_name: "滋补养生香辣锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item03 = SimpleMenuItem.create({item_code:"010012", name: "Herbal Drunken Chicken Broth", alt_name: "养生药膳醉鸡锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item04 = SimpleMenuItem.create({item_code:"010013", name: "Cooling Coconut Broth", alt_name: "清凉解热雪耳椰子锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item05 = SimpleMenuItem.create({item_code:"010014", name: "Lonevity Wild Pine Mushroom Broth", alt_name: "长生抗癌松茸菌锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  # menu_category1_menu_item06 = SimpleMenuItem.create({item_code:"010015", name: "Vitamin C Tomato Sweet Corn Broth", alt_name: "维他命C番茄玉米锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })  
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Single Pot",item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:0.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0051", menu_item: menu_category1_menu_item01, price:15800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth",item_instance_code:"II0061", menu_item: menu_category1_menu_item02, price:15800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0071", menu_item: menu_category1_menu_item03, price:17800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0081", menu_item: menu_category1_menu_item04, price:15800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item05, price:15800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0101", menu_item: menu_category1_menu_item06, price:15800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0051", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth",item_instance_code:"II0061", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0071", menu_item: menu_category1_menu_item0, price:17800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0081", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0101", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
   # twin pot
-  menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"01002", name: "Twin Pot", alt_name: "中辣",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })  
+  menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"01002", name: "Twin Pot", alt_name: "Twin Pot",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })  
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Twin Pot",item_instance_code:"II0021", menu_item: menu_category1_menu_item1, price:0.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0052", menu_item: menu_category1_menu_item01, price:9800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth",item_instance_code:"II0062", menu_item: menu_category1_menu_item02, price:9800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0072", menu_item: menu_category1_menu_item03, price:9800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0082", menu_item: menu_category1_menu_item04, price:9800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0092", menu_item: menu_category1_menu_item05, price:9800.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0102", menu_item: menu_category1_menu_item06, price:11800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0052", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth",item_instance_code:"II0062", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0072", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0082", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0092", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0102", menu_item: menu_category1_menu_item1, price:11800.00, is_on_promotion:false}])
   # vip room Individual pot
-  menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "VIP 小辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "VIP",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VIP Room Individual Pot",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:0.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0053", menu_item: menu_category1_menu_item01, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item02, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item03, price:8000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item04, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item05, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0103", menu_item: menu_category1_menu_item06, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:8000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
   # Quart pot
-  menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Quart Pot", alt_name: "大辣",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Quart Pot", alt_name: "Quart Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:0.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item01, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item02, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item03, price:8000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item04, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item05, price:6000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item06, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
 
 
 # Assorted Platter