diff --git a/app/Http/Controllers/Bo/ContactController.php b/app/Http/Controllers/Bo/ContactController.php index 355848c..9c4f9de 100644 --- a/app/Http/Controllers/Bo/ContactController.php +++ b/app/Http/Controllers/Bo/ContactController.php @@ -3,22 +3,26 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; +use App\Http\Requests\Bo\FilterCustomerRequest; +use App\Models\AppUser; use App\Models\Contact; -use Illuminate\Http\Request; +use Illuminate\Database\Eloquent\Builder; class ContactController extends Controller { /** * Display a listing of the resource. * - * @param \Illuminate\Http\Request $request + * @param \App\Http\Requests\Bo\FilterCustomerRequest $request * @return \Illuminate\Http\Response */ - public function index(Request $request) + public function index(FilterCustomerRequest $request) { /** @var \Illuminate\Database\Eloquent\Builder $query */ $query = Contact::query(); + $query->with('appUser'); + /** @var string $search Search field */ if ($request->search) { $this->searchQuery( @@ -35,9 +39,17 @@ class ContactController extends Controller /** Sort columns with a query */ $this->sortQuery($query); + if ($request->user) { + $query->whereHas('appUser', function (Builder $q) use ($request) { + $q->where('id', $request->user); + }); + } + $contactModelList = $this->paginate($query); - return view('bo.pages.contacts.index', compact('contactModelList', 'searchFields')); + $appUsers = AppUser::query()->select(['id', 'lastname', 'firstname'])->get(); + + return view('bo.pages.contacts.index', compact('contactModelList', 'searchFields', 'appUsers')); } /** @@ -48,6 +60,7 @@ class ContactController extends Controller */ public function show(Contact $contact) { + $contact->load('appUser.directories'); return \view('bo.pages.contacts.show', ['contactModel' => $contact]); } } diff --git a/app/Http/Requests/Bo/FilterCustomerRequest.php b/app/Http/Requests/Bo/FilterCustomerRequest.php new file mode 100644 index 0000000..cac1074 --- /dev/null +++ b/app/Http/Requests/Bo/FilterCustomerRequest.php @@ -0,0 +1,30 @@ +check(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'customer' => 'sometimes|nullable|numeric|exists:app_users,id' + ]; + } +} diff --git a/app/Models/AppUser.php b/app/Models/AppUser.php index 82dd48d..e479b05 100644 --- a/app/Models/AppUser.php +++ b/app/Models/AppUser.php @@ -15,7 +15,7 @@ use Kwaadpepper\Enum\Traits\CastsEnums; * @property string $firstname * @property string $email * @property string $password - * @property integer $role + * @property \App\Enums\AppUserRolesEnum $role * @property boolean $status * @property integer $order */ diff --git a/resources/views/bo/modules/search-bar.blade.php b/resources/views/bo/modules/search-bar.blade.php index 81b6fce..4c4cd49 100644 --- a/resources/views/bo/modules/search-bar.blade.php +++ b/resources/views/bo/modules/search-bar.blade.php @@ -1,57 +1,52 @@ -@php - $iArgs = []; - if(request()->sort_col) { - $iArgs['sort_col'] = request()->sort_col; - } - - if(request()->search) { - $iArgs['search'] = request()->sort_way; - } -@endphp
- @if(request()->sort_col) - + {{-- CONTACTS FILTER --}} + @if (request()->user) + @endif - @if(request()->sort_way) - + @if (request()->sort_col) + @endif - @if(request()->rangefilter) - + @if (request()->sort_way) + @endif - @if(request()->group) - + @if (request()->rangefilter) + @endif - + @if (request()->group) + + @endif + @if (request()->routeIs('bo.documents.*')) - + @endif - - @push('scripts') - + @endpush
diff --git a/resources/views/bo/pages/app-users/card.blade.php b/resources/views/bo/pages/app-users/card.blade.php new file mode 100644 index 0000000..b2a95d7 --- /dev/null +++ b/resources/views/bo/pages/app-users/card.blade.php @@ -0,0 +1,17 @@ +
+
+
+ +
+
{{ __('Dossiers accessibles') }}
+ +
+
+
+
diff --git a/resources/views/bo/pages/contacts/form.blade.php b/resources/views/bo/pages/contacts/form.blade.php deleted file mode 100644 index 678b637..0000000 --- a/resources/views/bo/pages/contacts/form.blade.php +++ /dev/null @@ -1,70 +0,0 @@ -
- {{-- TITLE --}} -
-
- {{ __('Informations générales') }} - @php - $data = [ - 'id' => 'document', - 'documents' => $documents, - 'directories' => $directories, - 'model' => $documentModel ?? null, - 'languages' => \App\Enums\Documents\LangEnum::toArray(), - 'csrf' => csrf_token(), - ]; - @endphp -
-
-
- {{-- TAGS --}} -
-
- {{ __('Étiquettes') }} -
-
- @include('bo.partials.inputs.pivot-belongs-to-many', [ - 'id' => 'app_userAuthorizedFolders', - 'name' => 'tags', - 'label' => __('Étiquettes associées'), - 'model' => $documentModel ?? null, - 'itemsList' => $tags, - 'itemLimit' => [0,5], - 'placeholder' => __('Recherchez une étiquette'), - 'helper' => __('Sélectionner des étiquettes parmis la liste (0 minimum et 5 maximum).'), - ]) -
-
-
-
- {{-- STATUS --}} -
-
- {{ __('Publication') }} -
-
- @include('bo.partials.inputs.boolean-switch', [ - 'id' => 'documentStatus', - 'name' => 'status', - 'label' => __('État de publication'), - 'model' => $documentModel ?? null, - 'helper' => __('Le document est publié ou non.') - ]) -
-
-
-
-
- -@push('scripts') - -@endpush diff --git a/resources/views/bo/pages/contacts/index-list.blade.php b/resources/views/bo/pages/contacts/index-list.blade.php index bf105f3..5bc80e6 100644 --- a/resources/views/bo/pages/contacts/index-list.blade.php +++ b/resources/views/bo/pages/contacts/index-list.blade.php @@ -3,9 +3,10 @@ @php $cols = [ + 'lastname' => __('Nom'), 'email' => __('Email'), 'phone' => __('Téléphone'), - 'lastname' => __('Nom'), + 'app_user_id' => __('Commercial'), 'updated_at' => __('Mis à jour'), ]; @endphp @@ -18,15 +19,18 @@ @if ($contactModelList->count()) @foreach ($contactModelList as $contactModel) - - {{ $contactModel->email }} - - - {{ $contactModel->phone }} - {{ $contactModel->lastname }} {{ $contactModel->firsname }} + + {{ $contactModel->email }} + + + {{ $contactModel->phone }} + + + {{ $contactModel->appUser->lastname }} {{ $contactModel->appUser->firstname }} + {{ $contactModel->updated_at->isoFormat('\L\e DD/MM/YYYY \à HH:mm') }} diff --git a/resources/views/bo/pages/contacts/index.blade.php b/resources/views/bo/pages/contacts/index.blade.php index 44df76f..67ae7b6 100644 --- a/resources/views/bo/pages/contacts/index.blade.php +++ b/resources/views/bo/pages/contacts/index.blade.php @@ -18,7 +18,33 @@
- +
+ + + +
+ @push('scripts') + + @endpush
diff --git a/resources/views/bo/pages/contacts/show.blade.php b/resources/views/bo/pages/contacts/show.blade.php index 88e16e9..7706384 100644 --- a/resources/views/bo/pages/contacts/show.blade.php +++ b/resources/views/bo/pages/contacts/show.blade.php @@ -40,12 +40,35 @@ {{ $contactModel->updated_at->isoFormat('DD/MM/YYYY \à HH:mm') }} + {{-- COMMERCIAL --}} +
+
{{ __('Commercial') }}
+
+
+
+
+ +
+
+
+ @include('bo.pages.app-users.card', ['appUser' => $contactModel->appUser]) +
+
+
+
+
+
{{-- EMAIL --}}
{{ __('Email') }} ({{ __('obligatoire') }})
-
{{ $contactModel->email }}
+
{{ $contactModel->email }}
{{-- LASTNAME --}} @@ -53,7 +76,7 @@
{{ __('Nom') }} ({{ __('obligatoire') }})
-
{{ $contactModel->lastname }}
+
{{ $contactModel->lastname }}
{{-- FIRSTNAME --}} @@ -61,14 +84,14 @@
{{ __('Prénom') }} ({{ __('obligatoire') }})
-
{{ $contactModel->firstname }}
+
{{ $contactModel->firstname }}
{{-- PHONE --}}
{{ __('Téléphone') }}
-
{{ $contactModel->phone }}
+
{{ $contactModel->phone }}
{{-- NOTES --}}