6.30.0

Co-authored-by: David Johnson <djohnson14@paypal.com>

Author: braintreeps

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
-## 6.29.0
+## 6.30.0
+* Add `processingMerchantCategoryCode` to `TransactionGateway`
+* Add missing `transfer` validation error codes in `Transaction`
 
+## 6.29.0
 * Add Bank Account Instant Verification functionality
 * Add `BankAccountInstantVerificationGateway` for creating JWT tokens
 * Add `BankAccountInstantVerificationJwt` and `BankAccountInstantVerificationJwtRequest` classes

lib/Braintree/Error/Codes.php

@@ -584,6 +584,7 @@ class Codes
     const TRANSACTION_PAYPAL_NOT_ENABLED                                              = '91576';
     const TRANSACTION_PAY_PAL_AUTH_EXPIRED                                            = '91579';
     const TRANSACTION_PAY_PAL_VAULT_RECORD_MISSING_DATA                               = '91583';
+    const TRANSACTION_PROCESSING_MERCHANT_CATEGORY_CODE_IS_INVALID                    = '915265';
     const TRANSACTION_PROCESSOR_AUTHORIZATION_CODE_CANNOT_BE_SET                      = '91519';
     const TRANSACTION_PROCESSOR_AUTHORIZATION_CODE_IS_INVALID                         = '81520';
     const TRANSACTION_PROCESSOR_DOES_NOT_SUPPORT_AUTHS                                = '915104';
@@ -640,8 +641,19 @@ class Codes
     const TRANSACTION_TRANSACTION_SOURCE_IS_INVALID                                   = '915133';
 
 
-     const TRANSFER_DETAILS_NOT_APPLICABLE                                            = '97501';
-    const TRANSFER_DETAILS_NOT_AVAILABLE                                              = '97510';
+    const TRANSFER_DETAILS_NOT_APPLICABLE                                             = '97501'; //Deprecated
+    const TRANSFER_DETAILS_NOT_AVAILABLE                                              = '97510'; //Deprecated
+    const TRANSACTION_TRANSFER_DETAILS_NOT_APPLICABLE                                 = '97511';
+    const TRANSACTION_TRANSFER_DETAILS_NOT_AVAILABLE                                  = '97510';
+    const TRANSACTION_TRANSFER_RECEIVER_ACCOUNT_REFERENCE_NUMBER_IS_NOT_VALID         = '97509';
+    const TRANSACTION_TRANSFER_RECEIVER_FIRST_NAME_IS_NOT_VALID                       = '97507';
+    const TRANSACTION_TRANSFER_RECEIVER_LAST_NAME_IS_NOT_VALID                        = '97508';
+    const TRANSACTION_TRANSFER_RECEIVER_TAX_ID_IS_NOT_VALID                           = '97506';
+    const TRANSACTION_TRANSFER_SENDER_ACCOUNT_REFERENCE_NUMBER_IS_NOT_VALID           = '97505';
+    const TRANSACTION_TRANSFER_SENDER_FIRST_NAME_IS_NOT_VALID                         = '97503';
+    const TRANSACTION_TRANSFER_SENDER_LAST_NAME_IS_NOT_VALID                          = '97504';
+    const TRANSACTION_TRANSFER_SENDER_TAX_ID_IS_NOT_VALID                             = '97502';
+    const TRANSACTION_TRANSFER_TYPE_INVALID                                           = '97501';
 
     const US_BANK_ACCOUNT_VERIFICATION_NOT_CONFIRMABLE                      = '96101';
     const US_BANK_ACCOUNT_VERIFICATION_MUST_BE_MICRO_TRANSFERS_VERIFICATION = '96102';

lib/Braintree/TransactionGateway.php

@@ -294,6 +294,7 @@ public static function createSignature()
             'paymentMethodNonce',
             'paymentMethodToken',
             ['paypalAccount' => ['payeeId', 'payeeEmail', 'payerId', 'paymentId']],
+            'processingMerchantCategoryCode',
             'productSku',
             'purchaseOrderNumber',
             'recurring',

lib/Braintree/Version.php

@@ -9,7 +9,7 @@
 class Version
 {
     const MAJOR = 6;
-    const MINOR = 29;
+    const MINOR = 30;
     const TINY = 0;
 
     protected function __construct()

tests/integration/TransactionTest.php

@@ -7390,4 +7390,72 @@ public function test_findTransactionWithPaymentAccountReferenceInGooglePayDetail
         $this->assertNotNull($transaction->googlePayCardDetails);
         $this->assertArrayHasKey('paymentAccountReference', $transaction->googlePayCardDetails->toArray());
     }
+
+    public function testSale_withValidProcessingMerchantCategoryCode()
+    {
+        $result = Braintree\Transaction::sale([
+            'amount' => '100.00',
+            'creditCard' => [
+                'number' => '5105105105105100',
+                'expirationDate' => '05/2025',
+            ],
+            'processingMerchantCategoryCode' => '5411'
+        ]);
+
+        $this->assertTrue($result->success);
+    }
+
+    public function testSale_withInvalidProcessingMerchantCategoryCodeTooLong()
+    {
+        $result = Braintree\Transaction::sale([
+            'amount' => '100.00',
+            'creditCard' => [
+                'number' => '5105105105105100',
+                'expirationDate' => '05/2025',
+            ],
+            'processingMerchantCategoryCode' => '54111'
+        ]);
+
+        $this->assertFalse($result->success);
+        $this->assertEquals(
+            Braintree\Error\Codes::TRANSACTION_PROCESSING_MERCHANT_CATEGORY_CODE_IS_INVALID,
+            $result->errors->forKey('transaction')->onAttribute('processingMerchantCategoryCode')[0]->code
+        );
+    }
+
+    public function testSale_withInvalidProcessingMerchantCategoryCodeNonNumeric()
+    {
+        $result = Braintree\Transaction::sale([
+            'amount' => '100.00',
+            'creditCard' => [
+                'number' => '5105105105105100',
+                'expirationDate' => '05/2025',
+            ],
+            'processingMerchantCategoryCode' => 'abcd'
+        ]);
+
+        $this->assertFalse($result->success);
+        $this->assertEquals(
+            Braintree\Error\Codes::TRANSACTION_PROCESSING_MERCHANT_CATEGORY_CODE_IS_INVALID,
+            $result->errors->forKey('transaction')->onAttribute('processingMerchantCategoryCode')[0]->code
+        );
+    }
+
+    public function testSale_withInvalidProcessingMerchantCategoryCodeTooShort()
+    {
+        $result = Braintree\Transaction::sale([
+            'amount' => '100.00',
+            'creditCard' => [
+                'number' => '5105105105105100',
+                'expirationDate' => '05/2025',
+            ],
+            'processingMerchantCategoryCode' => '541'
+        ]);
+
+        $this->assertFalse($result->success);
+        $this->assertEquals(
+            Braintree\Error\Codes::TRANSACTION_PROCESSING_MERCHANT_CATEGORY_CODE_IS_INVALID,
+            $result->errors->forKey('transaction')->onAttribute('processingMerchantCategoryCode')[0]->code
+        );
+    }
 }

tests/unit/TransactionTest.php

@@ -169,6 +169,25 @@ public function testSaleAcceptsPaymentFacilitatorOptions()
         $transactionGateway->sale($transactionParams);
     }
 
+    public function testSaleWithProcessingMerchantCategoryCode()
+    {
+        $transactionGateway = $this->mockTransactionGatewayDoCreate();
+        $transactionGateway
+            ->expects($this->once())
+            ->method('_doCreate')
+            ->will($this->returnCallback(function ($path, $params) {
+                $this->assertEquals('5411', $params["transaction"]["processingMerchantCategoryCode"]);
+            }));
+        $transactionGateway->sale([
+            'amount' => Braintree\Test\TransactionAmounts::$authorize,
+            'creditCard' => [
+                'number' => Braintree\Test\CreditCardNumbers::$visa,
+                'expirationDate' => '05/2009',
+            ],
+            'processingMerchantCategoryCode' => '5411'
+        ]);
+    }
+
     public function testTransactionWithMetaCheckoutCardAttributes()
     {
         $transaction = Braintree\Transaction::factory([