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:
Aung Myo
2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/crm/customers_controller.rb
View File

@@ -57,7 +57,7 @@ class Crm::CustomersController < BaseCrmController
date_of_birth = customer_params[:date_of_birth]
membership_id = params[:membership_id]
membership = MembershipSetting.find_by_membership_type("smartpay_url")
membership = MembershipSetting.find_by_membership_type("paypar_url")
app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + "/api/create_membership_customer".to_s
@@ -124,7 +124,7 @@ class Crm::CustomersController < BaseCrmController
date_of_birth = customer_params[:date_of_birth]
id = customer_params[:membership_id]
membership = MembershipSetting.find_by_membership_type("smartpay_url")
membership = MembershipSetting.find_by_membership_type("paypar_url")
app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + "/api/update_membership_customer".to_s