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

- fix express checkout for logged in customer and code formatting

Author: krissyhiserote

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

@@ -206,8 +206,8 @@ define([
         beforePlaceOrder: function (data) {
             this.setPaymentMethodNonce(data.nonce);
 
-            if ((this.isRequiredBillingAddress() || 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);
             }

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

@@ -616,14 +616,14 @@ public function returnFromPaypal($token)
 
         $this->ignoreAddressValidation();
 
+        $isButton = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1;
+
         // import shipping address
         $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress();
         if (!$quote->getIsVirtual()) {
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress) {
-                if ($exportedShippingAddress
-                    && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
-                ) {
+                if ($exportedShippingAddress && $isButton) {
                     $this->_setExportedAddressData($shippingAddress, $exportedShippingAddress);
                     // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix
                     $shippingAddress->setPrefix(null);
@@ -651,24 +651,29 @@ public function returnFromPaypal($token)
         }
 
         // import billing address
-        $portBillingFromShipping = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
-            && $this->_config->getValue(
+        $requireBillingAddress = $this->_config->getValue(
                 'requireBillingAddress'
-            ) != \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL
-            && !$quote->isVirtual();
-        if ($portBillingFromShipping) {
+        ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+
+        if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) {
             $billingAddress = clone $shippingAddress;
             $billingAddress->unsAddressId()->unsAddressType()->setCustomerAddressId(null);
             $data = $billingAddress->getData();
             $data['save_in_address_book'] = 0;
             $quote->getBillingAddress()->addData($data);
             $quote->getShippingAddress()->setSameAsBilling(1);
         } else {
-            $billingAddress = $quote->getBillingAddress();
+            $billingAddress = $quote->getBillingAddress()->setCustomerAddressId(null);
         }
         $exportedBillingAddress = $this->_getApi()->getExportedBillingAddress();
 
-        $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
+        // Since country is required field for billing and shipping address,
+        // we consider the address information to be empty if country is empty.
+        $isEmptyAddress = ($billingAddress->getCountryId() === null);
+
+        if ($requireBillingAddress || $isEmptyAddress) {
+            $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
+        }
         $billingAddress->setCustomerNote($exportedBillingAddress->getData('note'));
         $quote->setBillingAddress($billingAddress);
         $quote->setCheckoutMethod($this->getCheckoutMethod());
@@ -904,19 +909,6 @@ public function getCheckoutMethod()
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {
-        // 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 (!$requireBillingAddress && !$isEmptyAddress) {
-            return;
-        }
-
         foreach ($exportedAddress->getExportedKeys() as $key) {
             $data = $exportedAddress->getData($key);
             if (!empty($data)) {