diff --git a/app/Http/Controllers/Bo/ActivityLogsController.php b/app/Http/Controllers/Bo/ActivityLogsController.php index a88b9ef..5591797 100644 --- a/app/Http/Controllers/Bo/ActivityLogsController.php +++ b/app/Http/Controllers/Bo/ActivityLogsController.php @@ -51,7 +51,7 @@ class ActivityLogsController extends Controller $this->sortQuery($query); /** Custom pagination */ - $activitylogModels = $this->paginate($query); + $activitylogModels = $query->paginate($this->getPagination()); return view('bo.pages.activity_logs.index', compact('activitylogModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/AnswerController.php b/app/Http/Controllers/Bo/AnswerController.php index 46818e2..e93a74f 100644 --- a/app/Http/Controllers/Bo/AnswerController.php +++ b/app/Http/Controllers/Bo/AnswerController.php @@ -32,22 +32,22 @@ class AnswerController extends Controller /** @var \App\Models\Question $questionModel */ $questionModel = $request->question; - /** @var \Illuminate\Database\Eloquent\Builder $answers */ - $answers = Answer::query()->where('question_id', $questionModel->id); + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = Answer::query()->where('question_id', $questionModel->id); if ($request->search) { $this->searchQuery( - $answers, + $query, $request->search, null, 'answer', ); } - $this->sortQuery($answers); + $this->sortQuery($query); $searchFields = trans('Réponse'); - $answerModels = $this->paginate($answers); + $answerModels = $this->paginate($this->getPagination()); return view('bo.pages.answers.index', compact('answerModels', 'questionModel', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/BrandController.php b/app/Http/Controllers/Bo/BrandController.php index f55343b..2ccbe38 100644 --- a/app/Http/Controllers/Bo/BrandController.php +++ b/app/Http/Controllers/Bo/BrandController.php @@ -50,7 +50,7 @@ class BrandController extends Controller $q->where('opt_in', true); }]); - $brandModels = $this->paginate($query); + $brandModels = $query->paginate($this->getPagination()); return view('bo.pages.brands.index', compact('brandModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimController.php b/app/Http/Controllers/Bo/ClaimController.php index b405b9b..a6586bc 100644 --- a/app/Http/Controllers/Bo/ClaimController.php +++ b/app/Http/Controllers/Bo/ClaimController.php @@ -45,8 +45,8 @@ class ClaimController extends Controller /** @var \App\Models\User $userModel */ $userModel = auth('backend')->user(); - /** @var \Illuminate\Database\Eloquent\Builder $claimModels */ - $claimModels = Claim::query() + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = Claim::query() ->when( $request->filled('brand'), fn($q) => $q->whereHas('brand', fn($q) => $q->where('id', $request->brand)) @@ -59,7 +59,7 @@ class ClaimController extends Controller $search = $request->search; if ($search) { $this->searchQuery( - $claimModels, + $query, $search, null, 'reference', @@ -76,10 +76,10 @@ class ClaimController extends Controller ]); /** Sort columns with a query */ - $this->sortQuery($claimModels); + $this->sortQuery($query); /** Custom pagination */ - $claimModels = $this->paginate($claimModels); + $claimModels = $query->simplePaginate($this->getPagination()); return view('bo.pages.claims.index', compact('claimModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimMailTemplateController.php b/app/Http/Controllers/Bo/ClaimMailTemplateController.php index 6dc0571..a79bc7c 100644 --- a/app/Http/Controllers/Bo/ClaimMailTemplateController.php +++ b/app/Http/Controllers/Bo/ClaimMailTemplateController.php @@ -55,7 +55,7 @@ class ClaimMailTemplateController extends Controller $this->sortQuery($query); $searchFields = trans('validation.custom.label'); - $claimMailTemplateModels = $this->paginate($query); + $claimMailTemplateModels = $query->paginate($this->getPagination()); return view('bo.pages.claim_mail_templates.index', compact('claimMailTemplateModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimSubjectController.php b/app/Http/Controllers/Bo/ClaimSubjectController.php index 9a0c0d6..d4355c2 100644 --- a/app/Http/Controllers/Bo/ClaimSubjectController.php +++ b/app/Http/Controllers/Bo/ClaimSubjectController.php @@ -47,7 +47,7 @@ class ClaimSubjectController extends Controller $this->sortQuery($query); $searchFields = trans('validation.custom.label'); - $claimSubjectModels = $this->paginate($query); + $claimSubjectModels = $query->paginate($this->getPagination()); return view('bo.pages.claim_subjects.index', compact('claimSubjectModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/CustomerController.php b/app/Http/Controllers/Bo/CustomerController.php index a211f67..edaf4e3 100644 --- a/app/Http/Controllers/Bo/CustomerController.php +++ b/app/Http/Controllers/Bo/CustomerController.php @@ -42,10 +42,11 @@ class CustomerController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - $modelClass = Customer::class; - $modelTable = (new Customer())->getTable(); - $brands = Brand::select('id', 'name')->get(); - $columns = ['customer_infos.lastname', 'customer_infos.firstname']; + $modelClass = Customer::class; + $modelTable = (new Customer())->getTable(); + $questionModels = null; + $answerModels = null; + $searchFields = trans('Email, Prénom, Nom'); // Reset session sorts. if ($request->rstSrts) { @@ -56,27 +57,26 @@ class CustomerController extends Controller $this->resetSessionFilters($modelTable); } - $query = $this->buildCustomerQuery(); + if ($request->filled('search') || Session::get("crud.$modelTable.search")) { + $columns = ['customer_infos.lastname', 'customer_infos.firstname']; + $query = $this->buildCustomerQuery(); - // Apply filters. - $questionModels = null; - $answerModels = null; - $this->applyBrandFilter($request, $query, $modelTable, $questionModels, $answerModels); - $this->applySearchFilter($request, $query, $modelTable, $columns); - $this->applySort($request, $query, $modelTable); + // Apply filters. + $this->applyBrandFilter($request, $query, $modelTable, $questionModels, $answerModels); + $this->applySearchFilter($request, $query, $modelTable, $columns); + $this->applySort($request, $query, $modelTable); - $customerModels = $this->paginate($query->with(['customer', 'brand'])); - $searchFields = trans('Email, Prénom, Nom'); + $customerModels = $query->with(['customer', 'brand'])->simplePaginate($this->getPagination()); + } //end if - return view('bo.pages.customers.index', compact( - 'modelClass', - 'modelTable', - 'customerModels', - 'brands', - 'searchFields', - 'questionModels', - 'answerModels', - )); + return view('bo.pages.customers.index', [ + 'modelClass' => $modelClass, + 'modelTable' => $modelTable, + 'customerModels' => $customerModels ?? collect(), + 'searchFields' => $searchFields, + 'questionModels' => $questionModels, + 'answerModels' => $answerModels, + ]); } /** @@ -330,34 +330,35 @@ class CustomerController extends Controller ?Collection &$questionModels, ?Collection &$answerModels ): void { - if ($request->filled('brand') || Session::has("crud.$table.brand")) { - $brand = $request->brand ?? Session::get("crud.$table.brand"); - Session::put("crud.$table.brand", $brand); - $query->where('customer_infos.brand_id', $brand); + $brand = $request->brand ?? Session::get("crud.$table.brand"); + if (!(int) $brand) { + return; + } + Session::put("crud.$table.brand", $brand); + $query->where('customer_infos.brand_id', $brand); - $questionModels = Question::getAllModelsFromBrand($brand); + $questionModels = Question::getAllModelsFromBrand($brand); - if (($request->filled('question') || Session::has("crud.$table.question")) && $questionModels->count()) { - $question = $request->question ?? Session::get("crud.$table.question"); - Session::put("crud.$table.question", $question); + if (($request->filled('question') || Session::has("crud.$table.question")) && $questionModels->count()) { + $question = $request->question ?? Session::get("crud.$table.question"); + Session::put("crud.$table.question", $question); - $answerModels = Answer::getAllAnswersFromQuestion($question); - $questionAnswers = Question::find($question)?->answers->modelKeys() ?? []; + $answerModels = Answer::getAllAnswersFromQuestion($question); + $questionAnswers = Question::find($question)?->answers->modelKeys() ?? []; - $query->whereHas('customer.answers', fn($q) => $q->whereIn('answer_id', $questionAnswers)); + $query->whereHas('customer.answers', fn($q) => $q->whereIn('answer_id', $questionAnswers)); - if ( - ($request->filled('answer') || Session::has("crud.$table.answer")) - && $questionModels->count() - && $answerModels->count() - ) { - $answer = $request->answer ?? Session::get("crud.$table.answer"); - Session::put("crud.$table.answer", $answer); + if ( + ($request->filled('answer') || Session::has("crud.$table.answer")) + && $questionModels->count() + && $answerModels->count() + ) { + $answer = $request->answer ?? Session::get("crud.$table.answer"); + Session::put("crud.$table.answer", $answer); - $query->whereHas('customer.answers', fn($q) => $q->whereKey($answer)); - } + $query->whereHas('customer.answers', fn($q) => $q->whereKey($answer)); } - } //end if + } } /** @@ -371,19 +372,17 @@ class CustomerController extends Controller */ private function applySearchFilter(Request $request, Builder &$query, string $table, array $columns): void { - if ($request->filled('search') || Session::has("crud.$table.search")) { - $search = $request->search ?? Session::get("crud.$table.search"); - Session::put("crud.$table.search", $search); + $search = $request->search ?? Session::get("crud.$table.search"); + Session::put("crud.$table.search", $search); - $query->where(function ($q) use ($columns, $search) { - foreach ($columns as $column) { - $q->orWhere($column, 'LIKE', "%$search%"); - } + $query->where(function ($q) use ($columns, $search) { + foreach ($columns as $column) { + $q->orWhere($column, 'LIKE', "%$search%"); + } - $q->orWhere('customers.email', 'LIKE', "%$search%") - ->orWhere('customer_logins.last_connection', 'LIKE', "%$search%"); - }); - } + $q->orWhere('customers.email', 'LIKE', "%$search%") + ->orWhere('customer_logins.last_connection', 'LIKE', "%$search%"); + }); } /** diff --git a/app/Http/Controllers/Bo/QuestionController.php b/app/Http/Controllers/Bo/QuestionController.php index 184ccc6..9c82fcd 100644 --- a/app/Http/Controllers/Bo/QuestionController.php +++ b/app/Http/Controllers/Bo/QuestionController.php @@ -55,7 +55,7 @@ class QuestionController extends Controller $query->with(['brand', 'answers']); /** @var \Illuminate\Pagination\AbstractPaginator */ - $questionModels = $this->paginate($query); + $questionModels = $query->paginate($this->getPagination()); return view('bo.pages.questions.index', compact('questionModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ServiceController.php b/app/Http/Controllers/Bo/ServiceController.php index dcf47da..a1e1245 100644 --- a/app/Http/Controllers/Bo/ServiceController.php +++ b/app/Http/Controllers/Bo/ServiceController.php @@ -54,7 +54,7 @@ class ServiceController extends Controller $query->with(['brand']); - $serviceModels = $this->paginate($query); + $serviceModels = $query->paginate($this->getPagination()); return view('bo.pages.services.index', compact('serviceModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/SingleOptinController.php b/app/Http/Controllers/Bo/SingleOptinController.php index 59b75db..4cd0a3a 100644 --- a/app/Http/Controllers/Bo/SingleOptinController.php +++ b/app/Http/Controllers/Bo/SingleOptinController.php @@ -29,20 +29,23 @@ class SingleOptinController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - $query = SingleOptin::query(); $questionModels = null; $answerModels = null; + $searchFields = trans('E-mail'); - $this->applyBrandAndAnswerFilters($request, $query, $questionModels, $answerModels); - $this->applySearch($request, $query); - $this->sortQuery($query); + if ($request->filled('search')) { + $query = SingleOptin::query(); - $query->with('brand'); - $singleoptinModels = $this->paginate($query); - $searchFields = trans('E-mail'); + $this->applyBrandAndAnswerFilters($request, $query, $questionModels, $answerModels); + $this->applySearch($request, $query); + $this->sortQuery($query); + + $query->with('brand'); + $singleoptinModels = $query->simplePaginate($this->getPagination()); + } return view('bo.pages.singleoptins.index', [ - 'singleoptinModels' => $singleoptinModels, + 'singleoptinModels' => $singleoptinModels ?? collect(), 'searchFields' => $searchFields, 'questionModels' => $questionModels, 'answerModels' => $answerModels, @@ -88,7 +91,7 @@ class SingleOptinController extends Controller ?Collection &$questionModels, ?Collection &$answerModels ): void { - if (!$request->filled('brand')) { + if (!$request->filled('brand') || !(int) $request->brand) { return; } diff --git a/app/Http/Controllers/Bo/UserController.php b/app/Http/Controllers/Bo/UserController.php index 28f3722..d0d2ffa 100644 --- a/app/Http/Controllers/Bo/UserController.php +++ b/app/Http/Controllers/Bo/UserController.php @@ -33,14 +33,14 @@ class UserController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - /** @var \Illuminate\Database\Eloquent\Builder $userModels */ - $userModels = User::query(); + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = User::query(); /** @var string $search Search field */ $search = $request->search; if ($search) { $this->searchQuery( - $userModels, + $query, $search, null, 'first_name', @@ -57,10 +57,10 @@ class UserController extends Controller ]); /** Sort columns with a query */ - $this->sortQuery($userModels); + $this->sortQuery($query); /** Custom pagination */ - $userModels = $this->paginate($userModels); + $userModels = $query->paginate($this->getPagination()); return view('bo.pages.users.index', compact('userModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index cb0a5bf..d9d2e5b 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -189,16 +189,13 @@ class Controller extends BaseController } /** - * Customize pagination with cache or config (default). + * Get the number of items per page. * - * @param \Illuminate\Database\Eloquent\Builder $query * @param \App\Enums\Pagination\ItemsPerPaginationEnum|null $pagination - * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator + * @return integer */ - protected function paginate( - Builder $query, - ItemsPerPaginationEnum $pagination = null - ): \Illuminate\Contracts\Pagination\LengthAwarePaginator { + protected function getPagination(ItemsPerPaginationEnum $pagination = null): int + { $currentRoutePath = Str::slug(request()->route()->getName()); $cacheKey = "pagination.{$currentRoutePath}"; $pagination = $pagination ?? ItemsPerPaginationEnum::twelve; @@ -210,8 +207,7 @@ class Controller extends BaseController if (Cache::get($cacheKey) !== $pagination) { Cache::put($cacheKey, $pagination); } - $query = $query->paginate($pagination); - return $query; + return $pagination; } /** diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index aa4ffb7..87a5180 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -32,7 +32,8 @@ class ViewServiceProvider extends ServiceProvider // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) // Early boot, request wont be filled as expected. if (collect(explode('/', \request()->getPathInfo()))->get(1) === 'bo') { - Paginator::defaultView('bo.modules.pagination'); + Paginator::defaultView('bo.modules.pagination.default'); + Paginator::defaultSimpleView('bo.modules.pagination.simple'); } else { Paginator::useBootstrapFive(); } diff --git a/resources/ts/bo/pages/search-bar.ts b/resources/ts/bo/pages/search-bar.ts index f554cdc..4e9685c 100644 --- a/resources/ts/bo/pages/search-bar.ts +++ b/resources/ts/bo/pages/search-bar.ts @@ -13,6 +13,7 @@ function setupFilterListener(selectId: string, paramKey: FilterKey): void { if (value !== "0") { const url = new URL(location.href); url.searchParams.set(paramKey, value); + url.searchParams.set("page", "1"); url.searchParams.delete("rstFltrs"); url.searchParams.delete("rstSrts"); location.assign(url.search); diff --git a/resources/ts/bo/utilities/fontawesome.ts b/resources/ts/bo/utilities/fontawesome.ts index b9557e5..324f67a 100644 --- a/resources/ts/bo/utilities/fontawesome.ts +++ b/resources/ts/bo/utilities/fontawesome.ts @@ -44,6 +44,7 @@ import { faSyncAlt, faTimes, faTrash, + faTriangleExclamation, faUndoAlt, faWandMagic, } from "@fortawesome/free-solid-svg-icons"; @@ -92,6 +93,7 @@ library.add( faArrowUpRightFromSquare, faCommentSlash, faCommentDots, + faTriangleExclamation, ); // Front diff --git a/resources/views/bo/modules/pagination.blade.php b/resources/views/bo/modules/pagination/default.blade.php similarity index 73% rename from resources/views/bo/modules/pagination.blade.php rename to resources/views/bo/modules/pagination/default.blade.php index 13b22fe..52d77a3 100644 --- a/resources/views/bo/modules/pagination.blade.php +++ b/resources/views/bo/modules/pagination/default.blade.php @@ -2,26 +2,7 @@ @php $pagination = intval(Cache::get('pagination.' . str(request()->route()->getName())->slug())); @endphp @if ($paginator->items())