Skip to content

Commit d1ad997

Browse files
committed
ACP2E-56 : [On Prem] Magento invoice order date filter not working
1 parent c0b1974 commit d1ad997

File tree

6 files changed

+17
-122
lines changed

6 files changed

+17
-122
lines changed

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,11 @@ protected function _initSelect()
9393
parent::_initSelect();
9494

9595
$tableDescription = $this->getConnection()->describeTable($this->getMainTable());
96-
foreach ($tableDescription as $columnInfo) {
97-
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.'.$columnInfo['COLUMN_NAME']);
96+
97+
if ($tableDescription) {
98+
foreach ($tableDescription as $columnInfo) {
99+
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.' . $columnInfo['COLUMN_NAME']);
100+
}
98101
}
99102

100103
return $this;

app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,11 @@ protected function _initSelect()
9393
parent::_initSelect();
9494

9595
$tableDescription = $this->getConnection()->describeTable($this->getMainTable());
96-
foreach ($tableDescription as $columnInfo) {
97-
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.'.$columnInfo['COLUMN_NAME']);
96+
97+
if ($tableDescription) {
98+
foreach ($tableDescription as $columnInfo) {
99+
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.'.$columnInfo['COLUMN_NAME']);
100+
}
98101
}
99102

100103
return $this;

app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFilter.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class CollectionFilter extends SearchResult
2727
* @param Logger $logger
2828
* @param FetchStrategy $fetchStrategy
2929
* @param EventManager $eventManager
30+
* @param TimezoneInterface $timeZone
3031
* @param string $mainTable
3132
* @param string $resourceModel
32-
* @param TimezoneInterface $timeZone
3333
*/
3434
public function __construct(
3535
EntityFactory $entityFactory,
@@ -47,13 +47,16 @@ public function __construct(
4747
/**
4848
* @inheritdoc
4949
*/
50-
protected function _initSelect()
50+
public function _initSelect()
5151
{
5252
parent::_initSelect();
5353

5454
$tableDescription = $this->getConnection()->describeTable($this->getMainTable());
55-
foreach ($tableDescription as $columnInfo) {
56-
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.'.$columnInfo['COLUMN_NAME']);
55+
56+
if ($tableDescription) {
57+
foreach ($tableDescription as $columnInfo) {
58+
$this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.' . $columnInfo['COLUMN_NAME']);
59+
}
5760
}
5861

5962
return $this;

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)