From 408beeb2af895eda68845a873fb4200dd13fd3b3 Mon Sep 17 00:00:00 2001 From: Navid Sedehi Date: Sat, 3 Feb 2018 18:27:18 +0330 Subject: [PATCH] Update Filterable.php --- src/Filterable.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Filterable.php b/src/Filterable.php index 11099d0..a1f38cf 100644 --- a/src/Filterable.php +++ b/src/Filterable.php @@ -57,13 +57,13 @@ private function mktime(){ } } - private function convertDate($date){ + private function convertDate($date, $last = false){ $mktimeFunction = $this->mktime(); $dateTime = []; - $dateTime[3] = '0'; - $dateTime[4] = '0'; - $dateTime[5] = '0'; + $dateTime[3] = ($last) ? '23' : '0'; + $dateTime[4] = ($last) ? '59' : '0'; + $dateTime[5] = ($last) ? '59' : '0'; $dateTime = array_merge(explode(config('filterable.date_divider'), $date), $dateTime); $formats = ['d' => 0, 'm' => 1, 'y' => 2, 'h' => 3, 'i' => 4, 's' => 5]; if(count($dateTime) == 6) { @@ -131,7 +131,7 @@ private function clauseBetween($query, $key, $value){ foreach($value['between'] as $vBetween) { if(request()->has($vBetween) && !is_null(request($vBetween))) { if(in_array($key, $dates)) { - $betweenValue[] = $this->convertDate(request()->get($vBetween)); + $betweenValue[] = $this->convertDate(request()->get($vBetween), (last($value['between']) == $vBetween) ? true : false); }else { $betweenValue[] = request()->get($vBetween); }