killbill 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3dc2f6f6f18ecb0b78208ee9b4866ab4e64135
-  data.tar.gz: 67e7e0f1fc22c8bd8ac6f673226a281ee77a6d44
+  metadata.gz: 82a09a7d410fc5aff99f49e2ff2b4426e8b951b7
+  data.tar.gz: db04bda5377c39f74d59c7315056a859754c59cd
 SHA512:
-  metadata.gz: a0a93615aea2fbfe61c7239ff7ebce66c6c281ee49f085b20f04718e0994fb32ecc02bc426150665c0e5a25ea1c5061f251bb3ea259780e29c5dd252f1be7373
-  data.tar.gz: 54bf15ca7cf02ab75b3644da9bdb4101a04d58439b0d0deccf12736e3f4cc1231370cd29ae806d3293e205fa1a48b108a75a72060d179be97ccbb08b9a6e9033
+  metadata.gz: a98a498e8a8260ef655e34b48d5e2abcca0d5817e58d45ed6e853405ae8679f27a8891b4491211fe42ab7744c3c27a5b81697c6a36bb1d761e4fc9f7c1918e8b
+  data.tar.gz: 963f49b07a89afaaeb6fc4b584da8c61dabb7fc49ad417de918607af92f0da705b2e685e763260e3589bd1e94e2cda140463a452ab643a5fe6c544b069ca5172

data/NEWS

@@ -1,3 +1,6 @@
+3.1.3
+    Minor change for non multi tenant environment
+
 3.1.2
     Make ActiveMerchant plugins multi-tenant
     Add support for ActiveMerchant integrations

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.1.3

data/generators/active_merchant/templates/pom.xml.rb

@@ -2,7 +2,7 @@
 <!--
 ~ Copyright 2014 The Billing Project, LLC
 ~
-~  Ning licenses this file to you under the Apache License, version 2.0
+~  The Billing Project licenses this file to you under the Apache License, version 2.0
 ~  (the "License"); you may not use this file except in compliance with the
 ~  License.  You may obtain a copy of the License at:
 ~

data/lib/killbill/helpers/active_merchant/active_record/models/payment_method.rb

@@ -33,11 +33,19 @@ module Killbill
           end
 
           def self.from_kb_account_id(kb_account_id, kb_tenant_id)
-            where('kb_account_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_account_id, kb_tenant_id, false)
+            if kb_tenant_id.nil?
+              where('kb_account_id = ? AND is_deleted = ?', kb_account_id, false)
+            else
+              where('kb_account_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_account_id, kb_tenant_id, false)
+            end
           end
 
           def self.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
-            payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_payment_method_id, kb_tenant_id, false)
+            if kb_tenant_id.nil?
+              payment_methods = where('kb_payment_method_id = ? AND is_deleted = ?', kb_payment_method_id, false)
+            else
+              payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_payment_method_id, kb_tenant_id, false)
+            end
             raise "No payment method found for payment method #{kb_payment_method_id}" if payment_methods.empty?
             raise "Kill Bill payment method #{kb_payment_method_id} mapping to multiple active plugin payment methods" if payment_methods.size > 1
             payment_methods[0]
@@ -78,8 +86,13 @@ module Killbill
           def self.search_query(search_key, kb_tenant_id, offset = nil, limit = nil)
             t = self.arel_table
 
-            query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
-                     .order(t[:id])
+            if kb_tenant_id.nil?
+              query = t.where(search_where_clause(t, search_key))
+              .order(t[:id])
+            else
+              query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
+              .order(t[:id])
+            end
 
             if offset.blank? and limit.blank?
               # true is for count distinct

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -60,8 +60,13 @@ module Killbill
           def self.search_query(api_call, search_key, kb_tenant_id, offset = nil, limit = nil)
             t = self.arel_table
 
-            query = t.where(search_where_clause(t, search_key, api_call).and(t[:kb_tenant_id].eq(kb_tenant_id)))
-                     .order(t[:id])
+            if kb_tenant_id.nil?
+              query = t.where(search_where_clause(t, search_key, api_call))
+              .order(t[:id])
+            else
+              query = t.where(search_where_clause(t, search_key, api_call).and(t[:kb_tenant_id].eq(kb_tenant_id)))
+              .order(t[:id])
+            end
 
             if offset.blank? and limit.blank?
               # true is for count distinct

data/lib/killbill/helpers/active_merchant/active_record/models/transaction.rb

@@ -29,6 +29,12 @@ module Killbill
           end
 
           def self.do_find_candidate_transaction_for_refund(api_call, kb_payment_id, kb_tenant_id, amount_in_cents)
+
+            if kb_tenant_id.nil?
+              transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_payment_id = ?', amount_in_cents, api_call, kb_payment_id)
+            else
+              transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', amount_in_cents, api_call, kb_tenant_id, kb_payment_id)
+            end
             # Find one successful charge which amount is at least the amount we are trying to refund
             transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', amount_in_cents, api_call, kb_tenant_id, kb_payment_id)
             raise "Unable to find transaction for payment #{kb_payment_id} and api_call #{api_call}" if transactions.size == 0
@@ -47,7 +53,11 @@ module Killbill
           private
 
           def self.transaction_from_kb_payment_id(api_call, kb_payment_id, kb_tenant_id, how_many)
-            transactions = where('api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', api_call, kb_tenant_id, kb_payment_id)
+            if kb_tenant_id.nil?
+              transactions = where('api_call = ? AND kb_payment_id = ?', api_call, kb_payment_id)
+            else
+              transactions = where('api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', api_call, kb_tenant_id, kb_payment_id)
+            end
             raise "Unable to find transaction id for payment #{kb_payment_id}" if transactions.empty?
             if how_many == :single
               raise "Kill Bill payment #{kb_payment_id} mapping to multiple plugin transactions" if transactions.size > 1

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -310,7 +310,7 @@ module Killbill
           }
 
           # Retrieve the ActiveMerchant integration
-          integration_module = ::ActiveMerchant::Billing::Integrations.const_get(@identifier.to_s.camelize)
+          integration_module = get_active_merchant_module
           service_class = integration_module.const_get('Helper')
           service = service_class.new(order, account, service_options)
 
@@ -353,7 +353,7 @@ module Killbill
           options = properties_to_hash(properties)
 
           # Retrieve the ActiveMerchant integration
-          integration_module = ::ActiveMerchant::Billing::Integrations.const_get(@identifier.to_s.camelize)
+          integration_module = get_active_merchant_module
           service_class = integration_module.const_get('Notification')
           # notification is either a body or a query string
           service = service_class.new(notification, options)
@@ -453,6 +453,10 @@ module Killbill
           end
           properties
         end
+
+        def get_active_merchant_module
+          ::ActiveMerchant::Billing::Integrations.const_get(@identifier.to_s.camelize)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra