MAGETWO-91334: [Corra Technology]Customer Custom attribute-Default value is not showing in Order page.

Author: viktym

app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php

@@ -11,6 +11,7 @@
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterface;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
+use Magento\Customer\Model\Data\AttributeMetadata;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
@@ -120,7 +121,7 @@ public function extract($attributeMetadata)
     {
         return $this->dataObjectProcessor->buildOutputDataArray(
             $attributeMetadata,
-            AttributeMetadataInterface::class
+            AttributeMetadata::class
         );
     }
 }

app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php

@@ -205,7 +205,7 @@ public function testExtract()
             ->method('buildOutputDataArray')
             ->with(
                 $this->attributeMetadataMock,
-                AttributeMetadataInterface::class
+                AttributeMetadata::class
             )
             ->willReturn($data);
         $this->assertSame(

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

@@ -132,7 +132,15 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-        $this->_form->setValues($this->getFormValues());
+
+        $formValues = $this->getFormValues();
+        foreach ($attributes as $code => $attribute) {
+            $defaultValue = $attribute->getDefaultValue();
+            if (isset($defaultValue) && !isset($formValues[$code])) {
+                $formValues[$code] = $defaultValue;
+            }
+        }
+        $this->_form->setValues($formValues);
 
         return $this;
     }

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php

@@ -5,39 +5,50 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppArea adminhtml
  */
 class AccountTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account */
-    protected $_accountBlock;
+    /** @var Account */
+    private $accountBlock;
 
     /**
-     * @var \Magento\TestFramework\Helper\Bootstrap
+     * @var Bootstrap
      */
-    protected $_objectManager;
+    private $objectManager;
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      */
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class)->load(1);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $quote = $this->objectManager->create(Quote::class)->load(1);
         $sessionQuoteMock = $this->getMockBuilder(
-            \Magento\Backend\Model\Session\Quote::class
+            SessionQuote::class
         )->disableOriginalConstructor()->setMethods(
             ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
         )->getMock();
         $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
         $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
-        $this->_accountBlock = $layout->createBlock(
-            \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account::class,
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $this->accountBlock = $layout->createBlock(
+            Account::class,
             'address_block' . rand(),
             ['sessionQuote' => $sessionQuoteMock]
         );
@@ -50,7 +61,7 @@ protected function setUp()
     public function testGetForm()
     {
         $expectedFields = ['group_id', 'email'];
-        $form = $this->_accountBlock->getForm();
+        $form = $this->accountBlock->getForm();
         $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
 
@@ -63,4 +74,56 @@ public function testGetForm()
             );
         }
     }
+
+    /**
+     * Tests a case when user defined custom attribute has default value.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetFormWithUserDefinedAttribute()
+    {
+        $formFactory = $this->getFormFactoryMock();
+        $this->objectManager->addSharedInstance($formFactory, FormFactory::class);
+
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $accountBlock = $layout->createBlock(Account::class, 'address_block' . rand());
+
+        $form = $accountBlock->getForm();
+        $form->setUseContainer(true);
+
+        $this->assertContains(
+            '<option value="1" selected="selected">Yes</option>',
+            $form->toHtml(),
+            'Default value for user defined custom attribute should be selected'
+        );
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+    {
+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+        $booleanAttribute = $attributeMetadataFactory->create()
+            ->setAttributeCode('boolean')
+            ->setBackendType('boolean')
+            ->setFrontendInput('boolean')
+            ->setDefaultValue('1')
+            ->setFrontendLabel('Yes/No');
+
+        $form = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
+        $form->method('getSystemAttributes')->willReturn([]);
+
+        $formFactory = $this->getMockBuilder(FormFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $formFactory->method('create')->willReturn($form);
+
+        return $formFactory;
+    }
 }