forge-joniko/ldc-crm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Noah Lancien 2025-12-08 16:50:03 +01:00
commit a2fe764732
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Controllers/Bo/ClaimController.php
View file

@ -99,13 +99,23 @@ class ClaimController extends Controller
/** Custom pagination */
$claimModels = $query->simplePaginate($this->getPagination());
/** Define request brand filter if user only has 1 brand */
if (auth('backend')->user()->brands()->count() === 1) {
$request->merge(['brand' => auth('backend')->user()->brands()->value('id')]);
};
$claimSubjectModels = ClaimSubject::query()
->when(
$request->filled('brand'),
fn($q) => $q->whereHas('brand', fn($q) => $q->where('id', $request->brand)),
fn($q) => $q->whereHas('brand', fn($q) => $q->whereIn('id', $userModel->brands()->pluck('id')))
)
->get();
->when(
auth('backend')->user()->brands()->count() === 1,
fn($q) => $q->whereHas('brand', fn($q) => $q->where('id', auth('backend')->user()->brands()->pluck('id')))
);
$claimSubjectModels = $request->filled('brand') || (auth('backend')->user()->brands()->count() === 1) ?
$claimSubjectModels->get() :
null;
return view('bo.pages.claims.index', compact('claimModels', 'search', 'searchFields', 'claimSubjectModels'));
}

30
resources/views/bo/modules/claim-tools.blade.php
View file

@ -9,20 +9,22 @@
{{ __('Exporter')}}
</button>
</div>
<div class="col-3 offset-8">
<form action="{{ request()->fullUrlWithQuery(['rstFltrs' => null]) }}" class="row gx-2 mb-2">
{{-- SUBJECT SELECT --}}
<select class="form-select mb-1 mb-lg-0"
id="subjectSelect" role="button" name="subject">
<option value="0" @selected(!$selectedSubject)>{{ __('Sélectionnez un sujet...') }}</option>
@foreach ($claimSubjectModels as $claimSubjectModel)
<option value="{{ $claimSubjectModel->getKey() }}" @selected($selectedSubject == $claimSubjectModel->getKey())>
{{ $claimSubjectModel->label }}
</option>
@endforeach
</select>
</form>
</div>
@if (!empty($claimSubjectModels))
<div class="col-3 offset-8">
<form action="{{ request()->fullUrlWithQuery(['rstFltrs' => null]) }}" class="row gx-2 mb-2">
{{-- SUBJECT SELECT --}}
<select class="form-select mb-1 mb-lg-0"
id="subjectSelect" role="button" name="subject">
<option value="0" @selected(!$selectedSubject)>{{ __('Sélectionnez un sujet...') }}</option>
@foreach ($claimSubjectModels as $claimSubjectModel)
<option value="{{ $claimSubjectModel->getKey() }}" @selected($selectedSubject == $claimSubjectModel->getKey())>
{{ $claimSubjectModel->label }}
</option>
@endforeach
</select>
</form>
</div>
@endif
</div>
{{-- EXPORT MODAL --}}