redeem process

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,

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

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 => {

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)

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;
 })
 </script>

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