4.35.0

Co-authored-by: Rajaram Gurumurthi <[email protected]>
Co-authored-by: Kevin Laguerre <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+
+## 4.35.0
+* Add support for capturing payment facilitator and sub-merchant details with transactions 
+* Remove marketplace features
+
 ## 4.34.0
 * Add prepaid_reloadable from bin data in credit card responses
 * Add support for `PayPalPaymentResource` requests

braintree/__init__.py

@@ -41,9 +41,10 @@
 from braintree.local_payment_reversed import LocalPaymentReversed
 from braintree.merchant import Merchant
 from braintree.merchant_account import MerchantAccount
-from braintree.merchant_account_gateway import MerchantAccountGateway
+from braintree.merchant_account_gateway import MerchantAccountGateway 
 from braintree.oauth_access_revocation import OAuthAccessRevocation
 from braintree.partner_merchant import PartnerMerchant
+from braintree.payment_facilitator import PaymentFacilitator
 from braintree.payment_instrument_type import PaymentInstrumentType
 from braintree.payment_method import PaymentMethod
 from braintree.payment_method_customer_data_updated_metadata import PaymentMethodCustomerDataUpdatedMetadata
@@ -62,6 +63,7 @@
 from braintree.settlement_batch_summary import SettlementBatchSummary
 from braintree.signature_service import SignatureService
 from braintree.status_event import StatusEvent
+from braintree.sub_merchant import SubMerchant
 from braintree.subscription import Subscription
 from braintree.subscription_gateway import SubscriptionGateway
 from braintree.subscription_search import SubscriptionSearch

braintree/braintree_gateway.py

@@ -56,7 +56,7 @@ def __init__(self, config=None, **kwargs):
         self.document_upload = DocumentUploadGateway(self)
         self.exchange_rate_quote = ExchangeRateQuoteGateway(self)
         self.merchant = MerchantGateway(self)
-        self.merchant_account = MerchantAccountGateway(self)
+        self.merchant_account = MerchantAccountGateway(self) 
         self.oauth = OAuthGateway(self)
         self.payment_method = PaymentMethodGateway(self)
         self.payment_method_nonce = PaymentMethodNonceGateway(self)

braintree/error_codes.py

@@ -153,7 +153,6 @@ class Options(object):
             VerificationMerchantAccountIdIsInvalid = "91728"
             VerificationMerchantAccountIsForbidden = "91743"
             VerificationMerchantAccountIsSuspended = "91742"
-            VerificationMerchantAccountCannotBeSubMerchantAccount = "91755"
 
 
     class Customer(object):
@@ -240,104 +239,14 @@ class Merchant(object):
         MerchantAccountExistsForId = "93620"
 
     class MerchantAccount(object):
-        IdFormatIsInvalid = "82603"
-        IdIsInUse = "82604"
-        IdIsNotAllowed = "82605"
-        IdIsTooLong = "82602"
-        MasterMerchantAccountIdIsInvalid = "82607"
-        MasterMerchantAccountIdIsRequired = "82606"
-        MasterMerchantAccountMustBeActive = "82608"
-        TosAcceptedIsRequired = "82610"
-        CannotBeUpdated = "82674"
-        IdCannotBeUpdated = "82675"
-        MasterMerchantAccountIdCannotBeUpdated = "82676"
-        Declined = "82626"
-        DeclinedMasterCardMatch = "82622"
-        DeclinedOFAC = "82621"
-        DeclinedFailedKYC = "82623"
-        DeclinedSsnInvalid = "82624"
-        DeclinedSsnMatchesDeceased = "82625"
 
         class ApplicantDetails(object):
-            AccountNumberIsRequired = "82614"
-            CompanyNameIsInvalid = "82631"
-            CompanyNameIsRequiredWithTaxId = "82633"
-            DateOfBirthIsRequired = "82612"
             Declined = "82626" # Keep for backwards compatibility
             DeclinedMasterCardMatch = "82622" # Keep for backwards compatibility
             DeclinedOFAC = "82621" # Keep for backwards compatibility
             DeclinedFailedKYC = "82623" # Keep for backwards compatibility
             DeclinedSsnInvalid = "82624" # Keep for backwards compatibility
             DeclinedSsnMatchesDeceased = "82625" # Keep for backwards compatibility
-            EmailAddressIsInvalid = "82616"
-            FirstNameIsInvalid = "82627"
-            FirstNameIsRequired = "82609"
-            LastNameIsInvalid = "82628"
-            LastNameIsRequired = "82611"
-            PhoneIsInvalid = "82636"
-            RoutingNumberIsInvalid = "82635"
-            RoutingNumberIsRequired = "82613"
-            SsnIsInvalid = "82615"
-            TaxIdIsInvalid = "82632"
-            TaxIdIsRequiredWithCompanyName = "82634"
-            DateOfBirthIsInvalid = "82663"
-            EmailAddressIsRequired = "82665"
-            AccountNumberIsInvalid = "82670"
-            TaxIdMustBeBlank = "82673"
-
-            class Address(object):
-                LocalityIsRequired = "82618"
-                PostalCodeIsInvalid = "82630"
-                PostalCodeIsRequired = "82619"
-                RegionIsRequired = "82620"
-                StreetAddressIsInvalid = "82629"
-                StreetAddressIsRequired = "82617"
-                RegionIsInvalid = "82664"
-
-        class Individual(object):
-            FirstNameIsRequired = "82637"
-            LastNameIsRequired = "82638"
-            DateOfBirthIsRequired = "82639"
-            SsnIsInvalid = "82642"
-            EmailAddressIsInvalid = "82643"
-            FirstNameIsInvalid = "82644"
-            LastNameIsInvalid = "82645"
-            PhoneIsInvalid = "82656"
-            DateOfBirthIsInvalid = "82666"
-            EmailAddressIsRequired = "82667"
-
-            class Address(object):
-                StreetAddressIsRequired = "82657"
-                LocalityIsRequired = "82658"
-                PostalCodeIsRequired = "82659"
-                RegionIsRequired = "82660"
-                StreetAddressIsInvalid = "82661"
-                PostalCodeIsInvalid = "82662"
-                RegionIsInvalid = "82668"
-
-        class Business(object):
-            DbaNameIsInvalid = "82646"
-            LegalNameIsInvalid = "82677"
-            LegalNameIsRequiredWithTaxId = "82669"
-            TaxIdIsInvalid = "82647"
-            TaxIdIsRequiredWithLegalName = "82648"
-            TaxIdMustBeBlank = "82672"
-            class Address(object):
-                StreetAddressIsInvalid = "82685"
-                PostalCodeIsInvalid = "82686"
-                RegionIsInvalid = "82684"
-
-        class Funding(object):
-            RoutingNumberIsRequired = "82640"
-            AccountNumberIsRequired = "82641"
-            RoutingNumberIsInvalid = "82649"
-            AccountNumberIsInvalid = "82671"
-            DestinationIsInvalid = "82679"
-            DestinationIsRequired = "82678"
-            EmailAddressIsInvalid = "82681"
-            EmailAddressIsRequired = "82680"
-            MobilePhoneIsInvalid = "82683"
-            MobilePhoneIsRequired = "82682"
 
     class OAuth(object):
         InvalidGrant = "93801"
@@ -376,7 +285,6 @@ class Options(object):
             MerchantAccountIdIsInvalid = "94204"
             MerchantAccountIsSuspended = "94205"
             MerchantAccountIsForbidden = "94206"
-            MerchantAccountCannotBeSubMerchantAccount = "94208"
             AccountTypeIsInvalid = "942184"
             AccountTypeNotSupported = "942185"
 
@@ -563,14 +471,11 @@ class Transaction(object):
         CannotCloneTransactionWithVaultCreditCard = "91540"
         CannotCloneUnsuccessfulTransaction = "91542"
         CannotCloneVoiceAuthorizations = "91541"
-        CannotHoldInEscrow = "91560"
-        CannotPartiallyRefundEscrowedTransaction = "91563"
         CannotRefundCredit = "91505"
         CannotRefundSettlingTransaction = "91574"
         CannotRefundUnlessSettled = "91506"
         CannotRefundWithPendingMerchantAccount = "91559"
         CannotRefundWithSuspendedMerchantAccount = "91538"
-        CannotReleaseFromEscrow = "91561"
         CannotSimulateTransactionSettlement = "91575"
         CannotSubmitForPartialSettlement = "915103"
         CannotSubmitForSettlement = "91507"
@@ -654,7 +559,6 @@ class Transaction(object):
         ShipsFromPostalCodeInvalidCharacters = "915167"
         ShipsFromPostalCodeIsInvalid = "915166"
         ShipsFromPostalCodeIsTooLong = "915165"
-        SubMerchantAccountRequiresServiceFeeAmount = "91553"
         SubscriptionDoesNotBelongToCustomer = "91529"
         SubscriptionIdIsInvalid = "91528"
         SubscriptionStatusMustBePastDue = "91531"

braintree/merchant_account/__init__.py

@@ -1,4 +1 @@
-from braintree.merchant_account.business_details import BusinessDetails
-from braintree.merchant_account.funding_details import FundingDetails
-from braintree.merchant_account.individual_details import IndividualDetails
-from braintree.merchant_account.merchant_account import MerchantAccount
+from braintree.merchant_account.merchant_account import MerchantAccount

braintree/merchant_account/business_details.py

@@ -1,38 +1,26 @@
 from braintree.configuration import Configuration
 from braintree.resource import Resource
-from braintree.merchant_account import BusinessDetails, FundingDetails, IndividualDetails
-
 
 class MerchantAccount(Resource):
     class Status(object):
         Active = "active"
         Pending = "pending"
         Suspended = "suspended"
-
+        
     class FundingDestination(object):
         Bank = "bank"
         Email = "email"
         MobilePhone = "mobile_phone"
-
     FundingDestinations = FundingDestination
 
     def __init__(self, gateway, attributes):
         Resource.__init__(self, gateway, attributes)
-        self.individual_details = IndividualDetails(attributes.get("individual", {}))
-        self.business_details = BusinessDetails(attributes.get("business", {}))
-        self.funding_details = FundingDetails(attributes.get("funding", {}))
-        if "master_merchant_account" in attributes:
-            self.master_merchant_account = MerchantAccount(gateway, attributes.pop("master_merchant_account"))
 
     def __repr__(self):
         detail_list = [
             "id",
-            "business_details",
             "currency_iso_code",
             "default",
-            "funding_details",
-            "individual_details",
-            "master_merchant_account",
             "status",
         ]
         return super(MerchantAccount, self).__repr__(detail_list)
@@ -49,4 +37,4 @@ def update(id, attributes):
 
     @staticmethod
     def find(id):
-        return Configuration.gateway().merchant_account.find(id)
+        return Configuration.gateway().merchant_account.find(id)