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
@@ -0,0 +1,120 @@
|
|
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.overdue.api'
|
33
|
+
class OverdueState
|
34
|
+
|
35
|
+
include org.killbill.billing.overdue.api.OverdueState
|
36
|
+
|
37
|
+
attr_accessor :overdue_condition, :name, :external_message, :is_block_changes, :is_disable_entitlement_and_changes_blocked, :overdue_cancellation_policy, :is_clear_state, :auto_reevaluation_interval
|
38
|
+
|
39
|
+
def initialize()
|
40
|
+
end
|
41
|
+
|
42
|
+
def to_java()
|
43
|
+
# conversion for overdue_condition [type = org.killbill.billing.overdue.api.OverdueCondition]
|
44
|
+
@overdue_condition = @overdue_condition.to_java unless @overdue_condition.nil?
|
45
|
+
|
46
|
+
# conversion for name [type = java.lang.String]
|
47
|
+
@name = @name.to_s unless @name.nil?
|
48
|
+
|
49
|
+
# conversion for external_message [type = java.lang.String]
|
50
|
+
@external_message = @external_message.to_s unless @external_message.nil?
|
51
|
+
|
52
|
+
# conversion for is_block_changes [type = boolean]
|
53
|
+
@is_block_changes = @is_block_changes.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_block_changes)
|
54
|
+
|
55
|
+
# conversion for is_disable_entitlement_and_changes_blocked [type = boolean]
|
56
|
+
@is_disable_entitlement_and_changes_blocked = @is_disable_entitlement_and_changes_blocked.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_disable_entitlement_and_changes_blocked)
|
57
|
+
|
58
|
+
# conversion for overdue_cancellation_policy [type = org.killbill.billing.overdue.api.OverdueCancellationPolicy]
|
59
|
+
@overdue_cancellation_policy = Java::org.killbill.billing.overdue.api.OverdueCancellationPolicy.value_of( @overdue_cancellation_policy.to_s ) unless @overdue_cancellation_policy.nil?
|
60
|
+
|
61
|
+
# conversion for is_clear_state [type = boolean]
|
62
|
+
@is_clear_state = @is_clear_state.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_clear_state)
|
63
|
+
|
64
|
+
# conversion for auto_reevaluation_interval [type = org.killbill.billing.catalog.api.Duration]
|
65
|
+
@auto_reevaluation_interval = @auto_reevaluation_interval.to_java unless @auto_reevaluation_interval.nil?
|
66
|
+
self
|
67
|
+
end
|
68
|
+
|
69
|
+
def to_ruby(j_obj)
|
70
|
+
# conversion for overdue_condition [type = org.killbill.billing.overdue.api.OverdueCondition]
|
71
|
+
@overdue_condition = j_obj.overdue_condition
|
72
|
+
@overdue_condition = Killbill::Plugin::Model::OverdueCondition.new.to_ruby(@overdue_condition) unless @overdue_condition.nil?
|
73
|
+
|
74
|
+
# conversion for name [type = java.lang.String]
|
75
|
+
@name = j_obj.name
|
76
|
+
|
77
|
+
# conversion for external_message [type = java.lang.String]
|
78
|
+
@external_message = j_obj.external_message
|
79
|
+
|
80
|
+
# conversion for is_block_changes [type = boolean]
|
81
|
+
@is_block_changes = j_obj.is_block_changes
|
82
|
+
if @is_block_changes.nil?
|
83
|
+
@is_block_changes = false
|
84
|
+
else
|
85
|
+
tmp_bool = (@is_block_changes.java_kind_of? java.lang.Boolean) ? @is_block_changes.boolean_value : @is_block_changes
|
86
|
+
@is_block_changes = tmp_bool ? true : false
|
87
|
+
end
|
88
|
+
|
89
|
+
# conversion for is_disable_entitlement_and_changes_blocked [type = boolean]
|
90
|
+
@is_disable_entitlement_and_changes_blocked = j_obj.is_disable_entitlement_and_changes_blocked
|
91
|
+
if @is_disable_entitlement_and_changes_blocked.nil?
|
92
|
+
@is_disable_entitlement_and_changes_blocked = false
|
93
|
+
else
|
94
|
+
tmp_bool = (@is_disable_entitlement_and_changes_blocked.java_kind_of? java.lang.Boolean) ? @is_disable_entitlement_and_changes_blocked.boolean_value : @is_disable_entitlement_and_changes_blocked
|
95
|
+
@is_disable_entitlement_and_changes_blocked = tmp_bool ? true : false
|
96
|
+
end
|
97
|
+
|
98
|
+
# conversion for overdue_cancellation_policy [type = org.killbill.billing.overdue.api.OverdueCancellationPolicy]
|
99
|
+
@overdue_cancellation_policy = j_obj.overdue_cancellation_policy
|
100
|
+
@overdue_cancellation_policy = @overdue_cancellation_policy.to_s.to_sym unless @overdue_cancellation_policy.nil?
|
101
|
+
|
102
|
+
# conversion for is_clear_state [type = boolean]
|
103
|
+
@is_clear_state = j_obj.is_clear_state
|
104
|
+
if @is_clear_state.nil?
|
105
|
+
@is_clear_state = false
|
106
|
+
else
|
107
|
+
tmp_bool = (@is_clear_state.java_kind_of? java.lang.Boolean) ? @is_clear_state.boolean_value : @is_clear_state
|
108
|
+
@is_clear_state = tmp_bool ? true : false
|
109
|
+
end
|
110
|
+
|
111
|
+
# conversion for auto_reevaluation_interval [type = org.killbill.billing.catalog.api.Duration]
|
112
|
+
@auto_reevaluation_interval = j_obj.auto_reevaluation_interval
|
113
|
+
@auto_reevaluation_interval = Killbill::Plugin::Model::Duration.new.to_ruby(@auto_reevaluation_interval) unless @auto_reevaluation_interval.nil?
|
114
|
+
self
|
115
|
+
end
|
116
|
+
|
117
|
+
end
|
118
|
+
end
|
119
|
+
end
|
120
|
+
end
|
@@ -0,0 +1,72 @@
|
|
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.overdue.api'
|
33
|
+
class OverdueStatesAccount
|
34
|
+
|
35
|
+
include org.killbill.billing.overdue.api.OverdueStatesAccount
|
36
|
+
|
37
|
+
attr_accessor :initial_reevaluation_interval, :states
|
38
|
+
|
39
|
+
def initialize()
|
40
|
+
end
|
41
|
+
|
42
|
+
def to_java()
|
43
|
+
|
44
|
+
# conversion for states [type = org.killbill.billing.overdue.api.OverdueState[]]
|
45
|
+
tmp = []
|
46
|
+
(@states || []).each do |m|
|
47
|
+
# conversion for m [type = org.killbill.billing.overdue.api.OverdueState]
|
48
|
+
m = m.to_java unless m.nil?
|
49
|
+
tmp << m
|
50
|
+
end
|
51
|
+
@states = tmp.to_java Java::org.killbill.billing.overdue.api.OverdueState
|
52
|
+
self
|
53
|
+
end
|
54
|
+
|
55
|
+
def to_ruby(j_obj)
|
56
|
+
|
57
|
+
# conversion for states [type = org.killbill.billing.overdue.api.OverdueState[]]
|
58
|
+
@states = j_obj.states
|
59
|
+
tmp = []
|
60
|
+
(@states || []).each do |m|
|
61
|
+
# conversion for m [type = org.killbill.billing.overdue.api.OverdueState]
|
62
|
+
m = Killbill::Plugin::Model::OverdueState.new.to_ruby(m) unless m.nil?
|
63
|
+
tmp << m
|
64
|
+
end
|
65
|
+
@states = tmp
|
66
|
+
self
|
67
|
+
end
|
68
|
+
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
@@ -39,8 +39,8 @@ module Killbill
|
|
39
39
|
end
|
40
40
|
|
41
41
|
|
42
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createAuthorization(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
43
|
-
def create_authorization(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
42
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createAuthorization(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
43
|
+
def create_authorization(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
44
44
|
|
45
45
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
46
46
|
account = account.to_java unless account.nil?
|
@@ -61,6 +61,12 @@ module Killbill
|
|
61
61
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
62
62
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
63
63
|
|
64
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
65
|
+
if !effectiveDate.nil?
|
66
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
67
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
68
|
+
end
|
69
|
+
|
64
70
|
# conversion for paymentExternalKey [type = java.lang.String]
|
65
71
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
66
72
|
|
@@ -79,7 +85,7 @@ module Killbill
|
|
79
85
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
80
86
|
context = context.to_java unless context.nil?
|
81
87
|
begin
|
82
|
-
res = @real_java_api.create_authorization(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
88
|
+
res = @real_java_api.create_authorization(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
83
89
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
84
90
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
85
91
|
return res
|
@@ -88,8 +94,8 @@ module Killbill
|
|
88
94
|
end
|
89
95
|
end
|
90
96
|
|
91
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createAuthorizationWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
92
|
-
def create_authorization_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
97
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createAuthorizationWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
98
|
+
def create_authorization_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
93
99
|
|
94
100
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
95
101
|
account = account.to_java unless account.nil?
|
@@ -110,6 +116,12 @@ module Killbill
|
|
110
116
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
111
117
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
112
118
|
|
119
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
120
|
+
if !effectiveDate.nil?
|
121
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
122
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
123
|
+
end
|
124
|
+
|
113
125
|
# conversion for paymentExternalKey [type = java.lang.String]
|
114
126
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
115
127
|
|
@@ -131,7 +143,7 @@ module Killbill
|
|
131
143
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
132
144
|
context = context.to_java unless context.nil?
|
133
145
|
begin
|
134
|
-
res = @real_java_api.create_authorization_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
146
|
+
res = @real_java_api.create_authorization_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
135
147
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
136
148
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
137
149
|
return res
|
@@ -140,8 +152,8 @@ module Killbill
|
|
140
152
|
end
|
141
153
|
end
|
142
154
|
|
143
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createCapture(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
144
|
-
def create_capture(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, context)
|
155
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createCapture(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.util.callcontext.CallContext)'
|
156
|
+
def create_capture(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, context)
|
145
157
|
|
146
158
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
147
159
|
account = account.to_java unless account.nil?
|
@@ -159,6 +171,12 @@ module Killbill
|
|
159
171
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
160
172
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
161
173
|
|
174
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
175
|
+
if !effectiveDate.nil?
|
176
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
177
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
178
|
+
end
|
179
|
+
|
162
180
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
163
181
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
164
182
|
|
@@ -174,7 +192,7 @@ module Killbill
|
|
174
192
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
175
193
|
context = context.to_java unless context.nil?
|
176
194
|
begin
|
177
|
-
res = @real_java_api.create_capture(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, context)
|
195
|
+
res = @real_java_api.create_capture(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, context)
|
178
196
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
179
197
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
180
198
|
return res
|
@@ -183,8 +201,8 @@ module Killbill
|
|
183
201
|
end
|
184
202
|
end
|
185
203
|
|
186
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createCaptureWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
187
|
-
def create_capture_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
|
204
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createCaptureWithPaymentControl(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)'
|
205
|
+
def create_capture_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
188
206
|
|
189
207
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
190
208
|
account = account.to_java unless account.nil?
|
@@ -202,6 +220,12 @@ module Killbill
|
|
202
220
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
203
221
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
204
222
|
|
223
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
224
|
+
if !effectiveDate.nil?
|
225
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
226
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
227
|
+
end
|
228
|
+
|
205
229
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
206
230
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
207
231
|
|
@@ -220,7 +244,7 @@ module Killbill
|
|
220
244
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
221
245
|
context = context.to_java unless context.nil?
|
222
246
|
begin
|
223
|
-
res = @real_java_api.create_capture_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
|
247
|
+
res = @real_java_api.create_capture_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
224
248
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
225
249
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
226
250
|
return res
|
@@ -229,8 +253,8 @@ module Killbill
|
|
229
253
|
end
|
230
254
|
end
|
231
255
|
|
232
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createPurchase(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
233
|
-
def create_purchase(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
256
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createPurchase(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
257
|
+
def create_purchase(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
234
258
|
|
235
259
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
236
260
|
account = account.to_java unless account.nil?
|
@@ -251,6 +275,12 @@ module Killbill
|
|
251
275
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
252
276
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
253
277
|
|
278
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
279
|
+
if !effectiveDate.nil?
|
280
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
281
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
282
|
+
end
|
283
|
+
|
254
284
|
# conversion for paymentExternalKey [type = java.lang.String]
|
255
285
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
256
286
|
|
@@ -269,7 +299,7 @@ module Killbill
|
|
269
299
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
270
300
|
context = context.to_java unless context.nil?
|
271
301
|
begin
|
272
|
-
res = @real_java_api.create_purchase(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
302
|
+
res = @real_java_api.create_purchase(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
273
303
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
274
304
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
275
305
|
return res
|
@@ -278,8 +308,8 @@ module Killbill
|
|
278
308
|
end
|
279
309
|
end
|
280
310
|
|
281
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createPurchaseWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
282
|
-
def create_purchase_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
311
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createPurchaseWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
312
|
+
def create_purchase_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
283
313
|
|
284
314
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
285
315
|
account = account.to_java unless account.nil?
|
@@ -300,6 +330,12 @@ module Killbill
|
|
300
330
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
301
331
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
302
332
|
|
333
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
334
|
+
if !effectiveDate.nil?
|
335
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
336
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
337
|
+
end
|
338
|
+
|
303
339
|
# conversion for paymentExternalKey [type = java.lang.String]
|
304
340
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
305
341
|
|
@@ -321,7 +357,7 @@ module Killbill
|
|
321
357
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
322
358
|
context = context.to_java unless context.nil?
|
323
359
|
begin
|
324
|
-
res = @real_java_api.create_purchase_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
360
|
+
res = @real_java_api.create_purchase_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
325
361
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
326
362
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
327
363
|
return res
|
@@ -330,8 +366,8 @@ module Killbill
|
|
330
366
|
end
|
331
367
|
end
|
332
368
|
|
333
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createVoid(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
334
|
-
def create_void(account, paymentId, paymentTransactionExternalKey, properties, context)
|
369
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createVoid(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.util.callcontext.CallContext)'
|
370
|
+
def create_void(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, context)
|
335
371
|
|
336
372
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
337
373
|
account = account.to_java unless account.nil?
|
@@ -339,6 +375,12 @@ module Killbill
|
|
339
375
|
# conversion for paymentId [type = java.util.UUID]
|
340
376
|
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
341
377
|
|
378
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
379
|
+
if !effectiveDate.nil?
|
380
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
381
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
382
|
+
end
|
383
|
+
|
342
384
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
343
385
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
344
386
|
|
@@ -354,7 +396,7 @@ module Killbill
|
|
354
396
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
355
397
|
context = context.to_java unless context.nil?
|
356
398
|
begin
|
357
|
-
res = @real_java_api.create_void(account, paymentId, paymentTransactionExternalKey, properties, context)
|
399
|
+
res = @real_java_api.create_void(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, context)
|
358
400
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
359
401
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
360
402
|
return res
|
@@ -363,8 +405,8 @@ module Killbill
|
|
363
405
|
end
|
364
406
|
end
|
365
407
|
|
366
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createVoidWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
367
|
-
def create_void_with_payment_control(account, paymentId, paymentTransactionExternalKey, properties, paymentOptions, context)
|
408
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createVoidWithPaymentControl(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)'
|
409
|
+
def create_void_with_payment_control(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
368
410
|
|
369
411
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
370
412
|
account = account.to_java unless account.nil?
|
@@ -372,6 +414,12 @@ module Killbill
|
|
372
414
|
# conversion for paymentId [type = java.util.UUID]
|
373
415
|
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
374
416
|
|
417
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
418
|
+
if !effectiveDate.nil?
|
419
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
420
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
421
|
+
end
|
422
|
+
|
375
423
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
376
424
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
377
425
|
|
@@ -390,7 +438,7 @@ module Killbill
|
|
390
438
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
391
439
|
context = context.to_java unless context.nil?
|
392
440
|
begin
|
393
|
-
res = @real_java_api.create_void_with_payment_control(account, paymentId, paymentTransactionExternalKey, properties, paymentOptions, context)
|
441
|
+
res = @real_java_api.create_void_with_payment_control(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
394
442
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
395
443
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
396
444
|
return res
|
@@ -399,8 +447,8 @@ module Killbill
|
|
399
447
|
end
|
400
448
|
end
|
401
449
|
|
402
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createRefund(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
403
|
-
def create_refund(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, context)
|
450
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createRefund(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.util.callcontext.CallContext)'
|
451
|
+
def create_refund(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, context)
|
404
452
|
|
405
453
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
406
454
|
account = account.to_java unless account.nil?
|
@@ -418,6 +466,12 @@ module Killbill
|
|
418
466
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
419
467
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
420
468
|
|
469
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
470
|
+
if !effectiveDate.nil?
|
471
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
472
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
473
|
+
end
|
474
|
+
|
421
475
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
422
476
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
423
477
|
|
@@ -433,7 +487,7 @@ module Killbill
|
|
433
487
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
434
488
|
context = context.to_java unless context.nil?
|
435
489
|
begin
|
436
|
-
res = @real_java_api.create_refund(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, context)
|
490
|
+
res = @real_java_api.create_refund(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, context)
|
437
491
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
438
492
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
439
493
|
return res
|
@@ -442,8 +496,8 @@ module Killbill
|
|
442
496
|
end
|
443
497
|
end
|
444
498
|
|
445
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createRefundWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
446
|
-
def create_refund_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
|
499
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createRefundWithPaymentControl(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)'
|
500
|
+
def create_refund_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
447
501
|
|
448
502
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
449
503
|
account = account.to_java unless account.nil?
|
@@ -461,6 +515,12 @@ module Killbill
|
|
461
515
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
462
516
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
463
517
|
|
518
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
519
|
+
if !effectiveDate.nil?
|
520
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
521
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
522
|
+
end
|
523
|
+
|
464
524
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
465
525
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
466
526
|
|
@@ -479,7 +539,7 @@ module Killbill
|
|
479
539
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
480
540
|
context = context.to_java unless context.nil?
|
481
541
|
begin
|
482
|
-
res = @real_java_api.create_refund_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
|
542
|
+
res = @real_java_api.create_refund_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
|
483
543
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
484
544
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
485
545
|
return res
|
@@ -488,8 +548,8 @@ module Killbill
|
|
488
548
|
end
|
489
549
|
end
|
490
550
|
|
491
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createCredit(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
492
|
-
def create_credit(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
551
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createCredit(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
552
|
+
def create_credit(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
493
553
|
|
494
554
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
495
555
|
account = account.to_java unless account.nil?
|
@@ -510,6 +570,12 @@ module Killbill
|
|
510
570
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
511
571
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
512
572
|
|
573
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
574
|
+
if !effectiveDate.nil?
|
575
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
576
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
577
|
+
end
|
578
|
+
|
513
579
|
# conversion for paymentExternalKey [type = java.lang.String]
|
514
580
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
515
581
|
|
@@ -528,7 +594,7 @@ module Killbill
|
|
528
594
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
529
595
|
context = context.to_java unless context.nil?
|
530
596
|
begin
|
531
|
-
res = @real_java_api.create_credit(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
597
|
+
res = @real_java_api.create_credit(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, context)
|
532
598
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
533
599
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
534
600
|
return res
|
@@ -537,8 +603,8 @@ module Killbill
|
|
537
603
|
end
|
538
604
|
end
|
539
605
|
|
540
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createCreditWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
541
|
-
def create_credit_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
606
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createCreditWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, 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.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
607
|
+
def create_credit_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
542
608
|
|
543
609
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
544
610
|
account = account.to_java unless account.nil?
|
@@ -559,6 +625,12 @@ module Killbill
|
|
559
625
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
560
626
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
561
627
|
|
628
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
629
|
+
if !effectiveDate.nil?
|
630
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
631
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
632
|
+
end
|
633
|
+
|
562
634
|
# conversion for paymentExternalKey [type = java.lang.String]
|
563
635
|
paymentExternalKey = paymentExternalKey.to_s unless paymentExternalKey.nil?
|
564
636
|
|
@@ -580,7 +652,7 @@ module Killbill
|
|
580
652
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
581
653
|
context = context.to_java unless context.nil?
|
582
654
|
begin
|
583
|
-
res = @real_java_api.create_credit_with_payment_control(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
655
|
+
res = @real_java_api.create_credit_with_payment_control(account, paymentMethodId, paymentId, amount, currency, effectiveDate, paymentExternalKey, paymentTransactionExternalKey, properties, paymentOptions, context)
|
584
656
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
585
657
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
586
658
|
return res
|
@@ -600,8 +672,8 @@ module Killbill
|
|
600
672
|
@real_java_api.cancel_scheduled_payment_transaction(paymentTransactionExternalKey, context)
|
601
673
|
end
|
602
674
|
|
603
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargeback(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
|
604
|
-
def create_chargeback(account, paymentId, amount, currency, paymentTransactionExternalKey, context)
|
675
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargeback(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::org.killbill.billing.util.callcontext.CallContext)'
|
676
|
+
def create_chargeback(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, context)
|
605
677
|
|
606
678
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
607
679
|
account = account.to_java unless account.nil?
|
@@ -619,13 +691,19 @@ module Killbill
|
|
619
691
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
620
692
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
621
693
|
|
694
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
695
|
+
if !effectiveDate.nil?
|
696
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
697
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
698
|
+
end
|
699
|
+
|
622
700
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
623
701
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
624
702
|
|
625
703
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
626
704
|
context = context.to_java unless context.nil?
|
627
705
|
begin
|
628
|
-
res = @real_java_api.create_chargeback(account, paymentId, amount, currency, paymentTransactionExternalKey, context)
|
706
|
+
res = @real_java_api.create_chargeback(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, context)
|
629
707
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
630
708
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
631
709
|
return res
|
@@ -634,8 +712,8 @@ module Killbill
|
|
634
712
|
end
|
635
713
|
end
|
636
714
|
|
637
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
638
|
-
def create_chargeback_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, paymentOptions, context)
|
715
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackWithPaymentControl(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::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
716
|
+
def create_chargeback_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, paymentOptions, context)
|
639
717
|
|
640
718
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
641
719
|
account = account.to_java unless account.nil?
|
@@ -653,6 +731,12 @@ module Killbill
|
|
653
731
|
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
654
732
|
currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
|
655
733
|
|
734
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
735
|
+
if !effectiveDate.nil?
|
736
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
737
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
738
|
+
end
|
739
|
+
|
656
740
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
657
741
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
658
742
|
|
@@ -662,7 +746,7 @@ module Killbill
|
|
662
746
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
663
747
|
context = context.to_java unless context.nil?
|
664
748
|
begin
|
665
|
-
res = @real_java_api.create_chargeback_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, paymentOptions, context)
|
749
|
+
res = @real_java_api.create_chargeback_with_payment_control(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, paymentOptions, context)
|
666
750
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
667
751
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
668
752
|
return res
|
@@ -671,8 +755,8 @@ module Killbill
|
|
671
755
|
end
|
672
756
|
end
|
673
757
|
|
674
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackReversal(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
|
675
|
-
def create_chargeback_reversal(account, paymentId, paymentTransactionExternalKey, context)
|
758
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackReversal(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::org.joda.time.DateTime, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
|
759
|
+
def create_chargeback_reversal(account, paymentId, effectiveDate, paymentTransactionExternalKey, context)
|
676
760
|
|
677
761
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
678
762
|
account = account.to_java unless account.nil?
|
@@ -680,13 +764,19 @@ module Killbill
|
|
680
764
|
# conversion for paymentId [type = java.util.UUID]
|
681
765
|
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
682
766
|
|
767
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
768
|
+
if !effectiveDate.nil?
|
769
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
770
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
771
|
+
end
|
772
|
+
|
683
773
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
684
774
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
685
775
|
|
686
776
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
687
777
|
context = context.to_java unless context.nil?
|
688
778
|
begin
|
689
|
-
res = @real_java_api.create_chargeback_reversal(account, paymentId, paymentTransactionExternalKey, context)
|
779
|
+
res = @real_java_api.create_chargeback_reversal(account, paymentId, effectiveDate, paymentTransactionExternalKey, context)
|
690
780
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
691
781
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
692
782
|
return res
|
@@ -695,8 +785,8 @@ module Killbill
|
|
695
785
|
end
|
696
786
|
end
|
697
787
|
|
698
|
-
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackReversalWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.String, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
699
|
-
def create_chargeback_reversal_with_payment_control(account, paymentId, paymentTransactionExternalKey, paymentOptions, context)
|
788
|
+
java_signature 'Java::org.killbill.billing.payment.api.Payment createChargebackReversalWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::org.joda.time.DateTime, Java::java.lang.String, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
789
|
+
def create_chargeback_reversal_with_payment_control(account, paymentId, effectiveDate, paymentTransactionExternalKey, paymentOptions, context)
|
700
790
|
|
701
791
|
# conversion for account [type = org.killbill.billing.account.api.Account]
|
702
792
|
account = account.to_java unless account.nil?
|
@@ -704,6 +794,12 @@ module Killbill
|
|
704
794
|
# conversion for paymentId [type = java.util.UUID]
|
705
795
|
paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
|
706
796
|
|
797
|
+
# conversion for effectiveDate [type = org.joda.time.DateTime]
|
798
|
+
if !effectiveDate.nil?
|
799
|
+
effectiveDate = (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
|
800
|
+
effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
801
|
+
end
|
802
|
+
|
707
803
|
# conversion for paymentTransactionExternalKey [type = java.lang.String]
|
708
804
|
paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
|
709
805
|
|
@@ -713,7 +809,7 @@ module Killbill
|
|
713
809
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
714
810
|
context = context.to_java unless context.nil?
|
715
811
|
begin
|
716
|
-
res = @real_java_api.create_chargeback_reversal_with_payment_control(account, paymentId, paymentTransactionExternalKey, paymentOptions, context)
|
812
|
+
res = @real_java_api.create_chargeback_reversal_with_payment_control(account, paymentId, effectiveDate, paymentTransactionExternalKey, paymentOptions, context)
|
717
813
|
# conversion for res [type = org.killbill.billing.payment.api.Payment]
|
718
814
|
res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
|
719
815
|
return res
|
@@ -1017,12 +1113,57 @@ module Killbill
|
|
1017
1113
|
end
|
1018
1114
|
end
|
1019
1115
|
|
1020
|
-
java_signature 'Java::java.util.
|
1021
|
-
def
|
1116
|
+
java_signature 'Java::java.util.UUID addPaymentMethodWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.lang.String, Java::java.lang.String, Java::boolean, Java::org.killbill.billing.payment.api.PaymentMethodPlugin, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
|
1117
|
+
def add_payment_method_with_payment_control(account, paymentMethodExternalKey, pluginName, setDefault, paymentMethodInfo, properties, paymentOptions, context)
|
1118
|
+
|
1119
|
+
# conversion for account [type = org.killbill.billing.account.api.Account]
|
1120
|
+
account = account.to_java unless account.nil?
|
1121
|
+
|
1122
|
+
# conversion for paymentMethodExternalKey [type = java.lang.String]
|
1123
|
+
paymentMethodExternalKey = paymentMethodExternalKey.to_s unless paymentMethodExternalKey.nil?
|
1124
|
+
|
1125
|
+
# conversion for pluginName [type = java.lang.String]
|
1126
|
+
pluginName = pluginName.to_s unless pluginName.nil?
|
1127
|
+
|
1128
|
+
# conversion for setDefault [type = boolean]
|
1129
|
+
setDefault = setDefault.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(setDefault)
|
1130
|
+
|
1131
|
+
# conversion for paymentMethodInfo [type = org.killbill.billing.payment.api.PaymentMethodPlugin]
|
1132
|
+
paymentMethodInfo = paymentMethodInfo.to_java unless paymentMethodInfo.nil?
|
1133
|
+
|
1134
|
+
# conversion for properties [type = java.lang.Iterable]
|
1135
|
+
tmp = java.util.ArrayList.new
|
1136
|
+
(properties || []).each do |m|
|
1137
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
1138
|
+
m = m.to_java unless m.nil?
|
1139
|
+
tmp.add(m)
|
1140
|
+
end
|
1141
|
+
properties = tmp
|
1142
|
+
|
1143
|
+
# conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
|
1144
|
+
paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
|
1145
|
+
|
1146
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
1147
|
+
context = context.to_java unless context.nil?
|
1148
|
+
begin
|
1149
|
+
res = @real_java_api.add_payment_method_with_payment_control(account, paymentMethodExternalKey, pluginName, setDefault, paymentMethodInfo, properties, paymentOptions, context)
|
1150
|
+
# conversion for res [type = java.util.UUID]
|
1151
|
+
res = res.nil? ? nil : res.to_s
|
1152
|
+
return res
|
1153
|
+
rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
|
1154
|
+
raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
|
1155
|
+
end
|
1156
|
+
end
|
1157
|
+
|
1158
|
+
java_signature 'Java::java.util.List getAccountPaymentMethods(Java::java.util.UUID, Java::boolean, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
1159
|
+
def get_account_payment_methods(accountId, includedInactive, withPluginInfo, properties, context)
|
1022
1160
|
|
1023
1161
|
# conversion for accountId [type = java.util.UUID]
|
1024
1162
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
1025
1163
|
|
1164
|
+
# conversion for includedInactive [type = boolean]
|
1165
|
+
includedInactive = includedInactive.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includedInactive)
|
1166
|
+
|
1026
1167
|
# conversion for withPluginInfo [type = boolean]
|
1027
1168
|
withPluginInfo = withPluginInfo.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(withPluginInfo)
|
1028
1169
|
|
@@ -1038,7 +1179,7 @@ module Killbill
|
|
1038
1179
|
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
1039
1180
|
context = context.to_java unless context.nil?
|
1040
1181
|
begin
|
1041
|
-
res = @real_java_api.get_account_payment_methods(accountId, withPluginInfo, properties, context)
|
1182
|
+
res = @real_java_api.get_account_payment_methods(accountId, includedInactive, withPluginInfo, properties, context)
|
1042
1183
|
# conversion for res [type = java.util.List]
|
1043
1184
|
tmp = []
|
1044
1185
|
(res || []).each do |m|
|