killbill 7.0.6 → 8.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +0 -6
  3. data/Gemfile.lock +13 -15
  4. data/Jarfile +10 -9
  5. data/Jarfile.lock +53 -50
  6. data/NEWS +0 -4
  7. data/README.md +13 -1
  8. data/generators/active_merchant/templates/spec/spec_helper.rb +5 -9
  9. data/killbill.gemspec +0 -1
  10. data/lib/killbill/gen/api/account.rb +26 -1
  11. data/lib/killbill/gen/api/dry_run_arguments.rb +4 -7
  12. data/lib/killbill/gen/api/entitlement.rb +7 -1
  13. data/lib/killbill/gen/api/entitlement_api.rb +42 -84
  14. data/lib/killbill/gen/api/immutable_account_data.rb +26 -1
  15. data/lib/killbill/gen/api/invoice_user_api.rb +52 -12
  16. data/lib/killbill/gen/api/killbill_nodes_api.rb +30 -13
  17. data/lib/killbill/gen/api/migration_plan.rb +19 -12
  18. data/lib/killbill/gen/api/osgi_killbill.rb +8 -1
  19. data/lib/killbill/gen/api/payment_api.rb +51 -0
  20. data/lib/killbill/gen/api/plan.rb +19 -12
  21. data/lib/killbill/gen/api/require_gen.rb +1 -0
  22. data/lib/killbill/gen/api/subscription.rb +7 -1
  23. data/lib/killbill/gen/api/subscription_api.rb +279 -164
  24. data/lib/killbill/gen/api/subscription_event.rb +1 -12
  25. data/lib/killbill/gen/api/subscription_usage_record.rb +8 -2
  26. data/lib/killbill/gen/api/usage_api_exception.rb +68 -0
  27. data/lib/killbill/gen/plugin-api/blocking_state_metadata.rb +137 -0
  28. data/lib/killbill/gen/plugin-api/entitlement_context.rb +26 -8
  29. data/lib/killbill/gen/plugin-api/prior_entitlement_result.rb +26 -8
  30. data/lib/killbill/gen/plugin-api/require_gen.rb +1 -0
  31. data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +1 -0
  32. data/lib/killbill/helpers/active_merchant/payment_plugin.rb +1 -6
  33. data/lib/killbill/migration.rb +2 -13
  34. data/lib/killbill/version.rb +1 -1
  35. data/spec/killbill/helpers/payment_method_spec.rb +8 -8
  36. data/spec/killbill/helpers/response_spec.rb +4 -4
  37. data/spec/spec_helper.rb +1 -1
  38. metadata +102 -82
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.entitlement.api.SubscriptionEvent
36
36
 
37
- attr_accessor :id, :entitlement_id, :effective_date, :requested_date, :subscription_event_type, :is_blocked_billing, :is_blocked_entitlement, :service_name, :service_state_name, :prev_product, :prev_plan, :prev_phase, :prev_price_list, :prev_billing_period, :next_product, :next_plan, :next_phase, :next_price_list, :next_billing_period
37
+ attr_accessor :id, :entitlement_id, :effective_date, :subscription_event_type, :is_blocked_billing, :is_blocked_entitlement, :service_name, :service_state_name, :prev_product, :prev_plan, :prev_phase, :prev_price_list, :prev_billing_period, :next_product, :next_plan, :next_phase, :next_price_list, :next_billing_period
38
38
 
39
39
  def initialize()
40
40
  end
@@ -51,11 +51,6 @@ module Killbill
51
51
  @effective_date = Java::org.joda.time.LocalDate.parse(@effective_date.to_s)
52
52
  end
53
53
 
54
- # conversion for requested_date [type = org.joda.time.LocalDate]
55
- if !@requested_date.nil?
56
- @requested_date = Java::org.joda.time.LocalDate.parse(@requested_date.to_s)
57
- end
58
-
59
54
  # conversion for subscription_event_type [type = org.killbill.billing.entitlement.api.SubscriptionEventType]
60
55
  @subscription_event_type = Java::org.killbill.billing.entitlement.api.SubscriptionEventType.value_of( @subscription_event_type.to_s ) unless @subscription_event_type.nil?
61
56
 
@@ -118,12 +113,6 @@ module Killbill
118
113
  @effective_date = @effective_date.to_s
119
114
  end
120
115
 
121
- # conversion for requested_date [type = org.joda.time.LocalDate]
122
- @requested_date = j_obj.requested_date
123
- if !@requested_date.nil?
124
- @requested_date = @requested_date.to_s
125
- end
126
-
127
116
  # conversion for subscription_event_type [type = org.killbill.billing.entitlement.api.SubscriptionEventType]
128
117
  @subscription_event_type = j_obj.subscription_event_type
129
118
  @subscription_event_type = @subscription_event_type.to_s.to_sym unless @subscription_event_type.nil?
@@ -32,7 +32,7 @@ module Killbill
32
32
  class SubscriptionUsageRecord
33
33
 
34
34
 
35
- attr_accessor :subscription_id, :unit_usage_record
35
+ attr_accessor :subscription_id, :tracking_id, :unit_usage_record
36
36
 
37
37
  def initialize()
38
38
  end
@@ -41,6 +41,9 @@ module Killbill
41
41
  # conversion for subscription_id [type = java.util.UUID]
42
42
  @subscription_id = java.util.UUID.fromString(@subscription_id.to_s) unless @subscription_id.nil?
43
43
 
44
+ # conversion for tracking_id [type = java.lang.String]
45
+ @tracking_id = @tracking_id.to_s unless @tracking_id.nil?
46
+
44
47
  # conversion for unit_usage_record [type = java.util.List]
45
48
  tmp = java.util.ArrayList.new
46
49
  (@unit_usage_record || []).each do |m|
@@ -49,7 +52,7 @@ module Killbill
49
52
  tmp.add(m)
50
53
  end
51
54
  @unit_usage_record = tmp
52
- Java::org.killbill.billing.usage.api.SubscriptionUsageRecord.new(@subscription_id, @unit_usage_record)
55
+ Java::org.killbill.billing.usage.api.SubscriptionUsageRecord.new(@subscription_id, @tracking_id, @unit_usage_record)
53
56
  end
54
57
 
55
58
  def to_ruby(j_obj)
@@ -57,6 +60,9 @@ module Killbill
57
60
  @subscription_id = j_obj.subscription_id
58
61
  @subscription_id = @subscription_id.nil? ? nil : @subscription_id.to_s
59
62
 
63
+ # conversion for tracking_id [type = java.lang.String]
64
+ @tracking_id = j_obj.tracking_id
65
+
60
66
  # conversion for unit_usage_record [type = java.util.List]
61
67
  @unit_usage_record = j_obj.unit_usage_record
62
68
  tmp = []
@@ -0,0 +1,68 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module Killbill
29
+ module Plugin
30
+ module Model
31
+
32
+ class UsageApiException
33
+
34
+
35
+ attr_accessor :message, :cause, :code
36
+
37
+ def initialize()
38
+ end
39
+
40
+ def to_java()
41
+ # conversion for message [type = java.lang.String]
42
+ @message = @message.to_s unless @message.nil?
43
+
44
+ # conversion for cause [type = java.lang.Throwable]
45
+ @cause = @cause.to_s unless cause.nil?
46
+
47
+ # conversion for code [type = int]
48
+ @code = @code
49
+ Java::org.killbill.billing.usage.api.UsageApiException.new(@message, @cause, @code)
50
+ end
51
+
52
+ def to_ruby(j_obj)
53
+ # conversion for message [type = java.lang.String]
54
+ @message = j_obj.message
55
+
56
+ # conversion for cause [type = java.lang.Throwable]
57
+ @cause = j_obj.cause
58
+ @cause = @cause.to_s unless @cause.nil?
59
+
60
+ # conversion for code [type = int]
61
+ @code = j_obj.code
62
+ self
63
+ end
64
+
65
+ end
66
+ end
67
+ end
68
+ end
@@ -0,0 +1,137 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module Killbill
29
+ module Plugin
30
+ module Model
31
+
32
+ class BlockingStateMetadata
33
+
34
+
35
+ attr_accessor :blockable_id, :service, :state_name, :blocking_type, :effective_date, :transitioned_to_blocked_billing, :transitioned_to_unblocked_billing, :transitioned_to_blocked_entitlement, :transitioned_to_unblocked_entitlement
36
+
37
+ def initialize()
38
+ end
39
+
40
+ def to_java()
41
+ # conversion for blockable_id [type = java.util.UUID]
42
+ @blockable_id = java.util.UUID.fromString(@blockable_id.to_s) unless @blockable_id.nil?
43
+
44
+ # conversion for service [type = java.lang.String]
45
+ @service = @service.to_s unless @service.nil?
46
+
47
+ # conversion for state_name [type = java.lang.String]
48
+ @state_name = @state_name.to_s unless @state_name.nil?
49
+
50
+ # conversion for blocking_type [type = org.killbill.billing.entitlement.api.BlockingStateType]
51
+ @blocking_type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of( @blocking_type.to_s ) unless @blocking_type.nil?
52
+
53
+ # conversion for effective_date [type = org.joda.time.DateTime]
54
+ if !@effective_date.nil?
55
+ @effective_date = (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
56
+ @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
57
+ end
58
+
59
+ # conversion for transitioned_to_blocked_billing [type = java.lang.Boolean]
60
+ @transitioned_to_blocked_billing = @transitioned_to_blocked_billing.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_blocked_billing)
61
+
62
+ # conversion for transitioned_to_unblocked_billing [type = java.lang.Boolean]
63
+ @transitioned_to_unblocked_billing = @transitioned_to_unblocked_billing.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_unblocked_billing)
64
+
65
+ # conversion for transitioned_to_blocked_entitlement [type = java.lang.Boolean]
66
+ @transitioned_to_blocked_entitlement = @transitioned_to_blocked_entitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_blocked_entitlement)
67
+
68
+ # conversion for transitioned_to_unblocked_entitlement [type = java.lang.Boolean]
69
+ @transitioned_to_unblocked_entitlement = @transitioned_to_unblocked_entitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_unblocked_entitlement)
70
+ Java::org.killbill.billing.notification.plugin.api.BlockingStateMetadata.new(@blockable_id, @service, @state_name, @blocking_type, @effective_date, @transitioned_to_blocked_billing, @transitioned_to_unblocked_billing, @transitioned_to_blocked_entitlement, @transitioned_to_unblocked_entitlement)
71
+ end
72
+
73
+ def to_ruby(j_obj)
74
+ # conversion for blockable_id [type = java.util.UUID]
75
+ @blockable_id = j_obj.blockable_id
76
+ @blockable_id = @blockable_id.nil? ? nil : @blockable_id.to_s
77
+
78
+ # conversion for service [type = java.lang.String]
79
+ @service = j_obj.service
80
+
81
+ # conversion for state_name [type = java.lang.String]
82
+ @state_name = j_obj.state_name
83
+
84
+ # conversion for blocking_type [type = org.killbill.billing.entitlement.api.BlockingStateType]
85
+ @blocking_type = j_obj.blocking_type
86
+ @blocking_type = @blocking_type.to_s.to_sym unless @blocking_type.nil?
87
+
88
+ # conversion for effective_date [type = org.joda.time.DateTime]
89
+ @effective_date = j_obj.effective_date
90
+ if !@effective_date.nil?
91
+ fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
92
+ str = fmt.print(@effective_date)
93
+ @effective_date = DateTime.iso8601(str)
94
+ end
95
+
96
+ # conversion for transitioned_to_blocked_billing [type = java.lang.Boolean]
97
+ @transitioned_to_blocked_billing = j_obj.transitioned_to_blocked_billing
98
+ if @transitioned_to_blocked_billing.nil?
99
+ @transitioned_to_blocked_billing = false
100
+ else
101
+ tmp_bool = (@transitioned_to_blocked_billing.java_kind_of? java.lang.Boolean) ? @transitioned_to_blocked_billing.boolean_value : @transitioned_to_blocked_billing
102
+ @transitioned_to_blocked_billing = tmp_bool ? true : false
103
+ end
104
+
105
+ # conversion for transitioned_to_unblocked_billing [type = java.lang.Boolean]
106
+ @transitioned_to_unblocked_billing = j_obj.transitioned_to_unblocked_billing
107
+ if @transitioned_to_unblocked_billing.nil?
108
+ @transitioned_to_unblocked_billing = false
109
+ else
110
+ tmp_bool = (@transitioned_to_unblocked_billing.java_kind_of? java.lang.Boolean) ? @transitioned_to_unblocked_billing.boolean_value : @transitioned_to_unblocked_billing
111
+ @transitioned_to_unblocked_billing = tmp_bool ? true : false
112
+ end
113
+
114
+ # conversion for transitioned_to_blocked_entitlement [type = java.lang.Boolean]
115
+ @transitioned_to_blocked_entitlement = j_obj.transitioned_to_blocked_entitlement
116
+ if @transitioned_to_blocked_entitlement.nil?
117
+ @transitioned_to_blocked_entitlement = false
118
+ else
119
+ tmp_bool = (@transitioned_to_blocked_entitlement.java_kind_of? java.lang.Boolean) ? @transitioned_to_blocked_entitlement.boolean_value : @transitioned_to_blocked_entitlement
120
+ @transitioned_to_blocked_entitlement = tmp_bool ? true : false
121
+ end
122
+
123
+ # conversion for transitioned_to_unblocked_entitlement [type = java.lang.Boolean]
124
+ @transitioned_to_unblocked_entitlement = j_obj.transitioned_to_unblocked_entitlement
125
+ if @transitioned_to_unblocked_entitlement.nil?
126
+ @transitioned_to_unblocked_entitlement = false
127
+ else
128
+ tmp_bool = (@transitioned_to_unblocked_entitlement.java_kind_of? java.lang.Boolean) ? @transitioned_to_unblocked_entitlement.boolean_value : @transitioned_to_unblocked_entitlement
129
+ @transitioned_to_unblocked_entitlement = tmp_bool ? true : false
130
+ end
131
+ self
132
+ end
133
+
134
+ end
135
+ end
136
+ end
137
+ end
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.entitlement.plugin.api.EntitlementContext
36
36
 
37
- attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :bundle_id, :external_key, :entitlement_specifiers, :effective_date, :plugin_properties
37
+ attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :bundle_id, :external_key, :entitlement_specifiers, :entitlement_effective_date, :billing_effective_date, :billing_action_policy, :plugin_properties
38
38
 
39
39
  def initialize()
40
40
  end
@@ -97,11 +97,19 @@ module Killbill
97
97
  end
98
98
  @entitlement_specifiers = tmp
99
99
 
100
- # conversion for effective_date [type = org.joda.time.LocalDate]
101
- if !@effective_date.nil?
102
- @effective_date = Java::org.joda.time.LocalDate.parse(@effective_date.to_s)
100
+ # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
101
+ if !@entitlement_effective_date.nil?
102
+ @entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@entitlement_effective_date.to_s)
103
103
  end
104
104
 
105
+ # conversion for billing_effective_date [type = org.joda.time.LocalDate]
106
+ if !@billing_effective_date.nil?
107
+ @billing_effective_date = Java::org.joda.time.LocalDate.parse(@billing_effective_date.to_s)
108
+ end
109
+
110
+ # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
111
+ @billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @billing_action_policy.to_s ) unless @billing_action_policy.nil?
112
+
105
113
  # conversion for plugin_properties [type = java.lang.Iterable]
106
114
  tmp = java.util.ArrayList.new
107
115
  (@plugin_properties || []).each do |m|
@@ -184,12 +192,22 @@ module Killbill
184
192
  end
185
193
  @entitlement_specifiers = tmp
186
194
 
187
- # conversion for effective_date [type = org.joda.time.LocalDate]
188
- @effective_date = j_obj.effective_date
189
- if !@effective_date.nil?
190
- @effective_date = @effective_date.to_s
195
+ # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
196
+ @entitlement_effective_date = j_obj.entitlement_effective_date
197
+ if !@entitlement_effective_date.nil?
198
+ @entitlement_effective_date = @entitlement_effective_date.to_s
191
199
  end
192
200
 
201
+ # conversion for billing_effective_date [type = org.joda.time.LocalDate]
202
+ @billing_effective_date = j_obj.billing_effective_date
203
+ if !@billing_effective_date.nil?
204
+ @billing_effective_date = @billing_effective_date.to_s
205
+ end
206
+
207
+ # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
208
+ @billing_action_policy = j_obj.billing_action_policy
209
+ @billing_action_policy = @billing_action_policy.to_s.to_sym unless @billing_action_policy.nil?
210
+
193
211
  # conversion for plugin_properties [type = java.lang.Iterable]
194
212
  @plugin_properties = j_obj.plugin_properties
195
213
  tmp = []
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.entitlement.plugin.api.PriorEntitlementResult
36
36
 
37
- attr_accessor :is_aborted, :adjusted_effective_date, :adjusted_entitlement_specifiers, :adjusted_plugin_properties
37
+ attr_accessor :is_aborted, :adjusted_entitlement_effective_date, :adjusted_billing_effective_date, :adjusted_billing_action_policy, :adjusted_entitlement_specifiers, :adjusted_plugin_properties
38
38
 
39
39
  def initialize()
40
40
  end
@@ -43,11 +43,19 @@ module Killbill
43
43
  # conversion for is_aborted [type = boolean]
44
44
  @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
45
45
 
46
- # conversion for adjusted_effective_date [type = org.joda.time.LocalDate]
47
- if !@adjusted_effective_date.nil?
48
- @adjusted_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_effective_date.to_s)
46
+ # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
47
+ if !@adjusted_entitlement_effective_date.nil?
48
+ @adjusted_entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_entitlement_effective_date.to_s)
49
49
  end
50
50
 
51
+ # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
52
+ if !@adjusted_billing_effective_date.nil?
53
+ @adjusted_billing_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_billing_effective_date.to_s)
54
+ end
55
+
56
+ # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
57
+ @adjusted_billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @adjusted_billing_action_policy.to_s ) unless @adjusted_billing_action_policy.nil?
58
+
51
59
  # conversion for adjusted_entitlement_specifiers [type = java.util.List]
52
60
  tmp = java.util.ArrayList.new
53
61
  (@adjusted_entitlement_specifiers || []).each do |m|
@@ -78,12 +86,22 @@ module Killbill
78
86
  @is_aborted = tmp_bool ? true : false
79
87
  end
80
88
 
81
- # conversion for adjusted_effective_date [type = org.joda.time.LocalDate]
82
- @adjusted_effective_date = j_obj.adjusted_effective_date
83
- if !@adjusted_effective_date.nil?
84
- @adjusted_effective_date = @adjusted_effective_date.to_s
89
+ # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
90
+ @adjusted_entitlement_effective_date = j_obj.adjusted_entitlement_effective_date
91
+ if !@adjusted_entitlement_effective_date.nil?
92
+ @adjusted_entitlement_effective_date = @adjusted_entitlement_effective_date.to_s
85
93
  end
86
94
 
95
+ # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
96
+ @adjusted_billing_effective_date = j_obj.adjusted_billing_effective_date
97
+ if !@adjusted_billing_effective_date.nil?
98
+ @adjusted_billing_effective_date = @adjusted_billing_effective_date.to_s
99
+ end
100
+
101
+ # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
102
+ @adjusted_billing_action_policy = j_obj.adjusted_billing_action_policy
103
+ @adjusted_billing_action_policy = @adjusted_billing_action_policy.to_s.to_sym unless @adjusted_billing_action_policy.nil?
104
+
87
105
  # conversion for adjusted_entitlement_specifiers [type = java.util.List]
88
106
  @adjusted_entitlement_specifiers = j_obj.adjusted_entitlement_specifiers
89
107
  tmp = []
@@ -28,6 +28,7 @@
28
28
  require 'killbill/gen/plugin-api/payment_method_info_plugin'
29
29
  require 'killbill/gen/plugin-api/payment_plugin_api'
30
30
  require 'killbill/gen/plugin-api/payment_plugin_api_exception'
31
+ require 'killbill/gen/plugin-api/blocking_state_metadata'
31
32
  require 'killbill/gen/plugin-api/broadcast_metadata'
32
33
  require 'killbill/gen/plugin-api/ext_bus_event'
33
34
  require 'killbill/gen/plugin-api/notification_plugin_api'
@@ -162,6 +162,7 @@ module Killbill
162
162
  .or(t[:kb_payment_transaction_id].eq(search_key))
163
163
  .or(t[:message].eq(search_key))
164
164
  .or(t[:authorization].eq(search_key))
165
+ .or(t[:fraud_review].eq(search_key))
165
166
 
166
167
  # Only search successful payments and refunds
167
168
  where_clause = where_clause.and(t[:success].eq(true))
@@ -86,12 +86,7 @@ module Killbill
86
86
 
87
87
  # Go to the gateway - while some gateways implementations are smart and have void support 'auth_reversal' and 'void' (e.g. Litle),
88
88
  # others (e.g. CyberSource) implement different methods
89
- if linked_transaction.transaction_type == 'AUTHORIZE' && gateway.respond_to?(:auth_reversal)
90
- options[:currency] ||= linked_transaction.currency
91
- gateway.auth_reversal(linked_transaction.amount_in_cents, authorization, options)
92
- else
93
- gateway.void(authorization, options)
94
- end
89
+ linked_transaction.transaction_type == 'AUTHORIZE' && gateway.respond_to?(:auth_reversal) ? gateway.auth_reversal(linked_transaction.amount_in_cents, authorization, options) : gateway.void(authorization, options)
95
90
  end
96
91
 
97
92
  linked_transaction_proc = Proc.new do |amount_in_cents, options|
@@ -3,19 +3,8 @@ require 'logger'
3
3
  require 'active_record'
4
4
  require 'arjdbc'
5
5
 
6
- begin
7
- require 'jdbc/mariadb'
8
- Jdbc::MariaDB.load_driver
9
- rescue LoadError
10
- # ignored
11
- end
12
-
13
- begin
14
- require 'jdbc/postgres'
15
- Jdbc::Postgres.load_driver
16
- rescue LoadError
17
- # ignored
18
- end
6
+ require 'jdbc/mariadb'
7
+ Jdbc::MariaDB.load_driver
19
8
 
20
9
  module Killbill
21
10
  class Migration