Uncomment git stash

Signed-off-by: snipe <snipe@snipe.net>
Nicer upgrade.php UI
2025-02-25 16:55:39 +00:00 · 2025-02-25 16:51:32 +00:00 · 2025-02-25 14:40:45 +00:00 · 2025-02-25 13:49:38 +00:00 · 2025-02-25 14:22:22 +01:00 · 2025-02-25 13:55:53 +01:00
1682 changed files with 301285 additions and 12081 deletions
@@ -3235,6 +3235,60 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "sgross-emlix",
+      "name": "Sebastian Groß",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143394709?v=4",
+      "profile": "https://github.com/sgross-emlix",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AnouarTouati",
+      "name": "Anouar Touati",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41107778?v=4",
+      "profile": "https://github.com/AnouarTouati",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aHVzY2g",
+      "name": "aHVzY2g",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25596663?v=4",
+      "profile": "https://github.com/aHVzY2g",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "brlin-tw",
+      "name": "林博仁 Buo-ren Lin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13408130?v=4",
+      "profile": "https://brlin.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "addex12",
+      "name": "Adugna Gizaw",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18550946?v=4",
+      "profile": "https://orbalia.pythonanywhere.com/",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "jostrander",
+      "name": "Jesse Ostrander",
+      "avatar_url": "https://avatars.githubusercontent.com/u/760989?v=4",
+      "profile": "https://github.com/jostrander",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -11,12 +11,12 @@ MYSQL_ROOT_PASSWORD=changeme1234
 # REQUIRED: BASIC APP SETTINGS
 # --------------------------------------------
 APP_ENV=develop
-APP_DEBUG=false
+APP_DEBUG=true
 # please regenerate the APP_KEY value by calling `docker-compose run --rm snipeit bash` and then `php artisan key:generate --show` and then copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
 APP_URL=http://localhost:8000
 APP_TIMEZONE='UTC'
-APP_LOCALE=en
+APP_LOCALE=en-US
 MAX_RESULTS=500

 # --------------------------------------------
@@ -158,7 +158,7 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=stderr
+LOG_CHANNEL=single
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
@@ -1,7 +1,7 @@
 # --------------------------------------------
 # REQUIRED: DOCKER SPECIFIC SETTINGS
 # --------------------------------------------
-APP_VERSION=v6.4.1
+APP_VERSION=
 APP_PORT=8000

 # --------------------------------------------
@@ -9,7 +9,7 @@ APP_PORT=8000
 # --------------------------------------------
 APP_ENV=production
 APP_DEBUG=false
-# Please regenerate the APP_KEY value by calling `docker compose run --rm snipeit php artisan key:generate --show`. Copy paste the value here
+# Please regenerate the APP_KEY value by calling `docker compose run --rm app php artisan key:generate --show`. Copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
 APP_URL=http://localhost:8000
 # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - TZ identifier
@@ -80,6 +80,12 @@ MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true
 ALLOW_BACKUP_DELETE=false
 ALLOW_DATA_PURGE=false
+ALL_BACKUP_KEEP_DAYS=7
+DAILY_BACKUP_KEEP_DAYS=16
+WEEKLY_BACKUP_KEEP_WEEKS=8
+MONTHLY_BACKUP_KEEP_MONTHS=4
+YEARLY_BACKUP_KEEP_YEARS=2
+BACKUP_PURGE_OLDEST_AT_MEGS=5000

 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
@@ -25,9 +25,9 @@ jobs:
      fail-fast: false
      matrix:
        php-version:
-          - "8.1"
          - "8.2"
          - "8.3"
+          - "8.4"

    name: PHP ${{ matrix.php-version }}

@@ -21,9 +21,10 @@ jobs:
      fail-fast: false
      matrix:
        php-version:
-          - "8.1"
          - "8.2"
          - "8.3"
+          - "8.4"
+

    name: PHP ${{ matrix.php-version }}

@@ -15,7 +15,7 @@ jobs:
      fail-fast: false
      matrix:
        php-version:
-          - "8.1.1"
+          - "8.3"

    name: PHP ${{ matrix.php-version }}

@@ -3,8 +3,8 @@
    "DOC2": "In other words, what you see locally are the requirements for your _current_ install",
    "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version",
    "DOC4": "You should really just ignore it and run upgrade.php. Really",
-    "php_min_version": "8.1.0",
-    "php_max_major_minor": "8.3",
-    "php_max_wontwork": "8.4.0",
-    "current_snipeit_version": "7.0"
+    "php_min_version": "8.2.0",
+    "php_max_major_minor": "8.4",
+    "php_max_wontwork": "8.5.0",
+    "current_snipeit_version": "8.0"
 }
@@ -52,7 +52,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") |
 | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") | [<img src="https://avatars.githubusercontent.com/u/25596663?v=4" width="110px;"/><br /><sub>aHVzY2g</sub>](https://github.com/aHVzY2g)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aHVzY2g "Code") | [<img src="https://avatars.githubusercontent.com/u/13408130?v=4" width="110px;"/><br /><sub>林博仁 Buo-ren Lin</sub>](https://brlin.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brlin-tw "Code") | [<img src="https://avatars.githubusercontent.com/u/18550946?v=4" width="110px;"/><br /><sub>Adugna Gizaw</sub>](https://orbalia.pythonanywhere.com/)<br />[🌍](#translation-addex12 "Translation") | [<img src="https://avatars.githubusercontent.com/u/760989?v=4" width="110px;"/><br /><sub>Jesse Ostrander</sub>](https://github.com/jostrander)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jostrander "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"

 # No need to add `apt-get clean` here, reference:
@@ -14,16 +14,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
 apt-utils \
 apache2 \
 apache2-bin \
-libapache2-mod-php8.1 \
-php8.1-curl \
-php8.1-ldap \
-php8.1-mysql \
-php8.1-gd \
-php8.1-xml \
-php8.1-mbstring \
-php8.1-zip \
-php8.1-bcmath \
-php8.1-redis \
+libapache2-mod-php8.3 \
+php8.3-curl \
+php8.3-ldap \
+php8.3-mysql \
+php8.3-gd \
+php8.3-xml \
+php8.3-mbstring \
+php8.3-zip \
+php8.3-bcmath \
+php8.3-redis \
 php-memcached \
 patch \
 curl \
@@ -40,8 +40,7 @@ autoconf \
 libc-dev \
 libldap-common \
 pkg-config \
-libmcrypt-dev \
-php8.1-dev \
+php8.3-dev \
 ca-certificates \
 unzip \
 dnsutils \
@@ -51,18 +50,13 @@ dnsutils \
 RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
 RUN php go-pear.phar

-RUN pecl install mcrypt
-
-RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.1/mods-available/mcrypt.ini"
-
-RUN phpenmod mcrypt
 RUN phpenmod gd
 RUN phpenmod bcmath

-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/cli/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/cli/php.ini

-RUN useradd -m --uid 1000 --gid 50 docker
+RUN useradd -m --uid 10000 --gid 50 docker

 RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
 RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
@@ -73,7 +73,7 @@ RUN mkdir -p /var/www/.composer && chown apache /var/www/.composer

 # Install dependencies
 USER apache
-RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html
+RUN COMPOSER_CACHE_DIR=/dev/null composer install --working-dir=/var/www/html

 USER root

@@ -7,7 +7,7 @@

 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 10](http://laravel.com).
+It is built on [Laravel 11](http://laravel.com).

 Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)

@@ -94,6 +94,8 @@ Since the release of the JSON REST API, several third-party developers have been
 - [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by [@ReticentRobot](https://github.com/ReticentRobot) - Windows agent for Snipe-IT.
 - [Gate Pass Generator](https://github.com/cha7uraAE/snipe-it-gate-pass-system) by [@cha7uraAE](https://github.com/cha7uraAE) - A Streamlit application for generating gate passes based on hardware data from a Snipe-IT API.

+We also have a handful of [Google Apps scripts](https://github.com/grokability/google-apps-scripts-for-snipe-it) to help with various tasks.
+
 -----

 ### Join the Community!
@@ -125,6 +125,10 @@ class LdapSync extends Command
             */
            $attributes = array_values(array_filter($ldap_map));

+            if (Setting::getSettings()->is_ad === 1 && is_null($ldap_map['active_flag'])) {
+                $attributes[] = 'useraccountcontrol';
+            }
+
            $results = Ldap::findLdapUsers($search_base, -1, $filter, $attributes);

        } catch (\Exception $e) {
@@ -427,7 +431,13 @@ class LdapSync extends Command
                    $user->groups()->attach($ldap_default_group);
                }
                //updates assets location based on user's location
-                Asset::where('assigned_to', '=', $user->id)->where('assigned_type', '=', User::class)->update(['location_id' => $user->location_id]);
+                if ($user->wasChanged('location_id')) {
+                    foreach ($user->assets as $asset) {
+                        $asset->location_id = $user->location_id;
+                        // TODO: somehow add note? "Asset Location Changed because of thing"
+                        $asset->save();
+                    }
+                }

            } else {
                foreach ($user->getErrors()->getMessages() as $key => $err) {
@@ -59,7 +59,7 @@ class ObjectImportCommand extends Command
        $classString = "App\\Importer\\{$class}Importer";
        $importer = new $classString($filename);
        $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
-                 ->setUserId($this->option('user_id'))
+                 ->setCreatedBy($this->option('user_id'))
                 ->setUpdating($this->option('update'))
                 ->setShouldNotify($this->option('send-welcome'))
                 ->setUsernameFormat($this->option('username_format'));
@@ -1,157 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\LegacyEncrypter\McryptEncrypter;
-use App\Models\Asset;
-use App\Models\CustomField;
-use App\Models\Setting;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-
-class RecryptFromMcrypt extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:legacy-recrypt 
-                {--force : Force a re-crypt of encrypted data from MCRYPT.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This command allows upgrading users to de-encrypt their deprecated mcrypt encrypted fields and re-encrypt them using the current OpenSSL encryption.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        // Check and see if they have a legacy app key listed in their .env
-        // If not, we can try to use the current APP_KEY if looks like it's old
-        $legacy_key = env('LEGACY_APP_KEY');
-        $key_parts = explode(':', $legacy_key);
-        $legacy_cipher = env('LEGACY_CIPHER', 'rijndael-256');
-        $errors = [];
-
-        if (! $legacy_key) {
-            $this->error('ERROR: You do not have a LEGACY_APP_KEY set in your .env file. Please locate your old APP_KEY and ADD a line to your .env file like: LEGACY_APP_KEY=YOUR_OLD_APP_KEY');
-
-            return false;
-        }
-
-        // Do some basic legacy app key length checks
-        if (strlen($legacy_key) == 32) {
-            $legacy_length_check = true;
-        } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1]) == 44)) {
-            $legacy_key = base64_decode($key_parts[1], true);
-            $legacy_length_check = true;
-        } else {
-            $legacy_length_check = false;
-        }
-
-        // Check that the app key is 32 characters
-        if ($legacy_length_check === true) {
-            $this->comment('INFO: Your LEGACY_APP_KEY looks correct. Okay to continue.');
-        } else {
-            $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters or base64 followed by 44 characters for later versions). Please locate your old APP_KEY and use that as your LEGACY_APP_KEY in your .env file to continue.');
-
-            return false;
-        }
-
-        $this->error('================================!!!! WARNING !!!!================================');
-        $this->error('================================!!!! WARNING !!!!================================');
-        $this->comment("This tool will attempt to decrypt your old Snipe-IT (mcrypt, now deprecated) encrypted data and re-encrypt it using OpenSSL. \n\nYou should only continue if you have backed up any and all old APP_KEYs and have backed up your data.");
-
-        $force = ($this->option('force')) ? true : false;
-
-        if ($force || ($this->confirm('Are you SURE you wish to continue?'))) {
-            $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
-
-            try {
-                Storage::disk('local')->put($backup_file, 'APP_KEY: '.config('app.key'));
-                Storage::disk('local')->append($backup_file, 'LEGACY_APP_KEY: '.$legacy_key);
-            } catch (\Exception $e) {
-                $this->info('WARNING: Could not backup app keys');
-            }
-
-            if ($legacy_cipher) {
-                $mcrypter = new McryptEncrypter($legacy_key, $legacy_cipher);
-            } else {
-                $mcrypter = new McryptEncrypter($legacy_key);
-            }
-            $settings = Setting::getSettings();
-
-            if ($settings->ldap_pword == '') {
-                $this->comment('INFO: No LDAP password found. Skipping... ');
-            } else {
-                $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword);
-                $settings->ldap_pword = Crypt::encrypt($decrypted_ldap_pword);
-                $settings->save();
-            }
-            /** @var CustomField[] $custom_fields */
-            $custom_fields = CustomField::where('field_encrypted', '=', 1)->get();
-            $this->comment('INFO: Retrieving encrypted custom fields...');
-
-            $query = Asset::withTrashed();
-
-            foreach ($custom_fields as $custom_field) {
-                $this->comment('FIELD TO RECRYPT:  '.$custom_field->name.' ('.$custom_field->db_column.')');
-                $query->orWhereNotNull($custom_field->db_column);
-            }
-
-            // Get all assets with a value in any of the fields that were encrypted
-            /** @var Asset[] $assets */
-            $assets = $query->get();
-
-            $bar = $this->output->createProgressBar(count($assets));
-
-            foreach ($assets as $asset) {
-                foreach ($custom_fields as $encrypted_field) {
-                    $columnName = $encrypted_field->db_column;
-
-                    // Make sure the value isn't null
-                    if ($asset->{$columnName} != '') {
-                        // Try to decrypt the payload using the legacy app key
-                        try {
-                            $decrypted_field = $mcrypter->decrypt($asset->{$columnName});
-                            $asset->{$columnName} = Crypt::encrypt($decrypted_field);
-                            $this->comment($decrypted_field);
-                        } catch (\Exception $e) {
-                            $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
-                        }
-                    }
-                }
-                $asset->save();
-                $bar->advance();
-            }
-
-            $bar->finish();
-
-            if (count($errors) > 0) {
-                $this->comment("\n\n");
-                $this->error("The decrypter encountered some errors: \n");
-                foreach ($errors as $error) {
-                    $this->error($error);
-                }
-            }
-        }
-    }
-}
@@ -50,12 +50,12 @@ class ResetDemoSettings extends Command
        $settings->alert_email = 'service@snipe-it.io';
        $settings->login_note = 'Use `admin` / `password` to login to the demo.';
        $settings->header_color = null;
-        $settings->barcode_type = 'QRCODE';
+        $settings->label2_2d_type = 'QRCODE';
        $settings->default_currency = 'USD';
        $settings->brand = 2;
        $settings->ldap_enabled = 0;
        $settings->full_multiple_companies_support = 0;
-        $settings->alt_barcode = 'C128';
+        $settings->label2_1d_type = 'C128';
        $settings->skin = '';
        $settings->email_domain = 'snipeitapp.com';
        $settings->email_format = 'filastname';
@@ -65,7 +65,7 @@ class ResetDemoSettings extends Command
        $settings->thumbnail_max_h = '30';
        $settings->locale = 'en-US';
        $settings->version_footer = 'on';
-        $settings->support_footer = null;
+        $settings->support_footer = 'on';
        $settings->saml_enabled = '0';
        $settings->saml_sp_x509cert = null;
        $settings->saml_idp_metadata = null;
@@ -51,6 +51,8 @@ class SQLStreamer {
            /* we *could* have made the ^INSERT INTO blah VALUES$ turn on the capturing state, and closed it with
               a ^(blahblah);$ but it's cleaner to not have to manage the state machine. We're just going to
               assume that (blahblah), or (blahblah); are values for INSERT and are always acceptable. */
+            "<^/\*!40101 SET NAMES '?[a-zA-Z0-9_-]+'? \*/;$>"                                   => false, //using weird delimiters (<,>) for readability. allow quoted or unquoted charsets
+            "<^/\*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' \*/;$>" => false, //same, now handle zero-values
        ];

        foreach($allowed_statements as $statement => $statechange) {
@@ -370,7 +372,7 @@ class RestoreFromBackup extends Command
        if ($this->option('sanitize-guess-prefix')) {
            $prefix = SQLStreamer::guess_prefix($sql_contents);
            $this->line($prefix);
-            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitze your SQL.");
+            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitize your SQL.");
        }

        // If we're doing --sql-stdout-only, handle that now so we don't have to open pipes to mysql and all of that silliness
@@ -72,7 +72,7 @@ class SendAcceptanceReminder extends Command
            $locale = $acceptance->assignedTo?->locale;
            $email = $acceptance->assignedTo?->email;
            if(!$email){
-                $this->info($acceptance->assignedTo->present()->fullName().' has no email address.');
+                $this->info($acceptance->assignedTo?->present()->fullName().' has no email address.');
            }
            $item_count = $unacceptedAssetGroup->count();

@@ -2,13 +2,13 @@

 namespace App\Console\Commands;

+use App\Mail\ExpiringAssetsMail;
+use App\Mail\ExpiringLicenseMail;
 use App\Models\Asset;
 use App\Models\License;
-use App\Models\Recipients\AlertRecipient;
 use App\Models\Setting;
-use App\Notifications\ExpiringAssetsNotification;
-use App\Notifications\ExpiringLicenseNotification;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;

 class SendExpirationAlerts extends Command
 {
@@ -47,22 +47,22 @@ class SendExpirationAlerts extends Command
        if (($settings->alert_email != '') && ($settings->alerts_enabled == 1)) {

            // Send a rollup to the admin, if settings dictate
-            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
-                return new AlertRecipient($item);
-            });
-
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item)) // Trim each email
+                ->all();
            // Expiring Assets
            $assets = Asset::getExpiringWarrantee($threshold);
+
            if ($assets->count() > 0) {
                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]));
-                \Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold));
+                Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $threshold));
            }

            // Expiring licenses
            $licenses = License::getExpiringLicenses($threshold);
            if ($licenses->count() > 0) {
                $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $threshold]));
-                \Notification::send($recipients, new ExpiringLicenseNotification($licenses, $threshold));
+                Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $threshold));
            }
        } else {
            if ($settings->alert_email == '') {
@@ -122,6 +122,27 @@ class Handler extends ExceptionHandler
        }


+        // This is traaaaash but it handles models that are not found while using route model binding :(
+        // The only alternative is to set that at *each* route, which is crazypants
+        if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+            $model_name = last(explode('\\', $e->getModel()));
+            $route = str_plural(strtolower(last(explode('\\', $e->getModel())))).'.index';
+
+            // Sigh.
+            if ($route == 'assets.index') {
+                $route = 'hardware.index';
+            } elseif ($route == 'reporttemplates.index') {
+                $route = 'reports/custom';
+            } elseif ($route == 'assetmodels.index') {
+                $route = 'models.index';
+            } elseif ($route == 'predefinedkits.index') {
+                $route = 'kits.index';
+            }
+
+            return redirect()
+                ->route($route)
+                ->withError(trans('general.generic_model_not_found', ['model' => $model_name]));
+        }


        if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
@@ -1520,11 +1520,11 @@ class Helper
        if ($redirect_option == 'target') {
            switch ($checkout_to_type) {
                case 'user':
-                    return route('users.show', ['user' => $request->assigned_user]);
+                    return route('users.show', $request->assigned_user);
                case 'location':
-                    return route('locations.show', ['location' => $request->assigned_location]);
+                    return route('locations.show', $request->assigned_location);
                case 'asset':
-                    return route('hardware.show', ['hardware' => $request->assigned_asset]);
+                    return route('hardware.show', $request->assigned_asset);
            }
        }
        return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
@@ -59,6 +59,8 @@ class IconHelper
                return 'fas fa-cog';
            case 'angle-left':
                return 'fas fa-angle-left';
+            case 'angle-right':
+                return 'fas fa-angle-right';
            case 'warning':
                return 'fas fa-exclamation-triangle';
            case 'kits':
@@ -184,7 +186,11 @@ class IconHelper
                return 'fa-regular fa-id-card';
            case 'department' :
                return 'fa-solid fa-building-user';
-
+            case 'home' :
+                return 'fa-solid fa-house';
+            case 'note':
+            case 'notes':
+                return 'fas fa-sticky-note';
        }
    }
 }
@@ -31,7 +31,7 @@ class AccessoriesController extends Controller
    public function index() : View
    {
        $this->authorize('index', Accessory::class);
-        return view('accessories/index');
+        return view('accessories.index');
    }

    /**
@@ -95,16 +95,10 @@ class AccessoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $accessoryId
     */
-    public function edit($accessoryId = null) : View | RedirectResponse
+    public function edit(Accessory $accessory) : View | RedirectResponse
    {
-
-        if ($item = Accessory::find($accessoryId)) {
-            $this->authorize($item);
-            return view('accessories/edit', compact('item'))->with('category_type', 'accessory');
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-
+        $this->authorize('update', Accessory::class);
+        return view('accessories.edit')->with('item', $accessory)->with('category_type', 'accessory');
    }

    /**
@@ -114,19 +108,12 @@ class AccessoriesController extends Controller
     * @param int $accessoryId
     * @since [v6.0]
     */
-    public function getClone($accessoryId = null) : View | RedirectResponse
+    public function getClone(Accessory $accessory) : View | RedirectResponse
    {

        $this->authorize('create', Accessory::class);

-        // Check if the asset exists
-        if (is_null($accessory_to_clone = Accessory::find($accessoryId))) {
-            // Redirect to the asset management page
-            return redirect()->route('accessories.index')
-                ->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryId]));
-        }
-
-        $accessory = clone $accessory_to_clone;
+        $accessory = clone $accessory;
        $accessory->id = null;
        $accessory->location_id = null;

@@ -142,9 +129,9 @@ class AccessoriesController extends Controller
     * @param ImageUploadRequest $request
     * @param  int $accessoryId
     */
-    public function update(ImageUploadRequest $request, $accessoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Accessory $accessory) : RedirectResponse
    {
-        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryId)) {
+        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id)) {

            $this->authorize($accessory);

@@ -231,14 +218,10 @@ class AccessoriesController extends Controller
     * @see AccessoriesController::getDataView() method that generates the JSON response
     * @since [v1.0]
     */
-    public function show($accessoryID = null) : View | RedirectResponse
+    public function show(Accessory $accessory) : View | RedirectResponse
    {
-        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryID);
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id);
        $this->authorize('view', $accessory);
-        if (isset($accessory->id)) {
-            return view('accessories/view', compact('accessory'));
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryID]));
+        return view('accessories.view', compact('accessory'));
    }
 }
@@ -51,15 +51,15 @@ class AccessoriesFilesController extends Controller
                }


-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));

            }

-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
        }
        // Prepare the error message
-        return redirect()->route('accessories.index')
-            ->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
    }

    /**
@@ -72,30 +72,27 @@ class AccessoriesFilesController extends Controller
     */
    public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
    {
-        $accessory = Accessory::find($accessoryId);
-
-        // the asset is valid
-        if (isset($accessory->id)) {
+        if ($accessory = Accessory::find($accessoryId)) {
            $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);

-            // Remove the file if one exists
-            if (Storage::exists('accessories/'.$log->filename)) {
-                try {
-                    Storage::delete('accessories/'.$log->filename);
-                } catch (\Exception $e) {
-                    Log::debug($e);
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
                }
+
            }
-
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
        }

-        // Redirect to the licence management page
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
    }

    /**
@@ -125,10 +122,11 @@ class AccessoriesFilesController extends Controller
                }
            }

-            return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.log_record_not_found'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));

        }

-        return redirect()->route('accessories.index')->with('error', trans('general.file_not_found'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
    }
 }
@@ -75,20 +75,23 @@ class AccessoryCheckoutController extends Controller
        $accessory->checkout_qty = $request->input('checkout_qty', 1);
        
        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
-            AccessoryCheckout::create([
+
+            $accessory_checkout = new AccessoryCheckout([
                'accessory_id' => $accessory->id,
                'created_at' => Carbon::now(),
-                'created_by' => auth()->id(),
                'assigned_to' => $target->id,
                'assigned_type' => $target::class,
                'note' => $request->input('note'),
            ]);
+
+            $accessory_checkout->created_by = auth()->id();
+            $accessory_checkout->save();
        }
+
        event(new CheckoutableCheckedOut($accessory,  $target, auth()->user(), $request->input('note')));

-        // Set this as user since we only allow checkout to user for this item type
        $request->request->add(['checkout_to_type' => request('checkout_to_type')]);
-        $request->request->add(['assigned_user' => $target->id]);
+        $request->request->add(['assigned_to' => $target->id]);

        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

@@ -40,10 +40,13 @@ class ActionlogController extends Controller
    public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
    {
        $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
+
+        if (config('filesystems.default') == 's3_private') {
+            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
+        }

        if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
-            return response()->download($file);
+            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
        }

        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
@@ -13,6 +13,7 @@ use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Accessory;
 use App\Models\Company;
 use App\Models\User;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
@@ -184,39 +185,33 @@ class AccessoriesController extends Controller


    /**
-     * Display the specified resource.
+     * Get the list of checkouts for a specific accessory
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return  | array
     */
-    public function checkedout($id, Request $request)
+    public function checkedout(Request $request, $id)
    {
        $this->authorize('view', Accessory::class);

        $accessory = Accessory::with('lastCheckout')->findOrFail($id);
-
        $offset = request('offset', 0);
        $limit = request('limit', 50);

-        $accessory_checkouts = $accessory->checkouts;
-        $total = $accessory_checkouts->count();
-
-        if ($total < $offset) {
-            $offset = 0;
-        }
-
-        $accessory_checkouts = $accessory->checkouts()->skip($offset)->take($limit)->get();
+        // Total count of all checkouts for this asset
+        $accessory_checkouts = $accessory->checkouts();

+        // Check for search text in the request
        if ($request->filled('search')) {
-            
-            $accessory_checkouts = $accessory->checkouts()->TextSearch($request->input('search'))
-                                         ->get();
-            $total = $accessory_checkouts->count();
+            $accessory_checkouts = $accessory_checkouts->TextSearch($request->input('search'));
        }

-        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $accessory_checkouts, $total);
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+
+        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_checkouts, $total);
    }


@@ -227,7 +222,7 @@ class AccessoriesController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest $request
     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
     */
    public function update(ImageUploadRequest $request, $id)
    {
@@ -249,7 +244,7 @@ class AccessoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
     */
    public function destroy($id)
    {
@@ -284,14 +279,17 @@ class AccessoriesController extends Controller
        $accessory->checkout_qty = $request->input('checkout_qty', 1);

        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
-            AccessoryCheckout::create([
+
+            $accessory_checkout = new AccessoryCheckout([
                'accessory_id' => $accessory->id,
                'created_at' => Carbon::now(),
-                'created_by' => auth()->id(),
                'assigned_to' => $target->id,
                'assigned_type' => $target::class,
                'note' => $request->input('note'),
            ]);
+
+            $accessory_checkout->created_by = auth()->id();
+            $accessory_checkout->save();
        }

        // Set this value to be able to pass the qty through to the event
@@ -122,7 +122,7 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v1.8]
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request) : JsonResponse | array
    {
        $this->authorize('update', Asset::class);
        // create a new model instance
@@ -149,7 +149,7 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v4.0]
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id) : JsonResponse | array
    {
        $this->authorize('update', Asset::class);

@@ -186,7 +186,7 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v4.0]
     */
-    public function destroy($assetMaintenanceId) : JsonResponse
+    public function destroy($assetMaintenanceId) : JsonResponse | array
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
@@ -208,7 +208,7 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v4.0]
     */
-    public function show($assetMaintenanceId) : JsonResponse
+    public function show($assetMaintenanceId) : JsonResponse | array
    {
        $this->authorize('view', Asset::class);
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
@@ -9,6 +9,7 @@ use App\Http\Controllers\Controller;
 use App\Models\AssetModel;
 use App\Models\Actionlog;
 use App\Http\Requests\UploadFileRequest;
+use App\Http\Transformers\AssetModelsTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -68,37 +69,15 @@ class AssetModelFilesController extends Controller
    /**
     * List the files for an asset.
     *
-     * @param  int $assetModelId
+     * @param  int $assetmodel
     * @since [v7.0.12]
     * @author [r-xyz]
     */
-    public function list($assetModelId = null) : JsonResponse
+    public function list($assetmodel_id) : JsonResponse | array
    {
-        // Start by checking if the asset being acted upon exists
-        if (! $assetModel = AssetModel::find($assetModelId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
-        }
-        
-        // the asset is valid
-        if (isset($assetModel->id)) {
-            $this->authorize('view', $assetModel);
-
-            // Check that there are some uploads on this asset that can be listed
-            if ($assetModel->uploads->count() > 0) {
-                $files = array();
-                foreach ($assetModel->uploads as $upload) {
-                    array_push($files, $upload);
-                }
-                // Give the list of files back to the user
-                return response()->json(Helper::formatStandardApiResponse('success', $files, trans('admin/models/message.upload.success')));
-            }
-
-            // There are no files.
-            return response()->json(Helper::formatStandardApiResponse('success', array(), trans('admin/models/message.upload.success')));
-        }
-
-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error')), 500);
+            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
+            $this->authorize('view', $assetmodel);
+            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
    }

    /**
@@ -6,6 +6,7 @@ use App\Events\CheckoutableCheckedIn;
 use App\Http\Requests\StoreAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
+use App\Models\AccessoryCheckout;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
 use Illuminate\Database\Eloquent\Builder;
@@ -26,11 +27,9 @@ use App\Models\License;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use App\View\Label;
@@ -129,6 +128,7 @@ class AssetsController extends Controller

        $assets = Asset::select('assets.*')
            ->with(
+                'model',
                'location',
                'assetstatus',
                'company',
@@ -140,7 +140,7 @@ class AssetsController extends Controller
                'model.manufacturer',
                'model.fieldset',
                'supplier'
-            ); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
+            ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.


        if ($filter_non_deprecable_assets) {
@@ -765,9 +765,13 @@ class AssetsController extends Controller
            }

            if ($problems_updating_encrypted_custom_fields) {
-                return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.encrypted_warning')));
+                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
+                // Below is the *correct* return since it uses the transformer, but we have to use the old, flat return for now until we can update Jamf2Snipe and Kanji2Snipe
+                // return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.encrypted_warning')));
            } else {
-                return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));
+                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+                // Below is the *correct* return since it uses the transformer, but we have to use the old, flat return for now until we can update Jamf2Snipe and Kanji2Snipe
+                /// return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));
            }
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -1214,6 +1218,32 @@ class AssetsController extends Controller
        return (new AssetsTransformer)->transformRequestedAssets($assets, $total);
    }

+
+    public function assignedAssets(Request $request, Asset $asset) : JsonResponse | array
+    {
+
+        return [];
+        // to do
+    }
+
+    public function assignedAccessories(Request $request, Asset $asset) : JsonResponse | array
+    {
+        $this->authorize('view', Asset::class);
+        $this->authorize('view', $asset);
+        $accessory_checkouts = AccessoryCheckout::AssetsAssigned()
+            ->where('assigned_to', $asset->id)
+            ->with('adminuser')
+            ->with('accessories');
+
+        $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
+        $limit = app('api_limit_value');
+
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+        return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
+    }
+
+
    /**
     * Generate asset labels by tag
     * 
@@ -39,6 +39,7 @@ class CategoriesController extends Controller
            'components_count',
            'licenses_count',
            'image',
+            'notes',
        ];

        $categories = Category::select([
@@ -52,6 +53,7 @@ class CategoriesController extends Controller
            'require_acceptance',
            'checkin_email',
            'image',
+            'notes',
            ])
            ->with('adminuser')
            ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
@@ -38,11 +38,12 @@ class CompaniesController extends Controller
            'accessories_count',
            'consumables_count',
            'components_count',
+            'notes',
        ];

        $companies = Company::withCount(['assets as assets_count'  => function ($query) {
            $query->AssetsForShow();
-        }])->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
+        }])->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');

        if ($request->filled('search')) {
            $companies->TextSearch($request->input('search'));
@@ -48,7 +48,8 @@ class ComponentsController extends Controller
            ];

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

        if ($request->filled('search')) {
            $components = $components->TextSearch($request->input('search'));
@@ -197,6 +198,11 @@ class ComponentsController extends Controller
        $this->authorize('delete', Component::class);
        $component = Component::findOrFail($id);
        $this->authorize('delete', $component);
+
+        if ($component->numCheckedOut() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/components/message.delete.error_qty')));
+        }
+
        $component->delete();

        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.delete.success')));
@@ -23,7 +23,7 @@ class DepartmentsController extends Controller
    public function index(Request $request) : JsonResponse | array
    {
        $this->authorize('view', Department::class);
-        $allowed_columns = ['id', 'name', 'image', 'users_count'];
+        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];

        $departments = Department::select(
            'departments.id',
@@ -35,7 +35,8 @@ class DepartmentsController extends Controller
            'departments.manager_id',
            'departments.created_at',
            'departments.updated_at',
-            'departments.image'
+            'departments.image',
+            'departments.notes',
        )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');

        if ($request->filled('search')) {
@@ -72,6 +73,9 @@ class DepartmentsController extends Controller
            case 'manager':
                $departments->OrderManager($order);
                break;
+            case 'company':
+                $departments->OrderCompany($order);
+                break;
            default:
                $departments->orderBy($sort, $order);
                break;
@@ -24,7 +24,7 @@ class GroupsController extends Controller

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

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

        if ($request->filled('search')) {
            $groups = $groups->TextSearch($request->input('search'));
@@ -81,6 +81,7 @@ class GroupsController extends Controller

        $group->name = $request->input('name');
        $group->created_by = auth()->id();
+        $group->notes = $request->input('notes');
        $group->permissions = json_encode($request->input('permissions', $groupPermissions));

        if ($group->save()) {
@@ -118,6 +119,7 @@ class GroupsController extends Controller
        $group = Group::findOrFail($id);

        $group->name = $request->input('name');
+        $group->notes = $request->input('notes');
        $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here

        if ($group->save()) {
@@ -9,12 +9,14 @@ use App\Http\Transformers\ImportsTransformer;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
+use Onnov\DetectEncoding\EncodingDetector;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\JsonResponse;
@@ -45,6 +47,8 @@ class ImportController extends Controller
            $path = config('app.private_uploads').'/imports';
            $results = [];
            $import = new Import;
+            $detector = new EncodingDetector();
+
            foreach ($files as $file) {
                if (! in_array($file->getMimeType(), [
                    'application/vnd.ms-excel',
@@ -55,7 +59,6 @@ class ImportController extends Controller
                    'text/comma-separated-values',
                    'text/tsv', ])) {
                    $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();
-
                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
                }

@@ -63,7 +66,25 @@ class ImportController extends Controller
                if (! ini_get('auto_detect_line_endings')) {
                    ini_set('auto_detect_line_endings', '1');
                }
+                $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?
+                $encoding = $detector->getEncoding($file_contents);
+                $reader = null;
+                if (strcasecmp($encoding, 'UTF-8') != 0) {
+                    $transliterated = iconv($encoding, 'UTF-8', $file_contents);
+                    if ($transliterated !== false) {
+                        $tmpname = tempnam(sys_get_temp_dir(), '');
+                        $tmpresults = file_put_contents($tmpname, $transliterated);
+                        if ($tmpresults !== false) {
+                            $transliterated = null; //save on memory?
+                            $newfile = new UploadedFile($tmpname, $file->getClientOriginalName(), null, null, true); //WARNING: this is enabling 'test mode' - which is gross, but otherwise the file won't be treated as 'uploaded'
+                            if ($newfile->isValid()) {
+                                $file = $newfile;
+                            }
+                        }
+                    }
+                }
                $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
+                $file_contents = null; //try to save on memory, I guess?

                try {
                    $import->header_row = $reader->fetchOne(0);
@@ -3,17 +3,20 @@
 namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
-use App\Http\Requests\ImageUploadRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\AccessoriesTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Asset;
 use App\Models\Location;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use Illuminate\Http\JsonResponse;

 class LocationsController extends Controller
 {
@@ -28,26 +31,29 @@ class LocationsController extends Controller
    {
        $this->authorize('view', Location::class);
        $allowed_columns = [
-            'id',
-            'name',
+            'accessories_count',
            'address',
            'address2',
+            'assets_count',
+            'assets_count',
+            'assigned_accessories_count',
+            'assigned_assets_count',
+            'assigned_assets_count',
            'city',
-            'state',
            'country',
-            'zip',
            'created_at',
-            'updated_at',
-            'manager_id',
-            'image',
-            'assigned_assets_count',
-            'users_count',
-            'assets_count',
-            'assigned_assets_count',
-            'assets_count',
-            'rtd_assets_count',
            'currency',
+            'id',
+            'image',
            'ldap_ou',
+            'manager_id',
+            'name',
+            'rtd_assets_count',
+            'state',
+            'updated_at',
+            'users_count',
+            'zip',
+            'notes',
            ];

        $locations = Location::with('parent', 'manager', 'children')->select([
@@ -68,8 +74,12 @@ class LocationsController extends Controller
            'locations.image',
            'locations.ldap_ou',
            'locations.currency',
-        ])->withCount('assignedAssets as assigned_assets_count')
+            'locations.notes',
+        ])
+            ->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
+            ->withCount('assignedAccessories as assigned_accessories_count')
+            ->withCount('accessories as accessories_count')
            ->withCount('rtd_assets as rtd_assets_count')
            ->withCount('children as children_count')
            ->withCount('users as users_count');
@@ -182,6 +192,7 @@ class LocationsController extends Controller
                'locations.updated_at',
                'locations.image',
                'locations.currency',
+                'locations.notes',
            ])
            ->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
@@ -224,7 +235,17 @@ class LocationsController extends Controller
        return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
    }

+
    public function assets(Request $request, Location $location) : JsonResponse | array
+    {
+        $this->authorize('view', Asset::class);
+        $this->authorize('view', $location);
+        $assets = Asset::where('location_id', '=', $location->id)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');
+        $assets = $assets->get();
+        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
+    }
+
+    public function assignedAssets(Request $request, Location $location) : JsonResponse | array
    {
        $this->authorize('view', Asset::class);
        $this->authorize('view', $location);
@@ -233,6 +254,20 @@ class LocationsController extends Controller
        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
    }

+    public function assignedAccessories(Request $request, Location $location) : JsonResponse | array
+    {
+        $this->authorize('view', Accessory::class);
+        $this->authorize('view', $location);
+        $accessory_checkouts = AccessoryCheckout::LocationAssigned()->where('assigned_to', $location->id)->with('adminuser')->with('accessories');
+
+        $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
+        $limit = app('api_limit_value');
+
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+        return (new LocationsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
+    }
+
    /**
     * Remove the specified resource from storage.
     *
@@ -39,7 +39,8 @@ class ManufacturersController extends Controller
            'assets_count',
            'consumables_count',
            'components_count',
-            'licenses_count'
+            'licenses_count',
+            'notes',
        ];

        $manufacturers = Manufacturer::select([
@@ -55,6 +56,7 @@ class ManufacturersController extends Controller
                'updated_at',
                'image',
                'deleted_at',
+                'notes',
            ])
            ->with('adminuser')
            ->withCount('assets as assets_count')
@@ -20,6 +20,7 @@ use App\Models\License;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
@@ -80,7 +81,16 @@ class UsersController extends Controller
            'users.website',

        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
-            ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count');
+            ->withCount([
+                'assets as assets_count' => function(Builder $query) {
+                    $query->withoutTrashed();
+                },
+                'licenses as licenses_count',
+                'accessories as accessories_count',
+                'consumables as consumables_count',
+                'managesUsers as manages_users_count',
+                'managedLocations as manages_locations_count'
+            ]);


        if ($request->filled('search') != '') {
@@ -139,19 +139,12 @@ class AssetMaintenancesController extends Controller
    * @version v1.0
    * @since [v1.8]
    */
-    public function edit($assetMaintenanceId = null) : View | RedirectResponse
+    public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
    {
        $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-            // Redirect to the asset maintenance management page
+        if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
            return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

@@ -161,7 +154,7 @@ class AssetMaintenancesController extends Controller
        return view('asset_maintenances/edit')
                   ->with('selectedAsset', null)
                   ->with('assetMaintenanceType', $assetMaintenanceType)
-                   ->with('item', $assetMaintenance);
+                   ->with('item', $maintenance);
    }

    /**
@@ -174,24 +167,20 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v1.8]
     */
-    public function update(Request $request, $assetMaintenanceId = null) : View | RedirectResponse
+    public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
    {
        $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-                // Redirect to the asset maintenance management page
+
+       if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
                return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

-        $assetMaintenance->supplier_id = $request->input('supplier_id');
-        $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  $request->input('cost');
-        $assetMaintenance->notes = $request->input('notes');
+        $maintenance->supplier_id = $request->input('supplier_id');
+        $maintenance->is_warranty = $request->input('is_warranty');
+        $maintenance->cost =  $request->input('cost');
+        $maintenance->notes = $request->input('notes');

        $asset = Asset::find(request('asset_id'));

@@ -200,39 +189,39 @@ class AssetMaintenancesController extends Controller
        }

        // Save the asset maintenance data
-        $assetMaintenance->asset_id = $request->input('asset_id');
-        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $assetMaintenance->title = $request->input('title');
-        $assetMaintenance->start_date = $request->input('start_date');
-        $assetMaintenance->completion_date = $request->input('completion_date');
+        $maintenance->asset_id = $request->input('asset_id');
+        $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $maintenance->title = $request->input('title');
+        $maintenance->start_date = $request->input('start_date');
+        $maintenance->completion_date = $request->input('completion_date');

-        if (($assetMaintenance->completion_date == null)
+        if (($maintenance->completion_date == null)
        ) {
-            if (($assetMaintenance->asset_maintenance_time !== 0)
-              || (! is_null($assetMaintenance->asset_maintenance_time))
+            if (($maintenance->asset_maintenance_time !== 0)
+              || (! is_null($maintenance->asset_maintenance_time))
            ) {
-                $assetMaintenance->asset_maintenance_time = null;
+                $maintenance->asset_maintenance_time = null;
            }
        }

-        if (($assetMaintenance->completion_date !== null)
-          && ($assetMaintenance->start_date !== '')
-          && ($assetMaintenance->start_date !== '0000-00-00')
+        if (($maintenance->completion_date !== null)
+          && ($maintenance->start_date !== '')
+          && ($maintenance->start_date !== '0000-00-00')
        ) {
-            $startDate = Carbon::parse($assetMaintenance->start_date);
-            $completionDate = Carbon::parse($assetMaintenance->completion_date);
-            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+            $startDate = Carbon::parse($maintenance->start_date);
+            $completionDate = Carbon::parse($maintenance->completion_date);
+            $maintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
        }

      // Was the asset maintenance created?
-        if ($assetMaintenance->save()) {
+        if ($maintenance->save()) {

            // Redirect to the new asset maintenance page
            return redirect()->route('maintenances.index')
-                         ->with('success', trans('admin/asset_maintenances/message.edit.success'));
+                            ->with('success', trans('admin/asset_maintenances/message.edit.success'));
        }

-        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+        return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
    }

    /**
@@ -271,19 +260,13 @@ class AssetMaintenancesController extends Controller
    * @version v1.0
    * @since [v1.8]
    */
-    public function show($assetMaintenanceId) : View | RedirectResponse
+    public function show(AssetMaintenance $maintenance) : View | RedirectResponse
    {
        $this->authorize('view', Asset::class);
-
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')
-                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }

-        return view('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+        return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
    }
 }
@@ -109,16 +109,11 @@ class AssetModelsController extends Controller
     * @since [v1.0]
     * @param int $modelId
     */
-    public function edit($modelId = null) : View | RedirectResponse
+    public function edit(AssetModel $model) : View | RedirectResponse
    {
        $this->authorize('update', AssetModel::class);
-        if ($item = AssetModel::find($modelId)) {
-            $category_type = 'asset';
-            return view('models/edit', compact('item', 'category_type'))->with('depreciation_list', Helper::depreciationList());
-
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        $category_type = 'asset';
+        return view('models/edit', compact('category_type'))->with('item', $model)->with('depreciation_list', Helper::depreciationList());
    }


@@ -133,16 +128,11 @@ class AssetModelsController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(StoreAssetModelRequest $request, $modelId) : RedirectResponse
+    public function update(StoreAssetModelRequest $request, AssetModel $model) : RedirectResponse
    {
        $this->authorize('update', AssetModel::class);

-        if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
-
        $model = $request->handleImages($model);
-
        $model->depreciation_id = $request->input('depreciation_id');
        $model->eol = $request->input('eol');
        $model->name = $request->input('name');
@@ -188,28 +178,16 @@ class AssetModelsController extends Controller
     * @since [v1.0]
     * @param int $modelId
     */
-    public function destroy($modelId) : RedirectResponse
+    public function destroy(AssetModel $model) : RedirectResponse
    {
        $this->authorize('delete', AssetModel::class);
-        // Check if the model exists
-        if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
+

        if ($model->assets()->count() > 0) {
            // Throw an error that this model is associated with assets
            return redirect()->route('models.index')->with('error', trans('admin/models/message.assoc_users'));
        }

-        if ($model->image) {
-            try {
-                Storage::disk('public')->delete('models/'.$model->image);
-                $model->update(['image' => null]);
-            } catch (\Exception $e) {
-                Log::info($e);
-            }
-        }
-
        // Delete the model
        $model->delete();

@@ -267,16 +245,10 @@ class AssetModelsController extends Controller
     * @since [v1.0]
     * @param int $modelId
     */
-    public function show($modelId = null) : View | RedirectResponse
+    public function show(AssetModel $model) : View | RedirectResponse
    {
        $this->authorize('view', AssetModel::class);
-        $model = AssetModel::withTrashed()->find($modelId);
-
-        if (isset($model->id)) {
-            return view('models/view', compact('model'));
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        return view('models/view', compact('model'));
    }

    /**
@@ -286,23 +258,20 @@ class AssetModelsController extends Controller
     * @since [v1.0]
     * @param int $modelId
     */
-    public function getClone($modelId = null) : View | RedirectResponse
+    public function getClone(AssetModel $model) : View | RedirectResponse
    {
        $this->authorize('create', AssetModel::class);
-        // Check if the model exists
-        if (is_null($model_to_clone = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }

-        $model = clone $model_to_clone;
+        $cloned_model = clone $model;
        $model->id = null;
+        $model->deleted_at = null;

        // Show the page
        return view('models/edit')
            ->with('depreciation_list', Helper::depreciationList())
            ->with('item', $model)
-            ->with('model_id', $model_to_clone->id)
-            ->with('clone_model', $model_to_clone);
+            ->with('model_id', $model->id)
+            ->with('clone_model', $cloned_model);
    }


@@ -321,7 +290,7 @@ class AssetModelsController extends Controller


    /**
-     * Returns a view that allows the user to bulk edit model attrbutes
+     * Returns a view that allows the user to bulk edit model attributes
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.7]
@@ -44,10 +44,10 @@ class AssetModelsFilesController extends Controller
                $model->logUpload($file_name, $request->get('notes'));
            }

-            return redirect()->back()->with('success', trans('general.file_upload_success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
        }

-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
    }

    /**
@@ -58,11 +58,9 @@ class AssetModelsFilesController extends Controller
     * @param  int $fileId
     * @since [v1.0]
     */
-    public function show($modelId = null, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    public function show(AssetModel $model, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
    {
-        $model = AssetModel::find($modelId);
-        // the asset is valid
-        if (isset($model->id)) {
+
            $this->authorize('view', $model);

            if (! $log = Actionlog::find($fileId)) {
@@ -87,12 +85,6 @@ class AssetModelsFilesController extends Controller
            }

            return StorageHelper::downloader($file);
-        }
-        // Prepare the error message
-        $error = trans('admin/hardware/message.does_not_exist', ['id' => $fileId]);
-
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', $error);
    }

    /**
@@ -103,30 +95,21 @@ class AssetModelsFilesController extends Controller
     * @param  int $fileId
     * @since [v1.0]
     */
-    public function destroy($modelId = null, $fileId = null) : RedirectResponse
+    public function destroy(AssetModel $model, $fileId = null) : RedirectResponse
    {
-        $model = AssetModel::find($modelId);
-        $this->authorize('update', $model);
        $rel_path = 'private_uploads/assetmodels';
-
-        // the asset is valid
-        if (isset($model->id)) {
-            $this->authorize('update', $model);
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+        $this->authorize('update', $model);
+        $log = Actionlog::find($fileId);
+        if ($log) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
            }
+            $log->delete();

-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
        }

-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+
    }
 }
@@ -27,18 +27,12 @@ class AssetCheckinController extends Controller
     * @param string $backto
     * @since [v1.0]
     */
-    public function create($assetId, $backto = null) : View | RedirectResponse
+    public function create(Asset $asset, $backto = null) : View | RedirectResponse
    {
-        // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }

        $this->authorize('checkin', $asset);

        // This asset is already checked in, redirect
-        
        if (is_null($asset->assignedTo)) {
            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.already_checked_in'));
        }
@@ -47,7 +41,11 @@ class AssetCheckinController extends Controller
            return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
        }

-        return view('hardware/checkin', compact('asset'))->with('statusLabel_list', Helper::statusLabelList())->with('backto', $backto)->with('table_name', 'Assets');
+        return view('hardware/checkin', compact('asset'))
+            ->with('item', $asset)
+            ->with('statusLabel_list', Helper::statusLabelList())
+            ->with('backto', $backto)
+            ->with('table_name', 'Assets');
    }

    /**
@@ -91,6 +89,9 @@ class AssetCheckinController extends Controller
            $asset->status_id = e($request->get('status_id'));
        }

+        // Add any custom fields that should be included in the checkout
+        $asset->customFieldsForCheckinCheckout('display_checkin');
+
        $this->migrateLegacyLocations($asset);

        $asset->location_id = $asset->rtd_location_id;
@@ -128,6 +129,9 @@ class AssetCheckinController extends Controller

        session()->put('redirect_option', $request->get('redirect_option'));

+        // Add any custom fields that should be included in the checkout
+        $asset->customFieldsForCheckinCheckout('display_checkin');
+
        if ($asset->save()) {

            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
@@ -26,27 +26,25 @@ class AssetCheckoutController extends Controller
     * @since [v1.0]
     * @return \Illuminate\Contracts\View\View
     */
-    public function create($assetId) : View | RedirectResponse
+    public function create(Asset $asset) : View | RedirectResponse
    {
-        // Check if the asset exists
-        if (is_null($asset = Asset::with('company')->find(e($assetId)))) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }

        $this->authorize('checkout', $asset);

        if (!$asset->model) {
-            return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+            return redirect()->route('hardware.show', $asset)
+                ->with('error', trans('admin/hardware/general.model_invalid_fix'));
        }

        if ($asset->availableForCheckout()) {
            return view('hardware/checkout', compact('asset'))
                ->with('statusLabel_list', Helper::deployableStatusLabelList())
-                ->with('table_name', 'Assets');
+                ->with('table_name', 'Assets')
+                ->with('item', $asset);
        }

-
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available'));
+        return redirect()->route('hardware.index')
+            ->with('error', trans('admin/hardware/message.checkout.not_available'));
    }

    /**
@@ -68,7 +66,7 @@ class AssetCheckoutController extends Controller
            $this->authorize('checkout', $asset);

            if (!$asset->model) {
-                return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+                return redirect()->route('hardware.show', $asset)->with('error', trans('admin/hardware/general.model_invalid_fix'));
            }

            $admin = auth()->user();
@@ -91,6 +89,7 @@ class AssetCheckoutController extends Controller
                $asset->status_id = $request->get('status_id');
            }

+
            if(!empty($asset->licenseseats->all())){
                if(request('checkout_to_type') == 'user') {
                    foreach ($asset->licenseseats as $seat){
@@ -100,23 +99,26 @@ class AssetCheckoutController extends Controller
                }
            }

+            // Add any custom fields that should be included in the checkout
+            $asset->customFieldsForCheckinCheckout('display_checkout');
+
            $settings = \App\Models\Setting::getSettings();

            // We have to check whether $target->company_id is null here since locations don't have a company yet
            if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
                if ($target->company_id != $asset->company_id){
-                    return redirect()->to("hardware/$assetId/checkout")->with('error', trans('general.error_user_company'));
+                    return redirect()->route('hardware.checkout.create', $asset)->with('error', trans('general.error_user_company'));
                }
            }

-                session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->get('note'), $request->get('name'))) {
                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                    ->with('success', trans('admin/hardware/message.checkout.success'));
            }
            // Redirect to the asset management page with error
-            return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
+            return redirect()->route("hardware.checkout.create", $asset)->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
        } catch (ModelNotFoundException $e) {
            return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
        } catch (CheckoutNotAllowed $e) {
@@ -26,11 +26,8 @@ class AssetFilesController extends Controller
     *@since [v1.0]
     * @author [A. Gianotto] [<snipe@snipe.net>]
     */
-    public function store(UploadFileRequest $request, $assetId = null) : RedirectResponse
+    public function store(UploadFileRequest $request, Asset $asset) : RedirectResponse
    {
-        if (! $asset = Asset::find($assetId)) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }

        $this->authorize('update', $asset);

@@ -45,7 +42,7 @@ class AssetFilesController extends Controller
                $asset->logUpload($file_name, $request->get('notes'));
            }

-            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
        }

        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -59,31 +56,28 @@ class AssetFilesController extends Controller
     * @param  int $fileId
     * @since [v1.0]
     */
-    public function show($assetId = null, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
+    public function show(Asset $asset, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
    {
-        if ($asset = Asset::find($assetId)) {

-            $this->authorize('view', $asset);
+        $this->authorize('view', $asset);

-            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
-                $file = 'private_uploads/assets/'.$log->filename;
-
-                if ($log->action_type == 'audit') {
-                    $file = 'private_uploads/audits/'.$log->filename;
-                }
-
-                try {
-                     return StorageHelper::showOrDownloadFile($file, $log->filename);
-                } catch (\Exception $e) {
-                    return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.file_not_found'));
-                }
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+            $file = 'private_uploads/assets/'.$log->filename;

+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            try {
+                 return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found'));
            }

-            return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
        }

-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+

    }

@@ -95,29 +89,20 @@ class AssetFilesController extends Controller
     * @param  int $fileId
     * @since [v1.0]
     */
-    public function destroy($assetId = null, $fileId = null) : RedirectResponse
+    public function destroy(Asset $asset, $fileId = null) : RedirectResponse
    {
-        $asset = Asset::find($assetId);
        $this->authorize('update', $asset);
        $rel_path = 'private_uploads/assets';

-        // the asset is valid
-        if (isset($asset->id)) {
-            $this->authorize('update', $asset);
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+        if ($log = Actionlog::find($fileId)) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
            }
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            $log->delete();
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
        }

-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
    }
+
 }
@@ -30,6 +30,7 @@ use Illuminate\Http\Response;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use TypeError;

 /**
 * This class controls all actions related to assets for
@@ -201,7 +202,7 @@ class AssetsController extends Controller
                    $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
                }

-                $successes[] = "<a href='" . route('hardware.show', ['hardware' => $asset->id]) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
+                $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";

            } else {
                $failures[] = join(",", $asset->getErrors()->all());
@@ -222,7 +223,7 @@ class AssetsController extends Controller
                    //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed
                    //and re-translated
                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
-                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', ['hardware' => $asset->id]), 'id', 'tag' => e($asset->asset_tag)]));
+                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));
                } else {
                    //multi-success
                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
@@ -240,20 +241,14 @@ class AssetsController extends Controller
     * Returns a view that presents a form to edit an existing asset.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param int $assetId
     * @since [v1.0]
     * @return \Illuminate\Contracts\View\View
     */
-    public function edit($assetId = null) : View | RedirectResponse
+    public function edit(Asset $asset) : View | RedirectResponse
    {
-        if (! $item = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-        //Handles company checks and permissions.
-        $this->authorize($item);
-
-        return view('hardware/edit', compact('item'))
+        $this->authorize($asset);
+        return view('hardware/edit')
+            ->with('item', $asset)
            ->with('statuslabel_list', Helper::statusLabelList())
            ->with('statuslabel_types', Helper::statusTypeList());
    }
@@ -267,15 +262,14 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @return \Illuminate\Contracts\View\View
     */
-    public function show($assetId = null) : View | RedirectResponse
+    public function show(Asset $asset) : View | RedirectResponse
    {
-        $asset = Asset::withTrashed()->find($assetId);
        $this->authorize('view', $asset);
        $settings = Setting::getSettings();

        if (isset($asset)) {
            $audit_log = Actionlog::where('action_type', '=', 'audit')
-                ->where('item_id', '=', $assetId)
+                ->where('item_id', '=', $asset->id)
                ->where('item_type', '=', Asset::class)
                ->orderBy('created_at', 'DESC')->first();

@@ -291,7 +285,7 @@ class AssetsController extends Controller

            $qr_code = (object) [
                'display' => $settings->qr_code == '1',
-                'url' => route('qr_code/hardware', $asset->id),
+                'url' => route('qr_code/hardware', $asset),
            ];

            return view('hardware/view', compact('asset', 'qr_code', 'settings'))
@@ -308,14 +302,9 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @author [A. Gianotto] [<snipe@snipe.net>]
     */
-    public function update(ImageUploadRequest $request, $assetId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Asset $asset) : RedirectResponse
    {

-        // Check if the asset exists
-        if (! $asset = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
        $this->authorize($asset);

        $asset->status_id = $request->input('status_id', null);
@@ -430,7 +419,7 @@ class AssetsController extends Controller
        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

        if ($asset->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $assetId, 'Assets'))
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                ->with('success', trans('admin/hardware/message.update.success'));
        }

@@ -531,14 +520,14 @@ class AssetsController extends Controller
     * @param int $assetId
     * @since [v1.0]
     */
-    public function getQrCode($assetId = null) : Response | BinaryFileResponse | string | bool
+    public function getQrCode(Asset $asset) : Response | BinaryFileResponse | string | bool
    {
        $settings = Setting::getSettings();

-        if ($settings->qr_code == '1') {
-            $asset = Asset::withTrashed()->find($assetId);
+        if (($settings->qr_code == '1') && ($settings->label2_2d_type !== 'none')) {
+
            if ($asset) {
-                $size = Helper::barcodeDimensions($settings->barcode_type);
+                $size = Helper::barcodeDimensions($settings->label2_2d_type);
                $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';

                if (isset($asset->id, $asset->asset_tag)) {
@@ -548,7 +537,7 @@ class AssetsController extends Controller
                        return response()->file($qr_file, $header);
                    } else {
                        $barcode = new \Com\Tecnick\Barcode\Barcode();
-                        $barcode_obj = $barcode->getBarcodeObj($settings->barcode_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]);
+                        $barcode_obj = $barcode->getBarcodeObj($settings->label2_2d_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]);
                        file_put_contents($qr_file, $barcode_obj->getPngData());

                        return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
@@ -573,7 +562,7 @@ class AssetsController extends Controller
    {
        $settings = Setting::getSettings();
        if ($asset = Asset::withTrashed()->find($assetId)) {
-            $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';
+            $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->label2_1d_type).'-'.str_slug($asset->asset_tag).'.png';

            if (isset($asset->id, $asset->asset_tag)) {
                if (file_exists($barcode_file)) {
@@ -586,11 +575,11 @@ class AssetsController extends Controller

                    $barcode = new \Com\Tecnick\Barcode\Barcode();
                    try {
-                        $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, ($barcode_width < 300 ? $barcode_width : 300), 50);
+                        $barcode_obj = $barcode->getBarcodeObj($settings->label2_1d_type, $asset->asset_tag, ($barcode_width < 300 ? $barcode_width : 300), 50);
                        file_put_contents($barcode_file, $barcode_obj->getPngData());

                        return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
-                    } catch (\Exception $e) {
+                    } catch (\Exception|TypeError $e) {
                        Log::debug('The barcode format is invalid.');

                        return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
@@ -865,8 +854,8 @@ class AssetsController extends Controller
    public function quickScan()
    {
        $this->authorize('audit', Asset::class);
-        $dt = Carbon::now()->addMonths(12)->toDateString();
-
+        $settings = Setting::getSettings();
+        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
        return view('hardware/quickscan')->with('next_audit_date', $dt);
    }

@@ -877,13 +866,11 @@ class AssetsController extends Controller
        return view('hardware/quickscan-checkin')->with('statusLabel_list', Helper::statusLabelList());
    }

-    public function audit($id)
+    public function audit(Asset $asset)
    {
        $settings = Setting::getSettings();
        $this->authorize('audit', Asset::class);
        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
-        $asset = Asset::findOrFail($id);
-
        return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
    }

@@ -902,7 +889,7 @@ class AssetsController extends Controller
    }


-    public function auditStore(UploadFileRequest $request, $id)
+    public function auditStore(UploadFileRequest $request, Asset $asset)
    {
        $this->authorize('audit', Asset::class);

@@ -917,8 +904,6 @@ class AssetsController extends Controller
            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
        }

-        $asset = Asset::findOrFail($id);
-
        /**
         * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
         * which would trigger the Asset Observer and would log an asset *update* log entry (because the
@@ -525,21 +525,31 @@ class BulkAssetsController extends Controller
        $this->authorize('delete', Asset::class);

        $bulk_back_url = route('hardware.index');
+
        if ($request->session()->has('bulk_back_url')) {
            $bulk_back_url = $request->session()->pull('bulk_back_url');
        }
+        $assetIds = $request->get('ids');

-        if ($request->filled('ids')) {
-            $assets = Asset::find($request->get('ids'));
-            foreach ($assets as $asset) {
-                $asset->delete();
-            } // endforeach
-
-            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
-            // no values given, nothing to update
+        if(empty($assetIds)) {
+            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
        }

-        return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
+        $assignedAssets = Asset::whereIn('id', $assetIds)->whereNotNull('assigned_to')->get();
+        if($assignedAssets->isNotEmpty()) {
+
+            //if assets are checked out, return a list of asset tags that would need to be checked in first.
+            $assetTags = $assignedAssets->pluck('asset_tag')->implode(', ');
+            return redirect($bulk_back_url)->with('error', trans_choice('admin/hardware/message.delete.assigned_to_error', $assignedAssets->count(), ['asset_tag' => $assetTags] ));
+        }
+
+        foreach (Asset::wherein('id', $assetIds)->get() as $asset) {
+                $asset->delete();
+            }
+
+        return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
+            // no values given, nothing to update
+
    }

    /**
@@ -50,14 +50,14 @@ class ForgotPasswordController extends Controller
     */
    public function sendResetLinkEmail(Request $request)
    {
-
        /**
         * Let's set a max character count here to prevent potential
         * buffer overflow issues with attackers sending very large
-         * payloads through.
+         * payloads through. The addition of the string rule prevents attackers
+         * sending arrays through and causing 500s
         */
        $request->validate([
-            'username' => ['required', 'max:255'],
+            'username' => ['required', 'max:255', 'string'],
        ]);

        /**
@@ -103,22 +103,24 @@ class ResetPasswordController extends Controller
                    ], $messages);
            }

+            if ($user->ldap_import != '1') {

-            // set the response
-            $response = $broker->reset(
-                $this->credentials($request), function ($user, $password) {
-                $this->resetPassword($user, $password);
-            });
+                    // set the response
+                    $response = $broker->reset(
+                        $this->credentials($request), function ($user, $password) {
+                        $this->resetPassword($user, $password);
+                    });

-            // Check if the password reset above actually worked
-            if ($response == \Password::PASSWORD_RESET) {
-                Log::debug('Password reset for '.$user->username.' worked');
-                return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                    // Check if the password reset above actually worked
+                    if ($response == \Password::PASSWORD_RESET) {
+                        Log::debug('Password reset for ' . $user->username . ' worked');
+                        return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                    }
+
+                    Log::debug('Password reset for ' . $user->username . ' FAILED - this user exists but the token is not valid');
+                    return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
            }

-            Log::debug('Password reset for '.$user->username.' FAILED - this user exists but the token is not valid');
-            return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
-
        }


@@ -69,6 +69,7 @@ class CategoriesController extends Controller
        $category->use_default_eula = $request->input('use_default_eula', '0');
        $category->require_acceptance = $request->input('require_acceptance', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
+        $category->notes = $request->input('notes');
        $category->created_by = auth()->id();

        $category = $request->handleImages($category);
@@ -87,14 +88,10 @@ class CategoriesController extends Controller
     * @param int $categoryId
     * @since [v1.0]
     */
-    public function edit($categoryId = null) : RedirectResponse | View
+    public function edit(Category $category) : RedirectResponse | View
    {
        $this->authorize('update', Category::class);
-        if (is_null($item = Category::find($categoryId))) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        return view('categories/edit', compact('item'))
+        return view('categories/edit')->with('item', $category)
        ->with('category_types', Helper::categoryTypeList());
    }

@@ -107,19 +104,10 @@ class CategoriesController extends Controller
     * @param int $categoryId
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $categoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Category $category) : RedirectResponse
    {
        $this->authorize('update', Category::class);
-        if (is_null($category = Category::find($categoryId))) {
-            // Redirect to the categories management page
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        // Update the category data
        $category->name = $request->input('name');
-        // If the item count is > 0, we disable the category type in the edit. Disabled items
-        // don't POST, so if the category_type is blank we just set it to the default.
-

        // Don't allow the user to change the category_type once it's been created
        if (($request->filled('category_type') && ($category->itemCount() > 0))) {
@@ -134,6 +122,7 @@ class CategoriesController extends Controller
        $category->use_default_eula = $request->input('use_default_eula', '0');
        $category->require_acceptance = $request->input('require_acceptance', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
+        $category->notes = $request->input('notes');

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

@@ -179,10 +168,10 @@ class CategoriesController extends Controller
     * @param $id
     * @since [v1.8]
     */
-    public function show($id) : View | RedirectResponse
+    public function show(Category $category) : View | RedirectResponse
    {
        $this->authorize('view', Category::class);
-        if ($category = Category::find($id)) {
+
            if ($category->category_type == 'asset') {
                $category_type = 'hardware';
                $category_type_route = 'assets';
@@ -197,8 +186,5 @@ class CategoriesController extends Controller
            return view('categories/view', compact('category'))
                ->with('category_type', $category_type)
                ->with('category_type_route', $category_type_route);
-        }
-
-        return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
    }
 }
@@ -60,6 +60,7 @@ final class CompaniesController extends Controller
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
+        $company->notes = $request->input('notes');
        $company->created_by = auth()->id();

        $company = $request->handleImages($company);
@@ -79,16 +80,10 @@ final class CompaniesController extends Controller
     * @since [v1.8]
     * @param int $companyId
     */
-    public function edit($companyId) : View | RedirectResponse
+    public function edit(Company $company) : View | RedirectResponse
    {
-        if (is_null($item = Company::find($companyId))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('companies/edit')->with('item', $item);
+        $this->authorize('update', $company);
+        return view('companies/edit')->with('item', $company);
    }

    /**
@@ -99,18 +94,15 @@ final class CompaniesController extends Controller
     * @param ImageUploadRequest $request
     * @param int $companyId
     */
-    public function update(ImageUploadRequest $request, $companyId) : RedirectResponse
+    public function update(ImageUploadRequest $request, Company $company) : RedirectResponse
    {
-        if (is_null($company = Company::find($companyId))) {
-            return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
-        }

        $this->authorize('update', $company);
-
        $company->name = $request->input('name');
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
+        $company->notes = $request->input('notes');

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

@@ -156,15 +148,9 @@ final class CompaniesController extends Controller
            ->with('success', trans('admin/companies/message.delete.success'));
    }

-    public function show($id) : View | RedirectResponse
+    public function show(Company $company) : View | RedirectResponse
    {
        $this->authorize('view', Company::class);
-
-        if (is_null($company = Company::find($id))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.not_found'));
-        }
-
        return view('companies/view')->with('company', $company);
    }
 }
@@ -107,15 +107,13 @@ class ComponentsController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($componentId = null)
+    public function edit(Component $component)
    {
-        if ($item = Component::find($componentId)) {
-            $this->authorize('update', $item);

-            return view('components/edit', compact('item'))->with('category_type', 'component');
-        }
-
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
+            $this->authorize('update', $component);
+            return view('components/edit')
+                ->with('item', $component)
+                ->with('category_type', 'component');
    }


@@ -130,11 +128,8 @@ class ComponentsController extends Controller
     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v3.0]
     */
-    public function update(ImageUploadRequest $request, $componentId = null)
+    public function update(ImageUploadRequest $request, Component $component)
    {
-        if (is_null($component = Component::find($componentId))) {
-            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
-        }
        $min = $component->numCheckedOut();
        $validator = Validator::make($request->all(), [
            'qty' => "required|numeric|min:$min",
@@ -201,6 +196,10 @@ class ComponentsController extends Controller
            }
        }

+        if ($component->numCheckedOut() > 0) {
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.delete.error_qty'));
+        }
+
        $component->delete();

        return redirect()->route('components.index')->with('success', trans('admin/components/message.delete.success'));
@@ -216,17 +215,9 @@ class ComponentsController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($componentId = null)
+    public function show(Component $component)
    {
-        $component = Component::find($componentId);
-
-        if (isset($component->id)) {
            $this->authorize('view', $component);
-
            return view('components/view', compact('component'));
-        }
-        // Redirect to the user management page
-        return redirect()->route('components.index')
-            ->with('error', trans('admin/components/message.does_not_exist'));
    }
 }
@@ -50,7 +50,7 @@ class ComponentsFilesController extends Controller
                }


-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));

            }

@@ -91,7 +91,7 @@ class ComponentsFilesController extends Controller

            $log->delete();

-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                ->with('success', trans('admin/hardware/message.deletefile.success'));
        }

@@ -50,7 +50,7 @@ class ConsumablesController extends Controller
    {
        $this->authorize('create', Consumable::class);

-        return view('consumables/edit')->with('category_type', 'consumable')
+        return view('consumables.edit')->with('category_type', 'consumable')
            ->with('item', new Consumable);
    }

@@ -104,15 +104,13 @@ class ConsumablesController extends Controller
     * @see ConsumablesController::postEdit() method that stores the form data.
     * @since [v1.0]
     */
-    public function edit($consumableId = null) : View | RedirectResponse
+    public function edit(Consumable $consumable) : View | RedirectResponse
    {
-        if ($item = Consumable::find($consumableId)) {
-            $this->authorize($item);
+            $this->authorize($consumable);
+            return view('consumables/edit')
+                ->with('item', $consumable)
+                ->with('category_type', 'consumable');

-            return view('consumables/edit', compact('item'))->with('category_type', 'consumable');
-        }
-
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
    }

    /**
@@ -126,11 +124,8 @@ class ConsumablesController extends Controller
     * @see ConsumablesController::getEdit() method that stores the form data.
     * @since [v1.0]
     */
-    public function update(StoreConsumableRequest $request, $consumableId = null)
+    public function update(StoreConsumableRequest $request, Consumable $consumable)
    {
-        if (is_null($consumable = Consumable::find($consumableId))) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
-        }

        $min = $consumable->numCheckedOut();
        $validator = Validator::make($request->all(), [
@@ -202,16 +197,11 @@ class ConsumablesController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($consumableId = null)
+    public function show(Consumable $consumable)
    {
-        $consumable = Consumable::withCount('users as users_consumables')->find($consumableId);
+        $consumable = Consumable::withCount('users as users_consumables')->find($consumable->id);
        $this->authorize($consumable);
-        if (isset($consumable->id)) {
-            return view('consumables/view', compact('consumable'));
-        }
-
-        return redirect()->route('consumables.index')
-            ->with('error', trans('admin/consumables/message.does_not_exist'));
+        return view('consumables/view', compact('consumable'));
    }

    public function clone(Consumable $consumable) : View
@@ -48,7 +48,7 @@ class ConsumablesFilesController extends Controller
                }


-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));

            }

@@ -89,7 +89,7 @@ class ConsumablesFilesController extends Controller

            $log->delete();

-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                ->with('success', trans('admin/hardware/message.deletefile.success'));
        }

@@ -104,7 +104,9 @@ class CustomFieldsController extends Controller
            "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0),
            "show_in_listview" => $request->get("show_in_listview", 0),
            "show_in_requestable_list" => $request->get("show_in_requestable_list", 0),
-            "user_id" => auth()->id()
+            "display_checkin" => $request->get("display_checkin", 0),
+            "display_checkout" => $request->get("display_checkout", 0),
+            "created_by" => auth()->id()
        ]);


@@ -193,10 +195,8 @@ class CustomFieldsController extends Controller
     * @param  int $id
     * @since [v4.0]
     */
-    public function edit(Request $request, $id) : View | RedirectResponse
+    public function edit(Request $request, CustomField $field) : View | RedirectResponse
    {
-        if ($field = CustomField::find($id)) {
-
        $this->authorize('update', $field);
        $fieldsets = CustomFieldset::get();
        $customFormat = '';
@@ -210,11 +210,7 @@ class CustomFieldsController extends Controller
            'fieldsets'         => $fieldsets,
            'predefinedFormats' => Helper::predefined_formats(),
        ]);
-        } 

-        return redirect()->route("fields.index")
-            ->with("error", trans('admin/custom_fields/message.field.invalid'));
-        
    }


@@ -229,13 +225,9 @@ class CustomFieldsController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(CustomFieldRequest $request, $id) : RedirectResponse
+    public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
    {
-        $field = CustomField::find($id);
-
        $this->authorize('update', $field);
-
-
        $show_in_email = $request->get("show_in_email", 0);
        $display_in_user_view = $request->get("display_in_user_view", 0);

@@ -256,6 +248,8 @@ class CustomFieldsController extends Controller
        $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
        $field->show_in_listview = $request->get("show_in_listview", 0);
        $field->show_in_requestable_list = $request->get("show_in_requestable_list", 0);
+        $field->display_checkin = $request->get("display_checkin", 0);
+        $field->display_checkout = $request->get("display_checkout", 0);

        if ($request->get('format') == 'CUSTOM REGEX') {
            $field->format = e($request->get('custom_format'));
@@ -35,10 +35,12 @@ class CustomFieldsetsController extends Controller
     * @param int $id
     * @since [v1.8]
     */
-    public function show($id) : View | RedirectResponse
+    public function show(CustomFieldset $fieldset) : View | RedirectResponse
    {
        $cfset = CustomFieldset::with('fields')
-            ->where('id', '=', $id)->orderBy('id', 'ASC')->first();
+            ->where('id', '=', $fieldset->id)
+            ->orderBy('id', 'ASC')
+            ->first();

        $this->authorize('view', $cfset);

@@ -122,16 +124,10 @@ class CustomFieldsetsController extends Controller
     * @param  int  $id
     * @since [v6.0.14]
     */
-    public function edit($id) : View | RedirectResponse
+    public function edit(CustomFieldset $fieldset) : View | RedirectResponse
    {
        $this->authorize('create', CustomField::class);
-
-        if ($fieldset = CustomFieldset::find($id)) {
-            return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
-        }
-
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
-
+        return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
    }

    /**
@@ -141,23 +137,18 @@ class CustomFieldsetsController extends Controller
     * @param  int  $id
     * @since [v6.0.14]
     */
-    public function update(Request $request, $id) : RedirectResponse
+    public function update(Request $request, CustomFieldset $fieldset) : RedirectResponse
    {
        $this->authorize('create', CustomField::class);

-        if ($fieldset = CustomFieldset::find($id)) {
-
-            $fieldset->name = $request->input('name');
-
-            if ($fieldset->save()) {
-                return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
-            }
-
-            return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+        $fieldset->name = $request->input('name');

+        if ($fieldset->save()) {
+            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
        }

-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
+        return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+
    }

    /**
@@ -55,6 +55,7 @@ class DepartmentsController extends Controller
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
        $department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);
        $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
+        $department->notes = $request->input('notes');
        $department = $request->handleImages($department);

        if ($department->save()) {
@@ -72,17 +73,10 @@ class DepartmentsController extends Controller
     * @param int $id
     * @since [v4.0]
     */
-    public function show($id) : View | RedirectResponse
+    public function show(Department $department) : View | RedirectResponse
    {
-        $department = Department::find($id);
-
        $this->authorize('view', $department);
-
-        if (isset($department->id)) {
-            return view('departments/view', compact('department'));
-        }
-
-        return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
+        return view('departments/view', compact('department'));
    }

    /**
@@ -138,15 +132,10 @@ class DepartmentsController extends Controller
     * @param int $departmentId
     * @since [v1.0]
     */
-    public function edit($departmentId = null) : View | RedirectResponse
+    public function edit(Department $department) : View | RedirectResponse
    {
-        if (is_null($item = Department::find($departmentId))) {
-            return redirect()->back()->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('departments/edit', compact('item'));
+        $this->authorize('update', $department);
+        return view('departments/edit')->with('item', $department);
    }

    /**
@@ -157,11 +146,8 @@ class DepartmentsController extends Controller
     * @param int $departmentId
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $id) : RedirectResponse
+    public function update(ImageUploadRequest $request, Department $department) : RedirectResponse
    {
-        if (is_null($department = Department::find($id))) {
-            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
-        }

        $this->authorize('update', $department);

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

        if ($department->save()) {
@@ -95,17 +95,11 @@ class DepreciationsController extends Controller
     * @param int $depreciationId
     * @since [v1.0]
     */
-    public function edit($depreciationId = null) : RedirectResponse | View
+    public function edit(Depreciation $depreciation) : RedirectResponse | View
    {
-        // Check if the depreciation exists
-        if (is_null($item = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }

-        $this->authorize('update', $item);
-
-        return view('depreciations/edit', compact('item'));
+        $this->authorize('update', $depreciation);
+        return view('depreciations/edit')->with('item', $depreciation);
    }

    /**
@@ -117,17 +111,10 @@ class DepreciationsController extends Controller
     * @param int $depreciationId
     * @since [v1.0]
     */
-    public function update(Request $request, $depreciationId = null) : RedirectResponse
+    public function update(Request $request, Depreciation $depreciation) : RedirectResponse
    {
-        // Check if the depreciation exists
-        if (is_null($depreciation = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }

        $this->authorize('update', $depreciation);
-
-        // Depreciation data
        $depreciation->name             = $request->input('name');
        $depreciation->months           = $request->input('months');

@@ -191,12 +178,12 @@ class DepreciationsController extends Controller
     * @param int $depreciationId
     * @since [v1.0]
     */
-    public function show($id) : View | RedirectResponse
+    public function show(Depreciation $depreciation) : View | RedirectResponse
    {
        $depreciation = Depreciation::withCount('assets as assets_count')
            ->withCount('models as models_count')
            ->withCount('licenses as licenses_count')
-            ->find($id);
+            ->find($depreciation->id);

        $this->authorize('view', $depreciation);

@@ -62,6 +62,7 @@ class GroupsController extends Controller
        $group->name = $request->input('name');
        $group->permissions = json_encode($request->input('permission'));
        $group->created_by = auth()->id();
+        $group->notes = $request->input('notes');

        if ($group->save()) {
            return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
@@ -78,19 +79,12 @@ class GroupsController extends Controller
     * @param int $id
     * @since [v1.0]
     */
-    public function edit($id) : View | RedirectResponse
+    public function edit(Group $group) : View | RedirectResponse
    {
-        $group = Group::find($id);
-
-        if ($group) {
-            $permissions = config('permissions');
-            $groupPermissions = $group->decodePermissions();
-            $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-
-            return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+        $permissions = config('permissions');
+        $groupPermissions = $group->decodePermissions();
+        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
    }

    /**
@@ -101,13 +95,11 @@ class GroupsController extends Controller
     * @param int $id
     * @since [v1.0]
     */
-    public function update(Request $request, $id = null) : RedirectResponse
+    public function update(Request $request, Group $group) : RedirectResponse
    {
-        if (! $group = Group::find($id)) {
-            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
-        }
        $group->name = $request->input('name');
        $group->permissions = json_encode($request->input('permission'));
+        $group->notes = $request->input('notes');

        if (! config('app.lock_passwords')) {
            if ($group->save()) {
@@ -149,14 +141,8 @@ class GroupsController extends Controller
     * @param $id
     * @since [v4.0.11]
     */
-    public function show($id) : View | RedirectResponse
+    public function show(Group $group) : View | RedirectResponse
    {
-        $group = Group::find($id);
-
-        if ($group) {
-            return view('groups/view', compact('group'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+      return view('groups/view', compact('group'));
    }
 }
@@ -4,10 +4,8 @@ namespace App\Http\Controllers\Kits;

 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
-use App\Models\PredefinedKit;
 use App\Models\Asset;
-use App\Models\PredefinedLicence;
-use App\Models\PredefinedModel;
+use App\Models\PredefinedKit;
 use App\Models\User;
 use App\Services\PredefinedKitCheckoutService;
 use Illuminate\Http\Request;
@@ -35,12 +33,9 @@ class CheckoutKitController extends Controller
     * @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
     * @return \Illuminate\Contracts\View\View View to checkout
     */
-    public function showCheckout($kit_id)
+    public function showCheckout(PredefinedKit $kit)
    {
        $this->authorize('checkout', Asset::class);
-
-        $kit = PredefinedKit::findOrFail($kit_id);
-
        return view('kits/checkout')->with('kit', $kit);
    }

@@ -76,17 +76,15 @@ class PredefinedKitsController extends Controller
     * @param int $kit_id
     * @return \Illuminate\Contracts\View\View
     */
-    public function edit($kit_id = null)
+    public function edit(PredefinedKit $kit)
    {
        $this->authorize('update', PredefinedKit::class);
-        if ($kit = PredefinedKit::find($kit_id)) {
+
            return view('kits/edit')
                ->with('item', $kit)
                ->with('models', $kit->models)
                ->with('licenses', $kit->licenses);
-        }

-        return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
    }

    /**
@@ -98,15 +96,9 @@ class PredefinedKitsController extends Controller
     * @param int $kit_id
     * @return \Illuminate\Http\RedirectResponse
     */
-    public function update(ImageUploadRequest $request, $kit_id = null)
+    public function update(ImageUploadRequest $request, PredefinedKit $kit)
    {
        $this->authorize('update', PredefinedKit::class);
-        // Check if the kit exists
-        if (is_null($kit = PredefinedKit::find($kit_id))) {
-            // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
-        }
-
        $kit->name = $request->input('name');

        if ($kit->save()) {
@@ -153,9 +145,9 @@ class PredefinedKitsController extends Controller
     * @param int $modelId
     * @return \Illuminate\Contracts\View\View
     */
-    public function show($kit_id = null)
+    public function show(PredefinedKit $kit)
    {
-        return $this->edit($kit_id);
+        return $this->edit($kit);
    }

    /**
@@ -28,16 +28,11 @@ class LicenseCheckinController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($seatId = null, $backTo = null)
+    public function create(LicenseSeat $licenseSeat, $backTo = null)
    {
        // Check if the asset exists
-        if (is_null($licenseSeat = LicenseSeat::find($seatId)) || is_null($license = License::find($licenseSeat->license_id))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-        }
-
+        $license = License::find($licenseSeat->license_id);
        $this->authorize('checkout', $license);
-
        return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);
    }

@@ -71,7 +66,7 @@ class LicenseCheckinController extends Controller

        if (! $license->reassignable) {
            // Not allowed to checkin
-            Session::flash('error', 'License not reassignable.');
+            Session::flash('error', trans('admin/licenses/message.checkin.not_reassignable') . '.');

            return redirect()->back()->withInput();
        }
@@ -28,33 +28,24 @@ class LicenseCheckoutController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id)
+    public function create(License $license)
    {
+        $this->authorize('checkout', $license);

-        if ($license = License::find($id)) {
+        if ($license->category) {

-            $this->authorize('checkout', $license);
-
-            if ($license->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($license->availCount()->count() < 1){
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
-                }
-
-                // Return the checkout view
-                return view('licenses/checkout', compact('license'));
+            // Make sure there is at least one available to checkout
+            if ($license->availCount()->count() < 1) {
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
            }

-            // Invalid category
-            return redirect()->route('licenses.edit', ['license' => $license->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
-
+            // Return the checkout view
+            return view('licenses/checkout', compact('license'));
        }

-        // Not found
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-
+        // Invalid category
+        return redirect()->route('licenses.edit', ['license' => $license->id])
+            ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));

    }

@@ -121,13 +121,10 @@ class LicensesController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($licenseId = null)
+    public function edit(License $license)
    {
-        if (is_null($item = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }

-        $this->authorize('update', $item);
+        $this->authorize('update', $license);

        $maintained_list = [
            '' => 'Maintained',
@@ -135,7 +132,8 @@ class LicensesController extends Controller
            '0' => 'No',
        ];

-        return view('licenses/edit', compact('item'))
+        return view('licenses/edit')
+            ->with('item', $license)
            ->with('depreciation_list', Helper::depreciationList())
            ->with('maintained_list', $maintained_list);
    }
@@ -153,11 +151,9 @@ class LicensesController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(Request $request, $licenseId = null)
+    public function update(Request $request, License $license)
    {
-        if (is_null($license = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+

        $this->authorize('update', $license);

@@ -201,10 +197,10 @@ class LicensesController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($licenseId)
+    public function destroy(License $license)
    {
        // Check if the license exists
-        if (is_null($license = License::find($licenseId))) {
+        if (is_null($license = License::find($license->id))) {
            // Redirect to the license management page
            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
        }
@@ -238,14 +234,9 @@ class LicensesController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($licenseId = null)
+    public function show(License $license)
    {
-        $license = License::with('assignedusers')->find($licenseId);
-
-        if (!$license) {
-            return redirect()->route('licenses.index')
-            ->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+        $license = License::with('assignedusers')->find($license->id);

        $users_count = User::where('autoassign_licenses', '1')->count();
        $total_seats_count = $license->totalSeatsByLicenseID();
@@ -267,10 +258,10 @@ class LicensesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $licenseId
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse | \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function getClone($licenseId = null)
+    public function getClone($licenseId = null) : \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
    {
        if (is_null($license_to_clone = License::find($licenseId))) {
            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
@@ -78,6 +78,7 @@ class LocationsController extends Controller
        $location->created_by = auth()->id();
        $location->phone = request('phone');
        $location->fax = request('fax');
+        $location->notes = $request->input('notes');

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

@@ -96,15 +97,10 @@ class LocationsController extends Controller
     * @param int $locationId
     * @since [v1.0]
     */
-    public function edit($locationId = null) : View | RedirectResponse
+    public function edit(Location $location) : View | RedirectResponse
    {
        $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($item = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        return view('locations/edit', compact('item'));
+        return view('locations/edit')->with('item', $location);
    }

    /**
@@ -116,15 +112,10 @@ class LocationsController extends Controller
     * @param int $locationId
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $locationId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Location $location) : RedirectResponse
    {
        $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($location = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }

-        // Update the location data
        $location->name = $request->input('name');
        $location->parent_id = $request->input('parent_id', null);
        $location->currency = $request->input('currency', '$');
@@ -138,6 +129,7 @@ class LocationsController extends Controller
        $location->fax = request('fax');
        $location->ldap_ou = $request->input('ldap_ou');
        $location->manager_id = $request->input('manager_id');
+        $location->notes = $request->input('notes');

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

@@ -192,7 +184,7 @@ class LocationsController extends Controller
     * @param int $id
     * @since [v1.0]
     */
-    public function show($id = null) : View | RedirectResponse
+    public function show(Location $location) : View | RedirectResponse
    {
        $location = Location::withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
@@ -200,7 +192,7 @@ class LocationsController extends Controller
            ->withCount('children as children_count')
            ->withCount('users as users_count')
            ->withTrashed()
-            ->find($id);
+            ->find($location->id);

        if (isset($location->id)) {
            return view('locations/view', compact('location'));
@@ -67,6 +67,7 @@ class ManufacturersController extends Controller
        $manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');
        $manufacturer->support_phone = $request->input('support_phone');
        $manufacturer->support_email = $request->input('support_email');
+        $manufacturer->notes = $request->input('notes');
        $manufacturer = $request->handleImages($manufacturer);

        if ($manufacturer->save()) {
@@ -84,18 +85,10 @@ class ManufacturersController extends Controller
     * @param int $manufacturerId
     * @since [v1.0]
     */
-    public function edit($manufacturerId = null) : View | RedirectResponse
+    public function edit(Manufacturer $manufacturer) : View | RedirectResponse
    {
-        // Handles manufacturer checks and permissions.
        $this->authorize('update', Manufacturer::class);
-
-        // Check if the manufacturer exists
-        if (! $item = Manufacturer::find($manufacturerId)) {
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('manufacturers/edit', compact('item'));
+        return view('manufacturers/edit')->with('item', $manufacturer);
    }

    /**
@@ -107,22 +100,17 @@ class ManufacturersController extends Controller
     * @param int $manufacturerId
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $manufacturerId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, Manufacturer $manufacturer) : RedirectResponse
    {
        $this->authorize('update', Manufacturer::class);
-        // Check if the manufacturer exists
-        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
-            // Redirect to the manufacturer  page
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }

-        // Save the data
        $manufacturer->name = $request->input('name');
        $manufacturer->url = $request->input('url');
        $manufacturer->support_url = $request->input('support_url');
        $manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');
        $manufacturer->support_phone = $request->input('support_phone');
        $manufacturer->support_email = $request->input('support_email');
+        $manufacturer->notes = $request->input('notes');

        // Set the model's image property to null if the image is being deleted
        if ($request->input('image_delete') == 1) {
@@ -183,18 +171,10 @@ class ManufacturersController extends Controller
     * @param int $manufacturerId
     * @since [v1.0]
     */
-    public function show($manufacturerId = null) : View | RedirectResponse
+    public function show(Manufacturer $manufacturer) : View | RedirectResponse
    {
        $this->authorize('view', Manufacturer::class);
-        $manufacturer = Manufacturer::find($manufacturerId);
-
-        if (isset($manufacturer->id)) {
-            return view('manufacturers/view', compact('manufacturer'));
-        }
-
-        $error = trans('admin/manufacturers/message.does_not_exist');
-        // Redirect to the user management page
-        return redirect()->route('manufacturers.index')->with('error', $error);
+        return view('manufacturers/view', compact('manufacturer'));
    }

    /**
@@ -32,7 +32,8 @@ class ModalController extends Controller
            'statuslabel',
            'supplier',
            'upload-file',
-            'user',         
+            'user',
+            'add-note',
        ];


@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Actionlog;
+use App\Models\Asset;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class NotesController extends Controller
+{
+    public function store(Request $request)
+    {
+        $this->authorize('update', Asset::class);
+
+        $validated = $request->validate([
+            'id' => 'required',
+            'note' => 'required|string|max:50000',
+            'type' => [
+                'required',
+                Rule::in(['asset']),
+            ],
+        ]);
+
+        $item = Asset::findOrFail($validated['id']);
+
+        $this->authorize('update', $item);
+
+        $logaction = new Actionlog;
+        $logaction->item_id = $item->id;
+        $logaction->item_type = get_class($item);
+        $logaction->note = $validated['note'];
+        $logaction->created_by = Auth::id();
+        $logaction->logaction('note added');
+
+        return redirect()
+            ->route('hardware.show', $validated['id'])
+            ->withFragment('history')
+            ->with('success', trans('general.note_added'));
+    }
+}
@@ -99,9 +99,13 @@ class ProfileController extends Controller
     * User change email page.
     *
     */
-    public function password() : View
+    public function password() : View | RedirectResponse
    {
+
        $user = auth()->user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
+        }
        return view('account/change-password', compact('user'));
    }

@@ -116,7 +120,7 @@ class ProfileController extends Controller

        $user = auth()->user();
        if ($user->ldap_import == '1') {
-            return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap'));
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
        }

        $rules = [
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\CustomField;
+use App\Models\ReportTemplate;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+
+class ReportTemplatesController extends Controller
+{
+    public function store(Request $request): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        // Ignore "options" rules since data does not come in under that key...
+        $validated = $request->validate(Arr::except((new ReportTemplate)->getRules(), 'options'));
+
+        $report = $request->user()->reportTemplates()->create([
+            'name' => $validated['name'],
+            'options' => $request->except(['_token', 'name']),
+        ]);
+
+        session()->flash('success', trans('admin/reports/message.create.success'));
+
+        return redirect()->route('report-templates.show', $report->id);
+    }
+
+    public function show(ReportTemplate $reportTemplate)
+    {
+        $this->authorize('reports.view');
+
+        $customfields = CustomField::get();
+        $report_templates = ReportTemplate::orderBy('name')->get();
+
+        return view('reports/custom', [
+            'customfields' => $customfields,
+            'report_templates' => $report_templates,
+            'template' => $reportTemplate,
+        ]);
+    }
+
+    public function edit(ReportTemplate $reportTemplate)
+    {
+        $this->authorize('reports.view');
+
+        return view('reports/custom', [
+            'customfields' => CustomField::get(),
+            'template' => $reportTemplate,
+        ]);
+    }
+
+    public function update(Request $request, ReportTemplate $reportTemplate): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        // Ignore "options" rules since data does not come in under that key...
+        $validated = $request->validate(Arr::except((new ReportTemplate)->getRules(), 'options'));
+
+        $reportTemplate->update([
+            'name' => $validated['name'],
+            'options' => $request->except(['_token', 'name']),
+        ]);
+
+        session()->flash('success', trans('admin/reports/message.update.success'));
+
+        return redirect()->route('report-templates.show', $reportTemplate->id);
+    }
+
+    public function destroy(ReportTemplate $reportTemplate): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        $reportTemplate->delete();
+
+        return redirect()->route('reports/custom')
+            ->with('success', trans('admin/reports/message.delete.success'));
+    }
+}
@@ -11,12 +11,15 @@ use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\AssetMaintenance;
 use App\Models\CheckoutAcceptance;
+use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\Depreciation;
 use App\Models\License;
+use App\Models\ReportTemplate;
 use App\Models\Setting;
 use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Mail;
@@ -394,12 +397,27 @@ class ReportsController extends Controller
    * @see ReportsController::postCustomReport() method that generates the CSV
    * @since [v1.0]
    */
-    public function getCustomReport() : View
+    public function getCustomReport(Request $request) : View
    {
        $this->authorize('reports.view');
        $customfields = CustomField::get();
+        $report_templates = ReportTemplate::orderBy('name')->get();

-        return view('reports/custom')->with('customfields', $customfields);
+        // The view needs a template to render correctly, even if it is empty...
+        $template = new ReportTemplate;
+
+        // Set the report's input values in the cases we were redirected back
+        // with validation errors so the report is populated as expected.
+        if ($request->old()) {
+            $template->name = $request->old('name');
+            $template->options = $request->old();
+        }
+
+        return view('reports/custom', [
+            'customfields' => $customfields,
+            'report_templates' => $report_templates,
+            'template' => $template,
+        ]);
    }

    /**
@@ -1093,28 +1111,31 @@ class ReportsController extends Controller
        $this->authorize('reports.view');
        $showDeleted = $deleted == 'deleted';

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

-        $assetsForReport = $acceptances
-            ->filter(function ($acceptance) {
-                $acceptance_checkoutable_flag = false;
-                if ($acceptance->checkoutable){
-                    $acceptance_checkoutable_flag = $acceptance->checkoutable->checkedOutToUser();
-                }
-                
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && $acceptance_checkoutable_flag;
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
+        $assetsForReport = $query->get()
+                ->map(function ($acceptance) {
+                    return [
+                        'assetItem' => $acceptance->checkoutable,
+                        'acceptance' => $acceptance,
+                    ];
            });

        return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
@@ -1156,10 +1177,10 @@ class ReportsController extends Controller
        $locale = $assetItem->assignedTo?->locale;
        // Only send notification if assigned
        if ($locale && $email) {
-                Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $logItem->note, $acceptance))->locale($locale));
+            Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note))->locale($locale));

            } elseif ($email) {
-                Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $logItem->note, $acceptance)));
+            Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)));
            }

        if ($email == ''){
@@ -192,6 +192,7 @@ class SettingsController extends Controller
        $settings->next_auto_tag_base = 1;
        $settings->auto_increment_assets = $request->input('auto_increment_assets', 0);
        $settings->auto_increment_prefix = $request->input('auto_increment_prefix');
+        $settings->zerofill_count = $request->input('zerofill_count') ?: 0;

        if ((! $user->isValid()) || (! $settings->isValid())) {
            return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
@@ -695,48 +696,6 @@ class SettingsController extends Controller
        return redirect()->back()->withInput()->withErrors($setting->getErrors());
    }

-    /**
-     * Return a form to allow a super admin to update settings.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     */
-    public function getBarcodes() : View
-    {
-        $setting = Setting::getSettings();
-        $is_gd_installed = extension_loaded('gd');
-
-        return view('settings.barcodes', compact('setting'))->with('is_gd_installed', $is_gd_installed);
-    }
-
-    /**
-     * Saves settings from form.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     */
-    public function postBarcodes(Request $request) : RedirectResponse
-    {
-        if (is_null($setting = Setting::getSettings())) {
-            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
-        }
-
-        $setting->qr_code = $request->input('qr_code', '0');
-        $setting->alt_barcode = $request->input('alt_barcode');
-        $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');
-        $setting->barcode_type = $request->input('barcode_type');
-        $setting->qr_text = $request->input('qr_text');
-
-        if ($setting->save()) {
-            return redirect()->route('settings.index')
-                ->with('success', trans('admin/settings/message.update.success'));
-        }
-
-        return redirect()->back()->withInput()->withErrors($setting->getErrors());
-    }
-
    /**
     * Return a form to allow a super admin to update settings.
     *
@@ -762,8 +721,11 @@ class SettingsController extends Controller
     */
    public function getLabels() : View
    {
+        $is_gd_installed = extension_loaded('gd');
+
        return view('settings.labels')
            ->with('setting', Setting::getSettings())
+            ->with('is_gd_installed', $is_gd_installed)
            ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());
    }

@@ -799,9 +761,13 @@ class SettingsController extends Controller
        $setting->labels_pagewidth = $request->input('labels_pagewidth');
        $setting->labels_pageheight = $request->input('labels_pageheight');
        $setting->labels_display_company_name = $request->input('labels_display_company_name', '0');
-        $setting->labels_display_company_name = $request->input('labels_display_company_name', '0');
-

+        //Barcodes
+        $setting->qr_code = $request->input('qr_code', '0');
+        //1D-Barcode
+        $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');
+        //QR-Code
+        $setting->qr_text = $request->input('qr_text');

        if ($request->filled('labels_display_name')) {
            $setting->labels_display_name = 1;
@@ -834,6 +800,7 @@ class SettingsController extends Controller
        }

        if ($setting->save()) {
+
            return redirect()->route('settings.labels.index')
                ->with('success', trans('admin/settings/message.update.success'));
        }
@@ -903,7 +870,6 @@ class SettingsController extends Controller
        }

        if ($setting->save()) {
-            $setting->update_client_side_cert_files();
            return redirect()->route('settings.ldap.index')
                ->with('success', trans('admin/settings/message.update.success'));
        }
@@ -26,14 +26,10 @@ class StatuslabelsController extends Controller
        return view('statuslabels.index');
    }

-    public function show($id) : View | RedirectResponse
+    public function show(Statuslabel $statuslabel) : View | RedirectResponse
    {
        $this->authorize('view', Statuslabel::class);
-        if ($statuslabel = Statuslabel::find($id)) {
-            return view('statuslabels.view')->with('statuslabel', $statuslabel);
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+        return view('statuslabels.view')->with('statuslabel', $statuslabel);
    }

    /**
@@ -91,20 +87,15 @@ class StatuslabelsController extends Controller
     *
     * @param  int $statuslabelId
     */
-    public function edit($statuslabelId = null) : View | RedirectResponse
+    public function edit(Statuslabel $statuslabel) : View | RedirectResponse
    {
        $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($item = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }
-
-        $use_statuslabel_type = $item->getStatuslabelType();

        $statuslabel_types = ['' => trans('admin/hardware/form.select_statustype')] + ['undeployable' => trans('admin/hardware/general.undeployable')] + ['pending' => trans('admin/hardware/general.pending')] + ['archived' => trans('admin/hardware/general.archived')] + ['deployable' => trans('admin/hardware/general.deployable')];

-        return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('statuslabel_types'))
+            ->with('item', $statuslabel)
+            ->with('use_statuslabel_type', $statuslabel);
    }

    /**
@@ -112,14 +103,9 @@ class StatuslabelsController extends Controller
     *
     * @param  int $statuslabelId
     */
-    public function update(Request $request, $statuslabelId = null) : RedirectResponse
+    public function update(Request $request, Statuslabel $statuslabel) : RedirectResponse
    {
        $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }

        if (! $request->filled('statuslabel_types')) {
            return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
@@ -77,17 +77,10 @@ class SuppliersController extends Controller
     *
     * @param  int $supplierId
     */
-    public function edit($supplierId = null) : View | RedirectResponse
+    public function edit(Supplier $supplier) : View | RedirectResponse
    {
        $this->authorize('update', Supplier::class);
-        // Check if the supplier exists
-        if (is_null($item = Supplier::find($supplierId))) {
-            // Redirect to the supplier  page
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('suppliers/edit', compact('item'));
+        return view('suppliers/edit')->with('item',  $supplier);
    }

    /**
@@ -95,14 +88,9 @@ class SuppliersController extends Controller
     *
     * @param  int $supplierId
     */
-    public function update($supplierId, ImageUploadRequest $request) : RedirectResponse
+    public function update(ImageUploadRequest $request, Supplier $supplier) : RedirectResponse
    {
        $this->authorize('update', Supplier::class);
-
-        if (is_null($supplier = Supplier::find($supplierId))) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
        // Save the  data
        $supplier->name = request('name');
        $supplier->address = request('address');
@@ -163,15 +151,10 @@ class SuppliersController extends Controller
     * @param null $supplierId
     * @internal param int $assetId
     */
-    public function show($supplierId = null) : View | RedirectResponse
+    public function show(Supplier $supplier) : View | RedirectResponse
    {
        $this->authorize('view', Supplier::class);
-        $supplier = Supplier::find($supplierId);
+        return view('suppliers/view', compact('supplier'));

-        if (isset($supplier->id)) {
-            return view('suppliers/view', compact('supplier'));
-        }
-
-        return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
    }
 }
@@ -15,6 +15,7 @@ use App\Models\ConsumableAssignment;
 use App\Models\Consumable;
 use App\Models\Setting;
 use App\Models\User;
+use App\Notifications\CurrentInventory;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -52,6 +53,28 @@ class BulkUsersController extends Controller
                return view('users/bulk-edit', compact('users'))
                    ->with('groups', Group::pluck('name', 'id'));

+            // bulk send assigned inventory
+            } elseif ($request->input('bulk_actions') == 'send_assigned') {
+                    $this->authorize('update', User::class);
+
+                $users_without_email = 0;
+                foreach ($users as $user) {
+                    if (empty($user->email)) {
+                        $users_without_email++;
+                    } else {
+                        $user->notify((new CurrentInventory($user)));
+                    }
+                }
+
+                if ($users_without_email == 0) {
+                    return redirect()->back()->with('success', trans_choice('admin/users/general.users_notified', $users->count()));
+                } else {
+                    return redirect()->back()->with('warning', trans_choice('admin/users/general.users_notified_warning', $users->count(), ['no_email' => $users_without_email]));
+                }
+
+
+
+
            // bulk delete, display the bulk delete confirmation form
            } elseif ($request->input('bulk_actions') == 'delete') {
                $this->authorize('delete', User::class);
@@ -70,7 +93,7 @@ class BulkUsersController extends Controller
            // bulk password reset, just do the thing
            } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
                foreach ($users as $user) {
-                    if (($user->activated == '1') && ($user->email != '')) {
+                    if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import != '1')) {
                        $credentials = ['email' => $user->email];
                        Password::sendResetLink($credentials/* , function (Message $message) {
                        $message->subject($this->getEmailSubject()); // TODO - I'm not sure if we still need this, but this second parameter is no longer accepted in later Laravel versions.
@@ -22,43 +22,34 @@ class UserFilesController extends Controller
     *@author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.6]
     */
-    public function store(UploadFileRequest $request, $userId = null)
+    public function store(UploadFileRequest $request, User $user)
    {
-        $user = User::find($userId);
-        $destinationPath = config('app.private_uploads').'/users';
+        $this->authorize('update', $user);
+        $files = $request->file('file');

-        if (isset($user->id)) {
-            $this->authorize('update', $user);
-
-            $logActions = [];
-            $files = $request->file('file');
-
-            if (is_null($files)) {
-                return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
-            }
-            foreach ($files as $file) {
-                $file_name = $request->handleFile('private_uploads/users/', 'user-'.$user->id, $file);
-
-                //Log the uploaded file to the log
-                $logAction = new Actionlog();
-                $logAction->item_id = $user->id;
-                $logAction->item_type = User::class;
-                $logAction->created_by = auth()->id();
-                $logAction->note = $request->input('notes');
-                $logAction->target_id = null;
-                $logAction->created_at = date("Y-m-d H:i:s");
-                $logAction->filename = $file_name;
-                $logAction->action_type = 'uploaded';
-
-                if (! $logAction->save()) {
-                    return JsonResponse::create(['error' => 'Failed validation: '.print_r($logAction->getErrors(), true)], 500);
-                }
-                $logActions[] = $logAction;
-            }
-            // dd($logActions);
-            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
+        if (is_null($files)) {
+            return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
+        }
+        foreach ($files as $file) {
+            $file_name = $request->handleFile('private_uploads/users/', 'user-'.$user->id, $file);
+
+            //Log the uploaded file to the log
+            $logAction = new Actionlog();
+            $logAction->item_id = $user->id;
+            $logAction->item_type = User::class;
+            $logAction->created_by = auth()->id();
+            $logAction->note = $request->input('notes');
+            $logAction->target_id = null;
+            $logAction->created_at = date("Y-m-d H:i:s");
+            $logAction->filename = $file_name;
+            $logAction->action_type = 'uploaded';
+
+            if (! $logAction->save()) {
+                return JsonResponse::create(['error' => 'Failed validation: '.print_r($logAction->getErrors(), true)], 500);
+            }
+
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
        }
-        return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));


    }
@@ -87,7 +78,7 @@ class UserFilesController extends Controller
                
                if (Storage::exists($rel_path.'/'.$filename)) {
                    Storage::delete($rel_path.'/'.$filename);
-                    return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
                }

            }
@@ -110,7 +101,7 @@ class UserFilesController extends Controller
     * @return mixed
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($userId = null, $fileId = null)
+    public function show(User $user, $fileId = null)
    {


@@ -118,29 +109,21 @@ class UserFilesController extends Controller
            return redirect()->route('users.show')->with('error', 'Invalid file request');
        }

-        if ($user = User::find($userId)) {
-
            $this->authorize('view', $user);

-            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
-                $file = 'private_uploads/users/'.$log->filename;
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
+            $file = 'private_uploads/users/'.$log->filename;

-                try {
-                    return StorageHelper::showOrDownloadFile($file, $log->filename);
-                } catch (\Exception $e) {
-                    return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.file_not_found'));
-                }
+            try {
+                return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.file_not_found'));
            }
-
-            // The log record doesn't exist somehow
-            return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.log_record_not_found'));
-
-
-            return redirect()->back()->with('error',  trans('general.file_not_found'));
        }

-        // Redirect to the user management page if the user doesn't exist
-        return redirect()->route('users.index')->with('error',  trans('admin/users/message.user_not_found', ['id' => $userId]));
+        // The log record doesn't exist somehow
+        return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.log_record_not_found'));
+
    }

 }
@@ -182,11 +182,11 @@ class UsersController extends Controller
     * @internal param int $id
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($id)
+    public function edit(User $user)
    {

        $this->authorize('update', User::class);
-        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($id);
+        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($user->id);

        if ($user) {

@@ -198,7 +198,7 @@ class UsersController extends Controller
            $userPermissions = Helper::selectedPermissionsArray($permissions, $user->permissions);
            $permissions = $this->filterDisplayable($permissions);

-            return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))->with('item', $user);
+            return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'));
        }

        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
@@ -324,7 +324,7 @@ class UsersController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy(DeleteUserRequest $request, $id = null)
+    public function destroy(DeleteUserRequest $request, $id)
    {
        $this->authorize('delete', User::class);

@@ -333,13 +333,6 @@ class UsersController extends Controller
            $this->authorize('delete', $user);

            if ($user->delete()) {
-                if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
-                    try {
-                        Storage::disk('public')->delete('avatars/' . $user->avatar);
-                    } catch (\Exception $e) {
-                        Log::debug($e);
-                    }
-                }
                return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));
            }
        }
@@ -398,23 +391,18 @@ class UsersController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($userId = null)
+    public function show(User $user)
    {
        // Make sure the user can view users at all
        $this->authorize('view', User::class);

-        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId);
+        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);

        // Make sure they can view this particular user
        $this->authorize('view', $user);

-        if ($user) {
            $userlog = $user->userlog->load('item');
            return view('users/view', compact('user', 'userlog'))->with('settings', Setting::getSettings());
-        }
-
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId]));
-
    }


@@ -428,7 +416,7 @@ class UsersController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function getClone(Request $request, $id = null)
+    public function getClone(Request $request, User $user)
    {
        $this->authorize('create', User::class);

@@ -438,7 +426,7 @@ class UsersController extends Controller
        app('request')->request->set('permissions', $permissions);


-        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
+        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);
        // Make sure they can view this particular user
        $this->authorize('view', $user_to_clone);

@@ -24,9 +24,9 @@ class AssetCheckoutRequest extends Request
        $settings = \App\Models\Setting::getSettings();

        $rules = [
-            'assigned_user'         => 'required_without_all:assigned_asset,assigned_location',
-            'assigned_asset'        => 'required_without_all:assigned_user,assigned_location',
-            'assigned_location'     => 'required_without_all:assigned_user,assigned_asset',
+            'assigned_user' => 'numeric|nullable|required_without_all:assigned_asset,assigned_location',
+            'assigned_asset' => 'numeric|nullable|required_without_all:assigned_user,assigned_location',
+            'assigned_location' => 'numeric|nullable|required_without_all:assigned_user,assigned_asset',
            'status_id'             => 'exists:status_labels,id,deployable,1',
            'checkout_to_type'      => 'required|in:asset,location,user',
            'checkout_at' => [
@@ -24,7 +24,7 @@ class DeleteUserRequest extends FormRequest

    public function prepareForValidation(): void
    {
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));

        if ($user_to_delete) {
            $this->merge([
@@ -61,7 +61,8 @@ class DeleteUserRequest extends FormRequest
    public function messages(): array
    {

-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));
+
        $messages = [];

        if ($user_to_delete) {
@@ -62,7 +62,7 @@ class SettingsSamlRequest extends FormRequest
            $custom_privateKey = '';
            $custom_x509certNew = '';
            if (! empty($this->input('saml_custom_settings'))) {
-                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings'));
+                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
                $custom_settings = [];

                foreach ($req_custom_settings as $custom_setting) {
@@ -2,8 +2,11 @@

 namespace App\Http\Requests;

+
+use App\Models\Labels\Label;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;

 class StoreLabelSettings extends FormRequest
 {
@@ -22,6 +25,10 @@ class StoreLabelSettings extends FormRequest
     */
    public function rules(): array
    {
+        $names = Label::find()?->map(function ($label) {
+            return $label->getName();
+        })->values()->toArray();
+
        return [
            'labels_per_page'                     => 'numeric',
            'labels_width'                        => 'numeric',
@@ -36,6 +43,10 @@ class StoreLabelSettings extends FormRequest
            'labels_pagewidth'                    => 'numeric|nullable',
            'labels_pageheight'                   => 'numeric|nullable',
            'qr_text'                             => 'max:31|nullable',
+            'label2_template'                     => [
+                'required',
+                Rule::in($names),
+            ],
        ];
    }
 }
@@ -28,7 +28,7 @@ class StoreNotificationSettings extends FormRequest
            'admin_cc_email'                      => 'email_array|nullable',
            'alert_threshold'                     => 'numeric|nullable|gt:0',
            'alert_interval'                      => 'numeric|nullable|gt:0',
-            'audit_warning_days'                  => 'numeric|nullable|gt:0',
+            'audit_warning_days'                  => 'numeric|nullable',
            'due_checkin_days'                    => 'numeric|nullable|gt:0',
            'audit_interval'                      => 'numeric|nullable|gt:0',
        ];
@@ -46,8 +46,6 @@ class UploadFileRequest extends Request
        $extension = $file->getClientOriginalExtension();
        $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();

-
-        Log::debug("Your filetype IS: ".$file->getMimeType());
        // Check for SVG and sanitize it
        if ($file->getMimeType() === 'image/svg+xml') {
            Log::debug('This is an SVG');
@@ -66,7 +64,6 @@ class UploadFileRequest extends Request

        } else {
            $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
-            Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
        }
        return $file_name;
    }
@@ -69,7 +69,7 @@ class AccessoriesTransformer
        return $array;
    }

-    public function transformCheckedoutAccessory($accessory, $accessory_checkouts, $total)
+    public function transformCheckedoutAccessory($accessory_checkouts, $total)
    {
        $array = [];

@@ -77,9 +77,13 @@ class AccessoriesTransformer
            $array[] = [
                'id' => $checkout->id,
                'assigned_to' => $this->transformAssignedTo($checkout),
-                'checkout_notes' => e($checkout->note),
-                'last_checkout' => Helper::getFormattedDateObject($checkout->created_at, 'datetime'),
-                'available_actions' => ['checkin' => true],
+                'note' => $checkout->note ? e($checkout->note) : null,
+                'created_by' => $checkout->adminuser ? [
+                    'id' => (int) $checkout->adminuser->id,
+                    'name'=> e($checkout->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($checkout->created_at, 'datetime'),
+                'available_actions' => Gate::allows('checkout', Accessory::class) ? ['checkin' => true] : ['checkin' => false],
            ];
        }

@@ -89,22 +93,11 @@ class AccessoriesTransformer
    public function transformAssignedTo($accessoryCheckout)
    {
        if ($accessoryCheckout->checkedOutToUser()) {
-            return [
-                    'id' => (int) $accessoryCheckout->assigned->id,
-                    'username' => e($accessoryCheckout->assigned->username),
-                    'name' => e($accessoryCheckout->assigned->getFullNameAttribute()),
-                    'first_name'=> e($accessoryCheckout->assigned->first_name),
-                    'last_name'=> ($accessoryCheckout->assigned->last_name) ? e($accessoryCheckout->assigned->last_name) : null,
-                    'email'=> ($accessoryCheckout->assigned->email) ? e($accessoryCheckout->assigned->email) : null,
-                    'employee_number' =>  ($accessoryCheckout->assigned->employee_num) ? e($accessoryCheckout->assigned->employee_num) : null,
-                    'type' => 'user',
-                ];
+            return (new UsersTransformer)->transformUserCompact($accessoryCheckout->assigned);
+        } elseif ($accessoryCheckout->checkedOutToLocation()) {
+            return (new LocationsTransformer())->transformLocationCompact($accessoryCheckout->assigned);
+        } elseif ($accessoryCheckout->checkedOutToAsset()) {
+            return (new AssetsTransformer())->transformAssetCompact($accessoryCheckout->assigned);
        }
-
-        return $accessoryCheckout->assigned ? [
-            'id' => $accessoryCheckout->assigned->id,
-            'name' => e($accessoryCheckout->assigned->display_name),
-            'type' => $accessoryCheckout->assignedType(),
-        ] : null;
    }
 }
@@ -140,13 +140,13 @@ class ActionlogsTransformer
            } else {
                if ($actionlog->item) {
                    if ($actionlog->itemType() == 'asset') {
-                        $file_url = route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
+                        $file_url = route('show/assetfile', ['asset' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                    } elseif ($actionlog->itemType() == 'accessory') {
                        $file_url = route('show.accessoryfile', ['accessoryId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                    } elseif ($actionlog->itemType() == 'license') {
                        $file_url = route('show.licensefile', ['licenseId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                    } elseif ($actionlog->itemType() == 'user') {
-                        $file_url = route('show/userfile', ['userId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
+                        $file_url = route('show/userfile', ['user' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                    }
                }
            }
@@ -29,14 +29,15 @@ class AssetMaintenancesTransformer
                'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null,
                'asset_tag'=> e($assetmaintenance->asset->asset_tag),
                'serial'=> e($assetmaintenance->asset->serial),
-                'deleted_at'=> e($assetmaintenance->asset->deleted_at),
-                'created_at'=> e($assetmaintenance->asset->created_at),
+                'deleted_at'=> Helper::getFormattedDateObject($assetmaintenance->asset->deleted_at, 'datetime'),
+                'created_at' => Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime'),
            ] : null,
            'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [
                'id' => (int) $assetmaintenance->asset->model->id,
                'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null,
            ] : null,
-            'status_label' => ($assetmaintenance->asset->assetstatus) ? [
+            'status_label' => (($assetmaintenance->asset) && ($assetmaintenance->asset->assetstatus)) ? [
                'id' => (int) $assetmaintenance->asset->assetstatus->id,
                'name'=> e($assetmaintenance->asset->assetstatus->name),
                'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
@@ -79,7 +80,7 @@ class AssetMaintenancesTransformer
        ];

        $permissions_array['available_actions'] = [
-            'update' => (Gate::allows('update', Asset::class) && ($assetmaintenance->asset->deleted_at=='')) ? true : false,
+            'update' => (Gate::allows('update', Asset::class) && ((($assetmaintenance->asset) && $assetmaintenance->asset->deleted_at==''))) ? true : false,
            'delete' => Gate::allows('delete', Asset::class),
        ];

@@ -87,6 +87,41 @@ class AssetModelsTransformer
        return $array;
    }

+    public function transformAssetModelFiles($assetmodel, $total)
+    {
+
+        $array = [];
+        foreach ($assetmodel->uploads as $file) {
+            $array[] = self::transformAssetModelFile($file, $assetmodel);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetModelFile($file, $assetmodel)
+    {
+
+        $array = [
+            'id' => (int) $file->id,
+            'filename' => e($file->filename),
+            'url' => route('show/modelfile', [$assetmodel->id, $file->id]),
+            'created_by' => ($file->adminuser) ? [
+                'id' => (int) $file->adminuser->id,
+                'name'=> e($file->adminuser->present()->fullName),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
    public function transformAssetModelsDatatable($assetmodels)
    {
        return (new DatatablesTransformer)->transformDatatables($assetmodels);
@@ -3,12 +3,14 @@
 namespace App\Http\Transformers;

 use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;

 class AssetsTransformer
 {
@@ -225,7 +227,7 @@ class AssetsTransformer
    public function transformRequestedAsset(Asset $asset)
    {
        $array = [
-            'id' => (int) $asset->id,
+            'id' => (int)$asset->id,
            'name' => e($asset->name),
            'asset_tag' => e($asset->asset_tag),
            'serial' => e($asset->serial),
@@ -234,7 +236,7 @@ class AssetsTransformer
            'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
            'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
            'location' => ($asset->location) ? e($asset->location->name) : null,
-            'status'=> ($asset->assetstatus) ? $asset->present()->statusMeta : null,
+            'status' => ($asset->assetstatus) ? $asset->present()->statusMeta : null,
            'assigned_to_self' => ($asset->assigned_to == auth()->id()),
        ];

@@ -244,7 +246,7 @@ class AssetsTransformer
            foreach ($asset->model->fieldset->fields as $field) {

                // Only display this if it's allowed via the custom field setting
-                if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
+                if (($field->field_encrypted == '0') && ($field->show_in_requestable_list == '1')) {

                    $value = $asset->{$field->db_column};
                    if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) {
@@ -268,7 +270,62 @@ class AssetsTransformer

        $array += $permissions_array;
        return $array;
-
-
    }
+
+    public function transformAssetCompact(Asset $asset)
+    {
+        $array = [
+            'id' => (int) $asset->id,
+            'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
+            'type' => 'asset',
+            'name' => e($asset->present()->fullName()),
+            'model' => ($asset->model) ? e($asset->model->name) : null,
+            'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
+            'asset_tag' => e($asset->asset_tag),
+            'serial' => e($asset->serial),
+        ];
+
+        return $array;
+    }
+
+    public function transformCheckedoutAccessories($accessory_checkouts, $total)
+    {
+
+        $array = [];
+        foreach ($accessory_checkouts as $checkout) {
+            $array[] = self::transformCheckedoutAccessory($checkout);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checkout)
+    {
+
+        $array = [
+            'id' => $accessory_checkout->id,
+            'accessory' => [
+                'id' => $accessory_checkout->accessory->id,
+                'name' => $accessory_checkout->accessory->name,
+            ],
+            'assigned_to' => $accessory_checkout->assigned_to,
+            'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
+            'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
+            'created_by' => $accessory_checkout->adminuser ? [
+                'id' => (int) $accessory_checkout->adminuser->id,
+                'name'=> e($accessory_checkout->adminuser->present()->fullName),
+            ]: null,
+            'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'checkout' => false,
+            'checkin' => Gate::allows('checkin', Accessory::class),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
 }
@@ -66,6 +66,7 @@ class CategoriesTransformer
                    'id' => (int) $category->adminuser->id,
                    'name'=> e($category->adminuser->present()->fullName()),
                ] : null,
+                'notes' => Helper::parseEscapedMarkedownInline($category->notes),
                'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
            ];
@@ -40,6 +40,7 @@ class CompaniesTransformer
                    'id' => (int) $company->adminuser->id,
                    'name'=> e($company->adminuser->present()->fullName()),
                ] : null,
+                'notes' => Helper::parseEscapedMarkedownInline($company->notes),
                'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
            ];
@@ -62,7 +62,7 @@ class ComponentsTransformer
            'checkout' => Gate::allows('checkout', Component::class),
            'checkin' => Gate::allows('checkin', Component::class),
            'update' => Gate::allows('update', Component::class),
-            'delete' => Gate::allows('delete', Component::class),
+            'delete' => $component->isDeletable(),
        ];
        $array += $permissions_array;

@@ -44,6 +44,7 @@ class DepartmentsTransformer
                    'name' => e($department->location->name),
                ] : null,
                'users_count' => e($department->users_count),
+                'notes' => Helper::parseEscapedMarkedownInline($department->notes),
                'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),
            ];
@@ -61,7 +61,7 @@ class DepreciationReportTransformer
        /**
         * Override the previously set null values if there is a valid model and associated depreciation
         */
-        if (($asset->model) && ($asset->model->depreciation)) {
+        if (($asset->model) && ($asset->model->depreciation) && ($asset->model->depreciation->months !== 0)) {
            $depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue());
            $monthly_depreciation =Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
            $diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
@@ -26,6 +26,7 @@ class GroupsTransformer
            'name' => e($group->name),
            'permissions' => json_decode($group->permissions),
            'users_count' => (int) $group->users_count,
+            'notes' => Helper::parseEscapedMarkedownInline($group->notes),
            'created_by' => ($group->adminuser) ? [
                'id' => (int) $group->adminuser->id,
                'name'=> e($group->adminuser->present()->fullName()),
@@ -3,6 +3,8 @@
 namespace App\Http\Transformers;

 use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Location;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
@@ -45,12 +47,15 @@ class LocationsTransformer
                'zip' => ($location->zip) ? e($location->zip) : null,
                'phone' => ($location->phone!='') ? e($location->phone): null,
                'fax' => ($location->fax!='') ? e($location->fax): null,
+                'accessories_count' => (int) $location->accessories_count,
+                'assigned_accessories_count' => (int) $location->assigned_accessories_count,
                'assigned_assets_count' => (int) $location->assigned_assets_count,
                'assets_count'    => (int) $location->assets_count,
                'rtd_assets_count'    => (int) $location->rtd_assets_count,
                'users_count'    => (int) $location->users_count,
                'currency' =>  ($location->currency) ? e($location->currency) : null,
                'ldap_ou' =>  ($location->ldap_ou) ? e($location->ldap_ou) : null,
+                'notes' => Helper::parseEscapedMarkedownInline($location->notes),
                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
                'parent' => ($location->parent) ? [
@@ -76,4 +81,76 @@ class LocationsTransformer
            return $array;
        }
    }
-}
+
+
+    public function transformCheckedoutAccessories($accessory_checkouts, $total)
+    {
+
+        $array = [];
+        foreach ($accessory_checkouts as $checkout) {
+            $array[] = self::transformCheckedoutAccessory($checkout);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checkout)
+    {
+
+            $array = [
+                'id' => $accessory_checkout->id,
+                'assigned_to' => $accessory_checkout->assigned_to,
+                'accessory' => [
+                    'id' => $accessory_checkout->accessory->id,
+                    'name' => $accessory_checkout->accessory->name,
+                ],
+                'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
+                'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
+                'created_by' => $accessory_checkout->adminuser ? [
+                    'id' => (int) $accessory_checkout->adminuser->id,
+                    'name'=> e($accessory_checkout->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
+            ];
+
+            $permissions_array['available_actions'] = [
+                'checkout' => false,
+                'checkin' => Gate::allows('checkin', Accessory::class),
+            ];
+
+            $array += $permissions_array;
+        return $array;
+    }
+
+
+
+    /**
+     * This gives a compact view of the location data without any additional relational queries,
+     * allowing us to 1) deliver a smaller payload and 2) avoid additional queries on relations that
+     * have not been easy/lazy loaded already
+     *
+     * @param Location $location
+     * @return array
+     * @throws \Exception
+     */
+    public function transformLocationCompact(Location $location = null)
+    {
+        if ($location) {
+
+            $array = [
+                'id' => (int) $location->id,
+                'image' =>   ($location->image) ? Storage::disk('public')->url('locations/'.e($location->image)) : null,
+                'type' => "location",
+                'name' => e($location->name),
+                'created_by' => $location->adminuser ? [
+                    'id' => (int) $location->adminuser->id,
+                    'name'=> e($location->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
+            ];
+
+            return $array;
+        }
+    }
+}
@@ -37,6 +37,7 @@ class ManufacturersTransformer
                'consumables_count' => (int) $manufacturer->consumables_count,
                'accessories_count' => (int) $manufacturer->accessories_count,
                'components_count' => (int) $manufacturer->components_count,
+                'notes' => Helper::parseEscapedMarkedownInline($manufacturer->notes),
                'created_by' => ($manufacturer->adminuser) ? [
                    'id' => (int) $manufacturer->adminuser->id,
                    'name'=> e($manufacturer->adminuser->present()->fullName()),
@@ -3,6 +3,7 @@
 namespace App\Http\Transformers;

 use App\Helpers\Helper;
+use App\Models\Asset;
 use App\Models\PredefinedKit;
 use App\Models\SnipeModel;
 use Illuminate\Support\Facades\Gate;
@@ -42,7 +43,7 @@ class PredefinedKitsTransformer
        $permissions_array['available_actions'] = [
            'update' => Gate::allows('update', PredefinedKit::class),
            'delete' => Gate::allows('delete', PredefinedKit::class),
-            'checkout' => Gate::allows('checkout', PredefinedKit::class),
+            'checkout' => Gate::allows('checkout', Asset::class),
            // 'clone' => Gate::allows('create', PredefinedKit::class),
            // 'restore' => Gate::allows('create', PredefinedKit::class),
        ];
@@ -4,8 +4,8 @@ namespace App\Http\Transformers;

 use App\Helpers\Helper;
 use App\Models\User;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Gate;

 class UsersTransformer
 {
@@ -106,6 +106,37 @@ class UsersTransformer
        return $array;
    }

+    /**
+     * This gives a compact view of the user data without any additional relational queries,
+     * allowing us to 1) deliver a smaller payload and 2) avoid additional queries on relations that
+     * have not been easy/lazy loaded already
+     *
+     * @param User $user
+     * @return array
+     * @throws \Exception
+     */
+    public function transformUserCompact(User $user) : array
+    {
+
+        $array = [
+            'id' => (int) $user->id,
+            'image' => e($user->present()->gravatar) ?? null,
+            'type' => 'user',
+            'name' => e($user->getFullNameAttribute()),
+            'first_name' => e($user->first_name),
+            'last_name' => e($user->last_name),
+            'username' => e($user->username),
+            'created_by' => $user->adminuser ? [
+                'id' => (int) $user->adminuser->id,
+                'name'=> e($user->adminuser->present()->fullName),
+            ]: null,
+            'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'),
+            'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null,
+        ];
+
+        return $array;
+    }
+
    public function transformUsersDatatable($users)
    {
        return (new DatatablesTransformer)->transformDatatables($users);
@@ -39,6 +39,7 @@ abstract class Importer
     * @var array
     */
    private $defaultFieldMap = [
+        'id' => 'id',
        'asset_tag' => 'asset tag',
        'activated' => 'activated',
        'category' => 'category',
--- a/Show More
+++ b/Show More