Merge remote-tracking branch 'origin/develop'

# Conflicts: # config/version.php
Bumped version
2025-11-24 12:32:17 +00:00 · 2025-11-24 12:31:50 +00:00 · 2025-11-24 12:30:22 +00:00 · 2025-11-24 12:30:07 +00:00 · 2025-11-24 11:37:44 +00:00 · 2025-11-24 11:37:14 +00:00
1450 changed files with 47010 additions and 154019 deletions
@@ -4235,6 +4235,33 @@
      "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"
+      ]
    }
  ]
 }
@@ -190,13 +190,14 @@ 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
@@ -23,7 +23,23 @@ body:
    attributes:
      label: Snipe-IT Version
      description: What version of Snipe-IT are you seeing this issue on? You can find the version number in the footer of any page in Snipe-IT.
-      placeholder: ex. v8.3.1 - build 19577 (master)
+      placeholder: ex. v8.3.2 - build 19577 (master)
+    validations:
+      required: true
+  - type: input
+    id: php-version
+    attributes:
+      label: PHP Version
+      description: What version of PHP are you running? You can find the version of PHP your webserver is running in the `Admin Settings` section in the footer, and the cli version by running `php -v` via command line .
+      placeholder: ex. v8.3.1 (web), PHP 8.4.12 (cli)
+    validations:
+      required: true
+  - type: input
+    id: composer-version
+    attributes:
+      label: Composer Version
+      description: What version of composer are you running? You can find the version number by running `composer --version`.
+      placeholder: ex. 2.8.10
    validations:
      required: true
  - type: input
@@ -48,6 +64,16 @@ body:
        - Not sure
    validations:
      required: true
+  - type: dropdown
+    id: upgrade-or-fresh
+    attributes:
+      label: Is this a fresh install or an upgrade?
+      options:
+        - Fresh install
+        - Upgrade
+        - NA
+    validations:
+      required: true
  - type: textarea
    id: what-happened
    attributes:
@@ -67,6 +93,38 @@ body:
        - Safari
        - Microsoft Edge
        - Other
+  - type: dropdown
+    id: on-demo
+    attributes:
+      label: Can you reproduce this on the public demo?
+      description: You can check this at https://demo.snipeitapp.com.
+      options:
+        - 'Yes'
+        - 'No'
+        - N/A
+    validations:
+      required: true
+  - type: dropdown
+    id: fmcs
+    attributes:
+      label: Do you have full multiple company support enabled?
+      description: You can check this in your Snipe-IT installation at `Admin Settings > General Settings > Scoping`.
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: dropdown
+    id: fmcs-location
+    attributes:
+      label: If you have full multiple company support enabled, do you have location scoping to company enabled?
+      description: You can check this in your Snipe-IT installation at `Admin Settings > General Settings > Scoping`.
+      options:
+        - 'Yes'
+        - 'No'
+        - I do not have full multiple company support enabled
+    validations:
+      required: true
  - type: textarea
    id: server-logs
    attributes:
@@ -26,14 +26,14 @@ jobs:
        language: [ 'javascript' ]
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
      with:
        languages: ${{ matrix.language }}
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
@@ -32,7 +32,7 @@ jobs:
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
@@ -52,6 +52,6 @@ jobs:

      # Upload the SARIF file generated in the previous step
      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
        with:
          sarif_file: results.sarif
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

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

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

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

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

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

      - 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@v4
+        uses: actions/upload-artifact@v5
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
@@ -34,7 +34,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

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

      - 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@v4
+        uses: actions/upload-artifact@v5
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
@@ -25,7 +25,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

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

      - 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@v4
+        uses: actions/upload-artifact@v5
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
@@ -68,7 +68,8 @@ 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/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") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Actions\Categories;
+
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssetModels;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Models\Category;
+use Illuminate\Support\Facades\Storage;
+
+class DestroyCategoryAction
+{
+    /**
+     * @throws ItemStillHasAssets
+     * @throws ItemStillHasAssetModels
+     * @throws ItemStillHasComponents
+     * @throws ItemStillHasAccessories
+     * @throws ItemStillHasLicenses
+     * @throws ItemStillHasConsumables
+     */
+    static function run(Category $category): bool
+    {
+        $category->loadCount([
+            'assets as assets_count',
+            'accessories as accessories_count',
+            'consumables as consumables_count',
+            'components as components_count',
+            'licenses as licenses_count',
+            'models as models_count'
+        ]);
+
+        if ($category->assets_count > 0) {
+            throw new ItemStillHasAssets($category);
+        }
+        if ($category->accessories_count > 0) {
+            throw new ItemStillHasAccessories($category);
+        }
+        if ($category->consumables_count > 0) {
+            throw new ItemStillHasConsumables($category);
+        }
+        if ($category->components_count > 0) {
+            throw new ItemStillHasComponents($category);
+        }
+        if ($category->licenses_count > 0) {
+            throw new ItemStillHasLicenses($category);
+        }
+        if ($category->models_count > 0) {
+            throw new ItemStillHasAssetModels($category);
+        }
+
+        Storage::disk('public')->delete('categories'.'/'.$category->image);
+        $category->delete();
+
+        return true;
+    }
+}
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Actions\Manufacturers;
+
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Models\Manufacturer;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+
+class DeleteManufacturerAction
+{
+    /**
+     * @throws ItemStillHasAssets
+     * @throws ItemStillHasComponents
+     * @throws ItemStillHasAccessories
+     * @throws ItemStillHasLicenses
+     * @throws ItemStillHasConsumables
+     */
+    static function run(Manufacturer $manufacturer): bool
+    {
+        $manufacturer->loadCount([
+            'assets as assets_count',
+            'accessories as accessories_count',
+            'consumables as consumables_count',
+            'components as components_count',
+            'licenses as licenses_count',
+        ]);
+
+        if ($manufacturer->assets_count > 0) {
+            throw new ItemStillHasAssets($manufacturer);
+        }
+        if ($manufacturer->accessories_count > 0) {
+            throw new ItemStillHasAccessories($manufacturer);
+        }
+        if ($manufacturer->consumables_count > 0) {
+            throw new ItemStillHasConsumables($manufacturer);
+        }
+        if ($manufacturer->components_count > 0) {
+            throw new ItemStillHasComponents($manufacturer);
+        }
+        if ($manufacturer->licenses_count > 0) {
+            throw new ItemStillHasLicenses($manufacturer);
+        }
+
+        if ($manufacturer->image) {
+            try {
+                Storage::disk('public')->delete('manufacturers/'.$manufacturer->image);
+            } catch (\Exception $e) {
+                Log::info($e);
+            }
+        }
+
+        $manufacturer->delete();
+        //dd($manufacturer);
+
+        return true;
+    }
+
+}
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Actions\Suppliers;
+
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Models\Supplier;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasMaintenances;
+use App\Exceptions\ItemStillHasLicenses;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+
+class DestroySupplierAction
+{
+    /**
+     *
+     * @throws ItemStillHasLicenses
+     * @throws ItemStillHasAssets
+     * @throws ItemStillHasMaintenances
+     * @throws ItemStillHasAccessories
+     * @throws ItemStillHasConsumables
+     * @throws ItemStillHasComponents
+     */
+    static function run(Supplier $supplier): bool
+    {
+        $supplier->loadCount([
+            'maintenances as maintenances_count',
+            'assets as assets_count',
+            'licenses as licenses_count',
+            'accessories as accessories_count',
+            'consumables as consumables_count',
+            'components as components_count',
+        ]);
+        if ($supplier->assets_count > 0) {
+            throw new ItemStillHasAssets($supplier);
+        }
+
+        if ($supplier->maintenances_count > 0) {
+            throw new ItemStillHasMaintenances($supplier);
+        }
+
+        if ($supplier->licenses_count > 0) {
+            throw new ItemStillHasLicenses($supplier);
+        }
+
+        if ($supplier->accessories_count > 0) {
+            throw new ItemStillHasAccessories($supplier);
+        }
+
+        if ($supplier->consumables_count > 0) {
+            throw new ItemStillHasConsumables($supplier);
+        }
+
+        if ($supplier->components_count > 0) {
+            throw new ItemStillHasComponents($supplier);
+        }
+
+        if ($supplier->image) {
+            try {
+                Storage::disk('public')->delete('suppliers/'.$supplier->image);
+            } catch (\Exception $e) {
+                Log::info($e->getMessage());
+            }
+        }
+
+        $supplier->delete();
+
+        return true;
+    }
+}
@@ -317,9 +317,21 @@ class LdapSync extends Command
            if($ldap_map["jobtitle"] != null){
                $user->jobtitle = $item['jobtitle'];
            }
+            if($ldap_map["address"] != null){
+                $user->address = $item['address'];
+            }
+            if($ldap_map["city"] != null){
+                $user->city = $item['city'];
+            }
+            if($ldap_map["state"] != null){
+                $user->state = $item['state'];
+            }
            if($ldap_map["country"] != null){
                $user->country = $item['country'];
            }
+            if($ldap_map["zip"] != null){
+                $user->zip = $item['zip'];
+            }
            if($ldap_map["dept"]  != null){
                $user->department_id = $department->id;
            }
@@ -8,8 +8,6 @@ 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
@@ -52,6 +50,9 @@ 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');
@@ -3,13 +3,18 @@
 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
@@ -26,7 +31,7 @@ class SendAcceptanceReminder extends Command
     *
     * @var string
     */
-    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
+    protected $description = 'This will resend users with unaccepted items a reminder to accept or decline them.';

    /**
     * Create a new command instance.
@@ -45,19 +50,30 @@ class SendAcceptanceReminder extends Command
     */
    public function handle()
    {
-        $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();
+        $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();

        $count = 0;
        $unacceptedAssetGroups = $pending
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset';
-            })
            ->map(function($acceptance) {
                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
            })
@@ -9,6 +9,8 @@ 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
 {
@@ -17,7 +19,7 @@ class SendExpectedCheckinAlerts extends Command
     *
     * @var string
     */
-    protected $name = 'snipeit:expected-checkin';
+    protected $signature = 'snipeit:expected-checkin {--with-output : Display the results in a table in your console in addition to sending the email}';

    /**
     * The console command description.
@@ -42,19 +44,47 @@ class SendExpectedCheckinAlerts extends Command
    public function handle()
    {
        $settings = Setting::getSettings();
-        $interval = $settings->audit_warning_days ?? 0;
+        $interval = $settings->due_checkin_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 in on or before '.$interval_date.' is deadline');
+        $this->info($assets->count().' assets must be checked on or before '.Helper::getFormattedDateObject($interval_date, 'date', false));


        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 . ')' : '',
+                    ])
+                );
            }
        }

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

        }
+        
+        $this->info('Sent checkin reminders to to '.$count.' users.');
+
    }
 }
@@ -107,7 +107,7 @@ class SendExpirationAlerts extends Command
                        trans('general.name') => $item->name,
                        trans('general.purchase_date') => $item->purchase_date_formatted,
                        trans('admin/licenses/form.expiration') => $item->expires_formatted_date,
-                        trans('mail.expires') => $item->expires_diff_for_humans,
+                        trans('mail.expires') => $item->expires_formatted_date ? $item->expires_diff_for_humans : '',
                        trans('admin/licenses/form.termination_date') => $item->terminates_formatted_date,
                        trans('mail.terminates') => $item->terminates_diff_for_humans
                    ])
@@ -52,7 +52,9 @@ class SendInventoryAlerts extends Command
                    return new AlertRecipient($item);
                });

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

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

-        $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 ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
-            // Send a rollup to the admin, if settings dictate
-            $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));
-
-            $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->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 : '',
-                ])
-            );
+        $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.');
        }

+
+        if ($asset_count > 0) {
+
+            $assets_for_email = $assets_query->limit(30)->get();
+
+            // 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.');
+            }
+
+
+
+            if ($this->option('with-output')) {
+
+
+                // 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.');
+        }
+
+
+
    }
 }
@@ -37,6 +37,8 @@ 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');

@@ -0,0 +1,33 @@
+<?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';
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasAccessories extends ItemStillHasChildren
+{
+    //
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasAssetModels extends ItemStillHasChildren
+{
+    //
+}
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasAssets extends ItemStillHasChildren
+{
+}
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasChildren extends Exception
+{
+    //public function __construct($message, $code = 0, Exception $previous = null, $parent, $children)
+    //{
+    //    trans()
+    //
+    //}
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasComponents extends ItemStillHasChildren
+{
+    //
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasConsumables extends ItemStillHasChildren
+{
+    //
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasLicenses extends ItemStillHasChildren
+{
+    //
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ItemStillHasMaintenances extends ItemStillHasChildren
+{
+    //
+}
@@ -40,6 +40,8 @@ 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':
@@ -195,6 +197,10 @@ class IconHelper
            case 'note':
            case 'notes':
                return 'fas fa-sticky-note';
+            case 'tip':
+                return 'fa-solid fa-lightbulb';
+            case 'highlight':
+                return 'fa-solid fa-highlighter';
        }
    }
 }
@@ -182,7 +182,11 @@ class AccessoriesController extends Controller

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

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

            if ($accessory->save()) {
                return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
@@ -13,9 +13,9 @@ use App\Models\Company;
 use App\Models\Contracts\Acceptable;
 use App\Models\Setting;
 use App\Models\User;
-use App\Notifications\AcceptanceAssetAcceptedNotification;
-use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
-use App\Notifications\AcceptanceAssetDeclinedNotification;
+use App\Notifications\AcceptanceItemAcceptedNotification;
+use App\Notifications\AcceptanceItemAcceptedToUserNotification;
+use App\Notifications\AcceptanceItemDeclinedNotification;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -116,8 +116,6 @@ 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') {

@@ -140,14 +138,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) {
+        if (($settings->acceptance_pdf_logo) && (Storage::disk('public')->exists($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->name, // this handles licenses seats, which don't have a 'name' field
+            'item_name' => $item->display_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,
@@ -164,11 +162,9 @@ 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') {


@@ -187,13 +183,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 AcceptanceAssetAcceptedToUserNotification($data))->locale($assigned_user->locale));
+                    $assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));
                } catch (\Exception $e) {
                    Log::warning($e);
                }
            }
            try {
-                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
+                $acceptance->notify((new AcceptanceItemAcceptedNotification($data))->locale(Setting::getSettings()->locale));
            } catch (\Exception $e) {
                Log::warning($e);
            }
@@ -208,7 +204,7 @@ class AcceptanceController extends Controller
                $acceptance->decline($sig_filename, $request->input('note'));
            }

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

 use App\Events\CheckoutableCheckedIn;
-use App\Http\Requests\StoreAssetRequest;
-use App\Http\Requests\UpdateAssetRequest;
-use App\Http\Traits\MigratesLegacyAssetLocations;
-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\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\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\Support\Facades\DB;
+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\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
-use App\View\Label;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;

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


@@ -183,7 +184,7 @@ class AssetsController extends Controller
        // Search custom fields by column name
        foreach ($all_custom_fields as $field) {
            if ($request->filled($field->db_column_name()) && $field->db_column_name()) {
-                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
+                $assets->where('assets.'.$field->db_column_name(), '=', $request->input($field->db_column_name()));
            }
        }

@@ -2,6 +2,8 @@

 namespace App\Http\Controllers\Api;

+use App\Actions\Categories\DestroyCategoryAction;
+use App\Exceptions\ItemStillHasChildren;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\CategoriesTransformer;
@@ -41,6 +43,7 @@ class CategoriesController extends Controller
            'created_at',
            'updated_at',
            'image',
+            'tag_color',
            'notes',
        ];

@@ -55,6 +58,7 @@ class CategoriesController extends Controller
            'require_acceptance',
            'checkin_email',
            'image',
+            'tag_color',
            'notes',
            ])
            ->with('adminuser')
@@ -224,17 +228,21 @@ class CategoriesController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy(Category $category): JsonResponse
    {
        $this->authorize('delete', Category::class);
-        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($id);
-
-        if (! $category->isDeletable()) {
+        try {
+            DestroyCategoryAction::run(category: $category);
+        } catch (ItemStillHasChildren $e) {
            return response()->json(
-                Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type]))
+                Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['asset_type' => $category->category_type]))
+            );
+        } catch (\Exception $e) {
+            report($e);
+            return response()->json(
+                Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))
            );
        }
-        $category->delete();

        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success')));
    }
@@ -38,6 +38,7 @@ class CompaniesController extends Controller
            'accessories_count',
            'consumables_count',
            'components_count',
+            'tag_color',
            'notes',
        ];

@@ -64,6 +65,11 @@ 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');
@@ -191,6 +197,7 @@ class CompaniesController extends Controller
            'companies.name',
            'companies.email',
            'companies.image',
+            'companies.tag_color',
        ]);


@@ -4,6 +4,7 @@ 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;
@@ -23,21 +24,23 @@ class DepartmentsController extends Controller
    public function index(Request $request) : JsonResponse | array
    {
        $this->authorize('view', Department::class);
-        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];
+        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes', 'tag_color'];

        $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.notes',
-        )->with('users')->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.tag_color',
+                'departments.notes'
+            ])->with('location')->with('manager')->with('company')->withCount('users as users_count');

        if ($request->filled('search')) {
            $departments = $departments->TextSearch($request->input('search'));
@@ -59,6 +62,10 @@ 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');
@@ -94,18 +101,17 @@ class DepartmentsController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(StoreDepartmentRequest $request): JsonResponse
    {
-        $this->authorize('create', Department::class);
        $department = new Department;
-        $department->fill($request->all());
+        $department->fill($request->validated());
        $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', $department, trans('admin/departments/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.create.success')));
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));

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

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

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

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

        if ($request->filled('search')) {
@@ -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,6 +50,7 @@ class GroupsController extends Controller
                    'id',
                    'name',
                    'created_at',
+                    'updated_at',
                    'users_count',
                ];

@@ -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')
+            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department',  'user.company', 'asset.company')
                ->where('license_seats.license_id', $licenseId);

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

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

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

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

        $this->authorize('view', License::class);
-        // 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'));
+
+        if ($licenseSeat = LicenseSeat::where('license_id', $licenseId)->find($seatId)) {
+            return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
        }

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

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

        // check if this update is a checkin operation
        // 1. are relevant fields touched at all?
-        $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);
+        $assignmentTouched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
+        $anythingTouched = $licenseSeat->isDirty();

-        if (! $touched) {
-            // nothing to update
-            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
+        if (! $anythingTouched) {
+            return response()->json(
+                Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))
+            );
        }
-        if( $touched && $licenseSeat->unreassignable_seat) {
+        if( $assignmentTouched && $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')) {
@@ -140,25 +144,23 @@ class LicenseSeatsController extends Controller
            $target = $is_checkin ? $oldAsset : Asset::find($licenseSeat->asset_id);
        }

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

        if ($licenseSeat->save()) {
-
-            if ($is_checkin) {
-                if(!$licenseSeat->license->reassignable){
-                    $licenseSeat->unreassignable_seat = true;
-                    $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);
                }
-                $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')));
        }

@@ -59,6 +59,7 @@ class LocationsController extends Controller
            'state',
            'updated_at',
            'zip',
+            'tag_color',
            'notes',
            ];

@@ -81,6 +82,8 @@ 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',
@@ -145,6 +148,10 @@ 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');
@@ -402,6 +409,7 @@ class LocationsController extends Controller
            'locations.name',
            'locations.parent_id',
            'locations.image',
+            'locations.tag_color',
        ]);

        // Only scope locations if the setting is enabled
@@ -2,6 +2,13 @@

 namespace App\Http\Controllers\Api;

+use App\Actions\Manufacturers\DeleteManufacturerAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasChildren;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ManufacturersTransformer;
@@ -40,6 +47,7 @@ class ManufacturersController extends Controller
            'consumables_count',
            'components_count',
            'licenses_count',
+            'tag_color',
            'notes',
        ];

@@ -56,6 +64,7 @@ class ManufacturersController extends Controller
                'updated_at',
                'image',
                'deleted_at',
+                'tag_color',
                'notes',
            ])
            ->with('adminuser')
@@ -97,6 +106,10 @@ 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');
@@ -184,19 +197,19 @@ class ManufacturersController extends Controller
     * @since [v4.0]
     * @param  int  $id
     */
-    public function destroy($id) : JsonResponse
+    public function destroy(Manufacturer $manufacturer): JsonResponse
    {
-        $this->authorize('delete', Manufacturer::class);
-        $manufacturer = Manufacturer::findOrFail($id);
        $this->authorize('delete', $manufacturer);
-
-        if ($manufacturer->isDeletable()) {
-            $manufacturer->delete();
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));
+        try {
+            DeleteManufacturerAction::run($manufacturer);
+        } catch (ItemStillHasChildren $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')])));
+        } catch (\Exception $e) {
+            report($e);
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
        }

-        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.assoc_users')));
-
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success')));
    }

    /**
@@ -251,6 +264,7 @@ class ManufacturersController extends Controller
            'id',
            'name',
            'image',
+            'tag_color',
        ]);

        if ($request->filled('search')) {
@@ -2,6 +2,13 @@

 namespace App\Http\Controllers\Api;

+use App\Actions\Suppliers\DestroySupplierAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasMaintenances;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasLicenses;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\SelectlistTransformer;
@@ -43,12 +50,13 @@ 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'])
+                ['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'])
                    ->withCount('assets as assets_count')
                    ->withCount('licenses as licenses_count')
                    ->withCount('accessories as accessories_count')
@@ -191,27 +199,40 @@ class SuppliersController extends Controller
     * @since [v4.0]
     * @param  int  $id
     */
-    public function destroy($id) : JsonResponse
+    public function destroy(Supplier $supplier): JsonResponse
    {
-        $this->authorize('delete', Supplier::class);
-        $supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
        $this->authorize('delete', $supplier);
-
-
-        if ($supplier->assets_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
+        try {
+            DestroySupplierAction::run(supplier: $supplier);
+        } catch (ItemStillHasAssets $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_assets', [
+                'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (ItemStillHasMaintenances $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_maintenances', [
+                'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (ItemStillHasLicenses $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_licenses', [
+                'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (ItemStillHasAccessories $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_accessories', [
+                'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (ItemStillHasConsumables $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_consumables', [
+                'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (ItemStillHasComponents $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_components', [
+                'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier')
+            ])));
+        } catch (\Exception $e) {
+            report($e);
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
        }

-        if ($supplier->maintenances_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count])));
-        }
-
-        if ($supplier->licenses_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])));
-        }
-
-        $supplier->delete();
-
        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/suppliers/message.delete.success')));
    }

@@ -231,6 +252,7 @@ class SuppliersController extends Controller
            'id',
            'name',
            'image',
+            'tag_color',
        ]);

        if ($request->filled('search')) {
@@ -31,6 +31,7 @@ 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
 {
@@ -42,7 +43,7 @@ class UsersController extends Controller
     *
     * @return array
     */
-    public function index(Request $request) : array
+    public function index(FilterRequest $request) : array
    {
        $this->authorize('view', User::class);

@@ -162,6 +163,11 @@ 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);
@@ -240,10 +240,6 @@ class BulkAssetsController extends Controller
            $custom_fields_to_null[str_replace('null', '', $key)] = $value;
        }

-
-
-
-
     
        if (! $request->filled('ids') || count($request->input('ids')) == 0) {
            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -274,6 +270,7 @@ class BulkAssetsController extends Controller
            || ($request->filled('company_id'))
            || ($request->filled('status_id'))
            || ($request->filled('model_id'))
+            || ($request->filled('notes'))
            || ($request->filled('next_audit_date'))
            || ($request->filled('asset_eol_date'))
            || ($request->filled('null_name'))
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\Categories\DestroyCategoryAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssetModels;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Models\Category;
+use Illuminate\Http\Request;
+
+class BulkCategoriesController extends Controller
+{
+    public function destroy(Request $request)
+    {
+        $this->authorize('delete', Category::class);
+
+        $errors = [];
+        $success_count = 0;
+
+        foreach ($request->ids as $id) {
+            $category = Category::find($id);
+            if (is_null($category)) {
+                $errors[] = trans('admin/categories/message.does_not_exist');
+                continue;
+            }
+            try {
+                DestroyCategoryAction::run(category: $category);
+                $success_count++;
+            } catch (ItemStillHasAccessories $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
+            } catch (ItemStillHasAssetModels) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_asset_models_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
+            } catch (ItemStillHasAssets) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
+            } catch (ItemStillHasComponents) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
+            } catch (ItemStillHasConsumables) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
+            } catch (ItemStillHasLicenses) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);;
+            } catch (\Exception $e) {
+                report($e);
+                $errors[] = trans('general.something_went_wrong');
+            }
+        }
+        if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('categories.index')->with('success', trans_choice('admin/categories/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
+            return redirect()->route('categories.index')->with('multi_error_messages', $errors);
+        } else {
+            return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.bulk_success'));
+        }
+    }
+}
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\Manufacturers\DeleteManufacturerAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssetModels;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasChildren;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Models\Manufacturer;
+use Illuminate\Http\Request;
+
+class BulkManufacturersController extends Controller
+{
+    public function destroy(Request $request)
+    {
+        $this->authorize('delete', Manufacturer::class);
+
+        $errors = [];
+        $success_count = 0;
+        foreach ($request->ids as $id) {
+            $manufacturer = Manufacturer::find($id);
+            if (is_null($manufacturer)) {
+                $errors[] = trans('admin/manufacturers/message.does_not_exist');
+                continue;
+            }
+            try {
+                DeleteManufacturerAction::run(manufacturer: $manufacturer);
+                $success_count++;
+            } catch (ItemStillHasAssets $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
+            } catch (ItemStillHasAccessories $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_accessories_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
+            } catch (ItemStillHasConsumables $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
+            } catch (ItemStillHasComponents $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
+            } catch (ItemStillHasLicenses $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);;
+            } catch (\Exception $e) {
+                report($e);
+                $errors[] = trans('general.something_went_wrong');
+            }
+        }
+        if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('manufacturers.index')->with('success', trans_choice('admin/manufacturers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
+            return redirect()->route('manufacturers.index')->with('multi_error_messages', $errors);
+        } else {
+            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.bulk_success'));
+        }
+    }
+}
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\Suppliers\DestroySupplierAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasMaintenances;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Models\Supplier;
+use Illuminate\Http\Request;
+
+class BulkSuppliersController extends Controller
+{
+    public function destroy(Request $request)
+    {
+        $this->authorize('delete', Supplier::class);
+
+        $errors = [];
+        $success_count = 0;
+
+        foreach ($request->ids as $id) {
+            $supplier = Supplier::find($id);
+            if (is_null($supplier)) {
+                $errors[] = trans('admin/suppliers/message.delete.not_found');
+                continue;
+            }
+            try {
+                DestroySupplierAction::run(supplier: $supplier);
+            } catch (ItemStillHasAssets $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_assets', ['asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (ItemStillHasMaintenances $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (ItemStillHasLicenses $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (ItemStillHasAccessories $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_accessories', ['accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (ItemStillHasConsumables $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_consumables', ['consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (ItemStillHasComponents $e) {
+                $errors[] = trans('general.bulk_delete_associations.assoc_components', ['components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
+            } catch (\Exception $e) {
+                report($e);
+                $errors[] = trans('general.something_went_wrong');
+            }
+        }
+        if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('suppliers.index')->with('success', trans_choice('admin/suppliers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
+            return redirect()->route('suppliers.index')->with('multi_error_messages', $errors);
+        } else {
+            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.bulk_success'));
+        }
+    }
+}
@@ -2,6 +2,14 @@

 namespace App\Http\Controllers;

+use App\Actions\Categories\DestroyCategoryAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssetModels;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasChildren;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Category;
@@ -70,6 +78,7 @@ 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();

@@ -124,6 +133,7 @@ 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);
@@ -143,20 +153,18 @@ class CategoriesController extends Controller
     * @since [v1.0]
     * @param int $categoryId
     */
-    public function destroy($categoryId) : RedirectResponse
+    public function destroy(Category $category): RedirectResponse
    {
        $this->authorize('delete', Category::class);
-        // Check if the category exists
-        if (is_null($category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($categoryId))) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
+        try {
+            DestroyCategoryAction::run($category);
+        } catch (ItemStillHasChildren $e) {
+            return redirect()->route('categories.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.category')]));
+        } catch (\Exception $e) {
+            report($e);
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.delete.error'));
        }

-        if (! $category->isDeletable()) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=> $category->category_type]));
-        }
-
-        Storage::disk('public')->delete('categories'.'/'.$category->image);
-        $category->delete();
        return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
    }

@@ -60,6 +60,7 @@ 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();

@@ -102,6 +103,7 @@ 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);
@@ -30,6 +30,7 @@ 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;
@@ -45,12 +46,14 @@ abstract class Controller extends BaseController
        'accessories' => Accessory::class,
        'maintenances' => Maintenance::class,
        'assets' => Asset::class,
+        'audits' => Asset::class,
        'components' => Component::class,
        'consumables' => Consumable::class,
        'hardware' => Asset::class,
        'licenses' => License::class,
        'locations' => Location::class,
        'models' => AssetModel::class,
+        'suppliers' => Supplier::class,
        'users' => User::class,
    ];

@@ -58,12 +61,14 @@ abstract class Controller extends BaseController
        'accessories' => 'private_uploads/accessories/',
        'maintenances' => 'private_uploads/maintenances/',
        'assets' => 'private_uploads/assets/',
+        'audits' => 'private_uploads/audits/',
        'components' => 'private_uploads/components/',
        'consumables' => 'private_uploads/consumables/',
        'hardware' => 'private_uploads/assets/',
        'licenses' => 'private_uploads/licenses/',
        'locations' => 'private_uploads/locations/',
        'models' => 'private_uploads/models/',
+        'suppliers' => 'private_uploads/suppliers/',
        'users' => 'private_uploads/users/',
    ];

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

@@ -55,6 +55,7 @@ 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);

@@ -157,6 +158,7 @@ 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);

@@ -7,6 +7,7 @@ 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
@@ -43,9 +44,20 @@ 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);
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))
+            ->with('group', $group)
+            ->with('associated_users', [])
+            ->with('unselected_users', $users)
+            ->with('all_users_count', $users_count);
    }

    /**
@@ -60,11 +72,23 @@ 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'));
        }

@@ -87,8 +111,26 @@ class GroupsController extends Controller
        if ((!is_array($groupPermissions)) || (!$groupPermissions)) {
            $groupPermissions = [];
        }
+
        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-        return view('groups.edit', compact('group', 'permissions', 'selected_array', '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);
    }

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

@@ -82,6 +82,7 @@ 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'));

@@ -156,6 +157,7 @@ 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
@@ -2,6 +2,14 @@

 namespace App\Http\Controllers;

+use App\Actions\Manufacturers\DeleteManufacturerAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasChildren;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasLicenses;
+use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
 use App\Models\Manufacturer;
@@ -93,6 +101,7 @@ 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'));
@@ -134,6 +143,7 @@ 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
@@ -157,32 +167,18 @@ class ManufacturersController extends Controller
     * @param int $manufacturerId
     * @since [v1.0]
     */
-    public function destroy($manufacturerId) : RedirectResponse
+    public function destroy(Manufacturer $manufacturer): RedirectResponse
    {
-        $this->authorize('delete', Manufacturer::class);
-        if (is_null($manufacturer = Manufacturer::withTrashed()->withCount('models as models_count')->find($manufacturerId))) {
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found'));
+        $this->authorize('delete', $manufacturer);
+        try {
+            DeleteManufacturerAction::run($manufacturer);
+        } catch (ItemStillHasChildren $e) {
+            return redirect()->route('manufacturers.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')]));
+        } catch (\Exception $e) {
+            report($e);
+            return redirect()->route('manufacturers.index')->with('error', trans('general.something_went_wrong'));
        }

-        if (! $manufacturer->isDeletable()) {
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users'));
-        }
-
-        if ($manufacturer->image) {
-            try {
-                Storage::disk('public')->delete('manufacturers/'.$manufacturer->image);
-            } catch (\Exception $e) {
-                Log::info($e);
-            }
-        }
-
-        // Soft delete the manufacturer if active, permanent delete if is already deleted
-        if ($manufacturer->deleted_at === null) {
-            $manufacturer->delete();
-        } else {
-            $manufacturer->forceDelete();
-        }
-        // Redirect to the manufacturers management page
        return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success'));
    }

@@ -3,12 +3,21 @@
 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;
@@ -18,9 +27,11 @@ 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;
@@ -436,10 +447,8 @@ class ReportsController extends Controller
            // Open output stream
            $handle = fopen('php://output', 'w');
            stream_set_timeout($handle, 2000);
-            
-            if ($request->filled('use_bom')) {
-                fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF));
-            }
+
+            fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF));

            $header = [];

@@ -1118,34 +1127,32 @@ class ReportsController extends Controller
        $this->authorize('reports.view');
        $showDeleted = $deleted == 'deleted';

-        $query = CheckoutAcceptance::pending()
-            ->where('checkoutable_type', 'App\Models\Asset')
+        $query = CheckoutAcceptance::Pending()
            ->with([
                'checkoutable' => function (MorphTo $query) {
-                    $query->morphWith([
-                        AssetModel::class => ['model'],
-                        Company::class => ['company'],
-                        Asset::class => ['assignedTo'],
-                    ])->with('model.category');
+                    $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'],
+                    ]);
                },
                'assignedTo' => function($query){
                         $query->withTrashed();
                    }
-            ]);
+            ])->orderByDesc('checkout_acceptances.created_at');
+

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

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

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

    /**
@@ -1157,41 +1164,77 @@ class ReportsController extends Controller
    public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
    {
        $this->authorize('reports.view');
-
-        if (!$acceptance = CheckoutAcceptance::pending()->find($request->input('acceptance_id'))) {
+        $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) {
            Log::debug('No pending acceptances');
-            // Redirect to the unaccepted assets report page with error
+            // Redirect to the unaccepted items 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;

-        $assetItem = $acceptance->checkoutable;
-
-        Log::debug(print_r($assetItem, true));
+        Log::debug(print_r($acceptance, 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 {
-            $logItem_res = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get();
-
+            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();
+                }
            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'));
        }
-
-        Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note, firstTimeSending: false))->locale($locale));
+        $mailable = $this->getCheckoutMailType($acceptance, $logItem);
+        Mail::to($email)->send($mailable->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
     *
@@ -1223,31 +1266,43 @@ class ReportsController extends Controller
    public function postAssetAcceptanceReport($deleted = false) : Response
    {
        $this->authorize('reports.view');
-        $showDeleted = $deleted == 'deleted';
+        $showDeleted = request('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();
-        }

-        $assetsForReport = $acceptances
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset';
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
-            });
+            $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));

        $rows = [];

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

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

-            if ($item['assetItem'] != null){
+            if ($item != null){
            
                $row    = [ ];
-                $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')));
+                $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'));
                $rows[] = implode(',', $row);
            }
        }
@@ -589,6 +589,7 @@ 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')
@@ -772,6 +773,7 @@ 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');
@@ -2,10 +2,18 @@

 namespace App\Http\Controllers;

+use App\Actions\Suppliers\DestroySupplierAction;
+use App\Exceptions\ItemStillHasAccessories;
+use App\Exceptions\ItemStillHasComponents;
+use App\Exceptions\ItemStillHasConsumables;
+use App\Exceptions\ItemStillHasMaintenances;
+use App\Exceptions\ItemStillHasAssets;
+use App\Exceptions\ItemStillHasLicenses;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Supplier;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
+use Illuminate\Support\MessageBag;

 /**
 * This controller handles all actions related to Suppliers for
@@ -59,6 +67,7 @@ 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();
@@ -103,6 +112,7 @@ 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);

@@ -118,30 +128,41 @@ class SuppliersController extends Controller
     *
     * @param  int $supplierId
     */
-    public function destroy($supplierId) : RedirectResponse
+    public function destroy(Supplier $supplier): RedirectResponse
    {
        $this->authorize('delete', Supplier::class);
-        if (is_null($supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
+        try {
+            DestroySupplierAction::run(supplier: $supplier);
+        } catch (ItemStillHasAssets $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_assets', [
+                'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (ItemStillHasMaintenances $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_maintenances', [
+                'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (ItemStillHasLicenses $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_licenses', [
+                'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (ItemStillHasAccessories $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_accessories', [
+                'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (ItemStillHasConsumables $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_consumables', [
+                'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (ItemStillHasComponents $e) {
+            return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_components', [
+                'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier')
+            ]));
+        } catch (\Exception $e) {
+            report($e);
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.error'));
        }

-        if ($supplier->assets_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]));
-        }
-
-        if ($supplier->maintenances_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count]));
-        }
-
-        if ($supplier->licenses_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]));
-        }
-
-        $supplier->delete();
-
-        return redirect()->route('suppliers.index')->with('success',
-            trans('admin/suppliers/message.delete.success')
-        );
+        return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.success'));
    }

    /**
@@ -154,6 +175,5 @@ class SuppliersController extends Controller
    {
        $this->authorize('view', Supplier::class);
        return view('suppliers/view', compact('supplier'));
-
    }
 }
@@ -4,6 +4,7 @@ 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;
@@ -155,7 +156,19 @@ class ViewAssetsController extends Controller
    public function getRequestableIndex() : View
    {
        $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
-        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
+        $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();

        return view('account/requestable-assets', compact('assets', 'models'));
    }
@@ -201,7 +214,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('request_canceled');
+            $logaction->logaction(ActionType::RequestCanceled);

            if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
                $settings->notify(new RequestAssetCancelation($data));
@@ -0,0 +1,29 @@
+<?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()],
+        ];
+    }
+}
@@ -109,7 +109,7 @@ class SettingsSamlRequest extends FormRequest
                ];

                $pkey = openssl_pkey_new([
-                    'private_key_bits' => config('app.saml_key_size'),
+                    'private_key_bits' => (int) config('app.saml_key_size'),
                    'private_key_type' => OPENSSL_KEYTYPE_RSA,
                ]);

@@ -0,0 +1,32 @@
+<?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,
+        );
+    }
+}
@@ -49,6 +49,7 @@ 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),
@@ -32,7 +32,7 @@ class StoreNotificationSettings extends FormRequest
            ],
            'alert_threshold'                     => 'numeric|nullable',
            'alert_interval'                      => 'numeric|nullable|gt:0',
-            'audit_warning_days'                  => 'numeric|nullable',
+            'audit_warning_days'                  => 'numeric|nullable|gte:0',
            'due_checkin_days'                    => 'numeric|nullable|gt:0',
            'audit_interval'                      => 'numeric|nullable|gt:0',
        ];
@@ -28,23 +28,31 @@ class UpdateAssetRequest extends ImageUploadRequest
     */
    public function rules()
    {
+        $setting = Setting::getSettings();
+
        $rules = array_merge(
            parent::rules(),
            (new Asset)->getRules(),
-            // this is to overwrite rulesets that include required, and rewrite unique_undeleted
+            // 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.
            [
                '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()
+                    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',
                ],
            ],
        );

        // 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::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
+        if ($setting->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
            $rules['purchase_cost'] = ['nullable', 'string'];
        }

@@ -26,12 +26,32 @@ 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)] : 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,
+            '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,
            'model_number' => ($accessory->model_number) ? e($accessory->model_number) : 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,
+            '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,
            '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,
@@ -149,6 +149,7 @@ class ActionlogsTransformer
                    'filename' => $actionlog->filename,
                    'inlineable' => StorageHelper::allowSafeInline($actionlog->uploads_file_path()),
                    'exists_on_disk' => Storage::exists($actionlog->uploads_file_path()) ? true : false,
+                    'mediatype' => StorageHelper::getMediaType($actionlog->uploads_file_path()),
                ] : null,

            'item' => ($actionlog->item) ? [
@@ -160,6 +161,7 @@ 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'),
@@ -44,6 +44,7 @@ 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),
@@ -60,6 +61,7 @@ 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,
@@ -68,7 +70,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,
+            'require_serial' => ($assetmodel->require_serial == '1') ? true : false,
            'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
            'created_by' => ($assetmodel->adminuser) ? [
                'id' => (int) $assetmodel->adminuser->id,
@@ -40,7 +40,6 @@ 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,
@@ -53,10 +52,12 @@ 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,
@@ -68,20 +69,24 @@ 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,
@@ -66,6 +66,7 @@ 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'),
@@ -40,6 +40,7 @@ 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'),
@@ -30,15 +30,25 @@ 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'),
@@ -48,6 +58,7 @@ 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) ? [
@@ -26,12 +26,32 @@ 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)] : null,
-            'company'   => ($consumable->company) ? ['id' => (int) $consumable->company->id, 'name' => e($consumable->company->name)] : 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,
            'item_no'       => e($consumable->item_no),
-            'location'      => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null,
-            'manufacturer'  => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null,
-            'supplier' => ($consumable->supplier) ? ['id' => $consumable->supplier->id, 'name'=> e($consumable->supplier->name)] : null,
+            '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,
            'min_amt'       => (int) $consumable->min_amt,
            'model_number'  => ($consumable->model_number != '') ? e($consumable->model_number) : null,
            'remaining'  => $consumable->numRemaining(),
@@ -32,6 +32,7 @@ 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,
@@ -42,8 +43,10 @@ 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' => e($department->users_count),
+                'users_count' => (int) ($department->users_count),
+                'tag_color' => $department->tag_color ? e($department->tag_color) : null,
                'notes' => Helper::parseEscapedMarkedownInline($department->notes),
                'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),
@@ -34,8 +34,16 @@ 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) ? [
@@ -46,6 +54,7 @@ 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,
@@ -25,7 +25,11 @@ 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)] : 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,
            '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,
@@ -44,8 +48,16 @@ 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)] : null,
-            'category' =>  ($license->category) ? ['id' => (int) $license->category->id, 'name'=> e($license->category->name)] : null,
+            '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,
            'created_by' => ($license->adminuser) ? [
                'id' => (int) $license->adminuser->id,
                'name'=> e($license->adminuser->display_name),
@@ -58,6 +58,7 @@ 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 ? [
@@ -68,11 +69,13 @@ 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)
+                    'name'=> e($location->company->name),
+                    'tag_color' => $location->company->tag_color ? e($location->company->tag_color) : null,
                ] : null,

                'children' => $children_arr,
@@ -37,6 +37,7 @@ 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,
@@ -26,6 +26,7 @@ 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,

            ];
        }
@@ -43,6 +43,7 @@ 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 ? [
@@ -57,6 +57,7 @@ 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,
@@ -65,6 +66,7 @@ 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,
@@ -80,7 +82,11 @@ 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)] : null,
+                '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,
                'created_by' => ($user->createdBy) ? [
                    'id' => (int) $user->createdBy->id,
                    'name'=> e($user->createdBy->display_name),
@@ -44,7 +44,7 @@ class AssetImporter extends ItemImporter
            foreach ($this->customFields as $customField) {
                $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);

-                if ($customFieldValue) {
+                if (!is_null($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));
@@ -2,6 +2,7 @@

 namespace App\Livewire;

+use Livewire\Attributes\Computed;
 use Livewire\Component;

 class CategoryEditForm extends Component
@@ -12,43 +13,25 @@ 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');
    }

-    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
+    #[Computed]
+    public function emailWillBeSendDueToEula(): bool
    {
        return $this->eulaText || $this->useDefaultEula;
    }

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

-    public function getEulaTextDisabledProperty()
+    #[Computed]
+    public function eulaTextDisabled()
    {
        return (bool)$this->useDefaultEula;
    }
-
-    public function getSendCheckInEmailDisabledProperty()
-    {
-        return $this->eulaText || $this->useDefaultEula;
-    }
 }
@@ -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]));
@@ -0,0 +1,18 @@
+<?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',
+            ]
+        );
+    }
+}
@@ -6,14 +6,12 @@ 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 Mailable
+class CheckinAccessoryMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -7,15 +7,13 @@ 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 Mailable
+class CheckinAssetMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -7,14 +7,12 @@ 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 Mailable
+class CheckinComponentMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -6,14 +6,12 @@ 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 Mailable
+class CheckinLicenseMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -5,13 +5,11 @@ 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 Mailable
+class CheckoutAcceptanceResponseMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -8,15 +8,13 @@ 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 Mailable
+class CheckoutAccessoryMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -8,8 +8,6 @@ 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;
@@ -17,7 +15,7 @@ use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\SerializesModels;

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

@@ -87,7 +85,7 @@ class CheckoutAssetMail extends Mailable
            $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
@@ -6,13 +6,12 @@ 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 Mailable
+class CheckoutComponentMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -6,15 +6,12 @@ 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 Mailable
+class CheckoutConsumableMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -7,14 +7,12 @@ 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 Mailable
+class CheckoutLicenseMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -3,14 +3,12 @@
 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 Mailable
+class ExpiringAssetsMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -3,14 +3,12 @@
 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 Mailable
+class ExpiringLicenseMail extends BaseMailable
 {
    use Queueable, SerializesModels;

@@ -3,24 +3,23 @@
 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 Mailable
+class SendUpcomingAuditMail extends BaseMailable
 {
    use Queueable, SerializesModels;

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

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

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

@@ -49,6 +48,7 @@ class SendUpcomingAuditMail extends Mailable
            with:  [
                'assets'  => $this->assets,
                'threshold'  => $this->threshold,
+                'total'  => $this->total,
            ],
        );
    }
--- a/Show More
+++ b/Show More