MAGETWO-60246: [Backport] - [Github]Magento 2.1.1 Problem with change currency #6746 - for 2.1.x

Author: dhorytskyi

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -92,9 +92,15 @@ public function getDataSet(
             if (!$store instanceof \Magento\Store\Model\Store) {
                 throw new \RuntimeException('Illegal scope resolved');
             }
+
+            $currencyRate = $store->getCurrentCurrencyRate() ? : 1;
             $table = $this->resource->getTableName('catalog_product_index_price');
+            $columns = [
+                BucketInterface::FIELD_VALUE => 'main_table.min_price',
+                'currency_rate' => new \Zend_Db_Expr($currencyRate),
+            ];
             $select->from(['main_table' => $table], null)
-                ->columns([BucketInterface::FIELD_VALUE => 'main_table.min_price'])
+                ->columns($columns)
                 ->where('main_table.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
                 ->where('main_table.website_id = ?', $store->getWebsiteId());
         } else {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php

@@ -132,14 +132,15 @@ public function getAggregation(
         \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage
     ) {
         $select = $this->dataProvider->getDataSet($bucket, $dimensions, $entityStorage->getSource());
-        $column = $select->getPart(Select::COLUMNS)[0];
+        list ($valueColumn, $currencyRateColumn) = $select->getPart(Select::COLUMNS);
         $select->reset(Select::COLUMNS);
-        $rangeExpr = new \Zend_Db_Expr(
-            $this->connection->getIfNullSql(
-                $this->connection->quoteInto('FLOOR(' . $column[1] . ' / ? ) + 1', $range),
-                1
-            )
-        );
+        $rangeExpr = new \Zend_Db_Expr($this->connection->getIfNullSql(
+            $this->connection->quoteInto(
+                'FLOOR(' . $valueColumn[1] . ' * ' . (string) $currencyRateColumn[1] . ' / ? ) + 1',
+                $range
+            ),
+            1
+        ));
 
         $select
             ->columns(['range' => $rangeExpr])

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

@@ -262,8 +262,8 @@ private function prepareData($key, $count)
             $to = $this->getTo($to);
         }
         $label = $this->_renderRangeLabel(
-            empty($from) ? 0 : $from * $this->getCurrencyRate(),
-            empty($to) ? $to : $to * $this->getCurrencyRate()
+            empty($from) ? 0 : $from,
+            empty($to) ? $to : $to
         );
         $value = $from . '-' . $to . $this->dataProvider->getAdditionalRequestData();
 

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -263,27 +263,34 @@ public function addFieldToFilter($field, $condition = null)
             throw new \RuntimeException('Illegal state');
         }
 
-        $this->getSearchCriteriaBuilder();
-        $this->getFilterBuilder();
         if (!is_array($condition) || !in_array(key($condition), ['from', 'to'])) {
-            $this->filterBuilder->setField($field);
-            $this->filterBuilder->setValue($condition);
-            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+            $this->addFilterToSearchCriteria($field, $condition);
         } else {
+            if ('price' === $field) {
+                $coef = $this->_storeManager->getStore()->getCurrentCurrencyRate() ? : 1;
+            }
+
             if (!empty($condition['from'])) {
-                $this->filterBuilder->setField("{$field}.from");
-                $this->filterBuilder->setValue($condition['from']);
-                $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+                $this->addFilterToSearchCriteria("{$field}.from", $condition['from'] / $coef);
             }
             if (!empty($condition['to'])) {
-                $this->filterBuilder->setField("{$field}.to");
-                $this->filterBuilder->setValue($condition['to']);
-                $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+                $this->addFilterToSearchCriteria("{$field}.to", $condition['to'] / $coef);
             }
         }
         return $this;
     }
 
+    /**
+     * @param string $field
+     * @param mixed $value
+     */
+    private function addFilterToSearchCriteria($field, $value)
+    {
+        $this->getFilterBuilder()->setField($field);
+        $this->getFilterBuilder()->setValue($value);
+        $this->getSearchCriteriaBuilder()->addFilter($this->filterBuilder->create());
+    }
+
     /**
      * Add search query filter
      *
@@ -349,7 +356,8 @@ protected function _renderFiltersBefore()
         if ($this->order && 'relevance' === $this->order['field']) {
             $this->getSelect()->order('search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->order['dir']);
         }
-        return parent::_renderFiltersBefore();
+
+        parent::_renderFiltersBefore();
     }
 
     /**