MAGETWO-90310: [Magento Cloud] - PayPal pop up does not work with virtual product (gift card)

Author: StasKozar

app/code/Magento/Payment/Model/Method/AbstractMethod.php

@@ -6,12 +6,14 @@
 
 namespace Magento\Payment\Model\Method;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentMethodInterface;
 use Magento\Sales\Model\Order\Payment;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 /**
  * Payment method abstract model
@@ -194,6 +196,11 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      */
     protected $logger;
 
+    /**
+     * @var DirectoryHelper
+     */
+    private $directory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -205,6 +212,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param DirectoryHelper $directory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -217,7 +225,8 @@ public function __construct(
         \Magento\Payment\Model\Method\Logger $logger,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        DirectoryHelper $directory = null
     ) {
         parent::__construct(
             $context,
@@ -231,6 +240,7 @@ public function __construct(
         $this->_paymentData = $paymentData;
         $this->_scopeConfig = $scopeConfig;
         $this->logger = $logger;
+        $this->directory = $directory ?: ObjectManager::getInstance()->get(DirectoryHelper::class);
         $this->initializeData($data);
     }
 
@@ -584,11 +594,14 @@ public function validate()
         } else {
             $billingCountry = $paymentInfo->getQuote()->getBillingAddress()->getCountryId();
         }
+        $billingCountry = $billingCountry ?: $this->directory->getDefaultCountry();
+
         if (!$this->canUseForCountry($billingCountry)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('You can\'t use the payment type you selected to make payments to the billing country.')
             );
         }
+
         return $this;
     }
 

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Paypal\Controller\Express\AbstractExpress;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
@@ -118,15 +119,27 @@ public function execute()
             return;
         } catch (ApiProcessableException $e) {
             $this->_processPaypalApiError($e);
+        } catch (LocalizedException $e) {
+            $this->processException($e, $e->getRawMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addExceptionMessage(
-                $e,
-                __('We can\'t place the order.')
-            );
-            $this->_redirect('*/*/review');
+            $this->processException($e, 'We can\'t place the order.');
         }
     }
 
+    /**
+     * Process exception.
+     *
+     * @param \Exception $exception
+     * @param string $message
+     *
+     * @return void
+     */
+    private function processException(\Exception $exception, string $message): void
+    {
+        $this->messageManager->addExceptionMessage($exception, __($message));
+        $this->_redirect('*/*/review');
+    }
+
     /**
      * Process PayPal API's processable errors
      *

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -897,7 +897,12 @@ protected function _setExportedAddressData($address, $exportedAddress)
     {
         // Exported data is more priority if we came from Express Checkout button
         $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
-        if (!$isButton) {
+
+        // Since country is required field for billing and shipping address,
+        // we consider the address information to be empty if country is empty.
+        $isEmptyAddress = ($address->getCountryId() === null);
+
+        if (!$isButton && !$isEmptyAddress) {
             return;
         }