killbill-paypal-express 1.6.1 → 1.6.2

data/NEWS

@@ -1,3 +1,6 @@
+1.6.2
+    Add implementation for currency conversion
+
 1.6.1
     Update killbill version (1.8.3)
 

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/db/ddl.sql

@@ -20,6 +20,7 @@ CREATE TABLE `paypal_express_transactions` (
   `kb_payment_id` varchar(255) NOT NULL,
   `paypal_express_txn_id` varchar(255) NOT NULL,
   `amount_in_cents` int(11) NOT NULL,
+  `currency` char(3) NOT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),

data/db/schema.rb

@@ -21,6 +21,7 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.string   "kb_payment_id",              :null => false
     t.string   "paypal_express_txn_id",      :null => false
     t.integer  "amount_in_cents",            :null => false
+    t.string  "currency",                    :null => false
     t.datetime "created_at",                 :null => false
     t.datetime "updated_at",                 :null => false
   end

data/lib/paypal_express/api.rb

@@ -34,9 +34,12 @@ 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 amount_in_cents, options
-      response = save_response_and_transaction paypal_response, :charge, kb_payment_id, amount_in_cents
+      paypal_response = @gateway.reference_transaction actual_amount, options
+      response = save_response_and_transaction paypal_response, :charge, kb_payment_id, actual_amount, actual_currency
 
       response.to_payment_response
     end
@@ -59,9 +62,12 @@ module Killbill::PaypalExpress
 
       identification = paypal_express_transaction.paypal_express_txn_id
 
+      # Check for currency conversion
+      actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
+
       # Go to Paypal
-      paypal_response = @gateway.refund amount_in_cents, identification, options
-      response = save_response_and_transaction paypal_response, :refund, kb_payment_id, amount_in_cents
+      paypal_response = @gateway.refund actual_amount, identification, options
+      response = save_response_and_transaction paypal_response, :refund, kb_payment_id, actual_amount, actual_currency
 
       response.to_refund_response
     end
@@ -172,7 +178,31 @@ module Killbill::PaypalExpress
 
     private
 
-    def save_response_and_transaction(paypal_express_response, api_call, kb_payment_id=nil, amount_in_cents=0)
+    def convert_amount_currency_if_required(input_amount, input_currency, kb_payment_id)
+
+      converted_currency = Killbill::PaypalExpress.converted_currency(input_currency)
+      return [input_amount, input_currency] if converted_currency.nil?
+
+      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)
+      rates = currency_conversion.rates
+      found = rates.select do |r|
+        r.currency.to_s.upcase.to_sym == converted_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?
+      end
+
+      # conversion rounding ?
+      conversion_rate = found[0].value
+      output_amount =  input_amount * conversion_rate
+      return [output_amount.to_i, converted_currency]
+    end
+
+    def save_response_and_transaction(paypal_express_response, api_call, kb_payment_id=nil, amount_in_cents=0, currency=nil)
       @logger.warn "Unsuccessful #{api_call}: #{paypal_express_response.message}" unless paypal_express_response.success?
 
       # Save the response to our logs
@@ -181,7 +211,11 @@ module Killbill::PaypalExpress
 
       if response.success and !kb_payment_id.blank? and !response.authorization.blank?
         # Record the transaction
-        transaction = response.create_paypal_express_transaction!(:amount_in_cents => amount_in_cents, :api_call => api_call, :kb_payment_id => kb_payment_id, :paypal_express_txn_id => response.authorization)
+        transaction = response.create_paypal_express_transaction!(:amount_in_cents => amount_in_cents,
+                                                                  :currency => currency,
+                                                                  :api_call => api_call,
+                                                                  :kb_payment_id => kb_payment_id,
+                                                                  :paypal_express_txn_id => response.authorization)
         @logger.debug "Recorded transaction: #{transaction.inspect}"
       end
       response

data/lib/paypal_express/config/configuration.rb

@@ -7,6 +7,7 @@ module Killbill::PaypalExpress
   mattr_reader :paypal_sandbox_url
   mattr_reader :paypal_production_url
   mattr_reader :paypal_payment_description
+  mattr_reader :currency_conversions
   mattr_reader :initialized
   mattr_reader :test
 
@@ -27,6 +28,8 @@ module Killbill::PaypalExpress
     @@gateway = Killbill::PaypalExpress::Gateway.instance
     @@gateway.configure(@@config[:paypal])
 
+    @@currency_conversions = @@config[:currency_conversions]
+
     if defined?(JRUBY_VERSION)
       # See https://github.com/jruby/activerecord-jdbc-adapter/issues/302
       require 'jdbc/mysql'
@@ -38,4 +41,10 @@ module Killbill::PaypalExpress
 
     @@initialized = true
   end
+
+  def self.converted_currency(currency)
+    currency_sym = currency.to_s.upcase.to_sym
+    @@currency_conversions && @@currency_conversions[currency_sym]
+  end
+
 end

data/lib/paypal_express/models/paypal_express_response.rb

@@ -131,11 +131,13 @@ 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
         created_date = created_at
         first_payment_reference_id = nil
         second_payment_reference_id = nil
       else
         amount_in_cents = paypal_express_transaction.amount_in_cents
+        currency = paypal_express_transaction.currency
         created_date = paypal_express_transaction.created_at
         first_payment_reference_id = paypal_express_transaction.paypal_express_txn_id
         second_payment_reference_id = nil
@@ -148,6 +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.created_date = created_date
         p_info_plugin.effective_date = effective_date
         p_info_plugin.status = (success ? :PROCESSED : :ERROR)
@@ -159,6 +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.created_date = created_date
         r_info_plugin.effective_date = effective_date
         r_info_plugin.status = (success ? :PROCESSED : :ERROR)

data/lib/paypal_express/models/paypal_express_transaction.rb

@@ -2,6 +2,7 @@ module Killbill::PaypalExpress
   class PaypalExpressTransaction < ActiveRecord::Base
     belongs_to :paypal_express_response
     attr_accessible :amount_in_cents,
+                    :currency,
                     :api_call,
                     :kb_payment_id,
                     :paypal_express_txn_id

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
+    <version>1.6.2</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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
+  version: 1.6.2
   prerelease:
-  version: 1.6.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -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: