From 61923a08d8f875fa00b3db04eedc37796b79b773 Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Tue, 2 Nov 2021 16:04:01 +0300
Subject: [PATCH] filter option for the recurring documents and transactions
 added #1pbthq3

---
 app/View/Components/SearchString.php   | 12 ++++-----
 config/search-string.php               | 35 ++++++++++++++++++++++++++
 resources/lang/en-GB/search_string.php |  1 +
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index 7859aeea8..fa7a575eb 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -89,12 +89,12 @@ class SearchString extends Component
             $column = $options['key'];
         }
 
-        if (isset($options['relationship'])) {
-            if (isset($options['foreign_key'])) {
-                $column .= '.' . $options['foreign_key'];
-            } else {
-                $column .= '.id';
-            }
+        if (isset($options['relationship']) && isset($options['foreign_key']) && !empty($options['foreign_key'])) {
+            $column .= '.' . $options['foreign_key'];
+        }
+
+        if (isset($options['relationship']) && !isset($options['foreign_key'])) {
+            $column .= '.id';
         }
 
         return $column;
diff --git a/config/search-string.php b/config/search-string.php
index 60dc341dc..9b070ba9d 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -112,6 +112,12 @@ return [
                 'route' => 'categories.index'
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'foreign_key' => '',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
@@ -205,6 +211,11 @@ return [
                 'route' => 'categories.index'
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
@@ -243,6 +254,12 @@ return [
                 'route' => ['categories.index', 'search=type:expense']
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'foreign_key' => '',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
@@ -269,6 +286,12 @@ return [
                 'route' => ['categories.index', 'search=type:expense']
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'foreign_key' => '',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
@@ -308,6 +331,12 @@ return [
                 'route' => ['categories.index', 'search=type:income']
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'foreign_key' => '',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
@@ -334,6 +363,12 @@ return [
                 'route' => ['categories.index', 'search=type:income']
             ],
             'parent_id',
+            'recurring' => [
+                'key' => 'recurring',
+                'foreign_key' => '',
+                'relationship' => true,
+                'boolean' => true,
+            ]
         ],
     ],
 
diff --git a/resources/lang/en-GB/search_string.php b/resources/lang/en-GB/search_string.php
index 05e9aef86..c6d1c313c 100644
--- a/resources/lang/en-GB/search_string.php
+++ b/resources/lang/en-GB/search_string.php
@@ -15,6 +15,7 @@ return [
         'reconciled'        => 'Reconciled',
         'expense_account'   => 'From Account',
         'income_account'    => 'To Account',
+        'recurring'         => 'Recurring',
     ],
 
 ];