diff --git a/app/Http/Controllers/Admin/EmployersController.php b/app/Http/Controllers/Admin/EmployersController.php index 103414d..f982df8 100644 --- a/app/Http/Controllers/Admin/EmployersController.php +++ b/app/Http/Controllers/Admin/EmployersController.php @@ -25,7 +25,8 @@ class EmployersController extends Controller $user->update($request->all()); } - $users = User::with('employers')->select(['users.*','users.id as usr_id', 'emp.id as emp_id', 'emp.*'])->join('employers as emp','emp.user_id','users.id') + $users = User::with('employers')->select(['users.*','users.id as usr_id', 'emp.id as emp_id', 'emp.logo as emp_logo', 'emp.*']) + ->join('employers as emp','emp.user_id','users.id') ->where('users.is_worker', '0')->Realuser(); $all_employer = $users->count(); diff --git a/resources/views/admin/employer/edit.blade.php b/resources/views/admin/employer/edit.blade.php index 3bb743c..ba50eab 100644 --- a/resources/views/admin/employer/edit.blade.php +++ b/resources/views/admin/employer/edit.blade.php @@ -92,9 +92,9 @@ @endisset @error('logo') - - {{ $message }} - + + {{ $message }} + @enderror
diff --git a/resources/views/admin/employer/index.blade.php b/resources/views/admin/employer/index.blade.php index 2fb5a36..b8fc7c7 100644 --- a/resources/views/admin/employer/index.blade.php +++ b/resources/views/admin/employer/index.blade.php @@ -41,7 +41,7 @@ btns.forEach(btn => { btn.addEventListener('click', (e) => { console.log('click button'); - const id = e.target.id; + let id = e.target.id; let form = document.getElementById("form_modal_del"); form.action = "/delete/"+e.target.getAttribute('data-employer')+'/'+e.target.getAttribute('data-user'); //document.getElementById("title_modal").innerHTML = id; @@ -112,8 +112,9 @@ {{$user->name}} - @if (isset($user->employers[0]->logo) && ($user->employers[0]->logo)) - + + @if (isset($user->emp_logo) && ($user->emp_logo)) + @else - @endif @@ -141,7 +142,7 @@ @if (!empty($user->comment_admin)) - Есть + Есть @else Нет @endif