Merge pull request #433 from magento-troll/Troll_S40_bugfix

[Troll] bugfixes

Author: Ganin, Roman(rganin)

app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php

@@ -303,7 +303,7 @@ public function getCountTotals()
 
             $this->_addOrderStatusFilter($totalsCollection, $filterData);
 
-            if (count($totalsCollection->getItems()) < 1 || !$filterData->getData('from')) {
+            if ($totalsCollection->load()->getSize() < 1 || !$filterData->getData('from')) {
                 $this->setTotals(new \Magento\Framework\Object());
                 $this->setCountTotals(false);
             } else {

app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php

@@ -102,16 +102,16 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals()) {
             $this->getSelect()->group($this->_periodFormat);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php

@@ -83,16 +83,16 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
-     * @return \Magento\Sales\Model\Resource\Report\Refunded\Collection\Order
+     * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals()) {
             $this->getSelect()->group($this->_periodFormat);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php

@@ -87,11 +87,11 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
 
@@ -101,6 +101,6 @@ protected function _initSelect()
         if ($this->isSubTotals()) {
             $this->getSelect()->group([$this->_periodFormat]);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Tax/Model/Resource/Report/Collection.php

@@ -85,11 +85,11 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals() && !$this->isSubTotals()) {
@@ -99,6 +99,6 @@ protected function _initSelect()
         if ($this->isSubTotals()) {
             $this->getSelect()->group([$this->_periodFormat]);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php

@@ -34,7 +34,7 @@ public function processAssert(
         $this->order = $order;
         $this->searchInSalesReportGrid($salesReport);
         $salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getLastResult());
-        $prepareInitialResult = $this->prepareExpectedResult($initialSalesResult);
+        $prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesResult));
         \PHPUnit_Framework_Assert::assertEquals(
             $prepareInitialResult,
             $salesResult,
@@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult)
     {
         $data = [];
         foreach ($salesResult as $key => $result) {
-            $data[$key] = intval($result);
+            $data[$key] = floatval($result);
         }
 
         return $data;

dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php

@@ -33,15 +33,31 @@ public function processAssert(
         $this->salesReportPage = $salesReportPage;
         $this->order = $order;
         $this->searchInSalesReportGrid($salesReport);
-        $salesResult = $salesReportPage->getGridBlock()->getTotalResult();
-        $prepareInitialResult = $this->prepareExpectedResult($initialSalesTotalResult);
+        $salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getTotalResult());
+        $prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesTotalResult));
         \PHPUnit_Framework_Assert::assertEquals(
             $prepareInitialResult,
             $salesResult,
             "Grand total Sales result is not correct."
         );
     }
 
+    /**
+     * Prepare sales result.
+     *
+     * @param array $salesResult
+     * @return array
+     */
+    protected function prepareSalesResult($salesResult)
+    {
+        $data = [];
+        foreach ($salesResult as $key => $result) {
+            $data[$key] = floatval($result);
+        }
+
+        return $data;
+    }
+
     /**
      * Returns a string representation of the object
      *