ACP2E-860: The attribute values are storing correctly only if it's 'Show Company' property is 'Optional' for 'Main Website' for Multistore

 - Fixed the issue.

Author: devarul

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php

@@ -6,11 +6,50 @@
 
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Catalog\Helper\Product;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\PaymentException;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface
 {
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param Context $context
+     * @param Product $productHelper
+     * @param Escaper $escaper
+     * @param PageFactory $resultPageFactory
+     * @param ForwardFactory $resultForwardFactory
+     * @param StoreManagerInterface|null $storeManager
+     */
+    public function __construct(
+        Context $context,
+        Product $productHelper,
+        Escaper $escaper,
+        PageFactory $resultPageFactory,
+        ForwardFactory $resultForwardFactory,
+        StoreManagerInterface $storeManager = null
+    ) {
+        parent::__construct(
+            $context,
+            $productHelper,
+            $escaper,
+            $resultPageFactory,
+            $resultForwardFactory
+        );
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
+    }
+
     /**
      * Saving quote and create order
      *
@@ -31,6 +70,7 @@ public function execute()
             ) {
                 return $this->resultForwardFactory->create()->forward('denied');
             }
+            $this->storeManager->setCurrentStore($this->_getSession()->getQuote()->getStore()->getCode());
             $this->_getOrderCreateModel()->getQuote()->setCustomerId($this->_getSession()->getCustomerId());
             $this->_processActionData('save');
             $paymentData = $this->getRequest()->getPost('payment');

app/code/Magento/Sales/Plugin/Model/Customer/Metadata/AddressMetadata.php

@@ -52,7 +52,4 @@
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
         <plugin name="orderGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
     </type>
-    <type name="Magento\Customer\Model\Metadata\AddressMetadata">
-        <plugin name="OrderDetailUpdateAddress" type="Magento\Sales\Plugin\Model\Customer\Metadata\AddressMetadata"/>
-    </type>
 </config>