MAGETWO-39685: Order number is absent on success page for PayPal Advanced Checkout

Author: Yushkin, Dmytro

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

@@ -27,7 +27,6 @@ public function execute()
                     \Magento\Sales\Model\Order::STATE_COMPLETE,
                 ];
                 if (in_array($order->getState(), $allowedOrderStates)) {
-                    $this->_checkoutSession->unsLastRealOrderId();
                     $redirectBlock->setGotoSuccessPage(true);
                 } else {
                     $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));

app/code/Magento/Sales/Model/Order/Payment.php

@@ -350,12 +350,12 @@ protected function updateOrder(Order $order, $orderState, $orderStatus, $isCusto
                 break;
             case ($message):
             case ($originalOrderState && $message):
-                if ($originalOrderState != $orderState || $originalOrderStatus != $orderStatus) {
-                    $order->setState($orderState)
-                        ->setStatus($orderStatus)
-                        ->addStatusHistoryComment($message)
-                        ->setIsCustomerNotified($isCustomerNotified);
-                }
+            case ($originalOrderState != $orderState):
+            case ($originalOrderStatus != $orderStatus):
+                $order->setState($orderState)
+                    ->setStatus($orderStatus)
+                    ->addStatusHistoryComment($message)
+                    ->setIsCustomerNotified($isCustomerNotified);
                 break;
             default:
                 break;