IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-27 19:31:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/5810

Browse Source
This commit is contained in:
James Cole 2022-02-23 10:52:24 +01:00
parent 8c9bb3addb
commit dd66a1adf0
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Helpers/Collector/Extensions/MetaCollection.php
View File

@ -222,8 +222,8 @@ trait MetaCollection
$this->hasJoinedMetaTables = true;
$this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
}
$this->query->where(function(Builder $q1) {
$q1->where(function(Builder $q2) {
$this->query->where(function (Builder $q1) {
$q1->where(function (Builder $q2) {
$q2->where('journal_meta.name', '=', 'external_url');
$q2->whereNull('journal_meta.data');
})->orWhereNull('journal_meta.name');
@ -488,7 +488,10 @@ trait MetaCollection
public function withoutNotes(): GroupCollectorInterface
{
$this->withNotes();
$this->query->whereNull('notes.text');
$this->query->where(function (Builder $q) {
$q->whereNull('notes.text');
$q->orWhere('notes.text', '');
});
return $this;
}