Merge remote-tracking branch 'l3/MC-40810' into L3-PR-20210324

Author: veloraven

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

@@ -1155,8 +1155,18 @@ private function setShippingOptions(PaypalCart $cart, Address $address = null)
     protected function prepareGuestQuote()
     {
         $quote = $this->_quote;
+        $billingAddress = $quote->getBillingAddress();
+
+        /* Check if Guest customer provided an email address on checkout page, and in case
+        it was provided, use it as priority, if not, use email address returned from PayPal.
+        (Guest customer can place order two ways: - from checkout page, where guest is asked to provide
+        an email address that later can be used for account creation; - from mini shopping cart, directly
+        proceeding to PayPal without providing an email address */
+        $email = $billingAddress->getOrigData('email') !== null
+            ? $billingAddress->getOrigData('email') : $billingAddress->getEmail();
+
         $quote->setCustomerId(null)
-            ->setCustomerEmail($quote->getBillingAddress()->getEmail())
+            ->setCustomerEmail($email)
             ->setCustomerIsGuest(true)
             ->setCustomerGroupId(\Magento\Customer\Model\Group::NOT_LOGGED_IN_ID);
         return $this;

dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php

@@ -190,15 +190,23 @@ public function testPrepareCustomerQuote()
      * @magentoDataFixture Magento/Paypal/_files/quote_express.php
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @param string $accountEmail
+     * @param string $expected
+     * @dataProvider placeGuestQuoteDataProvider
      */
-    public function testPlaceGuestQuote()
+    public function testPlaceGuestQuote($accountEmail, $expected)
     {
         /** @var Quote $quote */
         $quote = $this->getFixtureQuote();
         $quote->setCheckoutMethod(Onepage::METHOD_GUEST); // to dive into _prepareGuestQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
 
+        /* Simulate data returned from PayPal containing email as well
+        as email entered at checkout step */
+        $quote->getBillingAddress()->setEmail('[email protected]');
+        $quote->getBillingAddress()->setOrigData('email', $accountEmail);
+
         $checkout = $this->getCheckout($quote);
         $checkout->place('token');
 
@@ -209,6 +217,7 @@ public function testPlaceGuestQuote()
             $quote->getCustomerGroupId()
         );
 
+        $this->assertEquals($expected, $quote->getCustomerEmail());
         $this->assertNotEmpty($quote->getBillingAddress());
         $this->assertNotEmpty($quote->getShippingAddress());
 
@@ -217,6 +226,17 @@ public function testPlaceGuestQuote()
         $this->assertNotEmpty($order->getShippingAddress());
     }
 
+    /**
+     * @return array
+     */
+    public function placeGuestQuoteDataProvider(): array
+    {
+        return [
+            'case with account email absent' => [null, '[email protected]'],
+            'case with account email present' => ['[email protected]', '[email protected]'],
+        ];
+    }
+
     /**
      * Place the order as guest when `Automatic Assignment to Customer Group` is enabled.
      *