Fixed audit images not showing inline

2025-10-21 12:08:35 +01:00
1169 changed files with 5467 additions and 43188 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -4235,33 +4235,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "smarsching",
-      "name": "Sebastian Marsching",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2880129?v=4",
-      "profile": "http://sebastian.marsching.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mohammad-ahmadi1",
-      "name": "Mo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/40658372?v=4",
-      "profile": "https://github.com/mohammad-ahmadi1",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "MarvelousAnything",
-      "name": "Owen V. Hayes",
-      "avatar_url": "https://avatars.githubusercontent.com/u/20994684?v=4",
-      "profile": "https://github.com/MarvelousAnything",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.env.dev.docker
+++ b/.env.dev.docker
@@ -137,8 +137,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -149,8 +147,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
--- a/.env.docker
+++ b/.env.docker
@@ -144,8 +144,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -156,8 +154,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
--- a/.env.example
+++ b/.env.example
@@ -143,8 +143,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -155,8 +153,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -194,14 +190,13 @@ APP_ALLOW_INSECURE_HOSTS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
-BACKUP_TIME_LIMIT=600
 IMPORT_TIME_LIMIT=600
 IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
 LIVEWIRE_URL_PREFIX=null
-MAX_UNPAGINATED=5000
+

 # --------------------------------------------
 # OPTIONAL: SAML SETTINGS
--- a/.github/workflows/SA-codeql.yml
+++ b/.github/workflows/SA-codeql.yml
@@ -26,7 +26,7 @@ jobs:
        language: [ 'javascript' ]
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -32,7 +32,7 @@ jobs:
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      - name: Crowdin push
        uses: crowdin/github-action@v2
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -42,7 +42,7 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
--- a/.github/workflows/docker-ubuntu.yml
+++ b/.github/workflows/docker-ubuntu.yml
@@ -42,7 +42,7 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -11,7 +11,7 @@ jobs:
  dockerHubDescription:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Docker Hub Description
        uses: grokability/dockerhub-description@7ea9d275c7cdbe2b676a093a0308c50665e3b8b4
--- a/.github/workflows/tests-mysql.yml
+++ b/.github/workflows/tests-mysql.yml
@@ -37,7 +37,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
@@ -82,7 +82,7 @@ jobs:

      - name: Upload Laravel logs as artifacts
        if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
--- a/.github/workflows/tests-postgres.yml
+++ b/.github/workflows/tests-postgres.yml
@@ -34,7 +34,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
@@ -81,7 +81,7 @@ jobs:

      - name: Upload Laravel logs as artifacts
        if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -25,7 +25,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
@@ -67,7 +67,7 @@ jobs:

      - name: Upload Laravel logs as artifacts
        if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -68,8 +68,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | [<img src="https://avatars.githubusercontent.com/u/58696401?v=4" width="110px;"/><br /><sub>Lukas Kraic</sub>](https://github.com/lukaskraic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukaskraic "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") | [<img src="https://avatars.githubusercontent.com/u/2880129?v=4" width="110px;"/><br /><sub>Sebastian Marsching</sub>](http://sebastian.marsching.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smarsching "Code") | [<img src="https://avatars.githubusercontent.com/u/40658372?v=4" width="110px;"/><br /><sub>Mo</sub>](https://github.com/mohammad-ahmadi1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mohammad-ahmadi1 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/20994684?v=4" width="110px;"/><br /><sub>Owen V. Hayes</sub>](https://github.com/MarvelousAnything)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MarvelousAnything "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/README.md
+++ b/README.md
@@ -83,7 +83,6 @@ Since the release of the JSON REST API, several third-party developers have been
 - [jamf2snipe](https://github.com/grokability/jamf2snipe) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
 - [jamf-snipe-rename](https://macblog.org/jamf-snipe-rename/) - Python script to rename computers in Jamf from Snipe-IT
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
- [Rudder2Snipe](https://github.com/norbertoaquino/rudder2snipe) by [@norbertoaquino](https://github.com/norbertoaquino) - Rudder.io integration for Snipe-IT
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
 - [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-IT.
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -8,6 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Console\Helper\ProgressIndicator;

+ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
+ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));

 /**
 * Class ObjectImportCommand
@@ -50,9 +52,6 @@ class ObjectImportCommand extends Command
     */
    public function handle()
    {
-        ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
-        ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));
-
        $this->progressIndicator = new ProgressIndicator($this->output);

        $filename = $this->argument('filename');
--- a/app/Console/Commands/SendAcceptanceReminder.php
+++ b/app/Console/Commands/SendAcceptanceReminder.php
@@ -3,18 +3,13 @@
 namespace App\Console\Commands;

 use App\Mail\UnacceptedAssetReminderMail;
-use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CurrentInventory;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Facades\Mail;

 class SendAcceptanceReminder extends Command
@@ -31,7 +26,7 @@ class SendAcceptanceReminder extends Command
     *
     * @var string
     */
-    protected $description = 'This will resend users with unaccepted items a reminder to accept or decline them.';
+    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';

    /**
     * Create a new command instance.
@@ -50,30 +45,19 @@ class SendAcceptanceReminder extends Command
     */
    public function handle()
    {
-        $pending = CheckoutAcceptance::query()
-            ->with([
-                'checkoutable' => function (MorphTo $morph) {
-                    $morph->morphWith([
-                        Asset::class       => ['model.category', 'assignedTo', 'adminuser', 'company', 'checkouts'],
-                        Accessory::class   => ['category', 'company', 'checkouts'],
-                        LicenseSeat::class => ['user', 'license', 'checkouts'],
-                        Component::class   => ['assignedTo', 'company', 'checkouts'],
-                        Consumable::class  => ['company', 'checkouts'],
-                    ]);
-                },
-                'assignedTo',
-            ])
-            ->whereHasMorph(
-                'checkoutable',
-                [Asset::class, Accessory::class, LicenseSeat::class, Component::class, Consumable::class],
-                fn ($q) => $q->whereNull('accepted_at')
-                    ->whereNull('declined_at')
-            )
-            ->pending()
-            ->get();
+        $pending = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')
+                                                ->whereHas('checkoutable', function($query) {
+                                                    $query->where('accepted_at', null)
+                                                          ->where('declined_at', null);
+                                                })
+                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.adminuser'])
+                                                ->get();

        $count = 0;
        $unacceptedAssetGroups = $pending
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            })
            ->map(function($acceptance) {
                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
            })
--- a/app/Console/Commands/SendExpectedCheckinAlerts.php
+++ b/app/Console/Commands/SendExpectedCheckinAlerts.php
@@ -9,8 +9,6 @@ use App\Notifications\ExpectedCheckinAdminNotification;
 use App\Notifications\ExpectedCheckinNotification;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Notification;
-use App\Helpers\Helper;

 class SendExpectedCheckinAlerts extends Command
 {
@@ -19,7 +17,7 @@ class SendExpectedCheckinAlerts extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:expected-checkin {--with-output : Display the results in a table in your console in addition to sending the email}';
+    protected $name = 'snipeit:expected-checkin';

    /**
     * The console command description.
@@ -44,47 +42,19 @@ class SendExpectedCheckinAlerts extends Command
    public function handle()
    {
        $settings = Setting::getSettings();
-        $interval = $settings->due_checkin_days ?? 0;
+        $interval = $settings->audit_warning_days ?? 0;
        $today = Carbon::now();
        $interval_date = $today->copy()->addDays($interval);
-        $count = 0;
-
-        if (!$this->option('with-output')) {
-            $this->info('Run this command with the --with-output option to see the full list in the console.');
-        }
-
+        
        $assets = Asset::whereNull('deleted_at')->DueOrOverdueForCheckin($settings)->orderBy('assets.expected_checkin', 'desc')->get();

-        $this->info($assets->count().' assets must be checked on or before '.Helper::getFormattedDateObject($interval_date, 'date', false));
+        $this->info($assets->count().' assets must be checked in on or before '.$interval_date.' is deadline');


        foreach ($assets as $asset) {
            if ($asset->assignedTo && (isset($asset->assignedTo->email)) && ($asset->assignedTo->email!='') && $asset->checkedOutToUser()) {
+                $this->info('Sending User ExpectedCheckinNotification to: '.$asset->assignedTo->email);
                $asset->assignedTo->notify((new ExpectedCheckinNotification($asset)));
-                $count++;
-            }
-        }
-
-        if ($this->option('with-output')) {
-            if (($assets) && ($assets->count() > 0) && ($settings->alert_email != '')) {
-                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('admin/hardware/form.tag'),
-                        trans('admin/hardware/form.model'),
-                        trans('general.model_no'),
-                        trans('general.purchase_date'),
-                        trans('admin/hardware/form.expected_checkin'),
-                    ],
-                    $assets->map(fn($assets) => [
-                        trans('general.id') => $assets->id,
-                        trans('admin/hardware/form.tag') => $assets->asset_tag,
-                        trans('admin/hardware/form.model') => $assets->model->name,
-                        trans('general.model_no') => $assets->model->model_number,
-                        trans('general.purchase_date') => $assets->purchase_date_formatted,
-                        trans('admin/hardware/form.eol_date') => $assets->expected_checkin_formattedDate ? $assets->expected_checkin_formattedDate . ' (' . $assets->expected_checkin_diff_for_humans . ')' : '',
-                    ])
-                );
            }
        }

@@ -93,11 +63,10 @@ class SendExpectedCheckinAlerts extends Command
            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item) {
                return new AlertRecipient($item);
            });
-            Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));
+
+            $this->info('Sending Admin ExpectedCheckinNotification to: '.$settings->alert_email);
+            \Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));

        }
-        
-        $this->info('Sent checkin reminders to to '.$count.' users.');
-
    }
 }
--- a/app/Console/Commands/SendInventoryAlerts.php
+++ b/app/Console/Commands/SendInventoryAlerts.php
@@ -52,9 +52,7 @@ class SendInventoryAlerts extends Command
                    return new AlertRecipient($item);
                });

-                Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
-            } else {
-                $this->info('No low inventory items found. No mail sent.');
+                \Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
            }
        } else {
            if ($settings->alert_email == '') {
--- a/app/Console/Commands/SendUpcomingAuditReport.php
+++ b/app/Console/Commands/SendUpcomingAuditReport.php
@@ -16,7 +16,7 @@ class SendUpcomingAuditReport extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:upcoming-audits {--with-output : Display the results in a table in your console in addition to sending the email}';
+    protected $signature = 'snipeit:upcoming-audits';

    /**
     * The console command description.
@@ -47,69 +47,43 @@ class SendUpcomingAuditReport extends Command
        $today = Carbon::now();
        $interval_date = $today->copy()->addDays($interval);

-        $assets_query = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->with('supplier');
-        $asset_count = $assets_query->count();
-        $this->info(number_format($asset_count) . ' assets must be audited on or before ' . $interval_date);
-        if (!$this->option('with-output')) {
-            $this->info('Run this command with the --with-output option to see the full list in the console.');
-        }
+        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->get();
+        $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');


-        if ($asset_count > 0) {
-
-            $assets_for_email = $assets_query->limit(30)->get();
-
+        if ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
            // Send a rollup to the admin, if settings dictate
-            if ($settings->alert_email != '') {
-
-                $recipients = collect(explode(',', $settings->alert_email))
-                    ->map(fn($item) => trim($item))
-                    ->filter(fn($item) => !empty($item))
-                    ->all();
-
-                Mail::to($recipients)->send(new SendUpcomingAuditMail($assets_for_email, $settings->audit_warning_days, $asset_count));
-                $this->info('Audit notification sent to: ' . $settings->alert_email);
-
-            } else {
-                $this->info('There is no admin alert email set so no email will be sent.');
-            }
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item))
+                ->filter(fn($item) => !empty($item))
+                ->all();


+            $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
+            Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));

-            if ($this->option('with-output')) {
+            $this->table(
+                [
+                    trans('general.id'),
+                    trans('general.name'),
+                    trans('general.last_audit'),
+                    trans('general.next_audit_date'),
+                    trans('mail.Days'),
+                    trans('mail.supplier'),
+                    trans('mail.assigned_to'),

-
-                // Get the full list if the user wants output in the console
-                $assets_for_output = $assets_query->limit(null)->get();
-
-                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('general.name'),
-                        trans('general.last_audit'),
-                        trans('general.next_audit_date'),
-                        trans('mail.Days'),
-                        trans('mail.supplier'),
-                        trans('mail.assigned_to'),
-
-                    ],
-                    $assets_for_output->map(fn($item) => [
-                        trans('general.id') => $item->id,
-                        trans('general.name') => $item->display_name,
-                        trans('general.last_audit') => $item->last_audit_formatted_date,
-                        trans('general.next_audit_date') => $item->next_audit_formatted_date,
-                        trans('mail.Days') => round($item->next_audit_diff_in_days),
-                        trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
-                        trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
-                    ])
-                );
-            }
-
-        } else {
-            $this->info('There are no assets due for audit in the next ' . $interval . ' days.');
+                ],
+                $assets->map(fn($item) => [
+                    trans('general.id') => $item->id,
+                    trans('general.name') => $item->display_name,
+                    trans('general.last_audit') => $item->last_audit_formatted_date,
+                    trans('general.next_audit_date') => $item->next_audit_formatted_date,
+                    trans('mail.Days') => round($item->next_audit_diff_in_days),
+                    trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
+                    trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
+                ])
+            );
        }

-
-
    }
 }
--- a/app/Console/Commands/SystemBackup.php
+++ b/app/Console/Commands/SystemBackup.php
@@ -37,8 +37,6 @@ class SystemBackup extends Command
     */
    public function handle()
    {
-        ini_set('max_execution_time', env('BACKUP_TIME_LIMIT', 600)); //600 seconds = 10 minutes
-
        if ($this->option('filename')) {
            $filename = $this->option('filename');

--- a/app/Enums/ActionType.php
+++ b/app/Enums/ActionType.php
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Enums;
-enum ActionType: string
-{
-    // General
-    case Create = 'create';
-    case Update = 'update';
-    case Delete = 'delete';
-    case Restore = 'restore';
-
-    // Assets/Accessories/Components/Licenses/Consumables
-    case Checkout = 'checkout';
-    case CheckinFrom = 'checkin from';
-    case Requested = 'requested';
-    case RequestCanceled = 'request canceled';
-    case Accepted = 'accepted';
-    case Declined = 'declined';
-    case Audit = 'audit';
-    case NoteAdded = 'note added';
-
-    // Users
-    case TwoFactorReset = '2FA reset';
-    case Merged = 'merged';
-
-    // Licenses
-    case DeleteSeats = 'delete seats';
-    case AddSeats = 'add seats';
-
-    // File Uploads
-    case Uploaded = 'uploaded';
-    case UploadDeleted = 'upload deleted';
-}
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -40,8 +40,6 @@ class IconHelper
                return 'fa-solid fa-trash-arrow-up';
            case 'external-link':
                return 'fa fa-external-link';
-            case 'link':
-                return 'fa fa-link';
            case 'email':
                return 'fa-regular fa-envelope';
            case 'phone':
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -182,11 +182,7 @@ class AccessoriesController extends Controller

            $accessory = $request->handleImages($accessory);

-            if($request->get('redirect_option') === 'back'){
-                session()->put(['redirect_option' => 'index']);
-            } else {
-                session()->put(['redirect_option' => $request->get('redirect_option')]);
-            }
+            session()->put(['redirect_option' => $request->get('redirect_option')]);

            if ($accessory->save()) {
                return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -13,9 +13,9 @@ use App\Models\Company;
 use App\Models\Contracts\Acceptable;
 use App\Models\Setting;
 use App\Models\User;
-use App\Notifications\AcceptanceItemAcceptedNotification;
-use App\Notifications\AcceptanceItemAcceptedToUserNotification;
-use App\Notifications\AcceptanceItemDeclinedNotification;
+use App\Notifications\AcceptanceAssetAcceptedNotification;
+use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
+use App\Notifications\AcceptanceAssetDeclinedNotification;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -116,6 +116,8 @@ class AcceptanceController extends Controller

        $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);

+
+
        // If signatures are required, make sure we have one
        if (Setting::getSettings()->require_accept_signature == '1') {

@@ -138,14 +140,14 @@ class AcceptanceController extends Controller
        // Convert PDF logo to base64 for TCPDF
        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
        $encoded_logo = null;
-        if (($settings->acceptance_pdf_logo) && (Storage::disk('public')->exists($settings->acceptance_pdf_logo))) {
+        if ($settings->acceptance_pdf_logo) {
            $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));
        }

        // Get the data array ready for the notifications and PDF generation
        $data = [
            'item_tag' => $item->asset_tag,
-            'item_name' => $item->display_name, // this handles licenses seats, which don't have a 'name' field
+            'item_name' => $item->name, // this handles licenses seats, which don't have a 'name' field
            'item_model' => $item->model?->name,
            'item_serial' => $item->serial,
            'item_status' => $item->assetstatus?->name,
@@ -162,9 +164,11 @@ class AcceptanceController extends Controller
            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
            'logo' => ($encoded_logo) ?? null,
            'date_settings' => $settings->date_display_format,
+            'admin' => auth()->user()->present()?->fullName,
            'qty' => $acceptance->qty ?? 1,
        ];

+
        if ($request->input('asset_acceptance') == 'accepted') {


@@ -183,13 +187,13 @@ class AcceptanceController extends Controller
                // Add the attachment for the signing user into the $data array
                $data['file'] = $pdf_filename;
                try {
-                    $assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));
+                    $assigned_user->notify((new AcceptanceAssetAcceptedToUserNotification($data))->locale($assigned_user->locale));
                } catch (\Exception $e) {
                    Log::warning($e);
                }
            }
            try {
-                $acceptance->notify((new AcceptanceItemAcceptedNotification($data))->locale(Setting::getSettings()->locale));
+                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
            } catch (\Exception $e) {
                Log::warning($e);
            }
@@ -204,7 +208,7 @@ class AcceptanceController extends Controller
                $acceptance->decline($sig_filename, $request->input('note'));
            }

-            $acceptance->notify(new AcceptanceItemDeclinedNotification($data));
+            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
            Log::debug('New event acceptance.');
            event(new CheckoutDeclined($acceptance));
            $return_msg = trans('admin/users/message.declined');
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -3,38 +3,37 @@
 namespace App\Http\Controllers\Api;

 use App\Events\CheckoutableCheckedIn;
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetCheckoutRequest;
-use App\Http\Requests\FilterRequest;
 use App\Http\Requests\StoreAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
-use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\ComponentsTransformer;
+use App\Models\AccessoryCheckout;
+use App\Models\CheckoutAcceptance;
+use App\Models\LicenseSeat;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Gate;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\AssetCheckoutRequest;
+use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\AccessoryCheckout;
 use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\License;
-use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use App\View\Label;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
+use App\View\Label;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;

@@ -57,7 +56,7 @@ class AssetsController extends Controller
     * @param int $assetId
     * @since [v4.0]
     */
-    public function index(FilterRequest $request, $action = null, $upcoming_status = null) : JsonResponse | array
+    public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array
    {


--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -43,7 +43,6 @@ class CategoriesController extends Controller
            'created_at',
            'updated_at',
            'image',
-            'tag_color',
            'notes',
        ];

@@ -58,7 +57,6 @@ class CategoriesController extends Controller
            'require_acceptance',
            'checkin_email',
            'image',
-            'tag_color',
            'notes',
            ])
            ->with('adminuser')
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -38,7 +38,6 @@ class CompaniesController extends Controller
            'accessories_count',
            'consumables_count',
            'components_count',
-            'tag_color',
            'notes',
        ];

@@ -65,11 +64,6 @@ class CompaniesController extends Controller
            $companies->where('created_by', '=', $request->input('created_by'));
        }

-        if ($request->filled('tag_color')) {
-            $companies->where('tag_color', '=', $request->input('tag_color'));
-        }
-
-

        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');
@@ -197,7 +191,6 @@ class CompaniesController extends Controller
            'companies.name',
            'companies.email',
            'companies.image',
-            'companies.tag_color',
        ]);


--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -58,8 +58,8 @@ class ComponentsController extends Controller
            ];

        $components = Component::select('components.*')
-            ->with('company', 'location', 'category', 'supplier', 'adminuser', 'manufacturer')
-            ->withSum('uncontrainedAssets as sum_unconstrained_assets', 'components_assets.assigned_qty');
+            ->with('company', 'location', 'category', 'assets', 'supplier', 'adminuser', 'manufacturer', 'uncontrainedAssets')
+            ->withSum('uncontrainedAssets', 'components_assets.assigned_qty');

        $filter = [];

@@ -112,8 +112,7 @@ class ComponentsController extends Controller
        }

        // Make sure the offset and limit are actually integers and do not exceed system limits
-        $components_count = $components->count();
-        $offset = ($request->input('offset') > $components_count) ? $components_count : app('api_offset_value');
+        $offset = ($request->input('offset') > $components->count()) ? $components->count() : app('api_offset_value');
        $limit = app('api_limit_value');

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -144,7 +143,7 @@ class ComponentsController extends Controller
                break;
        }

-        $total = $components_count;
+        $total = $components->count();
        $components = $components->skip($offset)->take($limit)->get();

        return (new ComponentsTransformer)->transformComponents($components, $total);
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreDepartmentRequest;
 use App\Http\Transformers\DepartmentsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Department;
@@ -24,23 +23,21 @@ class DepartmentsController extends Controller
    public function index(Request $request) : JsonResponse | array
    {
        $this->authorize('view', Department::class);
-        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes', 'tag_color'];
+        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];

        $departments = Department::select(
-            [
-                'departments.id',
-                'departments.name',
-                'departments.phone',
-                'departments.fax',
-                'departments.location_id',
-                'departments.company_id',
-                'departments.manager_id',
-                'departments.created_at',
-                'departments.updated_at',
-                'departments.image',
-                'departments.tag_color',
-                'departments.notes'
-            ])->with('location')->with('manager')->with('company')->withCount('users as users_count');
+            'departments.id',
+            'departments.name',
+            'departments.phone',
+            'departments.fax',
+            'departments.location_id',
+            'departments.company_id',
+            'departments.manager_id',
+            'departments.created_at',
+            'departments.updated_at',
+            'departments.image',
+            'departments.notes',
+        )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');

        if ($request->filled('search')) {
            $departments = $departments->TextSearch($request->input('search'));
@@ -62,10 +59,6 @@ class DepartmentsController extends Controller
            $departments->where('location_id', '=', $request->input('location_id'));
        }

-        if ($request->filled('tag_color')) {
-            $departments->where('tag_color', '=', $request->input('departments.tag_color'));
-        }
-
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $departments->count()) ? $departments->count() : app('api_offset_value');
        $limit = app('api_limit_value');
@@ -101,17 +94,18 @@ class DepartmentsController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     */
-    public function store(StoreDepartmentRequest $request): JsonResponse
+    public function store(ImageUploadRequest $request) : JsonResponse
    {
+        $this->authorize('create', Department::class);
        $department = new Department;
-        $department->fill($request->validated());
+        $department->fill($request->all());
        $department = $request->handleImages($department);

        $department->created_by = auth()->id();
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);

        if ($department->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.create.success')));
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));

@@ -127,7 +121,7 @@ class DepartmentsController extends Controller
    public function show($id) : array
    {
        $this->authorize('view', Department::class);
-        $department = Department::withCount('users as users_count')->findOrFail($id);
+        $department = Department::findOrFail($id);
        return (new DepartmentsTransformer)->transformDepartment($department);
    }

@@ -147,7 +141,7 @@ class DepartmentsController extends Controller
        $department = $request->handleImages($department);

        if ($department->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.update.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.update.success')));
        }

        return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));
@@ -191,7 +185,6 @@ class DepartmentsController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -24,7 +24,7 @@ class GroupsController extends Controller

        $this->authorize('view', Group::class);

-        $groups = Group::select(['id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by'])->with('adminuser')->withCount('users as users_count');
+        $groups = Group::select('id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count');

        if ($request->filled('search')) {
            $groups = $groups->TextSearch($request->input('search'));
@@ -50,7 +50,6 @@ class GroupsController extends Controller
                    'id',
                    'name',
                    'created_at',
-                    'updated_at',
                    'users_count',
                ];

--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -26,11 +26,11 @@ class LicenseSeatsController extends Controller
        if ($license = License::find($licenseId)) {
            $this->authorize('view', $license);

-            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department',  'user.company', 'asset.company')
+            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department')
                ->where('license_seats.license_id', $licenseId);

            if ($request->input('status') == 'available') {
-                $seats->whereNull('license_seats.assigned_to')->whereNull('license_seats.asset_id');
+                $seats->whereNull('license_seats.assigned_to');
            }

            if ($request->input('status') == 'assigned') {
@@ -40,10 +40,8 @@ class LicenseSeatsController extends Controller

            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

-            if ($request->input('sort') == 'assigned_user.department') {
+            if ($request->input('sort') == 'department') {
                $seats->OrderDepartments($order);
-            } elseif ($request->input('sort') == 'assigned_user.company') {
-                    $seats->OrderCompany($order);
            } else {
                $seats->orderBy('updated_at', $order);
            }
@@ -79,14 +77,17 @@ class LicenseSeatsController extends Controller
    {

        $this->authorize('view', License::class);
-
-        if ($licenseSeat = LicenseSeat::where('license_id', $licenseId)->find($seatId)) {
-            return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
+        // sanity checks:
+        // 1. does the license seat exist?
+        if (! $licenseSeat = LicenseSeat::find($seatId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
+        }
+        // 2. does the seat belong to the specified license?
+        if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
        }

-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat ID or license not found or the seat does not belong to this license'));
-
-
+        return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
    }

    /**
@@ -119,22 +120,17 @@ class LicenseSeatsController extends Controller

        // check if this update is a checkin operation
        // 1. are relevant fields touched at all?
-        $assignmentTouched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
-        $anythingTouched = $licenseSeat->isDirty();
+        $touched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
+        // 2. are they cleared? if yes then this is a checkin operation
+        $is_checkin = ($touched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null);

-        if (! $anythingTouched) {
-            return response()->json(
-                Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))
-            );
+        if (! $touched) {
+            // nothing to update
+            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
        }
-        if( $assignmentTouched && $licenseSeat->unreassignable_seat) {
+        if( $touched && $licenseSeat->unreassignable_seat) {
            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.checkout.unavailable')));
        }
-
-        // 2. are they cleared? if yes then this is a checkin operation
-        $is_checkin = ($assignmentTouched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null);
-        $target = null;
-
        // the logging functions expect only one "target". if both asset and user are present in the request,
        // we simply let assets take precedence over users...
        if ($licenseSeat->isDirty('assigned_to')) {
@@ -144,23 +140,25 @@ class LicenseSeatsController extends Controller
            $target = $is_checkin ? $oldAsset : Asset::find($licenseSeat->asset_id);
        }

-        if ($assignmentTouched && is_null($target)){
+        if (is_null($target)){
            return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
        }

        if ($licenseSeat->save()) {
-            if($assignmentTouched) {
-                if ($is_checkin) {
-                    if (!$licenseSeat->license->reassignable) {
-                        $licenseSeat->unreassignable_seat = true;
-                        $licenseSeat->save();
-                    }
-                    $licenseSeat->logCheckin($target, $licenseSeat->notes);
-                } else {
-                    // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
-                    $licenseSeat->logCheckout($request->input('notes'), $target);
+
+            if ($is_checkin) {
+                if(!$licenseSeat->license->reassignable){
+                    $licenseSeat->unreassignable_seat = true;
+                    $licenseSeat->save();
                }
+                $licenseSeat->logCheckin($target, $licenseSeat->notes);
+
+                return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
            }
+
+            // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
+            $licenseSeat->logCheckout($request->input('notes'), $target);
+
            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
        }

--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -59,7 +59,6 @@ class LocationsController extends Controller
            'state',
            'updated_at',
            'zip',
-            'tag_color',
            'notes',
            ];

@@ -82,8 +81,6 @@ class LocationsController extends Controller
            'locations.ldap_ou',
            'locations.currency',
            'locations.company_id',
-            'locations.tag_color',
-            'locations.tag_color',
            'locations.notes',
            'locations.created_by',
            'locations.deleted_at',
@@ -148,10 +145,6 @@ class LocationsController extends Controller
            $locations->onlyTrashed();
        }

-        if ($request->filled('tag_color')) {
-            $locations->where('tag_color', '=', $request->input('locations.tag_color'));
-        }
-
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $locations->count()) ? $locations->count() : app('api_offset_value');
        $limit = app('api_limit_value');
@@ -242,7 +235,6 @@ class LocationsController extends Controller
                'locations.currency',
                'locations.company_id',
                'locations.notes',
-                'locations.tag_color',
            ])
            ->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
@@ -410,7 +402,6 @@ class LocationsController extends Controller
            'locations.name',
            'locations.parent_id',
            'locations.image',
-            'locations.tag_color',
        ]);

        // Only scope locations if the setting is enabled
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -47,7 +47,6 @@ class ManufacturersController extends Controller
            'consumables_count',
            'components_count',
            'licenses_count',
-            'tag_color',
            'notes',
        ];

@@ -64,7 +63,6 @@ class ManufacturersController extends Controller
                'updated_at',
                'image',
                'deleted_at',
-                'tag_color',
                'notes',
            ])
            ->with('adminuser')
@@ -106,10 +104,6 @@ class ManufacturersController extends Controller
            $manufacturers->where('support_email', '=', $request->input('support_email'));
        }

-        if ($request->filled('tag_color')) {
-            $manufacturers->where('tag_color', '=', $request->input('manufacturers.tag_color'));
-        }
-
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : app('api_offset_value');
        $limit = app('api_limit_value');
@@ -264,7 +258,6 @@ class ManufacturersController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -50,13 +50,12 @@ class SuppliersController extends Controller
            'accessories_count',
            'components_count',
            'consumables_count',
-            'tag_color',
            'url',
            'notes',
        ];
        
        $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip', 'tag_color'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip'])
                    ->withCount('assets as assets_count')
                    ->withCount('licenses as licenses_count')
                    ->withCount('accessories as accessories_count')
@@ -252,7 +251,6 @@ class SuppliersController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -51,14 +51,21 @@ class UploadedFilesController extends Controller
            ];


-        $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
-            ->with('adminuser');
+        if (($request->filled('action_type') && ($request->input('action_type') == 'audit'))) {
+            $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->audits()
+                ->with('adminuser');
+        } else {
+            $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
+                ->with('adminuser');
+        }
+

        $offset = ($request->input('offset') > $uploads->count()) ? $uploads->count() : abs($request->input('offset'));
        $limit = app('api_limit_value');
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

+
        // Text search on action_logs fields
        // We could use the normal Actionlogs text scope, but it's a very heavy query since it's searching across all relations
        // and we generally won't need that here
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -31,7 +31,6 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
 use App\Http\Requests\DeleteUserRequest;
 use Illuminate\Http\JsonResponse;
-use App\Http\Requests\FilterRequest;

 class UsersController extends Controller
 {
@@ -43,7 +42,7 @@ class UsersController extends Controller
     *
     * @return array
     */
-    public function index(FilterRequest $request) : array
+    public function index(Request $request) : array
    {
        $this->authorize('view', User::class);

@@ -163,11 +162,6 @@ class UsersController extends Controller

        if ($request->filled('filter')) {
            $filter = json_decode($request->input('filter'), true);
-
-            if (is_null($filter)) {
-                $filter = [];
-            }
-
            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
                return in_array($key, $allowed_columns);
            }, ARRAY_FILTER_USE_KEY);
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -78,7 +78,6 @@ class CategoriesController extends Controller
        $category->require_acceptance = $request->input('require_acceptance', '0');
        $category->alert_on_response = $request->input('alert_on_response', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
-        $category->tag_color  = $request->input('tag_color');
        $category->notes = $request->input('notes');
        $category->created_by = auth()->id();

@@ -133,7 +132,6 @@ class CategoriesController extends Controller
        $category->require_acceptance = $request->input('require_acceptance', '0');
        $category->alert_on_response = $request->input('alert_on_response', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
-        $category->tag_color  = $request->input('tag_color');
        $category->notes = $request->input('notes');

        $category = $request->handleImages($category);
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -60,7 +60,6 @@ final class CompaniesController extends Controller
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
-        $company->tag_color = $request->input('tag_color');
        $company->notes = $request->input('notes');
        $company->created_by = auth()->id();

@@ -103,7 +102,6 @@ final class CompaniesController extends Controller
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
-        $company->tag_color = $request->input('tag_color');
        $company->notes = $request->input('notes');

        $company = $request->handleImages($company);
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -30,7 +30,6 @@ use App\Models\Consumable;
 use App\Models\License;
 use App\Models\Location;
 use App\Models\Maintenance;
-use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -53,7 +52,6 @@ abstract class Controller extends BaseController
        'licenses' => License::class,
        'locations' => Location::class,
        'models' => AssetModel::class,
-        'suppliers' => Supplier::class,
        'users' => User::class,
    ];

@@ -68,7 +66,6 @@ abstract class Controller extends BaseController
        'licenses' => 'private_uploads/licenses/',
        'locations' => 'private_uploads/locations/',
        'models' => 'private_uploads/models/',
-        'suppliers' => 'private_uploads/suppliers/',
        'users' => 'private_uploads/users/',
    ];

@@ -76,14 +73,13 @@ abstract class Controller extends BaseController
        'accessories' => 'accessory',
        'maintenances' => 'maintenance',
        'assets' => 'asset',
-        'audits' => 'audits',
+        'audits' => 'audit',
        'components' => 'component',
        'consumables' => 'consumable',
        'hardware' => 'asset',
        'licenses' => 'license',
        'locations' => 'location',
        'models' => 'model',
-        'suppliers' => 'supplier',
        'users' => 'user',
    ];

--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -55,7 +55,6 @@ class DepartmentsController extends Controller
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
        $department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);
        $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
-        $department->tag_color  = $request->input('tag_color');
        $department->notes = $request->input('notes');
        $department = $request->handleImages($department);

@@ -158,7 +157,6 @@ class DepartmentsController extends Controller
        $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
        $department->phone = $request->input('phone');
        $department->fax = $request->input('fax');
-        $department->tag_color  = $request->input('tag_color');
        $department->notes = $request->input('notes');
        $department = $request->handleImages($department);

--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -7,7 +7,6 @@ use App\Models\Group;
 use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
-use \App\Models\User;

 /**
 * This controller handles all actions related to User Groups for
@@ -44,20 +43,9 @@ class GroupsController extends Controller
        $permissions = config('permissions');
        $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
        $selectedPermissions = $request->old('permissions', $groupPermissions);
-        $users_query = User::where('show_in_list', 1)->whereNull('deleted_at');
-        $users_count = $users_query->count();
-
-        $users = collect();
-        if ($users_count <= config('app.max_unpaginated_records')) {
-            $users = $users_query->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-        }

        // Show the page
-        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))
-            ->with('group', $group)
-            ->with('associated_users', [])
-            ->with('unselected_users', $users)
-            ->with('all_users_count', $users_count);
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
    }

    /**
@@ -72,23 +60,11 @@ class GroupsController extends Controller
        // create a new group instance
        $group = new Group();
        $group->name = $request->input('name');
-
-        if ($request->filled('permission')) {
-            $group->permissions = json_encode($request->array('permission'));
-        } else {
-            $group->permissions = null;
-        }
-
        $group->permissions = json_encode($request->input('permission'));
        $group->created_by = auth()->id();
        $group->notes = $request->input('notes');

        if ($group->save()) {
-
-            if ($request->filled('users_to_sync')) {
-                $associated_users = explode(',',$request->input('users_to_sync'));
-                $group->users()->sync($associated_users);
-            }
            return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
        }

@@ -111,26 +87,8 @@ class GroupsController extends Controller
        if ((!is_array($groupPermissions)) || (!$groupPermissions)) {
            $groupPermissions = [];
        }
-
        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-
-
-        $users_query = User::where('show_in_list', 1)->whereNull('deleted_at');
-        $users_count = $users_query->count();
-
-        $associated_users = collect();
-        $unselected_users = collect();
-
-        if ($users_count <= config('app.max_unpaginated_records')) {
-            $associated_users = $group->users()->where('show_in_list', 1)->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-            // Get the unselected users
-            $unselected_users = User::where('show_in_list', 1)->whereNotIn('id', $associated_users->pluck('id')->toArray())->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-        }
-
-        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'))
-            ->with('associated_users', $associated_users)
-            ->with('unselected_users', $unselected_users)
-            ->with('all_users_count', $users_count);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
    }

    /**
@@ -144,24 +102,11 @@ class GroupsController extends Controller
    public function update(Request $request, Group $group) : RedirectResponse
    {
        $group->name = $request->input('name');
-
-        if ($request->filled('permission')) {
-            $group->permissions = json_encode($request->array('permission'));
-        } else {
-            $group->permissions = null;
-        }
-
+        $group->permissions = json_encode($request->input('permission'));
        $group->notes = $request->input('notes');

-
        if (! config('app.lock_passwords')) {
            if ($group->save()) {
-
-                if ($request->has('users_to_sync')) {
-                    $associated_users = explode(',',$request->input('users_to_sync'));
-                    $group->users()->sync($associated_users);
-                }
-
                return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.update'));
            }

--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -82,7 +82,6 @@ class LocationsController extends Controller
        $location->created_by = auth()->id();
        $location->phone = request('phone');
        $location->fax = request('fax');
-        $location->tag_color  = $request->input('tag_color');
        $location->notes = $request->input('notes');
        $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));

@@ -157,7 +156,6 @@ class LocationsController extends Controller
        $location->fax = request('fax');
        $location->ldap_ou = $request->input('ldap_ou');
        $location->manager_id = $request->input('manager_id');
-        $location->tag_color  = $request->input('tag_color');
        $location->notes = $request->input('notes');

        // Only scope the location if the setting is enabled
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -101,7 +101,6 @@ class ManufacturersController extends Controller
        $manufacturer->support_email = $request->input('support_email');
        $manufacturer->notes = $request->input('notes');
        $manufacturer = $request->handleImages($manufacturer);
-        $manufacturer->tag_color  = $request->input('tag_color');

        if ($manufacturer->save()) {
            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.create.success'));
@@ -143,7 +142,6 @@ class ManufacturersController extends Controller
        $manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');
        $manufacturer->support_phone = $request->input('support_phone');
        $manufacturer->support_email = $request->input('support_email');
-        $manufacturer->tag_color  = $request->input('tag_color');
        $manufacturer->notes = $request->input('notes');

        // Set the model's image property to null if the image is being deleted
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -3,21 +3,12 @@
 namespace App\Http\Controllers;

 use App\Helpers\Helper;
-use App\Mail\CheckoutAccessoryMail;
 use App\Mail\CheckoutAssetMail;
-use App\Mail\CheckoutComponentMail;
-use App\Mail\CheckoutConsumableMail;
-use App\Mail\CheckoutLicenseMail;
 use App\Models\Accessory;
-use App\Models\AccessoryCheckout;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
-use App\Models\Checkoutable;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\LicenseSeat;
 use App\Models\Maintenance;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
@@ -27,11 +18,9 @@ use App\Models\License;
 use App\Models\ReportTemplate;
 use App\Models\Setting;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
 use \Illuminate\Contracts\View\View;
 use League\Csv\Reader;
@@ -1127,32 +1116,34 @@ class ReportsController extends Controller
        $this->authorize('reports.view');
        $showDeleted = $deleted == 'deleted';

-        $query = CheckoutAcceptance::Pending()
+        $query = CheckoutAcceptance::pending()
+            ->where('checkoutable_type', 'App\Models\Asset')
            ->with([
                'checkoutable' => function (MorphTo $query) {
-                    $query->withTrashed()->morphWith([
-                        Asset::class => ['model.category', 'assignedTo', 'company'],
-                        Accessory::class => ['category','checkouts', 'company'],
-                        LicenseSeat::class => ['user', 'license'],
-                        Component::class => ['assignedTo', 'company'],
-                        Consumable::class => ['company'],
-                    ]);
+                    $query->morphWith([
+                        AssetModel::class => ['model'],
+                        Company::class => ['company'],
+                        Asset::class => ['assignedTo'],
+                    ])->with('model.category');
                },
                'assignedTo' => function($query){
                         $query->withTrashed();
                    }
-            ])->orderByDesc('checkout_acceptances.created_at');
-
+            ]);

        if ($showDeleted) {
            $query->withTrashed();
        }

-        $itemsForReport = $query->get()
-            ->filter(fn ($unaccepted) => $unaccepted->checkoutable)
-            ->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));
+        $assetsForReport = $query->get()
+                ->map(function ($acceptance) {
+                    return [
+                        'assetItem' => $acceptance->checkoutable,
+                        'acceptance' => $acceptance,
+                    ];
+            });

-        return view('reports/unaccepted_assets', compact('itemsForReport','showDeleted' ));
+        return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
    }

    /**
@@ -1164,77 +1155,41 @@ class ReportsController extends Controller
    public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
    {
        $this->authorize('reports.view');
-        $id = $request->input('acceptance_id');
-        $query = CheckoutAcceptance::query()
-            ->with([
-                'checkoutable' => function (MorphTo $query) {
-                    $query->withTrashed()->morphWith([
-                        Asset::class       => ['model.category', 'assignedTo', 'company', 'checkouts'],
-                        Accessory::class   => ['category', 'company', 'checkouts'],
-                        LicenseSeat::class => ['user', 'license', 'checkouts'],
-                        Component::class   => ['assignedTo', 'company', 'checkouts'],
-                        Consumable::class  => ['company', 'checkouts'],
-                    ]);
-                },
-                'assignedTo' => fn ($q) => $q->withTrashed(),
-            ])
-            ->pending();
-        $acceptance = $query->find($id);
-        if (!$acceptance) {
+
+        if (!$acceptance = CheckoutAcceptance::pending()->find($request->input('acceptance_id'))) {
            Log::debug('No pending acceptances');
-            // Redirect to the unaccepted items report page with error
+            // Redirect to the unaccepted assets report page with error
            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
        }
-        $item      = $acceptance->checkoutable;
-        $assignee  = $acceptance->assignedTo ?? $item->assignedTo ?? null;
-        $email     = $assignee?->email;
-        $locale    = $assignee?->locale;

-        Log::debug(print_r($acceptance, true));
+        $assetItem = $acceptance->checkoutable;
+
+        Log::debug(print_r($assetItem, true));

        if (is_null($acceptance->created_at)){
            Log::debug('No acceptance created_at');
            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
        } else {
-            if($item instanceof LicenseSeat){
-                $logItem_res = $item->license->checkouts()->with('adminuser')->where('created_at', '=', $acceptance->created_at)->get();
-            }
-            else{
-                $logItem_res = $item->checkouts()->with('adminuser')->where('created_at', '=', $acceptance->created_at)->get();
-                }
+            $logItem_res = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get();
+
            if ($logItem_res->isEmpty()){
                Log::debug('Acceptance date mismatch');
                return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
            }
            $logItem = $logItem_res[0];
        }
+        $email = $assetItem->assignedTo?->email;
+        $locale = $assetItem->assignedTo?->locale;

        if (is_null($email) || $email === '') {
            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
        }
-        $mailable = $this->getCheckoutMailType($acceptance, $logItem);
-        Mail::to($email)->send($mailable->locale($locale));
+
+        Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note, firstTimeSending: false))->locale($locale));

        return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
    }
-    private function getCheckoutMailType(CheckoutAcceptance $acceptance, $logItem) : Mailable
-    {
-        $lookup = [
-            Accessory::class => CheckoutAccessoryMail::class,
-            Asset::class => CheckoutAssetMail::class,
-            LicenseSeat::class => CheckoutLicenseMail::class,
-            Consumable::class => CheckoutConsumableMail::class,
-            Component::class => CheckoutComponentMail::class,
-        ];
-        $mailable= $lookup[get_class($acceptance->checkoutable)];

-        return new $mailable($acceptance->checkoutable,
-            $acceptance->checkedOutTo ?? $acceptance->assignedTo,
-            $logItem->adminuser,
-            $acceptance,
-            $acceptance->note);
-
-    }
    /**
     * sentAssetAcceptanceReminder
     *
@@ -1266,43 +1221,31 @@ class ReportsController extends Controller
    public function postAssetAcceptanceReport($deleted = false) : Response
    {
        $this->authorize('reports.view');
-        $showDeleted = request('deleted') === 'deleted';;
+        $showDeleted = $deleted == 'deleted';

        /**
         * Get all assets with pending checkout acceptances
         */
+        if($showDeleted) {
+            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        } else {
+            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        }

-            $acceptances = CheckoutAcceptance::pending()
-                ->with([
-                    'checkoutable' => function (MorphTo $acceptance) {
-                        $acceptance->withTrashed()->morphWith([
-                            Asset::class => ['model.category', 'assignedTo', 'company'],
-                            Accessory::class => ['category','checkouts', 'company'],
-                            LicenseSeat::class => ['user', 'license'],
-                            Component::class => ['assignedTo', 'company'],
-                            Consumable::class => ['company'],
-                        ]);
-                    },
-                    'assignedTo',
-                ])->orderByDesc('checkout_acceptances.created_at');
-
-            if ($showDeleted) {
-                $acceptances->withTrashed();
-            }
-
-        $itemsForReport = $acceptances->get()
-                ->filter(fn ($unaccepted) => $unaccepted->checkoutable)
-                ->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));
+        $assetsForReport = $acceptances
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            })
+            ->map(function($acceptance) {
+                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
+            });

        $rows = [];

        $header = [
-            trans('general.date'),
-            trans('general.type'),
-            trans('admin/companies/table.title'),
            trans('general.category'),
            trans('admin/hardware/form.model'),
-            trans('general.name'),
+            trans('admin/hardware/form.name'),
            trans('admin/hardware/table.asset_tag'),
            trans('admin/hardware/table.checkoutto'),
        ];
@@ -1310,19 +1253,16 @@ class ReportsController extends Controller
        $header = array_map('trim', $header);
        $rows[] = implode(',', $header);

-        foreach ($itemsForReport as $item) {
+        foreach ($assetsForReport as $item) {

-            if ($item != null){
+            if ($item['assetItem'] != null){
            
                $row    = [ ];
-                $row[]  = str_replace(',', '', $item->acceptance->created_at);
-                $row[]  = str_replace(',', '', $item->type);
-                $row[]  = str_replace(',', '', $item->plain_text_company);
-                $row[]  = str_replace(',', '', $item->plain_text_category);
-                $row[]  = str_replace(',', '', $item->plain_text_model);
-                $row[]  = str_replace(',', '', $item->plain_text_name);
-                $row[]  = str_replace(',', '', $item->asset_tag);
-                $row[]  = str_replace(',', '', ($item->acceptance->assignedto) ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'));
+                $row[]  = str_replace(',', '', e($item['assetItem']->model->category->name));
+                $row[]  = str_replace(',', '', e($item['assetItem']->model->name));
+                $row[]  = str_replace(',', '', e($item['assetItem']->name));
+                $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
+                $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->display_name : trans('admin/reports/general.deleted_user')));
                $rows[] = implode(',', $row);
            }
        }
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -589,7 +589,6 @@ class SettingsController extends Controller
        $setting->time_display_format = $request->input('time_display_format');
        $setting->digit_separator = $request->input('digit_separator');
        $setting->name_display_format = $request->input('name_display_format');
-        $setting->week_start = $request->input('week_start', 0);

        if ($setting->save()) {
            return redirect()->route('settings.index')
@@ -773,7 +772,6 @@ class SettingsController extends Controller
        $setting->label2_asset_logo = $request->input('label2_asset_logo');
        $setting->label2_1d_type = $request->input('label2_1d_type');
        $setting->label2_2d_type = $request->input('label2_2d_type');
-        $setting->label2_2d_prefix = $request->input('label2_2d_prefix');
        $setting->label2_2d_target = $request->input('label2_2d_target');
        $setting->label2_fields = $request->input('label2_fields');
        $setting->label2_empty_row_count = $request->input('label2_empty_row_count');
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -67,7 +67,6 @@ class SuppliersController extends Controller
        $supplier->phone = request('phone');
        $supplier->fax = request('fax');
        $supplier->email = request('email');
-        $supplier->tag_color  = $request->input('tag_color');
        $supplier->notes = request('notes');
        $supplier->url = $supplier->addhttp(request('url'));
        $supplier->created_by = auth()->id();
@@ -112,7 +111,6 @@ class SuppliersController extends Controller
        $supplier->fax = request('fax');
        $supplier->email = request('email');
        $supplier->url = $supplier->addhttp(request('url'));
-        $supplier->tag_color  = $request->input('tag_color');
        $supplier->notes = request('notes');
        $supplier = $request->handleImages($supplier);

--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;

 use App\Actions\CheckoutRequests\CancelCheckoutRequestAction;
 use App\Actions\CheckoutRequests\CreateCheckoutRequestAction;
-use App\Enums\ActionType;
 use App\Exceptions\AssetNotRequestable;
 use App\Models\Actionlog;
 use App\Models\Asset;
@@ -156,19 +155,7 @@ class ViewAssetsController extends Controller
    public function getRequestableIndex() : View
    {
        $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
-        $models = AssetModel::with([
-            'category',
-            'requests',
-            'assets' => function ($q) {
-                $q->where('requestable', 1)
-                    ->whereHas('assetstatus', fn ($s) =>
-                    $s->where('archived', 0)
-                        ->where(fn ($s) =>
-                        $s->where('deployable', 1)->orWhere('pending', 1)
-                        )
-                    );
-            },
-        ])->RequestableModels()->get();
+        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();

        return view('account/requestable-assets', compact('assets', 'models'));
    }
@@ -214,7 +201,7 @@ class ViewAssetsController extends Controller
        if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
            $item->cancelRequest($requestingUser);
            $data['item_quantity'] = ($item_request) ? $item_request->qty : 1;
-            $logaction->logaction(ActionType::RequestCanceled);
+            $logaction->logaction('request_canceled');

            if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
                $settings->notify(new RequestAssetCancelation($data));
--- a/app/Http/Requests/FilterRequest.php
+++ b/app/Http/Requests/FilterRequest.php
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\ValidJson;
-use Illuminate\Foundation\Http\FormRequest;
-
-class FilterRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'filter' => ['nullable', new ValidJson()],
-        ];
-    }
-}
--- a/app/Http/Requests/StoreDepartmentRequest.php
+++ b/app/Http/Requests/StoreDepartmentRequest.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\Department;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
-
-class StoreDepartmentRequest extends ImageUploadRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return Gate::allows('create', new Department);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        $modelRules = (new Department)->getRules();
-
-        return array_merge(
-            $modelRules,
-        );
-    }
-}
--- a/app/Http/Requests/StoreLabelSettings.php
+++ b/app/Http/Requests/StoreLabelSettings.php
@@ -49,7 +49,6 @@ class StoreLabelSettings extends FormRequest
            'labels_pagewidth'                    => 'numeric|nullable',
            'labels_pageheight'                   => 'numeric|nullable',
            'qr_text'                             => 'max:31|nullable',
-            'label2_2d_prefix'                    => 'nullable|max:191',
            'label2_template'                     => [
                'required',
                Rule::in($names),
--- a/app/Http/Requests/StoreNotificationSettings.php
+++ b/app/Http/Requests/StoreNotificationSettings.php
@@ -32,7 +32,7 @@ class StoreNotificationSettings extends FormRequest
            ],
            'alert_threshold'                     => 'numeric|nullable',
            'alert_interval'                      => 'numeric|nullable|gt:0',
-            'audit_warning_days'                  => 'numeric|nullable|gte:0',
+            'audit_warning_days'                  => 'numeric|nullable',
            'due_checkin_days'                    => 'numeric|nullable|gt:0',
            'audit_interval'                      => 'numeric|nullable|gt:0',
        ];
--- a/app/Http/Requests/UpdateAssetRequest.php
+++ b/app/Http/Requests/UpdateAssetRequest.php
@@ -28,31 +28,23 @@ class UpdateAssetRequest extends ImageUploadRequest
     */
    public function rules()
    {
-        $setting = Setting::getSettings();
-
        $rules = array_merge(
            parent::rules(),
            (new Asset)->getRules(),
-            // This overwrites the rulesets that are set at the model level (via Watson) but are not necessarily required at the request level when doing a PATCH update.
-            // Confusingly, this skips the unique_undeleted validator at the model level (and therefore the UniqueUndeletedTrait), so we have to re-add those
-            // rules here without the requiredness, since those values will already exist if you're updating an existing asset.
+            // this is to overwrite rulesets that include required, and rewrite unique_undeleted
            [
                'model_id'  => ['integer', 'exists:models,id,deleted_at,NULL', 'not_array'],
                'status_id' => ['integer', 'exists:status_labels,id'],
                'asset_tag' => [
                    'min:1', 'max:255', 'not_array',
-                    Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed(),
-                ],
-                'serial' => [
-                    'string', 'max:255', 'not_array',
-                    $setting->unique_serial=='1' ? Rule::unique('assets', 'serial')->ignore($this->asset)->withoutTrashed() : 'nullable',
+                    Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed()
                ],
            ],
        );

        // if the purchase cost is passed in as a string **and** the digit_separator is ',' (as is common in the EU)
        // then we tweak the purchase_cost rule to make it a string
-        if ($setting->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
+        if (Setting::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
            $rules['purchase_cost'] = ['nullable', 'string'];
        }

--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -26,32 +26,12 @@ class AccessoriesTransformer
            'id' => $accessory->id,
            'name' => e($accessory->name),
            'image' => ($accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory->image)) : null,
-            'company' => ($accessory->company) ? [
-                'id' => $accessory->company->id,
-                'name'=> e($accessory->company->name),
-                'tag_color'=> ($accessory->company->tag_color) ? e($accessory->company->tag_color) : null,
-            ] : null,
-            'manufacturer' => ($accessory->manufacturer) ? [
-                'id' => $accessory->manufacturer->id,
-                'name'=> e($accessory->manufacturer->name),
-                'tag_color'=> ($accessory->manufacturer->tag_color) ? e($accessory->manufacturer->tag_color) : null,
-            ] : null,
-            'supplier' => ($accessory->supplier) ? [
-                'id' => $accessory->supplier->id,
-                'name'=> e($accessory->supplier->name),
-                'tag_color'=> ($accessory->supplier->tag_color) ? e($accessory->supplier->tag_color) : null,
-            ] : null,
+            'company' => ($accessory->company) ? ['id' => $accessory->company->id, 'name'=> e($accessory->company->name)] : null,
+            'manufacturer' => ($accessory->manufacturer) ? ['id' => $accessory->manufacturer->id, 'name'=> e($accessory->manufacturer->name)] : null,
+            'supplier' => ($accessory->supplier) ? ['id' => $accessory->supplier->id, 'name'=> e($accessory->supplier->name)] : null,
            'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
-            'category' => ($accessory->category) ? [
-                'id' => $accessory->category->id,
-                'name'=> e($accessory->category->name),
-                'tag_color'=> ($accessory->category->tag_color) ? e($accessory->category->tag_color) : null,
-            ] : null,
-            'location' => ($accessory->location) ? [
-                'id' => $accessory->location->id,
-                'name'=> e($accessory->location->name),
-                'tag_color'=> ($accessory->location->tag_color) ? e($accessory->location->tag_color) : null,
-            ] : null,
+            'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null,
+            'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null,
            'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedownInline($accessory->notes) : null,
            'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
            'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -161,7 +161,6 @@ class ActionlogsTransformer
            'location' => ($actionlog->location) ? [
                'id' => (int) $actionlog->location->id,
                'name' => e($actionlog->location->name),
-                'tag_color'=> ($actionlog->location->tag_color) ? e($actionlog->location->tag_color) : null,
            ] : null,
            'created_at'    => Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
            'updated_at'    => Helper::getFormattedDateObject($actionlog->updated_at, 'datetime'),
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -44,7 +44,6 @@ class AssetModelsTransformer
            'manufacturer' => ($assetmodel->manufacturer) ? [
                'id' => (int) $assetmodel->manufacturer->id,
                'name'=> e($assetmodel->manufacturer->name),
-                'tag_color'=> ($assetmodel->manufacturer->tag_color) ? e($assetmodel->manufacturer->tag_color) : null,
            ] : null,
            'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
            'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number): null),
@@ -61,7 +60,6 @@ class AssetModelsTransformer
            'category' => ($assetmodel->category) ? [
                'id' => (int) $assetmodel->category->id,
                'name'=> e($assetmodel->category->name),
-                'tag_color'=> ($assetmodel->category->tag_color) ? e($assetmodel->category->tag_color) : null,
            ] : null,
            'fieldset' => ($assetmodel->fieldset) ? [
                'id' => (int) $assetmodel->fieldset->id,
@@ -70,7 +68,7 @@ class AssetModelsTransformer
            'default_fieldset_values' => $default_field_values,
            'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
            'requestable' => ($assetmodel->requestable == '1') ? true : false,
-            'require_serial' => ($assetmodel->require_serial == '1') ? true : false,
+            'require_serial' => $assetmodel->require_serial,
            'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
            'created_by' => ($assetmodel->adminuser) ? [
                'id' => (int) $assetmodel->adminuser->id,
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -40,6 +40,7 @@ class AssetsTransformer
            ] : null,
            'byod' => ($asset->byod ? true : false),
            'requestable' => ($asset->requestable ? true : false),
+
            'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
            'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) . ' months' : null,
            'asset_eol_date' => ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date') : null,
@@ -52,12 +53,10 @@ class AssetsTransformer
            'category' => (($asset->model) && ($asset->model->category)) ? [
                'id' => (int) $asset->model->category->id,
                'name'=> e($asset->model->category->name),
-                'tag_color'=> ($asset->model->category->tag_color) ? e($asset->model->category->tag_color) : null,
            ] : null,
            'manufacturer' => (($asset->model) && ($asset->model->manufacturer)) ? [
                'id' => (int) $asset->model->manufacturer->id,
                'name'=> e($asset->model->manufacturer->name),
-                'tag_color'=> ($asset->model->manufacturer->tag_color) ? e($asset->model->manufacturer->tag_color) : null,
            ] : null,
            'depreciation' => (($asset->model) && ($asset->model->depreciation)) ? [
                'id' => (int) $asset->model->depreciation->id,
@@ -69,24 +68,20 @@ class AssetsTransformer
            'supplier' => ($asset->supplier) ? [
                'id' => (int) $asset->supplier->id,
                'name'=> e($asset->supplier->name),
-                'tag_color'=> ($asset->supplier->tag_color) ? e($asset->supplier->tag_color) : null,
            ] : null,
            'notes' => ($asset->notes) ? Helper::parseEscapedMarkedownInline($asset->notes) : null,
            'order_number' => ($asset->order_number) ? e($asset->order_number) : null,
            'company' => ($asset->company) ? [
                'id' => (int) $asset->company->id,
                'name'=> e($asset->company->name),
-                'tag_color'=> ($asset->company->tag_color) ? e($asset->company->tag_color) : null,
            ] : null,
            'location' => ($asset->location) ? [
                'id' => (int) $asset->location->id,
                'name'=> e($asset->location->name),
-                'tag_color'=> ($asset->location->tag_color) ? e($asset->location->tag_color) : null,
            ] : null,
            'rtd_location' => ($asset->defaultLoc) ? [
                'id' => (int) $asset->defaultLoc->id,
                'name'=> e($asset->defaultLoc->name),
-                'tag_color'=> ($asset->defaultLoc->tag_color) ? e($asset->defaultLoc->tag_color) : null,
            ] : null,
            'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
            'qr' => ($setting->qr_code=='1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null,
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -66,7 +66,6 @@ class CategoriesTransformer
                    'id' => (int) $category->adminuser->id,
                    'name'=> e($category->adminuser->display_name),
                ] : null,
-                'tag_color' => $category->tag_color ? e($category->tag_color) : null,
                'notes' => Helper::parseEscapedMarkedownInline($category->notes),
                'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -40,7 +40,6 @@ class CompaniesTransformer
                    'id' => (int) $company->adminuser->id,
                    'name'=> e($company->adminuser->display_name),
                ] : null,
-                'tag_color' => ($company->tag_color!='') ? e($company->tag_color): null,
                'notes' => Helper::parseEscapedMarkedownInline($company->notes),
                'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -30,25 +30,15 @@ class ComponentsTransformer
            'location' => ($component->location) ? [
                'id' => (int) $component->location->id,
                'name' => e($component->location->name),
-                'tag_color' => $component->location->tag_color ? e($component->location->tag_color) : null,
            ] : null,
            'qty' => ($component->qty != '') ? (int) $component->qty : null,
            'min_amt' => ($component->min_amt != '') ? (int) $component->min_amt : null,
            'category' => ($component->category) ? [
                'id' => (int) $component->category->id,
                'name' => e($component->category->name),
-                'tag_color' => $component->category->tag_color ? e($component->category->tag_color) : null,
-            ] : null,
-            'supplier' => ($component->supplier) ? [
-                'id' => $component->supplier->id,
-                'name'=> e($component->supplier->name),
-                'tag_color' => $component->supplier->tag_color ? e($component->supplier->tag_color) : null,
-            ] : null,
-            'manufacturer' => ($component->manufacturer) ? [
-                'id' => $component->manufacturer->id,
-                'name'=> e($component->manufacturer->name),
-                'tag_color' => $component->manufacturer->tag_color ? e($component->manufacturer->tag_color) : null,
            ] : null,
+            'supplier' => ($component->supplier) ? ['id' => $component->supplier->id, 'name'=> e($component->supplier->name)] : null,
+            'manufacturer' => ($component->manufacturer) ? ['id' => $component->manufacturer->id, 'name'=> e($component->manufacturer->name)] : null,
            'model_number' => ($component->model_number) ? e($component->model_number) : null,
            'order_number'  => e($component->order_number),
            'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
@@ -58,7 +48,6 @@ class ComponentsTransformer
            'company'   => ($component->company) ? [
                'id' => (int) $component->company->id,
                'name' => e($component->company->name),
-                'tag_color' => $component->company->tag_color ? e($component->company->tag_color) : null,
            ] : null,
            'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,
            'created_by' => ($component->adminuser) ? [
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -26,32 +26,12 @@ class ConsumablesTransformer
            'id'            => (int) $consumable->id,
            'name'          => e($consumable->name),
            'image' =>   ($consumable->getImageUrl()) ? ($consumable->getImageUrl()) : null,
-            'category'      => ($consumable->category) ? [
-                'id' => $consumable->category->id,
-                'name' => e($consumable->category->name),
-                'tag_color' => $consumable->category->tag_color ? e($consumable->category->tag_color) : null,
-                ] : null,
-            'company'   => ($consumable->company) ? [
-                'id' => (int) $consumable->company->id,
-                'name' => e($consumable->company->name),
-                'tag_color' => $consumable->company->tag_color ? e($consumable->company->tag_color) : null,
-            ] : null,
+            'category'      => ($consumable->category) ? ['id' => $consumable->category->id, 'name' => e($consumable->category->name)] : null,
+            'company'   => ($consumable->company) ? ['id' => (int) $consumable->company->id, 'name' => e($consumable->company->name)] : null,
            'item_no'       => e($consumable->item_no),
-            'location'      => ($consumable->location) ? [
-                'id' => (int) $consumable->location->id,
-                'name' => e($consumable->location->name),
-                'tag_color' => $consumable->location->tag_color ? e($consumable->location->tag_color) : null,
-            ] : null,
-            'manufacturer'  => ($consumable->manufacturer) ? [
-                'id' => (int) $consumable->manufacturer->id,
-                'name' => e($consumable->manufacturer->name),
-                'tag_color' => $consumable->manufacturer->tag_color ? e($consumable->manufacturer->tag_color) : null,
-            ] : null,
-            'supplier' => ($consumable->supplier) ? [
-                'id' => $consumable->supplier->id,
-                'name'=> e($consumable->supplier->name),
-                'tag_color' => $consumable->supplier->tag_color ? e($consumable->supplier->tag_color) : null,
-            ] : null,
+            '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(),
--- a/app/Http/Transformers/DepartmentsTransformer.php
+++ b/app/Http/Transformers/DepartmentsTransformer.php
@@ -32,7 +32,6 @@ class DepartmentsTransformer
                'company' => ($department->company) ? [
                    'id' => (int) $department->company->id,
                    'name'=> e($department->company->name),
-                    'tag_color' => $department->company->tag_color ? e($department->company->tag_color) : null,
                ] : null,
                'manager' => ($department->manager) ? [
                    'id' => (int) $department->manager->id,
@@ -43,10 +42,8 @@ class DepartmentsTransformer
                'location' => ($department->location) ? [
                    'id' => (int) $department->location->id,
                    'name' => e($department->location->name),
-                    'tag_color' => $department->location->tag_color ? e($department->location->tag_color) : null,
                ] : null,
-                'users_count' => (int) ($department->users_count),
-                'tag_color' => $department->tag_color ? e($department->tag_color) : null,
+                'users_count' => e($department->users_count),
                'notes' => Helper::parseEscapedMarkedownInline($department->notes),
                'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -34,16 +34,8 @@ class LicenseSeatsTransformer
                        [
                            'id' => (int) $seat->user->department->id,
                            'name' => e($seat->user->department->name),
-                            'tag_color' => $seat->user->department->tag_color ? e($seat->user->department->tag_color) : null,

                        ] : null,
-                'company'=> ($seat->user->company) ?
-                    [
-                        'id' => (int) $seat->user->company->id,
-                        'name' => e($seat->user->company->name),
-                        'tag_color' => $seat->user->company->tag_color ? e($seat->user->company->tag_color) : null,
-
-                    ] : null,
                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
            ] : null,
            'assigned_asset' => ($seat->asset) ? [
@@ -54,7 +46,6 @@ class LicenseSeatsTransformer
            'location' => ($seat->location()) ? [
                'id' => (int) $seat->location()->id,
                'name'=> e($seat->location()->name),
-                'tag_color' => $seat->location()->tag_color ? e($seat->location()->tag_color) : null,
                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
            ] : null,
            'reassignable' => (bool) $seat->license->reassignable,
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -25,11 +25,7 @@ class LicensesTransformer
            'id' => (int) $license->id,
            'name' => e($license->name),
            'company' => ($license->company) ? ['id' => (int) $license->company->id, 'name'=> e($license->company->name)] : null,
-            'manufacturer' =>  ($license->manufacturer) ? [
-                'id' => (int) $license->manufacturer->id,
-                'name'=> e($license->manufacturer->name),
-                'tag_color'=> ($license->manufacturer->tag_color) ? e($license->manufacturer->tag_color) : null,
-            ] : null,
+            'manufacturer' =>  ($license->manufacturer) ? ['id' => (int) $license->manufacturer->id, 'name'=> e($license->manufacturer->name)] : null,
            'product_key' => (Gate::allows('viewKeys', License::class)) ? e($license->serial) : '------------',
            'order_number' => ($license->order_number) ? e($license->order_number) : null,
            'purchase_order' => ($license->purchase_order) ? e($license->purchase_order) : null,
@@ -48,16 +44,8 @@ class LicensesTransformer
            'license_email' => ($license->license_email) ? e($license->license_email) : null,
            'reassignable' => ($license->reassignable == 1) ? true : false,
            'maintained' => ($license->maintained == 1) ? true : false,
-            'supplier' =>  ($license->supplier) ? [
-                'id' => (int) $license->supplier->id,
-                'name'=> e($license->supplier->name),
-                'tag_color'=> ($license->supplier->tag_color) ? e($license->supplier->tag_color) : null,
-            ] : null,
-            'category' =>  ($license->category) ? [
-                'id' => (int) $license->category->id,
-                'name'=> e($license->category->name),
-                'tag_color'=> ($license->category->tag_color) ? e($license->category->tag_color) : null,
-            ] : null,
+            'supplier' =>  ($license->supplier) ? ['id' => (int) $license->supplier->id, 'name'=> e($license->supplier->name)] : null,
+            'category' =>  ($license->category) ? ['id' => (int) $license->category->id, 'name'=> e($license->category->name)] : null,
            'created_by' => ($license->adminuser) ? [
                'id' => (int) $license->adminuser->id,
                'name'=> e($license->adminuser->display_name),
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -58,7 +58,6 @@ class LocationsTransformer
                'children_count'    => (int) $location->children_count,
                'currency' =>  ($location->currency) ? e($location->currency) : null,
                'ldap_ou' =>  ($location->ldap_ou) ? e($location->ldap_ou) : null,
-                'tag_color' => $location->tag_color ? e($location->tag_color) : null,
                'notes' => Helper::parseEscapedMarkedownInline($location->notes),
                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
                'created_by' => $location->adminuser ? [
@@ -69,13 +68,11 @@ class LocationsTransformer
                'parent' => ($location->parent) ? [
                    'id' => (int) $location->parent->id,
                    'name'=> e($location->parent->name),
-                    'tag_color' => $location->parent->tag_color ? e($location->parent->tag_color) : null,
                ] : null,
                'manager' => ($location->manager) ? (new UsersTransformer)->transformUser($location->manager) : null,
                'company' => ($location->company) ? [
                    'id' => (int) $location->company->id,
-                    'name'=> e($location->company->name),
-                    'tag_color' => $location->company->tag_color ? e($location->company->tag_color) : null,
+                    'name'=> e($location->company->name)
                ] : null,

                'children' => $children_arr,
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -37,7 +37,6 @@ class ManufacturersTransformer
                'consumables_count' => (int) $manufacturer->consumables_count,
                'accessories_count' => (int) $manufacturer->accessories_count,
                'components_count' => (int) $manufacturer->components_count,
-                'tag_color' => $manufacturer->tag_color ? e($manufacturer->tag_color) : null,
                'notes' => Helper::parseEscapedMarkedownInline($manufacturer->notes),
                'created_by' => ($manufacturer->adminuser) ? [
                    'id' => (int) $manufacturer->adminuser->id,
--- a/app/Http/Transformers/SelectlistTransformer.php
+++ b/app/Http/Transformers/SelectlistTransformer.php
@@ -26,7 +26,6 @@ class SelectlistTransformer
                'id' => (int) $select_item->id,
                'text' => ($select_item->use_text) ? $select_item->use_text : $select_item->name,
                'image' => ($select_item->use_image) ? $select_item->use_image : null,
-                'tag_color' => ($select_item->tag_color) ? $select_item->tag_color : null,

            ];
        }
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -43,7 +43,6 @@ class SuppliersTransformer
                'licenses_count' => (int) $supplier->licenses_count,
                'consumables_count' => (int) $supplier->consumables_count,
                'components_count' => (int) $supplier->components_count,
-                'tag_color' => $supplier->tag_color ? e($supplier->tag_color) : null,
                'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
                'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                'created_by' => $supplier->adminuser ? [
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -57,7 +57,6 @@ class UsersTransformer
                'department' => ($user->department) ? [
                    'id' => (int) $user->department->id,
                    'name'=> e($user->department->name),
-                    'tag_color' => ($user->department->tag_color) ? e($user->department->tag_color) : null,
                ] : null,
                'department_manager' => ($user->department?->manager) ? [
                    'id' => (int) $user->department->manager->id,
@@ -66,7 +65,6 @@ class UsersTransformer
                'location' => ($user->userloc) ? [
                    'id' => (int) $user->userloc->id,
                    'name'=> e($user->userloc->name),
-                    'tag_color'=> ($user->userloc->tag_color) ? e($user->userloc->tag_color) : null,
                ] : null,
                'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
                'role' => $role,
@@ -82,11 +80,7 @@ class UsersTransformer
                'consumables_count' => (int) $user->consumables_count,
                'manages_users_count' => (int) $user->manages_users_count,
                'manages_locations_count' => (int) $user->manages_locations_count,
-                'company' => ($user->company) ? [
-                    'id' => (int) $user->company->id,
-                    'name'=> e($user->company->name),
-                    'tag_color'=> ($user->company->tag_color) ? e($user->company->tag_color) : null,
-                ] : null,
+                'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null,
                'created_by' => ($user->createdBy) ? [
                    'id' => (int) $user->createdBy->id,
                    'name'=> e($user->createdBy->display_name),
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -44,7 +44,7 @@ class AssetImporter extends ItemImporter
            foreach ($this->customFields as $customField) {
                $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);

-                if (!is_null($customFieldValue)) {
+                if ($customFieldValue) {
                    if ($customField->field_encrypted == 1) {
                        $this->item['custom_fields'][$customField->db_column_name()] = Crypt::encrypt($customFieldValue);
                        $this->log('Custom Field '.$customField->name.': '.Crypt::encrypt($customFieldValue));
--- a/app/Livewire/CategoryEditForm.php
+++ b/app/Livewire/CategoryEditForm.php
@@ -2,7 +2,6 @@

 namespace App\Livewire;

-use Livewire\Attributes\Computed;
 use Livewire\Component;

 class CategoryEditForm extends Component
@@ -13,25 +12,43 @@ class CategoryEditForm extends Component

    public $eulaText;

+    public $originalSendCheckInEmailValue;
+
    public bool $requireAcceptance;

    public bool $sendCheckInEmail;

    public bool $useDefaultEula;

+    public function mount()
+    {
+        $this->originalSendCheckInEmailValue = $this->sendCheckInEmail;
+
+        if ($this->eulaText || $this->useDefaultEula) {
+            $this->sendCheckInEmail = 1;
+        }
+    }
+
    public function render()
    {
        return view('livewire.category-edit-form');
    }

-    #[Computed]
-    public function emailWillBeSendDueToEula(): bool
+    public function updated($property, $value)
+    {
+        if (! in_array($property, ['eulaText', 'useDefaultEula'])) {
+            return;
+        }
+
+        $this->sendCheckInEmail = $this->eulaText || $this->useDefaultEula ? 1 : $this->originalSendCheckInEmailValue;
+    }
+
+    public function getShouldDisplayEmailMessageProperty(): bool
    {
        return $this->eulaText || $this->useDefaultEula;
    }

-    #[Computed]
-    public function emailMessage(): string
+    public function getEmailMessageProperty(): string
    {
        if ($this->useDefaultEula) {
            return trans('admin/categories/general.email_will_be_sent_due_to_global_eula');
@@ -40,9 +57,13 @@ class CategoryEditForm extends Component
        return trans('admin/categories/general.email_will_be_sent_due_to_category_eula');
    }

-    #[Computed]
-    public function eulaTextDisabled()
+    public function getEulaTextDisabledProperty()
    {
        return (bool)$this->useDefaultEula;
    }
+
+    public function getSendCheckInEmailDisabledProperty()
+    {
+        return $this->eulaText || $this->useDefaultEula;
+    }
 }
--- a/app/Livewire/SlackSettingsForm.php
+++ b/app/Livewire/SlackSettingsForm.php
@@ -159,7 +159,7 @@ class SlackSettingsForm extends Component
            ]);

        try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, 'headers' => ['Content-Type' => 'application/json']]);
+            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, ['headers' => ['Content-Type' => 'application/json']]]);

            if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
                return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
--- a/app/Mail/BaseMailable.php
+++ b/app/Mail/BaseMailable.php
@@ -1,18 +0,0 @@
-<?php
-namespace App\Mail;
-
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Headers;
-
-class BaseMailable extends Mailable
-{
-    public function headers(): Headers
-    {
-        return new Headers(
-            text: [
-                'X-Auto-Response-Suppress' => 'OOF, DR, RN, NRN, AutoReply',
-                'X-System-Sender' => 'Snipe-IT',
-            ]
-        );
-    }
-}
--- a/app/Mail/CheckinAccessoryMail.php
+++ b/app/Mail/CheckinAccessoryMail.php
@@ -6,12 +6,14 @@ use App\Models\Accessory;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckinAccessoryMail extends BaseMailable
+class CheckinAccessoryMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckinAssetMail.php
+++ b/app/Mail/CheckinAssetMail.php
@@ -7,13 +7,15 @@ use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\SerializesModels;

-class CheckinAssetMail extends BaseMailable
+class CheckinAssetMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckinComponentMail.php
+++ b/app/Mail/CheckinComponentMail.php
@@ -7,12 +7,14 @@ use App\Models\Component;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckinComponentMail extends BaseMailable
+class CheckinComponentMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckinLicenseMail.php
+++ b/app/Mail/CheckinLicenseMail.php
@@ -6,12 +6,14 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckinLicenseMail extends BaseMailable
+class CheckinLicenseMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckoutAcceptanceResponseMail.php
+++ b/app/Mail/CheckoutAcceptanceResponseMail.php
@@ -5,11 +5,13 @@ namespace App\Mail;
 use App\Models\CheckoutAcceptance;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckoutAcceptanceResponseMail extends BaseMailable
+class CheckoutAcceptanceResponseMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckoutAccessoryMail.php
+++ b/app/Mail/CheckoutAccessoryMail.php
@@ -8,13 +8,15 @@ use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;

-class CheckoutAccessoryMail extends BaseMailable
+class CheckoutAccessoryMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckoutAssetMail.php
+++ b/app/Mail/CheckoutAssetMail.php
@@ -8,6 +8,8 @@ use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Attachment;
 use Illuminate\Mail\Mailables\Content;
@@ -15,7 +17,7 @@ use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\SerializesModels;

-class CheckoutAssetMail extends BaseMailable
+class CheckoutAssetMail extends Mailable
 {
    use Queueable, SerializesModels;

@@ -85,7 +87,7 @@ class CheckoutAssetMail extends BaseMailable
            $name  = $this->target->assignedto?->display_name;
        }
        else if($this->target instanceof Location){
-            $name  = $this->target->manager?->name;
+            $name  = $this->target->manager->name;
        }

        // Check if the item has custom fields associated with it
--- a/app/Mail/CheckoutComponentMail.php
+++ b/app/Mail/CheckoutComponentMail.php
@@ -6,12 +6,13 @@ use App\Models\Component;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckoutComponentMail extends BaseMailable
+class CheckoutComponentMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckoutConsumableMail.php
+++ b/app/Mail/CheckoutConsumableMail.php
@@ -6,12 +6,15 @@ use App\Models\Consumable;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;

-class CheckoutConsumableMail extends BaseMailable
+class CheckoutConsumableMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/CheckoutLicenseMail.php
+++ b/app/Mail/CheckoutLicenseMail.php
@@ -7,12 +7,14 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class CheckoutLicenseMail extends BaseMailable
+class CheckoutLicenseMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/ExpiringAssetsMail.php
+++ b/app/Mail/ExpiringAssetsMail.php
@@ -3,12 +3,14 @@
 namespace App\Mail;

 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class ExpiringAssetsMail extends BaseMailable
+class ExpiringAssetsMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/ExpiringLicenseMail.php
+++ b/app/Mail/ExpiringLicenseMail.php
@@ -3,12 +3,14 @@
 namespace App\Mail;

 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class ExpiringLicenseMail extends BaseMailable
+class ExpiringLicenseMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Mail/SendUpcomingAuditMail.php
+++ b/app/Mail/SendUpcomingAuditMail.php
@@ -3,23 +3,24 @@
 namespace App\Mail;

 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class SendUpcomingAuditMail extends BaseMailable
+class SendUpcomingAuditMail extends Mailable
 {
    use Queueable, SerializesModels;

    /**
     * Create a new message instance.
     */
-    public function __construct($params, $threshold, $total)
+    public function __construct($params, $threshold)
    {
        $this->assets = $params;
        $this->threshold = $threshold;
-        $this->total = $total;
    }

    /**
@@ -31,7 +32,7 @@ class SendUpcomingAuditMail extends BaseMailable

        return new Envelope(
            from: $from,
-            subject: trans_choice('mail.upcoming-audits', $this->total, ['count' => $this->total, 'threshold' => $this->threshold]),
+            subject: trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]),
        );
    }

@@ -48,7 +49,6 @@ class SendUpcomingAuditMail extends BaseMailable
            with:  [
                'assets'  => $this->assets,
                'threshold'  => $this->threshold,
-                'total'  => $this->total,
            ],
        );
    }
--- a/app/Mail/UnacceptedAssetReminderMail.php
+++ b/app/Mail/UnacceptedAssetReminderMail.php
@@ -3,12 +3,14 @@
 namespace App\Mail;

 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;

-class UnacceptedAssetReminderMail extends BaseMailable
+class UnacceptedAssetReminderMail extends Mailable
 {
    use Queueable, SerializesModels;

--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -9,7 +9,6 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
-use App\Enums\ActionType;

 /**
 * Model for the Actionlog (the table that keeps a historical log of
@@ -336,12 +335,9 @@ class Actionlog extends SnipeModel
     * @since  [v3.0]
     * @return bool
     */
-    public function logaction(string|ActionType $actiontype)
+    public function logaction($actiontype)
    {
-        if (is_string($actiontype)) {
-            $actiontype = ActionType::from($actiontype);
-        }
-        $this->action_type = $actiontype->value;
+        $this->action_type = $actiontype;
        $this->remote_ip =  request()->ip();
        $this->user_agent = request()->header('User-Agent');
        $this->action_source = $this->determineActionSource();
@@ -364,7 +360,7 @@ class Actionlog extends SnipeModel
    {
        $now = Carbon::now();
        $last_audit_date = $this->created_at; // this is the action log's created at, not the asset itself
-        $next_audit = $last_audit_date->addMonth((int) $monthInterval); // this actually *modifies* the $last_audit_date
+        $next_audit = $last_audit_date->addMonth($monthInterval); // this actually *modifies* the $last_audit_date
        $next_audit_days = (int) round($now->diffInDays($next_audit, true));
        $override_default_next = $next_audit;

@@ -470,8 +466,6 @@ class Actionlog extends SnipeModel
    public function uploads_file_url()
    {

-
-
        if (($this->action_type == 'accepted') || ($this->action_type == 'declined')) {
            return route('log.storedeula.download', ['filename' => $this->filename]);
        }
@@ -482,6 +476,7 @@ class Actionlog extends SnipeModel
            $object = 'models';
        }

+        // @todo - remove audit special case when audits have their own file handling route
        if ($this->action_type == 'audit') {
            $object = 'audits';
        }
@@ -522,8 +517,6 @@ class Actionlog extends SnipeModel
            return 'private_uploads/locations/'.$this->filename;
        case Maintenance::class:
             return 'private_uploads/maintenances/'.$this->filename;
-        case Supplier::class:
-            return 'private_uploads/suppliers/'.$this->filename;
        case User::class:
            return 'private_uploads/users/'.$this->filename;
        default:
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -9,8 +9,6 @@ use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
-use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
 use App\Presenters\AssetPresenter;
 use App\Presenters\Presentable;
@@ -282,7 +280,7 @@ class Asset extends Depreciable
    protected function warrantyExpires(): Attribute
    {
        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths((int)$attributes['warranty_months']) : null,
+            get: fn(mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths($attributes['warranty_months']) : null,
        );
    }

@@ -408,13 +406,6 @@ class Asset extends Depreciable
        );
    }

-    protected function expectedCheckinDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('expected_checkin', $attributes)  ? Carbon::parse($this->expected_checkin)->diffForHumans() : null,
-        );
-    }
-
    /**
     * Establishes the asset -> company relationship
     *
@@ -946,37 +937,25 @@ class Asset extends Depreciable
     */
    public static function getExpiringWarrantyOrEol($days = 30)
    {
-        $now = now();
-        $end = now()->addDays($days);
-
-        $expired_assets = self::query()
-            ->where('archived', '=', '0')
+        
+        return self::where('archived', '=', '0')
            ->NotArchived()
            ->whereNull('deleted_at')
-            ->whereNotNull('asset_eol_date')
-            ->whereBetween('asset_eol_date', [$now, $end])
+            ->where(function ($query) use ($days) {
+                // Check for manual asset EOL first
+                $query->where(function ($query) use ($days) {
+                    $query->whereNotNull('asset_eol_date')
+                        ->whereBetween('asset_eol_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                // Otherwise use the warranty months + purchase date + threshold
+                })->orWhere(function ($query) use ($days) {
+                    $query->whereNotNull('purchase_date')
+                        ->whereNotNull('warranty_months')
+                        ->whereBetween('purchase_date', [Carbon::now(), Carbon::now()->addMonths('assets.warranty_months')->addDays($days)]);
+                });
+            })
+            ->orderBy('asset_eol_date', 'ASC')
+            ->orderBy('purchase_date', 'ASC')
            ->get();
-
-        $assets_with_warranties = self::query()
-            ->where('archived', '=', '0')
-            ->NotArchived()
-            ->whereNull('deleted_at')
-            ->whereNotNull('purchase_date')
-            ->whereNotNull('warranty_months')
-            ->get();
-
-        $expired_warranties = $assets_with_warranties->filter(function ($asset) use ($now, $end) {
-            $expiration_window = Carbon::parse($asset->purchase_date)->addMonths((int) $asset->warranty_months);
-
-            return $expiration_window->betweenIncluded($now, $end);
-        });
-        return $expired_assets->concat($expired_warranties)
-            ->unique('id')
-            ->sortBy([
-                ['asset_eol_date', 'ASC'],
-                ['purchase_date', 'ASC']
-            ])
-            ->values();
    }


--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -2,18 +2,16 @@

 namespace App\Models;

-use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
-use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
-use App\Presenters\AssetModelPresenter;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
+use \App\Presenters\AssetModelPresenter;
+use App\Http\Traits\TwoColumnUniqueUndeletedTrait;

 /**
 * Model for Asset Models. Asset Models contain higher level
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -73,7 +73,6 @@ class Category extends SnipeModel
        'alert_on_response',
        'use_default_eula',
        'created_by',
-        'tag_color',
        'notes',
    ];

--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -190,11 +190,6 @@ class CheckoutAcceptance extends Model
        }

        $pdf->Ln();
-
-        // Check for CJK in the translation string for date. (This is a good proxy for the rest of the document)
-        Helper::hasRtl(trans('general.date')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
-        Helper::isCjk(trans('general.date')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
-
        $pdf->writeHTML(trans('general.date') . ': ' . Helper::getFormattedDateObject(now(), 'datetime', false), true, 0, true, 0, '');

        if ($data['company_name'] != null) {
@@ -229,6 +224,7 @@ class CheckoutAcceptance extends Model
        foreach ($eula_lines as $eula_line) {
            Helper::hasRtl($eula_line) ? $pdf->setRTL(true) : $pdf->setRTL(false);
            Helper::isCjk($eula_line) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+
            $pdf->writeHTML(Helper::parseEscapedMarkedown($eula_line), true, 0, true, 0, '');
        }
        $pdf->Ln();
@@ -243,11 +239,8 @@ class CheckoutAcceptance extends Model
            $pdf->Ln();
        }

-        Helper::hasRtl(trans('general.notes')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
-        Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
-
        if ($data['note'] != null) {
-            Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+            Helper::isCjk($data['note']) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
            $pdf->writeHTML(trans('general.notes') . ': ' . e($data['note']), true, 0, true, 0, '');
            $pdf->Ln();
        }
--- a/app/Models/Checkoutable.php
+++ b/app/Models/Checkoutable.php
@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class Checkoutable
-{
-    public function __construct(
-        public int $acceptance_id,
-        public string $company,
-        public string $category,
-        public string $model,
-        public string $asset_tag,
-        public string $name,
-        public string $type,
-        public object $acceptance,
-        public object $assignee,
-        public readonly string $plain_text_category,
-        public readonly string $plain_text_model,
-        public readonly string $plain_text_name,
-        public readonly string $plain_text_company,
-    ){}
-
-    public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
-    {
-        $unaccepted_row = $unaccepted->checkoutable;
-        $acceptance = $unaccepted;
-
-        $assignee = $acceptance->assignedTo;
-        $company = $unaccepted_row?->company?->present()?->nameUrl() ?? '';
-        $category = $model = $name = $tag = '';
-        $type = $acceptance->checkoutable_item_type ?? '';
-
-
-        if($unaccepted_row instanceof Asset){
-            $category = optional($unaccepted_row->model?->category?->present())->nameUrl() ?? '';
-            $model = optional($unaccepted_row->present())->modelUrl() ?? '';
-            $name = optional($unaccepted_row->present())->nameUrl() ?? '';
-            $tag = (string) ($unaccepted_row->asset_tag ?? '');
-         }
-        if($unaccepted_row instanceof Accessory){
-            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
-            $model = $unaccepted_row->model_number ?? '';
-            $name = optional($unaccepted_row->present())->nameUrl() ?? '';
-        }
-        if($unaccepted_row instanceof LicenseSeat){
-            $category = optional($unaccepted_row->license->category?->present())->nameUrl() ?? '';
-            $company = optional($unaccepted_row->license->company?->present())?->nameUrl() ?? '';
-            $model = '';
-            $name = $unaccepted_row->license->present()->nameUrl() ?? '';
-        }
-        if($unaccepted_row instanceof Consumable){
-            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
-            $model = $unaccepted_row->model_number ?? '';
-            $name = $unaccepted_row?->present()?->nameUrl() ?? '';
-        }
-        if($unaccepted_row instanceof Component){
-            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
-            $model = $unaccepted_row->model_number ?? '';
-            $name = $unaccepted_row?->present()?->nameUrl()  ?? '';
-        }
-
-        return new self(
-            acceptance_id: $acceptance->id,
-            company: $company,
-            category: $category,
-            model: $model,
-            asset_tag: $tag,
-            name: $name,
-            type: $type,
-            acceptance: $acceptance,
-            assignee: $assignee,
-            //plain text for CSVs
-            plain_text_category: $unaccepted_row?->model?->category?->name ?? $unaccepted_row?->license?->category?->name ?? $unaccepted_row?->category?->name ?? '',
-            plain_text_model: $unaccepted_row?->model?->name ?? $unaccepted_row?->model_number ?? '',
-            plain_text_name: $unaccepted_row?->name ?? $unaccepted_row?->license?->name ?? '',
-            plain_text_company: $unaccepted_row?->company->name ?? $unaccepted_row?->license?->company?->name ?? '',
-        );
-    }
-}
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -72,7 +72,6 @@ final class Company extends SnipeModel
        'fax',
        'email',
        'created_by',
-        'tag_color',
        'notes',
    ];

--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -238,26 +237,14 @@ class Component extends SnipeModel
     * @since  [v5.0]
     * @return int
     */
-    public function numCheckedOut(bool $recalculate = false)
+    public function numCheckedOut()
    {
-        /**
-         *
-         * WARNING: This method caches the result, so if you're doing something
-         * that is going to change the number of checked-out items, make sure to pass
-         * 'true' as the first parameter to force this to recalculate the number of checked-out
-         * items!!!!!
-         *
-         */
+        $checkedout = 0;

        // In case there are elements checked out to assets that belong to a different company
        // than this asset and full multiple company support is on we'll remove the global scope,
        // so they are included in the count.
-        if (is_null($this->sum_unconstrained_assets) || $recalculate) {
-            // This, in a components-listing context, is mostly important for when it sets a 'zero' which
-            // is *not* null - so we don't have to keep recalculating for un-checked-out components
-            $this->sum_unconstrained_assets = $this->uncontrainedAssets()->sum('assigned_qty') ?? 0;
-        }
-        return $this->sum_unconstrained_assets;
+        return $this->uncontrainedAssets->sum('pivot.assigned_qty');
    }


@@ -287,19 +274,7 @@ class Component extends SnipeModel
    {
        return $this->category?->checkin_email;
    }
-    /**
-     * Get the list of checkouts for this License
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since  [v2.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function checkouts()
-    {
-        return $this->assetlog()->where('action_type', '=', 'checkout')
-            ->orderBy('created_at', 'desc')
-            ->withTrashed();
-    }
+

    /**
     * Check how many items within a component are remaining
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\ConsumablePresenter;
 use App\Presenters\Presentable;
@@ -317,20 +316,6 @@ class Consumable extends SnipeModel

        return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
    }
-    /**
-     * Get the list of checkouts for this consumable
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since  [v2.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function checkouts()
-    {
-        return $this->assetlog()->where('action_type', '=', 'checkout')
-            ->orderBy('created_at', 'desc')
-            ->withTrashed();
-    }
-
    /**
     * -----------------------------------------------
     * BEGIN MUTATORS
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\Searchable;
-use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Watson\Validating\ValidatingTrait;

@@ -23,10 +22,7 @@ class Department extends SnipeModel
     */
    protected $injectUniqueIdentifier = true;

-    protected $presenter = \App\Presenters\DepartmentPresenter::class;
-
-
-    use ValidatingTrait, UniqueUndeletedTrait, Presentable;
+    use ValidatingTrait, UniqueUndeletedTrait;

    protected $casts = [
        'manager_id'   => 'integer',
@@ -35,13 +31,10 @@ class Department extends SnipeModel
    ];

    protected $rules = [
-        'name'        => 'required|max:255|is_unique_across_company_and_location:departments,name',
-        'location_id' => 'numeric|nullable|exists:locations,id',
-        'company_id'  => 'numeric|nullable|exists:companies,id',
-        'manager_id'  => 'numeric|nullable|exists:users,id',
-        'phone'       => 'string|max:255|nullable',
-        'fax'         => 'string|max:255|nullable',
-        'notes'       => 'string|max:255|nullable',
+        'name'                  => 'required|max:255|is_unique_department',
+        'location_id'           => 'numeric|nullable',
+        'company_id'            => 'numeric|nullable',
+        'manager_id'            => 'numeric|nullable',
    ];

    /**
@@ -57,7 +50,6 @@ class Department extends SnipeModel
        'location_id',
        'company_id',
        'manager_id',
-        'tag_color',
        'notes',
    ];

--- a/app/Models/Labels/Sheets/Avery/L4736.php
+++ b/app/Models/Labels/Sheets/Avery/L4736.php
@@ -1,110 +0,0 @@
-<?php
-
-namespace App\Models\Labels\Sheets\Avery;
-
-use App\Helpers\Helper;
-use App\Models\Labels\RectangleSheet;
-
-abstract class L4736 extends RectangleSheet
-{
-
-    private const PAPER_FORMAT      = 'A4';
-    private const PAPER_ORIENTATION = 'P';
-
-    /* Data in pt from Word Template */
-	private const COLUMN1_X =  31.70;
-	private const COLUMN2_X = 167.92;
-	private const ROW1_Y    =  53.00;
-	private const ROW2_Y    = 112.8;
-	private const LABEL_W   = 122.24;	
-	private const LABEL_H   =  66.5; 
-
-    private float $pageWidth;
-    private float $pageHeight;
-    private float $pageMarginLeft;
-    private float $pageMarginTop;
-
-    private float $columnSpacing;
-    private float $rowSpacing;
-
-    private float $labelWidth;
-    private float $labelHeight;
-
-    public function __construct()
-    {
-        $paperSize = static::fromFormat(self::PAPER_FORMAT, self::PAPER_ORIENTATION, $this->getUnit(), 0);
-        $this->pageWidth = $paperSize->width;
-        $this->pageHeight = $paperSize->height;
-
-        $this->pageMarginLeft = Helper::convertUnit(self::COLUMN1_X, 'pt', $this->getUnit());
-        $this->pageMarginTop = Helper::convertUnit(self::ROW1_Y, 'pt', $this->getUnit());
-
-        $columnSpacingPt = self::COLUMN2_X - self::COLUMN1_X - self::LABEL_W;
-        $this->columnSpacing = Helper::convertUnit($columnSpacingPt, 'pt', $this->getUnit());
-        $rowSpacingPt = self::ROW2_Y - self::ROW1_Y - self::LABEL_H;
-        $this->rowSpacing = Helper::convertUnit($rowSpacingPt, 'pt', $this->getUnit());
-
-        $this->labelWidth = Helper::convertUnit(self::LABEL_W, 'pt', $this->getUnit());
-        $this->labelHeight = Helper::convertUnit(self::LABEL_H, 'pt', $this->getUnit());
-    }
-
-    public function getPageWidth()
-    {
-        return $this->pageWidth;
-    }
-    public function getPageHeight()
-    {
-        return $this->pageHeight;
-    }
-
-    public function getPageMarginTop()
-    {
-        return $this->pageMarginTop;
-    }
-    public function getPageMarginBottom()
-    {
-        return $this->pageMarginTop;
-    }
-    public function getPageMarginLeft()
-    {
-        return $this->pageMarginLeft;
-    }
-    public function getPageMarginRight()
-    {
-        return $this->pageMarginLeft;
-    }
-
-    public function getColumns()
-    {
-        return 4;
-    }
-    public function getRows()
-    {
-        return 12;
-    }
-
-    public function getLabelColumnSpacing()
-    {
-        return $this->columnSpacing;
-    }
-    public function getLabelRowSpacing()
-    {
-        return $this->rowSpacing;
-    }
-
-    public function getLabelWidth()
-    {
-        return $this->labelWidth;
-    }
-    public function getLabelHeight()
-    {
-        return $this->labelHeight;
-    }
-
-    public function getLabelBorder()
-    {
-        return 0;
-    }
-}
-
-?>
--- a/app/Models/Labels/Sheets/Avery/L4736_A.php
+++ b/app/Models/Labels/Sheets/Avery/L4736_A.php
@@ -1,137 +0,0 @@
-<?php
-
-namespace App\Models\Labels\Sheets\Avery;
-
-
-class L4736_A extends L4736
-{
-    private const BARCODE_MARGIN =   1.80;
-    private const TAG_SIZE       =   4.80;
-    private const TITLE_SIZE     =   3.00;
-    private const TITLE_MARGIN   =   1.80;
-    private const LABEL_SIZE     =   2.8;
-    private const LABEL_MARGIN   = - 0.45;
-    private const FIELD_SIZE     =   3.80;
-    private const FIELD_MARGIN   =   0.20;
-
-    public function getUnit()
-    {
-        return 'mm';
-    }
-
-    public function getLabelMarginTop()
-    {
-        return 0.06;
-    }
-    public function getLabelMarginBottom()
-    {
-        return 0.06;
-    }
-    public function getLabelMarginLeft()
-    {
-        return 0.06;
-    }
-    public function getLabelMarginRight()
-    {
-        return 0.06;
-    }
-
-    public function getSupportAssetTag()
-    {
-        return true;
-    }
-    public function getSupport1DBarcode()
-    {
-        return false;
-    }
-    public function getSupport2DBarcode()
-    {
-        return true;
-    }
-    public function getSupportFields()
-    {
-        return 4;
-    }
-    public function getSupportLogo()
-    {
-        return false;
-    }
-    public function getSupportTitle()
-    {
-        return true;
-    }
-
-    public function preparePDF($pdf)
-    {
-    }
-
-    public function write($pdf, $record)
-    {
-        $pa = $this->getLabelPrintableArea();
-
-        $currentX = $pa->x1;
-        $currentY = $pa->y1;
-        $usableWidth = $pa->w;
-        $usableHeight = $pa->h;
-
-        if ($record->has('title')) {
-            static::writeText(
-                $pdf, $record->get('title'),
-                $pa->x1, $pa->y1,
-                'freesans', '', self::TITLE_SIZE, 'C',
-                $pa->w, self::TITLE_SIZE, true, 0
-            );
-
-        }
-            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
-            $usableHeight -= self::TITLE_SIZE + self::TITLE_MARGIN;
-        $barcodeSize = $usableHeight;
-        if ($record->has('barcode2d')) {
-            static::write2DBarcode(
-                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
-                $currentX, $currentY,
-                $barcodeSize, $barcodeSize
-            );
-            $currentX += $barcodeSize + self::BARCODE_MARGIN;
-            $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        }
-        $fields = $record->get('fields');
-        $fieldCount = count($fields);
-
-        $perFieldHeight = (self::LABEL_SIZE + self::LABEL_MARGIN)
-                       + (self::FIELD_SIZE + self::FIELD_MARGIN);
-
-        $baseHeight = $fieldCount * $perFieldHeight;
-        $scale = 1.0;
-        if ($baseHeight > $usableHeight && $baseHeight > 0) {
-            $scale = $usableHeight / $baseHeight;
-        }
-
-        $labelSize   = self::LABEL_SIZE   * $scale;
-        $labelMargin = self::LABEL_MARGIN * $scale;
-        $fieldSize   = self::FIELD_SIZE   * $scale;
-        $fieldMargin = self::FIELD_MARGIN * $scale;
-
-        foreach ($fields as $field) {
-            static::writeText(
-                $pdf, $field['label'],
-                $currentX, $currentY,
-                'freesans', '', $labelSize, 'L',
-                $usableWidth, $labelSize, true, 0
-            );
-            $currentY += $labelSize + $labelMargin;
-
-            static::writeText(
-                $pdf, $field['value'],
-                $currentX, $currentY,
-                'freemono', 'B', $fieldSize, 'L',
-                $usableWidth, $fieldSize, true, 0, 0.01
-            );
-            $currentY += $fieldSize + $fieldMargin;
-        }
-
-    }
-}
-
-
-?>
--- a/Show More
+++ b/Show More