killbill 3.1.3 → 3.1.4

data/lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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:     #
 #                                                                                 #
 #          http://www.apache.org/licenses/LICENSE-2.0                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/{payment_info_plugin.rb → payment_transaction_info_plugin.rb}

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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:     #
 #                                                                                 #
 #          http://www.apache.org/licenses/LICENSE-2.0                             #
 #                                                                                 #
@@ -28,11 +29,11 @@ module Killbill
     module Model
 
       java_package 'org.killbill.billing.payment.plugin.api'
-      class PaymentInfoPlugin
+      class PaymentTransactionInfoPlugin
 
-        include org.killbill.billing.payment.plugin.api.PaymentInfoPlugin
+        include org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin
 
-        attr_accessor :kb_payment_id, :amount, :currency, :created_date, :effective_date, :status, :gateway_error, :gateway_error_code, :first_payment_reference_id, :second_payment_reference_id, :properties
+        attr_accessor :kb_payment_id, :kb_transaction_payment_id, :transaction_type, :amount, :currency, :created_date, :effective_date, :status, :gateway_error, :gateway_error_code, :first_payment_reference_id, :second_payment_reference_id, :properties
 
         def initialize()
         end
@@ -41,6 +42,12 @@ module Killbill
           # conversion for kb_payment_id [type = java.util.UUID]
           @kb_payment_id = java.util.UUID.fromString(@kb_payment_id.to_s) unless @kb_payment_id.nil?
 
+          # conversion for kb_transaction_payment_id [type = java.util.UUID]
+          @kb_transaction_payment_id = java.util.UUID.fromString(@kb_transaction_payment_id.to_s) unless @kb_transaction_payment_id.nil?
+
+          # conversion for transaction_type [type = org.killbill.billing.payment.api.TransactionType]
+          @transaction_type = Java::org.killbill.billing.payment.api.TransactionType.value_of("#{@transaction_type.to_s}") unless @transaction_type.nil?
+
           # conversion for amount [type = java.math.BigDecimal]
           if @amount.nil?
             @amount = java.math.BigDecimal::ZERO
@@ -94,6 +101,14 @@ module Killbill
           @kb_payment_id = j_obj.kb_payment_id
           @kb_payment_id = @kb_payment_id.nil? ? nil : @kb_payment_id.to_s
 
+          # conversion for kb_transaction_payment_id [type = java.util.UUID]
+          @kb_transaction_payment_id = j_obj.kb_transaction_payment_id
+          @kb_transaction_payment_id = @kb_transaction_payment_id.nil? ? nil : @kb_transaction_payment_id.to_s
+
+          # conversion for transaction_type [type = org.killbill.billing.payment.api.TransactionType]
+          @transaction_type = j_obj.transaction_type
+          @transaction_type = @transaction_type.to_s.to_sym unless @transaction_type.nil?
+
           # conversion for amount [type = java.math.BigDecimal]
           @amount = j_obj.amount
           @amount = @amount.nil? ? 0 : BigDecimal.new(@amount.to_s)

data/lib/killbill/gen/plugin-api/require_gen.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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:     #
 #                                                                                 #
 #          http://www.apache.org/licenses/LICENSE-2.0                             #
 #                                                                                 #
@@ -31,5 +32,4 @@ require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/currency_plugin_api'
 require 'killbill/gen/plugin-api/gateway_notification'
 require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
-require 'killbill/gen/plugin-api/payment_info_plugin'
-require 'killbill/gen/plugin-api/refund_info_plugin'
+require 'killbill/gen/plugin-api/payment_transaction_info_plugin'

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

@@ -3,6 +3,7 @@ module Killbill
     module ActiveMerchant
       module ActiveRecord
         require 'active_record'
+        require 'active_merchant'
         require 'killbill/helpers/active_merchant/active_record/models/helpers'
 
         class PaymentMethod < ::ActiveRecord::Base
@@ -14,9 +15,9 @@ module Killbill
           def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = PaymentMethod)
             model.new({
                           :kb_account_id        => kb_account_id,
-                          :kb_tenant_id         => kb_tenant_id,
                           :kb_payment_method_id => kb_payment_method_id,
-                          :token                => response.authorization,
+                          :kb_tenant_id         => kb_tenant_id,
+                          :token                => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? response.authorization : (cc_or_token || response.authorization),
                           :cc_first_name        => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.first_name : nil,
                           :cc_last_name         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_name : nil,
                           :cc_type              => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.brand : nil,
@@ -34,7 +35,7 @@ module Killbill
 
           def self.from_kb_account_id(kb_account_id, kb_tenant_id)
             if kb_tenant_id.nil?
-              where('kb_account_id = ? AND is_deleted = ?', kb_account_id, false)
+              where('kb_account_id = ? AND kb_tenant_id is NULL 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
@@ -42,7 +43,7 @@ module Killbill
 
           def self.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
             if kb_tenant_id.nil?
-              payment_methods = where('kb_payment_method_id = ? AND is_deleted = ?', kb_payment_method_id, false)
+              payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id is NULL 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
@@ -117,7 +118,7 @@ module Killbill
             actual_limit = [pagination.max_nb_records, limit].min
             pagination.iterator = StreamyResultSet.new(actual_limit) do |offset,limit|
               self.find_by_sql(self.search_query(search_key, kb_tenant_id, offset, limit))
-                  .map(&:to_payment_method_response)
+                  .map(&:to_payment_method_plugin)
             end
             pagination
           end
@@ -132,43 +133,31 @@ module Killbill
             false
           end
 
-          def to_payment_method_response
+          def to_payment_method_plugin
             properties = []
-            properties << create_pm_kv_info('token', external_payment_method_id)
-            properties << create_pm_kv_info('ccName', cc_name)
-            properties << create_pm_kv_info('ccType', cc_type)
-            properties << create_pm_kv_info('ccExpirationMonth', cc_exp_month)
-            properties << create_pm_kv_info('ccExpirationYear', cc_exp_year)
-            properties << create_pm_kv_info('ccLast4', cc_last_4)
-            properties << create_pm_kv_info('address1', address1)
-            properties << create_pm_kv_info('address2', address2)
-            properties << create_pm_kv_info('city', city)
-            properties << create_pm_kv_info('state', state)
-            properties << create_pm_kv_info('zip', zip)
-            properties << create_pm_kv_info('country', country)
+            properties << create_plugin_property('token', external_payment_method_id)
+            properties << create_plugin_property('ccName', cc_name)
+            properties << create_plugin_property('ccType', cc_type)
+            properties << create_plugin_property('ccExpirationMonth', cc_exp_month)
+            properties << create_plugin_property('ccExpirationYear', cc_exp_year)
+            properties << create_plugin_property('ccLast4', cc_last_4)
+            properties << create_plugin_property('address1', address1)
+            properties << create_plugin_property('address2', address2)
+            properties << create_plugin_property('city', city)
+            properties << create_plugin_property('state', state)
+            properties << create_plugin_property('zip', zip)
+            properties << create_plugin_property('country', country)
 
             pm_plugin = Killbill::Plugin::Model::PaymentMethodPlugin.new
             pm_plugin.kb_payment_method_id = kb_payment_method_id
             pm_plugin.external_payment_method_id = external_payment_method_id
             pm_plugin.is_default_payment_method = is_default
             pm_plugin.properties = properties
-            pm_plugin.type = 'CreditCard'
-            pm_plugin.cc_name = cc_name
-            pm_plugin.cc_type = cc_type
-            pm_plugin.cc_expiration_month = cc_exp_month
-            pm_plugin.cc_expiration_year = cc_exp_year
-            pm_plugin.cc_last4 = cc_last_4
-            pm_plugin.address1 = address1
-            pm_plugin.address2 = address2
-            pm_plugin.city = city
-            pm_plugin.state = state
-            pm_plugin.zip = zip
-            pm_plugin.country = country
 
             pm_plugin
           end
 
-          def to_payment_method_info_response
+          def to_payment_method_info_plugin
             pm_info_plugin = Killbill::Plugin::Model::PaymentMethodInfoPlugin.new
             pm_info_plugin.account_id = kb_account_id
             pm_info_plugin.payment_method_id = kb_payment_method_id
@@ -191,11 +180,6 @@ module Killbill
 
           private
 
-          # Deprecated
-          def create_pm_kv_info(key, value)
-            create_plugin_property(key, value)
-          end
-
           def create_plugin_property(key, value)
             prop = Killbill::Plugin::Model::PluginProperty.new
             prop.key = key

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

@@ -13,58 +13,94 @@ module Killbill
 
           self.abstract_class = true
 
-          def self.from_response(api_call, kb_account_id, kb_payment_id, kb_tenant_id, response, extra_params = {}, model = Response)
+          def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, extra_params = {}, model = Response)
             model.new({
-                          :api_call                => api_call,
-                          :kb_account_id           => kb_account_id,
-                          :kb_payment_id           => kb_payment_id,
-                          :kb_tenant_id            => kb_tenant_id,
-                          :message                 => response.message,
-                          :authorization           => response.authorization,
-                          :fraud_review            => response.fraud_review?,
-                          :test                    => response.test?,
-                          :avs_result_code         => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.code : response.avs_result['code'],
-                          :avs_result_message      => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.message : response.avs_result['message'],
-                          :avs_result_street_match => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.street_match : response.avs_result['street_match'],
-                          :avs_result_postal_match => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.postal_match : response.avs_result['postal_match'],
-                          :cvv_result_code         => response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? response.cvv_result.code : response.cvv_result['code'],
-                          :cvv_result_message      => response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? response.cvv_result.message : response.cvv_result['message'],
-                          :success                 => response.success?
+                          :api_call                  => api_call,
+                          :kb_account_id             => kb_account_id,
+                          :kb_payment_id             => kb_payment_id,
+                          :kb_payment_transaction_id => kb_payment_transaction_id,
+                          :transaction_type          => transaction_type,
+                          :kb_tenant_id              => kb_tenant_id,
+                          :message                   => response.message,
+                          :authorization             => response.authorization,
+                          :fraud_review              => response.fraud_review?,
+                          :test                      => response.test?,
+                          :avs_result_code           => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.code : response.avs_result['code'],
+                          :avs_result_message        => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.message : response.avs_result['message'],
+                          :avs_result_street_match   => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.street_match : response.avs_result['street_match'],
+                          :avs_result_postal_match   => response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? response.avs_result.postal_match : response.avs_result['postal_match'],
+                          :cvv_result_code           => response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? response.cvv_result.code : response.cvv_result['code'],
+                          :cvv_result_message        => response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? response.cvv_result.message : response.cvv_result['message'],
+                          :success                   => response.success?
                       }.merge!(extra_params))
           end
 
-          def to_payment_response(transaction=nil)
-            to_killbill_response :payment, transaction
-          end
+          def to_transaction_info_plugin(transaction=nil)
+            if transaction.nil?
+              amount_in_cents = nil
+              currency        = nil
+              created_date    = created_at
+            else
+              amount_in_cents = transaction.amount_in_cents
+              currency        = transaction.currency
+              created_date    = transaction.created_at
+            end
 
-          def to_refund_response(transaction=nil)
-            to_killbill_response :refund, transaction
+            t_info_plugin                             = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
+            t_info_plugin.kb_payment_id               = kb_payment_id
+            t_info_plugin.kb_transaction_payment_id   = kb_payment_transaction_id
+            t_info_plugin.transaction_type            = transaction_type.nil? ? nil : transaction_type.to_sym
+            t_info_plugin.amount                      = Money.new(amount_in_cents, currency).to_d if currency
+            t_info_plugin.currency                    = currency
+            t_info_plugin.created_date                = created_date
+            t_info_plugin.effective_date              = effective_date
+            t_info_plugin.status                      = (success ? :PROCESSED : :ERROR)
+            t_info_plugin.gateway_error               = gateway_error
+            t_info_plugin.gateway_error_code          = gateway_error_code
+            t_info_plugin.first_payment_reference_id  = first_reference_id
+            t_info_plugin.second_payment_reference_id = second_reference_id
+
+            properties = []
+            properties << create_plugin_property('message', message)
+            properties << create_plugin_property('authorization', authorization)
+            properties << create_plugin_property('fraudReview', fraud_review)
+            properties << create_plugin_property('test', self.read_attribute(:test))
+            properties << create_plugin_property('avsResultCode', avs_result_code)
+            properties << create_plugin_property('avsResultMessage', avs_result_message)
+            properties << create_plugin_property('avsResultStreetMatch', avs_result_street_match)
+            properties << create_plugin_property('avsResultPostalMatch', avs_result_postal_match)
+            properties << create_plugin_property('cvvResultCode', cvv_result_code)
+            properties << create_plugin_property('cvvResultMessage', cvv_result_message)
+            properties << create_plugin_property('success', success)
+            t_info_plugin.properties = properties
+
+            t_info_plugin
           end
 
           # Override in your plugin if needed
-          def self.search_where_clause(t, search_key, api_call)
+          def self.search_where_clause(t, search_key)
             # Exact matches only
             where_clause = t[:kb_payment_id].eq(search_key)
+                       .or(t[:kb_payment_transaction_id].eq(search_key))
                        .or(t[:message].eq(search_key))
                        .or(t[:authorization].eq(search_key))
                        .or(t[:fraud_review].eq(search_key))
 
             # Only search successful payments and refunds
-            where_clause = where_clause.and(t[:api_call].eq(api_call))
-                                       .and(t[:success].eq(true))
+            where_clause = where_clause.and(t[:success].eq(true))
 
             where_clause
           end
 
           # VisibleForTesting
-          def self.search_query(api_call, search_key, kb_tenant_id, offset = nil, limit = nil)
+          def self.search_query(search_key, kb_tenant_id, offset = nil, limit = nil)
             t = self.arel_table
 
             if kb_tenant_id.nil?
-              query = t.where(search_where_clause(t, search_key, api_call))
+              query = t.where(search_where_clause(t, search_key))
               .order(t[:id])
             else
-              query = t.where(search_where_clause(t, search_key, api_call).and(t[:kb_tenant_id].eq(kb_tenant_id)))
+              query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
               .order(t[:id])
             end
 
@@ -81,18 +117,16 @@ module Killbill
             query
           end
 
-          def self.search(search_key, kb_tenant_id, offset = 0, limit = 100, type = :payment)
-            api_call                    = type == :payment ? 'charge' : 'refund'
+          def self.search(search_key, kb_tenant_id, offset = 0, limit = 100)
             pagination                  = ::Killbill::Plugin::Model::Pagination.new
             pagination.current_offset   = offset
-            pagination.total_nb_records = self.count_by_sql(self.search_query(api_call, search_key, kb_tenant_id))
-            pagination.max_nb_records   = self.where(:api_call => api_call, :success => true).count
+            pagination.total_nb_records = self.count_by_sql(self.search_query(search_key, kb_tenant_id))
+            pagination.max_nb_records   = self.where(:success => true).count
             pagination.next_offset      = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
             # Reduce the limit if the specified value is larger than the number of records
             actual_limit                = [pagination.max_nb_records, limit].min
             pagination.iterator         = ::Killbill::Plugin::ActiveMerchant::ActiveRecord::StreamyResultSet.new(actual_limit) do |offset, limit|
-              self.find_by_sql(self.search_query(api_call, search_key, kb_tenant_id, offset, limit))
-              .map { |x| type == :payment ? x.to_payment_response : x.to_refund_response }
+              self.find_by_sql(self.search_query(search_key, kb_tenant_id, offset, limit)).map { |x| x.to_transaction_info_plugin }
             end
             pagination
           end
@@ -102,16 +136,6 @@ module Killbill
             authorization
           end
 
-          # Override in your plugin if needed
-          def first_payment_reference_id
-            nil
-          end
-
-          # Override in your plugin if needed
-          def second_payment_reference_id
-            nil
-          end
-
           # Override in your plugin if needed
           def first_reference_id
             nil
@@ -139,44 +163,11 @@ module Killbill
 
           private
 
-          def to_killbill_response(type, transaction)
-            if transaction.nil?
-              amount_in_cents = nil
-              currency        = nil
-              created_date    = created_at
-            else
-              amount_in_cents = transaction.amount_in_cents
-              currency        = transaction.currency
-              created_date    = transaction.created_at
-            end
-
-            if type == :payment
-              p_info_plugin                             = Killbill::Plugin::Model::PaymentInfoPlugin.new
-              p_info_plugin.kb_payment_id               = kb_payment_id
-              p_info_plugin.amount                      = Money.new(amount_in_cents, currency).to_d if currency
-              p_info_plugin.currency                    = currency
-              p_info_plugin.created_date                = created_date
-              p_info_plugin.effective_date              = effective_date
-              p_info_plugin.status                      = (success ? :PROCESSED : :ERROR)
-              p_info_plugin.gateway_error               = gateway_error
-              p_info_plugin.gateway_error_code          = gateway_error_code
-              p_info_plugin.first_payment_reference_id  = first_reference_id
-              p_info_plugin.second_payment_reference_id = second_reference_id
-              p_info_plugin
-            else
-              r_info_plugin                            = Killbill::Plugin::Model::RefundInfoPlugin.new
-              r_info_plugin.kb_payment_id              = kb_payment_id
-              r_info_plugin.amount                     = Money.new(amount_in_cents, currency).to_d if currency
-              r_info_plugin.currency                   = currency
-              r_info_plugin.created_date               = created_date
-              r_info_plugin.effective_date             = effective_date
-              r_info_plugin.status                     = (success ? :PROCESSED : :ERROR)
-              r_info_plugin.gateway_error              = gateway_error
-              r_info_plugin.gateway_error_code         = gateway_error_code
-              r_info_plugin.first_refund_reference_id  = first_reference_id
-              r_info_plugin.second_refund_reference_id = second_reference_id
-              r_info_plugin
-            end
+          def create_plugin_property(key, value)
+            prop       = Killbill::Plugin::Model::PluginProperty.new
+            prop.key   = key
+            prop.value = value
+            prop
           end
         end
       end

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

@@ -8,62 +8,81 @@ module Killbill
 
           self.abstract_class = true
 
-          def self.authorization_from_kb_payment_id(kb_payment_id, kb_tenant_id)
-            transaction_from_kb_payment_id :authorize, kb_payment_id, kb_tenant_id, :single
-          end
+          class << self
+            def transactions_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+              where(:kb_payment_id => kb_payment_id, :kb_tenant_id => kb_tenant_id).order(:created_at)
+            end
 
-          def self.charge_from_kb_payment_id(kb_payment_id, kb_tenant_id)
-            transaction_from_kb_payment_id :charge, kb_payment_id, kb_tenant_id, :single
-          end
+            [:authorize, :capture, :purchase, :credit, :refund].each do |transaction_type|
+              define_method("#{transaction_type.to_s}s_from_kb_payment_id") do |kb_payment_id, kb_tenant_id|
+                transaction_from_kb_payment_id(transaction_type.to_s.upcase, kb_payment_id, kb_tenant_id, :multiple)
+              end
+            end
 
-          def self.refunds_from_kb_payment_id(kb_payment_id, kb_tenant_id)
-            transaction_from_kb_payment_id :refund, kb_payment_id, kb_tenant_id, :multiple
-          end
+            # For convenience
+            alias_method :authorizations_from_kb_payment_id, :authorizes_from_kb_payment_id
 
-          def self.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, amount_in_cents)
-            begin
-              do_find_candidate_transaction_for_refund :authorize, kb_payment_id, kb_tenant_id, amount_in_cents
-            rescue
-              do_find_candidate_transaction_for_refund :charge, kb_payment_id, kb_tenant_id, amount_in_cents
+            # void is special: unique void per payment_id
+            def void_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+              transaction_from_kb_payment_id(:VOID, kb_payment_id, kb_tenant_id, :single)
             end
-          end
 
-          def self.do_find_candidate_transaction_for_refund(api_call, kb_payment_id, kb_tenant_id, amount_in_cents)
+            def from_kb_payment_transaction_id(kb_payment_transaction_id, kb_tenant_id)
+              transaction_from_kb_payment_transaction_id(nil, kb_payment_transaction_id, kb_tenant_id, :single)
+            end
 
-            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)
+            def find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, amount_in_cents)
+              begin
+                do_find_candidate_transaction_for_refund(:authorize, kb_payment_id, kb_tenant_id, amount_in_cents)
+              rescue
+                do_find_candidate_transaction_for_refund(:purchase, kb_payment_id, kb_tenant_id, amount_in_cents)
+              end
             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
 
-            # We have candidates, but we now need to make sure we didn't refund more than for the specified amount
-            amount_refunded_in_cents = where('api_call = ? and kb_payment_id = ?', :refund, kb_payment_id)
-                                       .sum('amount_in_cents')
+            private
 
-            amount_left_to_refund_in_cents = -amount_refunded_in_cents
-            transactions.map { |transaction| amount_left_to_refund_in_cents += transaction.amount_in_cents }
-            raise "Amount #{amount_in_cents} too large to refund for payment #{kb_payment_id}" if amount_left_to_refund_in_cents < amount_in_cents
+            def do_find_candidate_transaction_for_refund(api_call, kb_payment_id, kb_tenant_id, amount_in_cents)
+              # Find one successful charge which amount is at least the amount we are trying to refund
+              if kb_tenant_id.nil?
+                transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id is NULL AND kb_payment_id = ?', amount_in_cents, api_call, kb_payment_id).order(:created_at)
+              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).order(:created_at)
+              end
+              raise "Unable to find transaction for payment #{kb_payment_id} and api_call #{api_call}" if transactions.size == 0
 
-            transactions.first
-          end
+              # We have candidates, but we now need to make sure we didn't refund more than for the specified amount
+              amount_refunded_in_cents = where('api_call = ? and kb_payment_id = ?', :refund, kb_payment_id)
+                                         .sum('amount_in_cents')
 
-          private
+              amount_left_to_refund_in_cents = -amount_refunded_in_cents
+              transactions.map { |transaction| amount_left_to_refund_in_cents += transaction.amount_in_cents }
+              raise "Amount #{amount_in_cents} too large to refund for payment #{kb_payment_id}" if amount_left_to_refund_in_cents < amount_in_cents
 
-          def self.transaction_from_kb_payment_id(api_call, kb_payment_id, kb_tenant_id, how_many)
-            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)
+              transactions.first
             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
-              transactions[0]
-            else
-              transactions
+
+            [:kb_payment_id, :kb_payment_transaction_id].each do |attribute|
+              define_method("transaction_from_#{attribute.to_s}") do |transaction_type, attribute_value, kb_tenant_id, how_many|
+                if kb_tenant_id.nil?
+                  if transaction_type.nil?
+                    transactions = where("kb_tenant_id is NULL AND #{attribute.to_s} = ?", attribute_value).order(:created_at)
+                  else
+                    transactions = where("transaction_type = ? AND kb_tenant_id is NULL AND #{attribute.to_s} = ?", transaction_type, attribute_value).order(:created_at)
+                  end
+                else
+                  if transaction_type.nil?
+                    transactions = where("kb_tenant_id = ? AND #{attribute.to_s} = ?", kb_tenant_id, attribute_value).order(:created_at)
+                  else
+                    transactions = where("transaction_type = ? AND kb_tenant_id = ? AND #{attribute.to_s} = ?", transaction_type, kb_tenant_id, attribute_value).order(:created_at)
+                  end
+                end
+                if how_many == :single
+                  raise "Kill Bill #{attribute} = #{attribute_value} mapping to multiple plugin transactions" if transactions.size > 1
+                  transactions[0]
+                else
+                  transactions
+                end
+              end
             end
           end
         end