Skip to content

Commit

Permalink
Merge pull request #341 from recurly/api_version_2_8
Browse files Browse the repository at this point in the history
Bump 2.11.0, API Version 2.8
  • Loading branch information
csmb authored Oct 6, 2017
2 parents ceec6a4 + 221f4f8 commit 7af889e
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 7 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<a name="unreleased"></a>
## Unreleased

<a name="v2.11.0"></a>
## v2.11.0 (2017-10-04)

This release will upgrade us to API version 2.8.

- Added custom invoice notes to `Purchase` [PR](https://github.com/recurly/recurly-client-ruby/pull/340)
- Added `imported_trial` boolean field to `Subscription` [Commit](https://github.com/recurly/recurly-client-ruby/commit/cdfbe9de6203f8f2a3bb533411dd4c16dea138b6)

### Upgrade Notes

There is one breaking change in this API version you must consider. All `country` fields must now contain valid [2 letter ISO 3166 country codes](https://www.iso.org/iso-3166-country-codes.html). If your code fails
validation, you will receive a validation error. This affects anywhere and address is collected.

<a name="v2.10.1"></a>
## v2.10.2 (2017-09-27)

Expand Down
2 changes: 1 addition & 1 deletion lib/recurly/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class API

@@base_uri = "https://api.recurly.com/v2/"

RECURLY_API_VERSION = '2.7'
RECURLY_API_VERSION = '2.8'

FORMATS = Helper.hash_with_indifferent_read_access(
'pdf' => 'application/pdf',
Expand Down
3 changes: 3 additions & 0 deletions lib/recurly/purchase.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ class Purchase < Resource
po_number
net_terms
coupon_codes
terms_and_conditions
customer_notes
vat_reverse_charge_notes
)

class << self
Expand Down
1 change: 1 addition & 0 deletions lib/recurly/subscription.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Subscription < Resource
started_with_gift
converted_at
no_billing_info_reason
imported_trial
)
alias to_param uuid

Expand Down
4 changes: 2 additions & 2 deletions lib/recurly/version.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module Recurly
module Version
MAJOR = 2
MINOR = 10
PATCH = 2
MINOR = 11
PATCH = 0
PRE = nil

VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/subscriptions/serialize-automatic.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<subscription><account><account_code>1</account_code><billing_info><month>1</month><number>4111-1111-1111-1111</number><year>2014</year></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
<subscription><account><account_code>1</account_code><billing_info><month>1</month><number>4111-1111-1111-1111</number><year>2014</year></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><imported_trial>true</imported_trial><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
2 changes: 1 addition & 1 deletion spec/fixtures/subscriptions/serialize-token.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<subscription><account><account_code>1</account_code><billing_info><token_id>abc123</token_id></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
<subscription><account><account_code>1</account_code><billing_info><token_id>abc123</token_id></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><imported_trial>true</imported_trial><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
2 changes: 1 addition & 1 deletion spec/fixtures/subscriptions/serialize-with-bulk.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<subscription><account><account_code>1</account_code><billing_info><month>1</month><number>4111-1111-1111-1111</number><year>2014</year></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><bulk>true</bulk><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
<subscription><account><account_code>1</account_code><billing_info><month>1</month><number>4111-1111-1111-1111</number><year>2014</year></billing_info><email>[email protected]</email><first_name>Verena</first_name><last_name>Example</last_name></account><bulk>true</bulk><currency>EUR</currency><customer_notes>Some Customer Notes</customer_notes><imported_trial>true</imported_trial><plan_code>gold</plan_code><terms_and_conditions>Some Terms and Conditions</terms_and_conditions></subscription>
2 changes: 1 addition & 1 deletion spec/fixtures/subscriptions/serialize.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<subscription><account><account_code>1</account_code></account><collection_method>manual</collection_method><currency>EUR</currency><net_terms>10</net_terms><plan_code>gold</plan_code><po_number>1000</po_number></subscription>
<subscription><account><account_code>1</account_code></account><collection_method>manual</collection_method><currency>EUR</currency><net_terms>10</net_terms><plan_code>gold</plan_code><po_number>1000</po_number></subscription>
1 change: 1 addition & 0 deletions spec/recurly/subscription_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
currency: 'EUR',
terms_and_conditions: 'Some Terms and Conditions',
customer_notes: 'Some Customer Notes',
imported_trial: true,
account: {
account_code: '1',
email: '[email protected]',
Expand Down

0 comments on commit 7af889e

Please sign in to comment.