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

redeem process

Browse Source
This commit is contained in:
Moe Su
2017-06-11 17:40:44 +06:30
parent 60b1819220
commit 7341657477
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,9 @@ class Crm::CustomersController < ApplicationController
membership_id = params[:membership_id] membership_id = params[:membership_id]
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("create_membership_customer")
app_token = membership.auth_token.to_s app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + "/api/create_membership_customer".to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, response = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
date_of_birth: date_of_birth, date_of_birth: date_of_birth,
@@ -114,8 +115,9 @@ class Crm::CustomersController < ApplicationController
id = customer_params[:membership_id] id = customer_params[:membership_id]
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("update_membership_customer")
app_token = membership.auth_token.to_s app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + "/api/update_membership_customer".to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, response = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
date_of_birth: date_of_birth, date_of_birth: date_of_birth,

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

@@ -9,12 +9,12 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
customer_data= Customer.find_by_customer_id(sale_data.customer_id) customer_data= Customer.find_by_customer_id(sale_data.customer_id)
if customer_data if customer_data
@membership_id = customer_data.membership_id @membership_id = customer_data.membership_id
@campaign_type_id =1
if !@membership_id.nil? if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("paypar_url") membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
if membership_setting.gateway_url if membership_setting.gateway_url
member_actions =MembershipAction.find_by_membership_type("get_account_balance") member_actions =MembershipAction.find_by_membership_type("get_account_balance")
if member_actions.gateway_url if member_actions.gateway_url
@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s 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) membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
if membership_data["status"]==true if membership_data["status"]==true

3
app/models/customer.rb
View File

@@ -14,9 +14,10 @@ class Customer < ApplicationRecord
def self.get_member_group def self.get_member_group
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("get_all_member_group")
app_token = membership.auth_token.to_s app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + "/api/get_all_member_group".to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.get(url, response = HTTParty.get(url,
:body => { app_token: app_token}.to_json, :body => { app_token: app_token}.to_json,
:headers => { :headers => {

9
app/models/sale_payment.rb
View File

@@ -78,11 +78,11 @@ class SalePayment < ApplicationRecord
end end
def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id) def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
membership_actions_data = MembershipAction.find_by_membership_type("redeem"); membership_actions_data = MembershipAction.find_by_membership_type("redeem");
if !membership_actions_data.nil? if !membership_actions_data.nil?
url = paypar_url.to_s + membership_actions_data.gateway_url.to_s url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
campaign_type_id = 1 campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
response = HTTParty.post(url, response = HTTParty.post(url,
:body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json, :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json,
:headers => { :headers => {
@@ -93,7 +93,7 @@ class SalePayment < ApplicationRecord
else else
response =false; response =false;
end end
puts response.to_json
return response; return response;
end end
@@ -188,10 +188,9 @@ class SalePayment < ApplicationRecord
self.payment_status = "pending" self.payment_status = "pending"
payment_method = self.save! payment_method = self.save!
campaign_type_id =1;
customer_data = Customer.find_by_customer_id(self.sale.customer_id) customer_data = Customer.find_by_customer_id(self.sale.customer_id)
membership_setting = MembershipSetting.find_by_membership_type("paypar_url") membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id,campaign_type_id) membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
if membership_data["status"]==true if membership_data["status"]==true
SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid') SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
sale_update_payment_status(self.received_amount.to_f) sale_update_payment_status(self.received_amount.to_f)

1
app/views/origami/others_payments/index.html.erb
View File

@@ -14,7 +14,6 @@
$('.others-payment').on('click',function(){ $('.others-payment').on('click',function(){
var input_type = $(this).attr("data-type"); var input_type = $(this).attr("data-type");
var sale_id = $(this).attr("data-sale-id"); var sale_id = $(this).attr("data-sale-id");
alert(input_type)
window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type; window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type;
}) })
</script> </script>

1
db/migrate/20170611084537_create_membership_actions.rb
View File

@@ -11,7 +11,6 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1]
t.jsonb :additional_parameter t.jsonb :additional_parameter
t.timestamps t.timestamps
t.timestamps
end end
end end
end end

BIN
dump.rdb
View File

Binary file not shown.