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

pradeep.rauthan · pradeep.rauthan · commit e438e743c9a7 · 2021-10-02T09:11:44.000+05:30
diff --git a/app/code/Magento/Sales/ViewModel/Customer/Address/AddressAttributeFilter.php b/app/code/Magento/Sales/ViewModel/Customer/Address/AddressAttributeFilter.php
@@ -38,10 +38,10 @@ public function __construct(
      *
      * @param Collection $collection
      * @param string|integer $storeId
-     * @return Object
+     * @return Collection
      * @throws LocalizedException
      */
-    public function setScopeFilter(Collection $collection, $storeId)
+    public function setScopeFilter(Collection $collection, $storeId) : Collection
     {
         if ($storeId) {
             $allowedCountries = $this->allowedCountryReader->getAllowedCountries(
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -49,14 +49,14 @@
                             <arguments>
                                 <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                                 <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-                                <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                                <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                             </arguments>
                         </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
                             <arguments>
                                 <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                                 <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-                                <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                                <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                             </arguments>
                         </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
@@ -13,7 +13,7 @@
                     <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                     <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
                     <argument name="billingAddressDataProvider" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\Billing\AddressDataProvider</argument>
-                    <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                    <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -24,14 +24,14 @@
                     <arguments>
                         <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                         <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-                        <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                        <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                     </arguments>
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
                     <arguments>
                         <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                         <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-                        <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                        <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                     </arguments>
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                     <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
-                    <argument name="view_model" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
+                    <argument name="customerAddressCollectionAttributeFilter" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -15,11 +15,11 @@
  */
 
 $addressCollection = $block->getData('customerAddressCollection');
-$viewModel = $block->getViewModel();
+$AddressCollectionAttributeFilter = $block->getData('customerAddressCollectionAttributeFilter');
 
 $addressArray = [];
 if ($block->getCustomerId()):
-    $addressArray = $viewModel->setScopeFilter($addressCollection, $block->getStoreId())
+    $addressArray = $AddressCollectionAttributeFilter->setScopeFilter($addressCollection, $block->getStoreId())
         ->setCustomerFilter([$block->getCustomerId()])->toArray();
 endif;
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CustomerAddressDataProviderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CustomerAddressDataProviderTest.php
@@ -7,20 +7,21 @@
 
 namespace Magento\Customer\Model\Address;
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\Storage\Writer;
 use Magento\Framework\App\Config\Storage\WriterInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Assert that only relavant addresses for the allowed countries under a website/store fetch.
+ * Assert that only relevant addresses for the allowed countries under a website/store fetch.
  *
- * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CustomerAddressDataProviderTest extends TestCase
 {
@@ -51,8 +52,8 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        /** @var \Magento\Framework\Registry $registry */
-        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
+        /** @var Registry $registry */
+        $registry = $this->objectManager->get(Registry::class);
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', true);
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/ViewModel/Customer/Address/AddressAttributeFilterTest.php b/dev/tests/integration/testsuite/Magento/Sales/ViewModel/Customer/Address/AddressAttributeFilterTest.php
@@ -26,7 +26,6 @@
 /**
  * Assert that only relevant addresses for the allowed countries under a website/store fetch.
  *
- * @magentoDbIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressAttributeFilterTest extends TestCase
@@ -94,8 +93,7 @@ protected function tearDown(): void
      *
      * @dataProvider addressesDataProvider
      *
-     * @param Collection $collection
-     * @param $customerId
+     * @param $storeId
      * @param $allowedCountries
      * @return void
      * @throws LocalizedException
@@ -125,7 +123,6 @@ public function testSetScopeFilter($storeId, $allowedCountries) : void
     /**
      * Data provider for create allowed countries for a particular store.
      *
-     * @param Collection $collection
      * @return array
      */
     public function addressesDataProvider(): array

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ public function __construct(`
`38`	`38`	`*`
`39`	`39`	`* @param Collection $collection`
`40`	`40`	`* @param string\|integer $storeId`
`41`		`- * @return Object`
	`41`	`+ * @return Collection`
`42`	`42`	`* @throws LocalizedException`
`43`	`43`	`*/`
`44`		`- public function setScopeFilter(Collection $collection, $storeId)`
	`44`	`+ public function setScopeFilter(Collection $collection, $storeId) : Collection`
`45`	`45`	`{`
`46`	`46`	`if ($storeId) {`
`47`	`47`	`$allowedCountries = $this->allowedCountryReader->getAllowedCountries(`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`/**`
`27`	`27`	`* Assert that only relevant addresses for the allowed countries under a website/store fetch.`
`28`	`28`	`*`
`29`		`- * @magentoDbIsolation enabled`
`30`	`29`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`31`	`30`	`*/`
`32`	`31`	`class AddressAttributeFilterTest extends TestCase`
`@@ -94,8 +93,7 @@ protected function tearDown(): void`
`94`	`93`	`*`
`95`	`94`	`* @dataProvider addressesDataProvider`
`96`	`95`	`*`
`97`		`- * @param Collection $collection`
`98`		`- * @param $customerId`
	`96`	`+ * @param $storeId`
`99`	`97`	`* @param $allowedCountries`
`100`	`98`	`* @return void`
`101`	`99`	`* @throws LocalizedException`
`@@ -125,7 +123,6 @@ public function testSetScopeFilter($storeId, $allowedCountries) : void`
`125`	`123`	`/**`
`126`	`124`	`* Data provider for create allowed countries for a particular store.`
`127`	`125`	`*`
`128`		`- * @param Collection $collection`
`129`	`126`	`* @return array`
`130`	`127`	`*/`
`131`	`128`	`public function addressesDataProvider(): array`