merge with staging

app/models/sale_payment.rb

@@ -400,10 +400,8 @@ class SalePayment < ApplicationRecord
       rebate_arr =[]
       campaign_method.each do |a|
         data = {:type => a[:type], :amount => a[:amount]}
-        puts data
         type_arr.each do |si|
           if si[:type] == a[:type]
-            puts "steeeeeeeeeeeee"
             amount = (redeem_amount / total_percentage)*si[:percentage]
             actual = a[:amount] - amount
             data[:amount] = actual
@@ -412,7 +410,7 @@ class SalePayment < ApplicationRecord
         end
         rebate_arr.push(data)
       end
-
+    
    		total_amount = rebate_prices - payparcost - overall_dis
 
       if credit == 1