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
{{ $contactModel->email }}
+ {{ $contactModel->email }}
{{ $contactModel->lastname }}
+ {{ $contactModel->lastname }}
{{ $contactModel->firstname }}
+ {{ $contactModel->firstname }}
{{ $contactModel->phone }}
+ {{ $contactModel->phone }}