Merge upstream v2 (2.19.6 → 2.20.5)

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.19.6
+current_version = 2.20.5
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)

CHANGELOG.md

@@ -1,5 +1,169 @@
 # Changelog
 
+## [2.20.5](https://github.com/recurly/recurly-client-ruby/tree/2.20.5) (2025-12-17)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.20.4...2.20.5)
+
+
+**Merged Pull Requests**
+
+- Add tax_service_opt_out attribute to GiftCard model and corresponding tests [#944](https://github.com/recurly/recurly-client-ruby/pull/944) ([d14z-tech](https://github.com/d14z-tech))
+
+
+
+## [2.20.4](https://github.com/recurly/recurly-client-ruby/tree/2.20.4) (2025-12-10)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.20.3...2.20.4)
+
+
+**Merged Pull Requests**
+
+- Accept vertex_transaction_type fur purchase, adjustments and invoice [#943](https://github.com/recurly/recurly-client-ruby/pull/943) ([sgilrodriguez](https://github.com/sgilrodriguez))
+
+
+
+## [2.20.3](https://github.com/recurly/recurly-client-ruby/tree/2.20.3) (2024-11-13)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.20.2...2.20.3)
+
+
+**Merged Pull Requests**
+
+- Add vertex_transaction_type to plans [#916](https://github.com/recurly/recurly-client-ruby/pull/916) ([faiberrec](https://github.com/faiberrec))
+
+
+
+## [2.20.2](https://github.com/recurly/recurly-client-ruby/tree/2.20.2) (2024-08-28)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.20.1...2.20.2)
+
+
+**Merged Pull Requests**
+
+- Get external sub by uuid [#911](https://github.com/recurly/recurly-client-ruby/pull/911) ([amandamfielding](https://github.com/amandamfielding))
+
+
+
+## [2.20.1](https://github.com/recurly/recurly-client-ruby/tree/2.20.1) (2024-08-21)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.20.0...2.20.1)
+
+
+**Merged Pull Requests**
+
+- Added support for refunding invoices and line items [#909](https://github.com/recurly/recurly-client-ruby/pull/909) ([andcoca](https://github.com/andcoca))
+
+
+
+## [2.20.0](https://github.com/recurly/recurly-client-ruby/tree/2.20.0) (2024-07-03)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.14...2.20.0)
+
+
+**Merged Pull Requests**
+
+- GET external_subscription by external_id [#907](https://github.com/recurly/recurly-client-ruby/pull/907) ([paulorbpinho-fullstacklabs](https://github.com/paulorbpinho-fullstacklabs))
+- add taxable address sources to business entity and adjustment [#906](https://github.com/recurly/recurly-client-ruby/pull/906) ([amandamfielding](https://github.com/amandamfielding))
+
+
+
+## [2.19.14](https://github.com/recurly/recurly-client-ruby/tree/2.19.14) (2024-05-08)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.13...2.19.14)
+
+
+**Merged Pull Requests**
+
+- Add subscription change proflex options [#898](https://github.com/recurly/recurly-client-ruby/pull/898) ([Patrick-Duvall](https://github.com/Patrick-Duvall))
+
+
+
+## [2.19.13](https://github.com/recurly/recurly-client-ruby/tree/2.19.13) (2024-04-04)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.12...2.19.13)
+
+
+**Merged Pull Requests**
+
+- Add net_terms_type to Invoices, Purchases, and Subscriptions [#897](https://github.com/recurly/recurly-client-ruby/pull/897) ([flaviomuller](https://github.com/flaviomuller))
+
+
+
+## [2.19.12](https://github.com/recurly/recurly-client-ruby/tree/2.19.12) (2024-03-19)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.11...2.19.12)
+
+
+**Merged Pull Requests**
+
+- Add card_network_preference field to v2 [#896](https://github.com/recurly/recurly-client-ruby/pull/896) ([gilv93](https://github.com/gilv93))
+
+
+
+## [2.19.11](https://github.com/recurly/recurly-client-ruby/tree/2.19.11) (2024-03-13)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.10...2.19.11)
+
+
+**Merged Pull Requests**
+
+- add revrec to purchases and adjustments [#891](https://github.com/recurly/recurly-client-ruby/pull/891) ([wsethbrown](https://github.com/wsethbrown))
+- add revrec to gift cards [#889](https://github.com/recurly/recurly-client-ruby/pull/889) ([wsethbrown](https://github.com/wsethbrown))
+- add revrec to addons and items [#885](https://github.com/recurly/recurly-client-ruby/pull/885) ([wsethbrown](https://github.com/wsethbrown))
+- Add revrec shipping methods [#883](https://github.com/recurly/recurly-client-ruby/pull/883) ([wsethbrown](https://github.com/wsethbrown))
+- add plan setup fee revrec [#881](https://github.com/recurly/recurly-client-ruby/pull/881) ([wsethbrown](https://github.com/wsethbrown))
+- add get business entity [#880](https://github.com/recurly/recurly-client-ruby/pull/880) ([wsethbrown](https://github.com/wsethbrown))
+- Add pobs [#879](https://github.com/recurly/recurly-client-ruby/pull/879) ([wsethbrown](https://github.com/wsethbrown))
+- Add RevRec features to ruby [#878](https://github.com/recurly/recurly-client-ruby/pull/878) ([faiberrec](https://github.com/faiberrec))
+- Adding support for General Ledger Accounts [#875](https://github.com/recurly/recurly-client-ruby/pull/875) ([faiberrec](https://github.com/faiberrec))
+
+
+
+## [2.19.10](https://github.com/recurly/recurly-client-ruby/tree/2.19.10) (2023-12-06)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.9...2.19.10)
+
+
+**Merged Pull Requests**
+
+- External payment phases [#868](https://github.com/recurly/recurly-client-ruby/pull/868) ([amandamfielding](https://github.com/amandamfielding))
+
+
+
+## [2.19.9](https://github.com/recurly/recurly-client-ruby/tree/2.19.9) (2023-08-10)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.8...2.19.9)
+
+
+**Merged Pull Requests**
+
+- [V2] Add action_result to Subscription and Transaction [#863](https://github.com/recurly/recurly-client-ruby/pull/863) ([fkosouski](https://github.com/fkosouski))
+
+
+
+## [2.19.8](https://github.com/recurly/recurly-client-ruby/tree/2.19.8) (2023-07-27)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.7...2.19.8)
+
+
+**Merged Pull Requests**
+
+- Fixed usage of Minitest [#862](https://github.com/recurly/recurly-client-ruby/pull/862) ([csampson](https://github.com/csampson))
+- [V2] Add starting_on and ending_on to subscription ramps [#858](https://github.com/recurly/recurly-client-ruby/pull/858) ([rlew421](https://github.com/rlew421))
+
+
+
+## [2.19.7](https://github.com/recurly/recurly-client-ruby/tree/2.19.7) (2023-07-17)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.6...2.19.7)
+
+
+**Merged Pull Requests**
+
+- modify external subscription [#857](https://github.com/recurly/recurly-client-ruby/pull/857) ([amandamfielding](https://github.com/amandamfielding))
+
+
+
 ## [2.19.6](https://github.com/recurly/recurly-client-ruby/tree/2.19.6) (2023-06-13)
 
 [Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.5...2.19.6)
@@ -989,7 +1153,7 @@
 - Fix AddOn quantity accumulator [#278](https://github.com/recurly/recurly-client-ruby/pull/278) ([bhelx](https://github.com/bhelx))
 - Add new dunning event notification [#277](https://github.com/recurly/recurly-client-ruby/pull/277) ([bhelx](https://github.com/bhelx))
 - Fix failing dependency for ruby 1.9.3 [#276](https://github.com/recurly/recurly-client-ruby/pull/276) ([bhelx](https://github.com/bhelx))
-- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([jdeseno](https://github.com/jdeseno))
+- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([ghost](https://github.com/ghost))
 - Fix redeem bang [#271](https://github.com/recurly/recurly-client-ruby/pull/271) ([sdhull](https://github.com/sdhull))
 - Cleanup code around message interpolation [#268](https://github.com/recurly/recurly-client-ruby/pull/268) ([bhelx](https://github.com/bhelx))
 - removes base from error messages [#267](https://github.com/recurly/recurly-client-ruby/pull/267) ([lmnleaf](https://github.com/lmnleaf))
@@ -1535,7 +1699,7 @@
 - Fix AddOn quantity accumulator [#278](https://github.com/recurly/recurly-client-ruby/pull/278) ([bhelx](https://github.com/bhelx))
 - Add new dunning event notification [#277](https://github.com/recurly/recurly-client-ruby/pull/277) ([bhelx](https://github.com/bhelx))
 - Fix failing dependency for ruby 1.9.3 [#276](https://github.com/recurly/recurly-client-ruby/pull/276) ([bhelx](https://github.com/bhelx))
-- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([jdeseno](https://github.com/jdeseno))
+- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([ghost](https://github.com/ghost))
 - Fix redeem bang [#271](https://github.com/recurly/recurly-client-ruby/pull/271) ([sdhull](https://github.com/sdhull))
 - Cleanup code around message interpolation [#268](https://github.com/recurly/recurly-client-ruby/pull/268) ([bhelx](https://github.com/bhelx))
 - removes base from error messages [#267](https://github.com/recurly/recurly-client-ruby/pull/267) ([lmnleaf](https://github.com/lmnleaf))
@@ -2153,7 +2317,7 @@
 - Fix AddOn quantity accumulator [#278](https://github.com/recurly/recurly-client-ruby/pull/278) ([bhelx](https://github.com/bhelx))
 - Add new dunning event notification [#277](https://github.com/recurly/recurly-client-ruby/pull/277) ([bhelx](https://github.com/bhelx))
 - Fix failing dependency for ruby 1.9.3 [#276](https://github.com/recurly/recurly-client-ruby/pull/276) ([bhelx](https://github.com/bhelx))
-- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([jdeseno](https://github.com/jdeseno))
+- Correct rails deprecation warning [#275](https://github.com/recurly/recurly-client-ruby/pull/275) ([ghost](https://github.com/ghost))
 - Fix redeem bang [#271](https://github.com/recurly/recurly-client-ruby/pull/271) ([sdhull](https://github.com/sdhull))
 - Cleanup code around message interpolation [#268](https://github.com/recurly/recurly-client-ruby/pull/268) ([bhelx](https://github.com/bhelx))
 - removes base from error messages [#267](https://github.com/recurly/recurly-client-ruby/pull/267) ([lmnleaf](https://github.com/lmnleaf))

README.md

@@ -14,7 +14,7 @@ Recurly is packaged as a Ruby gem. We recommend you install it with
 [Bundler](http://gembundler.com/) by adding the following line to your Gemfile:
 
 ``` ruby
-gem 'recurly', '~> 2.19.6'
+gem 'recurly', '~> 2.20.5'
 ```
 
 Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice

lib/recurly_v2.rb

@@ -27,6 +27,7 @@ module RecurlyV2
   require 'recurly_v2/external_invoice'
   require 'recurly_v2/external_product'
   require 'recurly_v2/external_product_reference'
+  require 'recurly_v2/external_payment_phase'
   require 'recurly_v2/external_subscription'
   require 'recurly_v2/helper'
   require 'recurly_v2/invoice'
@@ -61,6 +62,8 @@ module RecurlyV2
   require 'recurly_v2/currency_percentage_tier'
   require 'recurly_v2/sub_add_on_percentage_tier'
   require 'recurly_v2/custom_field_definition'
+  require 'recurly_v2/general_ledger_account'
+  require 'recurly_v2/performance_obligation'
 
   @subdomain = nil
 

lib/recurly_v2/add_on.rb

@@ -31,7 +31,7 @@ class AddOn < Resource
       external_sku
       avalara_service_type
       avalara_transaction_type
-    )
+    ) + RevRec::PRODUCT_ATTRIBUTES
     alias to_param add_on_code
     alias quantity default_quantity
 

lib/recurly_v2/adjustment.rb

@@ -55,6 +55,8 @@ class Adjustment < Resource
       tax_type
       tax_region
       tax_rate
+      origin_tax_address_source
+      destination_tax_address_source
       tax_exempt
       tax_inclusive
       tax_code
@@ -67,8 +69,9 @@ class Adjustment < Resource
       surcharge_in_cents
       avalara_transaction_type
       avalara_service_type
+      vertex_transaction_type
       refundable_total_in_cents
-    ]
+    ] + RevRec::ALL_ATTRIBUTES
     alias to_param uuid
 
     # @return ["charge", "credit", nil] The type of adjustment.

lib/recurly_v2/billing_info.rb

@@ -50,6 +50,7 @@ class BillingInfo < Resource
       backup_payment_method
       cc_bin_country
       online_banking_payment_type
+      card_network_preference
     ) | CREDIT_CARD_ATTRIBUTES | BANK_ACCOUNT_ATTRIBUTES | AMAZON_ATTRIBUTES | PAYPAL_ATTRIBUTES | ROKU_ATTRIBUTES | SEPA_ATTRIBUTES | BACS_ATTRIBUTES | BECS_ATTRIBUTES | VENMO_ATTRIBUTES
 
     # Verify an account's stored billing info

lib/recurly_v2/business_entity.rb

@@ -1,9 +1,10 @@
 module RecurlyV2
   class BusinessEntity < Resource
     belongs_to :site
+    belongs_to :default_revenue_gl_account, class_name: 'GeneralLedgerAccount'
+    belongs_to :default_liability_gl_account, class_name: 'GeneralLedgerAccount'
 
     has_many :invoices
-
     has_many :accounts
 
     define_attribute_methods %w(
@@ -12,9 +13,13 @@ class BusinessEntity < Resource
       name
       invoice_display_address
       tax_address
+      origin_tax_address_source
+      destination_tax_address_source
       subscriber_location_countries
       default_vat_number
       default_registration_number
+      default_revenue_gl_account_id
+      default_liability_gl_account_id
       created_at
       updated_at
     )

lib/recurly_v2/external_invoice.rb

@@ -5,6 +5,7 @@ class ExternalInvoice < Resource
     belongs_to :site
     belongs_to :account
     belongs_to :external_subscription
+    belongs_to :external_payment_phase
 
     # @return [[ExternalCharge], nil]
     has_many :line_items, class_name: :ExternalCharge

lib/recurly_v2/external_payment_phase.rb

@@ -0,0 +1,27 @@
+module RecurlyV2
+  class ExternalPaymentPhase < Resource
+
+    # @return [ExternalSubscription]
+    belongs_to :external_subscription
+
+    define_attribute_methods %w(
+      id
+      started_at
+      ends_at
+      starting_billing_period_index
+      ending_billing_period_index
+      offer_type
+      offer_name
+      period_count
+      period_length
+      amount
+      currency
+      created_at
+      updated_at
+    )
+
+    # We do not expose POST or PUT via the v2 API
+    protected(*%w(save save!))
+    private_class_method(*%w(create! create))
+  end
+end

lib/recurly_v2/external_subscription.rb

@@ -10,8 +10,12 @@ class ExternalSubscription < Resource
     # @return [ExternalInvoice]
     has_many :external_invoices
 
+    # @return [ExternalPaymentPhase]
+    has_many :external_payment_phases
+
     define_attribute_methods %w(
       account
+      uuid
       external_id
       external_product_reference
       quantity
@@ -23,10 +27,36 @@ class ExternalSubscription < Resource
       auto_renew
       app_identifier
       state
+      trial_started_at
+      trial_ends_at
+      canceled_at
+      in_grace_period
+      imported
+      test
     )
 
     # We do not expose PUT or POST in the v2 API.
     protected(*%w(save save!))
     private_class_method(*%w(create! create))
+
+    def get_external_payment_phases
+      Pager.new(RecurlyV2::ExternalPaymentPhase, uri: "#{path}/external_payment_phases", parent: self)
+    rescue RecurlyV2::API::UnprocessableEntity => e
+      raise Invalid, e.message
+    end
+
+    def get_external_payment_phase(external_payment_phase_uuid)
+      ExternalPaymentPhase.from_response API.get("#{path}/external_payment_phases/#{external_payment_phase_uuid}")
+    rescue RecurlyV2::API::UnprocessableEntity => e
+      raise Invalid, e.message
+    end
+
+    def self.find_by_external_id(external_id)
+      self.find("external-id-#{external_id}")
+    end
+
+    def self.find_by_uuid(uuid)
+      self.find("uuid-#{uuid}")
+    end
   end
 end

lib/recurly_v2/general_ledger_account.rb

@@ -0,0 +1,16 @@
+module RecurlyV2
+  class GeneralLedgerAccount < Resource
+    belongs_to :site
+
+    define_attribute_methods %w(
+      id
+      code
+      description
+      account_type
+    )
+
+    def self.collection_path
+      "general_ledger_accounts"
+    end
+  end
+end