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

pradeep.rauthan · pradeep.rauthan · commit fd54337f7b8f · 2021-09-30T19:52:48.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
@@ -33,7 +33,6 @@ public function __construct(
         $this->allowedCountryReader = $allowedCountryReader;
     }
 
-
     /**
      * Set allowed country filter for customer's addresses
      *
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
@@ -10,8 +10,8 @@
  */
 
 /**
- *  @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
- * @var $viewModel \Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter
+ * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
+ * @var \Magento\Sales\ViewModel\Customer\Address\AddressAttributeFilter $viewModel
  */
 
 $addressCollection = $block->getData('customerAddressCollection');

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function __construct(`
`33`	`33`	`$this->allowedCountryReader = $allowedCountryReader;`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`	`36`	`/**`
`38`	`37`	`* Set allowed country filter for customer's addresses`
`39`	`38`	`*`