From 467cf07a9acecc6373257f648260146239340c57 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 4 Apr 2023 02:16:43 +0200 Subject: [PATCH 1/2] Fixed price filter --- .../Block/Widget/Grid/Column/Filter/Price.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php index 80e54946f81..7b7f390476b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php @@ -115,14 +115,11 @@ public function getCondition() } $rate = $this->_getRate($displayCurrency, $this->getColumn()->getCurrencyCode()); - if (isset($value['from'])) { - $from = $value['from'] * $rate; - $value['from'] = sprintf('%F', $from); - } - - if (isset($value['to'])) { - $to = $value['to'] * $rate; - $value['to'] = sprintf('%F', $to); + foreach (['from', 'to'] as $key) { + if (isset($value[$key]) && is_numeric($value[$key])) { + $result = $value[$key] * $rate; + $value[$key] = sprintf('%F', $result); + } } $this->prepareRates($displayCurrency); From 4169f574d0c357703b059fe671a720fb53b9621a Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 4 Apr 2023 02:47:03 +0200 Subject: [PATCH 2/2] Save one line --- .../Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php index 7b7f390476b..b381b917c57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php @@ -117,8 +117,7 @@ public function getCondition() foreach (['from', 'to'] as $key) { if (isset($value[$key]) && is_numeric($value[$key])) { - $result = $value[$key] * $rate; - $value[$key] = sprintf('%F', $result); + $value[$key] = sprintf('%F', $value[$key] * $rate); } }