From eb2407c6935182fd20af02cccedc43ee8b08e29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 18 Feb 2021 18:22:57 +0300
Subject: [PATCH] fixed #1868

---
 config/search-string.php                      | 61 ++++++++++++++-----
 .../views/purchases/payments/index.blade.php  |  2 +-
 .../views/purchases/vendors/index.blade.php   |  2 +-
 .../views/sales/revenues/index.blade.php      |  2 +-
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/config/search-string.php b/config/search-string.php
index 00ff96ba3..1ccc3390a 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -98,9 +98,7 @@ return [
                 'route' => 'currencies.index'
             ],
             'document_id',
-            'contact_id' => [
-                'route' => 'customers.index'
-            ],
+            'contact_id',
             'description' => ['searchable' => true],
             'payment_method',
             'reference',
@@ -182,9 +180,7 @@ return [
             'currency_code' => [
                 'route' => 'currencies.index'
             ],
-            'contact_id' => [
-                'route' => 'vendors.index'
-            ],
+            'contact_id',
             'contact_name' => ['searchable' => true],
             'contact_email' => ['searchable' => true],
             'contact_tax_number',
@@ -197,7 +193,7 @@ return [
         ],
     ],
 
-    App\Models\Purchase\Bill::class => [
+    'App\Models\Purchase\Bill' => [
         'columns' => [
             'document_number' => ['searchable' => true],
             'order_number' => ['searchable' => true],
@@ -226,24 +222,32 @@ return [
         ],
     ],
 
-    App\Models\Purchase\Vendor::class => [
+    'App\Models\Purchase\Payment' => [
         'columns' => [
             'type',
-            'name' => ['searchable' => true],
-            'email' => ['searchable' => true],
-            'tax_number' => ['searchable' => true],
-            'phone' => ['searchable' => true],
-            'address' => ['searchable' => true],
-            'website' => ['searchable' => true],
+            'account_id' => [
+                'route' => 'accounts.index'
+            ],
+            'paid_at' => ['date' => true],
+            'amount',
             'currency_code' => [
                 'route' => 'currencies.index'
             ],
+            'document_id',
+            'contact_id' => [
+                'route' => 'vendors.index'
+            ],
+            'description' => ['searchable' => true],
+            'payment_method',
             'reference',
-            'enabled' => ['boolean' => true],
+            'category_id' => [
+                'route' => ['categories.index', 'search=type:expense']
+            ],
+            'parent_id',
         ],
     ],
 
-    App\Models\Sale\Invoice::class => [
+    'App\Models\Sale\Invoice' => [
         'columns' => [
             'document_number' => ['searchable' => true],
             'order_number' => ['searchable' => true],
@@ -272,6 +276,31 @@ return [
         ],
     ],
 
+    'App\Models\Sale\Revenue' => [
+        'columns' => [
+            'type',
+            'account_id' => [
+                'route' => 'accounts.index'
+            ],
+            'paid_at' => ['date' => true],
+            'amount',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
+            'document_id',
+            'contact_id' => [
+                'route' => 'customers.index'
+            ],
+            'description' => ['searchable' => true],
+            'payment_method',
+            'reference',
+            'category_id' => [
+                'route' => ['categories.index', 'search=type:income']
+            ],
+            'parent_id',
+        ],
+    ],
+
     App\Models\Setting\Category::class => [
         'columns' => [
             'name' => ['searchable' => true],
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 7d0b2556d..cd374692f 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -21,7 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <x-search-string model="App\Models\Banking\Transaction" />
+                        <x-search-string model="App\Models\Purchase\Payment" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.payments', $bulk_actions, ['group' => 'purchases', 'type' => 'payments']) }}
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index 8eb8cdb15..9b097506a 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -21,7 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <x-search-string model="App\Models\Purchase\Vendor" />
+                        <x-search-string model="App\Models\Common\Contact" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, ['group' => 'purchases', 'type' => 'vendors']) }}
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 428b99b60..377a14164 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -21,7 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <x-search-string model="App\Models\Banking\Transaction" />
+                        <x-search-string model="App\Models\Sale\Revenue" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, ['group' => 'sales', 'type' => 'revenues']) }}