diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 657c53e8..06c8cefb 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -292,8 +292,8 @@ class SalePayment < ApplicationRecord end - def self.create_payment(paypar_url,payment_type,membership_id,received_amount,sale_id) - membership_actions_data = MembershipAction.find_by_membership_type("create_payment") + def self.create_payment(paypar_url,membership_type,membership_id,received_amount,sale_id) + membership_actions_data = MembershipAction.find_by_membership_type(membership_type); sale_data = Sale.find_by_sale_id(sale_id) customer_data = Customer.find_by_customer_id(sale_data.customer_id) if !membership_actions_data.nil? @@ -530,7 +530,7 @@ class SalePayment < ApplicationRecord account_no = self.payment_reference # self.sale.customer.update_attributes(paypar_account_no: ) membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - membership_data = SalePayment.create_payment(membership_setting.gateway_url,"PAYMAL",account_no,self.received_amount,self.sale.sale_id) + membership_data = SalePayment.create_payment(membership_setting.gateway_url,"create_payment",account_no,self.received_amount,self.sale.sale_id) #record an payment in sale-audit remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " @@ -580,7 +580,7 @@ class SalePayment < ApplicationRecord # end membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - membership_data = SalePayment.create_payment(membership_setting.gateway_url,"DINGA",account_no,self.received_amount,self.sale.sale_id) + membership_data = SalePayment.create_payment(membership_setting.gateway_url,"dinga_payment",account_no,self.received_amount,self.sale.sale_id) #record an payment in sale-audit remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "