killbill 3.1.11 → 3.1.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/Jarfile +6 -6
  3. data/NEWS +6 -0
  4. data/VERSION +1 -1
  5. data/generators/active_merchant/templates/Jarfile.rb +7 -7
  6. data/generators/active_merchant/templates/db/ddl.sql.rb +2 -0
  7. data/generators/active_merchant/templates/db/schema.rb +2 -0
  8. data/generators/active_merchant/templates/lib/application.rb +1 -5
  9. data/generators/active_merchant/templates/lib/models/response.rb +2 -1
  10. data/generators/active_merchant/templates/lib/plugin.rb +1 -0
  11. data/generators/active_merchant/templates/lib/private_api.rb +7 -0
  12. data/generators/active_merchant/templates/plugin.gemspec.rb +3 -2
  13. data/generators/active_merchant/templates/spec/integration_spec.rb +103 -2
  14. data/killbill.gemspec +4 -1
  15. data/lib/killbill/gen/api/dry_run_arguments.rb +100 -0
  16. data/lib/killbill/gen/api/invoice_user_api.rb +5 -5
  17. data/lib/killbill/gen/api/killbill_api.rb +19 -18
  18. data/lib/killbill/gen/api/payment_options.rb +17 -5
  19. data/lib/killbill/gen/api/require_gen.rb +5 -0
  20. data/lib/killbill/gen/api/rolled_up_unit.rb +63 -0
  21. data/lib/killbill/gen/api/rolled_up_usage.rb +31 -35
  22. data/lib/killbill/gen/api/static_catalog.rb +8 -8
  23. data/lib/killbill/gen/api/subscription_usage_record.rb +75 -0
  24. data/lib/killbill/gen/api/unit_usage_record.rb +74 -0
  25. data/lib/killbill/gen/api/usage_record.rb +66 -0
  26. data/lib/killbill/gen/api/usage_user_api.rb +22 -56
  27. data/lib/killbill/gen/plugin-api/currency_plugin_api.rb +19 -18
  28. data/lib/killbill/gen/plugin-api/ext_bus_event.rb +19 -18
  29. data/lib/killbill/gen/plugin-api/gateway_notification.rb +19 -18
  30. data/lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb +19 -18
  31. data/lib/killbill/gen/plugin-api/notification_plugin_api.rb +19 -18
  32. data/lib/killbill/gen/plugin-api/payment_method_info_plugin.rb +19 -18
  33. data/lib/killbill/gen/plugin-api/payment_plugin_api.rb +19 -18
  34. data/lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb +19 -18
  35. data/lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb +19 -18
  36. data/lib/killbill/gen/plugin-api/require_gen.rb +19 -18
  37. data/lib/killbill/helpers/active_merchant/active_record/models/payment_method.rb +4 -0
  38. data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +65 -34
  39. data/lib/killbill/helpers/active_merchant/active_record/models/streamy_result_set.rb +14 -2
  40. data/lib/killbill/helpers/active_merchant/active_record/models/transaction.rb +9 -5
  41. data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb +28 -23
  42. data/lib/killbill/helpers/active_merchant/payment_plugin.rb +66 -36
  43. data/lib/killbill/helpers/active_merchant/private_payment_plugin.rb +18 -31
  44. data/lib/killbill/helpers/active_merchant/sinatra.rb +7 -2
  45. data/lib/killbill/helpers/active_merchant/utils.rb +12 -0
  46. data/spec/killbill/helpers/killbill_spec_helper_spec.rb +24 -0
  47. data/spec/killbill/helpers/payment_method_spec.rb +5 -0
  48. data/spec/killbill/helpers/payment_plugin_spec.rb +33 -2
  49. data/spec/killbill/helpers/private_payment_plugin_spec.rb +83 -0
  50. data/spec/killbill/helpers/response_spec.rb +47 -24
  51. data/spec/killbill/helpers/streamy_result_set_spec.rb +38 -0
  52. data/spec/killbill/helpers/test_schema.rb +2 -0
  53. metadata +57 -8
  54. data/lib/killbill/gen/api/payment_attempt.rb +0 -117
  55. data/lib/killbill/gen/api/payment_method_kv_info.rb +0 -71
  56. data/lib/killbill/gen/plugin-api/billing_address.rb +0 -85
  57. data/lib/killbill/gen/plugin-api/customer.rb +0 -73
@@ -39,41 +39,19 @@ module Killbill
39
39
  end
40
40
 
41
41
 
42
- java_signature 'Java::void recordRolledUpUsage(Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.DateTime, Java::org.joda.time.DateTime, Java::java.math.BigDecimal, Java::org.killbill.billing.util.callcontext.CallContext)'
43
- def record_rolled_up_usage(subscriptionId, unitType, startTime, endTime, amount, context)
42
+ java_signature 'Java::void recordRolledUpUsage(Java::org.killbill.billing.usage.api.SubscriptionUsageRecord, Java::org.killbill.billing.util.callcontext.CallContext)'
43
+ def record_rolled_up_usage(usage, context)
44
44
 
45
- # conversion for subscriptionId [type = java.util.UUID]
46
- subscriptionId = java.util.UUID.fromString(subscriptionId.to_s) unless subscriptionId.nil?
47
-
48
- # conversion for unitType [type = java.lang.String]
49
- unitType = unitType.to_s unless unitType.nil?
50
-
51
- # conversion for startTime [type = org.joda.time.DateTime]
52
- if !startTime.nil?
53
- startTime = (startTime.kind_of? Time) ? DateTime.parse(startTime.to_s) : startTime
54
- startTime = Java::org.joda.time.DateTime.new(startTime.to_s, Java::org.joda.time.DateTimeZone::UTC)
55
- end
56
-
57
- # conversion for endTime [type = org.joda.time.DateTime]
58
- if !endTime.nil?
59
- endTime = (endTime.kind_of? Time) ? DateTime.parse(endTime.to_s) : endTime
60
- endTime = Java::org.joda.time.DateTime.new(endTime.to_s, Java::org.joda.time.DateTimeZone::UTC)
61
- end
62
-
63
- # conversion for amount [type = java.math.BigDecimal]
64
- if amount.nil?
65
- amount = java.math.BigDecimal::ZERO
66
- else
67
- amount = java.math.BigDecimal.new(amount.to_s)
68
- end
45
+ # conversion for usage [type = org.killbill.billing.usage.api.SubscriptionUsageRecord]
46
+ usage = usage.to_java unless usage.nil?
69
47
 
70
48
  # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
71
49
  context = context.to_java unless context.nil?
72
- @real_java_api.record_rolled_up_usage(subscriptionId, unitType, startTime, endTime, amount, context)
50
+ @real_java_api.record_rolled_up_usage(usage, context)
73
51
  end
74
52
 
75
- java_signature 'Java::org.killbill.billing.usage.api.RolledUpUsage getUsageForSubscription(Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.DateTime, Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.TenantContext)'
76
- def get_usage_for_subscription(subscriptionId, unitType, startTime, endTime, context)
53
+ java_signature 'Java::org.killbill.billing.usage.api.RolledUpUsage getUsageForSubscription(Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.TenantContext)'
54
+ def get_usage_for_subscription(subscriptionId, unitType, startDate, endDate, context)
77
55
 
78
56
  # conversion for subscriptionId [type = java.util.UUID]
79
57
  subscriptionId = java.util.UUID.fromString(subscriptionId.to_s) unless subscriptionId.nil?
@@ -81,56 +59,44 @@ module Killbill
81
59
  # conversion for unitType [type = java.lang.String]
82
60
  unitType = unitType.to_s unless unitType.nil?
83
61
 
84
- # conversion for startTime [type = org.joda.time.DateTime]
85
- if !startTime.nil?
86
- startTime = (startTime.kind_of? Time) ? DateTime.parse(startTime.to_s) : startTime
87
- startTime = Java::org.joda.time.DateTime.new(startTime.to_s, Java::org.joda.time.DateTimeZone::UTC)
62
+ # conversion for startDate [type = org.joda.time.LocalDate]
63
+ if !startDate.nil?
64
+ startDate = Java::org.joda.time.LocalDate.parse(startDate.to_s)
88
65
  end
89
66
 
90
- # conversion for endTime [type = org.joda.time.DateTime]
91
- if !endTime.nil?
92
- endTime = (endTime.kind_of? Time) ? DateTime.parse(endTime.to_s) : endTime
93
- endTime = Java::org.joda.time.DateTime.new(endTime.to_s, Java::org.joda.time.DateTimeZone::UTC)
67
+ # conversion for endDate [type = org.joda.time.LocalDate]
68
+ if !endDate.nil?
69
+ endDate = Java::org.joda.time.LocalDate.parse(endDate.to_s)
94
70
  end
95
71
 
96
72
  # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
97
73
  context = context.to_java unless context.nil?
98
- res = @real_java_api.get_usage_for_subscription(subscriptionId, unitType, startTime, endTime, context)
74
+ res = @real_java_api.get_usage_for_subscription(subscriptionId, unitType, startDate, endDate, context)
99
75
  # conversion for res [type = org.killbill.billing.usage.api.RolledUpUsage]
100
76
  res = Killbill::Plugin::Model::RolledUpUsage.new.to_ruby(res) unless res.nil?
101
77
  return res
102
78
  end
103
79
 
104
- java_signature 'Java::java.util.List getAllUsageForSubscription(Java::java.util.UUID, Java::java.util.Set, Java::java.util.List, Java::org.killbill.billing.util.callcontext.TenantContext)'
105
- def get_all_usage_for_subscription(subscriptionId, unitType, transitionTimes, context)
80
+ java_signature 'Java::java.util.List getAllUsageForSubscription(Java::java.util.UUID, Java::java.util.List, Java::org.killbill.billing.util.callcontext.TenantContext)'
81
+ def get_all_usage_for_subscription(subscriptionId, transitionDates, context)
106
82
 
107
83
  # conversion for subscriptionId [type = java.util.UUID]
108
84
  subscriptionId = java.util.UUID.fromString(subscriptionId.to_s) unless subscriptionId.nil?
109
85
 
110
- # conversion for unitType [type = java.util.Set]
111
- tmp = java.util.TreeSet.new
112
- (unitType || []).each do |m|
113
- # conversion for m [type = java.lang.String]
114
- m = m.to_s unless m.nil?
115
- tmp.add(m)
116
- end
117
- unitType = tmp
118
-
119
- # conversion for transitionTimes [type = java.util.List]
86
+ # conversion for transitionDates [type = java.util.List]
120
87
  tmp = java.util.ArrayList.new
121
- (transitionTimes || []).each do |m|
122
- # conversion for m [type = org.joda.time.DateTime]
88
+ (transitionDates || []).each do |m|
89
+ # conversion for m [type = org.joda.time.LocalDate]
123
90
  if !m.nil?
124
- m = (m.kind_of? Time) ? DateTime.parse(m.to_s) : m
125
- m = Java::org.joda.time.DateTime.new(m.to_s, Java::org.joda.time.DateTimeZone::UTC)
91
+ m = Java::org.joda.time.LocalDate.parse(m.to_s)
126
92
  end
127
93
  tmp.add(m)
128
94
  end
129
- transitionTimes = tmp
95
+ transitionDates = tmp
130
96
 
131
97
  # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
132
98
  context = context.to_java unless context.nil?
133
- res = @real_java_api.get_all_usage_for_subscription(subscriptionId, unitType, transitionTimes, context)
99
+ res = @real_java_api.get_all_usage_for_subscription(subscriptionId, transitionDates, context)
134
100
  # conversion for res [type = java.util.List]
135
101
  tmp = []
136
102
  (res || []).each do |m|
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #
@@ -1,21 +1,22 @@
1
- ###################################################################################
2
- # #
3
- # Copyright 2010-2013 Ning, Inc. #
4
- # Copyright 2014 The Billing Project, LLC #
5
- # #
6
- # The Billing Project licenses this file to you under the Apache License, #
7
- # version 2.0 (the "License"); you may not use this file except in #
8
- # compliance with the License. You may obtain a copy of the License at: #
9
- # #
10
- # http://www.apache.org/licenses/LICENSE-2.0 #
11
- # #
12
- # Unless required by applicable law or agreed to in writing, software #
13
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
14
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
15
- # License for the specific language governing permissions and limitations #
16
- # under the License. #
17
- # #
18
- ###################################################################################
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
+ #############################################################################################
19
20
 
20
21
 
21
22
  #