Merge pull request #1626 from magento-engcom/2.1-develop-prs

[EngCom] Public Pull Requests - 2.1-develop
 - MAGETWO-82178 Fix Filter Customer Report Review 2.1-develop [Backport] #11523
 - MAGETWO-82762 [Backport 2.1-develop] Dashboard Fix Y Axis for range #11753

Author: ishakhsuvarov

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
                     $tmpstring = implode('|', $this->_axisLabels[$idx]);
 
                     $valueBuffer[] = $indexid . ":|" . $tmpstring;
+                } elseif ($idx == 'y') {
+                    $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
                 }
                 $indexid++;
             }

app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php

@@ -83,7 +83,7 @@ protected function _joinCustomers()
         $this->getSelect()->reset(
             \Magento\Framework\DB\Select::COLUMNS
         )->joinInner(
-            ['customer' => $connection->getTableName('customer_entity')],
+            ['customer' => $this->getTable('customer_entity')],
             'customer.entity_id = detail.customer_id',
             []
         )->columns(
@@ -99,20 +99,36 @@ protected function _joinCustomers()
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Additional processing of 'customer_name' field is required, as it is a concat field, which can not be aliased.
+     * @see _joinCustomers
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field === 'customer_name') {
+            $field = $this->getConnection()->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
+        }
+
+        return parent::addFieldToFilter($field, $condition);
+    }
+
     /**
      * Get select count sql
      *
      * @return string
      */
     public function getSelectCountSql()
     {
-        $countSelect = clone $this->_select;
+        $countSelect = clone $this->getSelect();
         $countSelect->reset(\Magento\Framework\DB\Select::ORDER);
         $countSelect->reset(\Magento\Framework\DB\Select::GROUP);
         $countSelect->reset(\Magento\Framework\DB\Select::HAVING);
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $countSelect->reset(\Magento\Framework\DB\Select::WHERE);
 
         $countSelect->columns(new \Zend_Db_Expr('COUNT(DISTINCT detail.customer_id)'));
 

dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Reports\Model\ResourceModel\Review\Customer;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Review\Customer\Collection
+     */
+    private $collection;
+
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Reports\Model\ResourceModel\Review\Customer\Collection::class
+        );
+    }
+
+    /**
+     * This tests covers issue described in:
+     * https://github.com/magento/magento2/issues/10301
+     *
+     * @magentoDataFixture Magento/Review/_files/customer_review.php
+     */
+    public function testSelectCountSql()
+    {
+        $this->collection->addFieldToFilter('customer_name', ['like' => '%John%'])->getItems();
+        $this->assertEquals(1, $this->collection->getSize());
+    }
+}