MAGETWO-64714: [GitHub] [PR] Fix quote's outdated shipping address overwriting PayPal Express shipping address #8568

Author: Oleksii Korshenko

app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php

@@ -84,6 +84,14 @@ private function updateQuote(Quote $quote, array $details)
 
         $quote->collectTotals();
 
+        /**
+         * Unset shipping assignment to prevent from saving / applying outdated data
+         * @see \Magento\Quote\Model\QuoteRepository\SaveHandler::processShippingAssignment
+         */
+        if ($quote->getExtensionAttributes()) {
+            $quote->getExtensionAttributes()->setShippingAssignments(null);
+        }
+
         $this->quoteRepository->save($quote);
     }
 
@@ -122,6 +130,11 @@ private function updateShippingAddress(Quote $quote, array $details)
         $shippingAddress->setCollectShippingRates(true);
 
         $this->updateAddressData($shippingAddress, $details['shippingAddress']);
+
+        // PayPal's address supposes not saving against customer account
+        $shippingAddress->setSaveInAddressBook(false);
+        $shippingAddress->setSameAsBilling(false);
+        $shippingAddress->unsCustomerAddressId();
     }
 
     /**
@@ -144,6 +157,11 @@ private function updateBillingAddress(Quote $quote, array $details)
         $billingAddress->setFirstname($details['firstName']);
         $billingAddress->setLastname($details['lastName']);
         $billingAddress->setEmail($details['email']);
+
+        // PayPal's address supposes not saving against customer account
+        $billingAddress->setSaveInAddressBook(false);
+        $billingAddress->setSameAsBilling(false);
+        $billingAddress->unsCustomerAddressId();
     }
 
     /**