Merge remote-tracking branch 'origin/MC-25042' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

@@ -10,6 +10,8 @@
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Customer\Model\Session;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -92,23 +94,32 @@ class AttributeMerger
      */
     private $topCountryCodes;
 
+    /**
+     * @var AllowedCountries|null
+     */
+    private $allowedCountryReader;
+
     /**
      * @param AddressHelper $addressHelper
      * @param Session $customerSession
      * @param CustomerRepository $customerRepository
      * @param DirectoryHelper $directoryHelper
+     * @param AllowedCountries $allowedCountryReader
      */
     public function __construct(
         AddressHelper $addressHelper,
         Session $customerSession,
         CustomerRepository $customerRepository,
-        DirectoryHelper $directoryHelper
+        DirectoryHelper $directoryHelper,
+        ?AllowedCountries $allowedCountryReader = null
     ) {
         $this->addressHelper = $addressHelper;
         $this->customerSession = $customerSession;
         $this->customerRepository = $customerRepository;
         $this->directoryHelper = $directoryHelper;
         $this->topCountryCodes = $directoryHelper->getTopCountryCodes();
+        $this->allowedCountryReader =
+            $allowedCountryReader ?: ObjectManager::getInstance()->get(AllowedCountries::class);
     }
 
     /**
@@ -289,7 +300,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
                 'dataScope' => $lineIndex,
                 'provider' => $providerName,
                 'validation' => $isFirstLine
-                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     ? array_merge(
                         ['required-entry' => (bool)$attributeConfig['required']],
                         $attributeConfig['validation']
@@ -330,7 +341,11 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
     protected function getDefaultValue($attributeCode): ?string
     {
         if ($attributeCode === 'country_id') {
-            return $this->directoryHelper->getDefaultCountry();
+            $defaultCountryId = $this->directoryHelper->getDefaultCountry();
+            if (!in_array($defaultCountryId, $this->allowedCountryReader->getAllowedCountries())) {
+                $defaultCountryId = null;
+            }
+            return $defaultCountryId;
         }
 
         $customer = $this->getCustomer();

dev/tests/integration/testsuite/Magento/Checkout/Block/Checkout/LayoutProcessorTest.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Block\Checkout;
+
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class LayoutProcessorTest extends TestCase
+{
+    /**
+     * Tests default country for shipping address.
+     *
+     * @param string $defaultCountryId
+     * @param bool $isCountryValueExpected
+     * @magentoConfigFixture default_store checkout/options/display_billing_address_on 1
+     * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
+     * @dataProvider defaultCountryDataProvider
+     */
+    public function testShippingAddressCountryId(string $defaultCountryId, bool $isCountryValueExpected): void
+    {
+        /** @var MutableScopeConfigInterface $mutableConfig */
+        $mutableConfig = Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class);
+        $mutableConfig->setValue('general/country/default', $defaultCountryId, ScopeInterface::SCOPE_STORE, 'default');
+
+        /** @var $layoutProcessor LayoutProcessor */
+        $layoutProcessor = Bootstrap::getObjectManager()->get(LayoutProcessor::class);
+
+        $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
+        ['children']['shippingAddress']['children']['shipping-address-fieldset']['children'] = [];
+        $data = $layoutProcessor->process($jsLayout);
+
+        $countryId = $data["components"]["checkout"]["children"]["steps"]["children"]["shipping-step"]["children"]
+        ["shippingAddress"]["children"]["shipping-address-fieldset"]["children"]["country_id"];
+
+        $isCountryValueExists = array_key_exists('value', $countryId);
+
+        $this->assertEquals($isCountryValueExpected, $isCountryValueExists);
+        if ($isCountryValueExpected) {
+            $this->assertEquals($defaultCountryId, $countryId['value']);
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function defaultCountryDataProvider(): array
+    {
+        return [
+            'Default country isn\'t in allowed country list' => [
+                'defaultCountryId' => 'US',
+                'isCountryValueExpected' => false
+            ],
+            'Default country is in allowed country list' => [
+                'defaultCountryId' => 'FR',
+                'isCountryValueExpected' => true
+            ],
+        ];
+    }
+}