jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new version in repository

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-07-25 23:19:27 +02:00
parent d174fe1c81
commit 0d421226fa
608 changed files with 12235 additions and 7513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Repositories/Core/DataTable.php
View File

@@ -194,13 +194,15 @@ class DataTable
if (is_array($hasfilters)) {
foreach ($hasfilters as $hasfilter) {
if (!empty($hasfilter['search'])) {
$elements = $elements->whereHas($hasfilter['controller'], function ($query) use ($hasfilter) {
if ($hasfilter['like']) {
$query->where($hasfilter['field'], 'like', '%' . $hasfilter['search'] . '%');
} else {
$query->where($hasfilter['field'], '=', $hasfilter['search']);
$elements = $elements->whereHas(
$hasfilter['controller'], function ($query) use ($hasfilter) {
if ($hasfilter['like']) {
$query->where($hasfilter['field'], 'like', '%' . $hasfilter['search'] . '%');
} else {
$query->where($hasfilter['field'], '=', $hasfilter['search']);
}
}
});
);
}
}
}
@@ -217,9 +219,11 @@ class DataTable
'field' => $tab[1],
'search' => $search,
];
$elements = $elements->whereHas($searchField['controller'], function ($query) use ($searchField) {
$query->where($searchField['field'], 'like', '%' . $searchField['search'] . '%');
});
$elements = $elements->whereHas(
$searchField['controller'], function ($query) use ($searchField) {
$query->where($searchField['field'], 'like', '%' . $searchField['search'] . '%');
}
);
} else {
$elements = $elements->where($searchcol, 'like', "%$search%");
}