Between filter (#745)

* added between filter * between filter
andersao · Jan 8, 2021 · d4cd5af · d4cd5af
1 parent a1a2e20
commit d4cd5af
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/Prettus/Repository/Criteria/RequestCriteria.php b/src/Prettus/Repository/Criteria/RequestCriteria.php
@@ -74,7 +74,7 @@ public function apply($model, RepositoryInterface $repository)
                     if (isset($searchData[$field])) {
                         $value = ($condition == "like" || $condition == "ilike") ? "%{$searchData[$field]}%" : $searchData[$field];
                     } else {
-                        if (!is_null($search) && $condition !== 'in') {
+                        if (!is_null($search) && !in_array($condition,['in','between'])) {
                             $value = ($condition == "like" || $condition == "ilike") ? "%{$search}%" : $search;
                         }
                     }
@@ -91,20 +91,30 @@ public function apply($model, RepositoryInterface $repository)
                             $value = null;
                         }
                     }
+                    if($condition === 'between'){
+                        $value = explode(',',$value);
+                        if(count($value) < 2){
+                            $value = null;
+                        }
+                    }
                     $modelTableName = $query->getModel()->getTable();
                     if ( $isFirstField || $modelForceAndWhere ) {
                         if (!is_null($value)) {
                             if(!is_null($relation)) {
                                 $query->whereHas($relation, function($query) use($field,$condition,$value) {
                                     if($condition === 'in'){
                                         $query->whereIn($field,$value);
+                                    }elseif($condition === 'between'){
+                                        $query->whereBetween($field,$value);
                                     }else{
                                         $query->where($field,$condition,$value);
                                     }
                                 });
                             } else {
                                 if($condition === 'in'){
                                     $query->whereIn($modelTableName.'.'.$field,$value);
+                                }elseif($condition === 'between'){
+                                    $query->whereBetween($modelTableName.'.'.$field,$value);
                                 }else{
                                     $query->where($modelTableName.'.'.$field,$condition,$value);
                                 }
@@ -117,13 +127,17 @@ public function apply($model, RepositoryInterface $repository)
                                 $query->orWhereHas($relation, function($query) use($field,$condition,$value) {
                                     if($condition === 'in'){
                                         $query->whereIn($field,$value);
+                                    }elseif($condition === 'between'){
+                                        $query->whereBetween($field, $value);
                                     }else{
                                         $query->where($field,$condition,$value);
                                     }
                                 });
                             } else {
                                 if($condition === 'in'){
                                     $query->orWhereIn($modelTableName.'.'.$field, $value);
+                                }elseif($condition === 'between'){
+                                    $query->whereBetween($modelTableName.'.'.$field,$value);
                                 }else{
                                     $query->orWhere($modelTableName.'.'.$field, $condition, $value);
                                 }