braintree 2.104.1 → 3.4.0

data/lib/braintree/transaction/disbursement_details.rb

@@ -13,6 +13,7 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @disbursement_date = Date.parse(disbursement_date) unless disbursement_date.nil?
       end
 
       def funds_held?

data/lib/braintree/transaction/{android_pay_details.rb → google_pay_details.rb}

@@ -1,6 +1,6 @@
 module Braintree
   class Transaction
-    class AndroidPayDetails
+    class GooglePayDetails
       include BaseModule
 
       attr_reader :bin

data/lib/braintree/transaction/installment.rb

@@ -0,0 +1,28 @@
+module Braintree
+  class Transaction
+    class Installment
+      include BaseModule
+
+      attr_reader :id
+      attr_reader :amount
+      attr_reader :projected_disbursement_date
+      attr_reader :actual_disbursement_date
+      attr_reader :adjustments
+
+      def initialize(attributes)
+        set_instance_variables_from_hash attributes unless attributes.nil?
+        @amount = Util.to_big_decimal(amount)
+        adjustments.map! { |attrs| Adjustment.new(attrs) } if adjustments
+      end
+
+      def inspect
+        attrs = [:id, :amount, :projected_disbursement_date, :actual_disbursement_date, :adjustments]
+        formatted_attrs = attrs.map do |attr|
+          "#{attr}: #{send(attr).inspect}"
+        end
+
+        "#<#{formatted_attrs.join(", ")}>"
+      end
+    end
+  end
+end

data/lib/braintree/transaction/installment/adjustment.rb

@@ -0,0 +1,33 @@
+module Braintree
+  class Transaction
+    class Installment
+      class Adjustment
+        include BaseModule
+
+        module Kind
+          Refund = "REFUND"
+          Dispute = "DISPUTE"
+        end
+
+        attr_reader :amount
+        attr_reader :kind
+        attr_reader :projected_disbursement_date
+        attr_reader :actual_disbursement_date
+
+        def initialize(attributes)
+          set_instance_variables_from_hash attributes unless attributes.nil?
+          @amount = Util.to_big_decimal(amount)
+        end
+
+        def inspect
+          attrs = [:amount, :kind, :projected_disbursement_date, :actual_disbursement_date]
+          formatted_attrs = attrs.map do |attr|
+            "#{attr}: #{send(attr).inspect}"
+          end
+
+          "#<#{formatted_attrs.join(", ")}>"
+        end
+      end
+    end
+  end
+end

data/lib/braintree/transaction/paypal_details.rb

@@ -4,6 +4,7 @@ module Braintree
       include BaseModule
 
       attr_reader :authorization_id
+      attr_reader :billing_agreement_id
       attr_reader :capture_id
       attr_reader :custom_field
       attr_reader :debug_id

data/lib/braintree/transaction/subscription_details.rb

@@ -8,6 +8,8 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @billing_period_start_date = Date.parse(billing_period_start_date) unless billing_period_start_date.nil?
+        @billing_period_end_date = Date.parse(billing_period_end_date) unless billing_period_end_date.nil?
       end
     end
   end

data/lib/braintree/transaction_gateway.rb

@@ -52,19 +52,8 @@ module Braintree
       return_object_or_raise(:transaction) { clone_transaction(*args) }
     end
 
-    # Deprecated
-    def create_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_create("/transactions/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
-    def create_transaction_url
-      warn "[DEPRECATED] Transaction.create_transaction_url is deprecated. Please use TransparentRedirect.url"
-      "#{@config.base_merchant_url}/transactions/all/create_via_transparent_redirect_request"
-    end
-
     def credit(attributes)
-      create(attributes.merge(:type => 'credit'))
+      create(attributes.merge(:type => "credit"))
     end
 
     def credit!(*args)
@@ -83,7 +72,7 @@ module Braintree
       options = if amount_or_options.is_a?(Hash)
                   amount_or_options
                 else
-                  { :amount => amount_or_options }
+                  {:amount => amount_or_options}
                 end
 
       Util.verify_keys(TransactionGateway._refund_signature, options)
@@ -108,7 +97,7 @@ module Braintree
     end
 
     def sale(attributes)
-      create(attributes.merge(:type => 'sale'))
+      create(attributes.merge(:type => "sale"))
     end
 
     def sale!(*args)
@@ -124,7 +113,7 @@ module Braintree
       if response.has_key?(:search_results)
         ResourceCollection.new(response) { |ids| _fetch_transactions(search, ids) }
       else
-        raise DownForMaintenanceError
+        raise UnexpectedError, "expected :search_results"
       end
     end
 
@@ -150,6 +139,18 @@ module Braintree
       return_object_or_raise(:transaction) { submit_for_settlement(*args) }
     end
 
+    def adjust_authorization(transaction_id, amount)
+      raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
+      Util.verify_keys(TransactionGateway._adjust_authorization_signature, {})
+      transaction_params = {:amount => amount}
+      response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/adjust_authorization", :transaction => transaction_params)
+      _handle_transaction_response(response)
+    end
+
+    def adjust_authorization!(*args)
+      return_object_or_raise(:transaction) { adjust_authorization(*args) }
+    end
+
     def update_details(transaction_id, options = {})
       raise ArgumentError, "transaction_id is invalid" unless transaction_id =~ /\A[0-9a-z]+\z/
       Util.verify_keys(TransactionGateway._update_details_signature, options)
@@ -184,13 +185,14 @@ module Braintree
 
     def self._create_signature # :nodoc:
       [
-        :amount, :customer_id, :merchant_account_id, :order_id, :channel, :payment_method_token,
-        :purchase_order_number, :recurring, :transaction_source, :shipping_address_id, :type, :tax_amount, :tax_exempt,
-        :venmo_sdk_payment_method_code, :device_session_id, :service_fee_amount, :device_data, :fraud_merchant_id,
-        :shipping_amount, :discount_amount, :ships_from_postal_code,
-        :billing_address_id, :payment_method_nonce, :three_d_secure_token, :three_d_secure_authentication_id,
-        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id, :shared_payment_method_nonce,
-        :product_sku,
+        :amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
+        :merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token,
+        :product_sku, :purchase_order_number, :service_fee_amount, :shared_billing_address_id,
+        :shared_customer_id, :shared_payment_method_nonce, :shared_payment_method_token,
+        :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
+        :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,
+        :three_d_secure_token, :transaction_source, :type, :venmo_sdk_payment_method_code,
+        :sca_exemption, :currency_iso_code,
         {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
@@ -256,8 +258,8 @@ module Braintree
           ]},
         ]},
         {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        {:android_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]},
+        {:installments => [:count]},
       ]
     end
 
@@ -275,6 +277,12 @@ module Braintree
       ]
     end
 
+    def self._adjust_authorization_signature
+      [
+        :amount
+      ]
+    end
+
     def self._update_details_signature # :nodoc:
       [
         :amount,
@@ -286,11 +294,15 @@ module Braintree
     def self._refund_signature
       [
         :amount,
-        :order_id
+        :merchant_account_id,
+        :order_id,
       ]
     end
 
     def _do_create(path, params=nil) # :nodoc:
+      if !params.nil?
+        params = Util.replace_key(params, :google_pay_card, :android_pay_card)
+      end
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
       _handle_transaction_response(response)
     end

data/lib/braintree/transaction_line_item.rb

@@ -29,7 +29,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
 

data/lib/braintree/transaction_search.rb

@@ -28,7 +28,6 @@ module Braintree
       :paypal_authorization_id,
       :paypal_payer_email,
       :processor_authorization_code,
-      :europe_bank_account_iban,
       :settlement_batch_id,
       :shipping_company,
       :shipping_country_name,
@@ -38,7 +37,8 @@ module Braintree
       :shipping_locality,
       :shipping_postal_code,
       :shipping_region,
-      :shipping_street_address
+      :shipping_street_address,
+      :store_id,
     )
 
     equality_fields :credit_card_expiration_date
@@ -60,6 +60,7 @@ module Braintree
     multiple_value_field :status, :allows => Transaction::Status::All
     multiple_value_field :source
     multiple_value_field :type, :allows => Transaction::Type::All
+    multiple_value_field :store_ids
 
     key_value_fields :refund
 

data/lib/braintree/unknown_payment_method.rb

@@ -20,7 +20,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/us_bank_account.rb

@@ -35,7 +35,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
 
     def self.find(*args)
@@ -45,8 +45,8 @@ module Braintree
     def self.sale(token, transaction_attributes)
       Configuration.gateway.transaction.sale(transaction_attributes.merge(
           :payment_method_token => token,
-          :options => { :submit_for_settlement => true }
-        )
+          :options => {:submit_for_settlement => true},
+        ),
       )
     end
 

data/lib/braintree/us_bank_account_verification.rb

@@ -63,7 +63,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
 
     def self.confirm_micro_transfer_amounts(*args)

data/lib/braintree/us_bank_account_verification_gateway.rb

@@ -18,7 +18,7 @@ module Braintree
         ErrorResult.new(@gateway, response[:api_error_response])
       else
         SuccessfulResult.new(
-          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification])
+          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification]),
         )
       end
     rescue NotFoundError

data/lib/braintree/util.rb

@@ -14,13 +14,13 @@ module Braintree
         else
           url_encode(full_key) + "=" + url_encode(value)
         end
-      end.sort * '&'
+      end.sort * "&"
     end
 
     def self.parse_query_string(qs)
-      qs.split('&').inject({}) do |result, couplet|
-        pair = couplet.split('=')
-        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || '')
+      qs.split("&").inject({}) do |result, couplet|
+        pair = couplet.split("=")
+        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || "")
         result
       end
     end
@@ -53,6 +53,8 @@ module Braintree
         raise AuthorizationError, message
       when 404
         raise NotFoundError
+      when 408
+        raise RequestTimeoutError
       when 426
         raise UpgradeRequiredError, "Please upgrade your client library."
       when 429
@@ -60,7 +62,9 @@ module Braintree
       when 500
         raise ServerError
       when 503
-        raise DownForMaintenanceError
+        raise ServiceUnavailableError
+      when 504
+        raise GatewayTimeoutError
       else
         raise UnexpectedError, "Unexpected HTTP_RESPONSE #{status_code.to_i}"
       end
@@ -87,7 +91,7 @@ module Braintree
           when "INTERNAL"
             raise ServerError
           when "SERVICE_AVAILABILITY"
-            raise DownForMaintenanceError
+            raise ServiceUnavailableError
           else
             raise UnexpectedError, "Unexpected Response: #{error[:message]}"
           end
@@ -126,6 +130,17 @@ module Braintree
       !invalid_keys.any?
     end
 
+    def self.replace_key(hash, target_key, replacement_key)
+      hash.inject({}) do |new_hash, (key, value)|
+        if value.is_a?(Hash)
+          value = replace_key(value, target_key, replacement_key)
+        end
+
+        key = replacement_key if key == target_key
+        new_hash.merge(key => value)
+      end
+    end
+
     def self._flatten_valid_keys(valid_keys, namespace = nil)
       valid_keys.inject([]) do |result, key|
         if key.is_a?(Hash)

data/lib/braintree/venmo_account.rb

@@ -28,7 +28,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/version.rb

@@ -1,8 +1,8 @@
 module Braintree
   module Version
-    Major = 2
-    Minor = 104
-    Tiny = 1
+    Major = 3
+    Minor = 4
+    Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"
   end

data/lib/braintree/visa_checkout_card.rb

@@ -39,7 +39,7 @@ module Braintree
     end
 
     def _most_recent_verification(attributes)
-      verification = (attributes[:verifications] || []).sort_by{ |verification| verification[:created_at] }.reverse.first
+      verification = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
       CreditCardVerification._new(verification) if verification
     end
 
@@ -84,7 +84,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/webhook_notification.rb

@@ -1,12 +1,17 @@
-require 'ostruct'
+require "ostruct"
 
 module Braintree
   class WebhookNotification
     include BaseModule
 
     module Kind
+
+      AccountUpdaterDailyReport = "account_updater_daily_report"
+
       Check = "check"
 
+      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
+      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
       DisbursementException = "disbursement_exception"
 
@@ -17,6 +22,23 @@ module Braintree
       DisputeDisputed = "dispute_disputed"
       DisputeExpired = "dispute_expired"
 
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
+
+      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+
+      LocalPaymentCompleted = "local_payment_completed"
+      LocalPaymentReversed = "local_payment_reversed"
+
+      OAuthAccessRevoked = "oauth_access_revoked"
+
+      PartnerMerchantConnected = "partner_merchant_connected"
+      PartnerMerchantDisconnected = "partner_merchant_disconnected"
+      PartnerMerchantDeclined = "partner_merchant_declined"
+
+      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
+
+      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
+
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"
       SubscriptionChargedUnsuccessfully = "subscription_charged_unsuccessfully"
@@ -27,33 +49,10 @@ module Braintree
 
       SubMerchantAccountApproved = "sub_merchant_account_approved"
       SubMerchantAccountDeclined = "sub_merchant_account_declined"
+
       TransactionDisbursed = "transaction_disbursed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"
-      PartnerMerchantConnected = "partner_merchant_connected"
-      PartnerMerchantDisconnected = "partner_merchant_disconnected"
-      PartnerMerchantDeclined = "partner_merchant_declined"
-
-      AccountUpdaterDailyReport = "account_updater_daily_report"
-
-      # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-      # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-      IdealPaymentComplete = "ideal_payment_complete"
-      IdealPaymentFailed = "ideal_payment_failed"
-
-      OAuthAccessRevoked = "oauth_access_revoked"
-      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
-      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
-
-      # NEXT_MAJOR_VERSION remove GrantedPaymentInstrumentUpdate. Kind is not sent by Braintree Gateway.
-      # Kind will either be GrantorUpdatedGrantedPaymentMethod or RecipientUpdatedGrantedPaymentMethod.
-      GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
-      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
-      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
-      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
-      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
-
-      LocalPaymentCompleted = "local_payment_completed"
     end
 
     attr_reader :account_updater_daily_report
@@ -63,9 +62,9 @@ module Braintree
     attr_reader :dispute
     attr_reader :granted_payment_instrument_update
     attr_reader :revoked_payment_method_metadata
-    attr_reader :ideal_payment
     attr_reader :kind
     attr_reader :local_payment_completed
+    attr_reader :local_payment_reversed
     attr_reader :oauth_access_revocation
     attr_reader :partner_merchant
     attr_reader :source_merchant_id
@@ -93,12 +92,12 @@ module Braintree
       @disbursement = Disbursement._new(gateway, @subject[:disbursement]) if @subject.has_key?(:disbursement)
       @dispute = Dispute._new(@subject[:dispute]) if @subject.has_key?(:dispute)
       @account_updater_daily_report = AccountUpdaterDailyReport._new(@subject[:account_updater_daily_report]) if @subject.has_key?(:account_updater_daily_report)
-      @ideal_payment = Braintree::IdealPayment._new(gateway, @subject[:ideal_payment]) if @subject.has_key?(:ideal_payment)
       @connected_merchant_status_transitioned = ConnectedMerchantStatusTransitioned._new(@subject[:connected_merchant_status_transitioned]) if @subject.has_key?(:connected_merchant_status_transitioned)
       @connected_merchant_paypal_status_changed = ConnectedMerchantPayPalStatusChanged._new(@subject[:connected_merchant_paypal_status_changed]) if @subject.has_key?(:connected_merchant_paypal_status_changed)
       @granted_payment_instrument_update = GrantedPaymentInstrumentUpdate._new(@subject[:granted_payment_instrument_update]) if @subject.has_key?(:granted_payment_instrument_update)
       @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer].include?(@kind)
-      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment)
+      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment) && Kind::LocalPaymentCompleted == @kind
+      @local_payment_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
     end
 
     def merchant_account
@@ -120,7 +119,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end