From ecda8eebf27a2e3cfe404e3678f1e21354a39f48 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Mon, 24 Jan 2022 23:03:33 -0700 Subject: [PATCH] Fix withoutExternalUrl query and add search modifiers Co-authored-by: JC5 --- app/Helpers/Collector/Extensions/MetaCollection.php | 8 ++++++-- resources/lang/en_US/firefly.php | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index 193cb8ef63..11e0c90b59 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -221,8 +221,12 @@ trait MetaCollection $this->hasJoinedMetaTables = true; $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id'); } - $this->query->where('journal_meta.name', '=', 'external_url'); - $this->query->whereNull('journal_meta.data'); + $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'); + }); return $this; } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 403ea38144..7b7250c6fc 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -291,6 +291,8 @@ return [ 'search_modifier_created_on' => 'Transaction was created on ":value"', 'search_modifier_updated_on' => 'Transaction was last updated on ":value"', 'search_modifier_external_id' => 'External ID is ":value"', + 'search_modifier_no_external_url' => 'The transaction has no external URL', + 'search_modifier_any_external_url' => 'The transaction must have a (any) external URL', 'search_modifier_internal_reference' => 'Internal reference is ":value"', 'search_modifier_description_starts' => 'Description is ":value"', 'search_modifier_description_ends' => 'Description ends with ":value"',