Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -212,6 +212,40 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $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) {
+                $q2->where('journal_meta.name', '=', 'external_url');
+                $q2->whereNull('journal_meta.data');
+            })->orWhereNull('journal_meta.name');
+        });
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function withExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $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->whereNotNull('journal_meta.data');
+
+        return $this;
+    }
+
     /**
      * @inheritDoc
      */

app/Helpers/Collector/GroupCollectorInterface.php

@@ -305,6 +305,20 @@ interface GroupCollectorInterface
      */
     public function setExternalId(string $externalId): GroupCollectorInterface;
 
+    /**
+     * Transactions without an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface;
+
+    /**
+     * Transactions with an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withExternalUrl(): GroupCollectorInterface;
+
     /**
      * Limit results to a specific foreign currency.
      *

app/Support/Search/OperatorQuerySearch.php

@@ -627,6 +627,15 @@ class OperatorQuerySearch implements SearchInterface
                 $this->collector->setUpdatedAt($updatedAt);
                 break;
             //
+            // external URL
+            //
+            case 'no_external_url':
+                $this->collector->withoutExternalUrl();
+                break;
+            case 'any_external_url':
+                $this->collector->withExternalUrl();
+                break;
+            //
             // other fields
             //
             case 'external_id':

config/firefly.php

@@ -518,6 +518,8 @@ return [
             'notes_are'                       => ['alias' => false, 'needs_context' => true,],
             'no_notes'                        => ['alias' => false, 'needs_context' => false,],
             'any_notes'                       => ['alias' => false, 'needs_context' => false,],
+            'no_external_url'                 => ['alias' => false, 'needs_context' => false,],
+            'any_external_url'                => ['alias' => false, 'needs_context' => false,],
 
             // one exact (or array of) journals:
             'id'                              => ['alias' => false, 'trigger_class' => null, 'needs_context' => true,],

public/v1/js/ff/rules/create-edit.js

@@ -348,6 +348,8 @@ function updateTriggerInput(selectList) {
         case 'source_is_cash':
         case 'destination_is_cash':
         case 'account_is_cash':
+        case 'no_external_url':
+        case 'any_external_url':
             console.log('Select list value is ' + selectList.val() + ', so input needs to be disabled.');
             inputResult.prop('disabled', true);
             inputResult.typeahead('destroy');

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"',
@@ -562,6 +564,8 @@ return [
     'rule_trigger_internal_reference'                     => 'Internal reference is ":trigger_value"',
     'rule_trigger_journal_id_choice'                      => 'Transaction journal ID is..',
     'rule_trigger_journal_id'                             => 'Transaction journal ID is ":trigger_value"',
+    'rule_trigger_no_external_url'                        => 'Transaction has no external URL',
+    'rule_trigger_any_external_url'                       => 'Transaction has an external URL',
 
     // actions
     'rule_action_delete_transaction_choice'               => 'DELETE transaction (!)',