killbill 8.3.6 → 9.2.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.
- checksums.yaml +4 -4
- data/.travis.yml +51 -0
- data/Gemfile.lock +4 -4
- data/Jarfile +11 -11
- data/Jarfile.lock +63 -57
- data/NEWS +2 -8
- data/README.md +1 -0
- data/gen_config/api.conf +2 -0
- data/lib/killbill/gen/api/account.rb +20 -20
- data/lib/killbill/gen/api/account_data.rb +15 -1
- data/lib/killbill/gen/api/block_price_override.rb +81 -0
- data/lib/killbill/gen/api/call_context.rb +8 -1
- data/lib/killbill/gen/api/catalog_entity.rb +7 -1
- data/lib/killbill/gen/api/catalog_user_api.rb +8 -0
- data/lib/killbill/gen/api/custom_field_user_api.rb +17 -0
- data/lib/killbill/gen/api/email_notification.rb +75 -0
- data/lib/killbill/gen/api/entitlement_api.rb +12 -6
- data/lib/killbill/gen/api/immutable_account_data.rb +1 -20
- data/lib/killbill/gen/api/invoice.rb +15 -1
- data/lib/killbill/gen/api/invoice_formatter.rb +15 -1
- data/lib/killbill/gen/api/invoice_item.rb +19 -1
- data/lib/killbill/gen/api/invoice_item_formatter.rb +19 -1
- data/lib/killbill/gen/api/migration_plan.rb +14 -1
- data/lib/killbill/gen/api/mutable_account_data.rb +15 -1
- data/lib/killbill/gen/api/mutable_static_catalog.rb +1 -8
- data/lib/killbill/gen/api/osgi_killbill.rb +8 -1
- data/lib/killbill/gen/api/overdue_api.rb +88 -0
- data/lib/killbill/gen/api/overdue_api_exception.rb +68 -0
- data/lib/killbill/gen/api/overdue_condition.rb +108 -0
- data/lib/killbill/gen/api/overdue_config.rb +58 -0
- data/lib/killbill/gen/api/overdue_state.rb +120 -0
- data/lib/killbill/gen/api/overdue_states_account.rb +72 -0
- data/lib/killbill/gen/api/payment_api.rb +192 -51
- data/lib/killbill/gen/api/plan.rb +14 -1
- data/lib/killbill/gen/api/plan_phase.rb +7 -1
- data/lib/killbill/gen/api/plan_phase_price_override.rb +20 -1
- data/lib/killbill/gen/api/price_list.rb +7 -1
- data/lib/killbill/gen/api/product.rb +7 -1
- data/lib/killbill/gen/api/require_gen.rb +131 -121
- data/lib/killbill/gen/api/security_api.rb +20 -0
- data/lib/killbill/gen/api/static_catalog.rb +1 -8
- data/lib/killbill/gen/api/tag_user_api.rb +12 -3
- data/lib/killbill/gen/api/tenant_context.rb +8 -1
- data/lib/killbill/gen/api/tier_price_override.rb +70 -0
- data/lib/killbill/gen/api/tiered_block_price_override.rb +87 -0
- data/lib/killbill/gen/api/unit.rb +7 -1
- data/lib/killbill/gen/api/usage.rb +14 -1
- data/lib/killbill/gen/api/usage_price_override.rb +83 -0
- data/lib/killbill/gen/plugin-api/catalog_plugin_api.rb +34 -0
- data/lib/killbill/gen/plugin-api/entitlement_context.rb +8 -8
- data/lib/killbill/gen/plugin-api/ext_bus_event.rb +8 -1
- data/lib/killbill/gen/plugin-api/invoice_payment_metadata.rb +115 -0
- data/lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb +64 -0
- data/lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb +64 -0
- data/lib/killbill/gen/plugin-api/payment_control_context.rb +14 -8
- data/lib/killbill/gen/plugin-api/prior_payment_control_result.rb +7 -1
- data/lib/killbill/gen/plugin-api/require_gen.rb +15 -12
- data/lib/killbill/gen/plugin-api/subscription_metadata.rb +8 -2
- data/lib/killbill/gen/plugin-api/versioned_plugin_catalog.rb +1 -8
- data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +6 -21
- data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb +1 -1
- data/lib/killbill/helpers/active_merchant/payment_plugin.rb +12 -12
- data/lib/killbill/version.rb +1 -1
- data/spec/killbill/helpers/response_spec.rb +0 -7
- data/spec/killbill/helpers/test_response.rb +0 -4
- data/spec/killbill/killbillapi_spec.rb +1 -0
- metadata +17 -4
- data/.circleci/config.yml +0 -138
- data/lib/killbill/gen/api/refund.rb +0 -151
@@ -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, :
|
37
|
+
attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :account_id, :tenant_id, :operation_type, :destination_account_id, :base_entitlement_with_add_ons_specifiers, :billing_action_policy, :plugin_properties
|
38
38
|
|
39
39
|
def initialize()
|
40
40
|
end
|
@@ -70,15 +70,15 @@ module Killbill
|
|
70
70
|
@updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
71
71
|
end
|
72
72
|
|
73
|
+
# conversion for account_id [type = java.util.UUID]
|
74
|
+
@account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
|
75
|
+
|
73
76
|
# conversion for tenant_id [type = java.util.UUID]
|
74
77
|
@tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
|
75
78
|
|
76
79
|
# conversion for operation_type [type = org.killbill.billing.entitlement.plugin.api.OperationType]
|
77
80
|
@operation_type = Java::org.killbill.billing.entitlement.plugin.api.OperationType.value_of( @operation_type.to_s ) unless @operation_type.nil?
|
78
81
|
|
79
|
-
# conversion for account_id [type = java.util.UUID]
|
80
|
-
@account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
|
81
|
-
|
82
82
|
# conversion for destination_account_id [type = java.util.UUID]
|
83
83
|
@destination_account_id = java.util.UUID.fromString(@destination_account_id.to_s) unless @destination_account_id.nil?
|
84
84
|
|
@@ -143,6 +143,10 @@ module Killbill
|
|
143
143
|
@updated_date = DateTime.iso8601(str)
|
144
144
|
end
|
145
145
|
|
146
|
+
# conversion for account_id [type = java.util.UUID]
|
147
|
+
@account_id = j_obj.account_id
|
148
|
+
@account_id = @account_id.nil? ? nil : @account_id.to_s
|
149
|
+
|
146
150
|
# conversion for tenant_id [type = java.util.UUID]
|
147
151
|
@tenant_id = j_obj.tenant_id
|
148
152
|
@tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s
|
@@ -151,10 +155,6 @@ module Killbill
|
|
151
155
|
@operation_type = j_obj.operation_type
|
152
156
|
@operation_type = @operation_type.to_s.to_sym unless @operation_type.nil?
|
153
157
|
|
154
|
-
# conversion for account_id [type = java.util.UUID]
|
155
|
-
@account_id = j_obj.account_id
|
156
|
-
@account_id = @account_id.nil? ? nil : @account_id.to_s
|
157
|
-
|
158
158
|
# conversion for destination_account_id [type = java.util.UUID]
|
159
159
|
@destination_account_id = j_obj.destination_account_id
|
160
160
|
@destination_account_id = @destination_account_id.nil? ? nil : @destination_account_id.to_s
|
@@ -34,7 +34,7 @@ module Killbill
|
|
34
34
|
|
35
35
|
include org.killbill.billing.notification.plugin.api.ExtBusEvent
|
36
36
|
|
37
|
-
attr_accessor :event_type, :object_type, :object_id, :meta_data, :account_id, :tenant_id
|
37
|
+
attr_accessor :event_type, :object_type, :object_id, :meta_data, :account_id, :tenant_id, :user_token
|
38
38
|
|
39
39
|
def initialize()
|
40
40
|
end
|
@@ -57,6 +57,9 @@ module Killbill
|
|
57
57
|
|
58
58
|
# conversion for tenant_id [type = java.util.UUID]
|
59
59
|
@tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
|
60
|
+
|
61
|
+
# conversion for user_token [type = java.util.UUID]
|
62
|
+
@user_token = java.util.UUID.fromString(@user_token.to_s) unless @user_token.nil?
|
60
63
|
self
|
61
64
|
end
|
62
65
|
|
@@ -83,6 +86,10 @@ module Killbill
|
|
83
86
|
# conversion for tenant_id [type = java.util.UUID]
|
84
87
|
@tenant_id = j_obj.tenant_id
|
85
88
|
@tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s
|
89
|
+
|
90
|
+
# conversion for user_token [type = java.util.UUID]
|
91
|
+
@user_token = j_obj.user_token
|
92
|
+
@user_token = @user_token.nil? ? nil : @user_token.to_s
|
86
93
|
self
|
87
94
|
end
|
88
95
|
|
@@ -0,0 +1,115 @@
|
|
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 InvoicePaymentMetadata
|
33
|
+
|
34
|
+
|
35
|
+
attr_accessor :payment_id, :invoice_payment_type, :payment_date, :amount, :currency, :linked_invoice_payment_id, :payment_cookie_id, :processed_currency
|
36
|
+
|
37
|
+
def initialize()
|
38
|
+
end
|
39
|
+
|
40
|
+
def to_java()
|
41
|
+
# conversion for payment_id [type = java.util.UUID]
|
42
|
+
@payment_id = java.util.UUID.fromString(@payment_id.to_s) unless @payment_id.nil?
|
43
|
+
|
44
|
+
# conversion for invoice_payment_type [type = org.killbill.billing.invoice.api.InvoicePaymentType]
|
45
|
+
@invoice_payment_type = Java::org.killbill.billing.invoice.api.InvoicePaymentType.value_of( @invoice_payment_type.to_s ) unless @invoice_payment_type.nil?
|
46
|
+
|
47
|
+
# conversion for payment_date [type = org.joda.time.DateTime]
|
48
|
+
if !@payment_date.nil?
|
49
|
+
@payment_date = (@payment_date.kind_of? Time) ? DateTime.parse(@payment_date.to_s) : @payment_date
|
50
|
+
@payment_date = Java::org.joda.time.DateTime.new(@payment_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
51
|
+
end
|
52
|
+
|
53
|
+
# conversion for amount [type = java.math.BigDecimal]
|
54
|
+
if @amount.nil?
|
55
|
+
@amount = java.math.BigDecimal::ZERO
|
56
|
+
else
|
57
|
+
@amount = java.math.BigDecimal.new(@amount.to_s)
|
58
|
+
end
|
59
|
+
|
60
|
+
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
61
|
+
@currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
|
62
|
+
|
63
|
+
# conversion for linked_invoice_payment_id [type = java.util.UUID]
|
64
|
+
@linked_invoice_payment_id = java.util.UUID.fromString(@linked_invoice_payment_id.to_s) unless @linked_invoice_payment_id.nil?
|
65
|
+
|
66
|
+
# conversion for payment_cookie_id [type = java.lang.String]
|
67
|
+
@payment_cookie_id = @payment_cookie_id.to_s unless @payment_cookie_id.nil?
|
68
|
+
|
69
|
+
# conversion for processed_currency [type = org.killbill.billing.catalog.api.Currency]
|
70
|
+
@processed_currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @processed_currency.to_s ) unless @processed_currency.nil?
|
71
|
+
Java::org.killbill.billing.notification.plugin.api.InvoicePaymentMetadata.new(@payment_id, @invoice_payment_type, @payment_date, @amount, @currency, @linked_invoice_payment_id, @payment_cookie_id, @processed_currency)
|
72
|
+
end
|
73
|
+
|
74
|
+
def to_ruby(j_obj)
|
75
|
+
# conversion for payment_id [type = java.util.UUID]
|
76
|
+
@payment_id = j_obj.payment_id
|
77
|
+
@payment_id = @payment_id.nil? ? nil : @payment_id.to_s
|
78
|
+
|
79
|
+
# conversion for invoice_payment_type [type = org.killbill.billing.invoice.api.InvoicePaymentType]
|
80
|
+
@invoice_payment_type = j_obj.invoice_payment_type
|
81
|
+
@invoice_payment_type = @invoice_payment_type.to_s.to_sym unless @invoice_payment_type.nil?
|
82
|
+
|
83
|
+
# conversion for payment_date [type = org.joda.time.DateTime]
|
84
|
+
@payment_date = j_obj.payment_date
|
85
|
+
if !@payment_date.nil?
|
86
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
87
|
+
str = fmt.print(@payment_date)
|
88
|
+
@payment_date = DateTime.iso8601(str)
|
89
|
+
end
|
90
|
+
|
91
|
+
# conversion for amount [type = java.math.BigDecimal]
|
92
|
+
@amount = j_obj.amount
|
93
|
+
@amount = @amount.nil? ? 0 : BigDecimal.new(@amount.to_s)
|
94
|
+
|
95
|
+
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
96
|
+
@currency = j_obj.currency
|
97
|
+
@currency = @currency.to_s.to_sym unless @currency.nil?
|
98
|
+
|
99
|
+
# conversion for linked_invoice_payment_id [type = java.util.UUID]
|
100
|
+
@linked_invoice_payment_id = j_obj.linked_invoice_payment_id
|
101
|
+
@linked_invoice_payment_id = @linked_invoice_payment_id.nil? ? nil : @linked_invoice_payment_id.to_s
|
102
|
+
|
103
|
+
# conversion for payment_cookie_id [type = java.lang.String]
|
104
|
+
@payment_cookie_id = j_obj.payment_cookie_id
|
105
|
+
|
106
|
+
# conversion for processed_currency [type = org.killbill.billing.catalog.api.Currency]
|
107
|
+
@processed_currency = j_obj.processed_currency
|
108
|
+
@processed_currency = @processed_currency.to_s.to_sym unless @processed_currency.nil?
|
109
|
+
self
|
110
|
+
end
|
111
|
+
|
112
|
+
end
|
113
|
+
end
|
114
|
+
end
|
115
|
+
end
|
@@ -0,0 +1,64 @@
|
|
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 InvoicePluginApiRetryException
|
33
|
+
|
34
|
+
|
35
|
+
attr_accessor :retry_schedule
|
36
|
+
|
37
|
+
def initialize()
|
38
|
+
end
|
39
|
+
|
40
|
+
def to_java()
|
41
|
+
# conversion for retry_schedule [type = java.util.List]
|
42
|
+
tmp = java.util.ArrayList.new
|
43
|
+
(@retry_schedule || []).each do |m|
|
44
|
+
tmp.add(m)
|
45
|
+
end
|
46
|
+
@retry_schedule = tmp
|
47
|
+
Java::org.killbill.billing.invoice.plugin.api.InvoicePluginApiRetryException.new(@retry_schedule)
|
48
|
+
end
|
49
|
+
|
50
|
+
def to_ruby(j_obj)
|
51
|
+
# conversion for retry_schedule [type = java.util.List]
|
52
|
+
@retry_schedule = j_obj.retry_schedule
|
53
|
+
tmp = []
|
54
|
+
(@retry_schedule || []).each do |m|
|
55
|
+
tmp << m
|
56
|
+
end
|
57
|
+
@retry_schedule = tmp
|
58
|
+
self
|
59
|
+
end
|
60
|
+
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,64 @@
|
|
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 NotificationPluginApiRetryException
|
33
|
+
|
34
|
+
|
35
|
+
attr_accessor :retry_schedule
|
36
|
+
|
37
|
+
def initialize()
|
38
|
+
end
|
39
|
+
|
40
|
+
def to_java()
|
41
|
+
# conversion for retry_schedule [type = java.util.List]
|
42
|
+
tmp = java.util.ArrayList.new
|
43
|
+
(@retry_schedule || []).each do |m|
|
44
|
+
tmp.add(m)
|
45
|
+
end
|
46
|
+
@retry_schedule = tmp
|
47
|
+
Java::org.killbill.billing.notification.plugin.api.NotificationPluginApiRetryException.new(@retry_schedule)
|
48
|
+
end
|
49
|
+
|
50
|
+
def to_ruby(j_obj)
|
51
|
+
# conversion for retry_schedule [type = java.util.List]
|
52
|
+
@retry_schedule = j_obj.retry_schedule
|
53
|
+
tmp = []
|
54
|
+
(@retry_schedule || []).each do |m|
|
55
|
+
tmp << m
|
56
|
+
end
|
57
|
+
@retry_schedule = tmp
|
58
|
+
self
|
59
|
+
end
|
60
|
+
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -34,7 +34,7 @@ module Killbill
|
|
34
34
|
|
35
35
|
include org.killbill.billing.control.plugin.api.PaymentControlContext
|
36
36
|
|
37
|
-
attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :
|
37
|
+
attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :account_id, :tenant_id, :payment_id, :attempt_payment_id, :payment_external_key, :transaction_id, :transaction_external_key, :payment_api_type, :transaction_type, :hpp_type, :amount, :currency, :payment_method_id, :payment_plugin_name, :processed_amount, :processed_currency, :is_api_payment
|
38
38
|
|
39
39
|
def initialize()
|
40
40
|
end
|
@@ -70,12 +70,12 @@ module Killbill
|
|
70
70
|
@updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
71
71
|
end
|
72
72
|
|
73
|
-
# conversion for tenant_id [type = java.util.UUID]
|
74
|
-
@tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
|
75
|
-
|
76
73
|
# conversion for account_id [type = java.util.UUID]
|
77
74
|
@account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
|
78
75
|
|
76
|
+
# conversion for tenant_id [type = java.util.UUID]
|
77
|
+
@tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
|
78
|
+
|
79
79
|
# conversion for payment_id [type = java.util.UUID]
|
80
80
|
@payment_id = java.util.UUID.fromString(@payment_id.to_s) unless @payment_id.nil?
|
81
81
|
|
@@ -113,6 +113,9 @@ module Killbill
|
|
113
113
|
# conversion for payment_method_id [type = java.util.UUID]
|
114
114
|
@payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
|
115
115
|
|
116
|
+
# conversion for payment_plugin_name [type = java.lang.String]
|
117
|
+
@payment_plugin_name = @payment_plugin_name.to_s unless @payment_plugin_name.nil?
|
118
|
+
|
116
119
|
# conversion for processed_amount [type = java.math.BigDecimal]
|
117
120
|
if @processed_amount.nil?
|
118
121
|
@processed_amount = java.math.BigDecimal::ZERO
|
@@ -166,14 +169,14 @@ module Killbill
|
|
166
169
|
@updated_date = DateTime.iso8601(str)
|
167
170
|
end
|
168
171
|
|
169
|
-
# conversion for tenant_id [type = java.util.UUID]
|
170
|
-
@tenant_id = j_obj.tenant_id
|
171
|
-
@tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s
|
172
|
-
|
173
172
|
# conversion for account_id [type = java.util.UUID]
|
174
173
|
@account_id = j_obj.account_id
|
175
174
|
@account_id = @account_id.nil? ? nil : @account_id.to_s
|
176
175
|
|
176
|
+
# conversion for tenant_id [type = java.util.UUID]
|
177
|
+
@tenant_id = j_obj.tenant_id
|
178
|
+
@tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s
|
179
|
+
|
177
180
|
# conversion for payment_id [type = java.util.UUID]
|
178
181
|
@payment_id = j_obj.payment_id
|
179
182
|
@payment_id = @payment_id.nil? ? nil : @payment_id.to_s
|
@@ -216,6 +219,9 @@ module Killbill
|
|
216
219
|
@payment_method_id = j_obj.payment_method_id
|
217
220
|
@payment_method_id = @payment_method_id.nil? ? nil : @payment_method_id.to_s
|
218
221
|
|
222
|
+
# conversion for payment_plugin_name [type = java.lang.String]
|
223
|
+
@payment_plugin_name = j_obj.payment_plugin_name
|
224
|
+
|
219
225
|
# conversion for processed_amount [type = java.math.BigDecimal]
|
220
226
|
@processed_amount = j_obj.processed_amount
|
221
227
|
@processed_amount = @processed_amount.nil? ? 0 : BigDecimal.new(@processed_amount.to_s)
|
@@ -34,7 +34,7 @@ module Killbill
|
|
34
34
|
|
35
35
|
include org.killbill.billing.control.plugin.api.PriorPaymentControlResult
|
36
36
|
|
37
|
-
attr_accessor :adjusted_plugin_properties, :is_aborted, :adjusted_amount, :adjusted_currency, :adjusted_payment_method_id
|
37
|
+
attr_accessor :adjusted_plugin_properties, :is_aborted, :adjusted_amount, :adjusted_currency, :adjusted_payment_method_id, :adjusted_plugin_name
|
38
38
|
|
39
39
|
def initialize()
|
40
40
|
end
|
@@ -64,6 +64,9 @@ module Killbill
|
|
64
64
|
|
65
65
|
# conversion for adjusted_payment_method_id [type = java.util.UUID]
|
66
66
|
@adjusted_payment_method_id = java.util.UUID.fromString(@adjusted_payment_method_id.to_s) unless @adjusted_payment_method_id.nil?
|
67
|
+
|
68
|
+
# conversion for adjusted_plugin_name [type = java.lang.String]
|
69
|
+
@adjusted_plugin_name = @adjusted_plugin_name.to_s unless @adjusted_plugin_name.nil?
|
67
70
|
self
|
68
71
|
end
|
69
72
|
|
@@ -98,6 +101,9 @@ module Killbill
|
|
98
101
|
# conversion for adjusted_payment_method_id [type = java.util.UUID]
|
99
102
|
@adjusted_payment_method_id = j_obj.adjusted_payment_method_id
|
100
103
|
@adjusted_payment_method_id = @adjusted_payment_method_id.nil? ? nil : @adjusted_payment_method_id.to_s
|
104
|
+
|
105
|
+
# conversion for adjusted_plugin_name [type = java.lang.String]
|
106
|
+
@adjusted_plugin_name = j_obj.adjusted_plugin_name
|
101
107
|
self
|
102
108
|
end
|
103
109
|
|
@@ -26,32 +26,35 @@
|
|
26
26
|
|
27
27
|
|
28
28
|
require 'killbill/gen/plugin-api/payment_method_info_plugin'
|
29
|
-
require 'killbill/gen/plugin-api/payment_plugin_api'
|
30
29
|
require 'killbill/gen/plugin-api/payment_plugin_api_exception'
|
30
|
+
require 'killbill/gen/plugin-api/payment_plugin_api'
|
31
|
+
require 'killbill/gen/plugin-api/invoice_payment_metadata'
|
31
32
|
require 'killbill/gen/plugin-api/blocking_state_metadata'
|
32
|
-
require 'killbill/gen/plugin-api/broadcast_metadata'
|
33
33
|
require 'killbill/gen/plugin-api/ext_bus_event'
|
34
|
-
require 'killbill/gen/plugin-api/notification_plugin_api'
|
35
34
|
require 'killbill/gen/plugin-api/payment_metadata'
|
35
|
+
require 'killbill/gen/plugin-api/notification_plugin_api_retry_exception'
|
36
|
+
require 'killbill/gen/plugin-api/broadcast_metadata'
|
37
|
+
require 'killbill/gen/plugin-api/notification_plugin_api'
|
36
38
|
require 'killbill/gen/plugin-api/subscription_metadata'
|
37
39
|
require 'killbill/gen/plugin-api/invoice_plugin_api'
|
40
|
+
require 'killbill/gen/plugin-api/invoice_plugin_api_retry_exception'
|
38
41
|
require 'killbill/gen/plugin-api/currency_plugin_api'
|
39
|
-
require 'killbill/gen/plugin-api/
|
40
|
-
require 'killbill/gen/plugin-api/on_failure_payment_control_result'
|
42
|
+
require 'killbill/gen/plugin-api/payment_control_context'
|
41
43
|
require 'killbill/gen/plugin-api/on_success_payment_control_result'
|
44
|
+
require 'killbill/gen/plugin-api/prior_payment_control_result'
|
45
|
+
require 'killbill/gen/plugin-api/on_failure_payment_control_result'
|
46
|
+
require 'killbill/gen/plugin-api/control_result'
|
42
47
|
require 'killbill/gen/plugin-api/payment_control_api_exception'
|
43
|
-
require 'killbill/gen/plugin-api/payment_control_context'
|
44
48
|
require 'killbill/gen/plugin-api/payment_control_plugin_api'
|
45
|
-
require 'killbill/gen/plugin-api/prior_payment_control_result'
|
46
49
|
require 'killbill/gen/plugin-api/catalog_plugin_api'
|
47
|
-
require 'killbill/gen/plugin-api/standalone_plugin_catalog'
|
48
50
|
require 'killbill/gen/plugin-api/versioned_plugin_catalog'
|
49
|
-
require 'killbill/gen/plugin-api/
|
51
|
+
require 'killbill/gen/plugin-api/standalone_plugin_catalog'
|
50
52
|
require 'killbill/gen/plugin-api/entitlement_plugin_api'
|
51
|
-
require 'killbill/gen/plugin-api/
|
53
|
+
require 'killbill/gen/plugin-api/entitlement_context'
|
52
54
|
require 'killbill/gen/plugin-api/on_failure_entitlement_result'
|
53
55
|
require 'killbill/gen/plugin-api/on_success_entitlement_result'
|
54
56
|
require 'killbill/gen/plugin-api/prior_entitlement_result'
|
55
|
-
require 'killbill/gen/plugin-api/
|
56
|
-
require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
|
57
|
+
require 'killbill/gen/plugin-api/entitlement_plugin_api_exception'
|
57
58
|
require 'killbill/gen/plugin-api/payment_transaction_info_plugin'
|
59
|
+
require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
|
60
|
+
require 'killbill/gen/plugin-api/gateway_notification'
|