killbill 9.3.2 → 9.4.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/Gemfile.lock +1 -1
- data/Jarfile +3 -3
- data/Jarfile.lock +17 -16
- data/NEWS +3 -0
- data/lib/killbill/gen/api/account.rb +1 -13
- data/lib/killbill/gen/api/account_data.rb +1 -13
- data/lib/killbill/gen/api/catalog_user_api.rb +11 -5
- data/lib/killbill/gen/api/invoice_payment_api.rb +94 -0
- data/lib/killbill/gen/api/migration_plan.rb +8 -1
- data/lib/killbill/gen/api/mutable_account_data.rb +1 -13
- data/lib/killbill/gen/api/plan.rb +8 -1
- data/lib/killbill/gen/api/require_gen.rb +1 -0
- data/lib/killbill/gen/api/versioned_catalog.rb +185 -0
- data/lib/killbill/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9a5f16eb8d2d7d84e106cd72a7641f4c5df8e1c1
|
|
4
|
+
data.tar.gz: 808645deb5a84812d8cdd31e3333d07c25288d83
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 984159049756726d30838852e556628bf8357b3700ac176dd19aece003f79e625778cf5a326ab08f0fd04463f249fe672619173685fa662d67d4a7e0d8020e88
|
|
7
|
+
data.tar.gz: 268ee0eb07937c1cd1664d23daf43bd43591fa280c1e64db6c40504eaf869f8890a088578517e8cc02aeeecc48e2c7498d2df06ebef10b58bbf48f86717a4bcc
|
data/Gemfile.lock
CHANGED
data/Jarfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
jar 'org.kill-bill.billing:killbill-api', '0.51.
|
|
1
|
+
jar 'org.kill-bill.billing:killbill-api', '0.51.27'
|
|
2
2
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.24.8'
|
|
3
3
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.24.8'
|
|
4
4
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.24.8'
|
|
@@ -6,7 +6,7 @@ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.24.8'
|
|
|
6
6
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.24.8'
|
|
7
7
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.24.8'
|
|
8
8
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.24.8'
|
|
9
|
-
jar 'org.kill-bill.billing:killbill-util:tests', '0.19.
|
|
10
|
-
jar 'org.kill-bill.billing:killbill-util', '0.19.
|
|
9
|
+
jar 'org.kill-bill.billing:killbill-util:tests', '0.19.18'
|
|
10
|
+
jar 'org.kill-bill.billing:killbill-util', '0.19.18'
|
|
11
11
|
jar 'org.mockito:mockito-all', '1.10.19'
|
|
12
12
|
jar 'javax.servlet:javax.servlet-api', '3.1.0'
|
data/Jarfile.lock
CHANGED
|
@@ -1,35 +1,37 @@
|
|
|
1
1
|
---
|
|
2
2
|
:runtime:
|
|
3
|
+
- org.kill-bill.commons:killbill-clock:jar:0.21.15
|
|
3
4
|
- com.zaxxer:HikariCP-java6:jar:2.3.13
|
|
4
5
|
- net.jcip:jcip-annotations:jar:1.0
|
|
6
|
+
- org.kill-bill.billing:killbill-api:jar:0.51.27
|
|
5
7
|
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.6.7
|
|
6
8
|
- org.skife.config:config-magic:jar:0.17
|
|
7
9
|
- org.weakref:jmxutils:jar:1.19
|
|
8
|
-
- org.kill-bill.commons:killbill-locker:jar:0.21.13
|
|
9
10
|
- aopalliance:aopalliance:jar:1.0
|
|
10
11
|
- org.osgi:org.osgi.core:jar:5.0.0
|
|
11
12
|
- com.ning:async-http-client:jar:1.9.40
|
|
13
|
+
- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.19
|
|
14
|
+
- org.kill-bill.billing:killbill-internal-api:jar:0.19.18
|
|
12
15
|
- org.joda:joda-money:jar:0.9
|
|
13
16
|
- org.ehcache.integrations.shiro:shiro-ehcache3:jar:1.0.0
|
|
17
|
+
- org.kill-bill.commons:killbill-concurrent:jar:0.21.15
|
|
18
|
+
- org.kill-bill.billing:killbill-util:jar:0.19.18
|
|
14
19
|
- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.7
|
|
15
|
-
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.13
|
|
16
20
|
- com.fasterxml:classmate:jar:1.1.0
|
|
17
21
|
- org.slf4j:jcl-over-slf4j:jar:1.7.25
|
|
18
|
-
- org.
|
|
19
|
-
- org.kill-bill.commons:killbill-xmlloader:jar:0.21.13
|
|
22
|
+
- org.jasypt:jasypt:jar:1.9.2
|
|
20
23
|
- com.google.inject:guice:jar:3.0
|
|
24
|
+
- org.kill-bill.billing:killbill-platform-api:jar:0.37.19
|
|
21
25
|
- io.netty:netty:jar:3.10.6.Final
|
|
22
|
-
- org.kill-bill.commons:killbill-jdbi:jar:0.21.13
|
|
23
26
|
- org.apache.felix:org.apache.felix.framework:jar:4.4.1
|
|
24
27
|
- org.ehcache:ehcache-clustered:jar:3.3.1
|
|
28
|
+
- org.kill-bill.billing:killbill-util:jar:tests:0.19.18
|
|
25
29
|
- com.google.code.findbugs:jsr305:jar:3.0.1
|
|
26
|
-
- org.kill-bill.billing:killbill-internal-api:jar:0.19.16
|
|
27
30
|
- com.google.guava:guava:jar:20.0
|
|
28
31
|
- com.samskivert:jmustache:jar:1.5
|
|
29
|
-
- org.kill-bill.billing:killbill-platform-
|
|
32
|
+
- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.19
|
|
30
33
|
- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.24.8
|
|
31
34
|
- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.24.8
|
|
32
|
-
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.14
|
|
33
35
|
- javax.cache:cache-api:jar:1.0.0
|
|
34
36
|
- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
|
|
35
37
|
- com.fasterxml.jackson.core:jackson-annotations:jar:2.6.7
|
|
@@ -37,34 +39,33 @@
|
|
|
37
39
|
- org.ow2.asm:asm:jar:5.0.3
|
|
38
40
|
- com.fasterxml.jackson.core:jackson-databind:jar:2.6.7
|
|
39
41
|
- com.google.code.findbugs:annotations:jar:3.0.1u2
|
|
40
|
-
- org.kill-bill.billing:killbill-api:jar:0.51.25
|
|
41
42
|
- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.24.8
|
|
42
43
|
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.24.8
|
|
43
|
-
- org.kill-bill.commons:killbill-concurrent:jar:0.21.13
|
|
44
|
-
- org.kill-bill.billing:killbill-util:jar:0.19.16
|
|
45
|
-
- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.14
|
|
46
44
|
- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.24.8
|
|
47
45
|
- org.antlr:ST4:jar:4.0.8
|
|
48
46
|
- org.apache.shiro:shiro-guice:jar:1.3.2
|
|
49
47
|
- org.antlr:antlr-runtime:jar:3.5.2
|
|
48
|
+
- org.kill-bill.commons:killbill-locker:jar:0.21.15
|
|
50
49
|
- org.ehcache:ehcache:jar:3.3.1
|
|
51
|
-
- org.kill-bill.billing:killbill-platform-api:jar:0.37.14
|
|
52
50
|
- io.dropwizard.metrics:metrics-jcache:jar:3.2.2
|
|
53
51
|
- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.6.7
|
|
54
52
|
- com.google.inject.extensions:guice-multibindings:jar:3.0
|
|
55
53
|
- joda-time:joda-time:jar:2.9.9
|
|
56
54
|
- javax.inject:javax.inject:jar:1
|
|
57
|
-
- org.kill-bill.billing:killbill-util:jar:tests:0.19.16
|
|
58
55
|
- com.h2database:h2:jar:1.4.194
|
|
59
56
|
- commons-beanutils:commons-beanutils:jar:1.8.3
|
|
60
57
|
- javax.servlet:javax.servlet-api:jar:3.1.0
|
|
61
58
|
- com.fasterxml.jackson.core:jackson-core:jar:2.6.7
|
|
59
|
+
- org.kill-bill.commons:killbill-jdbi:jar:0.21.15
|
|
62
60
|
- cglib:cglib:jar:3.1
|
|
63
61
|
- io.dropwizard.metrics:metrics-core:jar:3.2.2
|
|
64
|
-
- org.kill-bill.
|
|
62
|
+
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.15
|
|
63
|
+
- org.kill-bill.billing:killbill-platform-base:jar:0.37.19
|
|
64
|
+
- org.kill-bill.commons:killbill-queue:jar:0.21.15
|
|
65
65
|
- org.slf4j:slf4j-api:jar:1.7.25
|
|
66
|
+
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.19
|
|
67
|
+
- org.kill-bill.commons:killbill-xmlloader:jar:0.21.15
|
|
66
68
|
- org.mockito:mockito-all:jar:1.10.19
|
|
67
69
|
- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.24.8
|
|
68
70
|
- org.osgi:org.osgi.compendium:jar:5.0.0
|
|
69
71
|
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.24.8
|
|
70
|
-
- org.kill-bill.commons:killbill-clock:jar:0.21.13
|
data/NEWS
CHANGED
|
@@ -34,7 +34,7 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.account.api.Account
|
|
36
36
|
|
|
37
|
-
attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :fixed_offset_time_zone, :reference_time, :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, :
|
|
37
|
+
attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :fixed_offset_time_zone, :reference_time, :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, :parent_account_id, :is_payment_delegated_to_parent, :notes
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
@@ -122,9 +122,6 @@ module Killbill
|
|
|
122
122
|
# conversion for is_migrated [type = java.lang.Boolean]
|
|
123
123
|
@is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
|
|
124
124
|
|
|
125
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
126
|
-
@is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
|
|
127
|
-
|
|
128
125
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
129
126
|
@parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
|
|
130
127
|
|
|
@@ -236,15 +233,6 @@ module Killbill
|
|
|
236
233
|
@is_migrated = tmp_bool ? true : false
|
|
237
234
|
end
|
|
238
235
|
|
|
239
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
240
|
-
@is_notified_for_invoices = j_obj.is_notified_for_invoices
|
|
241
|
-
if @is_notified_for_invoices.nil?
|
|
242
|
-
@is_notified_for_invoices = false
|
|
243
|
-
else
|
|
244
|
-
tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
|
|
245
|
-
@is_notified_for_invoices = tmp_bool ? true : false
|
|
246
|
-
end
|
|
247
|
-
|
|
248
236
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
249
237
|
@parent_account_id = j_obj.parent_account_id
|
|
250
238
|
@parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
|
|
@@ -34,7 +34,7 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.account.api.AccountData
|
|
36
36
|
|
|
37
|
-
attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :
|
|
37
|
+
attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :parent_account_id, :is_payment_delegated_to_parent, :notes
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
@@ -102,9 +102,6 @@ module Killbill
|
|
|
102
102
|
# conversion for is_migrated [type = java.lang.Boolean]
|
|
103
103
|
@is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
|
|
104
104
|
|
|
105
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
106
|
-
@is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
|
|
107
|
-
|
|
108
105
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
109
106
|
@parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
|
|
110
107
|
|
|
@@ -190,15 +187,6 @@ module Killbill
|
|
|
190
187
|
@is_migrated = tmp_bool ? true : false
|
|
191
188
|
end
|
|
192
189
|
|
|
193
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
194
|
-
@is_notified_for_invoices = j_obj.is_notified_for_invoices
|
|
195
|
-
if @is_notified_for_invoices.nil?
|
|
196
|
-
@is_notified_for_invoices = false
|
|
197
|
-
else
|
|
198
|
-
tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
|
|
199
|
-
@is_notified_for_invoices = tmp_bool ? true : false
|
|
200
|
-
end
|
|
201
|
-
|
|
202
190
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
203
191
|
@parent_account_id = j_obj.parent_account_id
|
|
204
192
|
@parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
|
|
@@ -39,18 +39,24 @@ module Killbill
|
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
|
|
42
|
-
java_signature 'Java::org.killbill.billing.catalog.api.
|
|
43
|
-
def get_catalog(catalogName, context)
|
|
42
|
+
java_signature 'Java::org.killbill.billing.catalog.api.VersionedCatalog getCatalog(Java::java.lang.String, Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
|
43
|
+
def get_catalog(catalogName, catalogDateVersion, context)
|
|
44
44
|
|
|
45
45
|
# conversion for catalogName [type = java.lang.String]
|
|
46
46
|
catalogName = catalogName.to_s unless catalogName.nil?
|
|
47
47
|
|
|
48
|
+
# conversion for catalogDateVersion [type = org.joda.time.DateTime]
|
|
49
|
+
if !catalogDateVersion.nil?
|
|
50
|
+
catalogDateVersion = (catalogDateVersion.kind_of? Time) ? DateTime.parse(catalogDateVersion.to_s) : catalogDateVersion
|
|
51
|
+
catalogDateVersion = Java::org.joda.time.DateTime.new(catalogDateVersion.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
52
|
+
end
|
|
53
|
+
|
|
48
54
|
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
|
49
55
|
context = context.to_java unless context.nil?
|
|
50
56
|
begin
|
|
51
|
-
res = @real_java_api.get_catalog(catalogName, context)
|
|
52
|
-
# conversion for res [type = org.killbill.billing.catalog.api.
|
|
53
|
-
res = Killbill::Plugin::Model::
|
|
57
|
+
res = @real_java_api.get_catalog(catalogName, catalogDateVersion, context)
|
|
58
|
+
# conversion for res [type = org.killbill.billing.catalog.api.VersionedCatalog]
|
|
59
|
+
res = Killbill::Plugin::Model::VersionedCatalog.new.to_ruby(res) unless res.nil?
|
|
54
60
|
return res
|
|
55
61
|
rescue Java::org.killbill.billing.catalog.api.CatalogApiException => e
|
|
56
62
|
raise Killbill::Plugin::Model::CatalogApiException.new.to_ruby(e)
|
|
@@ -233,6 +233,100 @@ module Killbill
|
|
|
233
233
|
end
|
|
234
234
|
end
|
|
235
235
|
|
|
236
|
+
java_signature 'Java::org.killbill.billing.invoice.api.InvoicePayment createChargebackForInvoicePayment(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::org.joda.time.DateTime, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
|
237
|
+
def create_chargeback_for_invoice_payment(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
|
238
|
+
|
|
239
|
+
# conversion for account [type = org.killbill.billing.account.api.Account]
|
|
240
|
+
account = account.to_java unless account.nil?
|
|
241
|
+
|
|
242
|
+
# conversion for paymentId [type = java.util.UUID]
|
|
243
|
+
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
|
244
|
+
|
|
245
|
+
# conversion for amount [type = java.math.BigDecimal]
|
|
246
|
+
if amount.nil?
|
|
247
|
+
amount = java.math.BigDecimal::ZERO
|
|
248
|
+
else
|
|
249
|
+
amount = java.math.BigDecimal.new(amount.to_s)
|
|
250
|
+
end
|
|
251
|
+
|
|
252
|
+
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
|
253
|
+
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
|
254
|
+
|
|
255
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
|
256
|
+
if !effectiveDate.nil?
|
|
257
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
|
258
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
259
|
+
end
|
|
260
|
+
|
|
261
|
+
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
|
262
|
+
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
|
263
|
+
|
|
264
|
+
# conversion for properties [type = java.lang.Iterable]
|
|
265
|
+
tmp = java.util.ArrayList.new
|
|
266
|
+
(properties || []).each do |m|
|
|
267
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
|
268
|
+
m = m.to_java unless m.nil?
|
|
269
|
+
tmp.add(m)
|
|
270
|
+
end
|
|
271
|
+
properties = tmp
|
|
272
|
+
|
|
273
|
+
# conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
|
|
274
|
+
paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
|
|
275
|
+
|
|
276
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
|
277
|
+
context = context.to_java unless context.nil?
|
|
278
|
+
begin
|
|
279
|
+
res = @real_java_api.create_chargeback_for_invoice_payment(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
|
280
|
+
# conversion for res [type = org.killbill.billing.invoice.api.InvoicePayment]
|
|
281
|
+
res = Killbill::Plugin::Model::InvoicePayment.new.to_ruby(res) unless res.nil?
|
|
282
|
+
return res
|
|
283
|
+
rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
|
|
284
|
+
raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
|
|
285
|
+
end
|
|
286
|
+
end
|
|
287
|
+
|
|
288
|
+
java_signature 'Java::org.killbill.billing.invoice.api.InvoicePayment createChargebackReversalForInvoicePayment(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::org.joda.time.DateTime, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
|
289
|
+
def create_chargeback_reversal_for_invoice_payment(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
|
290
|
+
|
|
291
|
+
# conversion for account [type = org.killbill.billing.account.api.Account]
|
|
292
|
+
account = account.to_java unless account.nil?
|
|
293
|
+
|
|
294
|
+
# conversion for paymentId [type = java.util.UUID]
|
|
295
|
+
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
|
296
|
+
|
|
297
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
|
298
|
+
if !effectiveDate.nil?
|
|
299
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
|
300
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
301
|
+
end
|
|
302
|
+
|
|
303
|
+
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
|
304
|
+
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
|
305
|
+
|
|
306
|
+
# conversion for properties [type = java.lang.Iterable]
|
|
307
|
+
tmp = java.util.ArrayList.new
|
|
308
|
+
(properties || []).each do |m|
|
|
309
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
|
310
|
+
m = m.to_java unless m.nil?
|
|
311
|
+
tmp.add(m)
|
|
312
|
+
end
|
|
313
|
+
properties = tmp
|
|
314
|
+
|
|
315
|
+
# conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
|
|
316
|
+
paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
|
|
317
|
+
|
|
318
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
|
319
|
+
context = context.to_java unless context.nil?
|
|
320
|
+
begin
|
|
321
|
+
res = @real_java_api.create_chargeback_reversal_for_invoice_payment(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
|
322
|
+
# conversion for res [type = org.killbill.billing.invoice.api.InvoicePayment]
|
|
323
|
+
res = Killbill::Plugin::Model::InvoicePayment.new.to_ruby(res) unless res.nil?
|
|
324
|
+
return res
|
|
325
|
+
rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
|
|
326
|
+
raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
|
|
327
|
+
end
|
|
328
|
+
end
|
|
329
|
+
|
|
236
330
|
java_signature 'Java::java.util.List getInvoicePayments(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
|
237
331
|
def get_invoice_payments(paymentId, context)
|
|
238
332
|
|
|
@@ -34,12 +34,15 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.catalog.api.MigrationPlan
|
|
36
36
|
|
|
37
|
-
attr_accessor :recurring_billing_mode, :initial_phases, :product, :price_list_name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions, :name, :pretty_name
|
|
37
|
+
attr_accessor :catalog, :recurring_billing_mode, :initial_phases, :product, :price_list_name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions, :name, :pretty_name
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
def to_java()
|
|
43
|
+
# conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
|
|
44
|
+
@catalog = @catalog.to_java unless @catalog.nil?
|
|
45
|
+
|
|
43
46
|
# conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
|
|
44
47
|
@recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
|
|
45
48
|
|
|
@@ -95,6 +98,10 @@ module Killbill
|
|
|
95
98
|
end
|
|
96
99
|
|
|
97
100
|
def to_ruby(j_obj)
|
|
101
|
+
# conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
|
|
102
|
+
@catalog = j_obj.catalog
|
|
103
|
+
@catalog = Killbill::Plugin::Model::StaticCatalog.new.to_ruby(@catalog) unless @catalog.nil?
|
|
104
|
+
|
|
98
105
|
# conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
|
|
99
106
|
@recurring_billing_mode = j_obj.recurring_billing_mode
|
|
100
107
|
@recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
|
|
@@ -34,7 +34,7 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.account.api.MutableAccountData
|
|
36
36
|
|
|
37
|
-
attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :
|
|
37
|
+
attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :parent_account_id, :is_payment_delegated_to_parent, :notes
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
@@ -102,9 +102,6 @@ module Killbill
|
|
|
102
102
|
# conversion for is_migrated [type = java.lang.Boolean]
|
|
103
103
|
@is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
|
|
104
104
|
|
|
105
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
106
|
-
@is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
|
|
107
|
-
|
|
108
105
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
109
106
|
@parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
|
|
110
107
|
|
|
@@ -190,15 +187,6 @@ module Killbill
|
|
|
190
187
|
@is_migrated = tmp_bool ? true : false
|
|
191
188
|
end
|
|
192
189
|
|
|
193
|
-
# conversion for is_notified_for_invoices [type = java.lang.Boolean]
|
|
194
|
-
@is_notified_for_invoices = j_obj.is_notified_for_invoices
|
|
195
|
-
if @is_notified_for_invoices.nil?
|
|
196
|
-
@is_notified_for_invoices = false
|
|
197
|
-
else
|
|
198
|
-
tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
|
|
199
|
-
@is_notified_for_invoices = tmp_bool ? true : false
|
|
200
|
-
end
|
|
201
|
-
|
|
202
190
|
# conversion for parent_account_id [type = java.util.UUID]
|
|
203
191
|
@parent_account_id = j_obj.parent_account_id
|
|
204
192
|
@parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
|
|
@@ -34,7 +34,7 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.catalog.api.Plan
|
|
36
36
|
|
|
37
|
-
attr_accessor :name, :pretty_name, :recurring_billing_mode, :initial_phases, :product, :price_list_name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
|
|
37
|
+
attr_accessor :name, :pretty_name, :catalog, :recurring_billing_mode, :initial_phases, :product, :price_list_name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
@@ -46,6 +46,9 @@ module Killbill
|
|
|
46
46
|
# conversion for pretty_name [type = java.lang.String]
|
|
47
47
|
@pretty_name = @pretty_name.to_s unless @pretty_name.nil?
|
|
48
48
|
|
|
49
|
+
# conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
|
|
50
|
+
@catalog = @catalog.to_java unless @catalog.nil?
|
|
51
|
+
|
|
49
52
|
# conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
|
|
50
53
|
@recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
|
|
51
54
|
|
|
@@ -101,6 +104,10 @@ module Killbill
|
|
|
101
104
|
# conversion for pretty_name [type = java.lang.String]
|
|
102
105
|
@pretty_name = j_obj.pretty_name
|
|
103
106
|
|
|
107
|
+
# conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
|
|
108
|
+
@catalog = j_obj.catalog
|
|
109
|
+
@catalog = Killbill::Plugin::Model::StaticCatalog.new.to_ruby(@catalog) unless @catalog.nil?
|
|
110
|
+
|
|
104
111
|
# conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
|
|
105
112
|
@recurring_billing_mode = j_obj.recurring_billing_mode
|
|
106
113
|
@recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
|
|
@@ -81,6 +81,7 @@ require 'killbill/gen/api/tier_price_override'
|
|
|
81
81
|
require 'killbill/gen/api/unit'
|
|
82
82
|
require 'killbill/gen/api/usage'
|
|
83
83
|
require 'killbill/gen/api/usage_price_override'
|
|
84
|
+
require 'killbill/gen/api/versioned_catalog'
|
|
84
85
|
require 'killbill/gen/api/currency_conversion'
|
|
85
86
|
require 'killbill/gen/api/currency_conversion_api'
|
|
86
87
|
require 'killbill/gen/api/currency_conversion_exception'
|
|
@@ -0,0 +1,185 @@
|
|
|
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
|
+
java_package 'org.killbill.billing.catalog.api'
|
|
33
|
+
class VersionedCatalog
|
|
34
|
+
|
|
35
|
+
include org.killbill.billing.catalog.api.VersionedCatalog
|
|
36
|
+
|
|
37
|
+
attr_accessor :catalog_name, :effective_date, :current_supported_currencies, :current_products, :current_units, :current_plans, :available_base_plan_listings, :versions
|
|
38
|
+
|
|
39
|
+
def initialize()
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def to_java()
|
|
43
|
+
# conversion for catalog_name [type = java.lang.String]
|
|
44
|
+
@catalog_name = @catalog_name.to_s unless @catalog_name.nil?
|
|
45
|
+
|
|
46
|
+
# conversion for effective_date [type = java.util.Date]
|
|
47
|
+
if !@effective_date.nil?
|
|
48
|
+
@effective_date = (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
|
|
49
|
+
@effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
50
|
+
@effective_date = @effective_date.to_date
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
# conversion for current_supported_currencies [type = org.killbill.billing.catalog.api.Currency[]]
|
|
54
|
+
tmp = []
|
|
55
|
+
(@current_supported_currencies || []).each do |m|
|
|
56
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Currency]
|
|
57
|
+
m = Java::org.killbill.billing.catalog.api.Currency.value_of( m.to_s ) unless m.nil?
|
|
58
|
+
tmp << m
|
|
59
|
+
end
|
|
60
|
+
@current_supported_currencies = tmp.to_java Java::org.killbill.billing.catalog.api.Currency
|
|
61
|
+
|
|
62
|
+
# conversion for current_products [type = java.util.Collection]
|
|
63
|
+
tmp = java.util.ArrayList.new
|
|
64
|
+
(@current_products || []).each do |m|
|
|
65
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Product]
|
|
66
|
+
m = m.to_java unless m.nil?
|
|
67
|
+
tmp.add(m)
|
|
68
|
+
end
|
|
69
|
+
@current_products = tmp
|
|
70
|
+
|
|
71
|
+
# conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
|
|
72
|
+
tmp = []
|
|
73
|
+
(@current_units || []).each do |m|
|
|
74
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Unit]
|
|
75
|
+
m = m.to_java unless m.nil?
|
|
76
|
+
tmp << m
|
|
77
|
+
end
|
|
78
|
+
@current_units = tmp.to_java Java::org.killbill.billing.catalog.api.Unit
|
|
79
|
+
|
|
80
|
+
# conversion for current_plans [type = java.util.Collection]
|
|
81
|
+
tmp = java.util.ArrayList.new
|
|
82
|
+
(@current_plans || []).each do |m|
|
|
83
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Plan]
|
|
84
|
+
m = m.to_java unless m.nil?
|
|
85
|
+
tmp.add(m)
|
|
86
|
+
end
|
|
87
|
+
@current_plans = tmp
|
|
88
|
+
|
|
89
|
+
# conversion for available_base_plan_listings [type = java.util.List]
|
|
90
|
+
tmp = java.util.ArrayList.new
|
|
91
|
+
(@available_base_plan_listings || []).each do |m|
|
|
92
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Listing]
|
|
93
|
+
m = m.to_java unless m.nil?
|
|
94
|
+
tmp.add(m)
|
|
95
|
+
end
|
|
96
|
+
@available_base_plan_listings = tmp
|
|
97
|
+
|
|
98
|
+
# conversion for versions [type = java.util.List]
|
|
99
|
+
tmp = java.util.ArrayList.new
|
|
100
|
+
(@versions || []).each do |m|
|
|
101
|
+
# conversion for m [type = Undefined]
|
|
102
|
+
tmp.add(m)
|
|
103
|
+
end
|
|
104
|
+
@versions = tmp
|
|
105
|
+
self
|
|
106
|
+
end
|
|
107
|
+
|
|
108
|
+
def to_ruby(j_obj)
|
|
109
|
+
# conversion for catalog_name [type = java.lang.String]
|
|
110
|
+
@catalog_name = j_obj.catalog_name
|
|
111
|
+
|
|
112
|
+
# conversion for effective_date [type = java.util.Date]
|
|
113
|
+
@effective_date = j_obj.effective_date
|
|
114
|
+
if !@effective_date.nil?
|
|
115
|
+
@effective_date = Java::org.joda.time.DateTime.new(@effective_date)
|
|
116
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
|
117
|
+
str = fmt.print(@effective_date)
|
|
118
|
+
@effective_date = DateTime.iso8601(str)
|
|
119
|
+
end
|
|
120
|
+
|
|
121
|
+
# conversion for current_supported_currencies [type = org.killbill.billing.catalog.api.Currency[]]
|
|
122
|
+
@current_supported_currencies = j_obj.current_supported_currencies
|
|
123
|
+
tmp = []
|
|
124
|
+
(@current_supported_currencies || []).each do |m|
|
|
125
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Currency]
|
|
126
|
+
m = m.to_s.to_sym unless m.nil?
|
|
127
|
+
tmp << m
|
|
128
|
+
end
|
|
129
|
+
@current_supported_currencies = tmp
|
|
130
|
+
|
|
131
|
+
# conversion for current_products [type = java.util.Collection]
|
|
132
|
+
@current_products = j_obj.current_products
|
|
133
|
+
tmp = []
|
|
134
|
+
(@current_products || []).each do |m|
|
|
135
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Product]
|
|
136
|
+
m = Killbill::Plugin::Model::Product.new.to_ruby(m) unless m.nil?
|
|
137
|
+
tmp << m
|
|
138
|
+
end
|
|
139
|
+
@current_products = tmp
|
|
140
|
+
|
|
141
|
+
# conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
|
|
142
|
+
@current_units = j_obj.current_units
|
|
143
|
+
tmp = []
|
|
144
|
+
(@current_units || []).each do |m|
|
|
145
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Unit]
|
|
146
|
+
m = Killbill::Plugin::Model::Unit.new.to_ruby(m) unless m.nil?
|
|
147
|
+
tmp << m
|
|
148
|
+
end
|
|
149
|
+
@current_units = tmp
|
|
150
|
+
|
|
151
|
+
# conversion for current_plans [type = java.util.Collection]
|
|
152
|
+
@current_plans = j_obj.current_plans
|
|
153
|
+
tmp = []
|
|
154
|
+
(@current_plans || []).each do |m|
|
|
155
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Plan]
|
|
156
|
+
m = Killbill::Plugin::Model::Plan.new.to_ruby(m) unless m.nil?
|
|
157
|
+
tmp << m
|
|
158
|
+
end
|
|
159
|
+
@current_plans = tmp
|
|
160
|
+
|
|
161
|
+
# conversion for available_base_plan_listings [type = java.util.List]
|
|
162
|
+
@available_base_plan_listings = j_obj.available_base_plan_listings
|
|
163
|
+
tmp = []
|
|
164
|
+
(@available_base_plan_listings || []).each do |m|
|
|
165
|
+
# conversion for m [type = org.killbill.billing.catalog.api.Listing]
|
|
166
|
+
m = Killbill::Plugin::Model::Listing.new.to_ruby(m) unless m.nil?
|
|
167
|
+
tmp << m
|
|
168
|
+
end
|
|
169
|
+
@available_base_plan_listings = tmp
|
|
170
|
+
|
|
171
|
+
# conversion for versions [type = java.util.List]
|
|
172
|
+
@versions = j_obj.versions
|
|
173
|
+
tmp = []
|
|
174
|
+
(@versions || []).each do |m|
|
|
175
|
+
# conversion for m [type = Undefined]
|
|
176
|
+
tmp << m
|
|
177
|
+
end
|
|
178
|
+
@versions = tmp
|
|
179
|
+
self
|
|
180
|
+
end
|
|
181
|
+
|
|
182
|
+
end
|
|
183
|
+
end
|
|
184
|
+
end
|
|
185
|
+
end
|
data/lib/killbill/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: killbill
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 9.
|
|
4
|
+
version: 9.4.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kill Bill core team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-07-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -525,6 +525,7 @@ files:
|
|
|
525
525
|
- lib/killbill/gen/api/usage_price_override.rb
|
|
526
526
|
- lib/killbill/gen/api/usage_record.rb
|
|
527
527
|
- lib/killbill/gen/api/usage_user_api.rb
|
|
528
|
+
- lib/killbill/gen/api/versioned_catalog.rb
|
|
528
529
|
- lib/killbill/gen/plugin-api/blocking_state_metadata.rb
|
|
529
530
|
- lib/killbill/gen/plugin-api/broadcast_metadata.rb
|
|
530
531
|
- lib/killbill/gen/plugin-api/catalog_plugin_api.rb
|