killbill-litle 1.9.4 → 1.9.5

data/.gitignore

@@ -27,9 +27,6 @@ Gemfile.lock
 # Build directory
 killbill-litle/
 
-# Config file
-litle.yml
-
 # Testing database
 test.db
 

data/NEWS

@@ -1,3 +1,6 @@
+1.9.5
+    Bug fixes for currency transaformation
+
 1.9.4
     Fix bugs in payment/refunds introduced during currency conversion
 

data/VERSION

@@ -1 +1 @@
-1.9.4
+1.9.5

data/lib/litle/api.rb

@@ -57,14 +57,14 @@ module Killbill::Litle
     def process_refund(kb_account_id, kb_payment_id, amount, currency, call_context = nil, options = {})
       amount_in_cents = (amount * 100).to_i
 
-      litle_transaction = LitleTransaction.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
-
-      # Set a default report group
-      options[:merchant] ||= report_group_for_currency(currency)
-
       # Check for currency conversion
       actual_amount, actual_currency = convert_amount_currency_if_required(amount_in_cents, currency, kb_payment_id)
 
+      litle_transaction = LitleTransaction.find_candidate_transaction_for_refund(kb_payment_id, actual_amount)
+
+      # Set a default report group
+      options[:merchant] ||= report_group_for_currency(actual_currency)
+
       # Go to Litle
       gateway = Killbill::Litle.gateway_for_currency(actual_currency)
       litle_response = gateway.credit actual_amount, litle_transaction.litle_txn_id, options
@@ -178,15 +178,15 @@ module Killbill::Litle
 
       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 ?
@@ -209,8 +209,9 @@ module Killbill::Litle
 
     def account_currency(kb_account_id)
       account = @kb_apis.account_user_api.get_account_by_id(kb_account_id, @kb_apis.create_context)
-      converted_currency = Killbill::Litle.converted_currency(account.currency)
-      converted_currency
+      #Killbill::Litle.converted_currency(account.currency)
+      # Use original currency on the account when creating the payment method
+      account.currency
     end
 
     def report_group_for_currency(currency)

data/lib/litle/models/litle_response.rb

@@ -89,7 +89,7 @@ module Killbill::Litle
     def to_killbill_response(type)
       if litle_transaction.nil?
         amount_in_cents = nil
-        currency = nill
+        currency = nil
         created_date = created_at
         first_payment_reference_id = nil
         second_payment_reference_id = nil

data/litle.yml

@@ -0,0 +1,16 @@
+:litle:
+  :test: True
+  :log_file: /var/tmp/litle.log
+  :username: YOYO
+  :password: certFoo
+  :merchant_id:
+      :USD: '064400'
+      :EUR: '064401'
+
+:database:
+  :adapter: sqlite3
+  :database: test.db
+
+:currency_conversions:
+  :BRL: 'USD'
+

data/pom.xml

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

metadata

@@ -2,7 +2,7 @@
 name: killbill-litle
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Kill Bill core team
@@ -234,6 +234,7 @@ files:
 - lib/litle/models/litle_transaction.rb
 - lib/litle/private_api.rb
 - lib/litle/views/paypage.erb
+- litle.yml
 - pom.xml
 - release.sh
 - spec/litle/base_plugin_spec.rb