Merge remote-tracking branch 'origin/MAGETWO-39685' into MAGETWO-32996

Author: dkvashninbay

app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php

@@ -34,12 +34,14 @@ public function execute()
             /** @var \Magento\Sales\Model\Order $order */
             $order = $this->_orderFactory->create()->loadByIncrementId($this->_checkoutSession->getLastRealOrderId());
 
-            if (in_array($order->getState(), $this->allowedOrderStates)) {
-                $redirectBlock->setData('goto_success_page', true);
-            } else {
-                $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));
-                $redirectBlock->setData('goto_section', $gotoSection);
-                $redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
+            if ($order->getIncrementId()) {
+                if (in_array($order->getState(), $this->allowedOrderStates)) {
+                    $redirectBlock->setData('goto_success_page', true);
+                } else {
+                    $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));
+                    $redirectBlock->setData('goto_section', $gotoSection);
+                    $redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
+                }
             }
         }
 

app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php

@@ -181,6 +181,11 @@ public function testExecuteAllowedOrderState($state)
             ->with($lastRealOrderId)
             ->will($this->returnSelf());
 
+        $this->orderMock
+            ->expects($this->once())
+            ->method('getIncrementId')
+            ->will($this->returnValue($lastRealOrderId));
+
         $this->orderMock
             ->expects($this->once())
             ->method('getState')
@@ -240,6 +245,11 @@ public function testExecuteNotAllowedOrderState($state, $restoreQuote, $expected
             ->with($lastRealOrderId)
             ->will($this->returnSelf());
 
+        $this->orderMock
+            ->expects($this->once())
+            ->method('getIncrementId')
+            ->will($this->returnValue($lastRealOrderId));
+
         $this->orderMock
             ->expects($this->once())
             ->method('getState')