mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fix search.
This commit is contained in:
parent
2d7f1af52c
commit
6490f9c128
@ -103,7 +103,7 @@ class Search implements SearchInterface
|
|||||||
public function searchTransactions(array $words): Collection
|
public function searchTransactions(array $words): Collection
|
||||||
{
|
{
|
||||||
// decrypted transaction journals:
|
// decrypted transaction journals:
|
||||||
$decrypted = Auth::user()->transactionjournals()->expanded()->where('encrypted', 0)->where(
|
$decrypted = Auth::user()->transactionjournals()->expanded()->where('transaction_journals.encrypted', 0)->where(
|
||||||
function (EloquentBuilder $q) use ($words) {
|
function (EloquentBuilder $q) use ($words) {
|
||||||
foreach ($words as $word) {
|
foreach ($words as $word) {
|
||||||
$q->orWhere('description', 'LIKE', '%' . e($word) . '%');
|
$q->orWhere('description', 'LIKE', '%' . e($word) . '%');
|
||||||
@ -112,7 +112,7 @@ class Search implements SearchInterface
|
|||||||
)->get(TransactionJournal::QUERYFIELDS);
|
)->get(TransactionJournal::QUERYFIELDS);
|
||||||
|
|
||||||
// encrypted
|
// encrypted
|
||||||
$all = Auth::user()->transactionjournals()->expanded()->where('encrypted', 1)->get(TransactionJournal::QUERYFIELDS);
|
$all = Auth::user()->transactionjournals()->expanded()->where('transaction_journals.encrypted', 1)->get(TransactionJournal::QUERYFIELDS);
|
||||||
$set = $all->filter(
|
$set = $all->filter(
|
||||||
function (TransactionJournal $journal) use ($words) {
|
function (TransactionJournal $journal) use ($words) {
|
||||||
foreach ($words as $word) {
|
foreach ($words as $word) {
|
||||||
|
Loading…
Reference in New Issue
Block a user