diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d58af5ad..6c9676e6 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -108,7 +108,9 @@ class Origami::PaymentsController < BaseOrigamiController
        
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
+      credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+      
+      if customer.membership_id != nil && rebate && credit_data.nil?
         member_info    = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
         current_balance = SaleAudit.paymal_search(sale_id)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 8fb1b48e..ad388cad 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -173,13 +173,20 @@ class SalePayment < ApplicationRecord
 
   private
   def cash_payment
+    status = false
+    sale_payments_data = SalePayment.find_by_sale_id(self.sale_id)
+    if sale_payments_data.nil?
+      status = true
+    end
+
     payment_status = false
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)
+
+    sale_update_payment_status(self.received_amount,status)
     return payment_status
   end