killbill-litle 1.9.1 → 1.9.2

data/Jarfile

@@ -1,5 +1,6 @@
-jar 'com.ning.billing:killbill-api', '0.7.1'
-jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.5.0'
-jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.5.0'
-jar 'com.ning.billing:killbill-util:tests', '0.6.17'
+jar 'com.ning.billing:killbill-api', '0.7.4'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.1'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.1'
+jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.1'
+jar 'com.ning.billing:killbill-util:tests', '0.7.1'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,6 @@
+1.9.2
+    Add ability currency conversion for payment/refunds
+
 1.9.1
     Search implementation bugfix
 

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

data/db/ddl.sql

@@ -30,6 +30,7 @@ CREATE TABLE `litle_transactions` (
   `kb_payment_id` varchar(255) NOT NULL,
   `litle_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

@@ -31,6 +31,7 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.string   "kb_payment_id",     :null => false
     t.string   "litle_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/killbill-litle.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.7.1'
+  s.add_dependency 'killbill', '~> 1.8.3'
   s.add_dependency 'activemerchant', '~> 1.36.0'
   s.add_dependency 'activerecord', '~> 3.2.1'
   s.add_dependency 'sinatra', '~> 1.3.4'

data/lib/litle/api.rb

@@ -33,14 +33,18 @@ module Killbill::Litle
       # Retrieve the Litle payment method
       litle_pm = LitlePaymentMethod.from_kb_payment_method_id(kb_payment_method_id)
 
+      # Check for currency conversion
+      converted = convert_amount_currency_if_required(amount_in_cents, currency)
+
       # Go to Litle
-      gateway = Killbill::Litle.gateway_for_currency(currency)
-      litle_response = gateway.purchase amount_in_cents, litle_pm.to_litle_card_token, options
-      response = save_response_and_transaction litle_response, :charge, kb_payment_id, amount_in_cents
+      gateway = Killbill::Litle.gateway_for_currency(converted[1])
+      litle_response = gateway.purchase converted[0], litle_pm.to_litle_card_token, options
+      response = save_response_and_transaction litle_response, :charge, kb_payment_id, converted[0], converted[1]
 
       response.to_payment_response
     end
 
+
     def get_payment_info(kb_account_id, kb_payment_id, tenant_context = nil, options = {})
       # We assume the payment is immutable in Litle and only look at our tables since there
       # doesn't seem to be a Litle API to fetch details for a given transaction.
@@ -58,11 +62,13 @@ module Killbill::Litle
       # Set a default report group
       options[:merchant] ||= report_group_for_currency(currency)
 
-      # Go to Litle
-      gateway = Killbill::Litle.gateway_for_currency(currency)
-      litle_response = gateway.credit amount_in_cents, litle_transaction.litle_txn_id, options
-      response = save_response_and_transaction litle_response, :refund, kb_payment_id, amount_in_cents
+      # Check for currency conversion
+      converted = convert_amount_currency_if_required(amount_in_cents, currency)
 
+      # Go to Litle
+      gateway = Killbill::Litle.gateway_for_currency(converted[1])
+      litle_response = gateway.credit converted[0], litle_transaction.litle_txn_id, options
+      response = save_response_and_transaction litle_response, :refund, kb_payment_id, converted[0], converted[1]
       response.to_refund_response
     end
 
@@ -165,6 +171,28 @@ module Killbill::Litle
 
     private
 
+    def convert_amount_currency_if_required(input_amount, input_currency, currency_conversion_date)
+
+      converted_currency = Killbill::Litle.converted_currency(input_currency)
+      return [input_amount, input_currency] if converted_currency.nil?
+
+      currency_conversion = @kb_apis.currency_conversion_api.get_currency_conversion(input_currency, currency_conversion_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 find_value_from_payment_method_props(payment_method_props, key)
       prop = (payment_method_props.properties.find { |kv| kv.key == key })
       prop.nil? ? nil : prop.value
@@ -186,7 +214,7 @@ module Killbill::Litle
       "Report Group for #{currency.to_s}"
     end
 
-    def save_response_and_transaction(litle_response, api_call, kb_payment_id=nil, amount_in_cents=0)
+    def save_response_and_transaction(litle_response, api_call, kb_payment_id=nil, amount_in_cents=0, currency=nil)
       @logger.warn "Unsuccessful #{api_call}: #{litle_response.message}" unless litle_response.success?
 
       # Save the response to our logs
@@ -196,6 +224,7 @@ module Killbill::Litle
       if response.success and !kb_payment_id.blank? and !response.litle_txn_id.blank?
         # Record the transaction
         transaction = response.create_litle_transaction!(:amount_in_cents => amount_in_cents,
+                                                         :currency => currency,
                                                          :api_call => api_call,
                                                          :kb_payment_id => kb_payment_id,
                                                          :litle_txn_id => response.litle_txn_id)

data/lib/litle/config/configuration.rb

@@ -4,6 +4,7 @@ module Killbill::Litle
   mattr_reader :logger
   mattr_reader :config
   mattr_reader :gateways
+  mattr_reader :currency_conversions
   mattr_reader :kb_apis
   mattr_reader :initialized
   mattr_reader :test
@@ -21,6 +22,8 @@ module Killbill::Litle
 
     @@gateways = Killbill::Litle::Gateway.from_config(@@config[:litle])
 
+    @@currency_conversions = @@config[:currency_conversions]
+
     if defined?(JRUBY_VERSION)
       # See https://github.com/jruby/activerecord-jdbc-adapter/issues/302
       require 'jdbc/mysql'
@@ -33,6 +36,12 @@ module Killbill::Litle
     @@initialized = true
   end
 
+  def self.converted_currency(currency)
+    currency_sym = currency.to_s.upcase.to_sym
+    @@currency_conversions && @@currency_conversions[currency_sym]
+  end
+
+
   def self.gateway_for_currency(currency)
     currency_sym = currency.to_s.upcase.to_sym
     gateway = @@gateways[currency_sym]

data/lib/litle/models/litle_transaction.rb

@@ -1,7 +1,7 @@
 module Killbill::Litle
   class LitleTransaction < ActiveRecord::Base
     belongs_to :litle_response
-    attr_accessible :amount_in_cents, :api_call, :kb_payment_id, :litle_txn_id
+    attr_accessible :amount_in_cents, :currency, :api_call, :kb_payment_id, :litle_txn_id
 
     def self.from_kb_payment_id(kb_payment_id)
       single_transaction_from_kb_payment_id :charge, kb_payment_id

data/pom.xml

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

data/spec/litle/currency_conversion_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Killbill::Litle do
+
+  before :all do
+    Killbill::Litle.initialize!
+  end
+
+  it 'should not make currency conversion' do
+    Killbill::Litle.converted_currency(:USD).should be_false
+    Killbill::Litle.converted_currency('usd').should be_false
+    Killbill::Litle.converted_currency('USD').should be_false
+  end
+
+  it 'should make currency conversion' do
+    Killbill::Litle.converted_currency(:BRL).should == 'USD'
+    Killbill::Litle.converted_currency('brl').should == 'USD'
+    Killbill::Litle.converted_currency('BRL').should == 'USD'
+  end
+
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: killbill-litle
 version: !ruby/object:Gem::Version
-  version: 1.9.1
   prerelease:
+  version: 1.9.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.3
     none: false
   prerelease: false
   type: :runtime
@@ -31,13 +31,13 @@ dependencies:
   name: activemerchant
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.36.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.36.0
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: LitleOnline
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 8.16.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 8.16.0
     none: false
@@ -95,13 +95,13 @@ dependencies:
   name: xml-mapping
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
     none: false
@@ -111,13 +111,13 @@ dependencies:
   name: xml-object
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.93
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.93
     none: false
@@ -127,13 +127,13 @@ dependencies:
   name: activerecord-jdbcmysql-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.9
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.9
     none: false
@@ -143,13 +143,13 @@ dependencies:
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
@@ -159,13 +159,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
     none: false
@@ -175,13 +175,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -191,13 +191,13 @@ dependencies:
   name: activerecord-jdbcsqlite3-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
     none: false
@@ -209,8 +209,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Jarfile
 - NEWS
@@ -237,6 +237,7 @@ files:
 - pom.xml
 - release.sh
 - spec/litle/base_plugin_spec.rb
+- spec/litle/currency_conversion_spec.rb
 - spec/litle/litle_payment_method_spec.rb
 - spec/litle/remote/integration_spec.rb
 - spec/litle/utils_spec.rb
@@ -246,24 +247,25 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
       - 0
-      version: '0'
       hash: 2
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project:
@@ -273,6 +275,7 @@ specification_version: 3
 summary: Plugin to use Litle & Co. as a gateway.
 test_files:
 - spec/litle/base_plugin_spec.rb
+- spec/litle/currency_conversion_spec.rb
 - spec/litle/litle_payment_method_spec.rb
 - spec/litle/remote/integration_spec.rb
 - spec/litle/utils_spec.rb