Skip to content

Fix: addFilterToMap function is not working for certain columns #3619 #36818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 16, 2024
+13 −4
Merged

Fix: addFilterToMap function is not working for certain columns #3619 #36818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bc56113
Fix: addFilterToMap function is not working for certain columns #3619
ananth-iyer Feb 8, 2023
09b760a
Updated OrderGridCollectionFilterTest file
ananth-iyer Feb 11, 2023
68d60d7
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Feb 12, 2023
c15f6a8
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Feb 13, 2023
04bc3b9
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Feb 15, 2023
35936eb
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Feb 16, 2023
d562215
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Feb 17, 2023
2633ccf
Updated Order Grid Collection plugin
ananth-iyer Mar 2, 2023
27c0395
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Mar 2, 2023
7d45bd4
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Mar 2, 2023
c4d612a
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Mar 6, 2023
cfc48a9
Merge branch '2.4-develop' into fix-issue-36719
ananth-iyer Mar 10, 2023
07be698
Added creditmemo, shipment, invoice grid plugin
ananth-iyer May 8, 2023
01199a4
Merge branch 'fix-issue-36719' of https://github.com/ananth-iyer/mage…
ananth-iyer May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function aroundAddFieldToFilter(
}
}

$fieldName = $subject->getConnection()->quoteIdentifier($field);
$fieldName = $subject->getConnection()->quoteIdentifier('main_table.' . $field);
$condition = $subject->getConnection()->prepareSqlCondition($fieldName, $condition);
$subject->getSelect()->where($condition, null, Select::TYPE_CONDITION);

Expand Down
11 changes: 10 additions & 1 deletion app/code/Magento/Sales/etc/adminhtml/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,18 @@
</arguments>
<plugin name="orderGridExportFilterColumnPlugin" type="Magento\Sales\Plugin\Model\Export\OrderGridExportFilterColumn"/>
</type>
<type name="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
<type name="Magento\Sales\Model\ResourceModel\Order\Grid\Collection">
<plugin name="orderGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
</type>
<type name="Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection">
<plugin name="invoiceGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
</type>
<type name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection">
<plugin name="creditmemoGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
</type>
<type name="Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection">
<plugin name="shipmentGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
</type>
<type name="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection">
<arguments>
<argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
Expand Down
4 changes: 2 additions & 2 deletions ...estsuite/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ public function testAroundAddFieldToFilter($mainTable, $resourceModel, $field, $

if ($mainTable == 'sales_order_grid') {
$condition = ['from' => $fieldValue , 'locale' => "en_US", 'datetime' => true];
$selectCondition = "WHERE (`{$field}` >= '{$convertedDate}')";
$selectCondition = "WHERE (`main_table`.`{$field}` >= '{$convertedDate}')";
} else {
$condition = ['qteq' => $fieldValue];
$selectCondition = "WHERE (((`{$field}` = '{$convertedDate}')))";
$selectCondition = "WHERE (((`main_table`.`{$field}` = '{$convertedDate}')))";
}

$this->searchResult = $this->objectManager->create(
Expand Down