From f767cc082f20c16237a4241943b5c704dfaf73e2 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:27:18 -0700
Subject: [PATCH 01/23] Introduce improved way to interact with settings in
 tests

---
 app/Observers/SettingObserver.php             |  1 +
 database/factories/SettingFactory.php         |  9 ------
 tests/Feature/Api/Assets/AssetIndexTest.php   |  3 --
 .../Api/Users/UsersForSelectListTest.php      |  7 ++---
 tests/Support/Settings.php                    | 30 +++++++++++++++++++
 tests/TestCase.php                            |  8 +++--
 6 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 tests/Support/Settings.php

diff --git a/app/Observers/SettingObserver.php b/app/Observers/SettingObserver.php
index ec9dec3f2..350249f57 100644
--- a/app/Observers/SettingObserver.php
+++ b/app/Observers/SettingObserver.php
@@ -17,5 +17,6 @@ class SettingObserver
     public function saved(Setting $setting)
     {
         Cache::forget(Setting::SETUP_CHECK_KEY);
+        Setting::$_cache = null;
     }
 }
diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php
index 970d00cd6..1655bd335 100644
--- a/database/factories/SettingFactory.php
+++ b/database/factories/SettingFactory.php
@@ -34,13 +34,4 @@ class SettingFactory extends Factory
             'email_domain' => 'test.com',
         ];
     }
-
-    public function withMultipleFullCompanySupport()
-    {
-        return $this->state(function () {
-            return [
-                'full_multiple_companies_support' => 1,
-            ];
-        });
-    }
 }
diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php b/tests/Feature/Api/Assets/AssetIndexTest.php
index 2190c791f..2bb54b809 100644
--- a/tests/Feature/Api/Assets/AssetIndexTest.php
+++ b/tests/Feature/Api/Assets/AssetIndexTest.php
@@ -3,7 +3,6 @@
 namespace Tests\Feature\Api\Assets;
 
 use App\Models\Asset;
-use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
@@ -13,8 +12,6 @@ class AssetIndexTest extends TestCase
 {
     public function testAssetIndexReturnsExpectedAssets()
     {
-        Setting::factory()->create();
-
         Asset::factory()->count(3)->create();
 
         Passport::actingAs(User::factory()->superuser()->create());
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php
index 8b2c01bcf..71e094b66 100644
--- a/tests/Feature/Api/Users/UsersForSelectListTest.php
+++ b/tests/Feature/Api/Users/UsersForSelectListTest.php
@@ -3,7 +3,6 @@
 namespace Tests\Feature\Api\Users;
 
 use App\Models\Company;
-use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
@@ -13,8 +12,6 @@ class UsersForSelectListTest extends TestCase
 {
     public function testUsersAreReturned()
     {
-        Setting::factory()->create();
-
         $users = User::factory()->superuser()->count(3)->create();
 
         Passport::actingAs($users->first());
@@ -32,7 +29,7 @@ class UsersForSelectListTest extends TestCase
 
     public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled()
     {
-        Setting::factory()->withMultipleFullCompanySupport()->create();
+        $this->settings->enableMultipleFullCompanySupport();
 
         $jedi = Company::factory()->has(User::factory()->count(3)->sequence(
             ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'],
@@ -60,7 +57,7 @@ class UsersForSelectListTest extends TestCase
 
     public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySupportEnabled()
     {
-        Setting::factory()->withMultipleFullCompanySupport()->create();
+        $this->settings->enableMultipleFullCompanySupport();
 
         $jedi = Company::factory()->has(User::factory()->count(3)->sequence(
             ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'],
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
new file mode 100644
index 000000000..6e9d492c3
--- /dev/null
+++ b/tests/Support/Settings.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Setting;
+
+class Settings
+{
+    private Setting $setting;
+    
+    public function __construct()
+    {
+        $this->setting = Setting::factory()->create();
+    }
+
+    public function enableMultipleFullCompanySupport()
+    {
+        $this->update(['full_multiple_companies_support' => 1]);
+    }
+
+    public function disableMultipleFullCompanySupport()
+    {
+        $this->update(['full_multiple_companies_support' => 0]);
+    }
+
+    private function update(array $attributes)
+    {
+        Setting::unguarded(fn() => $this->setting->update($attributes));
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index efa533b8c..cc8d36105 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,15 +3,17 @@
 namespace Tests;
 
 use App\Http\Middleware\SecurityHeaders;
-use App\Models\Setting;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Tests\Support\Settings;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use LazilyRefreshDatabase;
 
+    protected Settings $settings;
+
     private array $globallyDisabledMiddleware = [
         SecurityHeaders::class,
     ];
@@ -20,8 +22,8 @@ abstract class TestCase extends BaseTestCase
     {
         parent::setUp();
 
-        $this->beforeApplicationDestroyed(fn() => Setting::$_cache = null);
-
         $this->withoutMiddleware($this->globallyDisabledMiddleware);
+
+        $this->settings = new Settings();
     }
 }

From bbfb6c338a60fa3063a3a493ce791a39f9904573 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:28:16 -0700
Subject: [PATCH 02/23] Remove unused method

---
 tests/Support/Settings.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index 6e9d492c3..bef9378c7 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -18,11 +18,6 @@ class Settings
         $this->update(['full_multiple_companies_support' => 1]);
     }
 
-    public function disableMultipleFullCompanySupport()
-    {
-        $this->update(['full_multiple_companies_support' => 0]);
-    }
-
     private function update(array $attributes)
     {
         Setting::unguarded(fn() => $this->setting->update($attributes));

From 8ac4d3aeea1e778fb5a8f7206ee9bf27df79f399 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:42:15 -0700
Subject: [PATCH 03/23] Move to a static constructor

---
 tests/Support/Settings.php | 7 ++++++-
 tests/TestCase.php         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index bef9378c7..55ca6edc4 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -8,11 +8,16 @@ class Settings
 {
     private Setting $setting;
     
-    public function __construct()
+    private function __construct()
     {
         $this->setting = Setting::factory()->create();
     }
 
+    public static function initialize()
+    {
+        return new self();
+    }
+
     public function enableMultipleFullCompanySupport()
     {
         $this->update(['full_multiple_companies_support' => 1]);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index cc8d36105..6ab34ba48 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -24,6 +24,6 @@ abstract class TestCase extends BaseTestCase
 
         $this->withoutMiddleware($this->globallyDisabledMiddleware);
 
-        $this->settings = new Settings();
+        $this->settings = Settings::initialize();
     }
 }

From 52c733b31d439ffe8de529136edd140b413fe340 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:48:23 -0700
Subject: [PATCH 04/23] Add ability to set provided settings

---
 tests/Support/Settings.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index 55ca6edc4..a28819e8d 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -23,6 +23,11 @@ class Settings
         $this->update(['full_multiple_companies_support' => 1]);
     }
 
+    public function set(array $attributes)
+    {
+        $this->update($attributes);
+    }
+
     private function update(array $attributes)
     {
         Setting::unguarded(fn() => $this->setting->update($attributes));

From 95f195046d09042aa7f23f733c0394fdff12dd6d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:50:24 -0700
Subject: [PATCH 05/23] Move cache flush to testing helper

---
 app/Observers/SettingObserver.php | 1 -
 tests/Support/Settings.php        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Observers/SettingObserver.php b/app/Observers/SettingObserver.php
index 350249f57..ec9dec3f2 100644
--- a/app/Observers/SettingObserver.php
+++ b/app/Observers/SettingObserver.php
@@ -17,6 +17,5 @@ class SettingObserver
     public function saved(Setting $setting)
     {
         Cache::forget(Setting::SETUP_CHECK_KEY);
-        Setting::$_cache = null;
     }
 }
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index a28819e8d..e0b997054 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -31,5 +31,6 @@ class Settings
     private function update(array $attributes)
     {
         Setting::unguarded(fn() => $this->setting->update($attributes));
+        Setting::$_cache = null;
     }
 }

From 9561b6661389ae052403309c9fc9541480197b94 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 17:58:53 -0700
Subject: [PATCH 06/23] Add return types and docblock

---
 tests/Support/Settings.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index e0b997054..5061c461d 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -7,28 +7,31 @@ use App\Models\Setting;
 class Settings
 {
     private Setting $setting;
-    
+
     private function __construct()
     {
         $this->setting = Setting::factory()->create();
     }
 
-    public static function initialize()
+    public static function initialize(): Settings
     {
         return new self();
     }
 
-    public function enableMultipleFullCompanySupport()
+    public function enableMultipleFullCompanySupport(): void
     {
         $this->update(['full_multiple_companies_support' => 1]);
     }
 
-    public function set(array $attributes)
+    /**
+     * @param array $attributes Attributes to modify in the application's settings.
+     */
+    public function set(array $attributes): void
     {
         $this->update($attributes);
     }
 
-    private function update(array $attributes)
+    private function update(array $attributes): void
     {
         Setting::unguarded(fn() => $this->setting->update($attributes));
         Setting::$_cache = null;

From cd0796dddadd436a71bde72939e69c54a3be7b4a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Apr 2023 18:46:29 -0700
Subject: [PATCH 07/23] Allow Settings to be chainable

---
 tests/Support/Settings.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index 5061c461d..ccf50c3ce 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -18,22 +18,24 @@ class Settings
         return new self();
     }
 
-    public function enableMultipleFullCompanySupport(): void
+    public function enableMultipleFullCompanySupport(): Settings
     {
-        $this->update(['full_multiple_companies_support' => 1]);
+        return $this->update(['full_multiple_companies_support' => 1]);
     }
 
     /**
      * @param array $attributes Attributes to modify in the application's settings.
      */
-    public function set(array $attributes): void
+    public function set(array $attributes): Settings
     {
-        $this->update($attributes);
+        return $this->update($attributes);
     }
 
-    private function update(array $attributes): void
+    private function update(array $attributes): Settings
     {
         Setting::unguarded(fn() => $this->setting->update($attributes));
         Setting::$_cache = null;
+
+        return $this;
     }
 }

From 7c95e4517876bab8e800f15fd73257e2db51ba8d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 12 Apr 2023 17:28:47 -0700
Subject: [PATCH 08/23] Introduce trait to conditionally interact with settings

---
 tests/Feature/Api/Assets/AssetIndexTest.php        | 3 +++
 tests/Feature/Api/Users/UsersForSelectListTest.php | 3 +++
 tests/Support/InteractsWithSettings.php            | 8 ++++++++
 tests/TestCase.php                                 | 5 ++++-
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/Support/InteractsWithSettings.php

diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php b/tests/Feature/Api/Assets/AssetIndexTest.php
index 2bb54b809..3618c6e01 100644
--- a/tests/Feature/Api/Assets/AssetIndexTest.php
+++ b/tests/Feature/Api/Assets/AssetIndexTest.php
@@ -6,10 +6,13 @@ use App\Models\Asset;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetIndexTest extends TestCase
 {
+    use InteractsWithSettings;
+
     public function testAssetIndexReturnsExpectedAssets()
     {
         Asset::factory()->count(3)->create();
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php
index 71e094b66..6ab5bf9a8 100644
--- a/tests/Feature/Api/Users/UsersForSelectListTest.php
+++ b/tests/Feature/Api/Users/UsersForSelectListTest.php
@@ -6,10 +6,13 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UsersForSelectListTest extends TestCase
 {
+    use InteractsWithSettings;
+
     public function testUsersAreReturned()
     {
         $users = User::factory()->superuser()->count(3)->create();
diff --git a/tests/Support/InteractsWithSettings.php b/tests/Support/InteractsWithSettings.php
new file mode 100644
index 000000000..0a7a9c53b
--- /dev/null
+++ b/tests/Support/InteractsWithSettings.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Tests\Support;
+
+trait InteractsWithSettings
+{
+
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6ab34ba48..c8dd66178 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -5,6 +5,7 @@ namespace Tests;
 use App\Http\Middleware\SecurityHeaders;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Tests\Support\InteractsWithSettings;
 use Tests\Support\Settings;
 
 abstract class TestCase extends BaseTestCase
@@ -24,6 +25,8 @@ abstract class TestCase extends BaseTestCase
 
         $this->withoutMiddleware($this->globallyDisabledMiddleware);
 
-        $this->settings = Settings::initialize();
+        if (in_array(InteractsWithSettings::class, class_uses_recursive($this))) {
+            $this->settings = Settings::initialize();
+        }
     }
 }

From 6eed89df9108f9a0a158239ac11da62951197aa8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:03:26 -0700
Subject: [PATCH 09/23] Added components and consumables tab to suppliers

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/suppliers/view.blade.php | 77 ++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 1cf95cfe4..9024bd927 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -65,6 +65,30 @@
             </a>
           </li>
 
+            <li>
+                <a href="#components" data-toggle="tab">
+                    <span class="hidden-lg hidden-md">
+                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                    </span>
+                    <span class="hidden-xs hidden-sm">
+                          {{ trans('general.components') }}
+                        {!! (($supplier->components) && ($supplier->components->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->components->count()).'</badge>' : '' !!}
+                    </span>
+                </a>
+            </li>
+
+            <li>
+                <a href="#consumables" data-toggle="tab">
+                    <span class="hidden-lg hidden-md">
+                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                    </span>
+                    <span class="hidden-xs hidden-sm">
+                          {{ trans('general.consumables') }}
+                        {!! (($supplier->consumables) && ($supplier->consumables->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($supplier->consumables->count()).'</badge>' : '' !!}
+                    </span>
+                </a>
+            </li>
+
           <li>
             <a href="#maintenances" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
@@ -173,6 +197,59 @@
             </div><!-- /.table-responsive -->
           </div><!-- /.tab-pane -->
 
+            <div class="tab-pane" id="components">
+                <h2 class="box-title">{{ trans('general.components') }}</h2>
+                <div class="table table-responsive">
+                    <table
+                            data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
+                            data-cookie-id-table="componentsListingTable"
+                            data-pagination="true"
+                            data-id-table="componentsListingTable"
+                            data-search="true"
+                            data-side-pagination="server"
+                            data-show-columns="true"
+                            data-show-fullscreen="true"
+                            data-show-export="true"
+                            data-show-refresh="true"
+                            data-sort-order="asc"
+                            id="accessoriesListingTable"
+                            class="table table-striped snipe-table"
+                            data-url="{{route('api.components.index', ['supplier_id' => $supplier->id]) }}"
+                            data-export-options='{
+                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-components-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                    </table>
+                </div><!-- /.table-responsive -->
+            </div><!-- /.tab-pane -->
+
+            <div class="tab-pane" id="consumables">
+            <h2 class="box-title">{{ trans('general.consumables') }}</h2>
+            <div class="table table-responsive">
+                <table
+                        data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
+                        data-cookie-id-table="consumablesListingTable"
+                        data-pagination="true"
+                        data-id-table="consumablesListingTable"
+                        data-search="true"
+                        data-side-pagination="server"
+                        data-show-columns="true"
+                        data-show-fullscreen="true"
+                        data-show-export="true"
+                        data-show-refresh="true"
+                        data-sort-order="asc"
+                        id="accessoriesListingTable"
+                        class="table table-striped snipe-table"
+                        data-url="{{route('api.consumables.index', ['supplier_id' => $supplier->id]) }}"
+                        data-export-options='{
+                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-consumables-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                </table>
+            </div><!-- /.table-responsive -->
+        </div><!-- /.tab-pane -->
+
+
           <div class="tab-pane" id="maintenances">
             <h2 class="box-title">{{ trans('admin/asset_maintenances/general.asset_maintenances') }}</h2>
             <div class="table table-responsive">

From a40bad097231ccadaba68ed768f7c15ebc75fc73 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:04:13 -0700
Subject: [PATCH 10/23] Added consumables and components columns to supplier
 list

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/suppliers/index.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 894a6f459..aa1577a37 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -54,6 +54,8 @@
             <th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th>
             <th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th>
             <th data-searchable="false" data-sortable="true" data-field="licenses_count">{{ trans('admin/suppliers/table.licenses') }}</th>
+            <th data-searchable="false" data-sortable="true" data-field="components_count">{{ trans('general.components') }}</th>
+            <th data-searchable="false" data-sortable="true" data-field="consumables_count">{{ trans('general.consumables') }}</th>
             <th data-switchable="false" data-formatter="suppliersActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
           </tr>
         </thead>

From 65bb0486d4b1d973fc323b03b829526576e3ab2f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:04:29 -0700
Subject: [PATCH 11/23] Changed blade to use standard required check

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/partials/forms/edit/supplier-select.blade.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index 829d0a9c2..2bee81add 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -2,14 +2,14 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+    <div class="col-md-7{{  (Helper::checkIfRequired($item, $fieldname)) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}">
             @if ($supplier_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true" role="option">
                     {{ (\App\Models\Supplier::find($supplier_id)) ? \App\Models\Supplier::find($supplier_id)->name : '' }}
                 </option>
             @else
-                <option value=""  role="option">{{ trans('general.select_supplier') }}</option>
+                <option value="" role="option">{{ trans('general.select_supplier') }}</option>
             @endif
         </select>
     </div>

From b6d3f2827b36a4ef95aae946921ec553d68bee99 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:05:52 -0700
Subject: [PATCH 12/23] Switched to standardized require check

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/forms/edit/category-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index 402c959cc..ba84dc7e7 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -3,7 +3,7 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+    <div class="col-md-7{{  (Helper::checkIfRequired($item, $fieldname)) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' data-validation="required" required' : '' !!}>
             @if ($category_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $category_id }}" selected="selected" role="option" aria-selected="true"  role="option">

From 607ab3988a88f267c2bea175c3b6e730d22699fd Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:06:07 -0700
Subject: [PATCH 13/23] Added supplier to edit/creatre blade

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/components/edit.blade.php  | 1 +
 resources/views/consumables/edit.blade.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 1567ec5a8..5279f0399 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -17,6 +17,7 @@
 @include ('partials.forms.edit.serial', ['fieldname' => 'serial'])
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 @include ('partials.forms.edit.order_number')
 @include ('partials.forms.edit.purchase_date')
 @include ('partials.forms.edit.purchase_cost')
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index 6217aab3f..f32e74b19 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -11,6 +11,7 @@
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/consumables/table.title')])
 @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'consumable'])
+@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.model_number')

From 45142c688897d900688cb23c61b7b75fb2ea5ae6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:06:49 -0700
Subject: [PATCH 14/23] Migration to add supplier ID to components and
 consumables

Signed-off-by: snipe <snipe@snipe.net>
---
 ...4_12_135822_add_supplier_to_components.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 database/migrations/2023_04_12_135822_add_supplier_to_components.php

diff --git a/database/migrations/2023_04_12_135822_add_supplier_to_components.php b/database/migrations/2023_04_12_135822_add_supplier_to_components.php
new file mode 100644
index 000000000..447c7850a
--- /dev/null
+++ b/database/migrations/2023_04_12_135822_add_supplier_to_components.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSupplierToComponents extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (!Schema::hasColumn('components', 'supplier_id')) {
+                $table->integer('supplier_id')->after('user_id')->nullable()->default(null);
+            }
+        });
+
+        Schema::table('consumables', function (Blueprint $table) {
+            if (!Schema::hasColumn('consumables', 'supplier_id')) {
+                $table->integer('supplier_id')->after('user_id')->nullable()->default(null);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (Schema::hasColumn('components', 'supplier_id')) {
+                $table->dropColumn('supplier_id');
+            }
+        });
+
+        Schema::table('consumables', function (Blueprint $table) {
+            if (Schema::hasColumn('consumables', 'supplier_id')) {
+                $table->dropColumn('supplier_id');
+            }
+        });
+    }
+}

From e7c6771e73ff39a0ab85e88398cbba8c3ee83abe Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:07:22 -0700
Subject: [PATCH 15/23] Added supplier to components and consumables factories
 for seeding

Signed-off-by: snipe <snipe@snipe.net>
---
 database/factories/ComponentFactory.php  | 2 ++
 database/factories/ConsumableFactory.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/database/factories/ComponentFactory.php b/database/factories/ComponentFactory.php
index 6db9ef24f..caac70078 100644
--- a/database/factories/ComponentFactory.php
+++ b/database/factories/ComponentFactory.php
@@ -7,6 +7,7 @@ use App\Models\Company;
 use App\Models\Component;
 use App\Models\Location;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use App\Models\Supplier;
 
 class ComponentFactory extends Factory
 {
@@ -35,6 +36,7 @@ class ComponentFactory extends Factory
             'purchase_cost' => $this->faker->randomFloat(2),
             'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
             'company_id' => Company::factory(),
+            'supplier_id' => Supplier::factory(),
         ];
     }
 
diff --git a/database/factories/ConsumableFactory.php b/database/factories/ConsumableFactory.php
index 8dd56229e..544499971 100644
--- a/database/factories/ConsumableFactory.php
+++ b/database/factories/ConsumableFactory.php
@@ -8,6 +8,7 @@ use App\Models\Consumable;
 use App\Models\Manufacturer;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use App\Models\Supplier;
 
 class ConsumableFactory extends Factory
 {
@@ -36,6 +37,7 @@ class ConsumableFactory extends Factory
             'qty' => $this->faker->numberBetween(5, 10),
             'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
             'company_id' => Company::factory(),
+            'supplier_id' => Supplier::factory(),
         ];
     }
 

From 3aac8bccd2f7119d4325b1aafdd45b55039de5dc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:09:59 -0700
Subject: [PATCH 16/23] Added presenters for suppliers

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/ComponentPresenter.php  | 9 +++++++++
 app/Presenters/ConsumablePresenter.php | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 16a96f3c4..c7468911a 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -59,6 +59,15 @@ class ComponentPresenter extends Presenter
                 'title' => trans('general.category'),
                 'formatter' => 'categoriesLinkObjFormatter',
             ], [
+                'field' => 'supplier',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.supplier'),
+                'visible' => false,
+                'formatter' => 'suppliersLinkObjFormatter',
+            ],
+            [
                 'field' => 'qty',
                 'searchable' => false,
                 'sortable' => true,
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index e931fc122..abb599de4 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -53,6 +53,14 @@ class ConsumablePresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.category'),
                 'formatter' => 'categoriesLinkObjFormatter',
+            ], [
+                'field' => 'supplier',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.supplier'),
+                'visible' => false,
+                'formatter' => 'suppliersLinkObjFormatter',
             ], [
                 'field' => 'model_number',
                 'searchable' => true,

From 6097d534e98d6fd00adc84686495ec9b2843af71 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:10:16 -0700
Subject: [PATCH 17/23] Added eloquent model relationships

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Component.php  | 30 +++++++++++++++++++++++++++++-
 app/Models/Consumable.php | 27 +++++++++++++++++++++++++++
 app/Models/Supplier.php   | 24 ++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/app/Models/Component.php b/app/Models/Component.php
index 98230132b..052ec1219 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -33,7 +33,8 @@ class Component extends SnipeModel
         'name'           => 'required|min:3|max:255',
         'qty'            => 'required|integer|min:1',
         'category_id'    => 'required|integer|exists:categories,id',
-        'company_id'     => 'integer|nullable',
+        'supplier_id'    => 'nullable|integer|exists:suppliers,id',
+        'company_id'     => 'integer|nullable|exists:companies,id',
         'min_amt'        => 'integer|min:0|nullable',
         'purchase_date'   => 'date_format:Y-m-d|nullable',
         'purchase_cost'  => 'numeric|nullable|gte:0',
@@ -57,6 +58,7 @@ class Component extends SnipeModel
     protected $fillable = [
         'category_id',
         'company_id',
+        'supplier_id',
         'location_id',
         'name',
         'purchase_cost',
@@ -86,6 +88,7 @@ class Component extends SnipeModel
         'category'     => ['name'],
         'company'      => ['name'],
         'location'     => ['name'],
+        'supplier'     => ['name'],
     ];
 
 
@@ -168,6 +171,18 @@ class Component extends SnipeModel
         return $this->belongsTo(\App\Models\Category::class, 'category_id');
     }
 
+    /**
+     * Establishes the item -> supplier relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
+    }
+
     /**
      * Establishes the component -> action logs relationship
      *
@@ -247,4 +262,17 @@ class Component extends SnipeModel
     {
         return $query->leftJoin('companies', 'components.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
     }
+
+    /**
+     * Query builder scope to order on supplier
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderSupplier($query, $order)
+    {
+        return $query->leftJoin('suppliers', 'components.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
+    }
 }
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index ea4ac6086..a3a0d5917 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -27,6 +27,7 @@ class Consumable extends SnipeModel
         'requestable'    => 'boolean',
         'category_id'    => 'integer',
         'company_id'     => 'integer',
+        'supplier_id',
         'qty'            => 'integer',
         'min_amt'        => 'integer',    
      ];
@@ -95,6 +96,7 @@ class Consumable extends SnipeModel
         'company'      => ['name'],
         'location'     => ['name'],
         'manufacturer' => ['name'],
+        'supplier'     => ['name'],
     ];
 
 
@@ -249,6 +251,18 @@ class Consumable extends SnipeModel
         return $this->belongsToMany(\App\Models\User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps();
     }
 
+    /**
+     * Establishes the item -> supplier relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
+    }
+
 
     /**
      * Determine whether to send a checkin/checkout email based on
@@ -376,4 +390,17 @@ class Consumable extends SnipeModel
     {
         return $query->leftJoin('companies', 'consumables.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
     }
+
+    /**
+     * Query builder scope to order on supplier
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderSupplier($query, $order)
+    {
+        return $query->leftJoin('suppliers', 'consumables.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
+    }
 }
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 393e7ddb2..d60d3c42f 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -121,6 +121,30 @@ class Supplier extends SnipeModel
         return $this->hasMany(\App\Models\Accessory::class, 'supplier_id');
     }
 
+    /**
+     * Establishes the supplier -> component relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function components()
+    {
+        return $this->hasMany(\App\Models\Component::class, 'supplier_id');
+    }
+
+    /**
+     * Establishes the supplier -> component relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v6.1.1]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function consumables()
+    {
+        return $this->hasMany(\App\Models\Consumable::class, 'supplier_id');
+    }
+
     /**
      * Establishes the supplier -> asset maintenances relationship
      *

From 6e183f2cedd9a62822f08b638dffab0ed16aa9c6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:10:32 -0700
Subject: [PATCH 18/23] Added counters for consumables and components

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/SuppliersTransformer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index 71307a750..e7546bfd1 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -41,6 +41,8 @@ class SuppliersTransformer
                 'assets_count' => (int) $supplier->assets_count,
                 'accessories_count' => (int) $supplier->accessories_count,
                 'licenses_count' => (int) $supplier->licenses_count,
+                'consumables_count' => (int) $supplier->consumables_count,
+                'components_count' => (int) $supplier->components_count,
                 'notes' => ($supplier->notes) ? e($supplier->notes) : null,
                 'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),

From ab7c75232b58d80ce12375d68d5413bd78558893 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:10:51 -0700
Subject: [PATCH 19/23] Added supplier to transformers

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/ComponentsTransformer.php  | 1 +
 app/Http/Transformers/ConsumablesTransformer.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index 1610c3da5..97677af28 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -37,6 +37,7 @@ class ComponentsTransformer
                 'id' => (int) $component->category->id,
                 'name' => e($component->category->name),
             ] : null,
+            'supplier' => ($component->supplier) ? ['id' => $component->supplier->id, 'name'=> e($component->supplier->name)] : null,
             'order_number'  => e($component->order_number),
             'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
index 5079b2896..b92f843b7 100644
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -31,6 +31,7 @@ class ConsumablesTransformer
             'item_no'       => e($consumable->item_no),
             'location'      => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null,
             'manufacturer'  => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null,
+            'supplier' => ($consumable->supplier) ? ['id' => $consumable->supplier->id, 'name'=> e($consumable->supplier->name)] : null,
             'min_amt'       => (int) $consumable->min_amt,
             'model_number'  => ($consumable->model_number != '') ? e($consumable->model_number) : null,
             'remaining'  => $consumable->numRemaining(),

From 07c0a1927bac78aa9d05ee1ebc5ba9d038cff1a9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:12:01 -0700
Subject: [PATCH 20/23] Added supplier id to controllers

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Components/ComponentsController.php   | 2 ++
 app/Http/Controllers/Consumables/ConsumablesController.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
index f943a71a2..2ada97361 100644
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -71,6 +71,7 @@ class ComponentsController extends Controller
         $component = new Component();
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
+        $component->supplier_id            = $request->input('supplier_id');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number', null);
@@ -145,6 +146,7 @@ class ComponentsController extends Controller
         // Update the component data
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
+        $component->supplier_id            = $request->input('supplier_id');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number');
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index f068e9868..0a40c0bb3 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -68,6 +68,7 @@ class ConsumablesController extends Controller
         $consumable = new Consumable();
         $consumable->name                   = $request->input('name');
         $consumable->category_id            = $request->input('category_id');
+        $consumable->supplier_id            = $request->input('supplier_id');
         $consumable->location_id            = $request->input('location_id');
         $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $consumable->order_number           = $request->input('order_number');
@@ -144,6 +145,7 @@ class ConsumablesController extends Controller
 
         $consumable->name                   = $request->input('name');
         $consumable->category_id            = $request->input('category_id');
+        $consumable->supplier_id            = $request->input('supplier_id');
         $consumable->location_id            = $request->input('location_id');
         $consumable->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $consumable->order_number           = $request->input('order_number');

From d2b3e251ad7ae708528cda02019d2bb2ad973e4e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:12:16 -0700
Subject: [PATCH 21/23] Added counters to API controllers

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Api/SuppliersController.php   | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index f73f15049..c6da172d5 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -23,11 +23,30 @@ class SuppliersController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Supplier::class);
-        $allowed_columns = ['id', 'name', 'address', 'phone', 'contact', 'fax', 'email', 'image', 'assets_count', 'licenses_count', 'accessories_count', 'url'];
+        $allowed_columns = ['
+            id',
+            'name',
+            'address',
+            'phone',
+            'contact',
+            'fax',
+            'email',
+            'image',
+            'assets_count',
+            'licenses_count',
+            'accessories_count',
+            'components_count',
+            'consumables_count',
+            'url',
+        ];
         
         $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes']
-            )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('accessories as accessories_count');
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes'])
+                    ->withCount('assets as assets_count')
+                    ->withCount('licenses as licenses_count')
+                    ->withCount('accessories as accessories_count')
+                    ->withCount('components as components_count')
+                    ->withCount('consumables as consumables_count');
 
 
         if ($request->filled('search')) {

From 2fe7fcecdb24dd472b19f3a372b9f20547bf0387 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Apr 2023 11:13:45 -0700
Subject: [PATCH 22/23] Added case switch for sorting on suppliers

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/ComponentsController.php  | 9 ++++++++-
 app/Http/Controllers/Api/ConsumablesController.php | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index bf281d6b2..2c1d8e75c 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -46,7 +46,7 @@ class ComponentsController extends Controller
 
 
         $components = Company::scopeCompanyables(Component::select('components.*')
-            ->with('company', 'location', 'category', 'assets'));
+            ->with('company', 'location', 'category', 'assets', 'supplier'));
 
         if ($request->filled('search')) {
             $components = $components->TextSearch($request->input('search'));
@@ -64,6 +64,10 @@ class ComponentsController extends Controller
             $components->where('category_id', '=', $request->input('category_id'));
         }
 
+        if ($request->filled('supplier_id')) {
+            $components->where('supplier_id', '=', $request->input('supplier_id'));
+        }
+
         if ($request->filled('location_id')) {
             $components->where('location_id', '=', $request->input('location_id'));
         }
@@ -94,6 +98,9 @@ class ComponentsController extends Controller
             case 'company':
                 $components = $components->OrderCompany($order);
                 break;
+            case 'supplier':
+                $components = $components->OrderSupplier($order);
+                break;
             default:
                 $components = $components->orderBy($column_sort, $order);
                 break;
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index e9a069c37..25c411963 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -75,6 +75,10 @@ class ConsumablesController extends Controller
             $consumables->where('manufacturer_id', '=', $request->input('manufacturer_id'));
         }
 
+        if ($request->filled('supplier_id')) {
+            $consumables->where('supplier_id', '=', $request->input('supplier_id'));
+        }
+
         if ($request->filled('location_id')) {
             $consumables->where('location_id','=',$request->input('location_id'));
         }
@@ -111,6 +115,9 @@ class ConsumablesController extends Controller
             case 'company':
                 $consumables = $consumables->OrderCompany($order);
                 break;
+            case 'supplier':
+                $components = $consumables->OrderSupplier($order);
+                break;
             default:
                 $consumables = $consumables->orderBy($column_sort, $order);
                 break;

From 473241edca995fb049f63870db2acd78423890f9 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 13 Apr 2023 16:52:20 -0700
Subject: [PATCH 23/23] Move initialization of settings to trait

---
 tests/Support/InteractsWithSettings.php | 5 +++++
 tests/TestCase.php                      | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/Support/InteractsWithSettings.php b/tests/Support/InteractsWithSettings.php
index 0a7a9c53b..1de9e7bc1 100644
--- a/tests/Support/InteractsWithSettings.php
+++ b/tests/Support/InteractsWithSettings.php
@@ -4,5 +4,10 @@ namespace Tests\Support;
 
 trait InteractsWithSettings
 {
+    protected Settings $settings;
 
+    public function setUpSettings()
+    {
+        $this->settings = Settings::initialize();
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index c8dd66178..e3fd8a7aa 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,15 +6,12 @@ use App\Http\Middleware\SecurityHeaders;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Tests\Support\InteractsWithSettings;
-use Tests\Support\Settings;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use LazilyRefreshDatabase;
 
-    protected Settings $settings;
-
     private array $globallyDisabledMiddleware = [
         SecurityHeaders::class,
     ];
@@ -25,8 +22,8 @@ abstract class TestCase extends BaseTestCase
 
         $this->withoutMiddleware($this->globallyDisabledMiddleware);
 
-        if (in_array(InteractsWithSettings::class, class_uses_recursive($this))) {
-            $this->settings = Settings::initialize();
+        if (collect(class_uses_recursive($this))->contains(InteractsWithSettings::class)) {
+            $this->setUpSettings();
         }
     }
 }