From e0eb46ebe0305edf9c067516bfb174467f525eab Mon Sep 17 00:00:00 2001 From: Tobias Merkl Date: Fri, 12 Feb 2021 21:13:54 +0100 Subject: [PATCH] add oxremark to ordersearch --- Controller/Admin/NavigationController.php | 2 +- README.md | 5 +++-- metadata.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Controller/Admin/NavigationController.php b/Controller/Admin/NavigationController.php index bce9582..bc903e2 100755 --- a/Controller/Admin/NavigationController.php +++ b/Controller/Admin/NavigationController.php @@ -137,7 +137,7 @@ protected function _getOxcomAdminSearchCmsPages() protected function _getOxcomAdminSearchOrders() { $sViewName = $this->_sViewNameGenerator->getViewName("oxorder"); - $sSql = "SELECT oxid, CONCAT(oxordernr, ' / ', oxbillfname, ' ', oxbilllname, ' / ', oxbillemail, ' / ', oxtrackcode) AS search FROM $sViewName WHERE CONCAT(oxordernr, oxbillfname, oxbilllname, oxbillemail, oxtrackcode) LIKE " . \OxidEsales\Eshop\Core\DatabaseProvider::getDb()->quote('%' . $this->_sQueryName . '%'); + $sSql = "SELECT oxid, CONCAT(oxordernr, ' / ', oxbillfname, ' ', oxbilllname, ' / ', oxbillemail, ' / ', oxtrackcode, ' / ', oxremark) AS search FROM $sViewName WHERE CONCAT(oxordernr, oxbillfname, oxbilllname, oxbillemail, oxtrackcode, oxremark) LIKE " . \OxidEsales\Eshop\Core\DatabaseProvider::getDb()->quote('%' . $this->_sQueryName . '%'); return $this->_getOxcomAdminSearchData($sSql, 'admin_order'); } diff --git a/README.md b/README.md index 6d4cf56..525fe8a 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,11 @@ composer require oxid-community/adminsearch # Changelog + 2020-02-21 1.2.0 add oxremark to ordersearch 2020-08-25 1.1.1 improve searches, fix ordersearch 2020-08-24 1.1.0 improve ordersearch (add oxtrackcode) - 2018-03-23 1.0.4 search companies - 2017-12-12 1.0.3 typo module title, fix module search + 2018-03-23 1.0.4 search companies + 2017-12-12 1.0.3 typo module title, fix module search 2017-12-10 1.0.2 fix search class using module settings 2017-12-09 1.0.1 add translation, fix article search oxartnum 2017-12-09 1.0.0 module release diff --git a/metadata.php b/metadata.php index d8b0a75..18718ad 100755 --- a/metadata.php +++ b/metadata.php @@ -22,7 +22,7 @@ 'de' => 'Globale Suche im Shop-Admin', 'en' => 'Global search shop admin' ], - 'version' => '1.0.4', + 'version' => '1.2.0', 'author' => 'OXID Community', 'url' => 'https://github.com/OXIDprojects/adminsearch', 'extend' => [