From d45d322b545a8de0d62768d2ba80de720d23f282 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 23 Jun 2022 13:43:23 -0700
Subject: [PATCH 1/4] Use scoped query for asset count

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php                      | 21 +++++++++++++++++++++
 resources/views/categories/view.blade.php |  2 +-
 resources/views/dashboard.blade.php       |  2 +-
 resources/views/locations/view.blade.php  |  2 +-
 resources/views/suppliers/view.blade.php  |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 0bbb06aa131f..f4bc125155fd 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1147,6 +1147,27 @@ public function scopeDueOrOverdueForAudit($query, $settings)
     }
 
 
+    /**
+     * Query builder scope for Archived assets
+     *
+     * @param  \Illuminate\Database\Query\Builder $query Query builder instance
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeAssetsForShow($query)
+    {
+
+        if (Setting::getSettings()->show_archived_in_list!=1) {
+            return $query->whereHas('assetstatus', function ($query) {
+                $query->where('archived', '=', 0);
+            });
+        } else {
+            return $query;
+        }
+
+    }
+
   /**
    * Query builder scope for Archived assets
    *
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index b32bb8df068d..6e33594b176d 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -39,7 +39,7 @@
                     <li class="active">
                         <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}"> {{ ucwords($category_type_route) }}
                             @if ($category->category_type=='asset')
-                            <badge class="badge badge-secondary"> {{ $category->assets->count() }}</badge>
+                            <badge class="badge badge-secondary"> {{ $category->assets()->AssetsForShow()->count() }}</badge>
                             @endif
                         </a>
                     </li>
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index dab2e1dbdc99..f4e8cc714a21 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -33,7 +33,7 @@
     <!-- small box -->
     <div class="small-box bg-teal">
       <div class="inner">
-        <h3>{{ number_format($counts['asset']) }}</h3>
+        <h3>{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}</h3>
         <p>{{ strtolower(trans('general.assets')) }}</p>
       </div>
       <div class="icon" aria-hidden="true">
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 566e118c824e..ce4394f8c79f 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -38,7 +38,7 @@
                     </span>
                     <span class="hidden-xs hidden-sm">
                           {{ trans('general.assets') }}
-                          {!! (($location->assets) && ($location->assets->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->assets->count()).'</badge>' : '' !!}
+                          {!! (($location->assets) && ($location->assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
                     </span>
                   </a>
               </li>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 4316497f1e63..1cf95cfe44d5 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -35,7 +35,7 @@
                 </span>
                 <span class="hidden-xs hidden-sm">
                     {{ trans('general.assets') }}
-                    {!! (($supplier->assets) && ($supplier->assets->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->assets->count()).'</badge>' : '' !!}
+                    {!! (($supplier->assets) && ($supplier->assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
                </span>
 
             </a>

From 398c77bfdc7855a70e580f4507b4e694ea4d07cc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 23 Jun 2022 15:37:39 -0700
Subject: [PATCH 2/4] Use new scope for additional tabs

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/manufacturers/view.blade.php | 2 +-
 resources/views/users/view.blade.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index a6472fbcaec2..3872801a6900 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -41,7 +41,7 @@
             </span>
             <span class="hidden-xs hidden-sm">
                 {{ trans('general.assets') }}
-                {!! (($manufacturer->assets) && ($manufacturer->assets->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->assets->count()).'</badge>' : '' !!}
+                {!! (($manufacturer->assets) && ($manufacturer->assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
             </span>
 
           </a>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index e97c063df6ea..41f7b4774865 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -31,7 +31,7 @@
             <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-              {!! ($user->assets->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets->count()).'</badge>' : '' !!}
+              {!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
             </span>
           </a>
         </li>

From 1a4579b7705757d8fd2289520f43986fe6ec816e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 23 Jun 2022 16:00:27 -0700
Subject: [PATCH 3/4] Missed one

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/companies/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index 19a27c68bae4..4324f3f78eda 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -21,7 +21,7 @@
                             <i class="fas fa-barcode" aria-hidden="true"></i>
                             </span>
                             <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-                                {!! (($company->assets) && ($company->assets->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($company->assets->count()).'</badge>' : '' !!}
+                                {!! (($company->assets) && ($company->assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($company->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
 
                             </span>
                         </a>

From daf6c72005c6375fd8eac766221efff6a7764cf0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 23 Jun 2022 16:02:54 -0700
Subject: [PATCH 4/4] Fleshed out comments on new scope

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index f4bc125155fd..14613149a129 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1148,7 +1148,11 @@ public function scopeDueOrOverdueForAudit($query, $settings)
 
 
     /**
-     * Query builder scope for Archived assets
+     * Query builder scope for Archived assets counting
+     *
+     * This is primarily used for the tab counters so that IF the admin
+     * has chosen to not display archived assets in their regular lists
+     * and views, it will return the correct number.
      *
      * @param  \Illuminate\Database\Query\Builder $query Query builder instance
      *