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/LoadBlock.php

@@ -10,8 +10,10 @@
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Sales\Controller\Adminhtml\Order\Create as CreateAction;
+use Magento\Store\Model\StoreManagerInterface;
 
 class LoadBlock extends CreateAction implements HttpPostActionInterface, HttpGetActionInterface
 {
@@ -20,21 +22,28 @@ class LoadBlock extends CreateAction implements HttpPostActionInterface, HttpGet
      */
     protected $resultRawFactory;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
      * @param RawFactory $resultRawFactory
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         Action\Context $context,
         \Magento\Catalog\Helper\Product $productHelper,
         \Magento\Framework\Escaper $escaper,
         PageFactory $resultPageFactory,
         ForwardFactory $resultForwardFactory,
-        RawFactory $resultRawFactory
+        RawFactory $resultRawFactory,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->resultRawFactory = $resultRawFactory;
         parent::__construct(
@@ -44,6 +53,8 @@ public function __construct(
             $resultPageFactory,
             $resultForwardFactory
         );
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
@@ -54,6 +65,9 @@ public function __construct(
     public function execute()
     {
         $request = $this->getRequest();
+        if ($request->getParam('store_id') !== 'false') {
+            $this->storeManager->setCurrentStore($request->getParam('store_id'));
+        }
         try {
             $this->_initSession()->_processData();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

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

@@ -6,50 +6,11 @@
 
 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
      *
@@ -70,7 +31,6 @@ 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');