Merge branch 'MC-37649' of https://github.com/magento-mpi/magento2ce into PR-09-24-2020

Author: chittima

app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php

@@ -174,6 +174,7 @@ protected function _processPaypalApiError($exception)
                 $this->_redirectSameToken();
                 break;
             case ApiProcessableException::API_ADDRESS_MATCH_FAIL:
+            case ApiProcessableException::API_TRANSACTION_HAS_BEEN_COMPLETED:
                 $this->redirectToOrderReviewPageAndShowError($exception->getUserMessage());
                 break;
             case ApiProcessableException::API_UNABLE_TRANSACTION_COMPLETE:

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -1286,15 +1286,6 @@ protected function _handleCallErrors($response)
         );
         $this->_logger->critical($exceptionLogMessage);
 
-        /**
-         * The response code 10415 'Transaction has already been completed for this token'
-         * must not fails place order. The old Paypal interface does not lock 'Send' button
-         * it may result to re-send data.
-         */
-        if (in_array((string)ProcessableException::API_TRANSACTION_HAS_BEEN_COMPLETED, $this->_callErrors)) {
-            return;
-        }
-
         $exceptionPhrase = __('PayPal gateway has rejected request. %1', $errorMessages);
 
         /** @var \Magento\Framework\Exception\LocalizedException $exception */

app/code/Magento/Paypal/Model/Api/ProcessableException.php

@@ -67,6 +67,12 @@ public function getUserMessage()
                     . ' Please contact us so we can assist you.'
                 );
                 break;
+            case self::API_TRANSACTION_HAS_BEEN_COMPLETED:
+                $message = __(
+                    'A successful payment transaction has already been completed.'
+                    . ' Please, check if the order has been placed.'
+                );
+                break;
             case self::API_ADDRESS_MATCH_FAIL:
                 $message = __(
                     'A match of the Shipping Address City, State, and Postal Code failed.'

app/code/Magento/Paypal/Model/Express.php

@@ -276,6 +276,7 @@ protected function _setApiProcessableErrors()
                 ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
                 ApiProcessableException::API_OTHER_FILTER_DECLINE,
                 ApiProcessableException::API_ADDRESS_MATCH_FAIL,
+                ApiProcessableException::API_TRANSACTION_HAS_BEEN_COMPLETED,
                 self::$authorizationExpiredCode
             ]
         );

app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php

@@ -305,8 +305,7 @@ public function testGetDebugReplacePrivateDataKeys()
 
     /**
      * Tests case if obtained response with code 10415 'Transaction has already
-     * been completed for this token'. It must does not throws the exception and
-     * must returns response array.
+     * been completed for this token'. It must throw the ProcessableException.
      */
     public function testCallTransactionHasBeenCompleted()
     {
@@ -317,15 +316,10 @@ public function testCallTransactionHasBeenCompleted()
             ->method('read')
             ->willReturn($response);
         $this->model->setProcessableErrors($processableErrors);
-        $this->customLoggerMock->expects($this->once())
-            ->method('debug');
-        $expectedResponse = [
-            'ACK' => 'Failure',
-            'L_ERRORCODE0' => '10415',
-            'L_SHORTMESSAGE0' => 'Message.',
-            'L_LONGMESSAGE0' => 'Long Message.'
-        ];
 
-        $this->assertEquals($expectedResponse, $this->model->call('some method', ['data' => 'some data']));
+        $this->expectExceptionMessageMatches('/PayPal gateway has rejected request/');
+        $this->expectException(ProcessableException::class);
+
+        $this->model->call('DoExpressCheckout', ['data' => 'some data']);
     }
 }

app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php

@@ -53,6 +53,7 @@ class ExpressTest extends TestCase
         ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
         ApiProcessableException::API_OTHER_FILTER_DECLINE,
         ApiProcessableException::API_ADDRESS_MATCH_FAIL,
+        ApiProcessableException::API_TRANSACTION_HAS_BEEN_COMPLETED
     ];
 
     /**

app/code/Magento/Paypal/i18n/en_US.csv

@@ -737,3 +737,4 @@ User,User
 "Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"
 "Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
 "Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."
+"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."