Merge remote-tracking branch 'mpi/MC-19650' into Chaika-PR-2019-09-13-1

Author: veloraven

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

@@ -9,6 +9,8 @@
 use Magento\Framework\App\Action\Action as AppAction;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 
 /**
@@ -98,6 +100,11 @@ abstract class AbstractExpress extends AppAction implements
      */
     protected $_customerUrl;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -107,6 +114,7 @@ abstract class AbstractExpress extends AppAction implements
      * @param \Magento\Framework\Session\Generic $paypalSession
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
+     * @param CartRepositoryInterface $quoteRepository
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -116,7 +124,8 @@ public function __construct(
         \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
         \Magento\Framework\Session\Generic $paypalSession,
         \Magento\Framework\Url\Helper\Data $urlHelper,
-        \Magento\Customer\Model\Url $customerUrl
+        \Magento\Customer\Model\Url $customerUrl,
+        CartRepositoryInterface $quoteRepository = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_checkoutSession = $checkoutSession;
@@ -128,6 +137,7 @@ public function __construct(
         parent::__construct($context);
         $parameters = ['params' => [$this->_configMethod]];
         $this->_config = $this->_objectManager->create($this->_configType, $parameters);
+        $this->quoteRepository = $quoteRepository ?: ObjectManager::getInstance()->get(CartRepositoryInterface::class);
     }
 
     /**
@@ -233,7 +243,12 @@ protected function _getCheckoutSession()
     protected function _getQuote()
     {
         if (!$this->_quote) {
-            $this->_quote = $this->_getCheckoutSession()->getQuote();
+            if ($this->_getSession()->getQuoteId()) {
+                $this->_quote = $this->quoteRepository->get($this->_getSession()->getQuoteId());
+                $this->_getCheckoutSession()->replaceQuote($this->_quote);
+            } else {
+                $this->_quote = $this->_getCheckoutSession()->getQuote();
+            }
         }
         return $this->_quote;
     }
@@ -243,7 +258,7 @@ protected function _getQuote()
      */
     public function getCustomerBeforeAuthUrl()
     {
-        return;
+        return null;
     }
 
     /**

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

@@ -155,6 +155,7 @@ public function execute(): ResultInterface
             } else {
                 $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
                 $this->_checkoutSession->setQuoteId($quote->getId());
+                $this->_getSession()->setQuoteId($quote->getId());
             }
         } catch (ApiProcessableException $e) {
             $responseContent['success'] = false;