fixed conflict after merge with dev

app/models/sale_payment.rb

@@ -70,8 +70,6 @@ class SalePayment < ApplicationRecord
     self.sale = invoice
     self.received_amount = cash_amount
     self.payment_reference = remark
-    # puts action_by
-    # puts "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     self.action_by = action_by
     #get all payment for this invoices
     if payment_for
@@ -242,10 +240,7 @@ class SalePayment < ApplicationRecord
   end
 
   def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
-       # membership_actions_data = MembershipAction.find_by_membership_type("redeem");
         membership_actions_data = PaymentMethodSetting.find_by_payment_method("Redeem")
-        puts "This is membership_actions_data"
-        puts membership_actions_data.to_json
       if !membership_actions_data.nil?
 
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
@@ -334,8 +329,7 @@ class SalePayment < ApplicationRecord
                             merchant_uid:merchant_uid,
                             auth_token:auth_token}.to_json
           end
-
-          puts params
+          
           # Control for Paypar Cloud
           begin
             response = HTTParty.post(url,