MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers

- make sure the require billing address setting is set before getting billing address from PayPal

Author: krissyhiserote

app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
      */
     public function getConfig()
     {
+        $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+        
         return [
             'payment' => [
                 self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
+                    'isRequiredBillingAddress' =>
+                        $this->config->isRequiredBillingAddress() == $requireBillingAddressAll
                 ]
             ]
         ];

app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php

@@ -77,6 +77,9 @@ public function testGetConfig($expected)
                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
             ]);
 
+        $this->config->method('isRequiredBillingAddress')
+            ->willReturn(1);
+
         self::assertEquals($expected, $this->configProvider->getConfig());
     }
 
@@ -101,7 +104,8 @@ public function getConfigDataProvider()
                             'skipOrderReview' => false,
                             'paymentIcon' => [
                                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
-                            ]
+                            ],
+                            'isRequiredBillingAddress' => true
                         ]
                     ]
                 ]

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -206,7 +206,9 @@ define([
         beforePlaceOrder: function (data) {
             this.setPaymentMethodNonce(data.nonce);
 
-            if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
+            if ((this.isRequiredBillingAddress() || quote.billingAddress() === null)
+                && typeof data.details.billingAddress !== 'undefined'
+            ) {
                 this.setBillingAddress(data.details, data.details.billingAddress);
             }
 
@@ -264,6 +266,14 @@ define([
             return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
         },
 
+        /**
+         * Is billing address required from PayPal side
+         * @returns {Boolean}
+         */
+        isRequiredBillingAddress: function () {
+            return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
+        },
+
         /**
          * Get configuration for PayPal
          * @returns {Object}

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

@@ -904,14 +904,16 @@ public function getCheckoutMethod()
      */
     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);
+        // Exported data is more priority if require billing address setting is yes
+        $requireBillingAddress = $this->_config->getValue(
+            'requireBillingAddress'
+        ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
 
         // 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) {
+        if (!$requireBillingAddress && !$isEmptyAddress) {
             return;
         }