From 1ffcb2cfbf7e629980fbe1c7fa17e0b39e6f5ffc Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Thu, 8 Oct 2020 12:10:15 +0530 Subject: [PATCH] remove extra space --- packages/Webkul/Ui/src/DataGrid/DataGrid.php | 21 +------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index afc59de0f..3c0c005bc 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -478,11 +478,8 @@ abstract class DataGrid ); } } elseif ($columnType === 'boolean') { - if ($this->enableFilterMap && isset($this->filterMap[$columnName])) { - if ($this->operators[$condition] == '=') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -500,9 +497,7 @@ abstract class DataGrid )->orWhereNull($this->filterMap[$columnName]); }); } - } elseif ($this->operators[$condition] == '<>') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -520,7 +515,6 @@ abstract class DataGrid )->orWhereNotNull($this->filterMap[$columnName]); }); } - } else { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -530,11 +524,8 @@ abstract class DataGrid ); }); } - - } elseif ($this->enableFilterMap && ! isset($this->filterMap[$columnName])) { - + } elseif ($this->enableFilterMap && ! isset($this->filterMap[$columnName])) { if ($this->operators[$condition] == '=') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -552,9 +543,7 @@ abstract class DataGrid )->orWhereNull($this->filterMap[$columnName]); }); } - } elseif ($this->operators[$condition] == '<>') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -572,7 +561,6 @@ abstract class DataGrid )->orWhereNotNull($this->filterMap[$columnName]); }); } - } else { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -582,11 +570,8 @@ abstract class DataGrid ); }); } - } else { - if ($this->operators[$condition] == '=') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -604,9 +589,7 @@ abstract class DataGrid )->orWhereNull($this->filterMap[$columnName]); }); } - } elseif ($this->operators[$condition] == '<>') { - if ($filter_value == 1) { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -624,7 +607,6 @@ abstract class DataGrid )->orWhereNotNull($this->filterMap[$columnName]); }); } - } else { $collection->Where(function($query) use($columnName, $condition, $filter_value) { $query->where( @@ -634,7 +616,6 @@ abstract class DataGrid ); }); } - } } else { if ($this->enableFilterMap && isset($this->filterMap[$columnName])) {