git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-11 16:58:18 +06:30
parent 05286ce7a6 60b1819220
commit f6d14de461
5 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/origami/redeem_payments_controller.rb
View File

@@ -1,9 +1,9 @@
class Origami::RedeemPaymentsController < BaseOrigamiController
def index
sale_id = params[:sale_id]
@sale_id = params[:sale_id]
payment_method = params[:payment_method]
@membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(sale_id)
sale_data = Sale.find_by_sale_id(@sale_id)
if sale_data
if sale_data.customer_id
customer_data= Customer.find_by_customer_id(sale_data.customer_id)
@@ -12,18 +12,23 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
@campaign_type_id =1
if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
puts 'Hello Hello'
puts membership_setting.to_json
member_actions =MembershipAction.find_by_membership_type("get_account_balance")
puts member_actions.to_json
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
puts url
membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
if membership_data["status"]==true
@membership_rebate_balance=membership_data["balance"]
@out = true, @membership_rebate_balance,@membership_id
if membership_setting.gateway_url
member_actions =MembershipAction.find_by_membership_type("get_account_balance")
if member_actions.gateway_url
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
if membership_data["status"]==true
@membership_rebate_balance=membership_data["balance"]
@out = true, @membership_rebate_balance,@membership_id
end
else
@out =false,0
end
else
@out = false,0
end
else
@out = false, 0
end