|
@@ -38,6 +38,9 @@
|
|
|
</div>
|
|
</div>
|
|
|
@if(($enableColumnFilters ?? true) && $headerName !== 'image' && $headerName !== 'actions')
|
|
@if(($enableColumnFilters ?? true) && $headerName !== 'image' && $headerName !== 'actions')
|
|
|
@php
|
|
@php
|
|
|
|
|
+ $filters = $filters ?? [];
|
|
|
|
|
+ $ranges = $ranges ?? [];
|
|
|
|
|
+ $dates = $dates ?? [];
|
|
|
$type = null;
|
|
$type = null;
|
|
|
$data = (array_merge($filters, $ranges, $dates))[$headerName] ?? null;
|
|
$data = (array_merge($filters, $ranges, $dates))[$headerName] ?? null;
|
|
|
|
|
|
|
@@ -361,7 +364,7 @@
|
|
|
Поиск ведётся по следующим колонкам:
|
|
Поиск ведётся по следующим колонкам:
|
|
|
<span class="fst-italic">
|
|
<span class="fst-italic">
|
|
|
@foreach($searchFields as $searchField)
|
|
@foreach($searchFields as $searchField)
|
|
|
- {{ $header[$searchField] }}
|
|
|
|
|
|
|
+ {{ $header[$searchField] ?? $searchField }}
|
|
|
@if(!$loop->last)
|
|
@if(!$loop->last)
|
|
|
,
|
|
,
|
|
|
@endif
|
|
@endif
|