fjbender / magento-2

        $oQuote = $this->checkoutSession->getQuote();

        if ($this->paymentHelper->isPayPalExpressActive() && $oQuote && $oQuote->hasItems()) {

            if ($this->loginNeededForExpressCheckout($oQuote)) {

                $this->messageManager->addNoticeMessage(__('Please sign in to check out.'));

                $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

                return $resultRedirect->setPath('customer/account/login');

            }

            $this->paypalPayment->setIsPayPalExpress(true);

            $aResponse = $this->genericRequest->sendRequest($oQuote, $this->paypalPayment);

    {

        $this->paypalPayment->setIsPayPalExpress(true);

        $sWorkorderId = $this->checkoutSession->getPayoneWorkorderId();

        if ($sWorkorderId) {

            try {

                $this->returnHandler->handlePayPalReturn($sWorkorderId);

                /** @var Redirect $resultRedirect */

                $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

                return $resultRedirect->setPath('payone/onepage/review');

            } catch (\Exception $e) {

                $this->messageManager->addExceptionMessage($e, __('An error occured during the PayPal Express transaction.'));

            }

        }

        /** @var Redirect $resultRedirect */

        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);