diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 02e0c4ef..3ab55be8 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -261,6 +261,11 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
+         
+      if saleObj.discount_type == "member_discount"
+        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
+      end
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "foc")
 
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 242a1c2e..ffb2bde4 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,7 +6,11 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-      
+      if sale.discount_type == "member_discount"
+        sale.update_attributes(total_discount: 0)
+        sale.compute_by_sale_items(sale_id, sale.sale_items,0)
+      end
+
       # update count for shift sale
       if(sale.sale_status == "completed")
         if sale.shift_sale_id != nil
@@ -21,7 +25,7 @@ class Origami::VoidController < BaseOrigamiController
           shift.save
         end
       end
-
+            
       sale.payment_status = 'void'
       sale.sale_status = 'void'
       sale.save
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b97c529e..969deb5c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -247,6 +247,7 @@ class Sale < ApplicationRecord
 
   #compute - invoice total
   def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
+
     sale = Sale.find(sale_id)
     sales_items = sale_itemss
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6827d8e8..bd9022d9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -587,9 +587,9 @@
 
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
-
-          calculate_member_discount(sale_id,type);
-
+          if (type != "Credit") {
+            calculate_member_discount(sale_id,type);
+          }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
           $.ajax({
               type: "GET",
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1010101d..c076b81b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -425,14 +425,14 @@
           var sale_id   = $('#sale_id').text();
           // var item_row  = $('.is_card');
 
-          // if (item_row.length < 1) {
-            calculate_member_discount(sale_id);
-          // }
-         
-            //  payment
-            var cash = $('#cash').text();
+          //  payment
+            var cash   = $('#cash').text();
             var credit = $('#credit').text();
-            var card = $('#card').text();
+            var card   = $('#card').text();
+
+           if (credit <= 0) {
+            calculate_member_discount(sale_id);
+           }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",