killbill-paypal-express 1.6.2 → 1.6.3

data/NEWS

@@ -1,3 +1,6 @@
+1.6.3
+    Fix bugs for currency conversion during payment/refunds
+
 1.6.2
     Add implementation for currency conversion
 

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

data/lib/paypal_express/api.rb

@@ -23,7 +23,10 @@ module Killbill::PaypalExpress
       paypal_express_transaction = PaypalExpressTransaction.from_kb_payment_id(kb_payment_id) rescue nil
       return paypal_express_transaction.paypal_express_response.to_payment_response unless paypal_express_transaction.nil?
 
-      options[:currency] ||= currency.to_s
+      # Check for currency conversion
+      actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
+
+      options[:currency] ||= actual_currency.to_s
       options[:payment_type] ||= 'Any'
       options[:invoice_id] ||= kb_payment_id
       options[:description] ||= Killbill::PaypalExpress.paypal_payment_description || "Kill Bill payment for #{kb_payment_id}"
@@ -34,8 +37,6 @@ module Killbill::PaypalExpress
         options[:reference_id] = payment_method.paypal_express_baid
       end
 
-      # Check for currency conversion
-      actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
 
       # Go to Paypal (DoReferenceTransaction call)
       paypal_response = @gateway.reference_transaction actual_amount, options
@@ -55,15 +56,15 @@ module Killbill::PaypalExpress
     def process_refund(kb_account_id, kb_payment_id, amount, currency, call_context = nil, options = {})
       amount_in_cents = (amount * 100).to_i
 
-      paypal_express_transaction = PaypalExpressTransaction.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
+      # Check for currency conversion
+      actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
 
-      options[:currency] ||= currency.to_s
-      options[:refund_type] ||= paypal_express_transaction.amount_in_cents != amount_in_cents ? 'Partial' : 'Full'
+      paypal_express_transaction = PaypalExpressTransaction.find_candidate_transaction_for_refund(kb_payment_id, actual_amount)
 
-      identification = paypal_express_transaction.paypal_express_txn_id
+      options[:currency] ||= actual_currency.to_s
+      options[:refund_type] ||= paypal_express_transaction.amount_in_cents != actual_amount ? 'Partial' : 'Full'
 
-      # Check for currency conversion
-      actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
+      identification = paypal_express_transaction.paypal_express_txn_id
 
       # Go to Paypal
       paypal_response = @gateway.refund actual_amount, identification, options
@@ -185,15 +186,15 @@ module Killbill::PaypalExpress
 
       kb_payment = @kb_apis.payment_api.get_payment(kb_payment_id, false, @kb_apis.create_context)
 
-      currency_conversion = @kb_apis.currency_conversion_api.get_currency_conversion(input_currency, kb_payment.effective_date)
+      currency_conversion = @kb_apis.currency_conversion_api.get_currency_conversion(converted_currency, kb_payment.effective_date)
       rates = currency_conversion.rates
       found = rates.select do |r|
-        r.currency.to_s.upcase.to_sym == converted_currency.to_s.upcase.to_sym
+        r.currency.to_s.upcase.to_sym == input_currency.to_s.upcase.to_sym
       end
 
       if found.nil? || found.empty?
         @logger.warn "Failed to find converted currency #{converted_currency} for input currency #{input_currency}"
-        return [input_amount, input_currency] if converted_currency.nil?
+        return [input_amount, input_currency]
       end
 
       # conversion rounding ?

data/lib/paypal_express/models/paypal_express_response.rb

@@ -131,7 +131,7 @@ module Killbill::PaypalExpress
       if paypal_express_transaction.nil?
         # payment_info_grossamount is e.g. "100.00" - we need to convert it in cents
         amount_in_cents = payment_info_grossamount ? (payment_info_grossamount.to_f * 100).to_i : nil
-        currency = nill
+        currency = nil
         created_date = created_at
         first_payment_reference_id = nil
         second_payment_reference_id = nil
@@ -150,7 +150,7 @@ module Killbill::PaypalExpress
       if type == :payment
         p_info_plugin = Killbill::Plugin::Model::PaymentInfoPlugin.new
         p_info_plugin.amount = BigDecimal.new(amount_in_cents.to_s) / 100.0 if amount_in_cents
-        p_info_plugin.amount = currency
+        p_info_plugin.currency = currency
         p_info_plugin.created_date = created_date
         p_info_plugin.effective_date = effective_date
         p_info_plugin.status = (success ? :PROCESSED : :ERROR)
@@ -162,7 +162,7 @@ module Killbill::PaypalExpress
       else
         r_info_plugin = Killbill::Plugin::Model::RefundInfoPlugin.new
         r_info_plugin.amount = BigDecimal.new(amount_in_cents.to_s) / 100.0 if amount_in_cents
-        r_info_plugin.amount = currency
+        r_info_plugin.currency = currency
         r_info_plugin.created_date = created_date
         r_info_plugin.effective_date = effective_date
         r_info_plugin.status = (success ? :PROCESSED : :ERROR)

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.6.2
   prerelease:
+  version: 1.6.3
 platform: ruby
 authors:
 - Kill Bill core team
@@ -213,9 +213,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      hash: 2
       version: !binary |-
         MA==
-      hash: 2
   none: false
 requirements: []
 rubyforge_project: