Skip to content

Commit 60f8877

Browse files
committed
MAGETWO-37819: Sales Tax Report doesn't work
1 parent f43e187 commit 60f8877

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,14 @@ protected function _getSelectedColumns()
104104
/**
105105
* Apply custom columns before load
106106
*
107-
* @return void
107+
* @return $this
108108
*/
109109
protected function _beforeLoad()
110110
{
111111
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
112112
if (!$this->isTotals()) {
113113
$this->getSelect()->group($this->_periodFormat);
114114
}
115+
return parent::_beforeLoad();
115116
}
116117
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,14 @@ protected function _getSelectedColumns()
8585
/**
8686
* Apply custom columns before load
8787
*
88-
* @return void
88+
* @return $this
8989
*/
9090
protected function _beforeLoad()
9191
{
9292
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
9393
if (!$this->isTotals()) {
9494
$this->getSelect()->group($this->_periodFormat);
9595
}
96+
return parent::_beforeLoad();
9697
}
9798
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function _getSelectedColumns()
8989
/**
9090
* Apply custom columns before load
9191
*
92-
* @return void
92+
* @return $this
9393
*/
9494
protected function _beforeLoad()
9595
{
@@ -101,5 +101,6 @@ protected function _beforeLoad()
101101
if ($this->isSubTotals()) {
102102
$this->getSelect()->group([$this->_periodFormat]);
103103
}
104+
return parent::_beforeLoad();
104105
}
105106
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function _getSelectedColumns()
8787
/**
8888
* Apply custom columns before load
8989
*
90-
* @return void
90+
* @return $this
9191
*/
9292
protected function _beforeLoad()
9393
{
@@ -99,5 +99,6 @@ protected function _beforeLoad()
9999
if ($this->isSubTotals()) {
100100
$this->getSelect()->group([$this->_periodFormat]);
101101
}
102+
return parent::_beforeLoad();
102103
}
103104
}

0 commit comments

Comments
 (0)