4.7.0

braintree · Apr 1, 2022 · f18d293 · f18d293
1 parent f521dd0
commit f18d293
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
+## 4.7.0
+* Add `AchReturnCode` to transaction object
+* Add `retried` boolean to `Transaction`
 
-# 4.6.0
-
+## 4.6.0
 * Add `PaymentMethodCustomerDataUpdated` webhook notification support
 
-
 ## 4.5.0
 * Add plan create/update/find API endpoint
 * Add support for `TransactionReview` webhook notification

diff --git a/lib/braintree/transaction.rb b/lib/braintree/transaction.rb
@@ -91,6 +91,7 @@ module Status
     end
 
     attr_reader :acquirer_reference_number
+    attr_reader :ach_return_code
     attr_reader :add_ons
     attr_reader :additional_processor_response          # The raw response from the processor.
     attr_reader :amount
@@ -146,6 +147,7 @@ module Status
     attr_reader :refund_ids
     attr_reader :refunded_transaction_id
     attr_reader :refunded_installments
+    attr_reader :retried
     attr_reader :retrieval_reference_number
     attr_reader :risk_data
     attr_reader :samsung_pay_card_details

diff --git a/lib/braintree/version.rb b/lib/braintree/version.rb
@@ -1,7 +1,7 @@
 module Braintree
   module Version
     Major = 4
-    Minor = 6
+    Minor = 7
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

diff --git a/spec/integration/braintree/payment_method_spec.rb b/spec/integration/braintree/payment_method_spec.rb
@@ -200,7 +200,7 @@ def make_token
       venmo_account.default.should == true
       venmo_account.token.should == token
       venmo_account.username.should == "venmojoe"
-      venmo_account.venmo_user_id.should == "Venmo-Joe-1"
+      venmo_account.venmo_user_id.should == "1234567891234567891"
       venmo_account.image_url.should include(".png")
       venmo_account.source_description.should == "Venmo Account: venmojoe"
       venmo_account.customer_id.should == customer.id
@@ -1163,7 +1163,7 @@ def make_token
         venmo_account.default.should == true
         venmo_account.image_url.should =~ /venmo/
         venmo_account.username.should == "venmojoe"
-        venmo_account.venmo_user_id.should == "Venmo-Joe-1"
+        venmo_account.venmo_user_id.should == "1234567891234567891"
         venmo_account.source_description.should == "Venmo Account: venmojoe"
         venmo_account.customer_id.should == customer.id
       end

diff --git a/spec/integration/braintree/transaction_search_spec.rb b/spec/integration/braintree/transaction_search_spec.rb
@@ -419,6 +419,17 @@
         collection.maximum_size.should == 0
       end
 
+      it "searches for settlement_confirmed transaction" do
+        transaction_id = "settlement_confirmed_txn"
+
+        collection = Braintree::Transaction.search do |search|
+          search.id.is transaction_id
+        end
+
+        collection.maximum_size.should == 1
+        collection.first.id.should == transaction_id
+      end
+
       it "finds expired authorizations by status" do
         collection = Braintree::Transaction.search do |search|
           search.status.in Braintree::Transaction::Status::AuthorizationExpired

diff --git a/spec/integration/braintree/transaction_spec.rb b/spec/integration/braintree/transaction_spec.rb
@@ -1947,7 +1947,7 @@
         venmo_account_details.should be_a(Braintree::Transaction::VenmoAccountDetails)
         venmo_account_details.token.should respond_to(:to_str)
         venmo_account_details.username.should == "venmojoe"
-        venmo_account_details.venmo_user_id.should == "Venmo-Joe-1"
+        venmo_account_details.venmo_user_id.should == "1234567891234567891"
         venmo_account_details.image_url.should include(".png")
         venmo_account_details.source_description.should == "Venmo Account: venmojoe"
       end
@@ -6941,6 +6941,39 @@ def create_escrowed_transcation
     end
   end
 
+  describe "retried flag presence in response" do
+    it "creates a retried transaction" do
+      result = Braintree::Transaction.sale(
+        :amount => Braintree::Test::TransactionAmounts::Decline,
+        :payment_method_token => "network_tokenized_credit_card",
+      )
+      transaction = result.transaction
+      transaction.retried.should == true
+    end
+
+    it "creates a non-retried transaction" do
+      result = Braintree::Transaction.sale(
+        :amount => Braintree::Test::TransactionAmounts::Authorize,
+        :payment_method_token => "network_tokenized_credit_card",
+      )
+      transaction = result.transaction
+      transaction.retried.should == nil
+    end
+
+    it "creates a transaction that is ineligible for retries" do
+      result = Braintree::Transaction.sale(
+        :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2009"
+        },
+        :amount => Braintree::Test::TransactionAmounts::Authorize,
+      )
+      transaction = result.transaction
+      transaction.retried.should == nil
+    end
+  end
+
   describe "installments" do
     it "creates a transaction with an installment count" do
       result = Braintree::Transaction.create(

diff --git a/spec/unit/braintree/transaction_spec.rb b/spec/unit/braintree/transaction_spec.rb
@@ -238,6 +238,14 @@
       transaction.network_transaction_id.should == "123456789012345"
     end
 
+    it "accepts ach_return_code" do
+      transaction = Braintree::Transaction._new(
+        :gateway,
+        :ach_return_code => "R01",
+      )
+      expect(transaction.ach_return_code).to eq("R01")
+    end
+
     it "accepts network_response code and network_response_text" do
       transaction = Braintree::Transaction._new(
         :gateway,