MC-42623:Countries list is incorrect when using different countries per website and Global Customer Account settings

Author: pradeep.rauthan

app/code/Magento/Sales/ViewModel/Customer/Address/AddressAttributeFilter.php

@@ -10,100 +10,48 @@
 
 use Magento\Customer\Model\ResourceModel\Address\Collection;
 use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Store\Model\ScopeInterface;
 
 /**
  * Customer's addresses filter as per allowed country filter for corresponding store
  */
-class AddressAttributeFilter extends \Magento\Eav\Model\Entity\Collection\VersionControl\AbstractCollection implements ArgumentInterface
+class AddressAttributeFilter implements ArgumentInterface
 {
     /**
      * @var AllowedCountries
      */
     private $allowedCountryReader;
 
     /**
-     * @var Collection
-     */
-    private $collection;
-
-    /**
-     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
-     * @param \Magento\Eav\Model\ResourceModel\Helper $resourceHelper
-     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
      * @param AllowedCountries $allowedCountryReader
-     * @param Collection $collection
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
-        \Magento\Eav\Model\ResourceModel\Helper $resourceHelper,
-        \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
-        AllowedCountries $allowedCountryReader,
-        Collection $collection,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
+        AllowedCountries $allowedCountryReader
     ) {
         $this->allowedCountryReader = $allowedCountryReader;
-        $this->collection = $collection;
-
-        parent::__construct(
-            $entityFactory,
-            $logger,
-            $fetchStrategy,
-            $eventManager,
-            $eavConfig,
-            $resource,
-            $eavEntityFactory,
-            $resourceHelper,
-            $universalFactory,
-            $entitySnapshot,
-            $connection
-        );
     }
 
-    /**
-     * Resource initialization
-     *
-     * @return void
-     */
-    protected function _construct()
-    {
-        $this->_init(\Magento\Customer\Model\Address::class, \Magento\Customer\Model\ResourceModel\Address::class);
-    }
 
     /**
      * Set allowed country filter for customer's addresses
      *
-     * @return $this|Object
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param Collection $collection
+     * @param $storeId
+     * @return Object
+     * @throws LocalizedException
      */
-    public function setScopeFilter($storeId)
+    public function setScopeFilter(Collection $collection, $storeId)
     {
         if ($storeId) {
             $allowedCountries = $this->allowedCountryReader->getAllowedCountries(
                 ScopeInterface::SCOPE_STORE,
                 $storeId
             );
-            $this->collection->addAttributeToFilter('country_id', ['in' => $allowedCountries]);
+            $collection->addAttributeToFilter('country_id', ['in' => $allowedCountries]);
         }
 
-        return $this->collection;
+        return $collection;
     }
 }

app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml

@@ -10,13 +10,17 @@
  */
 
 /**
+ *  @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
  * @var $viewModel \Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter
  */
+
+$addressCollection = $block->getData('customerAddressCollection');
 $viewModel = $block->getViewModel();
 
 $addressArray = [];
 if ($block->getCustomerId()):
-    $addressArray = $viewModel->setScopeFilter($block->getStoreId())->setCustomerFilter([$block->getCustomerId()])->toArray();
+    $addressArray = $viewModel->setScopeFilter($addressCollection, $block->getStoreId())
+        ->setCustomerFilter([$block->getCustomerId()])->toArray();
 endif;
 
 /**