MAGETWO-51014: Incorrect error message is shown to customer when Express Checkout fraud filters triggered

- Added 10736 error code processing

Author: rliukshyn

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

@@ -141,6 +141,9 @@ protected function _processPaypalApiError($exception)
             case ApiProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL:
                 $this->_redirectSameToken();
                 break;
+            case ApiProcessableException::API_ADDRESS_MATCH_FAIL:
+                $this->_redirectToOrderReviewPageAndShowError($exception->getUserMessage());
+                break;
             case ApiProcessableException::API_UNABLE_TRANSACTION_COMPLETE:
                 if ($this->_config->getPaymentAction() == \Magento\Payment\Model\Method\AbstractMethod::ACTION_ORDER) {
                     $paypalTransactionData = $this->_getCheckoutSession()->getPaypalTransactionData();
@@ -182,6 +185,18 @@ protected function _redirectToCartAndShowError($errorMessage)
         $this->_redirect('checkout/cart');
     }
 
+    /**
+     * Redirect customer to the paypal order review page and show error message
+     *
+     * @param string $errorMessage
+     * @return void
+     */
+    protected function _redirectToOrderReviewPageAndShowError($errorMessage)
+    {
+        $this->messageManager->addErrorMessage($errorMessage);
+        $this->_redirect('*/*/review');
+    }
+
     /**
      * Return true if agreements validation required
      *

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

@@ -25,6 +25,7 @@ class ProcessableException extends LocalizedException
     const API_COUNTRY_FILTER_DECLINE = 10537;
     const API_MAXIMUM_AMOUNT_FILTER_DECLINE = 10538;
     const API_OTHER_FILTER_DECLINE = 10539;
+    const API_ADDRESS_MATCH_FAIL = 10736;
     /**#@-*/
 
     /**
@@ -61,8 +62,13 @@ public function getUserMessage()
                     'I\'m sorry - but we are not able to complete your transaction. Please contact us so we can assist you.'
                 );
                 break;
+            case self::API_ADDRESS_MATCH_FAIL:
+                $message = __(
+                    'A match of the Shipping Address City, State, and Postal Code failed.'
+                );
+                break;
             default:
-                $message = __($this->getMessage());
+                $message = __('We can\'t place the order.');
                 break;
         }
         return $message;

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

@@ -266,6 +266,7 @@ protected function _setApiProcessableErrors()
                 ApiProcessableException::API_COUNTRY_FILTER_DECLINE,
                 ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
                 ApiProcessableException::API_OTHER_FILTER_DECLINE,
+                ApiProcessableException::API_ADDRESS_MATCH_FAIL,
             ]
         );
     }