From 7341657477d1290b5059681a7fbfabd371f3b98f Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 17:40:44 +0630 Subject: [PATCH] redeem process --- app/controllers/crm/customers_controller.rb | 6 ++++-- .../origami/redeem_payments_controller.rb | 2 +- app/models/customer.rb | 3 ++- app/models/sale_payment.rb | 9 ++++----- .../origami/others_payments/index.html.erb | 1 - ...0170611084537_create_membership_actions.rb | 1 - dump.rdb | Bin 19781 -> 20156 bytes 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index e1283bd6..e0168fb5 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -50,8 +50,9 @@ class Crm::CustomersController < ApplicationController membership_id = params[:membership_id] membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("create_membership_customer") 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, date_of_birth: date_of_birth, @@ -114,8 +115,9 @@ class Crm::CustomersController < ApplicationController id = customer_params[:membership_id] membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("update_membership_customer") 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, date_of_birth: date_of_birth, diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index fba759bb..0821a2d8 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -9,12 +9,12 @@ class Origami::RedeemPaymentsController < BaseOrigamiController customer_data= Customer.find_by_customer_id(sale_data.customer_id) if customer_data @membership_id = customer_data.membership_id - @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") if membership_setting.gateway_url member_actions =MembershipAction.find_by_membership_type("get_account_balance") 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 membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true diff --git a/app/models/customer.rb b/app/models/customer.rb index afc17d79..9e980930 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -14,9 +14,10 @@ class Customer < ApplicationRecord def self.get_member_group 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 - 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, :body => { app_token: app_token}.to_json, :headers => { diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index aee7ace4..3049b3eb 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -78,11 +78,11 @@ class SalePayment < ApplicationRecord 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"); if !membership_actions_data.nil? 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, :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 => { @@ -93,7 +93,7 @@ class SalePayment < ApplicationRecord else response =false; end - + puts response.to_json return response; end @@ -188,10 +188,9 @@ class SalePayment < ApplicationRecord self.payment_status = "pending" payment_method = self.save! - campaign_type_id =1; customer_data = Customer.find_by_customer_id(self.sale.customer_id) 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 SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid') sale_update_payment_status(self.received_amount.to_f) diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index b5ef15ae..4b2397a2 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -14,7 +14,6 @@ $('.others-payment').on('click',function(){ var input_type = $(this).attr("data-type"); var sale_id = $(this).attr("data-sale-id"); - alert(input_type) window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type; }) diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 5b5d1774..74695871 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -11,7 +11,6 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.jsonb :additional_parameter t.timestamps - t.timestamps end end end diff --git a/dump.rdb b/dump.rdb index 353820066c0a3587829039db72f6c8e60a1eedaa..ebdb6db6aa4a16a1abe03b56aaa0c4d4053ff704 100644 GIT binary patch delta 213 zcmV;`04o2*ngP6>0gx~kp&C6|`UrJ%Wn?XFWo^RnV-EoS0Q(P-M};B{adl;NWjbVK zW?^+~bOFObVnMbCwgCVD3IG5AAO;^nsFN`t9s>+?Ws~tgWF=%`G%+