|
|
@@ -129,27 +129,34 @@ class Controller extends BaseController
|
|
|
foreach ($request->filters as $filterName => $filterValue) {
|
|
|
if(!$filterValue) continue;
|
|
|
|
|
|
- if(Str::contains($filterName, 'price')) {
|
|
|
- $filterValue = $filterValue * 100;
|
|
|
- }
|
|
|
-
|
|
|
- if(Str::endsWith($filterName, '_from')) {
|
|
|
- if(is_string($filterValue) && DateHelper::isDate($filterValue)) {
|
|
|
- $filterValue .= ' 00:00:00';
|
|
|
- }
|
|
|
- $query->where(Str::replace('_from', '', $filterName), '>=', $filterValue);
|
|
|
- } elseif(Str::endsWith($filterName, '_to')) {
|
|
|
- if(is_string($filterValue) && DateHelper::isDate($filterValue)) {
|
|
|
- $filterValue .= ' 23:59:59';
|
|
|
- }
|
|
|
- $query->where(Str::replace('_to', '', $filterName), '<=', $filterValue);
|
|
|
+ if(Str::contains($filterName, '||')) {
|
|
|
+ $values = explode('||', $filterValue);
|
|
|
+ $query->whereIn($filterName, $values);
|
|
|
} else {
|
|
|
- if($filterValue == '-пусто-') {
|
|
|
- $query->whereNull($filterName);
|
|
|
- } else {
|
|
|
- $query->where($filterName, '=', $filterValue);
|
|
|
- }
|
|
|
+ $query->where($filterName, $filterValue);
|
|
|
}
|
|
|
+
|
|
|
+// if(Str::contains($filterName, 'price')) {
|
|
|
+// $filterValue = $filterValue * 100;
|
|
|
+// }
|
|
|
+//
|
|
|
+// if(Str::endsWith($filterName, '_from')) {
|
|
|
+// if(is_string($filterValue) && DateHelper::isDate($filterValue)) {
|
|
|
+// $filterValue .= ' 00:00:00';
|
|
|
+// }
|
|
|
+// $query->where(Str::replace('_from', '', $filterName), '>=', $filterValue);
|
|
|
+// } elseif(Str::endsWith($filterName, '_to')) {
|
|
|
+// if(is_string($filterValue) && DateHelper::isDate($filterValue)) {
|
|
|
+// $filterValue .= ' 23:59:59';
|
|
|
+// }
|
|
|
+// $query->where(Str::replace('_to', '', $filterName), '<=', $filterValue);
|
|
|
+// } else {
|
|
|
+// if($filterValue == '-пусто-') {
|
|
|
+// $query->whereNull($filterName);
|
|
|
+// } else {
|
|
|
+// $query->where($filterName, '=', $filterValue);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
}
|