killbill-braintree_blue 0.2.1 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +34 -34
- data/Jarfile +10 -9
- data/Jarfile.lock +32 -29
- data/NEWS +3 -0
- data/README.md +3 -1
- data/VERSION +1 -1
- data/killbill-braintree_blue.gemspec +1 -1
- data/lib/braintree_blue/application.rb +4 -1
- data/lib/braintree_blue/ext/active_merchant/active_merchant.rb +58 -1
- data/lib/braintree_blue/models/payment_method.rb +2 -1
- data/pom.xml +1 -1
- data/spec/braintree_blue/remote/integration_spec.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3f95f6183a5c462d298dbc0e3fb43f4b2116fa4c
|
4
|
+
data.tar.gz: c3c0db6fa05b80bd4c32bc1a06835f655b8f7ae9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dcaf3ab947801210b8b6220b56aa37973be6a7ef5f4553836f932e4e1f31ac210c37cb7b8ec6afbe2f50a09d5c6eda52ac518d1dee8e25b1498a85aadf4618ec
|
7
|
+
data.tar.gz: ef7a030677f5e9577c663b310fb1153b7f08902ec6c68dfe0df77657261738c22a7467762cddb6f3d69e3cbec1a2959039b98eadf423cd0ac7b23a9b383ef678
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
killbill-braintree_blue (0.
|
4
|
+
killbill-braintree_blue (0.3.0)
|
5
5
|
actionpack (~> 4.1.0)
|
6
6
|
actionview (~> 4.1.0)
|
7
7
|
activemerchant (~> 1.55.0)
|
@@ -10,7 +10,7 @@ PATH
|
|
10
10
|
activerecord-jdbc-adapter (~> 1.3)
|
11
11
|
braintree (~> 2.0)
|
12
12
|
jruby-openssl (~> 0.9.6)
|
13
|
-
killbill (~>
|
13
|
+
killbill (~> 8.0)
|
14
14
|
monetize (~> 1.1.0)
|
15
15
|
money (~> 6.5.1)
|
16
16
|
offsite_payments (~> 2.1.0)
|
@@ -20,13 +20,13 @@ PATH
|
|
20
20
|
GEM
|
21
21
|
remote: https://rubygems.org/
|
22
22
|
specs:
|
23
|
-
actionpack (4.1.
|
24
|
-
actionview (= 4.1.
|
25
|
-
activesupport (= 4.1.
|
23
|
+
actionpack (4.1.16)
|
24
|
+
actionview (= 4.1.16)
|
25
|
+
activesupport (= 4.1.16)
|
26
26
|
rack (~> 1.5.2)
|
27
27
|
rack-test (~> 0.6.2)
|
28
|
-
actionview (4.1.
|
29
|
-
activesupport (= 4.1.
|
28
|
+
actionview (4.1.16)
|
29
|
+
activesupport (= 4.1.16)
|
30
30
|
builder (~> 3.1)
|
31
31
|
erubis (~> 2.7.0)
|
32
32
|
active_utils (3.0.0)
|
@@ -37,17 +37,17 @@ GEM
|
|
37
37
|
builder (>= 2.1.2, < 4.0.0)
|
38
38
|
i18n (>= 0.6.9)
|
39
39
|
nokogiri (~> 1.4)
|
40
|
-
activemodel (4.1.
|
41
|
-
activesupport (= 4.1.
|
40
|
+
activemodel (4.1.16)
|
41
|
+
activesupport (= 4.1.16)
|
42
42
|
builder (~> 3.1)
|
43
|
-
activerecord (4.1.
|
44
|
-
activemodel (= 4.1.
|
45
|
-
activesupport (= 4.1.
|
43
|
+
activerecord (4.1.16)
|
44
|
+
activemodel (= 4.1.16)
|
45
|
+
activesupport (= 4.1.16)
|
46
46
|
arel (~> 5.0.0)
|
47
|
-
activerecord-bogacs (0.
|
48
|
-
activerecord-jdbc-adapter (1.3.
|
47
|
+
activerecord-bogacs (0.5.0)
|
48
|
+
activerecord-jdbc-adapter (1.3.21)
|
49
49
|
activerecord (>= 2.2)
|
50
|
-
activesupport (4.1.
|
50
|
+
activesupport (4.1.16)
|
51
51
|
i18n (~> 0.6, >= 0.6.9)
|
52
52
|
json (~> 1.7, >= 1.7.7)
|
53
53
|
minitest (~> 5.1)
|
@@ -58,7 +58,7 @@ GEM
|
|
58
58
|
descendants_tracker (~> 0.0.4)
|
59
59
|
ice_nine (~> 0.11.0)
|
60
60
|
thread_safe (~> 0.3, >= 0.3.1)
|
61
|
-
braintree (2.
|
61
|
+
braintree (2.64.0)
|
62
62
|
builder (>= 2.0.0)
|
63
63
|
builder (3.2.2)
|
64
64
|
coercible (1.0.0)
|
@@ -68,34 +68,34 @@ GEM
|
|
68
68
|
diff-lcs (1.1.3)
|
69
69
|
equalizer (0.0.11)
|
70
70
|
erubis (2.7.0)
|
71
|
-
ethon (0.
|
71
|
+
ethon (0.9.1)
|
72
72
|
ffi (>= 1.3.0)
|
73
|
-
ffi (1.9.
|
73
|
+
ffi (1.9.14-java)
|
74
74
|
i18n (0.7.0)
|
75
|
-
ice_nine (0.11.
|
76
|
-
jar-dependencies (0.3.
|
77
|
-
jbundler (0.9.
|
75
|
+
ice_nine (0.11.2)
|
76
|
+
jar-dependencies (0.3.4)
|
77
|
+
jbundler (0.9.3)
|
78
78
|
bundler (~> 1.5)
|
79
|
-
jar-dependencies (~> 0.
|
80
|
-
maven-tools (~> 1.
|
81
|
-
ruby-maven (~> 3.3, >= 3.3.
|
82
|
-
jdbc-mariadb (1.
|
79
|
+
jar-dependencies (~> 0.3)
|
80
|
+
maven-tools (~> 1.1)
|
81
|
+
ruby-maven (~> 3.3, >= 3.3.8)
|
82
|
+
jdbc-mariadb (1.3.4)
|
83
83
|
jdbc-sqlite3 (3.8.11.2)
|
84
|
-
jruby-openssl (0.9.
|
84
|
+
jruby-openssl (0.9.18-java)
|
85
85
|
json (1.8.3-java)
|
86
|
-
killbill (
|
86
|
+
killbill (8.3.0)
|
87
87
|
rack (>= 1.5.2)
|
88
88
|
sinatra (~> 1.3.4)
|
89
89
|
typhoeus (~> 0.6.9)
|
90
90
|
tzinfo (~> 1.2.0)
|
91
|
-
maven-tools (1.
|
91
|
+
maven-tools (1.1.6)
|
92
92
|
virtus (~> 1.0)
|
93
|
-
minitest (5.
|
93
|
+
minitest (5.9.1)
|
94
94
|
monetize (1.1.0)
|
95
95
|
money (~> 6.5.0)
|
96
96
|
money (6.5.1)
|
97
97
|
i18n (>= 0.6.4, <= 0.7.0)
|
98
|
-
nokogiri (1.6.
|
98
|
+
nokogiri (1.6.8.1-java)
|
99
99
|
offsite_payments (2.1.0)
|
100
100
|
actionpack (>= 3.2.20, < 5.0.0)
|
101
101
|
active_utils (~> 3.0.0)
|
@@ -109,7 +109,7 @@ GEM
|
|
109
109
|
rack
|
110
110
|
rack-test (0.6.3)
|
111
111
|
rack (>= 1.0)
|
112
|
-
rake (
|
112
|
+
rake (11.2.2)
|
113
113
|
rspec (2.12.0)
|
114
114
|
rspec-core (~> 2.12.0)
|
115
115
|
rspec-expectations (~> 2.12.0)
|
@@ -118,9 +118,9 @@ GEM
|
|
118
118
|
rspec-expectations (2.12.1)
|
119
119
|
diff-lcs (~> 1.1.3)
|
120
120
|
rspec-mocks (2.12.2)
|
121
|
-
ruby-maven (3.3.
|
122
|
-
ruby-maven-libs (~> 3.3.
|
123
|
-
ruby-maven-libs (3.3.
|
121
|
+
ruby-maven (3.3.12)
|
122
|
+
ruby-maven-libs (~> 3.3.9)
|
123
|
+
ruby-maven-libs (3.3.9)
|
124
124
|
sinatra (1.3.6)
|
125
125
|
rack (~> 1.4)
|
126
126
|
rack-protection (~> 1.3)
|
data/Jarfile
CHANGED
@@ -1,11 +1,12 @@
|
|
1
|
-
jar 'org.kill-bill.billing:killbill-api', '0.
|
2
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.
|
3
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.
|
4
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.
|
5
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.
|
6
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.
|
7
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.
|
8
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.
|
9
|
-
jar 'org.kill-bill.billing:killbill-util:tests', '0.
|
1
|
+
jar 'org.kill-bill.billing:killbill-api', '0.50'
|
2
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
|
3
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
|
4
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
|
5
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
|
6
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
|
7
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
|
8
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
|
9
|
+
jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
|
10
|
+
jar 'org.kill-bill.billing:killbill-util', '0.18.0'
|
10
11
|
jar 'org.mockito:mockito-all', '1.10.19'
|
11
12
|
jar 'javax.servlet:javax.servlet-api', '3.1.0'
|
data/Jarfile.lock
CHANGED
@@ -1,63 +1,66 @@
|
|
1
1
|
---
|
2
2
|
:runtime:
|
3
3
|
- io.dropwizard.metrics:metrics-core:jar:3.1.1
|
4
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
|
5
|
-
- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
|
6
4
|
- joda-time:joda-time:jar:2.3
|
7
5
|
- org.weakref:jmxutils:jar:1.18
|
8
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
|
9
6
|
- commons-beanutils:commons-beanutils:jar:1.8.3
|
10
|
-
- org.kill-bill.billing:killbill-internal-api:jar:0.15.10
|
11
|
-
- org.kill-bill.commons:killbill-xmlloader:jar:0.11
|
12
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
|
13
7
|
- com.google.inject:guice:jar:3.0
|
14
8
|
- org.osgi:org.osgi.core:jar:5.0.0
|
15
|
-
-
|
9
|
+
- com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
|
10
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
|
11
|
+
- org.kill-bill.billing:killbill-platform-api:jar:0.36.1
|
16
12
|
- com.samskivert:jmustache:jar:1.5
|
17
|
-
- org.kill-bill.
|
18
|
-
- org.kill-bill.billing
|
13
|
+
- org.kill-bill.commons:killbill-clock:jar:0.20
|
14
|
+
- org.kill-bill.billing:killbill-util:jar:0.18.0
|
15
|
+
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
|
16
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
|
19
17
|
- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
|
20
18
|
- com.h2database:h2:jar:1.4.186
|
19
|
+
- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
|
21
20
|
- javax.activation:activation:jar:1.1
|
21
|
+
- org.javassist:javassist:jar:3.19.0-GA
|
22
22
|
- org.skife.config:config-magic:jar:0.14
|
23
|
-
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
|
24
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
|
25
23
|
- org.apache.commons:commons-email:jar:1.2
|
26
24
|
- org.mockito:mockito-all:jar:1.10.19
|
27
25
|
- antlr:antlr:jar:2.7.7
|
28
26
|
- aopalliance:aopalliance:jar:1.0
|
27
|
+
- com.zaxxer:HikariCP-java6:jar:2.3.7
|
28
|
+
- org.slf4j:slf4j-api:jar:1.7.21
|
29
29
|
- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
|
30
30
|
- org.antlr:stringtemplate:jar:3.2.1
|
31
|
-
- org.
|
31
|
+
- org.slf4j:jcl-over-slf4j:jar:1.7.21
|
32
32
|
- javax.mail:mail:jar:1.4.1
|
33
|
-
- org.kill-bill.billing:killbill-platform-base:jar:0.15
|
34
33
|
- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
|
35
|
-
- org.slf4j:jcl-over-slf4j:jar:1.7.12
|
36
34
|
- org.jdbi:jdbi:jar:2.62
|
37
|
-
-
|
38
|
-
- org.
|
39
|
-
- org.bouncycastle:bcprov-jdk15on:jar:1.50
|
35
|
+
- com.fasterxml.jackson.core:jackson-core:jar:2.4.5
|
36
|
+
- org.bouncycastle:bcpkix-jdk15on:jar:1.54
|
40
37
|
- org.apache.felix:org.apache.felix.framework:jar:4.4.1
|
41
38
|
- org.joda:joda-money:jar:0.9
|
42
|
-
- org.kill-bill.
|
43
|
-
- org.
|
39
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
|
40
|
+
- org.bouncycastle:bcprov-jdk15on:jar:1.54
|
44
41
|
- org.apache.shiro:shiro-core:jar:1.2.3
|
45
|
-
- org.
|
46
|
-
- org.kill-bill.billing:killbill-
|
47
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-
|
48
|
-
-
|
42
|
+
- org.kill-bill.billing:killbill-internal-api:jar:0.18.0
|
43
|
+
- org.kill-bill.billing:killbill-util:jar:tests:0.18.0
|
44
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
|
45
|
+
- org.kill-bill.commons:killbill-jdbi:jar:0.20
|
49
46
|
- com.google.guava:guava:jar:r09
|
50
|
-
- org.kill-bill.commons:killbill-
|
47
|
+
- org.kill-bill.commons:killbill-queue:jar:0.20
|
51
48
|
- org.osgi:org.osgi.compendium:jar:5.0.0
|
52
|
-
- org.kill-bill.commons:killbill-
|
53
|
-
- org.kill-bill.commons:killbill-concurrent:jar:0.11
|
49
|
+
- org.kill-bill.commons:killbill-xmlloader:jar:0.20
|
54
50
|
- javax.servlet:javax.servlet-api:jar:3.1.0
|
51
|
+
- org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
|
52
|
+
- org.kill-bill.billing:killbill-platform-base:jar:0.36.1
|
55
53
|
- org.apache.shiro:shiro-ehcache:jar:1.2.3
|
56
54
|
- javax.inject:javax.inject:jar:1
|
57
|
-
-
|
55
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
|
56
|
+
- org.kill-bill.billing:killbill-api:jar:0.50
|
57
|
+
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
|
58
58
|
- com.google.inject.extensions:guice-multibindings:jar:3.0
|
59
59
|
- net.sf.ehcache:ehcache:jar:2.9.1
|
60
|
-
- org.kill-bill.
|
61
|
-
- org.kill-bill.
|
60
|
+
- org.kill-bill.commons:killbill-locker:jar:0.20
|
61
|
+
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.20
|
62
62
|
- org.apache.shiro:shiro-guice:jar:1.2.3
|
63
|
+
- org.kill-bill.commons:killbill-concurrent:jar:0.20
|
64
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.23
|
65
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.23
|
63
66
|
- com.google.code.findbugs:annotations:jar:3.0.0
|
data/NEWS
CHANGED
data/README.md
CHANGED
@@ -13,8 +13,8 @@ Kill Bill compatibility
|
|
13
13
|
| Plugin version | Kill Bill version |
|
14
14
|
| -------------: | ----------------: |
|
15
15
|
| 0.0.y | 0.14.z |
|
16
|
-
| 0.1.y | 0.15.z |
|
17
16
|
| 0.2.y | 0.16.z |
|
17
|
+
| 0.3.y | 0.18.z |
|
18
18
|
|
19
19
|
Requirements
|
20
20
|
------------
|
@@ -231,6 +231,8 @@ curl -v \
|
|
231
231
|
"http://127.0.0.1:8080/1.0/kb/accounts/<ACCOUNT_ID>/paymentMethods?isDefault=true"
|
232
232
|
```
|
233
233
|
|
234
|
+
A full end-to-end integration demo is also available [here](https://github.com/killbill/killbill-braintree-demo).
|
235
|
+
|
234
236
|
Plugin properties
|
235
237
|
-----------------
|
236
238
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.3.0
|
@@ -27,6 +27,9 @@ end
|
|
27
27
|
# curl -v http://127.0.0.1:9292/plugins/killbill-braintree_blue/token
|
28
28
|
get '/plugins/killbill-braintree_blue/token', :provides => 'json' do
|
29
29
|
kb_tenant_id = request.GET['kb_tenant_id']
|
30
|
+
kb_tenant = request.env['killbill_tenant']
|
31
|
+
kb_tenant_id ||= kb_tenant.id.to_s unless kb_tenant.nil?
|
32
|
+
|
30
33
|
environment = request.GET['environment'] || 'sandbox'
|
31
34
|
customer_id = request.GET['customer_id']
|
32
35
|
|
@@ -37,7 +40,7 @@ get '/plugins/killbill-braintree_blue/token', :provides => 'json' do
|
|
37
40
|
Braintree::Configuration.private_key = bconfig[:private_key]
|
38
41
|
Braintree::Configuration.public_key = bconfig[:public_key]
|
39
42
|
|
40
|
-
Braintree::ClientToken.generate(:customer_id => customer_id)
|
43
|
+
{ :client_token => Braintree::ClientToken.generate(:customer_id => customer_id) }.to_json
|
41
44
|
end
|
42
45
|
|
43
46
|
# curl -v http://127.0.0.1:9292/plugins/killbill-braintree_blue/form
|
@@ -2,6 +2,55 @@ module ActiveMerchant
|
|
2
2
|
module Billing
|
3
3
|
class BraintreeBlueGateway
|
4
4
|
|
5
|
+
# Add support for other payment methods
|
6
|
+
def add_customer_with_credit_card(creditcard, options)
|
7
|
+
commit do
|
8
|
+
if options[:payment_method_nonce]
|
9
|
+
credit_card_params = { payment_method_nonce: options[:payment_method_nonce] }
|
10
|
+
else
|
11
|
+
credit_card_params = {
|
12
|
+
:credit_card => {
|
13
|
+
:cardholder_name => creditcard.name,
|
14
|
+
:number => creditcard.number,
|
15
|
+
:cvv => creditcard.verification_value,
|
16
|
+
:expiration_month => creditcard.month.to_s.rjust(2, "0"),
|
17
|
+
:expiration_year => creditcard.year.to_s,
|
18
|
+
:token => options[:credit_card_token]
|
19
|
+
}
|
20
|
+
}
|
21
|
+
end
|
22
|
+
parameters = {
|
23
|
+
:first_name => creditcard.first_name,
|
24
|
+
:last_name => creditcard.last_name,
|
25
|
+
:email => scrub_email(options[:email]),
|
26
|
+
:id => options[:customer],
|
27
|
+
}.merge credit_card_params
|
28
|
+
result = @braintree_gateway.customer.create(merge_credit_card_options(parameters, options))
|
29
|
+
|
30
|
+
card_token = nil
|
31
|
+
if result.success? && !result.customer.credit_cards.nil? && !result.customer.credit_cards[0].nil?
|
32
|
+
card_token = result.customer.credit_cards[0].token
|
33
|
+
end
|
34
|
+
|
35
|
+
paypal_token = nil
|
36
|
+
if result.success? && !result.customer.paypal_accounts.nil? && !result.customer.paypal_accounts[0].nil?
|
37
|
+
paypal_token = result.customer.paypal_accounts[0].token
|
38
|
+
end
|
39
|
+
|
40
|
+
Response.new(result.success?, message_from_result(result),
|
41
|
+
{
|
42
|
+
:braintree_customer => (customer_hash(result.customer, :include_credit_cards) if result.success?),
|
43
|
+
:customer_vault_id => (result.customer.id if result.success?),
|
44
|
+
:credit_card_token => card_token,
|
45
|
+
:paypal_token => paypal_token,
|
46
|
+
# Required for BraintreeBluePaymentMethod.from_response
|
47
|
+
:token => card_token || paypal_token
|
48
|
+
},
|
49
|
+
:authorization => (result.customer.id if result.success?)
|
50
|
+
)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
5
54
|
def add_credit_card_to_customer(credit_card, options)
|
6
55
|
commit do
|
7
56
|
if options[:payment_method_nonce]
|
@@ -24,12 +73,20 @@ module ActiveMerchant
|
|
24
73
|
parameters[:billing_address] = map_address(options[:billing_address]) unless options[:billing_address].empty?
|
25
74
|
|
26
75
|
result = @braintree_gateway.credit_card.create(parameters)
|
76
|
+
|
77
|
+
card_token = nil
|
78
|
+
if result.success?
|
79
|
+
card_token = result.credit_card.token
|
80
|
+
end
|
81
|
+
|
27
82
|
ActiveMerchant::Billing::Response.new(
|
28
83
|
result.success?,
|
29
84
|
message_from_result(result),
|
30
85
|
{
|
31
86
|
customer_vault_id: (result.credit_card.customer_id if result.success?),
|
32
|
-
credit_card_token:
|
87
|
+
credit_card_token: card_token,
|
88
|
+
# Required for BraintreeBluePaymentMethod.from_response
|
89
|
+
token: card_token
|
33
90
|
},
|
34
91
|
authorization: (result.credit_card.customer_id if result.success?)
|
35
92
|
)
|
@@ -13,7 +13,8 @@ module Killbill #:nodoc:
|
|
13
13
|
# Unfortunately, the ActiveMerchant Braintree implementation will drop that information when adding a card to an existing customer
|
14
14
|
customer_response = primary_response.params['braintree_customer'] || {}
|
15
15
|
|
16
|
-
|
16
|
+
# See active_merchant.rb
|
17
|
+
token = options[:token] || primary_response.params['token']
|
17
18
|
card_response = (customer_response['credit_cards'] || []).first || {}
|
18
19
|
cc_exp_dates = (card_response['expiration_date'] || '').split('/')
|
19
20
|
|
data/pom.xml
CHANGED
@@ -25,7 +25,7 @@
|
|
25
25
|
<groupId>org.kill-bill.billing.plugin.ruby</groupId>
|
26
26
|
<artifactId>braintree_blue-plugin</artifactId>
|
27
27
|
<packaging>pom</packaging>
|
28
|
-
<version>0.
|
28
|
+
<version>0.3.0</version>
|
29
29
|
<name>braintree_blue-plugin</name>
|
30
30
|
<url>http://github.com/killbill/killbill-braintree_blue-plugin</url>
|
31
31
|
<description>Plugin for accessing BraintreeBlue as a payment gateway</description>
|
@@ -101,7 +101,7 @@ describe Killbill::BraintreeBlue::PaymentPlugin do
|
|
101
101
|
fail('it should not accept a random nonce')
|
102
102
|
rescue => e
|
103
103
|
# TODO Could we generate a valid nonce?
|
104
|
-
e.message.starts_with?('Unknown payment_method_nonce.').should be_true
|
104
|
+
e.message.starts_with?('Unknown or expired payment_method_nonce.').should be_true
|
105
105
|
end
|
106
106
|
end
|
107
107
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: killbill-braintree_blue
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.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: 2016-
|
11
|
+
date: 2016-11-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: killbill
|
@@ -16,12 +16,12 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '8.0'
|
20
20
|
requirement: !ruby/object:Gem::Requirement
|
21
21
|
requirements:
|
22
22
|
- - ~>
|
23
23
|
- !ruby/object:Gem::Version
|
24
|
-
version: '
|
24
|
+
version: '8.0'
|
25
25
|
prerelease: false
|
26
26
|
type: :runtime
|
27
27
|
- !ruby/object:Gem::Dependency
|