Merge branch 'ACP2E-296' of https://github.com/magento-l3/magento2ce into PR1-21-01-2022

Author: chittima

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

@@ -30,25 +30,25 @@ class Checkout
      *
      * @var string
      */
-    const PAL_CACHE_ID = 'paypal_express_checkout_pal';
+    public const PAL_CACHE_ID = 'paypal_express_checkout_pal';
 
     /**
      * Keys for passthrough variables in sales/quote_payment and sales/order_payment
      * Uses additional_information as storage
      */
-    const PAYMENT_INFO_TRANSPORT_TOKEN    = 'paypal_express_checkout_token';
-    const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN = 'paypal_express_checkout_shipping_overridden';
-    const PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD = 'paypal_express_checkout_shipping_method';
-    const PAYMENT_INFO_TRANSPORT_PAYER_ID = 'paypal_express_checkout_payer_id';
-    const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required';
-    const PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT = 'paypal_ec_create_ba';
+    public const PAYMENT_INFO_TRANSPORT_TOKEN    = 'paypal_express_checkout_token';
+    public const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN = 'paypal_express_checkout_shipping_overridden';
+    public const PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD = 'paypal_express_checkout_shipping_method';
+    public const PAYMENT_INFO_TRANSPORT_PAYER_ID = 'paypal_express_checkout_payer_id';
+    public const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required';
+    public const PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT = 'paypal_ec_create_ba';
 
     /**
      * Flag which says that was used PayPal Express Checkout button for checkout
      * Uses additional_information as storage
      * @var string
      */
-    const PAYMENT_INFO_BUTTON = 'button';
+    public const PAYMENT_INFO_BUTTON = 'button';
 
     /**
      * @var \Magento\Quote\Model\Quote
@@ -131,8 +131,6 @@ class Checkout
     protected $_isBml = false;
 
     /**
-     * Customer ID
-     *
      * @var int
      */
     protected $_customerId;
@@ -145,8 +143,6 @@ class Checkout
     protected $_billingAgreement;
 
     /**
-     * Order
-     *
      * @var \Magento\Sales\Model\Order
      */
     protected $_order;
@@ -157,15 +153,11 @@ class Checkout
     protected $_configCacheType;
 
     /**
-     * Checkout data
-     *
      * @var \Magento\Checkout\Helper\Data
      */
     protected $_checkoutData;
 
     /**
-     * Tax data
-     *
      * @var \Magento\Tax\Helper\Data
      */
     protected $_taxData;
@@ -1167,6 +1159,8 @@ protected function prepareGuestQuote()
 
         $quote->setCustomerId(null)
             ->setCustomerEmail($email)
+            ->setCustomerFirstname($billingAddress->getFirstname())
+            ->setCustomerLastname($billingAddress->getLastname())
             ->setCustomerIsGuest(true)
             ->setCustomerGroupId(\Magento\Customer\Model\Group::NOT_LOGGED_IN_ID);
         return $this;

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

@@ -220,10 +220,14 @@ public function testPlaceGuestQuote($accountEmail, $expected)
         $this->assertEquals($expected, $quote->getCustomerEmail());
         $this->assertNotEmpty($quote->getBillingAddress());
         $this->assertNotEmpty($quote->getShippingAddress());
+        $this->assertEquals($quote->getBillingAddress()->getFirstname(), $quote->getCustomerFirstname());
+        $this->assertEquals($quote->getBillingAddress()->getLastname(), $quote->getCustomerLastname());
 
         $order = $checkout->getOrder();
         $this->assertNotEmpty($order->getBillingAddress());
         $this->assertNotEmpty($order->getShippingAddress());
+        $this->assertEquals($quote->getBillingAddress()->getFirstname(), $order->getCustomerFirstname());
+        $this->assertEquals($quote->getBillingAddress()->getLastname(), $order->getCustomerLastname());
     }
 
     /**