killbill-litle 1.1.1 → 1.2.0

data/README.md

@@ -93,7 +93,9 @@ The plugin expects a `litle.yml` configuration file containing the following:
 
 ```
 :litle:
-  :merchant_id: 'your-merchant-id'
+  :merchant_id:
+    :USD: 'your-merchant-id-USD'  
+    :EUR: 'your-merchant-id-EURO'
   :password: 'your-password'
   :username: 'your-username'
   # Optional, if you are using PayPage

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/litle/api.rb

@@ -2,11 +2,10 @@ module Killbill::Litle
   class PaymentPlugin < Killbill::Plugin::Payment
     def start_plugin
       Killbill::Litle.initialize! @logger, @conf_dir, @kb_apis
-      @gateway = Killbill::Litle.gateway
 
       super
 
-      @logger.info "Killbill::Litle::PaymentPlugin started"
+      @logger.info 'Killbill::Litle::PaymentPlugin started'
     end
 
     # return DB connections to the Pool if required
@@ -30,7 +29,8 @@ module Killbill::Litle
       token = get_token(kb_payment_method_id)
 
       # Go to Litle
-      litle_response = @gateway.purchase amount_in_cents, ActiveMerchant::Billing::LitleGateway::LitleCardToken.new(:token => token), options
+      gateway = Killbill::Litle.gateway_for_currency(currency)
+      litle_response = gateway.purchase amount_in_cents, ActiveMerchant::Billing::LitleGateway::LitleCardToken.new(:token => token), options
       response = save_response_and_transaction litle_response, :charge, kb_payment_id, amount_in_cents
 
       response.to_payment_response
@@ -52,7 +52,8 @@ module Killbill::Litle
       options[:merchant] ||= report_group_for_currency(currency)
 
       # Go to Litle
-      litle_response = @gateway.credit amount_in_cents, litle_transaction.litle_txn_id, options
+      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
 
       response.to_refund_response
@@ -72,7 +73,10 @@ module Killbill::Litle
 
       # TODO Add support for real credit cards
       token = find_value_from_payment_method_props payment_method_props, 'paypageRegistrationId'
-      litle_response = @gateway.store token, options
+
+      currency = account_currency(kb_account_id)
+      gateway = Killbill::Litle.gateway_for_currency(currency)
+      litle_response = gateway.store token, options
       response = save_response_and_transaction litle_response, :add_payment_method
 
       if response.success
@@ -156,13 +160,17 @@ module Killbill::Litle
     end
 
     def report_group_for_account(kb_account_id)
-      account = @kb_apis.get_account_by_id(kb_account_id)
-      currency = account.currency
+      currency = account_currency(kb_account_id)
       report_group_for_currency(currency)
     rescue Killbill::Plugin::JKillbillApi::APINotAvailableError
       "Default Report Group"
     end
 
+    def account_currency(kb_account_id)
+      account = @kb_apis.get_account_by_id(kb_account_id)
+      account.currency
+    end
+
     def report_group_for_currency(currency)
       "Report Group for #{currency.respond_to?(:enum) ? currency.enum : currency.to_s}"
     end

data/lib/litle/config/application.rb

@@ -45,13 +45,16 @@ end
 post '/plugins/killbill-litle/checkout' do
   kb_account_id = request.POST['kb_account_id']
   response_paypage_registration_id = request.POST['response_paypage_registration_id']
+  # Allow currency override if needed
+  currency = request.POST['currency'] || plugin.get_currency(kb_account_id)
 
   {
       :kb_account_id => kb_account_id,
+      :currency => currency,
       :response_paypage_registration_id => response_paypage_registration_id
   }.each { |k, v| required_parameter! k, v }
 
-  pm = plugin.register_token! kb_account_id, response_paypage_registration_id
+  pm = plugin.register_token! kb_account_id, currency, response_paypage_registration_id
   redirect "/plugins/killbill-litle/1.0/pms/#{pm.id}"
 end
 

data/lib/litle/config/configuration.rb

@@ -3,7 +3,7 @@ require 'logger'
 module Killbill::Litle
   mattr_reader :logger
   mattr_reader :config
-  mattr_reader :gateway
+  mattr_reader :gateways
   mattr_reader :kb_apis
   mattr_reader :initialized
   mattr_reader :test
@@ -17,8 +17,7 @@ module Killbill::Litle
     @@config.parse!
     @@test = @@config[:litle][:test]
 
-    @@gateway = Killbill::Litle::Gateway.instance
-    @@gateway.configure(@@config[:litle])
+    @@gateways = Killbill::Litle::Gateway.from_config(@@config[:litle])
 
     if defined?(JRUBY_VERSION)
       # See https://github.com/jruby/activerecord-jdbc-adapter/issues/302
@@ -30,4 +29,11 @@ module Killbill::Litle
 
     @@initialized = true
   end
+
+  def self.gateway_for_currency(currency)
+    currency_sym = currency.respond_to?(:enum) ? currency.enum.upcase.to_sym : currency.to_s.upcase.to_sym
+    gateway = @@gateways[currency_sym]
+    raise "Gateway for #{currency} not configured!" if gateway.nil?
+    gateway
+  end
 end

data/lib/litle/litle/gateway.rb

@@ -1,8 +1,6 @@
 module Killbill::Litle
   class Gateway
-    include Singleton
-
-    def configure(config)
+    def self.from_config(config)
       if config[:test]
         ActiveMerchant::Billing::Base.mode = :test
       end
@@ -12,9 +10,18 @@ module Killbill::Litle
         ActiveMerchant::Billing::LitleGateway.wiredump_device.sync = true
       end
 
-      @gateway = ActiveMerchant::Billing::LitleGateway.new({ :user => config[:username],
-                                                             :merchant_id => config[:merchant_id],
-                                                             :password => config[:password]
+      gateways = {}
+      config[:merchant_id].each do |currency, mid|
+        gateways[currency.upcase.to_sym] = Gateway.new(currency, config[:username], config[:password], mid)
+      end
+      gateways
+    end
+
+    def initialize(currency, user, password, merchant_id)
+      @currency = currency
+      @gateway = ActiveMerchant::Billing::LitleGateway.new({:user => user,
+                                                            :password => password,
+                                                            :merchant_id => merchant_id
                                                            })
     end
 

data/lib/litle/private_api.rb

@@ -2,8 +2,8 @@ module Killbill::Litle
   class PrivatePaymentPlugin
     include Singleton
 
-    def register_token!(kb_account_id, paypage_registration_id, options = {})
-      litle_response = gateway.store paypage_registration_id, options
+    def register_token!(kb_account_id, currency, paypage_registration_id, options = {})
+      litle_response = gateway(currency).store paypage_registration_id, options
       response = save_response litle_response, :register_token
 
       if response.success
@@ -33,9 +33,9 @@ module Killbill::Litle
       response
     end
 
-    def gateway
+    def gateway(currency)
       # The gateway should have been configured when the plugin started
-      Killbill::Litle::Gateway.instance
+      Killbill::Litle.gateway_for_currency(currency)
     end
 
     def logger

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>litle-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.1</version>
+    <version>1.2.0</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/base_plugin_spec.rb

@@ -6,7 +6,8 @@ describe Killbill::Litle::PaymentPlugin do
       file = File.new(File.join(dir, 'litle.yml'), "w+")
       file.write(<<-eos)
 :litle:
-  :merchant_id: 'merchant_id'
+  :merchant_id:
+    :USD: 'merchant_id'
   :password: 'password'
 # As defined by spec_helper.rb
 :database:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-litle
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill