killbill 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd154059c01dd7e7ec40938f0b30249bec32030b
-  data.tar.gz: f1e2f74e199f56c257dac3ae427bbc268c60de65
+  metadata.gz: 4267aac031e411928647f3f7958a91afb9bef67a
+  data.tar.gz: 9027ef5b616bd146e07386d67120b9fea7120c03
 SHA512:
-  metadata.gz: 739d5e790759d50a5bea73a79c143c49b5543ff7addd19d6b1496ece7ced5fa10bf332f5d4665e94c4471781f71a042fa2c76e1b9b76538685b90a3957e52685
-  data.tar.gz: 065200616fd8c310892d03440b2309cbf9d128e43e3469208ab13a0250348b5c5d4d56d42dbb3fe039e4cf6481376c7203ae48d805b810417a56d52cbf863a56
+  metadata.gz: 5a8cc8856a04eac9d2161b6ac28d35acf0f3a6bc0e6898e19aec5f87bf9a6d02b80ab02ab5d37471eec6afe35f49f5bc99e3f39f18e2906eddb7450881db713e
+  data.tar.gz: 42c3432815d7f6f94fecd91152ae2234dd77a3e5be840c34a3eb5b46c43ba58270e71fa46d0337ecdabe2207be22ab1fb2a76460ec0205f03026df0813dbc610

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (5.1.0)
+    killbill (5.2.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -50,7 +50,7 @@ GEM
     erubis (2.7.0)
     ethon (0.7.4)
       ffi (>= 1.3.0)
-    ffi (1.9.10-java)
+    ffi (1.9.9-java)
     i18n (0.7.0)
     jbundler (0.4.3)
       maven-tools (~> 0.32.1)
@@ -129,6 +129,3 @@ DEPENDENCIES
   rspec (~> 2.12.0)
   thor (~> 0.19.1)
   thread_safe (~> 0.3.4)
-
-BUNDLED WITH
-   1.10.6

data/Jarfile

@@ -1,11 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
+jar 'org.kill-bill.billing:killbill-api', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.16'
 jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,13 +1,13 @@
-org.kill-bill.billing:killbill-api:jar:0.19
+org.kill-bill.billing:killbill-api:jar:0.23
 com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.12
-org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.15
 org.kill-bill.billing:killbill-util:jar:tests:0.14.0
 com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
 com.fasterxml.jackson.core:jackson-core:jar:2.4.3

data/NEWS

@@ -1,3 +1,6 @@
+5.2.0
+    Regenerate files for killbill-api 0.23 and killbill-plugin-api 0.16
+
 5.1.0
     Fix missing require file
 

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,11 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
+jar 'org.kill-bill.billing:killbill-api', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.16'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.16'
 jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/lib/killbill/gen/api/account.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.Account
 
-        attr_accessor :id, :created_date, :updated_date, :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
+        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
 
         def initialize()
         end
@@ -58,6 +58,14 @@ module Killbill
           # conversion for external_key [type = java.lang.String]
           @external_key = @external_key.to_s unless @external_key.nil?
 
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          if !@time_zone.nil?
+            @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
+          end
+
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
@@ -70,17 +78,9 @@ module Killbill
           # conversion for bill_cycle_day_local [type = java.lang.Integer]
           @bill_cycle_day_local = @bill_cycle_day_local
 
-          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
-
           # conversion for payment_method_id [type = java.util.UUID]
           @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
 
-          # conversion for time_zone [type = org.joda.time.DateTimeZone]
-          if !@time_zone.nil?
-            @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
-          end
-
           # conversion for locale [type = java.lang.String]
           @locale = @locale.to_s unless @locale.nil?
 
@@ -140,6 +140,16 @@ module Killbill
           # conversion for external_key [type = java.lang.String]
           @external_key = j_obj.external_key
 
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = j_obj.currency
+          @currency = @currency.to_s.to_sym unless @currency.nil?
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          @time_zone = j_obj.time_zone
+          if !@time_zone.nil?
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+          end
+
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 
@@ -152,20 +162,10 @@ module Killbill
           # conversion for bill_cycle_day_local [type = java.lang.Integer]
           @bill_cycle_day_local = j_obj.bill_cycle_day_local
 
-          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = j_obj.currency
-          @currency = @currency.to_s.to_sym unless @currency.nil?
-
           # conversion for payment_method_id [type = java.util.UUID]
           @payment_method_id = j_obj.payment_method_id
           @payment_method_id = @payment_method_id.nil? ? nil : @payment_method_id.to_s
 
-          # conversion for time_zone [type = org.joda.time.DateTimeZone]
-          @time_zone = j_obj.time_zone
-          if !@time_zone.nil?
-            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
-          end
-
           # conversion for locale [type = java.lang.String]
           @locale = j_obj.locale
 

data/lib/killbill/gen/api/dry_run_arguments.rb

@@ -34,12 +34,15 @@ module Killbill
 
         include org.killbill.billing.invoice.api.DryRunArguments
 
-        attr_accessor :plan_phase_specifier, :action, :subscription_id, :effective_date, :bundle_id, :billing_action_policy, :plan_phase_priceoverrides
+        attr_accessor :dry_run_type, :plan_phase_specifier, :action, :subscription_id, :effective_date, :bundle_id, :billing_action_policy, :plan_phase_price_overrides
 
         def initialize()
         end
 
         def to_java()
+          # conversion for dry_run_type [type = org.killbill.billing.invoice.api.DryRunType]
+          @dry_run_type = Java::org.killbill.billing.invoice.api.DryRunType.value_of( @dry_run_type.to_s ) unless @dry_run_type.nil?
+
           # conversion for plan_phase_specifier [type = org.killbill.billing.catalog.api.PlanPhaseSpecifier]
           @plan_phase_specifier = @plan_phase_specifier.to_java unless @plan_phase_specifier.nil?
 
@@ -61,18 +64,22 @@ module Killbill
           # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           @billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @billing_action_policy.to_s ) unless @billing_action_policy.nil?
 
-          # conversion for plan_phase_priceoverrides [type = java.util.List]
+          # conversion for plan_phase_price_overrides [type = java.util.List]
           tmp = java.util.ArrayList.new
-          (@plan_phase_priceoverrides || []).each do |m|
+          (@plan_phase_price_overrides || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhasePriceOverride]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          @plan_phase_priceoverrides = tmp
+          @plan_phase_price_overrides = tmp
           self
         end
 
         def to_ruby(j_obj)
+          # conversion for dry_run_type [type = org.killbill.billing.invoice.api.DryRunType]
+          @dry_run_type = j_obj.dry_run_type
+          @dry_run_type = @dry_run_type.to_s.to_sym unless @dry_run_type.nil?
+
           # conversion for plan_phase_specifier [type = org.killbill.billing.catalog.api.PlanPhaseSpecifier]
           @plan_phase_specifier = j_obj.plan_phase_specifier
           @plan_phase_specifier = Killbill::Plugin::Model::PlanPhaseSpecifier.new.to_ruby(@plan_phase_specifier) unless @plan_phase_specifier.nil?
@@ -101,15 +108,15 @@ module Killbill
           @billing_action_policy = j_obj.billing_action_policy
           @billing_action_policy = @billing_action_policy.to_s.to_sym unless @billing_action_policy.nil?
 
-          # conversion for plan_phase_priceoverrides [type = java.util.List]
-          @plan_phase_priceoverrides = j_obj.plan_phase_priceoverrides
+          # conversion for plan_phase_price_overrides [type = java.util.List]
+          @plan_phase_price_overrides = j_obj.plan_phase_price_overrides
           tmp = []
-          (@plan_phase_priceoverrides || []).each do |m|
+          (@plan_phase_price_overrides || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhasePriceOverride]
             m = Killbill::Plugin::Model::PlanPhasePriceOverride.new.to_ruby(m) unless m.nil?
             tmp << m
           end
-          @plan_phase_priceoverrides = tmp
+          @plan_phase_price_overrides = tmp
           self
         end
 

data/lib/killbill/gen/api/immutable_account_data.rb

@@ -0,0 +1,82 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      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                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.account.api'
+      class ImmutableAccountData
+
+        include org.killbill.billing.account.api.ImmutableAccountData
+
+        attr_accessor :id, :external_key, :currency, :time_zone
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for id [type = java.util.UUID]
+          @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = @external_key.to_s unless @external_key.nil?
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          if !@time_zone.nil?
+            @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
+          end
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for id [type = java.util.UUID]
+          @id = j_obj.id
+          @id = @id.nil? ? nil : @id.to_s
+
+          # conversion for external_key [type = java.lang.String]
+          @external_key = j_obj.external_key
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = j_obj.currency
+          @currency = @currency.to_s.to_sym unless @currency.nil?
+
+          # conversion for time_zone [type = org.joda.time.DateTimeZone]
+          @time_zone = j_obj.time_zone
+          if !@time_zone.nil?
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/gen/api/invoice_payment.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.invoice.api.InvoicePayment
 
-        attr_accessor :id, :created_date, :updated_date, :payment_id, :type, :invoice_id, :payment_date, :amount, :currency, :linked_invoice_payment_id, :payment_cookie_id, :processed_currency
+        attr_accessor :id, :created_date, :updated_date, :payment_id, :type, :invoice_id, :payment_date, :amount, :currency, :linked_invoice_payment_id, :payment_cookie_id, :processed_currency, :is_success
 
         def initialize()
         end
@@ -88,6 +88,9 @@ module Killbill
 
           # conversion for processed_currency [type = org.killbill.billing.catalog.api.Currency]
           @processed_currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @processed_currency.to_s ) unless @processed_currency.nil?
+
+          # conversion for is_success [type = java.lang.Boolean]
+          @is_success = @is_success.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_success)
           self
         end
 
@@ -150,6 +153,15 @@ module Killbill
           # conversion for processed_currency [type = org.killbill.billing.catalog.api.Currency]
           @processed_currency = j_obj.processed_currency
           @processed_currency = @processed_currency.to_s.to_sym unless @processed_currency.nil?
+
+          # conversion for is_success [type = java.lang.Boolean]
+          @is_success = j_obj.is_success
+          if @is_success.nil?
+            @is_success = false
+          else
+            tmp_bool = (@is_success.java_kind_of? java.lang.Boolean) ? @is_success.boolean_value : @is_success
+            @is_success = tmp_bool ? true : false
+          end
           self
         end
 

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

@@ -30,6 +30,7 @@ require 'killbill/gen/api/account_api_exception'
 require 'killbill/gen/api/account_data'
 require 'killbill/gen/api/account_email'
 require 'killbill/gen/api/account_user_api'
+require 'killbill/gen/api/immutable_account_data'
 require 'killbill/gen/api/mutable_account_data'
 require 'killbill/gen/api/billing_exception_base'
 require 'killbill/gen/api/block'

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

@@ -40,12 +40,20 @@ module Killbill
         end
 
 
-        java_signature 'Java::java.util.List getAdditionalInvoiceItems(Java::org.killbill.billing.invoice.api.Invoice, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def get_additional_invoice_items(invoice, properties, context)
+        java_signature 'Java::java.util.List getAdditionalInvoiceItems(Java::org.killbill.billing.invoice.api.Invoice, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def get_additional_invoice_items(invoice, dryRun, properties, context)
 
           # conversion for invoice [type = org.killbill.billing.invoice.api.Invoice]
           invoice = Killbill::Plugin::Model::Invoice.new.to_ruby(invoice) unless invoice.nil?
 
+          # conversion for dryRun [type = boolean]
+          if dryRun.nil?
+            dryRun = false
+          else
+            tmp_bool = (dryRun.java_kind_of? java.lang.Boolean) ? dryRun.boolean_value : dryRun
+            dryRun = tmp_bool ? true : false
+          end
+
           # conversion for properties [type = java.lang.Iterable]
           tmp = []
           (properties.nil? ? [] : properties.iterator).each do |m|
@@ -58,7 +66,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.get_additional_invoice_items(invoice, properties, context)
+            res = @delegate_plugin.get_additional_invoice_items(invoice, dryRun, properties, context)
             # conversion for res [type = java.util.List]
             tmp = java.util.ArrayList.new
             (res || []).each do |m|

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

@@ -43,36 +43,25 @@ module Killbill
               transaction_from_kb_payment_transaction_id(nil, kb_payment_transaction_id, kb_tenant_id, :single)
             end
 
-            def find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, amount_in_cents, transaction_type = nil)
+            def find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, transaction_type = nil)
               if transaction_type.nil?
-                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
+                find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, :AUTHORIZE) || find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, :PURCHASE)
               else
-                do_find_candidate_transaction_for_refund(transaction_type, kb_payment_id, kb_tenant_id, amount_in_cents)
+                do_find_candidate_transaction_for_refund(transaction_type, kb_payment_id, kb_tenant_id)
               end
             end
 
             private
 
-            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
+            # Note: this does not check any amount, as the behavior is gateway specific (some allow to refund more than what was captured):
+            # we just want to find the reference transaction to pass the id to the gateway
+            def do_find_candidate_transaction_for_refund(transaction_type, kb_payment_id, kb_tenant_id)
+              # Assume the last one was successful
               if kb_tenant_id.nil?
-                transactions = where("amount_in_cents >= #{@@quotes_cache[amount_in_cents]} AND api_call = #{@@quotes_cache[api_call]} AND kb_tenant_id is NULL AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at)
+                transactions = where("transaction_type = #{@@quotes_cache[transaction_type]} AND kb_tenant_id is NULL AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at => :desc)
               else
-                transactions = where("amount_in_cents >= #{@@quotes_cache[amount_in_cents]} AND api_call = #{@@quotes_cache[api_call]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at)
+                transactions = where("transaction_type = #{@@quotes_cache[transaction_type]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at => :desc)
               end
-              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 = #{@@quotes_cache['refund']} and kb_payment_id = #{@@quotes_cache[kb_payment_id]}").sum('amount_in_cents')
-
-              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
-
               transactions.first
             end
 

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

@@ -129,7 +129,8 @@ module Killbill
 
           linked_transaction_proc = Proc.new do |amount_in_cents, options|
             linked_transaction_type = find_value_from_properties(properties, :linked_transaction_type)
-            transaction             = @transaction_model.find_candidate_transaction_for_refund(kb_payment_id, context.tenant_id, amount_in_cents, linked_transaction_type)
+            transaction             = @transaction_model.find_candidate_transaction_for_refund(kb_payment_id, context.tenant_id, linked_transaction_type)
+            # This should never happen
             raise "Unable to retrieve transaction to refund for operation=refund, kb_payment_id=#{kb_payment_id}, kb_payment_transaction_id=#{kb_payment_transaction_id}, kb_payment_method_id=#{kb_payment_method_id}" if transaction.nil?
             transaction
           end

data/lib/killbill/invoice.rb

@@ -5,7 +5,7 @@ module Killbill
   module Plugin
     class Invoice < Notification
 
-      def get_additional_invoice_items(invoice, properties, context)
+      def get_additional_invoice_items(invoice, dry_run, properties, context)
         []
       end
 

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -114,6 +114,33 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
       plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
     end
 
+    # https://github.com/killbill/killbill-plugin-framework-ruby/issues/51
+    it 'supports multiple refunds regardless of the amount against auth' do
+      ptip = trigger_auth(@properties)
+      verify_auth_status(ptip, :PROCESSED)
+
+      ptip = trigger_capture(@properties)
+      verify_capture_status(ptip, :PROCESSED)
+
+      ptip = trigger_refund(@properties)
+      verify_refund_status(ptip, :PROCESSED)
+
+      ptip = trigger_refund(@properties)
+      verify_refund_status(ptip, :PROCESSED)
+    end
+
+    # https://github.com/killbill/killbill-plugin-framework-ruby/issues/51
+    it 'supports multiple refunds regardless of the amount against purchase' do
+      ptip = trigger_purchase(@properties)
+      verify_purchase_status(ptip, :PROCESSED)
+
+      ptip = trigger_refund(@properties)
+      verify_refund_status(ptip, :PROCESSED)
+
+      ptip = trigger_refund(@properties)
+      verify_refund_status(ptip, :PROCESSED)
+    end
+
     it 'should support different payment_processor_account_ids' do
       plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
 
@@ -485,13 +512,46 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
 
   private
 
+  def add_payment_method_if_needed(pm_properties = [])
+    plugin.get_payment_method_detail(@kb_account_id, @kb_payment_method_id, pm_properties, @call_context) rescue plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, pm_properties, @call_context)
+  end
+
   def trigger_purchase(purchase_properties=[], kb_payment_transaction_id=SecureRandom.uuid)
-    plugin.get_payment_method_detail(@kb_account_id, @kb_payment_method_id, [], @call_context) rescue plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, [], @call_context)
+    add_payment_method_if_needed(purchase_properties)
     plugin.purchase_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, purchase_properties, @call_context)
   end
 
+  def trigger_auth(auth_properties=[], kb_payment_transaction_id=SecureRandom.uuid)
+    add_payment_method_if_needed(auth_properties)
+    plugin.authorize_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, auth_properties, @call_context)
+  end
+
+  def trigger_capture(capture_properties=[], kb_payment_transaction_id=SecureRandom.uuid)
+    plugin.capture_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, capture_properties, @call_context)
+  end
+
+  def trigger_refund(refund_properties=[], kb_payment_transaction_id=SecureRandom.uuid)
+    plugin.refund_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, refund_properties, @call_context)
+  end
+
+  def verify_transaction_status(t_info_plugin, status, transaction_type)
+    verify_transaction_info_plugin(t_info_plugin, t_info_plugin.kb_transaction_payment_id, transaction_type, nil, 'default', status)
+  end
+
   def verify_purchase_status(t_info_plugin, status)
-    verify_transaction_info_plugin(t_info_plugin, t_info_plugin.kb_transaction_payment_id, :PURCHASE, nil, 'default', status)
+    verify_transaction_status(t_info_plugin, status, :PURCHASE)
+  end
+
+  def verify_auth_status(t_info_plugin, status)
+    verify_transaction_status(t_info_plugin, status, :AUTHORIZE)
+  end
+
+  def verify_capture_status(t_info_plugin, status)
+    verify_transaction_status(t_info_plugin, status, :CAPTURE)
+  end
+
+  def verify_refund_status(t_info_plugin, status)
+    verify_transaction_status(t_info_plugin, status, :REFUND)
   end
 
   def verify_transaction_info_plugin(t_info_plugin, kb_transaction_id, type, transaction_nb, payment_processor_account_id='default', status=:PROCESSED)

data/spec/killbill/helpers/transaction_spec.rb

@@ -2,10 +2,32 @@ require 'spec_helper'
 
 describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Transaction do
 
-  before :all do
+  before :each do
     ::Killbill::Test::TestTransaction.delete_all
   end
 
+  # https://github.com/killbill/killbill-plugin-framework-ruby/issues/51
+  it 'always finds a transaction for refund' do
+    api_call        = 'for debugging only'
+    amount_in_cents = 1242
+    currency        = :USD
+    kb_account_id   = SecureRandom.uuid
+    kb_tenant_id    = SecureRandom.uuid
+    kb_payment_id   = SecureRandom.uuid
+
+    auth_tx = create_transaction(api_call, kb_payment_id, SecureRandom.uuid, :AUTHORIZE, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    ::Killbill::Test::TestTransaction.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id).id.should == auth_tx.id
+
+    create_transaction(api_call, kb_payment_id, SecureRandom.uuid, :CAPTURE, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    ::Killbill::Test::TestTransaction.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id).id.should == auth_tx.id
+
+    create_transaction(api_call, kb_payment_id, SecureRandom.uuid, :REFUND, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    ::Killbill::Test::TestTransaction.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id).id.should == auth_tx.id
+
+    create_transaction(api_call, kb_payment_id, SecureRandom.uuid, :REFUND, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    ::Killbill::Test::TestTransaction.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id).id.should == auth_tx.id
+  end
+
   it 'should store and retrieve transactions correctly' do
     api_call        = 'for debugging only'
     amount_in_cents = 1242

data/spec/killbill/invoice_plugin_api_spec.rb

@@ -10,7 +10,7 @@ describe Killbill::Plugin::Api::InvoicePluginApi do
   it 'should add items' do
     invoice = create_invoice
 
-    items = @invoicePluginApi.get_additional_invoice_items(invoice, java.util.ArrayList.new, nil)
+    items = @invoicePluginApi.get_additional_invoice_items(invoice, java.lang.Boolean::FALSE, java.util.ArrayList.new, nil)
     items.size.should == 2
 
     items.get(0).invoice_id.should == invoice.id

data/spec/killbill/invoice_plugin_spec.rb

@@ -7,7 +7,7 @@ describe Killbill::Plugin::Invoice do
 
   it 'should not raise exceptions by default' do
     plugin = DummyInvoicePlugin.new
-    plugin.get_additional_invoice_items(nil, nil, nil).size.should == 0
+    plugin.get_additional_invoice_items(nil, false, nil, nil).size.should == 0
   end
 
   it 'should be able to build items' do

data/spec/killbill/invoice_test.rb

@@ -5,7 +5,7 @@ module Killbill
   module Plugin
     class InvoiceTest < Invoice
 
-      def get_additional_invoice_items(invoice, properties, context)
+      def get_additional_invoice_items(invoice, dry_run, properties, context)
         additional_items = []
         invoice.invoice_items.each do |original_item|
           additional_items << build_item(original_item, original_item.amount * 7 / 100, 'Tax item', :TAX)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -393,6 +393,7 @@ files:
 - lib/killbill/gen/api/enumerator_iterator.rb
 - lib/killbill/gen/api/fixed.rb
 - lib/killbill/gen/api/illegal_plan_change.rb
+- lib/killbill/gen/api/immutable_account_data.rb
 - lib/killbill/gen/api/international_price.rb
 - lib/killbill/gen/api/invalid_config_exception.rb
 - lib/killbill/gen/api/invoice.rb
@@ -581,40 +582,8 @@ requirements:
 - jar 'org.kill-bill.billing:killbill-api'
 - jar 'org.kill-bill.billing:killbill-util:tests'
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Framework to write Kill Bill plugins in Ruby.
-test_files:
-- spec/killbill/base_plugin_spec.rb
-- spec/killbill/config_test.ru
-- spec/killbill/gen_conversions_spec.rb
-- spec/killbill/helpers/configuration_spec.rb
-- spec/killbill/helpers/connection_spec.rb
-- spec/killbill/helpers/killbill_spec_helper_spec.rb
-- spec/killbill/helpers/payment_method_spec.rb
-- spec/killbill/helpers/payment_plugin_spec.rb
-- spec/killbill/helpers/private_payment_plugin_spec.rb
-- spec/killbill/helpers/response_spec.rb
-- spec/killbill/helpers/streamy_result_set_spec.rb
-- spec/killbill/helpers/test_payment_method.rb
-- spec/killbill/helpers/test_response.rb
-- spec/killbill/helpers/test_schema.rb
-- spec/killbill/helpers/test_transaction.rb
-- spec/killbill/helpers/transaction_spec.rb
-- spec/killbill/helpers/utils_spec.rb
-- spec/killbill/invoice_plugin_api_spec.rb
-- spec/killbill/invoice_plugin_spec.rb
-- spec/killbill/invoice_test.rb
-- spec/killbill/killbill_integration_spec.rb
-- spec/killbill/killbill_logger_spec.rb
-- spec/killbill/killbillapi_spec.rb
-- spec/killbill/notification_plugin_api_spec.rb
-- spec/killbill/notification_plugin_spec.rb
-- spec/killbill/notification_test.rb
-- spec/killbill/payment_plugin_api_spec.rb
-- spec/killbill/payment_plugin_spec.rb
-- spec/killbill/payment_test.rb
-- spec/killbill/rack_handler_spec.rb
-- spec/killbill/remote/active_merchant_typhoeus_connection_spec.rb
-- spec/spec_helper.rb
+test_files: []