Merge pull request #5619 from magento-tsg-csl3/2.4-develop-pr23

[TSG-CSL3] For 2.4 (pr23)

Author: zakdma

app/code/Magento/Checkout/CustomerData/DefaultItem.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
- * Default item
+ * Default cart item
  */
 class DefaultItem extends AbstractItem
 {
@@ -78,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doGetItemData()
     {
@@ -106,6 +106,7 @@ protected function doGetItemData()
             ],
             'canApplyMsrp' => $this->msrpHelper->isShowBeforeOrderConfirm($this->item->getProduct())
                 && $this->msrpHelper->isMinimalPriceLessMsrp($this->item->getProduct()),
+            'message' => $this->item->getMessage(),
         ];
     }
 
@@ -121,6 +122,8 @@ protected function getOptionList()
     }
 
     /**
+     * Returns product for thumbnail.
+     *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
      */
@@ -130,6 +133,8 @@ protected function getProductForThumbnail()
     }
 
     /**
+     * Returns product.
+     *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
      */

app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
 use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DefaultItemTest extends \PHPUnit\Framework\TestCase
 {
@@ -25,7 +26,7 @@ class DefaultItemTest extends \PHPUnit\Framework\TestCase
     private $configurationPool;
 
     /**
-     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ItemResolverInterface|MockObject
      */
     private $itemResolver;
 
@@ -102,5 +103,6 @@ public function testGetItemData()
         $this->assertArrayHasKey('product_price_value', $itemData);
         $this->assertArrayHasKey('product_image', $itemData);
         $this->assertArrayHasKey('canApplyMsrp', $itemData);
+        $this->assertArrayHasKey('message', $itemData);
     }
 }

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -112,4 +112,7 @@
             </div>
         </div>
     </div>
+    <div class="message notice" if="message">
+        <div data-bind="text: message"></div>
+    </div>
 </li>

app/code/Magento/Customer/Controller/Account/CreatePost.php

@@ -149,6 +149,11 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, Ht
      */
     private $customerRepository;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -266,9 +271,15 @@ protected function extractAddress()
         $addressData = [];
 
         $regionDataObject = $this->regionDataFactory->create();
+        $userDefinedAttr = $this->getRequest()->getParam('address') ?: [];
         foreach ($allowedAttributes as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
-            $value = $this->getRequest()->getParam($attributeCode);
+            if ($attribute->isUserDefined()) {
+                $value = array_key_exists($attributeCode, $userDefinedAttr) ? $userDefinedAttr[$attributeCode] : null;
+            } else {
+                $value = $this->getRequest()->getParam($attributeCode);
+            }
+
             if ($value === null) {
                 continue;
             }
@@ -283,6 +294,9 @@ protected function extractAddress()
                     $addressData[$attributeCode] = $value;
             }
         }
+        $addressData = $addressForm->compactData($addressData);
+        unset($addressData['region_id'], $addressData['region']);
+
         $addressDataObject = $this->addressDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,

app/code/Magento/Directory/Helper/Data.php

@@ -6,11 +6,13 @@
 
 namespace Magento\Directory\Helper;
 
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Directory\Model\Currency;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Directory\Model\ResourceModel\Country\Collection;
 use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\App\Cache\Type\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Json\Helper\Data as JsonData;
 use Magento\Store\Model\ScopeInterface;
@@ -21,6 +23,7 @@
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -156,6 +159,7 @@ public function getRegionCollection()
     {
         if (!$this->_regionCollection) {
             $this->_regionCollection = $this->_regCollectionFactory->create();
+            // phpstan:ignore
             $this->_regionCollection->addCountryFilter($this->getAddress()->getCountryId())->load();
         }
         return $this->_regionCollection;
@@ -185,7 +189,9 @@ public function getRegionJson()
     {
         \Magento\Framework\Profiler::start('TEST: ' . __METHOD__, ['group' => 'TEST', 'method' => __METHOD__]);
         if (!$this->_regionJson) {
-            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . $this->_storeManager->getStore()->getId();
+            $scope = $this->getCurrentScope();
+            $scopeKey = $scope['value'] ? '_' . implode('_', $scope) : null;
+            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . $scopeKey;
             $json = $this->_configCacheType->load($cacheKey);
             if (empty($json)) {
                 $regions = $this->getRegionData();
@@ -344,10 +350,13 @@ public function getDefaultCountry($store = null)
      */
     public function getRegionData()
     {
-        $countryIds = [];
-        foreach ($this->getCountryCollection() as $country) {
-            $countryIds[] = $country->getCountryId();
-        }
+        $scope = $this->getCurrentScope();
+        $allowedCountries = $this->scopeConfig->getValue(
+            AllowedCountries::ALLOWED_COUNTRIES_PATH,
+            $scope['type'],
+            $scope['value']
+        );
+        $countryIds = explode(',', $allowedCountries);
         $collection = $this->_regCollectionFactory->create();
         $collection->addCountryFilter($countryIds)->load();
         $regions = [
@@ -392,4 +401,31 @@ public function getWeightUnit()
     {
         return $this->scopeConfig->getValue(self::XML_PATH_WEIGHT_UNIT, ScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * Get current scope from request
+     *
+     * @return array
+     */
+    private function getCurrentScope(): array
+    {
+        $scope = [
+            'type' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            'value' => null,
+        ];
+        $request = $this->_getRequest();
+        if ($request->getParam(ScopeInterface::SCOPE_WEBSITE)) {
+            $scope = [
+                'type' => ScopeInterface::SCOPE_WEBSITE,
+                'value' => $request->getParam(ScopeInterface::SCOPE_WEBSITE),
+            ];
+        } elseif ($request->getParam(ScopeInterface::SCOPE_STORE)) {
+            $scope = [
+                'type' => ScopeInterface::SCOPE_STORE,
+                'value' => $request->getParam(ScopeInterface::SCOPE_STORE),
+            ];
+        }
+
+        return $scope;
+    }
 }