adminka updated
This commit is contained in:
parent
9cbe89fd22
commit
7e815b9c0b
@ -9,64 +9,69 @@
|
||||
use App\Models\Company\Details;
|
||||
use App\Models\Company\CompanyAdmin;
|
||||
use App\Models\Company\CompanyType;
|
||||
|
||||
class DetailsController extends Controller
|
||||
{
|
||||
public function index($companyId = null)
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$company = false;
|
||||
$userId = auth()->user()->id;
|
||||
$admin = CompanyAdmin::where('user_id', $userId)->get();
|
||||
if ($admin->count() == 1)
|
||||
if (!$companyId)
|
||||
{
|
||||
$userId = auth()->user()->id;
|
||||
$admin = CompanyAdmin::where('user_id', $userId);
|
||||
if ($admin->count() == 1)
|
||||
{
|
||||
$agent = $admin->first();
|
||||
$company = Company::find($agent->company_id);
|
||||
$agent = $admin->first();
|
||||
$company = Company::find($agent->company_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
abort(code: 401);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
abort(code: 401);
|
||||
}
|
||||
;
|
||||
{
|
||||
$company = Company::find($companyId);
|
||||
}
|
||||
|
||||
$details = new Details($company);
|
||||
$details = $details->details;
|
||||
if ($company->type == CompanyType::SelfEmployer || $company->type == CompanyType::SoleProperty)
|
||||
{
|
||||
{
|
||||
return view('company.details.selfemp', [
|
||||
'company' => $company,
|
||||
'details' => $details
|
||||
]);
|
||||
}
|
||||
}
|
||||
;
|
||||
if ($company->type == CompanyType::Agency)
|
||||
{
|
||||
{
|
||||
return view('company.details.agency', [
|
||||
'company' => $company,
|
||||
'details' => $details
|
||||
]);
|
||||
}
|
||||
;
|
||||
}
|
||||
;
|
||||
}
|
||||
public function store(Request $request, Company $company)
|
||||
{
|
||||
{
|
||||
$userId = auth()->user()->id;
|
||||
$admin = CompanyAdmin::where('user_id', $userId)->get();
|
||||
if ($admin->count() == 1)
|
||||
{
|
||||
{
|
||||
$agent = $admin->first();
|
||||
if ($agent->company_id != $company->id)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return back();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return back();
|
||||
}
|
||||
$company->details = $request->all();
|
||||
$company->save();
|
||||
return to_route('company.details', [
|
||||
'company' => $company
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
8
app/Models/Company/CompanyStatus.php
Normal file
8
app/Models/Company/CompanyStatus.php
Normal file
@ -0,0 +1,8 @@
|
||||
<?php
|
||||
namespace App\Models\Company;
|
||||
enum CompanyStatus: string
|
||||
{
|
||||
case STATUS_NEW = 'new';
|
||||
case STATUS_ACCEPTED = 'accepted';
|
||||
case STATUS_DECLINED = 'declined';
|
||||
}
|
||||
@ -9,14 +9,23 @@
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
use App\Models\Company\Company;
|
||||
use App\Models\Company\CompanyStatus;
|
||||
|
||||
class AdminCompaniesController extends Controller
|
||||
{
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
$companies = Company::orderBy('name')->get();
|
||||
$companies = Company::orderBy('name');
|
||||
//if ($request->filter) {
|
||||
if (!(!$request->filter || $request->filter == 'all'))
|
||||
{
|
||||
$companies->where('status', $request->filter);
|
||||
}
|
||||
$companies = $companies->get();
|
||||
return view('admin::companies.index', [
|
||||
'companies' => $companies
|
||||
'companies' => $companies,
|
||||
'statuses' => CompanyStatus::cases(),
|
||||
'filter' => $request->filter
|
||||
]);
|
||||
}
|
||||
public function edit(Company $company)
|
||||
|
||||
@ -12,7 +12,6 @@ class AdminComplexesController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
$complexes = Complex::orderBy('name');
|
||||
//if ($request->filter) {
|
||||
switch ( $request->filter )
|
||||
{
|
||||
case 'trashed':
|
||||
@ -33,7 +32,7 @@ public function index(Request $request)
|
||||
}
|
||||
public function edit(Complex $complex)
|
||||
{
|
||||
return view('admin::companies.edit', [
|
||||
return view('admin::complexes.edit', [
|
||||
'complex' => $complex,
|
||||
]);
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
@php($title = 'Города')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<h1>Города</h1>
|
||||
|
||||
<div class="d-flex mb-3">
|
||||
<form class="p-2 border rounded-3 border-1 bg-white" method="GET" action="{{ route('admin.cities') }}">
|
||||
<input type="radio" class="btn-check" name="filter" value="all" id="option_all" autocomplete="off"
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@php($title = 'Агентства')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 p-3">
|
||||
|
||||
@ -1,6 +1,26 @@
|
||||
@php($title = 'Агентства')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<div>
|
||||
<div class="d-flex mb-3">
|
||||
<form class="p-2 border rounded-3 border-1 bg-white" method="GET" action="{{ route('admin.companies') }}">
|
||||
<input type="radio" class="btn-check" name="filter" value="all" id="status_all" autocomplete="off"
|
||||
onclick="this.form.submit()" {{ $filter == 'all' || !$filter ? 'checked' : '' }}>
|
||||
<label class="btn p-2 fs-5" for="status_all">Все</label>
|
||||
@foreach ($statuses as $status)
|
||||
<input type="radio" class="btn-check" name="filter" value="{{ $status->value }}"
|
||||
id="status_{{ $status->value }}" autocomplete="off" onclick="this.form.submit()"
|
||||
{{ $filter == $status->value ? 'checked' : '' }}>
|
||||
<label class="btn p-2 fs-5"
|
||||
for="status_{{ $status->value }}">{{ __('Companies ' . $status->value) }}</label>
|
||||
@endforeach
|
||||
</form>
|
||||
<div class="ms-auto p-2">
|
||||
<!--<button class="btn btn-primary py-2 px-3 fs-5" data-bs-toggle="modal" data-bs-target="#createCityModal">
|
||||
<i class="bi bi-plus"></i> Добавить комплекс
|
||||
</button>-->
|
||||
</div>
|
||||
</div>
|
||||
@if ($companies->count() == 0)
|
||||
<div class="text-center py-5">Нет данных для отображения</div>
|
||||
@else
|
||||
@ -9,7 +29,9 @@
|
||||
<thead>
|
||||
<tr scope="col">
|
||||
<th>Название
|
||||
<th>
|
||||
<th>ИНН
|
||||
<th>Email
|
||||
<th>Статус
|
||||
<th>
|
||||
<th>
|
||||
</tr>
|
||||
@ -21,7 +43,13 @@
|
||||
{{ $company->name }}
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
|
||||
{{ $company->inn }}
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
{{ $company->email }}
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
{{ __('Status ' . $company->status) }}
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
|
||||
|
||||
77
app/Modules/Admin/Views/complexes/edit.blade.php
Normal file
77
app/Modules/Admin/Views/complexes/edit.blade.php
Normal file
@ -0,0 +1,77 @@
|
||||
@php($title = 'Жилые комплексы')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 p-3">
|
||||
<h4 class="fw-bold my-3">Жилой комплекс</h4>
|
||||
<form action="{{ route('admin.complexes.update', ['complex' => $complex]) }}" method="post"
|
||||
enctype="multipart/form-data">
|
||||
@csrf
|
||||
<div class="mb-3">
|
||||
<label for="nameFormControl" class="form-label">Название</label>
|
||||
<input type="text" class="form-control" id="nameFormControl" name="name" value="{{ $complex->name }}">
|
||||
@error('name')
|
||||
<div class="text-danger">{{ $message }}</div>
|
||||
@enderror
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="mb-3">
|
||||
<label for="emailFormControl" class="form-label">Email</label>
|
||||
<input type="text" class="form-control" id="emailFormControl" name="email"
|
||||
value="{{ $user->email }}">
|
||||
@error('email')
|
||||
<div class="text-danger">{{ $message }}</div>
|
||||
@enderror
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="phoneFormControl" class="form-label">телефон</label>
|
||||
<input type="text" class="form-control" id="phoneFormControl" name="phone"
|
||||
value="{{ $user->phone }}">
|
||||
@error('phone')
|
||||
<div class="text-danger">{{ $message }}</div>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Сохранить</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 mt-3 pb-3">
|
||||
<h4 class="fw-bold m-3">Роли пользователя</h4>
|
||||
<table class="table m-0">
|
||||
<thead>
|
||||
<tr scope="col">
|
||||
<th>Роль
|
||||
<th>Когда назначена
|
||||
<th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class=" ">
|
||||
@foreach ($userRoles as $userRole)
|
||||
<tr scope="row">
|
||||
<td class="align-middle">
|
||||
{{ __($userRole->role->name) }}
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
{{ $userRole->created_at->diffForHumans() }}
|
||||
</td>
|
||||
<td class="text-end">
|
||||
<div class="dropdown" style="">
|
||||
<button class="btn btn-light" type="button" id="dropdownMenuButton"
|
||||
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class="bi bi-three-dots-vertical"></i>
|
||||
</button>
|
||||
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
||||
<form method="post"
|
||||
action="{{ route('admin.users.role.delete', ['userRole' => $userRole]) }}">
|
||||
@csrf
|
||||
<button class="dropdown-item" type="submit">Удалить</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endsection
|
||||
@ -1,7 +1,6 @@
|
||||
@php($title = 'Жилые комплексы')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<h1>Жилые комплексы</h1>
|
||||
|
||||
<div class="d-flex mb-3">
|
||||
<form class="p-2 border rounded-3 border-1 bg-white" method="GET" action="{{ route('admin.complexes') }}">
|
||||
<input type="radio" class="btn-check" name="filter" value="all" id="option_all" autocomplete="off"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<div>
|
||||
@if (in_array($roles::SUPER_ADMIN, $userRoles))
|
||||
<ul class="nav flex flex-md-column ">
|
||||
<li>
|
||||
<ul class="nav flex flex-md-column">
|
||||
<li class="d-none d-md-block">
|
||||
<h6 class="dropdown-header text-uppercase">Основное</h6>
|
||||
</li>
|
||||
<li class="nav-item text-center m-2"><a
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@php($title = 'Вознаграждения')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<h1>Вознаграждения</h1>
|
||||
<div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 py-3">
|
||||
<table class="table m-0">
|
||||
<thead>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@php($title = 'Новости')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@php($title = 'Новости')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@php($title = 'Новости')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<form class="d-flex mb-3" method="GET" action="{{ route('company.agents.table') }}">
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
@php($title = 'Пользователи')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 p-3">
|
||||
|
||||
<h4 class="fw-bold my-3">Редактировать данные пользователя</h4>
|
||||
<form action="{{ route('admin.users.update', ['user' => $user]) }}" method="post" enctype="multipart/form-data">
|
||||
@csrf
|
||||
<div class="mb-3">
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
@php($title = 'Пользователи')
|
||||
@extends('layouts.admin')
|
||||
@section('content')
|
||||
<div>
|
||||
@ -19,9 +20,9 @@
|
||||
|
||||
<div class="ms-auto p-2">
|
||||
<!--<button type="button" class="btn btn-primary py-2 px-3 fs-5" data-bs-toggle="modal"
|
||||
data-bs-target="#createAgentModal">
|
||||
<i class="bi bi-person-plus"></i>
|
||||
</button>-->
|
||||
data-bs-target="#createAgentModal">
|
||||
<i class="bi bi-person-plus"></i>
|
||||
</button>-->
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
10
lang/ru.json
10
lang/ru.json
@ -40,5 +40,13 @@
|
||||
"Super admin": "Суперадмин",
|
||||
"Company admin": "Администратор агентства",
|
||||
"Agent": "Агент",
|
||||
"Client": "Клиент"
|
||||
"Client": "Клиент",
|
||||
"Status new": "Новый",
|
||||
"Status moderation": "Модерация",
|
||||
"Status accepted": "Одобрен",
|
||||
"Status declined": "Отклонен",
|
||||
"Companies new": "Новые",
|
||||
"Companies moderation": "На модерации",
|
||||
"Companies accepted": "Одобренные",
|
||||
"Companies declined": "Отклоненные"
|
||||
}
|
||||
@ -22,37 +22,32 @@
|
||||
<div id="app">
|
||||
<nav class="navbar navbar-expand-md bg-body-tertiary shadow-sm">
|
||||
<div class="container">
|
||||
<a class="navbar-brand">
|
||||
<img src={{ url('/images/logo.png') }} alt="Bootstrap" width="70">
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="col-auto col-sm-2 text-center">
|
||||
<a class="navbar-brand">
|
||||
<img src={{ url('/images/logo.png') }} alt="Logo" width="70">
|
||||
</a>
|
||||
</div>
|
||||
<div class="col px-0 px-md-4 text-start text-truncate fw-light fs-4 text-secondary text-uppercase"
|
||||
id="pageTitle">
|
||||
@isset($title)
|
||||
{{ $title }}
|
||||
@endisset
|
||||
</div>
|
||||
<div class="col-auto col-sm-2">
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="navbar-nav me-auto">
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="navbar-nav me-auto">
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<!-- Authentication Links -->
|
||||
@guest
|
||||
@if (Route::has('login'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if (Route::has('register'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
@else
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item dropdown">
|
||||
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button"
|
||||
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
|
||||
@ -75,8 +70,8 @@
|
||||
</form>
|
||||
</div>
|
||||
</li>
|
||||
@endguest
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@ -22,37 +22,31 @@
|
||||
<div id="app">
|
||||
<nav class="navbar navbar-expand-md bg-body-tertiary shadow-sm">
|
||||
<div class="container">
|
||||
<a class="navbar-brand">
|
||||
<img src={{ url('/images/logo.png') }} alt="Bootstrap" width="70">
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="col-auto col-sm-2 text-center">
|
||||
<a class="navbar-brand">
|
||||
<img src={{ url('/images/logo.png') }} alt="Logo" width="70">
|
||||
</a>
|
||||
</div>
|
||||
<div class="col px-0 px-md-4 text-start text-truncate fw-bold fs-4 text-secondary" id="pageTitle">
|
||||
@isset($title)
|
||||
{{ $title }}
|
||||
@endisset
|
||||
</div>
|
||||
<div class="col-auto col-sm-2">
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="navbar-nav me-auto">
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="navbar-nav me-auto">
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<!-- Authentication Links -->
|
||||
@guest
|
||||
@if (Route::has('login'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if (Route::has('register'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
@else
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item dropdown">
|
||||
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button"
|
||||
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
|
||||
@ -75,8 +69,8 @@
|
||||
</form>
|
||||
</div>
|
||||
</li>
|
||||
@endguest
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@ -40,7 +40,8 @@
|
||||
Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
|
||||
Route::get('/clients/table', [App\Http\Controllers\ClientsTableController::class, 'index'])->name('clients.table');
|
||||
Route::get('/contract/{contract}', [App\Http\Controllers\Deal\ContractController::class, 'index'])->name('contract');
|
||||
Route::get('/company/details/', [App\Http\Controllers\Company\DetailsController::class, 'index'])->name('company.details');
|
||||
Route::get('/company/details/{company?}', [App\Http\Controllers\Company\DetailsController::class, 'index'])->name('company.details');
|
||||
|
||||
Route::post('/company/{company}/details/', [App\Http\Controllers\Company\DetailsController::class, 'store'])->name('company.details.store');
|
||||
Route::get('/agents/table', [App\Http\Controllers\Company\AgentsTableController::class, 'index'])->name('company.agents.table');
|
||||
Route::post('/company/agents/store/', App\Http\Controllers\Company\CreateAgentController::class)->name('company.agents.store');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user