diff --git a/app/Http/Controllers/Bo/AnswerController.php b/app/Http/Controllers/Bo/AnswerController.php index e93a74f..2972b6f 100644 --- a/app/Http/Controllers/Bo/AnswerController.php +++ b/app/Http/Controllers/Bo/AnswerController.php @@ -47,7 +47,7 @@ class AnswerController extends Controller $this->sortQuery($query); $searchFields = trans('Réponse'); - $answerModels = $this->paginate($this->getPagination()); + $answerModels = $query->paginate($this->getPagination()); return view('bo.pages.answers.index', compact('answerModels', 'questionModel', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimController.php b/app/Http/Controllers/Bo/ClaimController.php index a6586bc..1fcde8a 100644 --- a/app/Http/Controllers/Bo/ClaimController.php +++ b/app/Http/Controllers/Bo/ClaimController.php @@ -16,6 +16,7 @@ use App\Models\Claim; use App\Models\ClaimMailTemplate; use App\Models\ClaimMessage; use App\Models\ClaimSubject; +use App\Models\CustomerInfo; use App\Traits\Controllers\UpdateModelPublished; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -92,12 +93,12 @@ class ClaimController extends Controller */ public function edit(Claim $claim): \Illuminate\Contracts\View\View { - $customerClaimModels = !is_null($claim->customer) ? $this->paginate(Claim::query() + $customerClaimModels = !is_null($claim->customer) ? Claim::query() ->whereNotNull('customer_id') ->whereHas('brand', fn($q) => $q->whereKey($claim->brand->getKey())) ->whereHas('customer', fn($q) => $q->whereKey($claim->customer->getKey())) ->whereNot('id', $claim->getKey()) - ->whereNot('status', ClaimStatus::treated)) : collect(); + ->whereNot('status', ClaimStatus::treated)->paginate($this->jsonItemPerPagination) : collect(); $brandModels = CollectionHelper::paginate( Brand::getUserAssociatedBrands(), $this->jsonItemPerPagination, @@ -111,6 +112,7 @@ class ClaimController extends Controller ClaimMailTemplate::getAllModelsFromBrand($claim->brand->getKey()), $this->jsonItemPerPagination, ); + $customerModel = CustomerInfo::query()->where('hashcode', $claim->hashcode)->first(); return view('bo.pages.claims.edit', [ 'claimModel' => $claim->load(['brand', 'claimSubject']), @@ -119,6 +121,7 @@ class ClaimController extends Controller 'claimMessageModels' => $claimMessageModels, 'claimSubjectModels' => $claimSubjectModels, 'claimTemplateModels' => $claimTemplateModels, + 'customerModel' => $customerModel, ]); } @@ -168,7 +171,7 @@ class ClaimController extends Controller "%s %s %s %s