Merge branch 'ACP2E-279' of https://github.com/magento-l3/magento2ce into L3-PR-2022-04-19

Author: alzota

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -33,7 +33,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
     /**
      * Xml default email domain path
      */
-    const XML_PATH_DEFAULT_EMAIL_DOMAIN = 'customer/create_account/email_domain';
+    public const XML_PATH_DEFAULT_EMAIL_DOMAIN = 'customer/create_account/email_domain';
 
     private const XML_PATH_EMAIL_REQUIRED_CREATE_ORDER = 'customer/create_account/email_required_create_order';
     /**
@@ -100,8 +100,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
     protected $_quote;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -1833,9 +1831,6 @@ protected function _validateCustomerData(\Magento\Customer\Api\Data\CustomerInte
      */
     public function _prepareCustomer()
     {
-        if ($this->getQuote()->getCustomerIsGuest()) {
-            return $this;
-        }
         /** @var $store \Magento\Store\Model\Store */
         $store = $this->getSession()->getStore();
         $customer = $this->getQuote()->getCustomer();

dev/tests/integration/testsuite/Magento/Bundle/Model/Sales/AdminOrder/ReorderTest.php

@@ -67,6 +67,23 @@ public function testReorderBundleProductWithCustomPrice(): void
             self::assertEquals(0, (int)$quoteItem->getCustomPrice());
         }
 
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getGroupId',
+                    'getEmail',
+                    '_getExtensionAttributes'
+                ]
+            )->getMock();
+        $customerMock->method('getGroupId')
+            ->willReturn(1);
+        $customerMock->method('getEmail')
+            ->willReturn('customer@example.com');
+        $customerMock->method('_getExtensionAttributes')
+            ->willReturn(null);
+        $this->model->getQuote()->setCustomer($customerMock);
+
         $shippingMethod = 'freeshipping_freeshipping';
         /** @var Rate $rate */
         $rate = $this->objectManager->create(Rate::class);

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Sales/AdminOrder/ReorderTest.php

@@ -67,6 +67,23 @@ public function testReorderConfigurableProductWithCustomPrice(): void
             self::assertEquals(0, (int)$quoteItem->getCustomPrice());
         }
 
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getGroupId',
+                    'getEmail',
+                    '_getExtensionAttributes'
+                ]
+            )->getMock();
+        $customerMock->method('getGroupId')
+            ->willReturn(1);
+        $customerMock->method('getEmail')
+            ->willReturn('customer@example.com');
+        $customerMock->method('_getExtensionAttributes')
+            ->willReturn(null);
+        $this->model->getQuote()->setCustomer($customerMock);
+
         $shippingMethod = 'freeshipping_freeshipping';
         /** @var Rate $rate */
         $rate = $this->objectManager->create(Rate::class);

dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_with_additional_options.php

@@ -8,8 +8,8 @@
     \Magento\Sales\Model\Order\Address::class,
     [
         'data' => [
-            'firstname' => 'guest',
-            'lastname' => 'guest',
+            'firstname' => 'guestfname',
+            'lastname' => 'guestlname',
             'email' => 'customer@example.com',
             'street' => 'street',
             'city' => 'Los Angeles',

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -103,10 +103,12 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
 
         $customer = $this->objectManager->create(Customer::class);
         $customer->load(1)->setDefaultBilling(null)->setDefaultShipping(null)->save();
+        $customerMock = $this->getMockedCustomer();
 
         $rate = $this->objectManager->create(Quote\Address\Rate::class);
         $rate->setCode('freeshipping_freeshipping');
 
+        $this->model->getQuote()->setCustomer($customerMock);
         $this->model->getQuote()->getShippingAddress()->addShippingRate($rate);
         $this->model->getQuote()->getShippingAddress()->setCountryId('EE');
         $this->model->setShippingAsBilling(0);
@@ -399,6 +401,11 @@ public function testCreateOrderNewCustomerDifferentAddresses()
             $paymentMethod
         );
         $order = $this->model->createOrder();
+        $newBillAddress = $order->getBillingAddress();
+        self::assertEquals($this->model->getQuote()->getCustomerFirstname(), $newBillAddress->getFirstname());
+        self::assertEquals($this->model->getQuote()->getCustomerLastname(), $newBillAddress->getLastname());
+        self::assertEquals($order->getCustomerFirstname(), $newBillAddress->getFirstname());
+        self::assertEquals($order->getCustomerLastname(), $newBillAddress->getLastname());
         $this->verifyCreatedOrder($order, $shippingMethod);
         /** @var Customer $customer */
         $customer = $this->objectManager->create(Customer::class);
@@ -569,6 +576,9 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
             $paymentMethod,
             $customerIdFromFixture
         );
+        $customerMock = $this->getMockedCustomer();
+
+        $this->model->getQuote()->setCustomer($customerMock);
         $order = $this->model->createOrder();
         $this->verifyCreatedOrder($order, $shippingMethod);
         $this->objectManager->get(CustomerRegistry::class)
@@ -617,6 +627,9 @@ public function testCreateOrderExistingCustomer()
             $paymentMethod,
             $customerIdFromFixture
         );
+        $customerMock = $this->getMockedCustomer();
+
+        $this->model->getQuote()->setCustomer($customerMock);
         $order = $this->model->createOrder();
         $this->verifyCreatedOrder($order, $shippingMethod);
     }
@@ -861,6 +874,7 @@ public function testSetBillingAddressStreetValidationErrors()
          * They are set to message manager only during createOrder() call.
          */
         $this->model->setIsValidate(true)->setBillingAddress($invalidAddressData);
+        $this->model->setIsValidate(true)->setShippingAddress($invalidAddressData);
         try {
             $this->model->createOrder();
             $this->fail('Validation errors are expected to lead to exception during createOrder() call.');
@@ -939,4 +953,33 @@ public function testCreateOrderExistingCustomerWhenDefaultAddressDiffersWithNew(
             self::assertEquals('Validation is failed.', $e->getRawMessage());
         }
     }
+
+    /**
+     * Get customer mock object.
+     *
+     * @return \Magento\Customer\Model\Data\Customer
+     */
+    private function getMockedCustomer()
+    {
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getId',
+                    'getGroupId',
+                    'getEmail',
+                    '_getExtensionAttributes'
+                ]
+            )->getMock();
+        $customerMock->method('getId')
+            ->willReturn(1);
+        $customerMock->method('getGroupId')
+            ->willReturn(1);
+        $customerMock->method('getEmail')
+            ->willReturn('customer@example.com');
+        $customerMock->method('_getExtensionAttributes')
+            ->willReturn(null);
+
+        return $customerMock;
+    }
 }