Merge branch 'MAGETWO-99022' of https://github.com/magento-mpi/magento2ce into pr_2019_04_17

Author: vkolesny

app/code/Magento/Braintree/Controller/Paypal/Review.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Payment\Model\Method\Logger;
 
 /**
  * Class Review
@@ -25,6 +26,11 @@ class Review extends AbstractAction implements HttpPostActionInterface, HttpGetA
      */
     private $quoteUpdater;
 
+    /**
+     * @var Logger
+     */
+    private $logger;
+
     /**
      * @var string
      */
@@ -37,15 +43,18 @@ class Review extends AbstractAction implements HttpPostActionInterface, HttpGetA
      * @param Config $config
      * @param Session $checkoutSession
      * @param QuoteUpdater $quoteUpdater
+     * @param Logger $logger
      */
     public function __construct(
         Context $context,
         Config $config,
         Session $checkoutSession,
-        QuoteUpdater $quoteUpdater
+        QuoteUpdater $quoteUpdater,
+        Logger $logger
     ) {
         parent::__construct($context, $config, $checkoutSession);
         $this->quoteUpdater = $quoteUpdater;
+        $this->logger = $logger;
     }
 
     /**
@@ -57,6 +66,7 @@ public function execute()
             $this->getRequest()->getPostValue('result', '{}'),
             true
         );
+        $this->logger->debug($requestData);
         $quote = $this->checkoutSession->getQuote();
 
         try {

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

@@ -123,8 +123,8 @@ private function updateShippingAddress(Quote $quote, array $details)
     {
         $shippingAddress = $quote->getShippingAddress();
 
-        $shippingAddress->setLastname($details['lastName']);
-        $shippingAddress->setFirstname($details['firstName']);
+        $shippingAddress->setLastname($this->getShippingRecipientLastName($details));
+        $shippingAddress->setFirstname($this->getShippingRecipientFirstName($details));
         $shippingAddress->setEmail($details['email']);
 
         $shippingAddress->setCollectShippingRates(true);
@@ -188,4 +188,30 @@ private function updateAddressData(Address $address, array $addressData)
         $address->setSameAsBilling(false);
         $address->setCustomerAddressId(null);
     }
+
+    /**
+     * Returns shipping recipient first name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientFirstName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[0]
+            : $details['firstName'];
+    }
+
+    /**
+     * Returns shipping recipient last name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientLastName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[1]
+            : $details['lastName'];
+    }
 }

app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php

@@ -165,7 +165,7 @@ private function getDetails(): array
                 'region' => 'IL',
                 'postalCode' => '60618',
                 'countryCodeAlpha2' => 'US',
-                'recipientName' => 'John Doe',
+                'recipientName' => 'Jane Smith',
             ],
             'billingAddress' => [
                 'streetAddress' => '123 Billing Street',
@@ -186,9 +186,9 @@ private function getDetails(): array
     private function updateShippingAddressStep(array $details): void
     {
         $this->shippingAddress->method('setLastname')
-            ->with($details['lastName']);
+            ->with('Smith');
         $this->shippingAddress->method('setFirstname')
-            ->with($details['firstName']);
+            ->with('Jane');
         $this->shippingAddress->method('setEmail')
             ->with($details['email']);
         $this->shippingAddress->method('setCollectShippingRates')