diff --git a/app/Services/DataTable/Filter/SearchFunctions/FilterBetween.php b/app/Services/DataTable/Filter/SearchFunctions/FilterBetween.php index 7b91d5e6..7a6292da 100644 --- a/app/Services/DataTable/Filter/SearchFunctions/FilterBetween.php +++ b/app/Services/DataTable/Filter/SearchFunctions/FilterBetween.php @@ -13,11 +13,17 @@ class FilterBetween extends SearchFilter [$minVal, $maxVal] = $this->filter->getValue(); if ($minVal) { + if ($this->filter->getDatatype() == "date") { + $minVal = $minVal . " 00:00:00"; + } $this->filter->setValue($minVal); $query = (new FilterGreaterThanOrEqual($this->query, $this->filter))->apply(); } if ($maxVal) { + if ($this->filter->getDatatype() == "date") { + $maxVal = $maxVal . " 23:59:59"; + } $this->filter->setValue($maxVal); $query = (new FilterLessThanOrEqual($this->query, $this->filter))->apply(); }