Set item to null so it doesn’t get merged automatically

Co-authored-by: Marcus Moore <mmoore@grokability.com>

.env.example

@@ -190,7 +190,6 @@ 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

.github/ISSUE_TEMPLATE/Bug-Report.yml

@@ -23,23 +23,7 @@ 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.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
+      placeholder: ex. v8.3.1 - build 19577 (master)
     validations:
       required: true
   - type: input
@@ -64,16 +48,6 @@ 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:
@@ -160,4 +134,4 @@ body:
       description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/grokability/snipe-it/blob/master/CODE_OF_CONDUCT.md).
       options:
         - label: I agree to follow this project's Code of Conduct
-          required: true
+          required: true

.github/workflows/SA-codeql.yml

@@ -30,10 +30,10 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3

.github/workflows/codacy-analysis.yml

@@ -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@v4
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif

.github/workflows/tests-mysql.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload Laravel logs as artifacts
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
           path: |

.github/workflows/tests-postgres.yml

@@ -81,7 +81,7 @@ jobs:
 
       - name: Upload Laravel logs as artifacts
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
           path: |

.github/workflows/tests-sqlite.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Upload Laravel logs as artifacts
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
           path: |

app/Actions/Categories/DestroyCategoryAction.php

@@ -1,59 +0,0 @@
-<?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;
-    }
-}

app/Actions/Manufacturers/DeleteManufacturerAction.php

@@ -1,63 +0,0 @@
-<?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;
-    }
-
-}

app/Actions/Suppliers/DestroySupplierAction.php

@@ -1,72 +0,0 @@
-<?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;
-    }
-}

app/Console/Commands/LdapSync.php

@@ -317,21 +317,9 @@ 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;
             }

app/Console/Commands/ObjectImportCommand.php

@@ -8,6 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Console\Helper\ProgressIndicator;
 
+ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
+ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));
 
 /**
  * Class ObjectImportCommand
@@ -50,9 +52,6 @@ class ObjectImportCommand extends Command
      */
     public function handle()
     {
-        ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
-        ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));
-
         $this->progressIndicator = new ProgressIndicator($this->output);
 
         $filename = $this->argument('filename');

app/Console/Commands/RemoveInvalidUploadDeleteActionLogItems.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Actionlog;
-use Illuminate\Console\Command;
-
-class RemoveInvalidUploadDeleteActionLogItems extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:remove-invalid-upload-delete-action-log-items';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Permanently remove invalid "upload deleted" action log items that have a null filename. This command can potentially result in deleted files being "resurrected" in the UI.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $invalidLogs = Actionlog::query()
-            ->where('action_type', 'upload deleted')
-            ->whereNull('filename')
-            ->withTrashed()
-            ->get();
-
-        $this->info("{$invalidLogs->count()} invalid log items found.");
-
-        if ($invalidLogs->count() === 0) {
-            return 0;
-        }
-
-        $this->table(['ID', 'Action Type', 'Item Type', 'Item ID', 'Created At', 'Deleted At'], $invalidLogs->map(fn($log) => [
-            $log->id,
-            $log->action_type,
-            $log->item_type,
-            $log->item_id,
-            $log->created_at,
-            $log->deleted_at,
-        ])->toArray());
-
-        if ($this->confirm("Do you wish to remove {$invalidLogs->count()} log items?")) {
-            $invalidLogs->each(fn($log) => $log->forceDelete());
-        }
-
-        return 0;
-    }
-}

app/Console/Commands/RestoreFromBackup.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use ZipArchive;
 use Illuminate\Support\Facades\Log;
-use enshrined\svgSanitize\Sanitizer;
 
 class SQLStreamer {
     private $input;
@@ -243,10 +242,9 @@ class RestoreFromBackup extends Command
 
         $private_dirs = [
             'storage/private_uploads/accessories',
-            'storage/private_uploads/assetmodels' => 'storage/private_uploads/models', //this was changed from assetmodels => models Aug 10 2025
-            'storage/private_uploads/asset_maintenances' => 'storage/private_uploads/maintenances', //this was changed from asset_maintenances => maintenances Aug 10 2025
-            'storage/private_uploads/maintenances', //but let 'maintenances' take precedence
-            'storage/private_uploads/models', //and let 'models' take precedence
+            'storage/private_uploads/assetmodels',
+            'storage/private_uploads/maintenances',
+            'storage/private_uploads/models',
             'storage/private_uploads/assets', // these are asset _files_, not the pictures.
             'storage/private_uploads/audits',
             'storage/private_uploads/components',
@@ -264,7 +262,7 @@ class RestoreFromBackup extends Command
         ];
         $public_dirs = [
             'public/uploads/accessories',
-            // 'public/uploads/assetmodels' => 'public/uploads/models', //according to git, this was _never_ a thing... (see below)
+            'public/uploads/assetmodels',
             'public/uploads/maintenances',
             'public/uploads/assets', // these are asset _pictures_, not asset files
             'public/uploads/avatars',
@@ -275,7 +273,7 @@ class RestoreFromBackup extends Command
             'public/uploads/departments',
             'public/uploads/locations',
             'public/uploads/manufacturers',
-            'public/uploads/models', // ...it's been this way for 9 years (as of late 2025)
+            'public/uploads/models',
             'public/uploads/suppliers',
         ];
 
@@ -288,6 +286,8 @@ class RestoreFromBackup extends Command
             'public/uploads/favicon-uploaded.*',
         ];
 
+        $all_files = $private_dirs + $public_dirs;
+
         $sqlfiles = [];
         $sqlfile_indices = [];
 
@@ -295,20 +295,6 @@ class RestoreFromBackup extends Command
         $boring_files = [];
         $unsafe_files = [];
 
-        $good_extensions = config('filesystems.allowed_upload_extensions_array');
-
-        $private_extensions = array_merge($good_extensions, ["csv", "key"]); //add csv, and 'key'
-        $public_extensions = array_diff($good_extensions, ["xml"]); //remove xml
-
-        $sanitizer = new Sanitizer();
-
-        /**
-         * TODO: I _hate_ the "continue 3" thing we keep doing here
-         * I think a better approach might be to have the "each file" stuff be in a method on this class, and the
-         * boring_files and interesting_files be properties on it that we fill out. Then, in that method, we could
-         * just do a 'return' once the file is actually handled (yay or nay). We could also start to break out some of
-         * the _other_ things that we do into their own methods too? But I don't care about that as much.
-         */
         for ($i = 0; $i < $za->numFiles; $i++) {
             $stat_results = $za->statIndex($i);
             // echo "index: $i\n";
@@ -323,7 +309,7 @@ class RestoreFromBackup extends Command
             // skip macOS resource fork files (?!?!?!)
             if (strpos($raw_path, '__MACOSX') !== false && strpos($raw_path, '._') !== false) {
                 //print "SKIPPING macOS Resource fork file: $raw_path\n";
-                // $boring_files[] = $raw_path; //stop adding this to the boring files list; it's just confusing
+                $boring_files[] = $raw_path;
                 continue;
             }
             if (@pathinfo($raw_path, PATHINFO_EXTENSION) == 'sql') {
@@ -332,70 +318,44 @@ class RestoreFromBackup extends Command
                 $sqlfile_indices[] = $i;
                 continue;
             }
-            if ($raw_path[-1] == '/') {
-                //last character is '/' - this is a directory, and we don't need it, and we don't need to warn about it
-                continue;
-            }
-            if (in_array(basename($raw_path), [".gitkeep", ".gitignore", ".DS_Store"])) {
-                //skip these boring files silently without reporting on them; they're stupid
-                continue;
-            }
-            $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
 
-            foreach (['public' => $public_dirs, 'private' => $private_dirs] as $purpose => $dirs) {
-                $allowed_extensions = match ($purpose) {
-                    'public' => $public_extensions,
-                    'private' => $private_extensions,
-                };
-                foreach ($dirs as $dir => $destdir) {
-                    if (is_int($dir)) {
-                        $dir = $destdir;
-                    }
-                    $last_pos = strrpos($raw_path, $dir . '/');
-                    if ($last_pos !== false) {
-                        //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                        //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path?
-                        //the CSV bit, below, is because we store CSV files as "blahcsv" - without an extension
-                        if (!in_array($extension, $allowed_extensions) && !($dir == "storage/private_uploads/imports" && substr($raw_path, -3) == "csv" && $extension == "")) {
-                            $unsafe_files[] = $raw_path;
-                            Log::debug($raw_path . ' from directory ' . $dir . ' is being skipped');
-                        } else {
-                            if ($dir != $destdir) {
-                                Log::debug("Getting ready to save file $raw_path to new directory $destdir");
-                            }
-                            $interesting_files[$raw_path] = ['dest' => $destdir, 'index' => $i];
-                        }
-                        continue 3;
+            foreach (array_merge($private_dirs, $public_dirs) as $dir) {
+                $last_pos = strrpos($raw_path, $dir . '/');
+                if ($last_pos !== false) {
+                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
+                    //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path?
+                    $interesting_files[$raw_path] = ['dest' => $dir, 'index' => $i];
+                    continue 2;
+                    if ($last_pos + strlen($dir) + 1 == strlen($raw_path)) {
+                        // we don't care about that; we just want files with the appropriate prefix
+                        //print("FOUND THE EXACT DIRECTORY: $dir AT: $raw_path!!!\n");
                     }
                 }
             }
 
-            foreach (['public' => $public_files, 'private' => $private_files] as $purpose => $files) {
-                $allowed_extensions = match ($purpose) {
-                    'public' => $public_extensions,
-                    'private' => $private_extensions,
-                };
-                foreach ($files as $file) {
-                    $has_wildcard = (strpos($file, '*') !== false);
-                    if ($has_wildcard) {
-                        $file = substr($file, 0, -1); //trim last character (which should be the wildcard)
+            $good_extensions = config('filesystems.allowed_upload_extensions_array');
+
+            foreach (array_merge($private_files, $public_files) as $file) {
+                $has_wildcard = (strpos($file, '*') !== false);
+                if ($has_wildcard) {
+                    $file = substr($file, 0, -1); //trim last character (which should be the wildcard)
+                }
+                $last_pos = strrpos($raw_path, $file); // no trailing slash!
+                if ($last_pos !== false) {
+                    $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
+                    if (!in_array($extension, $good_extensions)) {
+                        // gathering potentially unsafe files here to return at exit
+                        $unsafe_files[] = $raw_path;
+                        Log::debug('Potentially unsafe file '.$raw_path.' is being skipped');
+                        $boring_files[] = $raw_path;
+                        continue 2;
                     }
-                    $last_pos = strrpos($raw_path, $file); // no trailing slash!
-                    if ($last_pos !== false) {
-                        if (!in_array($extension, $allowed_extensions)) {
-                            // gathering potentially unsafe files here to return at exit
-                            $unsafe_files[] = $raw_path;
-                            Log::debug('Potentially unsafe file ' . $raw_path . ' is being skipped');
-                            $boring_files[] = $raw_path;
-                            continue 3;
-                        }
-                        //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                        //no wildcards found in $file, process 'normally'
-                        if ($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it.
-                            // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though.
-                            $interesting_files[$raw_path] = ['dest' => dirname($file), 'index' => $i];
-                            continue 3;
-                        }
+                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
+                    //no wildcards found in $file, process 'normally'
+                    if ($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it.
+                        // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though.
+                        $interesting_files[$raw_path] = ['dest' => dirname($file), 'index' => $i];
+                        continue 2;
                     }
                 }
             }
@@ -532,25 +492,18 @@ class RestoreFromBackup extends Command
         }
         foreach ($interesting_files as $pretty_file_name => $file_details) {
             $ugly_file_name = $za->statIndex($file_details['index'])['name'];
-            $migrated_file_name = $file_details['dest'] . '/' . basename($pretty_file_name);
-            if (strcasecmp(substr($pretty_file_name, -4), ".svg") === 0) {
-                $svg_contents = $za->getFromIndex($file_details['index']);
-                $cleaned_svg = $sanitizer->sanitize($svg_contents);
-                file_put_contents($migrated_file_name, $cleaned_svg);
-            } else {
-                $fp = $za->getStream($ugly_file_name);
-                //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
-                if (!is_dir($file_details['dest'])) {
-                    mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
-                }
-                $migrated_file = fopen($migrated_file_name, 'w');
-                while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
-                    fwrite($migrated_file, $buffer);
-                }
-                fclose($migrated_file);
-                fclose($fp);
-                //$this->info("Wrote $ugly_file_name to $pretty_file_name");
+            $fp = $za->getStream($ugly_file_name);
+            //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
+            if (!is_dir($file_details['dest'])) {
+                mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
             }
+            $migrated_file = fopen($file_details['dest'].'/'.basename($pretty_file_name), 'w');
+            while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
+                fwrite($migrated_file, $buffer);
+            }
+            fclose($migrated_file);
+            fclose($fp);
+            //$this->info("Wrote $ugly_file_name to $pretty_file_name");
             if ($bar) {
                 $bar->advance();
             }

app/Console/Commands/SendExpirationAlerts.php

@@ -60,57 +60,19 @@ class SendExpirationAlerts extends Command
                 Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));
 
                 $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.eol_rate'),
-                        trans('admin/hardware/form.eol_date'),
-                        trans('admin/hardware/form.warranty_expires'),
-                    ],
-                    $assets->map(fn($item) =>
-                    [
-                        trans('general.id')  => $item->id,
-                        trans('admin/hardware/form.tag') => $item->asset_tag,
-                        trans('admin/hardware/form.model') => $item->model->name,
-                        trans('general.model_no') => $item->model->model_number,
-                        trans('general.purchase_date') => $item->purchase_date_formatted,
-                        trans('admin/hardware/form.eol_rate')  => $item->model->eol,
-                        trans('admin/hardware/form.eol_date') => $item->eol_date ? $item->eol_formatted_date .' ('.$item->eol_diff_for_humans.')' : '',
-                        trans('admin/hardware/form.warranty_expires') => $item->warranty_expires ? $item->warranty_expires_formatted_date .' ('.$item->warranty_expires_diff_for_humans.')' : '',
-                   ])
-                   );
+                    ['ID', 'Tag', 'Model', 'Model Number', 'EOL', 'EOL Months', 'Warranty Expires', 'Warranty Months'],
+                    $assets->map(fn($item) => ['ID' => $item->id, 'Tag' => $item->asset_tag, 'Model' => $item->model->name, 'Model Number' => $item->model->model_number, 'EOL' => $item->asset_eol_date, 'EOL Months' => $item->model->eol,  'Warranty Expires' => $item->warranty_expires,  'Warranty Months' => $item->warranty_months])
+                );
             }
 
             // Expiring licenses
-            $licenses = License::query()->ExpiringLicenses($alert_interval)
-                ->with('manufacturer','category')
-                ->orderBy('expiration_date', 'ASC')
-                ->orderBy('termination_date', 'ASC')
-                ->get();
+            $licenses = License::getExpiringLicenses($alert_interval);
             if ($licenses->count() > 0) {
                 Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));
 
                 $this->table(
-                    [
-                        trans('general.id'),
-                        trans('general.name'),
-                        trans('general.purchase_date'),
-                        trans('admin/licenses/form.expiration'),
-                        trans('mail.expires'),
-                        trans('admin/licenses/form.termination_date'),
-                        trans('mail.terminates')],
-                    $licenses->map(fn($item) => [
-                        trans('general.id') => $item->id,
-                        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_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
-                    ])
+                    ['ID', 'Name', 'Expires', 'Termination Date'],
+                    $licenses->map(fn($item) => ['ID' => $item->id, 'Name' => $item->name, 'Expires' => $item->expiration_date, 'Termination Date' => $item->termination_date])
                 );
             }
 

app/Console/Commands/SendUpcomingAuditReport.php

@@ -16,7 +16,7 @@ class SendUpcomingAuditReport extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:upcoming-audits {--with-output : Display the results in a table in your console in addition to sending the email}';
+    protected $signature = 'snipeit:upcoming-audits';
 
     /**
      * The console command description.
@@ -47,69 +47,21 @@ class SendUpcomingAuditReport extends Command
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval);
 
-        $assets_query = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->with('supplier');
-        $asset_count = $assets_query->count();
-        $this->info(number_format($asset_count) . ' assets must be audited on or before ' . $interval_date);
-        if (!$this->option('with-output')) {
-            $this->info('Run this command with the --with-output option to see the full list in the console.');
-        }
+        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
+        $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');
 
 
-        if ($asset_count > 0) {
-
-            $assets_for_email = $assets_query->limit(30)->get();
-
+        if ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
             // Send a rollup to the admin, if settings dictate
-            if ($settings->alert_email != '') {
-
-                $recipients = collect(explode(',', $settings->alert_email))
-                    ->map(fn($item) => trim($item))
-                    ->filter(fn($item) => !empty($item))
-                    ->all();
-
-                Mail::to($recipients)->send(new SendUpcomingAuditMail($assets_for_email, $settings->audit_warning_days, $asset_count));
-                $this->info('Audit notification sent to: ' . $settings->alert_email);
-
-            } else {
-                $this->info('There is no admin alert email set so no email will be sent.');
-            }
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item))
+                ->filter(fn($item) => !empty($item))
+                ->all();
 
 
-
-            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.');
+            $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
+            Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));
         }
 
-
-
     }
 }

app/Console/Commands/SystemBackup.php

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

app/Exceptions/ItemStillHasAccessories.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAccessories extends ItemStillHasChildren
-{
-    //
-}

app/Exceptions/ItemStillHasAssetModels.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAssetModels extends ItemStillHasChildren
-{
-    //
-}

app/Exceptions/ItemStillHasAssets.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAssets extends ItemStillHasChildren
-{
-}

app/Exceptions/ItemStillHasChildren.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasChildren extends Exception
-{
-    //public function __construct($message, $code = 0, Exception $previous = null, $parent, $children)
-    //{
-    //    trans()
-    //
-    //}
-}

app/Exceptions/ItemStillHasComponents.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasComponents extends ItemStillHasChildren
-{
-    //
-}

app/Exceptions/ItemStillHasConsumables.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasConsumables extends ItemStillHasChildren
-{
-    //
-}

app/Exceptions/ItemStillHasLicenses.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasLicenses extends ItemStillHasChildren
-{
-    //
-}

app/Exceptions/ItemStillHasMaintenances.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasMaintenances extends ItemStillHasChildren
-{
-    //
-}

app/Helpers/IconHelper.php

@@ -40,8 +40,6 @@ class IconHelper
                 return 'fa-solid fa-trash-arrow-up';
             case 'external-link':
                 return 'fa fa-external-link';
-            case 'link':
-                return 'fa fa-link';
             case 'email':
                 return 'fa-regular fa-envelope';
             case 'phone':
@@ -142,7 +140,7 @@ class IconHelper
             case 'more-files':
                 return 'fa-solid fa-laptop-file';
             case 'maintenances':
-                return 'fa-solid fa-screwdriver-wrench';
+                return 'fas fa-wrench';
             case 'seats':
                 return 'far fa-list-alt';
             case 'globe-us':
@@ -197,10 +195,6 @@ 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';
         }
     }
 }

app/Http/Controllers/Account/AcceptanceController.php

@@ -77,6 +77,7 @@ class AcceptanceController extends Controller
         $acceptance = CheckoutAcceptance::find($id);
         $assigned_user = User::find($acceptance->assigned_to_id);
         $settings = Setting::getSettings();
+        $path_logo = '';
         $sig_filename='';
 
 
@@ -116,6 +117,8 @@ class AcceptanceController extends Controller
 
         $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
 
+
+
         // If signatures are required, make sure we have one
         if (Setting::getSettings()->require_accept_signature == '1') {
 
@@ -135,13 +138,6 @@ 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) {
-            $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,
@@ -155,16 +151,16 @@ class AcceptanceController extends Controller
             'accepted_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
             'declined_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
             'assigned_to' => $assigned_user->display_name,
-            'email' => $assigned_user->email,
-            'employee_num' => $assigned_user->employee_num,
             'site_name' => $settings->site_name,
             'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
-            'logo' => ($encoded_logo) ?? null,
+            'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
+            'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,
             'date_settings' => $settings->date_display_format,
+            'admin' => auth()->user()->present()?->fullName,
             'qty' => $acceptance->qty ?? 1,
         ];
 
+
         if ($request->input('asset_acceptance') == 'accepted') {
 
 

app/Http/Controllers/Api/AccessoriesController.php

@@ -54,15 +54,6 @@ class AccessoriesController extends Controller
                 'notes',
                 'checkouts_count',
                 'qty',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'category',
-                'supplier',
-                'manufacturer',
             ];
 
 
@@ -70,23 +61,10 @@ class AccessoriesController extends Controller
             ->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')
             ->withCount('checkouts as checkouts_count');
 
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
+        if ($request->filled('search')) {
+            $accessories = $accessories->TextSearch($request->input('search'));
         }
 
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $accessories->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $accessories->TextSearch($request->input('search'));
-        }
-
-
         if ($request->filled('company_id')) {
             $accessories->where('accessories.company_id', '=', $request->input('company_id'));
         }

app/Http/Controllers/Api/AssetModelsController.php

@@ -46,20 +46,11 @@ class AssetModelsController extends Controller
                 'manufacturer',
                 'requestable',
                 'assets_count',
-                'assets_assigned_count',
-                'assets_archived_count',
-                'remaining',
                 'category',
                 'fieldset',
                 'deleted_at',
                 'updated_at',
                 'require_serial',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'manufacturer',
-                'category',
             ];
 
         $assetmodels = AssetModel::select([
@@ -82,28 +73,7 @@ class AssetModelsController extends Controller
             'models.require_serial'
          ])
             ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
-            ->withCount('assets as assets_count')
-            ->withCount('availableAssets as remaining')
-            ->withCount('assignedAssets as assets_assigned_count')
-            ->withCount('archivedAssets as assets_archived_count');
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $assetmodels->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $assetmodels->TextSearch($request->input('search'));
-        }
-
+            ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
             $assetmodels->onlyTrashed();

app/Http/Controllers/Api/AssetsController.php

@@ -6,7 +6,6 @@ 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;
@@ -116,22 +115,6 @@ class AssetsController extends Controller
             'asset_eol_date',
             'requestable',
             'jobtitle',
-            // These are *relationships* so we wouldn't normally include them in this array,
-            // since they would normally create a `column not found` error,
-            // BUT we account for them in the ordering switch down at the end of this method
-            // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-            'company',
-            'model',
-            'location',
-            'rtd_location',
-            'category',
-            'status_label',
-            'manufacturer',
-            'supplier',
-            'jobtitle',
-            'assigned_to',
-            'created_by',
-
         ];
 
         $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
@@ -148,7 +131,6 @@ class AssetsController extends Controller
             $filter = array_filter($filter, function ($key) use ($allowed_columns) {
                 return in_array($key, $allowed_columns);
             }, ARRAY_FILTER_USE_KEY);
-
         }
 
         $assets = Asset::select('assets.*')
@@ -183,7 +165,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('assets.'.$field->db_column_name(), '=', $request->input($field->db_column_name()));
+                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
             }
         }
 
@@ -1340,18 +1322,6 @@ class AssetsController extends Controller
         return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
     }
 
-    public function assignedComponents(Request $request, Asset $asset): JsonResponse|array
-    {
-        $this->authorize('view', Asset::class);
-        $this->authorize('view', $asset);
-
-        $asset->loadCount('components');
-        $total = $asset->components_count;
-
-        $components = $asset->load(['components' => fn($query) => $query->applyOffsetAndLimit($total)])->components;
-
-        return (new ComponentsTransformer)->transformComponents($components, $total);
-    }
 
     /**
      * Generate asset labels by tag

app/Http/Controllers/Api/CategoriesController.php

@@ -2,8 +2,6 @@
 
 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;
@@ -63,23 +61,6 @@ class CategoriesController extends Controller
             ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count');
 
 
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $categories->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $categories->TextSearch($request->input('search'));
-        }
-
         /*
          * This checks to see if we should override the Admin Setting to show archived assets in list.
          * We don't currently use it within the Snipe-IT GUI, but will be useful for API integrations where they
@@ -93,6 +74,10 @@ class CategoriesController extends Controller
             $categories = $categories->withCount('showableAssets as assets_count');
         }
 
+        if ($request->filled('search')) {
+            $categories = $categories->TextSearch($request->input('search'));
+        }
+
         if ($request->filled('name')) {
             $categories->where('name', '=', $request->input('name'));
         }
@@ -226,21 +211,17 @@ class CategoriesController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Category $category): JsonResponse
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Category::class);
-        try {
-            DestroyCategoryAction::run(category: $category);
-        } catch (ItemStillHasChildren $e) {
+        $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()) {
             return response()->json(
-                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'))
+                Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type]))
             );
         }
+        $category->delete();
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success')));
     }

app/Http/Controllers/Api/ComponentsController.php

@@ -45,40 +45,16 @@ class ComponentsController extends Controller
                 'qty',
                 'image',
                 'notes',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'category',
-                'manufacturer',
-                'supplier',
-
             ];
 
         $components = Component::select('components.*')
             ->with('company', 'location', 'category', 'assets', 'supplier', 'adminuser', 'manufacturer', 'uncontrainedAssets')
             ->withSum('uncontrainedAssets', 'components_assets.assigned_qty');
 
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
+        if ($request->filled('search')) {
+            $components = $components->TextSearch($request->input('search'));
         }
 
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $components->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $components->TextSearch($request->input('search'));
-        }
-
-
         if ($request->filled('name')) {
             $components->where('name', '=', $request->input('name'));
         }

app/Http/Controllers/Api/ConsumablesController.php

@@ -31,53 +31,10 @@ class ConsumablesController extends Controller
         $consumables = Consumable::with('company', 'location', 'category', 'supplier', 'manufacturer')
             ->withCount('users as consumables_users_count');
 
-        // This array is what determines which fields should be allowed to be sorted on ON the table itself.
-        // These must match a column on the consumables table directly.
-        $allowed_columns = [
-            'id',
-            'name',
-            'order_number',
-            'min_amt',
-            'purchase_date',
-            'purchase_cost',
-            'company',
-            'category',
-            'model_number',
-            'item_no',
-            'manufacturer',
-            'location',
-            'qty',
-            'image',
-            // These are *relationships* so we wouldn't normally include them in this array,
-            // since they would normally create a `column not found` error,
-            // BUT we account for them in the ordering switch down at the end of this method
-            // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-            'company',
-            'location',
-            'category',
-            'supplier',
-            'manufacturer',
-        ];
-
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
+        if ($request->filled('search')) {
+            $consumables = $consumables->TextSearch(e($request->input('search')));
         }
 
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $consumables->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $consumables->TextSearch($request->input('search'));
-        }
-
-
         if ($request->filled('name')) {
             $consumables->where('name', '=', $request->input('name'));
         }
@@ -139,6 +96,25 @@ class ConsumablesController extends Controller
                 $consumables = $consumables->OrderByCreatedBy($order);
                 break;
             default:
+                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
+                // These must match a column on the consumables table directly.
+                $allowed_columns = [
+                    'id',
+                    'name',
+                    'order_number',
+                    'min_amt',
+                    'purchase_date',
+                    'purchase_cost',
+                    'company',
+                    'category',
+                    'model_number',
+                    'item_no',
+                    'manufacturer',
+                    'location',
+                    'qty',
+                    'image'
+                ];
+
                 $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
                 $consumables = $consumables->orderBy($sort, $order);
                 break;

app/Http/Controllers/Api/LicensesController.php

@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\License;
-use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
@@ -26,12 +25,9 @@ class LicensesController extends Controller
         $this->authorize('view', License::class);
 
         $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
-        $settings = Setting::getSettings();
 
         if ($request->input('status')=='inactive') {
             $licenses->ExpiredLicenses();
-        } elseif ($request->input('status')=='expiring') {
-            $licenses->ExpiringLicenses($settings->alert_interval);
         } else {
             $licenses->ActiveLicenses();
         }

app/Http/Controllers/Api/MaintenancesController.php

@@ -52,10 +52,6 @@ class MaintenancesController extends Controller
             $maintenances->where('maintenances.created_by', '=', $request->input('created_by'));
         }
 
-        if ($request->filled('url')) {
-            $maintenances->where('maintenances.url', '=', $request->input('url'));
-        }
-
         if ($request->filled('asset_maintenance_type')) {
             $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
         }

app/Http/Controllers/Api/ManufacturersController.php

@@ -2,13 +2,6 @@
 
 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;
@@ -191,19 +184,19 @@ class ManufacturersController extends Controller
      * @since [v4.0]
      * @param  int  $id
      */
-    public function destroy(Manufacturer $manufacturer): JsonResponse
+    public function destroy($id) : JsonResponse
     {
+        $this->authorize('delete', Manufacturer::class);
+        $manufacturer = Manufacturer::findOrFail($id);
         $this->authorize('delete', $manufacturer);
-        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')));
+
+        if ($manufacturer->isDeletable()) {
+            $manufacturer->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success')));
+        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.assoc_users')));
+
     }
 
     /**

app/Http/Controllers/Api/SuppliersController.php

@@ -2,13 +2,6 @@
 
 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;
@@ -198,40 +191,27 @@ class SuppliersController extends Controller
      * @since [v4.0]
      * @param  int  $id
      */
-    public function destroy(Supplier $supplier): JsonResponse
+    public function destroy($id) : 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);
-        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->assets_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
         }
 
+        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')));
     }
 

app/Http/Controllers/Api/UploadedFilesController.php

@@ -193,12 +193,8 @@ class UploadedFilesController extends Controller
 
 
         // Check for the file
-        $log = Actionlog::query()
-            ->where('id', $file_id)
-            ->where('action_type', 'uploaded')
-            ->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)
-            ->first();
+        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
+            ->where('item_id', $object->id)->first();
 
         if ($log) {
             // Check the file actually exists, and delete it
@@ -217,4 +213,4 @@ class UploadedFilesController extends Controller
         return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);
 
     }
-}
+}

app/Http/Controllers/Api/UsersController.php

@@ -103,75 +103,9 @@ class UsersController extends Controller
                 'managedLocations as manages_locations_count'
             ]);
 
-        $allowed_columns =
-            [
-                'last_name',
-                'first_name',
-                'display_name',
-                'email',
-                'jobtitle',
-                'username',
-                'employee_num',
-                'groups',
-                'activated',
-                'created_at',
-                'updated_at',
-                'two_factor_enrolled',
-                'two_factor_optin',
-                'last_login',
-                'assets_count',
-                'licenses_count',
-                'consumables_count',
-                'accessories_count',
-                'manages_users_count',
-                'manages_locations_count',
-                'phone',
-                'mobile',
-                'address',
-                'city',
-                'state',
-                'country',
-                'zip',
-                'id',
-                'ldap_import',
-                'two_factor_optin',
-                'two_factor_enrolled',
-                'remote',
-                'vip',
-                'start_date',
-                'end_date',
-                'autoassign_licenses',
-                'website',
-                'locale',
-                'notes',
-                'employee_num',
 
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'department',
-                'manager',
-                'created_by',
-
-            ];
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $users->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $users->TextSearch($request->input('search'));
+        if ($request->filled('search') != '') {
+            $users = $users->TextSearch($request->input('search'));
         }
 
         if ($request->filled('activated')) {
@@ -352,6 +286,49 @@ class UsersController extends Controller
                 $users->orderBy('first_name', $order);
                 break;
             default:
+                $allowed_columns =
+                    [
+                        'last_name',
+                        'first_name',
+                        'display_name',
+                        'email',
+                        'jobtitle',
+                        'username',
+                        'employee_num',
+                        'groups',
+                        'activated',
+                        'created_at',
+                        'updated_at',
+                        'two_factor_enrolled',
+                        'two_factor_optin',
+                        'last_login',
+                        'assets_count',
+                        'licenses_count',
+                        'consumables_count',
+                        'accessories_count',
+                        'manages_users_count',
+                        'manages_locations_count',
+                        'phone',
+                        'mobile',
+                        'address',
+                        'city',
+                        'state',
+                        'country',
+                        'zip',
+                        'id',
+                        'ldap_import',
+                        'two_factor_optin',
+                        'two_factor_enrolled',
+                        'remote',
+                        'vip',
+                        'start_date',
+                        'end_date',
+                        'autoassign_licenses',
+                        'website',
+                        'locale',
+                        'notes',
+                    ];
+
                 $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'first_name';
                 $users = $users->orderBy($sort, $order);
                 break;

app/Http/Controllers/Assets/AssetsController.php

@@ -363,7 +363,7 @@ class AssetsController extends Controller
         $asset->purchase_cost = $request->input('purchase_cost', null);
         $asset->purchase_date = $request->input('purchase_date', null);
         $asset->next_audit_date = $request->input('next_audit_date', null);
-        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model?->eol > 0)) {
+        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) {
             $asset->purchase_date = $request->input('purchase_date', null); 
             $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
             $asset->eol_explicit = false;
@@ -379,7 +379,7 @@ class AssetsController extends Controller
            } else {
                $asset->eol_explicit = true;
            }
-        } elseif (!$request->filled('asset_eol_date') && (($asset->model?->eol) == 0)) {
+        } elseif (!$request->filled('asset_eol_date') && (($asset->model->eol) == 0)) {
            $asset->asset_eol_date = null;
 		   $asset->eol_explicit = false;
         }
@@ -398,7 +398,6 @@ class AssetsController extends Controller
             $asset->assigned_to = null;
             $asset->assigned_type = null;
             $asset->accepted = null;
-            $asset->last_checkin = now();
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
         }
 

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -163,7 +163,7 @@ class BulkAssetsController extends Controller
         $modelNames = [];
 
         foreach($models as $model) {
-            $modelNames[] = $model->model?->name;
+            $modelNames[] = $model->model->name;
         }
 
         if ($request->filled('bulk_actions')) {
@@ -240,6 +240,10 @@ 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'));
@@ -270,7 +274,6 @@ 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'))
@@ -467,7 +470,7 @@ class BulkAssetsController extends Controller
                  */
 
                 // Does the model have a fieldset?
-                if ($asset->model?->fieldset) {
+                if ($asset->model->fieldset) {
                     foreach ($asset->model->fieldset->fields as $field) {
 
                         // null custom fields
@@ -618,25 +621,9 @@ class BulkAssetsController extends Controller
     {
         $this->authorize('checkout', Asset::class);
 
-        $alreadyAssigned = collect();
-
-        if (old('selected_assets') && is_array(old('selected_assets'))) {
-            $assets = Asset::findMany(old('selected_assets'));
-
-            [$assignable, $alreadyAssigned] = $assets->partition(function (Asset $asset) {
-                return !$asset->assigned_to;
-            });
-
-            session()->flashInput(['selected_assets' => $assignable->pluck('id')->values()->toArray()]);
-        }
-
         $do_not_change = ['' => trans('general.do_not_change')];
         $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
-
-        return view('hardware/bulk-checkout', [
-            'statusLabel_list' => $status_label_list,
-            'removed_assets' => $alreadyAssigned,
-        ]);
+        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
     }
 
     /**
@@ -669,21 +656,6 @@ class BulkAssetsController extends Controller
                     ->with('error', trans('general.error_assets_already_checked_out'));
             }
 
-            // Prevent checking out assets across companies if FMCS enabled
-            if (Setting::getSettings()->full_multiple_companies_support && $target->company_id) {
-                $company_ids = $assets->pluck('company_id')->unique();
-
-                // if there is more than one unique company id or the singular company id does not match
-                // then the checkout is invalid
-                if ($company_ids->count() > 1 || $company_ids->first() != $target->company_id) {
-                    // re-add the asset ids so the assets select is re-populated
-                    $request->session()->flashInput(['selected_assets' => $asset_ids]);
-
-                    return redirect(route('hardware.bulkcheckout.show'))
-                        ->with('error', trans('general.error_user_company_multiple'));
-                }
-            }
-
             if (request('checkout_to_type') == 'asset') {
                 foreach ($asset_ids as $asset_id) {
                     if ($target->id == $asset_id) {

app/Http/Controllers/BulkCategoriesController.php

@@ -1,59 +0,0 @@
-<?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'));
-        }
-    }
-}

app/Http/Controllers/BulkManufacturersController.php

@@ -1,57 +0,0 @@
-<?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'));
-        }
-    }
-}

app/Http/Controllers/BulkSuppliersController.php

@@ -1,58 +0,0 @@
-<?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'));
-        }
-    }
-}

app/Http/Controllers/CategoriesController.php

@@ -2,14 +2,6 @@
 
 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;
@@ -151,18 +143,20 @@ class CategoriesController extends Controller
      * @since [v1.0]
      * @param int $categoryId
      */
-    public function destroy(Category $category): RedirectResponse
+    public function destroy($categoryId) : RedirectResponse
     {
         $this->authorize('delete', Category::class);
-        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'));
+        // 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'));
         }
 
+        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'));
     }
 

app/Http/Controllers/Controller.php

@@ -45,7 +45,6 @@ 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,
@@ -59,7 +58,6 @@ 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/',
@@ -73,7 +71,6 @@ abstract class Controller extends BaseController
         'accessories' => 'accessory',
         'maintenances' => 'maintenance',
         'assets' => 'asset',
-        'audits' => 'audits',
         'components' => 'component',
         'consumables' => 'consumable',
         'hardware' => 'asset',

app/Http/Controllers/GroupsController.php

@@ -65,7 +65,6 @@ class GroupsController extends Controller
         $group->notes = $request->input('notes');
 
         if ($group->save()) {
-            $group->users()->sync($request->input('associated_users'));
             return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
         }
 
@@ -89,10 +88,7 @@ class GroupsController extends Controller
             $groupPermissions = [];
         }
         $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-        $associated_users = $group->users()->get();
-
-        //dd($associated_users->toArray());
-        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'))->with('associated_users', $associated_users);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
     }
 
     /**
@@ -109,10 +105,8 @@ class GroupsController extends Controller
         $group->permissions = json_encode($request->input('permission'));
         $group->notes = $request->input('notes');
 
-
         if (! config('app.lock_passwords')) {
             if ($group->save()) {
-                $group->users()->sync($request->input('associated_users'));
                 return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.update'));
             }
 

app/Http/Controllers/MaintenancesController.php

@@ -68,12 +68,6 @@ class MaintenancesController extends Controller
     {
         $this->authorize('update', Asset::class);
 
-        \Log::error(print_r($request->input('selected_assets[]'), true));
-
-        if (!$request->filled('selected_assets')) {
-            return redirect()->back()->withInput()->with('error', 'No assets were selected.');
-        }
-
         $assets = Asset::whereIn('id', $request->input('selected_assets'))->get();
 
         // Loop through the selected assets
@@ -84,7 +78,6 @@ class MaintenancesController extends Controller
             $maintenance->is_warranty = $request->input('is_warranty');
             $maintenance->cost = $request->input('cost');
             $maintenance->notes = $request->input('notes');
-            $maintenance->url = $request->input('url');
 
             // Save the asset maintenance data
             $maintenance->asset_id = $asset->id;
@@ -159,7 +152,6 @@ class MaintenancesController extends Controller
         $maintenance->name = $request->input('name');
         $maintenance->start_date = $request->input('start_date');
         $maintenance->completion_date = $request->input('completion_date');
-        $maintenance->url = $request->input('url');
 
 
         // Todo - put this in a getter/setter?

app/Http/Controllers/ManufacturersController.php

@@ -2,14 +2,6 @@
 
 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;
@@ -165,18 +157,32 @@ class ManufacturersController extends Controller
      * @param int $manufacturerId
      * @since [v1.0]
      */
-    public function destroy(Manufacturer $manufacturer): RedirectResponse
+    public function destroy($manufacturerId) : RedirectResponse
     {
-        $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'));
+        $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'));
         }
 
+        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'));
     }
 

app/Http/Controllers/ReportsController.php

@@ -436,8 +436,10 @@ class ReportsController extends Controller
             // Open output stream
             $handle = fopen('php://output', 'w');
             stream_set_timeout($handle, 2000);
-
-            fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF));
+            
+            if ($request->filled('use_bom')) {
+                fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF));
+            }
 
             $header = [];
 
@@ -683,14 +685,6 @@ class ReportsController extends Controller
                 $assets->whereBetween('assets.purchase_date', [$request->input('purchase_start'), $request->input('purchase_end')]);
             }
 
-            if ($request->filled('purchase_cost_start')) {
-                if ($request->filled('purchase_cost_end')) {
-                    $assets->whereBetween('assets.purchase_cost', [$request->input('purchase_cost_start'), $request->input('purchase_cost_end')]);
-                } else {
-                    $assets->where('assets.purchase_cost', ">", $request->input('purchase_cost_start'));
-                }
-            }
-
             if (($request->filled('created_start')) && ($request->filled('created_end'))) {
                 $created_start = Carbon::parse($request->input('created_start'))->startOfDay();
                 $created_end = Carbon::parse($request->input('created_end'))->endOfDay();

app/Http/Controllers/SuppliersController.php

@@ -2,18 +2,10 @@
 
 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
@@ -126,41 +118,30 @@ class SuppliersController extends Controller
      *
      * @param  int $supplierId
      */
-    public function destroy(Supplier $supplier): RedirectResponse
+    public function destroy($supplierId) : RedirectResponse
     {
         $this->authorize('delete', Supplier::class);
-        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 (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'));
         }
 
-        return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.success'));
+        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')
+        );
     }
 
     /**
@@ -173,5 +154,6 @@ class SuppliersController extends Controller
     {
         $this->authorize('view', Supplier::class);
         return view('suppliers/view', compact('supplier'));
+
     }
 }

app/Http/Requests/CustomAssetReportRequest.php

@@ -14,15 +14,6 @@ class CustomAssetReportRequest extends Request
         return true;
     }
 
-
-    public function prepareForValidation()
-    {
-        if($this->filled('purchase_cost_end') && !$this->filled('purchase_cost_start')){
-            $this->merge(['purchase_cost_start' => 0 ]);
-        }
-    }
-
-
     /**
      * Get the validation rules that apply to the request.
      *
@@ -33,7 +24,6 @@ class CustomAssetReportRequest extends Request
         return [
             'purchase_start'        => 'date|date_format:Y-m-d|nullable',
             'purchase_end'          => 'date|date_format:Y-m-d|nullable',
-            'purchase_cost_end'     => 'numeric|nullable|gte:purchase_cost_start',
             'created_start'         => 'date|date_format:Y-m-d|nullable',
             'created_end'           => 'date|date_format:Y-m-d|nullable',
             'checkout_date_start'   => 'date|date_format:Y-m-d|nullable',

app/Http/Requests/SettingsSamlRequest.php

@@ -109,7 +109,7 @@ class SettingsSamlRequest extends FormRequest
                 ];
 
                 $pkey = openssl_pkey_new([
-                    'private_key_bits' => (int) config('app.saml_key_size'),
+                    'private_key_bits' => config('app.saml_key_size'),
                     'private_key_type' => OPENSSL_KEYTYPE_RSA,
                 ]);
 

app/Http/Requests/StoreAssetRequest.php

@@ -26,7 +26,6 @@ class StoreAssetRequest extends ImageUploadRequest
 
     public function prepareForValidation(): void
     {
-        parent::prepareForValidation(); // call ImageUploadRequest thing
         // Guard against users passing in an array for company_id instead of an integer.
         // If the company_id is not an integer then we simply use what was
         // provided to be caught by model level validation later.

app/Http/Requests/StoreNotificationSettings.php

@@ -32,7 +32,7 @@ class StoreNotificationSettings extends FormRequest
             ],
             'alert_threshold'                     => 'numeric|nullable',
             'alert_interval'                      => 'numeric|nullable|gt:0',
-            'audit_warning_days'                  => 'numeric|nullable|gte:0',
+            'audit_warning_days'                  => 'numeric|nullable',
             'due_checkin_days'                    => 'numeric|nullable|gt:0',
             'audit_interval'                      => 'numeric|nullable|gt:0',
         ];

app/Http/Traits/ConvertsBase64ToFiles.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Traits;
 
-use Illuminate\Validation\ValidationException;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -39,13 +38,20 @@ trait ConvertsBase64ToFiles
                 if (!$base64Contents) {
                     return;
                 }
+                
+                // autogenerate filenames
+                if ($filename == 'auto'){
+                    $header = explode(';', $base64Contents, 2)[0];
+                    // Grab the image type from the header while we're at it.
+                    $filename = $key . '.' . substr($header, strpos($header, '/')+1);
+                }
 
                 // Generate a temporary path to store the Base64 contents
                 $tempFilePath = tempnam(sys_get_temp_dir(), $filename);
 
-                // Store the contents using a stream, or throw an Error (which doesn't do anything?)
+                // Store the contents using a stream, or by decoding manually
                 if (Str::startsWith($base64Contents, 'data:') && count(explode(',', $base64Contents)) > 1) {
-                    $source = fopen($base64Contents, 'r'); // PHP has special processing for "data:" URL's
+                    $source = fopen($base64Contents, 'r');
                     $destination = fopen($tempFilePath, 'w');
 
                     stream_copy_to_stream($source, $destination);
@@ -53,8 +59,7 @@ trait ConvertsBase64ToFiles
                     fclose($source);
                     fclose($destination);
                 } else {
-                    // TODO - to get a better error message here, can we maybe do something with modifying the errorBag?
-                    throw new ValidationException("Need Base64 URL starting with 'data:'"); // This doesn't actually throw?
+                    file_put_contents($tempFilePath, base64_decode($base64Contents, true));
                 }
 
                 $uploadedFile = new UploadedFile($tempFilePath, $filename, null, null, true);

app/Http/Transformers/ActionlogsTransformer.php

@@ -149,7 +149,6 @@ 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) ? [

app/Http/Transformers/AssetModelsTransformer.php

@@ -48,15 +48,12 @@ class AssetModelsTransformer
             'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
             'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number): null),
             'min_amt'   => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
-
+            'remaining' => (int) ($assetmodel->assets_count - $assetmodel->min_amt),
             'depreciation' => ($assetmodel->depreciation) ? [
                 'id' => (int) $assetmodel->depreciation->id,
                 'name'=> e($assetmodel->depreciation->name),
             ] : null,
             'assets_count' => (int) $assetmodel->assets_count,
-            'assets_assigned_count' => (int) $assetmodel->assets_assigned_count,
-            'assets_archived_count' => (int) $assetmodel->assets_archived_count,
-            'remaining' => (int) ($assetmodel->assets_count - (int) $assetmodel->assets_assigned_count) - (int) $assetmodel->assets_archived_count,
             'category' => ($assetmodel->category) ? [
                 'id' => (int) $assetmodel->category->id,
                 'name'=> e($assetmodel->category->name),
@@ -68,7 +65,7 @@ class AssetModelsTransformer
             'default_fieldset_values' => $default_field_values,
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
-            'require_serial' => ($assetmodel->require_serial == '1') ? true : false,
+            'require_serial' => $assetmodel->require_serial,
             'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
             'created_by' => ($assetmodel->adminuser) ? [
                 'id' => (int) $assetmodel->adminuser->id,

app/Http/Transformers/MaintenancesTransformer.php

@@ -66,7 +66,6 @@ class MaintenancesTransformer
                     'id' => $assetmaintenance->supplier->id,
                     'name'=> e($assetmaintenance->supplier->name)
                     ] : null,
-            'url'         => ($assetmaintenance->url) ? e($assetmaintenance->url) : null,
             'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
             'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
             'start_date'         => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),

app/Importer/AssetImporter.php

@@ -44,7 +44,7 @@ class AssetImporter extends ItemImporter
             foreach ($this->customFields as $customField) {
                 $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);
 
-                if (!is_null($customFieldValue)) {
+                if ($customFieldValue) {
                     if ($customField->field_encrypted == 1) {
                         $this->item['custom_fields'][$customField->db_column_name()] = Crypt::encrypt($customFieldValue);
                         $this->log('Custom Field '.$customField->name.': '.Crypt::encrypt($customFieldValue));

app/Mail/CheckoutAssetMail.php

@@ -87,7 +87,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

app/Mail/SendUpcomingAuditMail.php

@@ -17,11 +17,10 @@ class SendUpcomingAuditMail extends Mailable
     /**
      * Create a new message instance.
      */
-    public function __construct($params, $threshold, $total)
+    public function __construct($params, $threshold)
     {
         $this->assets = $params;
         $this->threshold = $threshold;
-        $this->total = $total;
     }
 
     /**
@@ -33,7 +32,7 @@ class SendUpcomingAuditMail extends Mailable
 
         return new Envelope(
             from: $from,
-            subject: trans_choice('mail.upcoming-audits', $this->total, ['count' => $this->total, 'threshold' => $this->threshold]),
+            subject: trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]),
         );
     }
 
@@ -50,7 +49,6 @@ class SendUpcomingAuditMail extends Mailable
             with:  [
                 'assets'  => $this->assets,
                 'threshold'  => $this->threshold,
-                'total'  => $this->total,
             ],
         );
     }

app/Models/Accessory.php

@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -391,91 +390,7 @@ class Accessory extends SnipeModel
      * BEGIN QUERY SCOPES
      * -----------------------------------------------
      **/
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
 
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'name') {
-                        $query->where('accessories.name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'notes') {
-                        $query->where('accessories.notes', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'model_number') {
-                        $query->where('accessories.model_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'order_number') {
-                        $query->where('accessories.order_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'purchase_cost') {
-                        $query->where('accessories.purchase_cost', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'location') {
-                        $query->whereHas(
-                            'location', function ($query) use ($search_val) {
-                            $query->where('locations.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'manufacturer') {
-                        $query->whereHas(
-                            'manufacturer', function ($query) use ($search_val) {
-                            $query->where('manufacturers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'supplier') {
-                        $query->whereHas(
-                            'supplier', function ($query) use ($search_val) {
-                            $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'category') {
-                        $query->whereHas(
-                            'category', function ($query) use ($search_val) {
-                            $query->where('categories.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'company') {
-                        $query->whereHas(
-                            'company', function ($query) use ($search_val) {
-                            $query->where('companies.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-
-                }
-
-
-            }
-        );
-    }
 
     /**
      * Query builder scope to order on created_by name

app/Models/Actionlog.php

@@ -478,10 +478,6 @@ class Actionlog extends SnipeModel
             $object = 'models';
         }
 
-        if ($this->action_type == 'audit') {
-            $object = 'audits';
-        }
-
         return route('ui.files.show', [
             'object_type' => $object,
             'id' => $this->item_id,
@@ -497,10 +493,6 @@ class Actionlog extends SnipeModel
             return 'private_uploads/eula-pdfs/'.$this->filename;
         }
 
-        if ($this->action_type == 'audit')  {
-            return 'private_uploads/audits/'.$this->filename;
-        }
-
         switch ($this->item_type) {
         case Accessory::class:
             return 'private_uploads/accessories/'.$this->filename;

app/Models/Asset.php

@@ -9,8 +9,6 @@ use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
-use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
 use App\Presenters\AssetPresenter;
 use App\Presenters\Presentable;
@@ -229,6 +227,7 @@ class Asset extends Depreciable
     }
 
 
+
     public function customFieldValidationRules()
     {
 
@@ -267,6 +266,7 @@ class Asset extends Depreciable
         return parent::save($params);
     }
 
+
     public function getDisplayNameAttribute()
     {
         return $this->present()->name();
@@ -277,137 +277,23 @@ class Asset extends Depreciable
      *
      * @return \Carbon\Carbon|null
      */
-
-
-    protected function warrantyExpires(): Attribute
+    public function getWarrantyExpiresAttribute()
     {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths($attributes['warranty_months']) : null,
-        );
-    }
-
-    protected function warrantyExpiresFormattedDate(): Attribute
-    {
-
-        return Attribute:: make(
-             get: fn(mixed $value, array $attributes) => Helper::getFormattedDateObject($this->warrantyExpires, 'date', false)
-        );
-    }
-
-    protected function warrantyExpiresDiff(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->warrantyExpires ? round((Carbon::now()->diffInDays($this->warrantyExpires))) : null,
-        );
-
-    }
-
-    protected function warrantyExpiresDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->warrantyExpires ? Carbon::parse($this->warrantyExpires)->diffForHumans() : null,
-        );
-
-    }
-
-
-    protected function lastAuditFormattedDate(): Attribute
-    {
-
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => Helper::getFormattedDateObject($this->last_audit_date, 'datetime', false)
-        );
-    }
-
-    protected function lastAuditDiff(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->warrantyExpires ? round((Carbon::now()->diffInDays($this->warrantyExpires))) : null,
-        );
-
-    }
-
-    protected function lastAuditDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) =>  $attributes['last_audit_date'] ? Carbon::parse($attributes['last_audit_date'])->diffForHumans() : null,
-        );
-
-    }
-
-    protected function nextAuditFormattedDate(): Attribute
-    {
-
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => Helper::getFormattedDateObject($this->next_audit_date, 'date', false)
-        );
-    }
-
-    protected function nextAuditDiffInDays(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['next_audit_date'] ? Carbon::now()->diffInDays($attributes['next_audit_date']) : null,
-        );
-    }
-
-    protected function nextAuditDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['next_audit_date'] ? Carbon::parse($attributes['next_audit_date'])->diffForHumans() : null,
-        );
-
-    }
-
-    protected function eolDate(): Attribute
-    {
-
-        return Attribute:: make(
-            get: function(mixed $value, array $attributes) {
-                if ($attributes['asset_eol_date'] && $attributes['eol_explicit'] == '1') {
-                    return Carbon::parse($attributes['asset_eol_date']);
-                } elseif ($attributes['purchase_date'] && $this->model && ((int) $this->model->eol > 0)) {
-                    return Carbon::parse($attributes['purchase_date'])->addMonths((int) $this->model->eol);
-                } else {
-                    return null;
-                }
+        if (isset($this->attributes['warranty_months']) && isset($this->attributes['purchase_date'])) {
+            if (is_string($this->attributes['purchase_date']) || is_string($this->attributes['purchase_date'])) {
+                $purchase_date = \Carbon\Carbon::parse($this->attributes['purchase_date']);
+            } else {
+                $purchase_date = \Carbon\Carbon::instance($this->attributes['purchase_date']);
             }
-        );
+            $purchase_date->setTime(0, 0, 0);
 
+            return $purchase_date->addMonths((int) $this->attributes['warranty_months']);
+        }
+
+        return null;
     }
 
 
-
-    protected function eolFormattedDate(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->eolDate ? Helper::getFormattedDateObject($this->eolDate, 'date', false) : null,
-        );
-    }
-
-    protected function eolDiffInDays(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->eolDate ? round((Carbon::now()->diffInDays(Carbon::parse($this->eolDate), false,  1))) : null,
-        );
-
-    }
-
-    protected function eolDiffForHumans(): Attribute
-    {
-
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $this->eolDate  ? Carbon::parse($this->eolDate)->diffForHumans() : null,
-        );
-
-    }
-
-    protected function expectedCheckinFormattedDate(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('expected_checkin', $attributes) ? Helper::getFormattedDateObject($attributes['expected_checkin'], 'date', false) : null,
-        );
-    }
-
     /**
      * Establishes the asset -> company relationship
      *
@@ -939,37 +825,25 @@ class Asset extends Depreciable
      */
     public static function getExpiringWarrantyOrEol($days = 30)
     {
-        $now = now();
-        $end = now()->addDays($days);
-
-        $expired_assets = self::query()
-            ->where('archived', '=', '0')
+        
+        return self::where('archived', '=', '0')
             ->NotArchived()
             ->whereNull('deleted_at')
-            ->whereNotNull('asset_eol_date')
-            ->whereBetween('asset_eol_date', [$now, $end])
+            ->where(function ($query) use ($days) {
+                // Check for manual asset EOL first
+                $query->where(function ($query) use ($days) {
+                    $query->whereNotNull('asset_eol_date')
+                        ->whereBetween('asset_eol_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                // Otherwise use the warranty months + purchase date + threshold
+                })->orWhere(function ($query) use ($days) {
+                    $query->whereNotNull('purchase_date')
+                        ->whereNotNull('warranty_months')
+                        ->whereBetween('purchase_date', [Carbon::now(), Carbon::now()->addMonths('assets.warranty_months')->addDays($days)]);
+                });
+            })
+            ->orderBy('asset_eol_date', 'ASC')
+            ->orderBy('purchase_date', 'ASC')
             ->get();
-
-        $assets_with_warranties = self::query()
-            ->where('archived', '=', '0')
-            ->NotArchived()
-            ->whereNull('deleted_at')
-            ->whereNotNull('purchase_date')
-            ->whereNotNull('warranty_months')
-            ->get();
-
-        $expired_warranties = $assets_with_warranties->filter(function ($asset) use ($now, $end) {
-            $expiration_window = Carbon::parse($asset->purchase_date)->addMonths((int) $asset->warranty_months);
-
-            return $expiration_window->betweenIncluded($now, $end);
-        });
-        return $expired_assets->concat($expired_warranties)
-            ->unique('id')
-            ->sortBy([
-                ['asset_eol_date', 'ASC'],
-                ['purchase_date', 'ASC']
-            ])
-            ->values();
     }
 
 
@@ -1901,32 +1775,16 @@ class Asset extends Depreciable
                         );
                     }
 
-                    if ($fieldname == 'assigned_to') {
+                    if ($fieldname =='assigned_to') {
                         $query->whereHasMorph(
                             'assignedTo', [User::class], function ($query) use ($search_val) {
                                 $query->where(
                                     function ($query) use ($search_val) {
                                         $query->where('users.first_name', 'LIKE', '%'.$search_val.'%')
-                                            ->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%')
-                                            ->orWhere('users.username', 'LIKE', '%'.$search_val.'%');
+                                            ->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%');
                                     }
                                 );
                             }
-                        )->orWhereHasMorph(
-                            'assignedTo', [Location::class], function ($query) use ($search_val) {
-                                $query->where('locations.name', 'LIKE', '%'.$search_val.'%');
-                            }
-                        )->orWhereHasMorph(
-                            'assignedTo', [Asset::class], function ($query) use ($search_val) {
-                            $query->where(
-                                function ($query) use ($search_val) {
-                                    // Don't use the asset table prefix here because it will pull from the original asset,
-                                    // not the subselect we're doing here to get the assigned asset
-                                    $query->where('name', 'LIKE', '%'.$search_val.'%')
-                                        ->orWhere('asset_tag', 'LIKE', '%'.$search_val.'%');
-                                }
-                            );
-                        }
                         );
                     }
 
@@ -1966,44 +1824,51 @@ class Asset extends Depreciable
                     }
 
                     if ($fieldname == 'model') {
-                        $query->whereHas(
-                            'model', function ($query) use ($search_val) {
-                            $query->where('models.name', 'LIKE', '%'.$search_val.'%');
-                        }
+                        $query->where(
+                            function ($query) use ($search_val) {
+                                $query->whereHas(
+                                    'model', function ($query) use ($search_val) {
+                                        $query->where('models.name', 'LIKE', '%'.$search_val.'%');
+                                    }
+                                );
+                            }
                         );
                     }
 
-
                     if ($fieldname == 'model_number') {
-                        $query->whereHas(
-                            'model', function ($query) use ($search_val) {
-                            $query->where('models.model_number', 'LIKE', '%'.$search_val.'%');
-                        }
+                        $query->where(
+                            function ($query) use ($search_val) {
+                                $query->whereHas(
+                                    'model', function ($query) use ($search_val) {
+                                        $query->where('models.model_number', 'LIKE', '%'.$search_val.'%');
+                                    }
+                                );
+                            }
                         );
                     }
 
 
                     if ($fieldname == 'company') {
-                        $query->whereHas(
-                            'company', function ($query) use ($search_val) {
-                            $query->where('companies.name', 'LIKE', '%'.$search_val.'%');
-                        }
+                        $query->where(
+                            function ($query) use ($search_val) {
+                                $query->whereHas(
+                                    'company', function ($query) use ($search_val) {
+                                        $query->where('companies.name', 'LIKE', '%'.$search_val.'%');
+                                    }
+                                );
+                            }
                         );
                     }
 
                     if ($fieldname == 'supplier') {
-                        $query->whereHas(
-                            'supplier', function ($query) use ($search_val) {
-                            $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-                    
-                    if ($fieldname == 'status_label') {
-                        $query->whereHas(
-                            'assetstatus', function ($query) use ($search_val) {
-                            $query->where('status_labels.name', 'LIKE', '%'.$search_val.'%');
-                        }
+                        $query->where(
+                            function ($query) use ($search_val) {
+                                $query->whereHas(
+                                    'supplier', function ($query) use ($search_val) {
+                                        $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%');
+                                    }
+                                );
+                            }
                         );
                     }
 

app/Models/AssetModel.php

@@ -2,18 +2,16 @@
 
 namespace App\Models;
 
-use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
-use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
-use App\Presenters\AssetModelPresenter;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
+use \App\Presenters\AssetModelPresenter;
+use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 
 /**
  * Model for Asset Models. Asset Models contain higher level
@@ -124,22 +122,6 @@ class AssetModel extends SnipeModel
         return $this->hasMany(\App\Models\Asset::class, 'model_id');
     }
 
-
-    public function availableAssets()
-    {
-        return $this->hasMany(\App\Models\Asset::class, 'model_id')->RTD();
-    }
-
-    public function assignedAssets()
-    {
-        return $this->hasMany(\App\Models\Asset::class, 'model_id')->Deployed();
-    }
-
-    public function archivedAssets()
-    {
-        return $this->hasMany(\App\Models\Asset::class, 'model_id')->Archived();
-    }
-
     /**
      * Establishes the model -> category relationship
      *
@@ -258,57 +240,6 @@ class AssetModel extends SnipeModel
      * -----------------------------------------------
      **/
 
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'name') {
-                        $query->where('models.name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'notes') {
-                        $query->where('models.notes', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'model_number') {
-                        $query->where('models.model_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'category') {
-                        $query->whereHas(
-                            'category', function ($query) use ($search_val) {
-                            $query->where('categories.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'manufacturer') {
-                        $query->whereHas(
-                            'manufacturer', function ($query) use ($search_val) {
-                            $query->where('manufacturers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-
-                }
-
-
-            }
-        );
-    }
-
     /**
      * scopeInCategory
      * Get all models that are in the array of category ids

app/Models/Category.php

@@ -290,35 +290,6 @@ class Category extends SnipeModel
      * -----------------------------------------------
      **/
 
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'name') {
-                        $query->where('categories.name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'category_type') {
-                        $query->where('categories.category_type', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                }
-
-
-            }
-        );
-    }
-
     /**
      * Query builder scope for whether or not the category requires acceptance
      *

app/Models/CheckoutAcceptance.php

@@ -184,17 +184,12 @@ class CheckoutAcceptance extends Model
 
         $pdf->AddPage();
         if ($data['logo'] != null) {
-            $pdf->writeHTML('<img src="@'.$data['logo'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="'.$data['logo'].'">', true, 0, true, 0, '');
         } else {
             $pdf->writeHTML('<h3>'.$data['site_name'].'</h3><br /><br />', true, 0, true, 0, 'C');
         }
 
         $pdf->Ln();
-
-        // Check for CJK in the translation string for date. (This is a good proxy for the rest of the document)
-        Helper::hasRtl(trans('general.date')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
-        Helper::isCjk(trans('general.date')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
-
         $pdf->writeHTML(trans('general.date') . ': ' . Helper::getFormattedDateObject(now(), 'datetime', false), true, 0, true, 0, '');
 
         if ($data['company_name'] != null) {
@@ -215,10 +210,7 @@ class CheckoutAcceptance extends Model
         if (($data['qty'] != null) && ($data['qty'] > 1)) {
             $pdf->writeHTML(trans('general.qty').': '.e($data['qty']), true, 0, true, 0, '');
         }
-        $pdf->writeHTML(trans('general.assignee').': '.e($data['assigned_to']) . ($data['employee_num'] ? ' ('.$data['employee_num'].')' : ''), true, 0, true, 0, '');
-        if ($data['email'] != null) {
-            $pdf->writeHTML(trans('general.email').': '.e($data['email']), true, 0, true, 0, '');
-        }
+        $pdf->writeHTML(trans('general.assignee').': '.e($data['assigned_to']), true, 0, true, 0, '');
         $pdf->Ln();
         $pdf->writeHTML('<hr>', true, 0, true, 0, '');
 
@@ -229,6 +221,7 @@ class CheckoutAcceptance extends Model
         foreach ($eula_lines as $eula_line) {
             Helper::hasRtl($eula_line) ? $pdf->setRTL(true) : $pdf->setRTL(false);
             Helper::isCjk($eula_line) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+
             $pdf->writeHTML(Helper::parseEscapedMarkedown($eula_line), true, 0, true, 0, '');
         }
         $pdf->Ln();
@@ -237,17 +230,14 @@ class CheckoutAcceptance extends Model
         $pdf->Ln();
 
         if ($data['signature'] != null) {
-            $pdf->writeHTML('<img src="@'.$data['signature'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="'.$data['signature'].'">', true, 0, true, 0, '');
             $pdf->writeHTML('<hr>', true, 0, true, 0, '');
             $pdf->writeHTML(e($data['assigned_to']), true, 0, true, 0, 'C');
             $pdf->Ln();
         }
 
-        Helper::hasRtl(trans('general.notes')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
-        Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
-
         if ($data['note'] != null) {
-            Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+            Helper::isCjk($data['note']) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
             $pdf->writeHTML(trans('general.notes') . ': ' . e($data['note']), true, 0, true, 0, '');
             $pdf->Ln();
         }

app/Models/Component.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -322,97 +321,6 @@ class Component extends SnipeModel
      * -----------------------------------------------
      **/
 
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'name') {
-                        $query->where('components.name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'notes') {
-                        $query->where('components.notes', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'model_number') {
-                        $query->where('components.model_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'order_number') {
-                        $query->where('components.order_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'serial') {
-                        $query->where('components.serial', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'serial') {
-                        $query->where('components.serial', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'purchase_cost') {
-                        $query->where('components.purchase_cost', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'location') {
-                        $query->whereHas(
-                            'location', function ($query) use ($search_val) {
-                            $query->where('locations.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'manufacturer') {
-                        $query->whereHas(
-                            'manufacturer', function ($query) use ($search_val) {
-                            $query->where('manufacturers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'supplier') {
-                        $query->whereHas(
-                            'supplier', function ($query) use ($search_val) {
-                            $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'category') {
-                        $query->whereHas(
-                            'category', function ($query) use ($search_val) {
-                            $query->where('categories.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'company') {
-                        $query->whereHas(
-                            'company', function ($query) use ($search_val) {
-                            $query->where('companies.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                }
-
-
-            }
-        );
-    }
 
     /**
      * Query builder scope to order on company

app/Models/Consumable.php

@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\ConsumablePresenter;
 use App\Presenters\Presentable;
@@ -346,99 +345,6 @@ class Consumable extends SnipeModel
      * -----------------------------------------------
      **/
 
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'name') {
-                        $query->where('consumables.name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'notes') {
-                        $query->where('consumables.notes', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'model_number') {
-                        $query->where('consumables.model_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'order_number') {
-                        $query->where('consumables.order_number', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'item_no') {
-                        $query->where('consumables.item_no', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'serial') {
-                        $query->where('consumables.serial', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'purchase_cost') {
-                        $query->where('consumables.purchase_cost', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'location') {
-                        $query->whereHas(
-                            'location', function ($query) use ($search_val) {
-                            $query->where('locations.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'manufacturer') {
-                        $query->whereHas(
-                            'manufacturer', function ($query) use ($search_val) {
-                            $query->where('manufacturers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'supplier') {
-                        $query->whereHas(
-                            'supplier', function ($query) use ($search_val) {
-                            $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-                    if ($fieldname == 'category') {
-                        $query->whereHas(
-                            'category', function ($query) use ($search_val) {
-                            $query->where('categories.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'company') {
-                        $query->whereHas(
-                            'company', function ($query) use ($search_val) {
-                            $query->where('companies.name', 'LIKE', '%'.$search_val.'%');
-                        }
-                        );
-                    }
-
-
-
-                }
-
-
-            }
-        );
-    }
-
     /**
      * Query builder scope to order on company
      *

app/Models/Labels/DefaultLabel.php

@@ -229,7 +229,7 @@ class DefaultLabel extends RectangleSheet
             static::writeText(
                 $pdf, $record->get('title'),
                 $textX1, 0,
-                Helper::isCjk($record->get('title')) ? 'cid0cs' : 'freesans', 'b', $this->textSize, 'L',
+                'freesans', 'b', $this->textSize, 'L',
                 $textW, $this->textSize,
                 true, 0
             );
@@ -246,12 +246,11 @@ class DefaultLabel extends RectangleSheet
                 static::writeText(
                     $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
                     $textX1, $textY,
-                    Helper::isCjk($field['label']) ? 'cid0cs' : 'freesans', '', $this->textSize, 'L',
+                    'freesans', '', $this->textSize, 'L',
                     $textW, $this->textSize,
                     true, 0
                 );
 
-
                 $textY += $this->textSize + self::TEXT_MARGIN;
                 $fieldsDone++;
             }

app/Models/Labels/Label.php

@@ -211,36 +211,29 @@ abstract class Label
      */
     public final function writeText(TCPDF $pdf, $text, $x, $y, $font=null, $style=null, $size=null, $align='L', $width=null, $height=null, $squash=false, $border=0, $spacing=0)
     {
-
-
         $prevFamily = $pdf->getFontFamily();
         $prevStyle = $pdf->getFontStyle();
         $prevSizePt = $pdf->getFontSizePt();
 
-
         $text = !empty($text) ? $text : '';
 
         $fontFamily = !empty($font) ? $font : $prevFamily;
         $fontStyle = !empty($style) ? $style : $prevStyle;
-
-
-        if ($size) {
-            $fontSizePt = Helper::convertUnit($size, $this->getUnit(), 'pt', true);
-        } else {
-            $fontSizePt = $prevSizePt;
+        if ($size) { $fontSizePt = Helper::convertUnit($size, $this->getUnit(), 'pt', true);
+        } else { $fontSizePt = $prevSizePt;
         }
 
         $pdf->SetFontSpacing($spacing);
 
         $parts = collect(explode('**', $text))
             ->map(
-                function ($part, $index) use ($pdf, $fontFamily, $fontStyle, $fontSizePt, $text) {
+                function ($part, $index) use ($pdf, $fontFamily, $fontStyle, $fontSizePt) {
                     $modStyle = ($index % 2 == 1) ? 'B' : $fontStyle;
                     $pdf->setFont($fontFamily, $modStyle, $fontSizePt);
                     return [
                     'text' => $part,
                     'text_width' => $pdf->GetStringWidth($part),
-                    'font_family' => Helper::isCjk($text) ? 'cid0cs' : $fontFamily,
+                    'font_family' => $fontFamily,
                     'font_style' => $modStyle,
                     'font_size' => $fontSizePt,
                     ];

app/Models/Labels/Tapes/Brother/TZe_24mm_E.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Models\Labels\Tapes\Brother;
-
-class TZe_24mm_E extends TZe_24mm
-{
-    private const BARCODE_MARGIN =   1.50;
-    private const TAG_SIZE       =   2.00;
-    private const TITLE_SIZE     =   2.80;
-    private const TITLE_MARGIN   =   0.50;
-    private const LABEL_SIZE     =   2.00;
-    private const LABEL_MARGIN   = - 0.35;
-    private const FIELD_SIZE     =   2.80;
-    private const FIELD_MARGIN   =   0.15;
-    private const BARCODE1D_SIZE = - 1.00;  
-
-    public function getUnit()  { return 'mm'; }
-    public function getWidth() { return 45.0; }
-	public function getHeight() { return 15; }
-    public function getSupportAssetTag()  { return true; }
-    public function getSupport1DBarcode() { return true; }
-    public function getSupport2DBarcode() { return true; }
-    public function getSupportFields()    { return 3; }
-    public function getSupportLogo()      { return false; }
-    public function getSupportTitle()     { return true; }
-
-    public function preparePDF($pdf) {}
-
-    public function write($pdf, $record) {
-        $pa = $this->getPrintableArea();
-
-        $currentX = $pa->x1;
-        $currentY = $pa->y1;
-        $usableWidth = $pa->w;
-
-
-        $usableHeight = $pa->h - self::BARCODE1D_SIZE;
-        $barcodeSize = $usableHeight - self::TAG_SIZE;
-
-        if ($record->has('barcode2d')) {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE - self::BARCODE1D_SIZE,
-                'freesans', 'b', self::TAG_SIZE, 'C',
-                $barcodeSize, self::TAG_SIZE, true, 0
-            );
-            static::write2DBarcode(
-                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
-                $currentX, $currentY,
-                $barcodeSize, $barcodeSize
-            );
-            $currentX += $barcodeSize + self::BARCODE_MARGIN;
-            $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE - self::BARCODE1D_SIZE,
-                'freesans', 'B', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
-        }
-
-        if ($record->has('title')) {
-            static::writeText(
-                $pdf, $record->get('title'),
-                $currentX, $currentY,
-                'freesans', 'B', self::TITLE_SIZE, 'L',
-                $usableWidth, self::TITLE_SIZE, true, 0
-            );
-            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
-        }
-
-        foreach ($record->get('fields') as $field) {
-            // Write label and value on the same line
-            // Calculate label width with proportional character spacing
-            $labelWidth = $pdf->GetStringWidth($field['label'], 'freesans', '', self::LABEL_SIZE);
-            $charCount = strlen($field['label']);
-            $spacingPerChar = 0.5;
-            $totalSpacing = $charCount * $spacingPerChar;
-            $adjustedWidth = $labelWidth + $totalSpacing;
-
-            static::writeText(
-                $pdf, $field['label'],
-                $currentX, $currentY,
-                'freesans', 'B', self::LABEL_SIZE, 'L',
-                $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
-            );
-
-            static::writeText(
-                $pdf, $field['value'],
-                $currentX + $adjustedWidth + 2, $currentY,
-                'freesans', 'B', self::FIELD_SIZE, 'L',
-                $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
-            );
-
-            $currentY += max(self::LABEL_SIZE, self::FIELD_SIZE) + self::FIELD_MARGIN;
-        }
-
-        
-        if ($record->has('barcode1d')) {
-            static::write1DBarcode(
-                $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
-                $currentX, $barcodeSize + self::BARCODE_MARGIN, $usableWidth - self::TAG_SIZE, self::TAG_SIZE
-            );
-        }
-    }
-}

app/Models/Ldap.php

@@ -104,78 +104,6 @@ class Ldap extends Model
         return $connection;
     }
 
-    /**
-     * Finds user via Admin search *first*, and _then_ try to bind as that user, returning the user attributes on success,
-     * or false on failure. This enables login when the DN is harder to programmatically 'guess' due to having users in
-     * various different OU's or other LDAP entities.
-     */
-    public static function findAndBindMultiOU(string $baseDn, string $filterQuery, string $password, int $slow_failure = 3): array|false
-    {
-        /**
-         *  If you *don't* set the slow_failure variable, do note that we might permit timing attacks in here - if
-         *  your find results come back 'slow' when a user *does* exist, but fast if they *don't* exist, then you
-         *  can use this to enumerate users.
-         *
-         *  Even if that's *not* true, we still might have an issue: if we don't find the user, then we don't even _try_
-         *  to bind as them. Again, that could permit a timing attack.
-         *
-         *  Instead of checking every little thing, we just wrap everything in a try/catch in order to unify the
-         *  'slow_failure' treatment. All failures are re-raised as exceptions so that all failures exit from the
-         *  same place.
-         */
-        $connection = null;
-        $admin_conn = null;
-        try {
-            /**
-             * First we get an 'admin' connection, which will need search permissions. That was already a requirement
-             * here, so that's not a big lift. But it _is_ possible to configure LDAP to only login, and *not* to be
-             * able to import lists of users. In that case, this function *will not work* - and you should use the
-             * legacy 'findAndBindUserLdap' method, below. Otherwise, it looks like this would attempt an anonymous
-             * bind - which you might want, but you probably don't.
-             *
-             **/
-            $admin_conn = self::connectToLdap();
-            self::bindAdminToLdap($admin_conn);
-            $results = ldap_search($admin_conn, $baseDn, $filterQuery);
-            $entry_count = ldap_count_entries($admin_conn, $results);
-            if ($entry_count != 1) {
-                throw new \Exception('Wrong number of entries found: ' . $entry_count);
-            }
-            $entry = ldap_first_entry($admin_conn, $results);
-            $user = ldap_get_attributes($admin_conn, $entry);
-            $userDn = ldap_get_dn($admin_conn, $entry);
-            if (!$userDn) {
-                throw new \Exception("No user DN found");
-            }
-            \Log::debug("FOUND DN IS: $userDn");
-            // The temptation now is to do ldap_unbind on the $admin_conn, but that gets handled in the 'finally' below.
-            // I don't know if that means a separate 'connection' is maintained to the LDAP server or not, and would
-            // definitely prefer to not do that if we can avoid it. But I don't know enough about the LDAP protocol to
-            // be certain that that happens.
-
-            //now we try to log in (bind) as that found user
-            $connection = self::connectToLdap();
-            $bind_results = ldap_bind($connection, $userDn, $password);
-            if (!$bind_results) {
-                throw new \Exception("Unable to bind as user");
-            }
-            return array_change_key_case($user);
-        } catch (\Exception $e) {
-            \Log::debug("Exception on fast find-and-bind: " . $e->getMessage());
-            if ($slow_failure) {
-                sleep($slow_failure);
-            }
-            return false; //TODO - make this null instead for a slightly nicer type signature
-        } finally {
-            if ($admin_conn) {
-                ldap_unbind($admin_conn);
-            }
-            if ($connection) {
-                ldap_unbind($connection);
-            }
-        }
-    }
-
 
     /**
      * Binds/authenticates the user to LDAP, and returns their attributes.
@@ -219,27 +147,25 @@ class Ldap extends Model
 
         Log::debug('Filter query: '.$filterQuery);
 
-        // only try this if we have an Admin username set; otherwise use the 'legacy' method
-        if (($settings->ldap_uname) && ($baseDn)) {
-            // in the fallowing call, we pick a slow-failure of 0 because we might need to fall through to 'legacy'
-            $fast_bind = self::findAndBindMultiOU($baseDn, $filterQuery, $password, 0);
-            if ($fast_bind) {
-                \Log::debug("Fast bind worked");
-                return $fast_bind;
-            }
-            \Log::debug("Fast bind failed; falling through to legacy bind");
-        }
-
         if (! $ldapbind = @ldap_bind($connection, $userDn, $password)) {
             Log::debug("Status of binding user: $userDn to directory: (directly!) ".($ldapbind ? "success" : "FAILURE"));
-            // replicate the old bad-decryption-key detection behavior here
-            try {
-                Crypt::decrypt(Setting::getSettings()->ldap_pword);
-            } catch (\Exception $e) {
-                throw new \Exception('Your app key has changed! Could not decrypt LDAP password using your current app key, so LDAP authentication has been disabled. Login with a local account, update the LDAP password and re-enable it in Admin > Settings.');
+            if (! $ldapbind = self::bindAdminToLdap($connection)) {
+                /*
+                 * TODO PLEASE:
+                 *
+                 * this isn't very clear, so it's important to note: the $ldapbind value is never correctly returned - we never 'return true' from self::bindAdminToLdap() (the function
+                 * just "falls off the end" without ever explictly returning 'true')
+                 *
+                 * but it *does* have an interesting side-effect of checking for the LDAP password being incorrectly encrypted with the wrong APP_KEY, so I'm leaving it in for now.
+                 *
+                 * If it *did* correctly return 'true' on a succesful bind, it would _probably_ allow users to log in with an incorrect password. Which would be horrible!
+                 *
+                 * Let's definitely fix this at the next refactor!!!!
+                 *
+                 */
+                Log::debug("Status of binding Admin user: $userDn to directory instead: ".($ldapbind ? "success" : "FAILURE"));
+                return false;
             }
-            //regardless of anything else; stuff isn't working. Return false.
-            return false;
         }
 
         if (! $results = ldap_search($connection, $baseDn, $filterQuery)) {

app/Models/License.php

@@ -5,11 +5,9 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
@@ -158,29 +156,6 @@ class License extends Depreciable
         );
     }
 
-
-    protected function terminatesFormattedDate(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['termination_date'] ? Helper::getFormattedDateObject($attributes['termination_date'], 'date', false) : null,
-        );
-    }
-
-    protected function terminatesDiffInDays(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['termination_date'] ? Carbon::now()->diffInDays($attributes['termination_date']) : null,
-        );
-    }
-
-    protected function terminatesDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['termination_date'] ? Carbon::parse($attributes['termination_date'])->diffForHumans() : null,
-        );
-    }
-
-
     public function prepareLimitChangeRule($parameters, $field)
     {
         $actual_seat_count = $this->licenseseats()->count(); //we use the *actual* seat count here, in case your license has gone wonky
@@ -731,6 +706,49 @@ class License extends Depreciable
         return $this->hasMany(\App\Models\LicenseSeat::class)->whereNull('assigned_to')->whereNull('deleted_at')->whereNull('asset_id');
     }
 
+    /**
+     * Returns expiring licenses.
+     *
+     * This checks if:
+     *
+     * 1) The license has not been deleted
+     * 2) The expiration date is between now and the number of days specified
+     * 3) There is an expiration date set and the termination date has not passed
+     * 4) The license termination date is null or has not passed
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since  [v1.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @see \App\Console\Commands\SendExpiringLicenseNotifications
+     */
+    public static function getExpiringLicenses($days = 60)
+    {
+
+        return self::whereNull('licenses.deleted_at')
+
+            // The termination date is null or within range
+            ->where(function ($query) use ($days) {
+                $query->whereNull('termination_date')
+                    ->orWhereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+            })
+            ->where(function ($query) use ($days) {
+                $query->whereNotNull('expiration_date')
+                    // Handle expired licenses without termination dates
+                    ->where(function ($query) use ($days) {
+                        $query->whereNull('termination_date')
+                            ->whereBetween('expiration_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                    })
+
+                    // Handle expired licenses with termination dates in the future
+                    ->orWhere(function ($query) use ($days) {
+                        $query->whereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                    });
+            })
+            ->orderBy('expiration_date', 'ASC')
+            ->orderBy('termination_date', 'ASC')
+            ->get();
+    }
+
     public function scopeActiveLicenses($query)
     {
 
@@ -747,57 +765,19 @@ class License extends Depreciable
             });
     }
 
-    /**
-     * Expiried/terminated licenses scope
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since  [v1.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     * @see \App\Console\Commands\SendExpiringLicenseNotifications
-     */
     public function scopeExpiredLicenses($query)
     {
-        return $query->whereDate('termination_date', '<=', Carbon::now())// The termination date is null or within range
-        ->orWhere(function ($query) {
-                    $query->whereDate('expiration_date', '<=', Carbon::now());
-        })
-        ->whereNull('licenses.deleted_at');
-    }
 
-    /**
-     * Expiring/terminating licenses scope
-     *
-     * This checks if:
-     *
-     * 1) The license has not been deleted
-     * 2) The expiration date is between now and the number of days specified
-     * 3) There is an expiration date set and the termination date has not passed
-     * 4) The license termination date is null or has not passed
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since  [v1.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     * @see \App\Console\Commands\SendExpiringLicenseNotifications
-     */
-    public function scopeExpiringLicenses($query, $days = 60)
-    {
-        return $query// The termination date is null or within range
-        ->where(function ($query) use ($days) {
-            $query->whereNull('termination_date')
-                ->orWhereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
-        })
-            ->where(function ($query) use ($days) {
-                $query->whereNotNull('expiration_date')
-                    // Handle expiring licenses without termination dates
-                    ->where(function ($query) use ($days) {
-                        $query->whereNull('termination_date')
-                            ->whereBetween('expiration_date', [Carbon::now(), Carbon::now()->addDays($days)]);
-                    })
+        return $query->whereNull('licenses.deleted_at')
 
-                    // Handle expiring licenses with termination dates in the future
-                    ->orWhere(function ($query) use ($days) {
-                        $query->whereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
-                    });
+            // The termination date is null or within range
+            ->where(function ($query)  {
+                $query->whereNull('termination_date')
+                    ->orWhereDate('termination_date', '<=', [Carbon::now()]);
+            })
+            ->orWhere(function ($query) {
+                $query->whereNull('expiration_date')
+                    ->orWhereDate('expiration_date', '<=', [Carbon::now()]);
             });
     }
 

app/Models/LicenseSeat.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableChildTrait;
-use App\Models\Traits\Loggable;
 use App\Notifications\CheckinLicenseNotification;
 use App\Notifications\CheckoutLicenseNotification;
 use App\Presenters\Presentable;
@@ -76,7 +75,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
     protected function displayName(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value) => $this->license?->name,
+            get: fn(mixed $value) => $this->license->name,
         );
     }
 

app/Models/Location.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Loggable.php

@@ -1,14 +1,8 @@
 <?php
 
-namespace App\Models\Traits;
+namespace App\Models;
 
-use App\Models\Actionlog;
-use App\Models\Asset;
-use App\Models\License;
-use App\Models\LicenseSeat;
-use App\Models\Location;
 use App\Models\Setting;
-use App\Models\User;
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;

app/Models/Maintenance.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableChildTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -39,7 +38,6 @@ class Maintenance extends SnipeModel implements ICompanyableChild
         'completion_date'        => 'date_format:Y-m-d|nullable|after_or_equal:start_date',
         'notes'                  => 'string|nullable',
         'cost'                   =>  'numeric|nullable|gte:0|max:99999999999999999.99',
-        'url'                    =>  'nullable|url|max:255',
     ];
 
 
@@ -59,7 +57,6 @@ class Maintenance extends SnipeModel implements ICompanyableChild
         'asset_maintenance_time',
         'notes',
         'cost',
-        'url',
     ];
 
     use Searchable;

app/Models/Requestable.php

@@ -1,10 +1,8 @@
 <?php
 
-namespace App\Models\Traits;
+namespace App\Models;
 
 use Illuminate\Support\Facades\Auth;
-use App\Models\CheckoutRequest;
-use App\Models\User;
 
 // $asset->requests
 // $asset->isRequestedBy($user)

app/Models/SnipeModel.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Helpers\Helper;
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -20,44 +19,6 @@ class SnipeModel extends Model
         $this->attributes['purchase_date'] = $value;
     }
 
-    protected function purchaseDateForDatepicker(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('purchase_date', $attributes)  ? Carbon::parse($attributes['purchase_date'])->format('Y-m-d') : null,
-        );
-    }
-
-
-    protected function purchaseDateFormatted(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => $attributes['purchase_date']  ? Helper::getFormattedDateObject(Carbon::parse($attributes['purchase_date']), 'date', false) : null,
-        );
-    }
-
-
-    protected function expiresDiffInDays(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Carbon::now()->diffInDays($attributes['expiration_date']) : null,
-        );
-    }
-
-
-    protected function expiresDiffForHumans(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Carbon::parse($attributes['expiration_date'])->diffForHumans() : null,
-        );
-    }
-
-    protected function expiresFormattedDate(): Attribute
-    {
-        return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Helper::getFormattedDateObject($attributes['expiration_date'], 'date', false) : null,
-        );
-    }
-
     /**
      * @param $value
      */
@@ -219,7 +180,6 @@ class SnipeModel extends Model
         );
     }
 
-
     public function getEula()
     {
 

app/Models/User.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
-use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use App\Presenters\UserPresenter;
@@ -225,26 +224,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return false;
     }
 
-    public function hasIndividualPermissions()
-    {
-        $permissions = [];
-
-        if (is_object($this->permissions)) {
-            $permissions = json_decode(json_encode($this->permissions), true);
-        }
-
-        if (is_string($this->permissions)) {
-            $permissions = json_decode($this->permissions, true);
-        }
-
-        foreach ($permissions as $permission) {
-            if ($permission != 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Internally check the user permission for the given section
      *
@@ -884,141 +863,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return new \stdClass;
     }
 
-
-    /**
-     * Query builder scope to search on text filters for complex Bootstrap Tables API
-     *
-     * @param \Illuminate\Database\Query\Builder $query  Query builder instance
-     * @param text                               $filter JSON array of search keys and terms
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeByFilter($query, $filter)
-    {
-        return $query->where(
-            function ($query) use ($filter) {
-                foreach ($filter as $fieldname => $search_val) {
-
-                    if ($fieldname == 'first_name') {
-                        $query->where('users.first_name', 'LIKE', '%' . $search_val . '%');
-                    }
-                    if ($fieldname == 'last_name') {
-                        $query->where('users.last_name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'display_name') {
-                        $query->where('users.display_name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'name') {
-                        $query->where('users.last_name', 'LIKE', '%' . $search_val . '%')
-                            ->orWhere('users.first_name', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'username') {
-                        $query->where('users.username', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'email') {
-                        $query->where('users.email', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'phone') {
-                        $query->where('users.phone', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'mobile') {
-                        $query->where('users.mobile', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'phone') {
-                        $query->where('users.phone', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'jobtitle') {
-                        $query->where('users.jobtitle', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'created_at') {
-                        $query->where('users.created_at', '=', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'updated_at') {
-                        $query->where('users.updated_at', '=', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'start_date') {
-                        $query->where('users.start_date', '=', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'end_date') {
-                        $query->where('users.end_date', '=', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'employee_num') {
-                        $query->where('users.employee_num', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'locale') {
-                        $query->where('users.locale', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'address') {
-                        $query->where('users.address', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'state') {
-                        $query->where('users.state', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'zip') {
-                        $query->where('users.zip', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'country') {
-                        $query->where('users.country', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'vip') {
-                        $query->where('users.vip', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'remote') {
-                        $query->where('users.remote', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'start_date') {
-                        $query->where('users.purchase_date', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'notes') {
-                        $query->where('users.notes', 'LIKE', '%' . $search_val . '%');
-                    }
-
-                    if ($fieldname == 'location') {
-                        $query->whereHas(
-                            'location', function ($query) use ($search_val) {
-                            $query->where('locations.name', 'LIKE', '%' . $search_val . '%');
-                        }
-                        );
-                    }
-
-                    if ($fieldname == 'company') {
-                        $query->whereHas(
-                            'company', function ($query) use ($search_val) {
-                            $query->where('companies.name', 'LIKE', '%' . $search_val . '%');
-                        }
-                        );
-                    }
-
-
-                }
-
-
-            }
-        );
-    }
-
     /**
      * Query builder scope to search user by name with spaces in it.
      * We don't use the advancedTextSearch() scope because that searches

app/Notifications/AcceptanceAssetAcceptedNotification.php

@@ -34,6 +34,7 @@ use Illuminate\Notifications\Notification;
         $this->file = $params['file'] ?? null;
         $this->qty = $params['qty'] ?? null;
         $this->note = $params['note'] ?? null;
+        $this->admin = $params['admin'] ?? null;
 
     }
 
@@ -76,6 +77,7 @@ use Illuminate\Notifications\Notification;
                 'accepted_date' => $this->accepted_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
+                'admin'         => $this->admin,
                 'qty' => $this->qty,
                 'intro_text'    => trans('mail.acceptance_asset_accepted'),
             ])

app/Notifications/AcceptanceAssetAcceptedToUserNotification.php

@@ -32,6 +32,7 @@ use Illuminate\Notifications\Notification;
         $this->settings = Setting::getSettings();
         $this->file = $params['file'] ?? null;
         $this->qty = $params['qty'] ?? null;
+        $this->admin = $params['admin'] ?? null;
     }
 
     /**
@@ -69,6 +70,7 @@ use Illuminate\Notifications\Notification;
                 'accepted_date' => $this->accepted_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
+                'admin'         => $this->admin,
                 'qty' => $this->qty,
                 'intro_text'    => trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]),
             ])

app/Notifications/AcceptanceAssetDeclinedNotification.php

@@ -31,7 +31,6 @@ class AcceptanceAssetDeclinedNotification extends Notification
         $this->company_name = $params['company_name'];
         $this->settings = Setting::getSettings();
         $this->qty = $params['qty'] ?? null;
-        $this->admin = $params['admin'] ?? null;
     }
 
     /**
@@ -71,8 +70,7 @@ class AcceptanceAssetDeclinedNotification extends Notification
                 'declined_date' => $this->declined_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
-                'qty'           => $this->qty,
-                'admin'         => $this->admin,
+                'qty' => $this->qty,
                 'intro_text'    => trans('mail.acceptance_asset_declined'),
             ])
             ->subject(trans('mail.acceptance_asset_declined'));

app/Notifications/CheckoutAssetNotification.php

@@ -93,8 +93,8 @@ class CheckoutAssetNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            trans('general.to_user') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
-            trans('general.by_user') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
         ];
 
         if ($item->location) {

app/Observers/AssetObserver.php

@@ -168,14 +168,14 @@ class AssetObserver
     public function saving(Asset $asset)
     {
         // determine if calculated eol and then calculate it - this should only happen on a new asset
-        if (is_null($asset->asset_eol_date) && !is_null($asset->purchase_date) && ($asset->model?->eol > 0)) {
+        if (is_null($asset->asset_eol_date) && !is_null($asset->purchase_date) && ($asset->model->eol > 0)){
             $asset->asset_eol_date = $asset->purchase_date->addMonths($asset->model->eol)->format('Y-m-d');
             $asset->eol_explicit = false; 
         } 
 
        // determine if explicit and set eol_explicit to true
        if (!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) {
-           if ($asset->model?->eol > 0) {
+            if($asset->model->eol > 0) {
                 $months = (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true);
                 if($months != $asset->model->eol) {
                     $asset->eol_explicit = true;
@@ -184,9 +184,9 @@ class AssetObserver
        } elseif (!is_null($asset->asset_eol_date) && is_null($asset->purchase_date)) {
            $asset->eol_explicit = true;
        }
-
-        if ((!is_null($asset->asset_eol_date)) && (!is_null($asset->purchase_date)) && (is_null($asset->model?->eol) || ($asset->model?->eol == 0))) {
+       if ((!is_null($asset->asset_eol_date)) && (!is_null($asset->purchase_date)) && (is_null($asset->model->eol) || ($asset->model->eol == 0))) {
            $asset->eol_explicit = true;
        }
+
     }
 }

app/Presenters/AssetModelPresenter.php

@@ -53,7 +53,7 @@ class AssetModelPresenter extends Presenter
             ],
             [
                 'field' => 'manufacturer',
-                'searchable' => true,
+                'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('general.manufacturer'),
@@ -62,7 +62,7 @@ class AssetModelPresenter extends Presenter
             ],
             [
                 'field' => 'model_number',
-                'searchable' => true,
+                'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('admin/models/table.modelnumber'),
@@ -89,36 +89,17 @@ class AssetModelPresenter extends Presenter
                 'class' => 'text-right text-padding-number-cell',
                 'footerFormatter' => 'qtySumFormatter',
             ],
-            [
-                'field' => 'assets_assigned_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.assigned'),
-                'visible' => true,
-                'class' => 'text-right text-padding-number-cell',
-                'footerFormatter' => 'qtySumFormatter',
-            ],
+
             [
                 'field' => 'remaining',
                 'searchable' => false,
-                'sortable' => true,
+                'sortable' => false,
                 'switchable' => true,
                 'title' => trans('general.remaining'),
                 'visible' => true,
                 'class' => 'text-right text-padding-number-cell',
                 'footerFormatter' => 'qtySumFormatter',
             ],
-            [
-                'field' => 'assets_archived_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.archived'),
-                'visible' => true,
-                'class' => 'text-right text-padding-number-cell',
-                'footerFormatter' => 'qtySumFormatter',
-            ],
             [
                 'field' => 'depreciation',
                 'searchable' => false,
@@ -130,7 +111,7 @@ class AssetModelPresenter extends Presenter
             ],
             [
                 'field' => 'category',
-                'searchable' => true,
+                'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('general.category'),

app/Presenters/CategoryPresenter.php

@@ -14,11 +14,6 @@ class CategoryPresenter extends Presenter
     public static function dataTableLayout()
     {
         $layout = [
-            [
-                'field'        => 'checkbox',
-                'checkbox'     => true,
-                'titleTooltip' => trans('general.select_all_none'),
-            ],
             [
                 'field' => 'id',
                 'searchable' => false,
@@ -97,7 +92,7 @@ class CategoryPresenter extends Presenter
                 'formatter' => 'usersLinkObjFormatter',
             ], [
                 'field' => 'created_at',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('general.created_at'),
@@ -105,7 +100,7 @@ class CategoryPresenter extends Presenter
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'updated_at',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' => trans('general.updated_at'),

app/Presenters/ComponentPresenter.php

@@ -131,7 +131,7 @@ class ComponentPresenter extends Presenter
                 'class' => 'text-right',
             ], [
                 'field' => 'total_cost',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
                 'title' => trans('general.total_cost'),
                 'footerFormatter' => 'sumFormatterQuantity',

app/Presenters/LicensePresenter.php

@@ -48,13 +48,6 @@ class LicensePresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('admin/licenses/form.expiration'),
                 'formatter' => 'dateDisplayFormatter',
-            ], [
-                'field' => 'termination_date',
-                'searchable' => true,
-                'sortable' => true,
-                'visible' => false,
-                'title' => trans('admin/licenses/form.termination_date'),
-                'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'license_email',
                 'searchable' => true,
@@ -117,6 +110,14 @@ class LicensePresenter extends Presenter
                 'title' => trans('general.purchase_date'),
                 'formatter' => 'dateDisplayFormatter',
             ],
+            [
+                'field' => 'termination_date',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('admin/licenses/form.termination_date'),
+                'formatter' => 'dateDisplayFormatter',
+            ],
             [
                 'field' => 'depreciation',
                 'searchable' => true,

app/Presenters/MaintenancesPresenter.php

@@ -111,12 +111,6 @@ class MaintenancesPresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('admin/maintenances/form.completion_date'),
                 'formatter' => 'dateDisplayFormatter',
-            ], [
-                'field' => 'url',
-                'searchable' => true,
-                'sortable' => true,
-                'title' => trans('general.url'),
-                'formatter' => 'externalLinkFormatter',
             ], [
                 'field' => 'notes',
                 'searchable' => true,

app/Presenters/ManufacturerPresenter.php

@@ -14,11 +14,7 @@ class ManufacturerPresenter extends Presenter
     public static function dataTableLayout()
     {
         $layout = [
-            [
-                'field'        => 'checkbox',
-                'checkbox'     => true,
-                'titleTooltip' => trans('general.select_all_none'),
-            ],
+
             [
                 'field' => 'id',
                 'searchable' => false,

app/Presenters/SupplierPresenter.php

@@ -13,11 +13,6 @@ class SupplierPresenter extends Presenter
     public static function dataTableLayout()
     {
         $layout = [
-            [
-                'field'        => 'checkbox',
-                'checkbox'     => true,
-                'titleTooltip' => trans('general.select_all_none'),
-            ],
              [
                 'field' => 'id',
                 'searchable' => false,

app/Providers/AppServiceProvider.php

@@ -24,7 +24,6 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Blade;
 
 /**
  * This service provider handles setting the observers on models
@@ -43,9 +42,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(UrlGenerator $url)
     {
-
-
-
         /**
          * This is a workaround for proxies/reverse proxies that don't always pass the proper headers.
          *
@@ -80,9 +76,6 @@ class AppServiceProvider extends ServiceProvider
         Consumable::observe(ConsumableObserver::class);
         License::observe(LicenseObserver::class);
         Setting::observe(SettingObserver::class);
-
-        // https://laravel.com/docs/11.x/blade#html-entity-encoding
-        Blade::withoutDoubleEncoding();
     }
 
     /**

app/Providers/BreadcrumbsServiceProvider.php

@@ -350,15 +350,10 @@ class BreadcrumbsServiceProvider extends ServiceProvider
          * Licenses Breadcrumbs
          */
         if ((request()->is('licenses*')) && (request()->status=='inactive')) {
-            Breadcrumbs::for('licenses.index', fn(Trail $trail) => $trail->parent('home', route('home'))
-                ->push(trans('general.licenses'), route('licenses.index'))
-                ->push(trans('general.show_inactive'), route('licenses.index'))
-            );
-        } elseif ((request()->is('licenses*')) && (request()->status=='expiring')) {
             Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
             $trail->parent('home', route('home'))
                 ->push(trans('general.licenses'), route('licenses.index'))
-                ->push(trans('general.show_expiring'), route('licenses.index'))
+                ->push(trans('general.show_inactive'), route('licenses.index'))
             );
         } else {
             Breadcrumbs::for('licenses.index', fn (Trail $trail) =>

app/View/Label.php

@@ -74,10 +74,6 @@ class Label implements View
             [0 => $template->getWidth(), 1 => $template->getHeight(), 'Rotate' => $template->getRotation()]
         );
 
-        // Required for CJK languages, otherwise the embedded font can get too massive
-        $pdf->SetFontSubsetting(true);
-
-
         // Reset parameters
         $pdf->SetPrintHeader(false);
         $pdf->SetPrintFooter(false);
@@ -180,14 +176,14 @@ class Label implements View
                             // For fields that have multiple options, we need to combine them
                             // into a single field so all values are displayed.
                             ->reduce(function ($previous, $current) {
-                                // On the first iteration, we simply return the item.
+                                // On the first iteration we simply return the item.
                                 // If there is only one item to be processed for the row
                                 // then this effectively skips everything below this if block.
                                 if (is_null($previous)) {
                                     return $current;
                                 }
 
-                                // At this point, we are dealing with a row with multiple items being displayed.
+                                // At this point we are dealing with a row with multiple items being displayed.
                                 // We need to combine the label and value of the current item with the previous item.
 
                                 // The end result of this will be in this format:

config/database.php

@@ -18,10 +18,9 @@ $dump_options = [
     //'add_extra_option' => '--optionname=optionvalue',
 ];
 
-// For modern versions of mysqldump, use --ssl-mode=DISABLED
+// Some versions of mysql do not support the --skip-ssl option and will fail if it is even set
 if (env('DB_DUMP_SKIP_SSL') == 'true') {
-    // Correctly add the option as a string to the 'add_extra_option' key.
-    $dump_options['add_extra_option'] = '--ssl-mode=DISABLED';
+    $dump_options['skip_ssl'] = true;
 }
 
 

config/permissions.php

@@ -9,9 +9,11 @@
 
 return [
 
-    'Superuser' => [
+    'Global' => [
         [
             'permission' => 'superuser',
+            'label'      => 'Super User',
+            'note'       => 'Determines whether the user has full access to all aspects of the admin. This setting overrides any more specific permissions throughout the system. ',
             'display'    => true,
         ],
     ],
@@ -19,13 +21,17 @@ return [
     'Admin' => [
         [
             'permission' => 'admin',
+            'label'      => '',
+            'note'       => 'Determines whether the user has access to most aspects of the admin. ',
             'display'    => true,
         ],
     ],
 
-    'Import' => [
+    'CSV Import' => [
         [
             'permission' => 'import',
+            'label'      => '',
+            'note'       => 'This will allow users to import even if access to users, assets, etc is denied elsewhere.',
             'display'    => true,
         ],
     ],
@@ -33,6 +39,8 @@ return [
     'Reports' => [
         [
             'permission' => 'reports.view',
+            'label'      => 'View',
+            'note'       => 'Determines whether the user has the ability to view reports.',
             'display'    => true,
         ],
     ],
@@ -40,48 +48,68 @@ return [
     'Assets' => [
         [
             'permission' => 'assets.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => false,
         ],
 
         [
             'permission' => 'assets.checkin',
+            'label'      => 'Checkin ',
+            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.audit',
+            'label'      => 'Audit ',
+            'note'       => 'Allows the user to mark an asset as physically inventoried.',
             'display'    => true,
         ],
 
 
         [
             'permission' => 'assets.view.requestable',
+            'label'      => 'View Requestable Assets',
+            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.view.encrypted_custom_fields',
+            'label'      => 'View and Modify Encrypted Custom Fields',
+            'note'       => '',
             'display'    => true,
         ],
 
@@ -90,30 +118,44 @@ return [
     'Accessories' => [
         [
             'permission' => 'accessories.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.edit',
+            'label'      => 'Edit ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.checkin',
+            'label'      => 'Checkin ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.files',
+            'label'      => 'View and Modify Accessory Files',
+            'note'       => '',
             'display'    => true,
         ],
 
@@ -122,26 +164,38 @@ return [
     'Consumables' => [
         [
             'permission' => 'consumables.view',
+            'label'      => 'View',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.edit',
+            'label'      => 'Edit ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.files',
+            'label'      => 'View and Modify Consumable Files',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -150,34 +204,44 @@ return [
     'Licenses' => [
         [
             'permission' => 'licenses.view',
+            'label'      => 'View',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.edit',
+            'label'      => 'Edit ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.checkout',
-            'display'    => true,
-        ],
-        [
-            'permission' => 'licenses.checkin',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.keys',
+            'label'      => 'View License Keys',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.files',
+            'label'      => 'View and Modify License Files',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -186,30 +250,44 @@ return [
     'Components' => [
         [
             'permission' => 'components.view',
+            'label'      => 'View',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.edit',
+            'label'      => 'Edit ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.checkin',
+            'label'      => 'Checkin ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.files',
+            'label'      => 'View and Modify Component Files',
+            'note'       => '',
             'display'    => true,
         ],
 
@@ -218,18 +296,26 @@ return [
     'Kits' => [
         [
             'permission' => 'kits.view',
+            'label'      => 'View ',
+            'note'       => 'These are predefined kits that can be used to quickly checkout assets, licenses, etc.',
             'display'    => true,
         ],
         [
             'permission' => 'kits.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'kits.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'kits.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -237,18 +323,26 @@ return [
     'Users' => [
         [
             'permission' => 'users.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.create',
+            'label'      => 'Create Users',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.edit',
+            'label'      => 'Edit Users',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.delete',
+            'label'      => 'Delete Users',
+            'note'       => '',
             'display'    => true,
         ],
 
@@ -257,18 +351,26 @@ return [
     'Models' => [
         [
             'permission' => 'models.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
 
@@ -277,18 +379,26 @@ return [
     'Categories' => [
         [
             'permission' => 'categories.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -296,18 +406,26 @@ return [
     'Departments' => [
         [
             'permission' => 'departments.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -315,18 +433,26 @@ return [
     'Status Labels' => [
         [
             'permission' => 'statuslabels.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -334,18 +460,26 @@ return [
     'Custom Fields' => [
         [
             'permission' => 'customfields.view',
+            'label'      => 'View',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.create',
+            'label'      => 'Create',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.edit',
+            'label'      => 'Edit',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.delete',
+            'label'      => 'Delete',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -353,18 +487,26 @@ return [
     'Suppliers' => [
         [
             'permission' => 'suppliers.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -373,18 +515,26 @@ return [
     'Manufacturers' => [
         [
             'permission' => 'manufacturers.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -392,18 +542,26 @@ return [
     'Depreciations' => [
         [
             'permission' => 'depreciations.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -411,18 +569,26 @@ return [
     'Locations' => [
         [
             'permission' => 'locations.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -430,46 +596,66 @@ return [
     'Companies' => [
         [
             'permission' => 'companies.view',
+            'label'      => 'View ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.create',
+            'label'      => 'Create ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
             'display'    => true,
         ],
     ],
 
 
-    'User (Self) Accounts' => [
+
+
+    'Self' => [
         [
             'permission' => 'self.two_factor',
+            'label'      => 'Two-Factor Authentication',
+            'note'       => 'The user may disable/enable two-factor authentication themselves if two-factor is enabled and set to selective.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.api',
+            'label'      => 'Create API Keys',
+            'note'       => 'The user create personal API keys to utilize the REST API.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.edit_location',
+            'label'      => 'Profile Edit Location',
+            'note'       => 'The user may update their own location in their profile. Note that this is not affected by any additional Users permissions you grant to this user or group.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.checkout_assets',
+            'label'      => 'Self-Checkout',
+            'note'       => 'This user may check out assets that are marked for self-checkout.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.view_purchase_cost',
+            'label'      => 'View Purchase-Cost Column',
+            'note'       => 'This user can see the purchase cost column of items assigned to them.',
             'display'    => true,
         ],
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.3.4',
-  'full_app_version' => 'v8.3.4 - build 20218-g3ab2e2011',
-  'build_version' => '20218',
+  'app_version' => 'v8.3.2',
+  'full_app_version' => 'v8.3.2 - build 19905-g028b4e7b7',
+  'build_version' => '19905',
   'prerelease_version' => '',
-  'hash_version' => 'g3ab2e2011',
-  'full_hash' => 'v8.3.4-149-g3ab2e2011',
-  'branch' => 'master',
+  'hash_version' => 'g028b4e7b7',
+  'full_hash' => 'v8.3.2-319-g028b4e7b7',
+  'branch' => 'develop',
 );