Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Андрей Ларионов
2 parents 9f8d2d518d 7c475b9ed2
Showing 1 changed file Side-by-side Diff
app/Http/Controllers/MainController.php
@@ -188,14 +188,16 @@ class MainController extends Controller
        else
            $job_search = $request->get('job');
  
-       $Query = Ad_employer::with('jobs')->
-                             with('cat')->
-                             with('employer')->
-                             whereHas('jobs_code', function ($query) use ($job_search) {
-                                   if (!empty($job_search)) {
-                                       $query->where('job_title_id', $job_search);
-                                   }
-                            })->select('ad_employers.*');
+       $Query = Ad_employer::with('jobs')
+           ->with('cat')
+           ->with('employer')
+           ->where('is_remove', 0)
+           ->whereHas('jobs_code', function ($query) use ($job_search) {
+               if (!empty($job_search)) {
+                   $query->where('job_title_id', $job_search);
+               }
+           })
+           ->select('ad_employers.*');
  
        if (isset($categories->id) && ($categories->id > 0)) {
            $Query = $Query->where('category_id', '=', $categories->id);
...	...	@@ -188,14 +188,16 @@ class MainController extends Controller
188	188	else
189	189	$job_search = $request->get('job');
190	190
191		- $Query = Ad_employer::with('jobs')->
192		- with('cat')->
193		- with('employer')->
194		- whereHas('jobs_code', function ($query) use ($job_search) {
195		- if (!empty($job_search)) {
196		- $query->where('job_title_id', $job_search);
197		- }
198		- })->select('ad_employers.*');
	191	+ $Query = Ad_employer::with('jobs')
	192	+ ->with('cat')
	193	+ ->with('employer')
	194	+ ->where('is_remove', 0)
	195	+ ->whereHas('jobs_code', function ($query) use ($job_search) {
	196	+ if (!empty($job_search)) {
	197	+ $query->where('job_title_id', $job_search);
	198	+ }
	199	+ })
	200	+ ->select('ad_employers.*');
199	201
200	202	if (isset($categories->id) && ($categories->id > 0)) {
201	203	$Query = $Query->where('category_id', '=', $categories->id);