Merge remote-tracking branch 'origin/2.4-develop' into B2B-2048

Author: oshmyheliuk

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -196,6 +196,7 @@ public function getCacheKeyInfo()
         $cacheKeys['display_minimal_price'] = $this->getDisplayMinimalPrice();
         $cacheKeys['is_product_list'] = $this->isProductList();
         $cacheKeys['customer_group_id'] = $this->getSaleableItem()->getCustomerGroupId();
+        $cacheKeys['zone'] = $this->getZone();
         return $cacheKeys;
     }
 

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml

@@ -10,6 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryFilterSection">
         <element name="CategoryFilter" type="button" selector="//main//div[contains(@class,'filter-options')]//div[contains(text(), 'Category')]"/>
-        <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="CategoryByName" type="button" selector="//main//div[contains(@class,'filter-options')]//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -47,6 +47,7 @@
  */
 class Product extends AbstractEntity
 {
+    private const DEFAULT_GLOBAL_MULTIPLE_VALUE_SEPARATOR = ',';
     public const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
     private const HASH_ALGORITHM = 'sha256';
 
@@ -707,8 +708,6 @@ class Product extends AbstractEntity
     private $filesystem;
 
     /**
-     * Catalog config.
-     *
      * @var CatalogConfig
      */
     private $catalogConfig;
@@ -2812,6 +2811,10 @@ private function parseAttributesWithWrappedValues($attributesData)
     public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_LINE_SEPARATOR)
     {
         if (empty($this->_parameters[Import::FIELDS_ENCLOSURE])) {
+            if ($this->getMultipleValueSeparator() !== self::DEFAULT_GLOBAL_MULTIPLE_VALUE_SEPARATOR) {
+                $delimiter = $this->getMultipleValueSeparator();
+            }
+
             return explode($delimiter, $values);
         }
         if (preg_match_all('~"((?:[^"]|"")*)"~', $values, $matches)) {

app/code/Magento/CatalogRule/etc/adminhtml/events.xml

@@ -12,4 +12,7 @@
     <event name="catalogrule_dirty_notice">
         <observer name="catalogrule" instance="Magento\CatalogRule\Observer\AddDirtyRulesNotice" />
     </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" disabled="true" />
+    </event>
 </config>

app/code/Magento/CatalogRule/etc/crontab/events.xml

@@ -9,4 +9,7 @@
     <event name="catalog_product_get_final_price">
         <observer name="catalogrule" instance="Magento\CatalogRule\Observer\ProcessAdminFinalPriceObserver" />
     </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" disabled="true" />
+    </event>
 </config>

app/code/Magento/CatalogRule/etc/events.xml

@@ -21,4 +21,10 @@
     <event name="magento_catalogrule_api_data_ruleinterface_load_after">
         <observer name="legacy_model_load" instance="Magento\Framework\EntityManager\Observer\AfterEntityLoad" />
     </event>
+    <event name="catalog_product_get_final_price">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\ProcessFrontFinalPriceObserver" />
+    </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\PrepareCatalogProductCollectionPricesObserver" />
+    </event>
 </config>