braintree 4.26.0 → 4.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8e969e0988757df5800a440fdc36293b48bc0c72cc8c56b1175d74d79f309b
-  data.tar.gz: b44530a7eb4a73728fd4c79292633fc7d7ca0d6476c26b7277c1a3051d29fcaa
+  metadata.gz: 4cf859b9e9cd1dc488cbebf8b754be0a5657e76202688385526c3e83aae6510a
+  data.tar.gz: 71cfdbfa882a2e5e6bbb21cdd09bbf2c60b64b73956dd54a641c97cc8f3c2bee
 SHA512:
-  metadata.gz: 2d985f754fa864774601dad717587b5d5d7f1e75a9579286100559e9cd4ab1819fd856b5c90c6d59870149b6d7bfd0cc5d2865f2d96362a208c037854b9ab312
-  data.tar.gz: 2ab4e8c0f48d76e10f4854e3e32fe55c154c8bdd40730625409f4259921268788c9bd2baf3152724a6d665ed5d0bf53dc7b540570f2f9777ced5dc53be6aeaa8
+  metadata.gz: 7df6373d9bfa7fcb80d6d828cdfe36e044e194ff5a7e63bfb561cd52e946e61d564ddbc63f4194680a69642ef4a8e8a681b88eb90e03d43348660ca10a9b41cb
+  data.tar.gz: bd194236bbf640da0e0765819468e12b0358b292a66a042482c7869abe3ee786c5f2e92b59dc3a00f22c6ccd85a94f94cecae1b99008e9923712a848f4aaec1e

data/lib/braintree/configuration.rb

@@ -239,7 +239,7 @@ module Braintree
       when :production
         "#{endpoint}.braintreegateway.com"
       when :qa
-        "gateway.qa2.braintreepayments.com"
+        "gateway.qa.braintreepayments.com"
       when :sandbox
         "api.sandbox.braintreegateway.com"
       end

data/lib/braintree/error_codes.rb

@@ -116,7 +116,6 @@ module Braintree
         VerificationAmountFormatIsInvalid = "91740"
         VerificationAmountIsTooLarge = "91752"
         VerificationAmountNotSupportedByProcessor = "91741"
-        VerificationMerchantAccountCannotBeSubMerchantAccount = "91755"
         VerificationMerchantAccountIdIsInvalid = "91728"
         VerificationMerchantAccountIsForbidden = "91743"
         VerificationMerchantAccountIsSuspended = "91742"
@@ -191,6 +190,10 @@ module Braintree
       AndroidPayCardsAreNotAccepted = "83708"
     end
 
+    module PaymentFacilitator
+      PaymentFacilitatorNotApplicable = "97405"
+    end
+
     module PayPalAccount
       AuthExpired = "92911"
       CannotHaveBothAccessTokenAndConsentCode = "82903"
@@ -337,21 +340,16 @@ module Braintree
       BillingAddressConflict = "91530"
       BillingPhoneNumberIsInvalid = "915206"
       CannotBeVoided = "91504"
-      CannotCancelRelease = "91562"
       CannotCloneCredit = "91543"
-      CannotCloneMarketplaceTransaction = "915137"
       CannotCloneTransactionWithPayPalAccount = "91573"
       CannotCloneTransactionWithVaultCreditCard = "91540"
       CannotCloneUnsuccessfulTransaction = "91542"
       CannotCloneVoiceAuthorizations = "91541"
-      CannotHoldInEscrow = "91560"
-      CannotPartiallyRefundEscrowedTransaction = "91563"
       CannotRefundCredit = "91505"
       CannotRefundSettlingTransaction = "91574"
       CannotRefundUnlessSettled = "91506"
       CannotRefundWithPendingMerchantAccount = "91559"
       CannotRefundWithSuspendedMerchantAccount = "91538"
-      CannotReleaseFromEscrow = "91561"
       CannotSimulateTransactionSettlement = "91575"
       CannotSubmitForSettlement = "91507"
       CannotUpdateTransactionDetailsNotSubmittedForSettlement = "915129"
@@ -434,7 +432,6 @@ module Braintree
       ShipsFromPostalCodeInvalidCharacters = "915167"
       ShipsFromPostalCodeIsInvalid = "915166"
       ShipsFromPostalCodeIsTooLong = "915165"
-      SubMerchantAccountRequiresServiceFeeAmount = "91553"
       SubscriptionDoesNotBelongToCustomer = "91529"
       SubscriptionIdIsInvalid = "91528"
       SubscriptionStatusMustBePastDue = "91531"
@@ -468,6 +465,7 @@ module Braintree
       UsBankAccountNonceMustBePlaidVerified = "915171"
       UsBankAccountNotVerified = "915172"
 
+
       module Options
         SubmitForSettlementIsRequiredForCloning = "91544"
         SubmitForSettlementIsRequiredForPayPalUnilateral = "91582"
@@ -639,110 +637,14 @@ module Braintree
     end
 
     module MerchantAccount
-      CannotBeUpdated = "82674"
-      Declined = "82626"
-      DeclinedFailedKYC = "82623"
-      DeclinedMasterCardMatch = "82622"
-      DeclinedOFAC = "82621"
-      DeclinedSsnInvalid = "82624"
-      DeclinedSsnMatchesDeceased = "82625"
-      IdCannotBeUpdated = "82675"
-      IdFormatIsInvalid = "82603"
-      IdIsInUse = "82604"
-      IdIsNotAllowed = "82605"
-      IdIsTooLong = "82602"
-      MasterMerchantAccountIdCannotBeUpdated = "82676"
-      MasterMerchantAccountIdIsInvalid = "82607"
-      MasterMerchantAccountIdIsRequired = "82606"
-      MasterMerchantAccountMustBeActive = "82608"
-      TosAcceptedIsRequired = "82610"
 
       module ApplicantDetails
-        AccountNumberIsInvalid = "82670"
-        AccountNumberIsRequired = "82614"
-        CompanyNameIsInvalid = "82631"
-        CompanyNameIsRequiredWithTaxId = "82633"
-        DateOfBirthIsInvalid = "82663"
-        DateOfBirthIsRequired = "82612"
         Declined = "82626"                   # Keep for backwards compatibility
         DeclinedFailedKYC = "82623"          # Keep for backwards compatibility
         DeclinedMasterCardMatch = "82622"    # Keep for backwards compatibility
         DeclinedOFAC = "82621"               # Keep for backwards compatibility
         DeclinedSsnInvalid = "82624"         # Keep for backwards compatibility
         DeclinedSsnMatchesDeceased = "82625" # Keep for backwards compatibility
-        EmailAddressIsInvalid = "82616"
-        EmailAddressIsRequired = "82665"
-        FirstNameIsInvalid = "82627"
-        FirstNameIsRequired = "82609"
-        LastNameIsInvalid = "82628"
-        LastNameIsRequired = "82611"
-        PhoneIsInvalid = "82636"
-        RoutingNumberIsInvalid = "82635"
-        RoutingNumberIsRequired = "82613"
-        SsnIsInvalid = "82615"
-        TaxIdIsInvalid = "82632"
-        TaxIdIsRequiredWithCompanyName = "82634"
-        TaxIdMustBeBlank = "82673"
-
-        module Address
-          LocalityIsRequired = "82618"
-          PostalCodeIsInvalid = "82630"
-          PostalCodeIsRequired = "82619"
-          RegionIsInvalid = "82664"
-          RegionIsRequired = "82620"
-          StreetAddressIsInvalid = "82629"
-          StreetAddressIsRequired = "82617"
-        end
-      end
-
-      module Individual
-        DateOfBirthIsInvalid = "82666"
-        DateOfBirthIsRequired = "82639"
-        EmailIsInvalid = "82643"
-        EmailIsRequired = "82667"
-        FirstNameIsInvalid = "82644"
-        FirstNameIsRequired = "82637"
-        LastNameIsInvalid = "82645"
-        LastNameIsRequired = "82638"
-        PhoneIsInvalid = "82656"
-        SsnIsInvalid = "82642"
-
-        module Address
-          LocalityIsRequired = "82658"
-          PostalCodeIsInvalid = "82662"
-          PostalCodeIsRequired = "82659"
-          RegionIsInvalid = "82668"
-          RegionIsRequired = "82660"
-          StreetAddressIsInvalid = "82661"
-          StreetAddressIsRequired = "82657"
-        end
-      end
-
-      module Business
-        DbaNameIsInvalid = "82646"
-        LegalNameIsInvalid = "82677"
-        LegalNameIsRequiredWithTaxId = "82669"
-        TaxIdIsInvalid = "82647"
-        TaxIdIsRequiredWithLegalName = "82648"
-        TaxIdMustBeBlank = "82672"
-        module Address
-          PostalCodeIsInvalid = "82686"
-          RegionIsInvalid = "82684"
-          StreetAddressIsInvalid = "82685"
-        end
-      end
-
-      module Funding
-        AccountNumberIsInvalid = "82671"
-        AccountNumberIsRequired = "82641"
-        DestinationIsInvalid = "82679"
-        DestinationIsRequired = "82678"
-        EmailIsInvalid = "82681"
-        EmailIsRequired = "82680"
-        MobilePhoneIsInvalid = "82683"
-        MobilePhoneIsRequired = "82682"
-        RoutingNumberIsInvalid = "82649"
-        RoutingNumberIsRequired = "82640"
       end
     end
 
@@ -808,7 +710,6 @@ module Braintree
         AmountFormatIsInvalid = "94202"
         AmountIsTooLarge = "94207"
         AmountNotSupportedByProcessor = "94203"
-        MerchantAccountCannotBeSubMerchantAccount = "94208"
         MerchantAccountIdIsInvalid = "94204"
         MerchantAccountIsForbidden = "94206"
         MerchantAccountIsSuspended = "94205"

data/lib/braintree/merchant_account.rb

@@ -18,44 +18,20 @@ module Braintree
       include Braintree::MerchantAccount::FundingDestination
     end
 
-    attr_reader :business_details
     attr_reader :currency_iso_code
     attr_reader :default
-    attr_reader :funding_details
     attr_reader :id
-    attr_reader :individual_details
-    attr_reader :master_merchant_account
     attr_reader :status
 
     alias_method :default?, :default
 
-    def self.create(*args)
-      Configuration.gateway.merchant_account.create(*args)
-    end
-
-    def self.create!(*args)
-      Configuration.gateway.merchant_account.create!(*args)
-    end
-
     def self.find(*args)
       Configuration.gateway.merchant_account.find(*args)
     end
 
-    def self.update(*args)
-      Configuration.gateway.merchant_account.update(*args)
-    end
-
-    def self.update!(*args)
-      Configuration.gateway.merchant_account.update!(*args)
-    end
-
     def initialize(gateway, attributes)
       @gateway = gateway
       set_instance_variables_from_hash(attributes)
-      @individual_details = IndividualDetails.new(@individual)
-      @business_details = BusinessDetails.new(@business)
-      @funding_details = FundingDetails.new(@funding)
-      @master_merchant_account = MerchantAccount._new(@gateway, attributes.delete(:master_merchant_account)) if attributes[:master_merchant_account]
     end
 
     class << self
@@ -66,7 +42,7 @@ module Braintree
     end
 
     def inspect
-      order = [:id, :status, :master_merchant_account]
+      order = [:id, :status]
       nice_attributes = order.map do |attr|
         "#{attr}: #{send(attr).inspect}"
       end

data/lib/braintree/merchant_account_gateway.rb

@@ -20,16 +20,6 @@ module Braintree
       PaginatedResult.new(body[:total_items], body[:page_size], merchant_accounts)
     end
 
-    def create(attributes)
-      signature = MerchantAccountGateway._detect_signature(attributes)
-      Util.verify_keys(signature, attributes)
-      _do_create "/merchant_accounts/create_via_api", :merchant_account => attributes
-    end
-
-    def create!(*args)
-      return_object_or_raise(:merchant_account) { create(*args) }
-    end
-
     def find(merchant_account_id)
       raise ArgumentError if merchant_account_id.nil? || merchant_account_id.to_s.strip == ""
       response = @config.http.get("#{@config.base_merchant_path}/merchant_accounts/#{merchant_account_id}")
@@ -38,37 +28,10 @@ module Braintree
       raise NotFoundError, "Merchant account with id #{merchant_account_id} not found"
     end
 
-    def update(merchant_account_id, attributes)
-      Util.verify_keys(MerchantAccountGateway._update_signature, attributes)
-      _do_update "/merchant_accounts/#{merchant_account_id}/update_via_api", :merchant_account => attributes
-    end
-
-    def update!(*args)
-      return_object_or_raise(:merchant_account) { update(*args) }
-    end
-
     def create_for_currency(params)
       _create_for_currency(params)
     end
 
-    def _do_create(path, params=nil)
-      response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
-      if response[:api_error_response]
-        ErrorResult.new(@gateway, response[:api_error_response])
-      else
-        SuccessfulResult.new(:merchant_account => MerchantAccount._new(@gateway, response[:merchant_account]))
-      end
-    end
-
-    def _do_update(path, params=nil)
-      response = @config.http.put("#{@config.base_merchant_path}#{path}", params)
-      if response[:api_error_response]
-        ErrorResult.new(@gateway, response[:api_error_response])
-      else
-        SuccessfulResult.new(:merchant_account => MerchantAccount._new(@gateway, response[:merchant_account]))
-      end
-    end
-
     def _create_for_currency(params)
       response = @config.http.post("#{@config.base_merchant_path}/merchant_accounts/create_for_currency", :merchant_account => params)
 
@@ -82,49 +45,5 @@ module Braintree
         raise UnexpectedError, "expected :merchant or :api_error_response"
       end
     end
-
-    # NEXT_MAJOR_VERSION this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
-    def self._detect_signature(attributes)
-      if attributes.has_key?(:applicant_details)
-        warn "[DEPRECATED] Passing :applicant_details to create is deprecated. Please use :individual, :business, and :funding."
-        MerchantAccountGateway._deprecated_create_signature
-      else
-        MerchantAccountGateway._create_signature
-      end
-    end
-
-    # NEXT_MAJOR_VERSION this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
-    def self._deprecated_create_signature
-      [
-        {:applicant_details => [
-          :first_name, :last_name, :email, :date_of_birth, :ssn, :routing_number,
-          :account_number, :tax_id, :company_name, :phone,
-          {:address => [:street_address, :postal_code, :locality, :region]}]
-        },
-        :tos_accepted, :master_merchant_account_id, :id
-      ]
-    end
-
-    def self._signature
-      [
-        {:individual => [
-          :first_name, :last_name, :email, :date_of_birth, :ssn, :phone,
-          {:address => [:street_address, :locality, :region, :postal_code]}]
-        },
-        {:business => [
-          :dba_name, :legal_name, :tax_id,
-          {:address => [:street_address, :locality, :region, :postal_code]}]
-        },
-        {:funding => [:destination, :email, :mobile_phone, :routing_number, :account_number, :descriptor]}
-      ]
-    end
-
-    def self._create_signature
-      _signature + [:tos_accepted, :master_merchant_account_id, :id]
-    end
-
-    def self._update_signature
-      _signature
-    end
   end
 end

data/lib/braintree/transaction.rb

@@ -9,15 +9,6 @@ module Braintree
       Unrecognized = "unrecognized"
     end
 
-    module EscrowStatus
-      HoldPending    = "hold_pending"
-      Held           = "held"
-      ReleasePending = "release_pending"
-      Released       = "released"
-      Refunded       = "refunded"
-      Unrecognized   = "unrecognized"
-    end
-
     module GatewayRejectionReason
       ApplicationIncomplete = "application_incomplete"
       AVS          = "avs"
@@ -118,7 +109,6 @@ module Braintree
     attr_reader :discount_amount
     attr_reader :discounts
     attr_reader :disputes
-    attr_reader :escrow_status
     attr_reader :facilitated_details
     attr_reader :facilitator_details
     attr_reader :foreign_retailer
@@ -235,14 +225,6 @@ module Braintree
       Configuration.gateway.transaction_line_item.find_all(*args)
     end
 
-    def self.hold_in_escrow(*args)
-      Configuration.gateway.transaction.hold_in_escrow(*args)
-    end
-
-    def self.hold_in_escrow!(*args)
-      Configuration.gateway.transaction.hold_in_escrow!(*args)
-    end
-
     def self.refund(*args)
       Configuration.gateway.transaction.refund(*args)
     end
@@ -263,14 +245,6 @@ module Braintree
       Configuration.gateway.transaction.search(&block)
     end
 
-    def self.release_from_escrow(*args)
-      Configuration.gateway.transaction.release_from_escrow(*args)
-    end
-
-    def self.release_from_escrow!(*args)
-      Configuration.gateway.transaction.release_from_escrow!(*args)
-    end
-
     def self.submit_for_settlement(*args)
       Configuration.gateway.transaction.submit_for_settlement(*args)
     end

data/lib/braintree/transaction_gateway.rb

@@ -31,16 +31,6 @@ module Braintree
       return_object_or_raise(:transaction) { cancel_release(*args) }
     end
 
-    def hold_in_escrow(transaction_id)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
-      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/hold_in_escrow")
-      _handle_transaction_response(response)
-    end
-
-    def hold_in_escrow!(*args)
-      return_object_or_raise(:transaction) { hold_in_escrow(*args) }
-    end
-
     def _handle_transaction_response(response)
       if response[:transaction]
         SuccessfulResult.new(:transaction => Transaction._new(@gateway, response[:transaction]))
@@ -135,16 +125,6 @@ module Braintree
       end
     end
 
-    def release_from_escrow(transaction_id)
-      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
-      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/release_from_escrow")
-      _handle_transaction_response(response)
-    end
-
-    def release_from_escrow!(*args)
-      return_object_or_raise(:transaction) { release_from_escrow(*args) }
-    end
-
     def submit_for_settlement(transaction_id, amount = nil, options = {})
       raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
       Util.verify_keys(TransactionGateway._submit_for_settlement_signature, options)
@@ -275,6 +255,15 @@ module Braintree
         ]
         },
         {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email, :payer_id, :payment_id]},
+        {:payment_facilitator => [
+          :payment_facilitator_id,
+          {:sub_merchant => [:reference_number, :tax_id, :legal_name,
+            {:address => [ :street_address, :locality, :region, :country_code_alpha2, :postal_code,
+              {:international_phone => [:country_code, :national_number
+              ]}
+            ]}
+          ]}
+        ]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {
           :shipping => AddressGateway._shared_signature + [:shipping_method],

data/lib/braintree/version.rb

@@ -1,7 +1,7 @@
 module Braintree
   module Version
     Major = 4
-    Minor = 26
+    Minor = 27
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

data/lib/braintree/webhook_notification.rb

@@ -13,7 +13,6 @@ module Braintree
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
       ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
-      DisbursementException = "disbursement_exception"
 
       DisputeAccepted = "dispute_accepted"
       DisputeAutoAccepted = "dispute_auto_accepted"
@@ -57,9 +56,6 @@ module Braintree
       SubscriptionWentActive = "subscription_went_active"
       SubscriptionWentPastDue = "subscription_went_past_due"
 
-      SubMerchantAccountApproved = "sub_merchant_account_approved"
-      SubMerchantAccountDeclined = "sub_merchant_account_declined"
-
       TransactionDisbursed = "transaction_disbursed"
       TransactionReviewed = "transaction_reviewed"
       TransactionSettlementDeclined = "transaction_settlement_declined"

data/lib/braintree/webhook_testing_gateway.rb

@@ -58,10 +58,6 @@ module Braintree
         _partner_merchant_declined_sample_xml(id)
       when Braintree::WebhookNotification::Kind::OAuthAccessRevoked
         _oauth_access_revoked_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::SubMerchantAccountApproved
-        _merchant_account_approved_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::SubMerchantAccountDeclined
-        _merchant_account_declined_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionDisbursed
         _transaction_disbursed_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionReviewed
@@ -70,8 +66,6 @@ module Braintree
         _transaction_settled_sample_xml(id)
       when Braintree::WebhookNotification::Kind::TransactionSettlementDeclined
         _transaction_settlement_declined_sample_xml(id)
-      when Braintree::WebhookNotification::Kind::DisbursementException
-        _disbursement_exception_sample_xml(id)
       when Braintree::WebhookNotification::Kind::Disbursement
         _disbursement_sample_xml(id)
       when Braintree::WebhookNotification::Kind::SubscriptionBillingSkipped
@@ -959,33 +953,7 @@ module Braintree
       XML
     end
 
-    def _disbursement_exception_sample_xml(id)
-
-      <<-XML
-        <disbursement>
-          <id>#{id}</id>
-          <transaction-ids type="array">
-            <item>afv56j</item>
-            <item>kj8hjk</item>
-          </transaction-ids>
-          <success type="boolean">false</success>
-          <retry type="boolean">false</retry>
-          <merchant-account>
-            <id>merchant_account_token</id>
-            <currency-iso-code>USD</currency-iso-code>
-            <sub-merchant-account type="boolean">false</sub-merchant-account>
-            <status>active</status>
-          </merchant-account>
-          <amount>100.00</amount>
-          <disbursement-date type="date">2014-02-10</disbursement-date>
-          <exception-message>bank_rejected</exception-message>
-          <follow-up-action>update_funding_information</follow-up-action>
-        </disbursement>
-      XML
-    end
-
     def _disbursement_sample_xml(id)
-
       <<-XML
         <disbursement>
           <id>#{id}</id>
@@ -1010,7 +978,6 @@ module Braintree
     end
 
     def _account_updater_daily_report_sample_xml(id)
-
       <<-XML
         <account-updater-daily-report>
           <report-date type="date">2016-01-14</report-date>

data/lib/braintree.rb

@@ -98,9 +98,6 @@ require "braintree/merchant"
 require "braintree/merchant_gateway"
 require "braintree/merchant_account"
 require "braintree/merchant_account_gateway"
-require "braintree/merchant_account/individual_details"
-require "braintree/merchant_account/business_details"
-require "braintree/merchant_account/funding_details"
 require "braintree/merchant_account/address_details"
 require "braintree/meta_checkout_card"
 require "braintree/meta_checkout_token"

data/spec/integration/braintree/disbursement_spec.rb

@@ -28,4 +28,4 @@ describe Braintree::Disbursement do
       expect(transaction.id).to eq("sub_merchant_transaction")
     end
   end
-end
+end