Merge remote-tracking branch 'origin/MC-31832' into 2.4-develop-pr23

Author: zakdma

app/code/Magento/Catalog/Model/Layer/FilterList.php

@@ -123,9 +123,9 @@ protected function getAttributeFilterClass(\Magento\Catalog\Model\ResourceModel\
     {
         $filterClassName = $this->filterTypes[self::ATTRIBUTE_FILTER];
 
-        if ($attribute->getFrontendInput() === 'price') {
+        if ($attribute->getAttributeCode() == 'price') {
             $filterClassName = $this->filterTypes[self::PRICE_FILTER];
-        } elseif ($attribute->getBackendType() === 'decimal') {
+        } elseif ($attribute->getBackendType() == 'decimal') {
             $filterClassName = $this->filterTypes[self::DECIMAL_FILTER];
         }
 

app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

@@ -282,28 +282,6 @@
         <data key="used_for_sort_by">false</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
-    <entity name="productAttributeTypeOfPrice" type="ProductAttribute">
-        <data key="attribute_code" unique="suffix">attribute</data>
-        <data key="frontend_input">price</data>
-        <data key="scope">global</data>
-        <data key="is_required">false</data>
-        <data key="is_unique">false</data>
-        <data key="is_searchable">false</data>
-        <data key="is_visible">true</data>
-        <data key="is_wysiwyg_enabled">false</data>
-        <data key="is_visible_in_advanced_search">false</data>
-        <data key="is_visible_on_front">true</data>
-        <data key="is_filterable">true</data>
-        <data key="is_filterable_in_search">false</data>
-        <data key="used_in_product_listing">false</data>
-        <data key="is_used_for_promo_rules">false</data>
-        <data key="is_comparable">true</data>
-        <data key="is_used_in_grid">false</data>
-        <data key="is_visible_in_grid">false</data>
-        <data key="is_filterable_in_grid">false</data>
-        <data key="used_for_sort_by">false</data>
-        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-    </entity>
     <entity name="textProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
         <data key="frontend_input">text</data>
         <data key="default_value" unique="suffix">defaultValue</data>

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

@@ -11,6 +11,5 @@
     <section name="StorefrontCategoryFilterSection">
         <element name="CategoryFilter" type="button" selector="//main//div[@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="CustomPriceAttribute" type="button" selector="div.filter-options-title"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php

@@ -94,13 +94,9 @@ public function testGetFilters($method, $value, $expectedClass)
 
         $this->objectManagerMock->expects($this->at(1))
             ->method('create')
-            ->with(
-                $expectedClass,
-                [
-                    'data' => ['attribute_model' => $this->attributeMock],
-                    'layer' => $this->layerMock
-                ]
-            )
+            ->with($expectedClass, [
+                'data' => ['attribute_model' => $this->attributeMock],
+                'layer' => $this->layerMock])
             ->will($this->returnValue('filter'));
 
         $this->attributeMock->expects($this->once())
@@ -169,8 +165,8 @@ public function getFiltersDataProvider()
     {
         return [
             [
-                'method' => 'getFrontendInput',
-                'value' => 'price',
+                'method' => 'getAttributeCode',
+                'value' => FilterList::PRICE_FILTER,
                 'expectedClass' => 'PriceFilterClass',
             ],
             [
@@ -179,8 +175,8 @@ public function getFiltersDataProvider()
                 'expectedClass' => 'DecimalFilterClass',
             ],
             [
-                'method' => 'getFrontendInput',
-                'value' => 'text',
+                'method' => 'getAttributeCode',
+                'value' => null,
                 'expectedClass' => 'AttributeFilterClass',
             ]
         ];
@@ -195,8 +191,8 @@ public function getFiltersWithoutCategoryDataProvider(): array
     {
         return [
             'Filters contains only price attribute' => [
-                'method' => 'getFrontendInput',
-                'value' => 'price',
+                'method' => 'getAttributeCode',
+                'value' => FilterList::PRICE_FILTER,
                 'expectedClass' => 'PriceFilterClass',
                 'expectedResult' => [
                     'filter'

app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php

@@ -14,9 +14,6 @@
  */
 class Decimal extends AbstractFilter
 {
-    /** Decimal delta for filter  */
-    private const DECIMAL_DELTA = 0.001;
-
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
      */
@@ -75,17 +72,11 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
 
         list($from, $to) = explode('-', $filter);
 
-        // When the range is 10-20 we only need to get products that are in the 10-19.99 range.
-        $toValue = $to;
-        if (!empty($toValue) && $from !== $toValue) {
-            $toValue -= self::DECIMAL_DELTA;
-        }
-
         $this->getLayer()
             ->getProductCollection()
             ->addFieldToFilter(
                 $this->getAttributeModel()->getAttributeCode(),
-                ['from' => $from, 'to' => $toValue]
+                ['from' => $from, 'to' => $to]
             );
 
         $this->getLayer()->getState()->addFilter(
@@ -122,7 +113,7 @@ protected function _getItemsData()
                 $from = '';
             }
             if ($to == '*') {
-                $to = '';
+                $to = null;
             }
             $label = $this->renderRangeLabel(empty($from) ? 0 : $from, $to);
             $value = $from . '-' . $to;
@@ -149,7 +140,7 @@ protected function _getItemsData()
     protected function renderRangeLabel($fromPrice, $toPrice)
     {
         $formattedFromPrice = $this->priceCurrency->format($fromPrice);
-        if ($toPrice === '') {
+        if ($toPrice === null) {
             return __('%1 and above', $formattedFromPrice);
         } else {
             if ($fromPrice != $toPrice) {

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -141,7 +141,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
         list($from, $to) = $filter;
 
         $this->getLayer()->getProductCollection()->addFieldToFilter(
-            $this->getAttributeModel()->getAttributeCode(),
+            'price',
             ['from' => $from, 'to' =>  empty($to) || $from == $to ? $to : $to - self::PRICE_DELTA]
         );
 

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php

@@ -100,10 +100,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
                         ],
                     ];
                     $bucketName = $attribute->getAttributeCode() . self::BUCKET_SUFFIX;
-                    $generatorType = $attribute->getFrontendInput() === 'price'
-                        ? $attribute->getFrontendInput()
-                        : $attribute->getBackendType();
-                    $generator = $this->generatorResolver->getGeneratorForType($generatorType);
+                    $generator = $this->generatorResolver->getGeneratorForType($attribute->getBackendType());
                     $request['filters'][$filterName] = $generator->getFilterData($attribute, $filterName);
                     $request['aggregations'][$bucketName] = $generator->getAggregationData($attribute, $bucketName);
                 }

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Price.php

@@ -209,12 +209,6 @@ public function testApply()
         $priceId = '15-50';
         $requestVar = 'test_request_var';
 
-        $this->target->setAttributeModel($this->attribute);
-        $attributeCode = 'price';
-        $this->attribute->expects($this->any())
-            ->method('getAttributeCode')
-            ->will($this->returnValue($attributeCode));
-
         $this->target->setRequestVar($requestVar);
         $this->request->expects($this->exactly(1))
             ->method('getParam')