Merge pull request #516 from magento-mpi/MPI-BUGFIXES

[MPI] Bugfixes

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -119,6 +119,11 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      */
     protected $transactionRepository;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $psrLogger;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -761,7 +766,7 @@ protected function addStatusComment(\Magento\Sales\Model\Order\Payment $payment)
     {
         try {
             $transactionId = $this->getResponse()->getXTransId();
-            $data = $payment->getMethodInstance()->getTransactionDetails($transactionId);
+            $data = $this->transactionService->getTransactionDetails($this, $transactionId);
             $transactionStatus = (string)$data->transaction->transactionStatus;
             $fdsFilterAction = (string)$data->transaction->FDSFilterAction;
 
@@ -779,6 +784,7 @@ protected function addStatusComment(\Magento\Sales\Model\Order\Payment $payment)
                 $payment->getOrder()->addStatusHistoryComment($message);
             }
         } catch (\Exception $e) {
+            $this->getPsrLogger()->critical($e);
             //this request is optional
         }
         return $this;
@@ -805,7 +811,7 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
             $order->registerCancellation($message)->save();
         } catch (\Exception $e) {
             //quiet decline
-            $this->logger->critical($e);
+            $this->getPsrLogger()->critical($e);
         }
     }
 
@@ -973,4 +979,18 @@ protected function getTransactionResponse($transactionId)
 
         return $response;
     }
+
+    /**
+     * @return \Psr\Log\LoggerInterface
+     *
+     * @deprecated
+     */
+    private function getPsrLogger()
+    {
+        if (null === $this->psrLogger) {
+            $this->psrLogger = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Psr\Log\LoggerInterface::class);
+        }
+        return $this->psrLogger;
+    }
 }

app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js

@@ -6,48 +6,31 @@ define(
     [
         'Magento_Checkout/js/model/quote',
         'Magento_Checkout/js/model/url-builder',
-        'mage/storage',
-        'Magento_Checkout/js/model/error-processor',
         'Magento_Customer/js/model/customer',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Checkout/js/model/place-order'
     ],
-    function (quote, urlBuilder, storage, errorProcessor, customer, fullScreenLoader) {
+    function (quote, urlBuilder, customer, placeOrderService) {
         'use strict';
 
         return function (paymentData, messageContainer) {
-            var serviceUrl,
-                payload;
+            var serviceUrl, payload;
 
-            /** Checkout for guest and registered customer. */
-            if (!customer.isLoggedIn()) {
+            payload = {
+                cartId: quote.getQuoteId(),
+                billingAddress: quote.billingAddress(),
+                paymentMethod: paymentData
+            };
+
+            if (customer.isLoggedIn()) {
+                serviceUrl = urlBuilder.createUrl('/carts/mine/payment-information', {});
+            } else {
                 serviceUrl = urlBuilder.createUrl('/guest-carts/:quoteId/payment-information', {
                     quoteId: quote.getQuoteId()
                 });
-                payload = {
-                    cartId: quote.getQuoteId(),
-                    email: quote.guestEmail,
-                    paymentMethod: paymentData,
-                    billingAddress: quote.billingAddress()
-                };
-            } else {
-                serviceUrl = urlBuilder.createUrl('/carts/mine/payment-information', {});
-                payload = {
-                    cartId: quote.getQuoteId(),
-                    paymentMethod: paymentData,
-                    billingAddress: quote.billingAddress()
-                };
+                payload.email = quote.guestEmail;
             }
 
-            fullScreenLoader.startLoader();
-
-            return storage.post(
-                serviceUrl, JSON.stringify(payload)
-            ).fail(
-                function (response) {
-                    errorProcessor.process(response, messageContainer);
-                    fullScreenLoader.stopLoader();
-                }
-            );
+            return placeOrderService(serviceUrl, payload, messageContainer);
         };
     }
 );

app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js

@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define(
+    [
+        'mage/storage',
+        'Magento_Checkout/js/model/error-processor',
+        'Magento_Checkout/js/model/full-screen-loader'
+    ],
+    function (storage, errorProcessor, fullScreenLoader) {
+        'use strict';
+
+        return function (serviceUrl, payload, messageContainer) {
+            fullScreenLoader.startLoader();
+
+            return storage.post(
+                serviceUrl, JSON.stringify(payload)
+            ).fail(
+                function (response) {
+                    errorProcessor.process(response, messageContainer);
+                    fullScreenLoader.stopLoader();
+                }
+            );
+        };
+    }
+);

app/code/Magento/Dhl/Model/Carrier.php

@@ -1123,9 +1123,8 @@ protected function _parseResponse($response)
                     throw new \Magento\Framework\Exception\LocalizedException($responseError);
                 }
                 $this->debugErrors($this->_errors);
-
-                return false;
             }
+            $result->append($this->getErrorMessage());
         }
 
         return $result;

app/code/Magento/Fedex/Model/Carrier.php

@@ -501,7 +501,10 @@ protected function _getQuotes()
         // make general request for all methods
         $response = $this->_doRatesRequest(self::RATE_REQUEST_GENERAL);
         $preparedGeneral = $this->_prepareRateResponse($response);
-        if (!$preparedGeneral->getError() || $this->_result->getError() && $preparedGeneral->getError()) {
+        if (!$preparedGeneral->getError()
+            || $this->_result->getError() && $preparedGeneral->getError()
+            || empty($this->_result->getAllRates())
+        ) {
             $this->_result->append($preparedGeneral);
         }
 

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

@@ -62,15 +62,21 @@ public function __construct(
      */
     public function execute()
     {
-        try {
-            if ($this->isValidationRequired() &&
-                !$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))
-            ) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please agree to all the terms and conditions before placing the order.')
-                );
-            }
+        if ($this->isValidationRequired() &&
+            !$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))
+        ) {
+            $e = new \Magento\Framework\Exception\LocalizedException(
+                __('Please agree to all the terms and conditions before placing the order.')
+            );
+            $this->messageManager->addExceptionMessage(
+                $e,
+                $e->getMessage()
+            );
+            $this->_redirect('*/*/review');
+            return;
+        }
 
+        try {
             $this->_initCheckout();
             $this->_checkout->place($this->_initToken());
 
@@ -108,12 +114,6 @@ public function execute()
             return;
         } catch (ApiProcessableException $e) {
             $this->_processPaypalApiError($e);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addExceptionMessage(
-                $e,
-                $e->getMessage()
-            );
-            $this->_redirect('*/*/review');
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage(
                 $e,
@@ -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
+     */
+    private function redirectToOrderReviewPageAndShowError($errorMessage)
+    {
+        $this->messageManager->addErrorMessage($errorMessage);
+        $this->_redirect('*/*/review');
+    }
+
     /**
      * Return true if agreements validation required
      *

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

@@ -21,7 +21,6 @@ class Start extends GetToken
     public function execute()
     {
         try {
-
             $token = $this->getToken();
             if ($token === null) {
 

app/code/Magento/Paypal/Controller/Express/GetToken.php

@@ -53,8 +53,9 @@ public function execute()
             if ($token === null) {
                 $token = false;
             }
+            $url = $this->_checkout->getRedirectUrl();
             $this->_initToken($token);
-            $controllerResult->setData(['token' => $token]);
+            $controllerResult->setData(['url' => $url]);
         } catch (LocalizedException $exception) {
             $this->messageManager->addExceptionMessage(
                 $exception,

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

@@ -1288,9 +1288,10 @@ protected function _handleCallErrors($response)
         $exceptionPhrase = __('PayPal gateway has rejected request. %1', $errorMessages);
 
         /** @var \Magento\Framework\Exception\LocalizedException $exception */
-        $exception = count($errors) == 1 && $this->_isProcessableError($errors[0]['code'])
+        $firstError = $errors[0]['code'];
+        $exception = $this->_isProcessableError($firstError)
             ? $this->_processableExceptionFactory->create(
-                ['phrase' => $exceptionPhrase, 'code' => $errors[0]['code']]
+                ['phrase' => $exceptionPhrase, 'code' => $firstError]
             )
             : $this->_frameworkExceptionFactory->create(
                 ['phrase' => $exceptionPhrase]

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,
             ]
         );
     }

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

@@ -5,19 +5,16 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Api;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Paypal\Model\Api\ProcessableException;
 
 class ProcessableExceptionTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManager;
+    const UNKNOWN_CODE = 10411;
 
     /**
-     * @var \Magento\Paypal\Model\Api\ProcessableException
+     * @var ProcessableException
      */
-    protected $model;
+    private $model;
 
     /**
      * @param int $code
@@ -27,8 +24,7 @@ class ProcessableExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetUserMessage($code, $msg)
     {
-        $this->objectManager = new ObjectManager($this);
-        $this->model = new \Magento\Paypal\Model\Api\ProcessableException(__($msg), null, $code);
+        $this->model = new ProcessableException(__($msg), null, $code);
         $this->assertEquals($msg, $this->model->getUserMessage());
     }
 
@@ -39,28 +35,35 @@ public function getUserMessageDataProvider()
     {
         return [
             [
-                10001,
+                ProcessableException::API_INTERNAL_ERROR,
                 "I'm sorry - but we were not able to process your payment. "
                 . "Please try another payment method or contact us so we can assist you.",
             ],
             [
-                10417,
+                ProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE,
                 "I'm sorry - but we were not able to process your payment. "
                 . "Please try another payment method or contact us so we can assist you."
             ],
             [
-                10537,
+                ProcessableException::API_COUNTRY_FILTER_DECLINE,
                 "I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
             ],
             [
-                10538,
+                ProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
                 "I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
             ],
             [
-                10539,
+                ProcessableException::API_OTHER_FILTER_DECLINE,
                 "I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
             ],
-            [10411, "something went wrong"]
+            [
+                ProcessableException::API_ADDRESS_MATCH_FAIL,
+                'A match of the Shipping Address City, State, and Postal Code failed.'
+            ],
+            [
+                self::UNKNOWN_CODE,
+                "We can't place the order."
+            ]
         ];
     }
 }

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

@@ -22,6 +22,7 @@ class ExpressTest extends \PHPUnit_Framework_TestCase
         ApiProcessableException::API_COUNTRY_FILTER_DECLINE,
         ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
         ApiProcessableException::API_OTHER_FILTER_DECLINE,
+        ApiProcessableException::API_ADDRESS_MATCH_FAIL
     ];
 
     /**