Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json
Updated production assets
2024-07-08 15:53:42 +01:00 · 2024-07-08 15:29:36 +01:00 · 2024-07-08 13:21:38 +01:00 · 2024-07-04 17:10:43 +01:00 · 2024-07-03 23:20:24 +01:00 · 2024-07-02 09:48:32 +01:00
1688 changed files with 12571 additions and 373966 deletions
@@ -3138,37 +3138,10 @@
      ]
    },
    {
-      "login": "FlorentDotMe",
-      "name": "Florent Bervas",
-      "avatar_url": "https://avatars.githubusercontent.com/u/292081?v=4",
-      "profile": "http://spoontux.net",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "dbakan",
-      "name": "Daniel Albertsen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4498077?v=4",
-      "profile": "https://ditscheri.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "r-xyz",
-      "name": "r-xyz",
-      "avatar_url": "https://avatars.githubusercontent.com/u/100710244?v=4",
-      "profile": "https://github.com/r-xyz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "DrekiDegga",
-      "name": "Steven Mainor",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47491036?v=4",
-      "profile": "https://github.com/DrekiDegga",
+      "login": "Galaxy102",
+      "name": "Konstantin Köhring",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18245993?v=4",
+      "profile": "https://www.galaxy102.de",
      "contributions": [
        "code"
      ]
@@ -14,7 +14,7 @@ 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
 APP_TIMEZONE='UTC'
-APP_LOCALE=en-US
+APP_LOCALE=en
 MAX_RESULTS=500

 # --------------------------------------------
@@ -6,7 +6,7 @@ APP_DEBUG=false
 APP_KEY=base64:hTUIUh9CP6dQx+6EjSlfWTgbaMaaRvlpEwk45vp+xmk=
 APP_URL=http://127.0.0.1:8000
 APP_TIMEZONE='US/Eastern'
-APP_LOCALE=en-US
+APP_LOCALE=en
 APP_LOCKED=false
 MAX_RESULTS=200

@@ -87,7 +87,6 @@ SESSION_LIFETIME=12000
 EXPIRE_ON_CLOSE=false
 ENCRYPT=false
 COOKIE_NAME=snipeit_session
-PASSPORT_COOKIE_NAME='snipeit_passport_token'
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
 API_TOKEN_EXPIRATION_YEARS=15
@@ -184,7 +183,6 @@ REPORT_TIME_LIMIT=12000
 REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
-LIVEWIRE_URL_PREFIX=null

 # --------------------------------------------
 # OPTIONAL: HASHING
@@ -36,7 +36,7 @@ jobs:

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.5
+        uses: codacy/codacy-analysis-cli-action@v4.4.1
        with:
          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
          # You can also omit the token and run the tools that support default configurations
@@ -67,4 +67,3 @@ _ide_helper_models.php
 /.phplint-cache
 storage/ldap_client_tls.cert
 storage/ldap_client_tls.key
-/storage/framework/testing
@@ -51,7 +51,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") | [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [<img src="https://avatars.githubusercontent.com/u/5396871?v=4" width="110px;"/><br /><sub>Grant Le Roux</sub>](https://github.com/cram42)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [<img src="https://avatars.githubusercontent.com/u/58479551?v=4" width="110px;"/><br /><sub>Bogdan</sub>](http://@singrity)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [<img src="https://avatars.githubusercontent.com/u/3483684?v=4" width="110px;"/><br /><sub>mmanjos</sub>](https://github.com/mmanjos)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [<img src="https://avatars.githubusercontent.com/u/7429229?v=4" width="110px;"/><br /><sub>Abdelaziz Faki</sub>](https://azooz2014.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") |
 | [<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/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/18245993?v=4" width="110px;"/><br /><sub>Konstantin Köhring</sub>](https://www.galaxy102.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Galaxy102 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -20,7 +20,7 @@ APP_DEBUG=true
 APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
 APP_URL=http://localhost:8000
 APP_TIMEZONE='UTC'
-APP_LOCALE=en-US
+APP_LOCALE=en

 # --------------------------------------------
 # REQUIRED: DATABASE SETTINGS
@@ -251,7 +251,6 @@ class LdapSync extends Command
                    // Creating a new user.
                    $user = new User;
                    $user->password = $user->noPassword();
-                    $user->locale = app()->getLocale();
                    $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
                    $item['createorupdate'] = 'created';
                }
@@ -73,7 +73,6 @@ class ResetDemoSettings extends Command
        $settings->saml_forcelogin = '0';
        $settings->saml_slo = null;
        $settings->saml_custom_settings = null;
-        $settings->default_avatar = 'default.png';


        $settings->save();
@@ -30,11 +30,8 @@ class SQLStreamer {
    public function parse_sql(string $line): string {
        // take into account the 'start of line or not' setting as an instance variable?
        // 'continuation' lines for a permitted statement are PERMITTED.
-        // remove *only* line-feeds & carriage-returns; helpful for regexes against lines from
-        // Windows dumps
-        $line = trim($line, "\r\n");
        if($this->statement_is_permitted && $line[0] === ' ') {
-            return $line . "\n"; //re-add the newline
+            return $line;
        }

        $table_regex = '`?([a-zA-Z0-9_]+)`?';
@@ -45,12 +42,8 @@ class SQLStreamer {
            "/^(INSERT INTO )$table_regex(.*)$/" => false,
            "/^UNLOCK TABLES/" => false,
            // "/^\\) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;/" => false, // FIXME not sure what to do here?
-            "/^\\)[a-zA-Z0-9_= ]*;$/" => false,
-            // ^^^^^^ that bit should *exit* the 'permitted' block
-            "/^\\(.*\\)[,;]$/" => false, //older MySQL dump style with one set of values per line
-            /* 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. */
+            "/^\\)[a-zA-Z0-9_= ]*;$/" => false
+            // ^^^^^^ that bit should *exit* the 'perimitted' black
        ];

        foreach($allowed_statements as $statement => $statechange) {
@@ -74,7 +67,7 @@ class SQLStreamer {
                }
                //how do we *replace* the tablename?
 //                print "RETURNING LINE: $line";
-                return $line . "\n"; //re-add newline
+                return $line;
            }
        }
        // all that is not allowed is denied.
@@ -171,8 +164,7 @@ class RestoreFromBackup extends Command
                                            {filename : The zip file to be migrated}
                                            {--no-progress : Don\'t show a progress bar}
                                            {--sanitize-guess-prefix : Guess and output the table-prefix needed to "sanitize" the SQL}
-                                            {--sanitize-with-prefix= : "Sanitize" the SQL, using the passed-in table prefix (can be learned from --sanitize-guess-prefix). Pass as just \'--sanitize-with-prefix=\' to use no prefix}
-                                            {--sql-stdout-only : ONLY "Sanitize" the SQL and print it to stdout - useful for debugging - probably requires --sanitize-with-prefix= }';
+                                            {--sanitize-with-prefix= : "Sanitize" the SQL, using the passed-in table prefix (can be learned from --sanitize-guess-prefix). Pass as just \'--sanitize-with-prefix=\' to use no prefix}';

    /**
     * The console command description.
@@ -373,15 +365,6 @@ class RestoreFromBackup extends Command
            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitze 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
-        if ($this->option('sql-stdout-only')) {
-            $sql_importer = new SQLStreamer($sql_contents, STDOUT, $this->option('sanitize-with-prefix'));
-            $bytes_read = $sql_importer->line_aware_piping();
-            return $this->warn("$bytes_read total bytes read");
-            //TODO - it'd be nice to dump this message to STDERR so that STDOUT is just pure SQL,
-            // which would be good for redirecting to a file, and not having to trim the last line off of it
-        }
-
        //how to invoke the restore?
        $pipes = [];

@@ -483,9 +466,6 @@ class RestoreFromBackup extends Command
            $ugly_file_name = $za->statIndex($file_details['index'])['name'];
            $fp = $za->getStream($ugly_file_name);
            //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
-            if (!is_dir($file_details['dest'])) {
-                mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
-            }
            $migrated_file = fopen($file_details['dest'].'/'.basename($pretty_file_name), 'w');
            while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
                fwrite($migrated_file, $buffer);
@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Asset;
-use App\Models\CheckoutAcceptance;
-use App\Models\Setting;
-use App\Models\User;
-use App\Notifications\CheckoutAssetNotification;
-use App\Notifications\CurrentInventory;
-use App\Notifications\UnacceptedAssetReminderNotification;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Notification;
-
-class SendAcceptanceReminder extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:acceptance-reminder';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $pending = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')
-                                                ->whereHas('checkoutable', function($query) {
-                                                    $query->where('archived', 0);
-                                                })
-                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.adminuser'])
-                                                ->get();
-
-        $count = 0;
-        $unacceptedAssetGroups = $pending
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset';
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
-            })
-            ->groupBy(function($item) {
-                return $item['acceptance']->assignedTo ? $item['acceptance']->assignedTo->id : '';
-            });
-
-        $no_mail_address = [];
-
-        foreach($unacceptedAssetGroups as $unacceptedAssetGroup) {
-            $item_count = $unacceptedAssetGroup->count();
-            foreach ($unacceptedAssetGroup as $unacceptedAsset) {
-//            if ($unacceptedAsset['acceptance']->assignedTo->email == ''){
-//                $no_mail_address[] = $unacceptedAsset['checkoutable']->assignedTo->present()->fullName;
-//            }
-                if ($unacceptedAsset['acceptance']->assignedTo) {
-
-                    if (!$unacceptedAsset['acceptance']->assignedTo->locale) {
-                        Notification::locale(Setting::getSettings()->locale)->send(
-                            $unacceptedAsset['acceptance']->assignedTo,
-                            new UnacceptedAssetReminderNotification($unacceptedAsset['assetItem'], $count)
-                        );
-                    } else {
-                        Notification::send(
-                            $unacceptedAsset['acceptance']->assignedTo,
-                            new UnacceptedAssetReminderNotification($unacceptedAsset, $item_count)
-                        );
-                    }
-                    $count++;
-                }
-            }
-        }
-
-        if (!empty($no_mail_address)) {
-            foreach($no_mail_address as $user) {
-                return $user.' has no email.';
-            }
-
-
-        }
-
-
-
-        $this->info($count.' users notified.');
-    }
-}
@@ -62,9 +62,8 @@ class Helper
        'mn' => 'mn-MN', // Mongolian
        'ms' => 'ms-MY', // Malay
        'nl' => 'nl-NL', // Dutch
-        'no' => 'nb-NO', // Norwegian Bokmål
+        'no' => 'no-NO', // Norwegian
        'pl' => 'pl-PL', // Polish
-        'pt' => 'pt-PT', // Portuguese
        'ro' => 'ro-RO', // Romanian
        'ru' => 'ru-RU', // Russian
        'sk' => 'sk-SK', // Slovak
@@ -914,22 +913,13 @@ class Helper
        $rules = $class::rules();
        foreach ($rules as $rule_name => $rule) {
            if ($rule_name == $field) {
-                if (is_array($rule)) {
-                    if (in_array('required', $rule)) {
-                       return true;
-                    } else {
-                        return false;
-                    }
+                if (strpos($rule, 'required') === false) {
+                    return false;
                } else {
-                    if (strpos($rule, 'required') === false) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
+                    return true;
+                }
            }
        }
-        return false;
    }

    /**
@@ -1450,6 +1440,7 @@ class Helper

        foreach (self::$language_map as $legacy => $new) {
            if ($language_code == $legacy) {
+                Log::debug('Current language is '.$legacy.', using '.$new.' instead');
                return $new;
            }
        }
@@ -1460,7 +1451,6 @@ class Helper

    public static function mapBackToLegacyLocale($new_locale = null)
    {
-
        if (strlen($new_locale) <= 4) {
            return $new_locale; //"new locale" apparently wasn't quite so new
        }
@@ -1468,73 +1458,42 @@ class Helper
        // This does a *reverse* search against our new language map array - given the value, find the *key* for it
        $legacy_locale = array_search($new_locale, self::$language_map);

-        if ($legacy_locale !== false) {
+        if($legacy_locale !== false) {
            return $legacy_locale;
        }
        return $new_locale; // better that you have some weird locale that doesn't fit into our mappings anywhere than 'void'
    }

-    public static function determineLanguageDirection() {
-        return in_array(app()->getLocale(),
-            [
-                'ar-SA',
-                'fa-IR',
-                'he-IL'
-            ]) ? 'rtl' : 'ltr';
-    }

-
-    static public function getRedirectOption($request, $id, $table, $item_id = null)
+    static public function getRedirectOption($request, $id, $table, $asset_id = null)
    {

        $redirect_option = Session::get('redirect_option');
        $checkout_to_type = Session::get('checkout_to_type');

-        // return to index
-        if ($redirect_option == 'index') {
+        //return to index
+        if ($redirect_option == '0') {
            switch ($table) {
                case "Assets":
-                    return route('hardware.index');
-                case "Users":
-                    return route('users.index');
-                case "Licenses":
-                    return route('licenses.index');
-                case "Accessories":
-                    return route('accessories.index');
-                case "Components":
-                    return route('components.index');
-                case "Consumables":
-                    return route('consumables.index');
+                    return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success'));
            }
        }
-
-        // return to thing being assigned
-        if ($redirect_option == 'item') {
+        //return to thing being assigned
+        if ($redirect_option == '1') {
            switch ($table) {
                case "Assets":
-                    return route('hardware.show', $id ?? $item_id);
-                case "Users":
-                    return route('users.show', $id ?? $item_id);
-                case "Licenses":
-                    return route('licenses.show', $id ?? $item_id);
-                case "Accessories":
-                    return route('accessories.show', $id ?? $item_id);
-                case "Components":
-                    return route('components.show', $id ?? $item_id);
-                case "Consumables":
-                    return route('consumables.show', $id ?? $item_id);
+                    return redirect()->route('hardware.show', $id ? $id : $asset_id)->with('success', trans('admin/hardware/message.checkout.success'));
            }
        }
-
-        // return to assignment target
-        if ($redirect_option == 'target') {
+        //return to thing being assigned to
+        if ($redirect_option == '2') {
            switch ($checkout_to_type) {
                case 'user':
-                    return route('users.show', ['user' => $request->assigned_user]);
+                    return redirect()->route('users.show', $request->assigned_user)->with('success', trans('admin/hardware/message.checkout.success'));
                case 'location':
-                    return route('locations.show', ['location' => $request->assigned_location]);
+                    return redirect()->route('locations.show', $request->assigned_location)->with('success', trans('admin/hardware/message.checkout.success'));
                case 'asset':
-                    return route('hardware.show', ['hardware' => $request->assigned_asset]);
+                    return redirect()->route('hardware.show', $request->assigned_asset)->with('success', trans('admin/hardware/message.checkout.success'));
            }
        }
        return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
@@ -3,13 +3,10 @@
 namespace App\Helpers;

 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\Response;
-use Illuminate\Http\RedirectResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
+
 class StorageHelper
 {
-    public static function downloader($filename, $disk = 'default') : BinaryFileResponse | RedirectResponse | StreamedResponse
+    public static function downloader($filename, $disk = 'default')
    {
        if ($disk == 'default') {
            $disk = config('filesystems.default');
@@ -7,10 +7,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Accessory;
 use App\Models\Company;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use Redirect;
 use Illuminate\Support\Facades\Log;

 /** This controller handles all actions related to Accessories for
@@ -27,10 +27,13 @@ class AccessoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see AccessoriesController::getDatatable() method that generates the JSON response
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('index', Accessory::class);
+
        return view('accessories/index');
    }

@@ -38,8 +41,10 @@ class AccessoriesController extends Controller
     * Returns a view with a form to create a new Accessory.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Accessory::class);
        $category_type = 'accessory';
@@ -53,8 +58,10 @@ class AccessoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize(Accessory::class);
        
@@ -73,17 +80,16 @@ class AccessoriesController extends Controller
        $accessory->purchase_date           = request('purchase_date');
        $accessory->purchase_cost           = request('purchase_cost');
        $accessory->qty                     = request('qty');
-        $accessory->user_id                 = auth()->id();
+        $accessory->user_id                 = Auth::user()->id;
        $accessory->supplier_id             = request('supplier_id');
        $accessory->notes                   = request('notes');

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

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
        // Was the accessory created?
        if ($accessory->save()) {
            // Redirect to the new accessory  page
-            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.create.success'));
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
@@ -94,12 +100,15 @@ class AccessoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $accessoryId
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($accessoryId = null) : View | RedirectResponse
+    public function edit($accessoryId = null)
    {

        if ($item = Accessory::find($accessoryId)) {
            $this->authorize($item);
+
            return view('accessories/edit', compact('item'))->with('category_type', 'accessory');
        }

@@ -113,8 +122,9 @@ class AccessoriesController extends Controller
     * @author [J. Vinsmoke]
     * @param int $accessoryId
     * @since [v6.0]
+     * @return View
     */
-    public function getClone($accessoryId = null) : View | RedirectResponse
+    public function getClone($accessoryId = null)
    {

        $this->authorize('create', Accessory::class);
@@ -141,8 +151,10 @@ class AccessoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param ImageUploadRequest $request
     * @param  int $accessoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(ImageUploadRequest $request, $accessoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, $accessoryId = null)
    {
        if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {

@@ -177,10 +189,9 @@ class AccessoriesController extends Controller

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

-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-
+            // Was the accessory updated?
            if ($accessory->save()) {
-                return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.update.success'));
+                return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
            }
        } else {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
@@ -194,8 +205,10 @@ class AccessoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $accessoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($accessoryId) : RedirectResponse
+    public function destroy($accessoryId)
    {
        if (is_null($accessory = Accessory::find($accessoryId))) {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
@@ -230,8 +243,10 @@ class AccessoriesController extends Controller
     * @param  int $accessoryID
     * @see AccessoriesController::getDataView() method that generates the JSON response
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($accessoryID = null) : View | RedirectResponse
+    public function show($accessoryID = null)
    {
        $accessory = Accessory::withCount('users as users_count')->find($accessoryID);
        $this->authorize('view', $accessory);
@@ -7,13 +7,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\Accessory;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Log;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Response;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Accessory\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Log;

 class AccessoriesFilesController extends Controller
 {
@@ -22,17 +19,20 @@ class AccessoriesFilesController extends Controller
     *
     * @param UploadFileRequest $request
     * @param int $accessoryId
-     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @todo Switch to using the AssetFileRequest form request validator.
     */
-    public function store(UploadFileRequest $request, $accessoryId = null) : RedirectResponse
+    public function store(UploadFileRequest $request, $accessoryId = null)
    {

        if (config('app.lock_passwords')) {
            return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled'));
        }

+
        $accessory = Accessory::find($accessoryId);

        if (isset($accessory->id)) {
@@ -69,8 +69,10 @@ class AccessoriesFilesController extends Controller
     * @since [v1.0]
     * @param int $accessoryId
     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
+    public function destroy($accessoryId = null, $fileId = null)
    {
        $accessory = Accessory::find($accessoryId);

@@ -105,8 +107,10 @@ class AccessoriesFilesController extends Controller
     * @since [v1.4]
     * @param int $accessoryId
     * @param int $fileId
+     * @return \Symfony\Accessory\HttpFoundation\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($accessoryId = null, $fileId = null, $download = true) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse
+    public function show($accessoryId = null, $fileId = null, $download = true)
    {

        Log::debug('Private filesystem is: '.config('filesystems.default'));
@@ -3,14 +3,12 @@
 namespace App\Http\Controllers\Accessories;

 use App\Events\CheckoutableCheckedIn;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
 use App\Models\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;

 class AccessoryCheckinController extends Controller
 {
@@ -21,10 +19,15 @@ class AccessoryCheckinController extends Controller
     * @param Request $request
     * @param int $accessoryUserId
     * @param string $backto
+     * @return View
+     * @internal param int $accessoryId
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($accessoryUserId = null, $backto = null) : View | RedirectResponse
+    public function create($accessoryUserId = null, $backto = null)
    {
+        // Check if the accessory exists
        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

@@ -41,10 +44,15 @@ class AccessoryCheckinController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param null $accessoryUserId
     * @param string $backto
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @internal param int $accessoryId
     */
-    public function store(Request $request, $accessoryUserId = null, $backto = null) : RedirectResponse
+    public function store(Request $request, $accessoryUserId = null, $backto = null)
    {
+        // Check if the accessory exists
        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
        }

@@ -62,11 +70,9 @@ class AccessoryCheckinController extends Controller
        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
            $return_to = e($accessory_user->assigned_to);

-            event(new CheckoutableCheckedIn($accessory, User::find($return_to), auth()->user(), $request->input('note'), $checkin_at));
+            event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note'), $checkin_at));

-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-
-            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.checkin.success'));
+            return redirect()->route('accessories.show', $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
        }
        // Redirect to the accessory management page with error
        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
@@ -3,16 +3,14 @@
 namespace App\Http\Controllers\Accessories;

 use App\Events\CheckoutableCheckedOut;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\AccessoryCheckoutRequest;
 use App\Models\Accessory;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Input;

 class AccessoryCheckoutController extends Controller
 {
@@ -21,8 +19,10 @@ class AccessoryCheckoutController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $id
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id) : View | RedirectResponse
+    public function create($id)
    {

        if ($accessory = Accessory::withCount('users as users_count')->find($id)) {
@@ -58,36 +58,46 @@ class AccessoryCheckoutController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param Request $request
-     * @param  int $accessory
+     * @param  int $accessoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(AccessoryCheckoutRequest $request, Accessory $accessory) : RedirectResponse
+    public function store(Request $request, $accessoryId)
    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found'));
+        }

        $this->authorize('checkout', $accessory);
-        $accessory->assigned_to = $request->input('assigned_to');
-        $user = User::find($request->input('assigned_to'));
-        $accessory->checkout_qty = $request->input('checkout_qty', 1);

-        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
-            $accessory->users()->attach($accessory->id, [
-                'accessory_id' => $accessory->id,
-                'created_at' => Carbon::now(),
-                'user_id' => Auth::id(),
-                'assigned_to' => $request->input('assigned_to'),
-                'note' => $request->input('note'),
-            ]);
+        if (!$user = User::find($request->input('assigned_to'))) {
+            return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
        }
-        event(new CheckoutableCheckedOut($accessory, $user, 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' => 'user']);
-        $request->request->add(['assigned_user' => $user->id]);
+        // Make sure there is at least one available to checkout
+        if ($accessory->numRemaining() <= 0){
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));
+        }

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

+        // Update the accessory data
+        $accessory->assigned_to = e($request->input('assigned_to'));
+
+        $accessory->users()->attach($accessory->id, [
+            'accessory_id' => $accessory->id,
+            'created_at' => Carbon::now(),
+            'user_id' => Auth::id(),
+            'assigned_to' => $request->get('assigned_to'),
+            'note' => $request->input('note'),
+        ]);
+
+        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
+
+        event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));

        // Redirect to the new accessory page
-        return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))
-            ->with('success', trans('admin/accessories/message.checkout.success'));
+        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));
    }
 }
@@ -28,18 +28,20 @@ use Illuminate\Support\Str;
 use App\Http\Controllers\SettingsController;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Carbon\Carbon;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use phpDocumentor\Reflection\Types\Compound;
 use Illuminate\Support\Facades\Log;

 class AcceptanceController extends Controller
 {
    /**
     * Show a listing of pending checkout acceptances for the current user
+     *
+     * @return View
     */
-    public function index() : View
+    public function index()
    {
-        $acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get();
+        $acceptances = CheckoutAcceptance::forUser(Auth::user())->pending()->get();
+
        return view('account/accept.index', compact('acceptances'));
    }

@@ -47,8 +49,9 @@ class AcceptanceController extends Controller
     * Shows a form to either accept or decline the checkout acceptance
     *
     * @param  int  $id
+     * @return mixed
     */
-    public function create($id) : View | RedirectResponse
+    public function create($id)
    {
        $acceptance = CheckoutAcceptance::find($id);

@@ -61,7 +64,7 @@ class AcceptanceController extends Controller
            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
        }

-        if (! $acceptance->isCheckedOutTo(auth()->user())) {
+        if (! $acceptance->isCheckedOutTo(Auth::user())) {
            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
        }

@@ -77,8 +80,9 @@ class AcceptanceController extends Controller
     *
     * @param  Request $request
     * @param  int  $id
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function store(Request $request, $id) : RedirectResponse
+    public function store(Request $request, $id)
    {
        $acceptance = CheckoutAcceptance::find($id);

@@ -90,7 +94,7 @@ class AcceptanceController extends Controller
            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
        }

-        if (! $acceptance->isCheckedOutTo(auth()->user())) {
+        if (! $acceptance->isCheckedOutTo(Auth::user())) {
            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
        }

@@ -3,14 +3,13 @@
 namespace App\Http\Controllers;

 use App\Helpers\Helper;
-use Illuminate\Http\RedirectResponse;
+use App\Models\Actionlog;
+use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use \Illuminate\Http\Response;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class ActionlogController extends Controller
 {
-    public function displaySig($filename) : RedirectResponse | Response | bool
+    public function displaySig($filename)
    {
        // PHP doesn't let you handle file not found errors well with 
        // file_get_contents, so we set the error reporting for just this class
@@ -18,7 +17,6 @@ class ActionlogController extends Controller

        $disk = config('filesystems.default');
        switch (config("filesystems.disks.$disk.driver")) {
-
            case 's3':
                $file = 'private_uploads/signatures/'.$filename;
                return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
@@ -32,15 +30,15 @@ class ActionlogController extends Controller
                    Log::warning('File '.$file.' not found');
                    return false;
                } else {
-                    return response()->make($contents)->header('Content-Type', $filetype);
+                    return Response::make($contents)->header('Content-Type', $filetype);
                }
        }
    }

-    public function getStoredEula($filename) : Response | BinaryFileResponse
-    {
+    public function getStoredEula($filename){
        $this->authorize('view', \App\Models\Asset::class);
        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
-        return response()->download($file);
+
+        return Response::download($file);
    }
 }
@@ -5,8 +5,6 @@ namespace App\Http\Controllers\Api;
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\AccessoryCheckoutRequest;
-use App\Http\Requests\StoreAccessoryRequest;
 use App\Http\Transformers\AccessoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Accessory;
@@ -18,7 +16,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;

-
 class AccessoriesController extends Controller
 {
    /**
@@ -123,12 +120,12 @@ class AccessoriesController extends Controller
    /**
     * Store a newly created resource in storage.
     *
-     * @param  \App\Http\Requests\ImageUploadRequest $request
-     * @return \Illuminate\Http\JsonResponse
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(StoreAccessoryRequest $request)
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Accessory::class);
        $accessory = new Accessory;
@@ -146,10 +143,10 @@ class AccessoriesController extends Controller
    /**
     * Display the specified resource.
     *
-     * @param  int  $id
-     * @return array
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
    public function show($id)
    {
@@ -163,10 +160,10 @@ class AccessoriesController extends Controller
    /**
     * Display the specified resource.
     *
-     * @param  int  $id
-     * @return array
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
    public function accessory_detail($id)
    {
@@ -275,31 +272,43 @@ class AccessoriesController extends Controller
     * If Slack is enabled and/or asset acceptance is enabled, it will also
     * trigger a Slack message and send an email.
     *
-     * @param  int  $accessoryId
-     * @return \Illuminate\Http\JsonResponse
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int  $accessoryId
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory)
+    public function checkout(Request $request, $accessoryId)
    {
-        $this->authorize('checkout', $accessory);
-        $accessory->assigned_to = $request->input('assigned_to');
-        $user = User::find($request->input('assigned_to'));
-        $accessory->checkout_qty = $request->input('checkout_qty', 1);
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
+        }
+
+        $this->authorize('checkout', $accessory);
+
+
+        if ($accessory->numRemaining() > 0) {
+
+            if (! $user = User::find($request->input('assigned_to'))) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkout.user_does_not_exist')));
+            }
+
+            // Update the accessory data
+            $accessory->assigned_to = $request->input('assigned_to');

-        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
            $accessory->users()->attach($accessory->id, [
                'accessory_id' => $accessory->id,
                'created_at' => Carbon::now(),
                'user_id' => Auth::id(),
-                'assigned_to' => $request->input('assigned_to'),
-                'note' => $request->input('note'),
+                'assigned_to' => $request->get('assigned_to'),
+                'note' => $request->get('note'),
            ]);
+
+            event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
+
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
        }

-        // Set this value to be able to pass the qty through to the event
-        event(new CheckoutableCheckedOut($accessory, $user, auth()->user(), $request->input('note')));
-
-        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'No accessories remaining'));

    }

@@ -4,15 +4,28 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\StorageHelper;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Gate;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
+use App\Models\AssetModel;
 use App\Models\Actionlog;
+use \Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use DB;
+use Illuminate\Http\Request;
 use App\Http\Requests\UploadFileRequest;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Input;
+use Paginator;
+use Slack;
+use Str;
+use TCPDF;
+use Validator;
+use Route;


 /**
@@ -31,10 +44,12 @@ class AssetFilesController extends Controller
     *
     * @param \App\Http\Requests\UploadFileRequest $request
     * @param int $assetId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function store(UploadFileRequest $request, $assetId = null) : JsonResponse
+    public function store(UploadFileRequest $request, $assetId = null)
    {
        // Start by checking if the asset being acted upon exists
        if (! $asset = Asset::find($assetId)) {
@@ -44,7 +59,7 @@ class AssetFilesController extends Controller
        // Make sure we are allowed to update this asset
        $this->authorize('update', $asset);

-	    if ($request->hasFile('file')) {
+	if ($request->hasFile('file')) {
            // If the file storage directory doesn't exist; create it
            if (! Storage::exists('private_uploads/assets')) {
                Storage::makeDirectory('private_uploads/assets', 775);
@@ -69,10 +84,12 @@ class AssetFilesController extends Controller
     * List the files for an asset.
     *
     * @param  int $assetId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function list($assetId = null) : JsonResponse
+    public function list($assetId = null)
    {
        // Start by checking if the asset being acted upon exists
        if (! $asset = Asset::find($assetId)) {
@@ -111,7 +128,7 @@ class AssetFilesController extends Controller
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function show($assetId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    public function show($assetId = null, $fileId = null)
    {
        // Start by checking if the asset being acted upon exists
        if (! $asset = Asset::find($assetId)) {
@@ -129,7 +146,7 @@ class AssetFilesController extends Controller

 	    // Form the full filename with path
            $file = 'private_uploads/assets/'.$log->filename;
-            Log::debug('Checking for '.$file);
+            \Log::debug('Checking for '.$file);

            if ($log->action_type == 'audit') {
                $file = 'private_uploads/audits/'.$log->filename;
@@ -161,10 +178,12 @@ class AssetFilesController extends Controller
     *
     * @param  int $assetId
     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function destroy($assetId = null, $fileId = null) : JsonResponse
+    public function destroy($assetId = null, $fileId = null)
    {
        // Start by checking if the asset being acted upon exists
        if (! $asset = Asset::find($assetId)) {
@@ -9,8 +9,9 @@ use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Input;

 /**
 * This controller handles all actions related to Asset Maintenance for
@@ -21,6 +22,7 @@ use Illuminate\Http\JsonResponse;
 class AssetMaintenancesController extends Controller
 {

+
    /**
     *  Generates the JSON response for asset maintenances listing view.
     *
@@ -28,8 +30,9 @@ class AssetMaintenancesController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
+     * @return string JSON
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Asset::class);

@@ -117,8 +120,9 @@ class AssetMaintenancesController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
+     * @return string JSON
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('update', Asset::class);
        // create a new model instance
@@ -144,8 +148,9 @@ class AssetMaintenancesController extends Controller
     * @param int $request
     * @version v1.0
     * @since [v4.0]
+     * @return string JSON
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Asset::class);

@@ -181,8 +186,9 @@ class AssetMaintenancesController extends Controller
     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v4.0]
+     * @return string JSON
     */
-    public function destroy($assetMaintenanceId) : JsonResponse
+    public function destroy($assetMaintenanceId)
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
@@ -206,8 +212,9 @@ class AssetMaintenancesController extends Controller
     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v4.0]
+     * @return string JSON
     */
-    public function show($assetMaintenanceId) : JsonResponse
+    public function show($assetMaintenanceId)
    {
        $this->authorize('view', Asset::class);
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
@@ -4,16 +4,15 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreAssetModelRequest;
 use App\Http\Transformers\AssetModelsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use Illuminate\Http\Request;
+use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\JsonResponse;

 /**
 * This class controls all actions related to asset models for
@@ -29,8 +28,9 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', AssetModel::class);
        $allowed_columns =
@@ -116,9 +116,10 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\StoreAssetModelRequest  $request
+     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(StoreAssetModelRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', AssetModel::class);
        $assetmodel = new AssetModel;
@@ -139,8 +140,9 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) :  array
+    public function show($id)
    {
        $this->authorize('view', AssetModel::class);
        $assetmodel = AssetModel::withCount('assets as assets_count')->findOrFail($id);
@@ -154,8 +156,9 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function assets($id) : array
+    public function assets($id)
    {
        $this->authorize('view', AssetModel::class);
        $assets = Asset::where('model_id', '=', $id)->get();
@@ -173,7 +176,7 @@ class AssetModelsController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(StoreAssetModelRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', AssetModel::class);
        $assetmodel = AssetModel::findOrFail($id);
@@ -206,8 +209,9 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', AssetModel::class);
        $assetmodel = AssetModel::findOrFail($id);
@@ -237,7 +241,7 @@ class AssetModelsController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $this->authorize('view.selectlists');
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api;

 use App\Events\CheckoutableCheckedIn;
 use App\Http\Requests\StoreAssetRequest;
-use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
@@ -26,12 +25,17 @@ use App\Models\License;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
+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 Paginator;
+use Slack;
+use Str;
+use TCPDF;
+use Validator;
 use Illuminate\Support\Facades\Route;


@@ -52,8 +56,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array
+    public function index(Request $request, $action = null, $upcoming_status = null)
    {

        $filter_non_deprecable_assets = false;
@@ -410,8 +415,9 @@ class AssetsController extends Controller
     * @param string $tag
     * @since [v4.2.1]
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function showByTag(Request $request, $tag) : JsonResponse | array
+    public function showByTag(Request $request, $tag)
    {
        $this->authorize('index', Asset::class);
        $assets = Asset::where('asset_tag', $tag)->with('assetstatus')->with('assignedTo');
@@ -449,7 +455,7 @@ class AssetsController extends Controller
     * @since [v4.2.1]
     * @return \Illuminate\Http\JsonResponse
     */
-    public function showBySerial(Request $request, $serial) : JsonResponse | array
+    public function showBySerial(Request $request, $serial)
    {
        $this->authorize('index', Asset::class);
        $assets = Asset::where('serial', $serial)->with('assetstatus')->with('assignedTo');
@@ -476,20 +482,19 @@ class AssetsController extends Controller
     * @since [v4.0]
     * @return \Illuminate\Http\JsonResponse
     */
-    public function show(Request $request, $id) : JsonResponse | array
+    public function show(Request $request, $id)
    {
-        if ($asset = Asset::with('assetstatus')
-            ->with('assignedTo')->withTrashed()
-            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->find($id)) {
+        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()
+            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->findOrFail($id)) {
            $this->authorize('view', $asset);

            return (new AssetsTransformer)->transformAsset($asset, $request->input('components') );
        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+

    }

-    public function licenses(Request $request, $id) : array
+    public function licenses(Request $request, $id)
    {
        $this->authorize('view', Asset::class);
        $this->authorize('view', License::class);
@@ -506,8 +511,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $assets = Asset::select([
@@ -632,7 +638,7 @@ class AssetsController extends Controller
                $target = Location::find(request('assigned_location'));
            }
            if (isset($target)) {
-                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
+                $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
            }

            if ($asset->image) {
@@ -652,35 +658,37 @@ class AssetsController extends Controller
     * Accepts a POST request to update an asset
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param \App\Http\Requests\ImageUploadRequest $request
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
-        $asset->fill($request->validated());
+        $this->authorize('update', Asset::class);

-        if ($request->has('model_id')) {
-            $asset->model()->associate(AssetModel::find($request->validated()['model_id']));
-        }
-        if ($request->has('company_id')) {
-            $asset->company_id = Company::getIdForCurrentUser($request->validated()['company_id']);
-        }
-        if ($request->has('rtd_location_id') && !$request->has('location_id')) {
-            $asset->location_id = $request->validated()['rtd_location_id'];
-        }
-        if ($request->input('last_audit_date')) {
-            $asset->last_audit_date = Carbon::parse($request->input('last_audit_date'))->startOfDay()->format('Y-m-d H:i:s');
-        }
+        if ($asset = Asset::find($id)) {
+            $asset->fill($request->all());

-        /**
-        * this is here just legacy reasons. Api\AssetController
-        * used image_source  once to allow encoded image uploads.
-        */
-        if ($request->has('image_source')) {
-            $request->offsetSet('image', $request->offsetGet('image_source'));
-        }
+            ($request->filled('model_id')) ?
+                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : null;
+            ($request->filled('rtd_location_id')) ?
+                $asset->location_id = $request->get('rtd_location_id') : '';
+            ($request->filled('company_id')) ?
+                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';

-        $asset = $request->handleImages($asset);
-        $model = $asset->model;
+            ($request->filled('rtd_location_id')) ?
+                $asset->location_id = $request->get('rtd_location_id') : null;
+
+            /**
+            * this is here just legacy reasons. Api\AssetController
+            * used image_source  once to allow encoded image uploads.
+            */
+            if ($request->has('image_source')) {
+                $request->offsetSet('image', $request->offsetGet('image_source'));
+            }     
+
+            $asset = $request->handleImages($asset);
+            $model = AssetModel::find($asset->model_id);
            
            // Update custom fields
            $problems_updating_encrypted_custom_fields = false;
@@ -706,33 +714,39 @@ class AssetsController extends Controller
                    }
                }
            }
+
+
            if ($asset->save()) {
                if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
                        $location = $target->location_id;
                } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
                    $location = $target->location_id;

-                    Asset::where('assigned_type', \App\Models\Asset::class)->where('assigned_to', $asset->id)
+                    Asset::where('assigned_type', \App\Models\Asset::class)->where('assigned_to', $id)
                        ->update(['location_id' => $target->location_id]);
                } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                    $location = $target->id;
                }

                if (isset($target)) {
-                    $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
+                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
                }

                if ($asset->image) {
                    $asset->image = $asset->getImageUrl();
                }

-            if ($problems_updating_encrypted_custom_fields) {
-                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
-            } else {
-                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+                if ($problems_updating_encrypted_custom_fields) {
+                    return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
+                } else {
+                    return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+                }
            }
+
+            return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
    }


@@ -742,8 +756,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Asset::class);

@@ -770,8 +785,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v5.1.18]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function restore(Request $request, $assetId = null) : JsonResponse
+    public function restore(Request $request, $assetId = null)
    {

        if ($asset = Asset::withTrashed()->find($assetId)) {
@@ -799,8 +815,9 @@ class AssetsController extends Controller
     * @author [N. Butler]
     * @param string $tag
     * @since [v6.0.5]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function checkoutByTag(AssetCheckoutRequest $request, $tag) : JsonResponse
+    public function checkoutByTag(AssetCheckoutRequest $request, $tag)
    {
        if ($asset = Asset::where('asset_tag', $tag)->first()) {
            return $this->checkout($request, $asset->id);
@@ -814,8 +831,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function checkout(AssetCheckoutRequest $request, $asset_id) : JsonResponse
+    public function checkout(AssetCheckoutRequest $request, $asset_id)
    {
        $this->authorize('checkout', Asset::class);
        $asset = Asset::findOrFail($asset_id);
@@ -877,7 +895,7 @@ class AssetsController extends Controller
 //            $asset->location_id = $target->rtd_location_id;
 //        }

-        if ($asset->checkOut($target, auth()->user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
+        if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
        }

@@ -891,8 +909,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function checkin(Request $request, $asset_id) : JsonResponse
+    public function checkin(Request $request, $asset_id)
    {
        $asset = Asset::with('model')->findOrFail($asset_id);
        $this->authorize('checkin', $asset);
@@ -957,7 +976,7 @@ class AssetsController extends Controller
            });

        if ($asset->save()) {
-            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
+            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues));

            return response()->json(Helper::formatStandardApiResponse('success', [
                'asset_tag'=> e($asset->asset_tag),
@@ -974,8 +993,9 @@ class AssetsController extends Controller
     *
     * @author [A. Janes] [<ajanes@adagiohealth.org>]
     * @since [v6.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function checkinByTag(Request $request, $tag = null) : JsonResponse
+    public function checkinByTag(Request $request, $tag = null)
    {
        $this->authorize('checkin', Asset::class);
        if(null == $tag && null !== ($request->input('asset_tag'))) {
@@ -999,8 +1019,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $id
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function audit(Request $request) : JsonResponse
+    public function audit(Request $request)

    {
        $this->authorize('audit', Asset::class);
@@ -1091,8 +1112,9 @@ class AssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function requestable(Request $request) : JsonResponse | array
+    public function requestable(Request $request)
    {
        $this->authorize('viewRequestable', Asset::class);

@@ -8,9 +8,9 @@ use App\Http\Transformers\CategoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Category;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;

 class CategoriesController extends Controller
 {
@@ -21,7 +21,7 @@ class CategoriesController extends Controller
     * @since [v4.0]
     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : array
+    public function index(Request $request)
    {
        $this->authorize('view', Category::class);
        $allowed_columns = [
@@ -115,7 +115,7 @@ class CategoriesController extends Controller
     * @param  \App\Http\Requests\ImageUploadRequest $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Category::class);
        $category = new Category;
@@ -136,8 +136,9 @@ class CategoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Category::class);
        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
@@ -155,7 +156,7 @@ class CategoriesController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Category::class);
        $category = Category::findOrFail($id);
@@ -163,7 +164,7 @@ class CategoriesController extends Controller
        // Don't allow the user to change the category_type once it's been created
        if (($request->filled('category_type')) && ($category->category_type != $request->input('category_type'))) {
            return response()->json(
-                Helper::formatStandardApiResponse('error', null,  ['category_type' => trans('admin/categories/message.update.cannot_change_category_type')], 422)
+                Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.update.cannot_change_category_type'))
            );
        }
        $category->fill($request->all());
@@ -184,7 +185,7 @@ class CategoriesController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Category::class);
        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
@@ -207,7 +208,7 @@ class CategoriesController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request, $category_type = 'asset') : array
+    public function selectlist(Request $request, $category_type = 'asset')
    {
        $this->authorize('view.selectlists');
        $categories = Category::select([
@@ -10,7 +10,6 @@ use App\Models\Company;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;

 class CompaniesController extends Controller
 {
@@ -19,8 +18,9 @@ class CompaniesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Company::class);

@@ -79,8 +79,9 @@ class CompaniesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Company::class);
        $company = new Company;
@@ -101,8 +102,9 @@ class CompaniesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Company::class);
        $company = Company::findOrFail($id);
@@ -118,8 +120,9 @@ class CompaniesController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Company::class);
        $company = Company::findOrFail($id);
@@ -141,8 +144,9 @@ class CompaniesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Company::class);
        $company = Company::findOrFail($id);
@@ -165,7 +169,7 @@ class CompaniesController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        $this->authorize('view.selectlists');
        $companies = Company::select([
@@ -5,17 +5,16 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ComponentsTransformer;
+use App\Models\Company;
 use App\Models\Component;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use App\Events\CheckoutableCheckedIn;
+use App\Events\ComponentCheckedIn;
 use App\Models\Asset;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\DB;
-use Carbon\Carbon;

 class ComponentsController extends Controller
 {
@@ -25,8 +24,9 @@ class ComponentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     *
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Component::class);

@@ -116,8 +116,9 @@ class ComponentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Component::class);
        $component = new Component;
@@ -136,8 +137,9 @@ class ComponentsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Component::class);
        $component = Component::findOrFail($id);
@@ -154,8 +156,9 @@ class ComponentsController extends Controller
     * @since [v4.0]
     * @param   \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Component::class);
        $component = Component::findOrFail($id);
@@ -176,8 +179,9 @@ class ComponentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Component::class);
        $component = Component::findOrFail($id);
@@ -194,8 +198,9 @@ class ComponentsController extends Controller
     * @since [v4.0]
     * @param Request $request
     * @param int $id
+     * @return \Illuminate\Http\Response
    */
-    public function getAssets(Request $request, $id) : array
+    public function getAssets(Request $request, $id)
    {
        $this->authorize('view', \App\Models\Asset::class);
        
@@ -236,8 +241,10 @@ class ComponentsController extends Controller
     * @since [v5.1.8]
     * @param Request $request
     * @param int $componentId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function checkout(Request $request, $componentId) : JsonResponse
+    public function checkout(Request $request, $componentId)
    {
        // Check if the component exists
        if (!$component = Component::find($componentId)) {
@@ -268,9 +275,9 @@ class ComponentsController extends Controller

            $component->assets()->attach($component->id, [
                'component_id' => $component->id,
-                'created_at' => Carbon::now(),
+                'created_at' => \Carbon::now(),
                'assigned_qty' => $request->get('assigned_qty', 1),
-                'user_id' => auth()->id(),
+                'user_id' => \Auth::id(),
                'asset_id' => $request->get('assigned_to'),
                'note' => $request->get('note'),
            ]);
@@ -290,10 +297,12 @@ class ComponentsController extends Controller
     * @since [v5.1.8]
     * @param Request $request
     * @param $component_asset_id
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function checkin(Request $request, $component_asset_id) : JsonResponse
+    public function checkin(Request $request, $component_asset_id)
    {
-        if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
+        if ($component_assets = \DB::table('components_assets')->find($component_asset_id)) {

            if (is_null($component = Component::find($component_assets->component_id))) {

@@ -306,7 +315,7 @@ class ComponentsController extends Controller

            if ($max_to_checkin > 1) {
                
-                $validator = Validator::make($request->all(), [
+                $validator = \Validator::make($request->all(), [
                    "checkin_qty" => "required|numeric|between:1,$max_to_checkin"
                ]);
    
@@ -325,19 +334,19 @@ class ComponentsController extends Controller

            Log::debug($component_asset_id.' - '.$qty_remaining_in_checkout.' remaining in record '.$component_assets->id);
            
-            DB::table('components_assets')->where('id',
+            \DB::table('components_assets')->where('id',
                $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);

            // If the checked-in qty is exactly the same as the assigned_qty,
            // we can simply delete the associated components_assets record
            if ($qty_remaining_in_checkout == 0) {
-                DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
+                \DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
            }
            

            $asset = Asset::find($component_assets->asset_id);

-            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
+            event(new CheckoutableCheckedIn($component, $asset, \Auth::user(), $request->input('note'), \Carbon::now()));

            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/components/message.checkin.success')));

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreConsumableRequest;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
@@ -13,8 +12,8 @@ use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\JsonResponse;

 class ConsumablesController extends Controller
 {
@@ -23,13 +22,34 @@ class ConsumablesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     *
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : array
+    public function index(Request $request)
    {
        $this->authorize('index', Consumable::class);

-        $consumables = Consumable::with('company', 'location', 'category', 'supplier', 'manufacturer')
-            ->withCount('users as consumables_users_count');
+        // This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations
+        // Relations will be handled in query scopes a little further down.
+        $allowed_columns = 
+            [
+                'id',
+                'name',
+                'order_number',
+                'min_amt',
+                'purchase_date',
+                'purchase_cost',
+                'company',
+                'category',
+                'model_number', 
+                'item_no', 
+                'qty',
+                'image',
+                'notes',
+                ];
+
+        $consumables = Consumable::select('consumables.*')
+            ->with('company', 'location', 'category', 'users', 'manufacturer');

        if ($request->filled('search')) {
            $consumables = $consumables->TextSearch(e($request->input('search')));
@@ -71,9 +91,15 @@ class ConsumablesController extends Controller
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : app('api_offset_value');
        $limit = app('api_limit_value');
+
+        $allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image'];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

-        switch ($request->input('sort')) {
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+
+
+        switch ($sort_override) {
            case 'category':
                $consumables = $consumables->OrderCategory($order);
                break;
@@ -87,30 +113,10 @@ class ConsumablesController extends Controller
                $consumables = $consumables->OrderCompany($order);
                break;
            case 'supplier':
-                $consumables = $consumables->OrderSupplier($order);
+                $components = $consumables->OrderSupplier($order);
                break;
            default:
-                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
-                // These must match a column on the consumables table directly.
-                $allowed_columns = [
-                    'id',
-                    'name',
-                    'order_number',
-                    'min_amt',
-                    'purchase_date',
-                    'purchase_cost',
-                    'company',
-                    'category',
-                    'model_number',
-                    'item_no',
-                    'manufacturer',
-                    'location',
-                    'qty',
-                    'image'
-                ];
-
-                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-                $consumables = $consumables->orderBy($sort, $order);
+                $consumables = $consumables->orderBy($column_sort, $order);
                break;
        }

@@ -126,8 +132,9 @@ class ConsumablesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(StoreConsumableRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Consumable::class);
        $consumable = new Consumable;
@@ -146,8 +153,9 @@ class ConsumablesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Consumable::class);
        $consumable = Consumable::with('users')->findOrFail($id);
@@ -162,8 +170,9 @@ class ConsumablesController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest $request
     * @param  int $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(StoreConsumableRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Consumable::class);
        $consumable = Consumable::findOrFail($id);
@@ -183,8 +192,9 @@ class ConsumablesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Consumable::class);
        $consumable = Consumable::findOrFail($id);
@@ -201,8 +211,9 @@ class ConsumablesController extends Controller
    * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form.
    * @since [v1.0]
    * @param int $consumableId
+    * @return array
     */
-    public function getDataView($consumableId) : array
+    public function getDataView($consumableId)
    {
        $consumable = Consumable::with(['consumableAssignments'=> function ($query) {
            $query->orderBy($query->getModel()->getTable().'.created_at', 'DESC');
@@ -241,8 +252,9 @@ class ConsumablesController extends Controller
     * @author [A. Gutierrez] [<andres@baller.tv>]
     * @param int $id
     * @since [v4.9.5]
+     * @return JsonResponse
     */
-    public function checkout(Request $request, $id) : JsonResponse
+    public function checkout(Request $request, $id)
    {
        // Check if the consumable exists
        if (!$consumable = Consumable::with('users')->find($id)) {
@@ -266,6 +278,7 @@ class ConsumablesController extends Controller
        if (!$user = User::find($request->input('assigned_to'))) {
            // Return error message
            return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
+            Log::debug('No valid user');
        }

        // Update the consumable data
@@ -280,7 +293,7 @@ class ConsumablesController extends Controller
                ]
            );

-        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));
+        event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));

        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));

@@ -291,7 +304,7 @@ class ConsumablesController extends Controller
    *
    * @see \App\Http\Transformers\SelectlistTransformer
    */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        $consumables = Consumable::select([
            'consumables.id',
@@ -8,8 +8,7 @@ use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Http\JsonResponse;
+use Validator;

 class CustomFieldsController extends Controller
 {
@@ -21,7 +20,7 @@ class CustomFieldsController extends Controller
     * @since [v3.0]
     * @return array
     */
-    public function index() : array
+    public function index()
    {
        $this->authorize('index', CustomField::class);
        $fields = CustomField::get();
@@ -34,8 +33,9 @@ class CustomFieldsController extends Controller
     * @author [V. Cordes] [<volker@fdatek.de>]
     * @param int $id
     * @since [v4.1.10]
+     * @return View
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', CustomField::class);
        if ($field = CustomField::find($id)) {
@@ -52,8 +52,9 @@ class CustomFieldsController extends Controller
     * @since [v4.1.10]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', CustomField::class);
        $field = CustomField::findOrFail($id);
@@ -85,8 +86,9 @@ class CustomFieldsController extends Controller
     * @author [V. Cordes] [<volker@fdatek.de>]
     * @since [v4.1.10]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('create', CustomField::class);
        $field = new CustomField;
@@ -134,7 +136,7 @@ class CustomFieldsController extends Controller
        return $fieldset->fields()->sync($fields);
    }

-    public function associate(Request $request, $field_id) : JsonResponse
+    public function associate(Request $request, $field_id)
    {
        $this->authorize('update', CustomFieldset::class);

@@ -153,9 +155,10 @@ class CustomFieldsController extends Controller
        return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
    }

-    public function disassociate(Request $request, $field_id) : JsonResponse
+    public function disassociate(Request $request, $field_id)
    {
        $this->authorize('update', CustomFieldset::class);
+
        $field = CustomField::findOrFail($field_id);

        $fieldset_id = $request->input('fieldset_id');
@@ -176,8 +179,9 @@ class CustomFieldsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy($field_id) : JsonResponse
+    public function destroy($field_id)
    {
        $field = CustomField::findOrFail($field_id);

@@ -9,7 +9,8 @@ use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomFieldset;
 use App\Models\CustomField;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
+use Redirect;
+use View;

 /**
 * This controller handles all actions related to Custom Asset Fieldsets for
@@ -29,8 +30,9 @@ class CustomFieldsetsController extends Controller
     * @author [Josh Gibson]
     * @param int $id
     * @since [v1.8]
+     * @return View
     */
-    public function index() : array
+    public function index()
    {
        $this->authorize('index', CustomField::class);
        $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
@@ -44,8 +46,9 @@ class CustomFieldsetsController extends Controller
     * @author [Josh Gibson]
     * @param int $id
     * @since [v1.8]
+     * @return View
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', CustomField::class);
        if ($fieldset = CustomFieldset::find($id)) {
@@ -62,8 +65,9 @@ class CustomFieldsetsController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', CustomField::class);
        $fieldset = CustomFieldset::findOrFail($id);
@@ -82,8 +86,9 @@ class CustomFieldsetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('create', CustomField::class);
        $fieldset = new CustomFieldset;
@@ -113,8 +118,9 @@ class CustomFieldsetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', CustomField::class);
        $fieldset = CustomFieldset::findOrFail($id);
@@ -141,7 +147,7 @@ class CustomFieldsetsController extends Controller
     * @param $fieldsetId
     * @return string JSON
     */
-    public function fields($id) : array
+    public function fields($id)
    {
        $this->authorize('view', CustomField::class);
        $set = CustomFieldset::findOrFail($id);
@@ -158,11 +164,14 @@ class CustomFieldsetsController extends Controller
     * @param $fieldsetId
     * @return string JSON
     */
-    public function fieldsWithDefaultValues($fieldsetId, $modelId) : array
+    public function fieldsWithDefaultValues($fieldsetId, $modelId)
    {
        $this->authorize('view', CustomField::class);
+
        $set = CustomFieldset::findOrFail($fieldsetId);
+
        $fields = $set->fields;
+
        return (new CustomFieldsTransformer)->transformCustomFieldsWithDefaultValues($fields, $modelId, $fields->count());
    }
 }
@@ -6,11 +6,12 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\DepartmentsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Company;
 use App\Models\Department;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;

 class DepartmentsController extends Controller
 {
@@ -19,8 +20,9 @@ class DepartmentsController extends Controller
     *
     * @author [Godfrey Martinez] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Department::class);
        $allowed_columns = ['id', 'name', 'image', 'users_count'];
@@ -89,15 +91,16 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Department::class);
        $department = new Department;
        $department->fill($request->all());
        $department = $request->handleImages($department);

-        $department->user_id = auth()->id();
+        $department->user_id = Auth::user()->id;
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);

        if ($department->save()) {
@@ -113,11 +116,13 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Department::class);
        $department = Department::findOrFail($id);
+
        return (new DepartmentsTransformer)->transformDepartment($department);
    }

@@ -128,8 +133,9 @@ class DepartmentsController extends Controller
     * @since [v5.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Department::class);
        $department = Department::findOrFail($id);
@@ -150,8 +156,9 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $locationId
     * @since [v4.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $department = Department::findOrFail($id);

@@ -173,7 +180,7 @@ class DepartmentsController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $this->authorize('view.selectlists');
@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\DepreciationsTransformer;
 use App\Models\Depreciation;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;

 class DepreciationsController extends Controller
 {
@@ -16,8 +15,9 @@ class DepreciationsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Depreciation::class);
        $allowed_columns = ['id','name','months','depreciation_min','created_at'];
@@ -48,8 +48,9 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('create', Depreciation::class);
        $depreciation = new Depreciation;
@@ -68,8 +69,9 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', Depreciation::class);
        $depreciation = Depreciation::findOrFail($id);
@@ -84,8 +86,9 @@ class DepreciationsController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Depreciation::class);
        $depreciation = Depreciation::findOrFail($id);
@@ -104,8 +107,9 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Depreciation::class);
        $depreciation = Depreciation::withCount('models as models_count')->findOrFail($id);
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\GroupsTransformer;
 use App\Models\Group;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Auth;


 class GroupsController extends Controller
@@ -17,8 +17,9 @@ class GroupsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('superadmin');

@@ -55,8 +56,9 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('superadmin');
        $group = new Group;
@@ -65,7 +67,7 @@ class GroupsController extends Controller
        $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);

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

        if ($group->save()) {
@@ -81,8 +83,9 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('superadmin');
        $group = Group::findOrFail($id);
@@ -96,8 +99,9 @@ class GroupsController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('superadmin');
        $group = Group::findOrFail($id);
@@ -118,8 +122,9 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('superadmin');
        $group = Group::findOrFail($id);
@@ -17,15 +17,15 @@ use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\JsonResponse;

 class ImportController extends Controller
 {
    /**
     * Display a listing of the resource.
     *
+     * @return \Illuminate\Http\Response
     */
-    public function index() : JsonResponse | array
+    public function index()
    {
        $this->authorize('import');
        $imports = Import::latest()->get();
@@ -37,8 +37,9 @@ class ImportController extends Controller
     * Process and store a CSV upload file.
     *
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function store() : JsonResponse
+    public function store()
    {
        $this->authorize('import');
        if (! config('app.lock_passwords')) {
@@ -151,8 +152,9 @@ class ImportController extends Controller
     * Processes the specified Import.
     *
     * @param  int  $import_id
+     * @return \Illuminate\Http\Response
     */
-    public function process(ItemImportRequest $request, $import_id) : JsonResponse
+    public function process(ItemImportRequest $request, $import_id)
    {
        $this->authorize('import');

@@ -210,8 +212,9 @@ class ImportController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $import_id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($import_id) : JsonResponse
+    public function destroy($import_id)
    {
        $this->authorize('create', Asset::class);

@@ -228,8 +231,6 @@ class ImportController extends Controller

                return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
            }
-
        }
-        return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
    }
 }
@@ -8,7 +8,7 @@ use App\Http\Transformers\LabelsTransformer;
 use App\Models\Labels\Label;
 use Illuminate\Http\Request;
 use Illuminate\Support\ItemNotFoundException;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Auth;

 class LabelsController extends Controller
 {
@@ -16,8 +16,9 @@ class LabelsController extends Controller
     * Returns JSON listing of all labels.
     *
     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
+     * @return JsonResponse
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Label::class);

@@ -49,8 +50,9 @@ class LabelsController extends Controller
     *
     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
     * @param  string  $labelName
+     * @return JsonResponse
     */
-    public function show(string $labelName) : JsonResponse | array
+    public function show(string $labelName)
    {
        $labelName = str_replace('/', '\\', $labelName);
        try {
@@ -9,7 +9,7 @@ use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;

 class LicenseSeatsController extends Controller
@@ -19,10 +19,11 @@ class LicenseSeatsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $licenseId
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request, $licenseId) : JsonResponse | array
+    public function index(Request $request, $licenseId)
    {
-
+        //
        if ($license = License::find($licenseId)) {
            $this->authorize('view', $license);

@@ -63,10 +64,11 @@ class LicenseSeatsController extends Controller
     *
     * @param  int  $licenseId
     * @param  int  $seatId
+     * @return \Illuminate\Http\Response
     */
-    public function show($licenseId, $seatId) : JsonResponse | array
+    public function show($licenseId, $seatId)
    {
-
+        //
        $this->authorize('view', License::class);
        // sanity checks:
        // 1. does the license seat exist?
@@ -87,18 +89,19 @@ class LicenseSeatsController extends Controller
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $licenseId
     * @param  int  $seatId
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $licenseId, $seatId) : JsonResponse | array
+    public function update(Request $request, $licenseId, $seatId)
    {
        $this->authorize('checkout', License::class);

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

@@ -107,7 +110,7 @@ class LicenseSeatsController extends Controller

        // attempt to update the license seat
        $licenseSeat->fill($request->all());
-        $licenseSeat->user_id = auth()->id();
+        $licenseSeat->user_id = Auth::user()->id;

        // check if this update is a checkin operation
        // 1. are relevant fields touched at all?
@@ -4,12 +4,14 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Company;
 use App\Models\License;
+use App\Models\LicenseSeat;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Http\JsonResponse;

 class LicensesController extends Controller
 {
@@ -19,12 +21,13 @@ class LicensesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     *
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', License::class);

-        $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
+        $licenses = License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count');

        if ($request->filled('company_id')) {
            $licenses->where('company_id', '=', $request->input('company_id'));
@@ -70,9 +73,6 @@ class LicensesController extends Controller
            $licenses->where('depreciation_id', '=', $request->input('depreciation_id'));
        }

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

        if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
            $licenses->where('maintained','=',1);
@@ -116,9 +116,6 @@ class LicensesController extends Controller
            case 'company':
                $licenses = $licenses->leftJoin('companies', 'licenses.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
                break;
-            case 'created_by':
-                $licenses = $licenses->OrderCreatedBy($order);
-                break;
            default:
                $allowed_columns =
                    [
@@ -159,9 +156,11 @@ class LicensesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
+        //
        $this->authorize('create', License::class);
        $license = new License;
        $license->fill($request->all());
@@ -178,8 +177,9 @@ class LicensesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', License::class);
        $license = License::withCount('freeSeats')->findOrFail($id);
@@ -195,8 +195,9 @@ class LicensesController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse | array
+    public function update(Request $request, $id)
    {
        //
        $this->authorize('update', License::class);
@@ -217,8 +218,9 @@ class LicensesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        //
        $license = License::findOrFail($id);
@@ -246,7 +248,7 @@ class LicensesController extends Controller
     *
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        $licenses = License::select([
            'licenses.id',
@@ -5,15 +5,12 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Asset;
 use App\Models\Location;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use Illuminate\Http\JsonResponse;

 class LocationsController extends Controller
 {
@@ -24,7 +21,7 @@ class LocationsController extends Controller
     * @since [v4.0]
     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Location::class);
        $allowed_columns = [
@@ -141,8 +138,9 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Location::class);
        $location = new Location;
@@ -162,8 +160,9 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', Location::class);
        $location = Location::with('parent', 'manager', 'children')
@@ -200,8 +199,9 @@ class LocationsController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Location::class);
        $location = Location::findOrFail($id);
@@ -224,23 +224,15 @@ 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('assigned_to', '=', $location->id)->where('assigned_type', '=', Location::class)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');
-        $assets = $assets->get();
-        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
-    }
-
    /**
     * Remove the specified resource from storage.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Location::class);
        $location = Location::withCount('assignedAssets as assigned_assets_count')
@@ -288,7 +280,7 @@ class LocationsController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        // If a user is in the process of editing their profile, as determined by the referrer,
        // then we check that they have permission to edit their own location.
@@ -333,6 +325,7 @@ class LocationsController extends Controller

        $paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []);

+        //return [];
        return (new SelectlistTransformer)->transformSelectlist($paginated_results);
    }
 }
@@ -10,8 +10,8 @@ use App\Models\Actionlog;
 use App\Models\Manufacturer;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;

 class ManufacturersController extends Controller
 {
@@ -22,7 +22,7 @@ class ManufacturersController extends Controller
     * @since [v4.0]
     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', Manufacturer::class);
        $allowed_columns = ['id', 'name', 'url', 'support_url', 'support_email', 'warranty_lookup_url', 'support_phone', 'created_at', 'updated_at', 'image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count'];
@@ -83,8 +83,9 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Manufacturer::class);
        $manufacturer = new Manufacturer;
@@ -104,8 +105,9 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', Manufacturer::class);
        $manufacturer = Manufacturer::withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count')->findOrFail($id);
@@ -120,8 +122,9 @@ class ManufacturersController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Manufacturer::class);
        $manufacturer = Manufacturer::findOrFail($id);
@@ -141,8 +144,9 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Manufacturer::class);
        $manufacturer = Manufacturer::findOrFail($id);
@@ -163,9 +167,10 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.3.4]
     * @param int $id
+     * @return \Illuminate\Http\JsonResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function restore($id) : JsonResponse
+    public function restore($id)
    {
        $this->authorize('delete', Manufacturer::class);

@@ -181,7 +186,7 @@ class ManufacturersController extends Controller
                $logaction->item_type = Manufacturer::class;
                $logaction->item_id = $manufacturer->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('restore');

                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/manufacturers/message.restore.success')), 200);
@@ -201,7 +206,7 @@ class ManufacturersController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $this->authorize('view.selectlists');
@@ -7,8 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\PredefinedKitsTransformer;
 use App\Models\PredefinedKit;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use App\Http\Transformers\SelectlistTransformer;

 /**
 *  @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
@@ -20,7 +18,7 @@ class PredefinedKitsController extends Controller
     *
     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('view', PredefinedKit::class);
        $allowed_columns = ['id', 'name'];
@@ -49,8 +47,9 @@ class PredefinedKitsController extends Controller
     * Store a newly created resource in storage.
     *
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('create', PredefinedKit::class);
        $kit = new PredefinedKit;
@@ -67,8 +66,9 @@ class PredefinedKitsController extends Controller
     * Display the specified resource.
     *
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) :  array
+    public function show($id)
    {
        $this->authorize('view', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($id);
@@ -81,8 +81,9 @@ class PredefinedKitsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id kit id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($id);
@@ -99,8 +100,9 @@ class PredefinedKitsController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($id);
@@ -121,7 +123,7 @@ class PredefinedKitsController extends Controller
     *
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        $kits = PredefinedKit::select([
            'id',
@@ -143,7 +145,7 @@ class PredefinedKitsController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function indexLicenses($kit_id) : array
+    public function indexLicenses($kit_id)
    {
        $this->authorize('view', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -158,7 +160,7 @@ class PredefinedKitsController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function storeLicense(Request $request, $kit_id) : JsonResponse
+    public function storeLicense(Request $request, $kit_id)
    {
        $this->authorize('update', PredefinedKit::class);

@@ -184,8 +186,9 @@ class PredefinedKitsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function updateLicense(Request $request, $kit_id, $license_id) : JsonResponse
+    public function updateLicense(Request $request, $kit_id, $license_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -202,8 +205,9 @@ class PredefinedKitsController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function detachLicense($kit_id, $license_id) : JsonResponse
+    public function detachLicense($kit_id, $license_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -217,8 +221,9 @@ class PredefinedKitsController extends Controller
     * Display the specified resource.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function indexModels($kit_id) : array
+    public function indexModels($kit_id)
    {
        $this->authorize('view', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -231,8 +236,9 @@ class PredefinedKitsController extends Controller
     * Store the specified resource.
     *
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function storeModel(Request $request, $kit_id) : JsonResponse
+    public function storeModel(Request $request, $kit_id)
    {
        $this->authorize('update', PredefinedKit::class);

@@ -258,8 +264,9 @@ class PredefinedKitsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function updateModel(Request $request, $kit_id, $model_id) : JsonResponse
+    public function updateModel(Request $request, $kit_id, $model_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -276,8 +283,9 @@ class PredefinedKitsController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function detachModel($kit_id, $model_id) : JsonResponse
+    public function detachModel($kit_id, $model_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -291,8 +299,9 @@ class PredefinedKitsController extends Controller
     * Display the specified resource.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function indexConsumables($kit_id) : array
+    public function indexConsumables($kit_id)
    {
        $this->authorize('view', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -305,8 +314,9 @@ class PredefinedKitsController extends Controller
     * Store the specified resource.
     *
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function storeConsumable(Request $request, $kit_id) : JsonResponse
+    public function storeConsumable(Request $request, $kit_id)
    {
        $this->authorize('update', PredefinedKit::class);

@@ -332,8 +342,9 @@ class PredefinedKitsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function updateConsumable(Request $request, $kit_id, $consumable_id) : JsonResponse
+    public function updateConsumable(Request $request, $kit_id, $consumable_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -350,8 +361,9 @@ class PredefinedKitsController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function detachConsumable($kit_id, $consumable_id) : JsonResponse
+    public function detachConsumable($kit_id, $consumable_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -365,8 +377,9 @@ class PredefinedKitsController extends Controller
     * Display the specified resource.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function indexAccessories($kit_id) : array
+    public function indexAccessories($kit_id)
    {
        $this->authorize('view', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -379,8 +392,9 @@ class PredefinedKitsController extends Controller
     * Store the specified resource.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function storeAccessory(Request $request, $kit_id) : JsonResponse
+    public function storeAccessory(Request $request, $kit_id)
    {
        $this->authorize('update', PredefinedKit::class);

@@ -406,8 +420,9 @@ class PredefinedKitsController extends Controller
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function updateAccessory(Request $request, $kit_id, $accessory_id) : JsonResponse
+    public function updateAccessory(Request $request, $kit_id, $accessory_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -424,8 +439,9 @@ class PredefinedKitsController extends Controller
     * Remove the specified resource from storage.
     *
     * @param  int  $kit_id
+     * @return \Illuminate\Http\Response
     */
-    public function detachAccessory($kit_id, $accessory_id) : JsonResponse
+    public function detachAccessory($kit_id, $accessory_id)
    {
        $this->authorize('update', PredefinedKit::class);
        $kit = PredefinedKit::findOrFail($kit_id);
@@ -6,13 +6,13 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\CheckoutRequest;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
 use App\Models\CustomField;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Http\JsonResponse;

 class ProfileController extends Controller
 {
@@ -42,10 +42,12 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.3.0]
+     *
+     * @return array
     */
-    public function requestedAssets() :  array
+    public function requestedAssets()
    {
-        $checkoutRequests = CheckoutRequest::where('user_id', '=', auth()->id())->get();
+        $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get();

        $results = array();
        $show_field = array();
@@ -93,9 +95,10 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.0.5]
+     *
+     * @return \Illuminate\Http\Response
     */
-    public function createApiToken(Request $request) : JsonResponse
-    {
+    public function createApiToken(Request $request) {

        if (!Gate::allows('self.api')) {
            abort(403);
@@ -103,14 +106,14 @@ class ProfileController extends Controller

        $accessTokenName = $request->input('name', 'Auth Token');

-        if ($accessToken = auth()->user()->createToken($accessTokenName)->accessToken) {
+        if ($accessToken = Auth::user()->createToken($accessTokenName)->accessToken) {

            // Get the ID so we can return that with the payload
-            $token = DB::table('oauth_access_tokens')->where('user_id', '=', auth()->id())->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first();
+            $token = DB::table('oauth_access_tokens')->where('user_id', '=', Auth::user()->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first();
            $accessTokenData['id'] = $token->id;
            $accessTokenData['token'] = $accessToken;
            $accessTokenData['name'] = $accessTokenName;
-            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, trans('account/general.personal_api_keys_success', ['key' => $accessTokenName])));
+            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, 'Personal access token '.$accessTokenName.' created successfully'));
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, 'Token could not be created.'));

@@ -122,16 +125,17 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.0.5]
+     *
+     * @return \Illuminate\Http\Response
     */
-    public function deleteApiToken($tokenId) : Response
-    {
+    public function deleteApiToken($tokenId) {

        if (!Gate::allows('self.api')) {
            abort(403);
        }

        $token = $this->tokenRepository->findForUser(
-            $tokenId, auth()->user()->getAuthIdentifier()
+            $tokenId, Auth::user()->getAuthIdentifier()
        );

        if (is_null($token)) {
@@ -150,15 +154,16 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.0.5]
+     *
+     * @return \Illuminate\Http\Response
     */
-    public function showApiTokens() : JsonResponse
-    {
+    public function showApiTokens(Request $request) {

        if (!Gate::allows('self.api')) {
            abort(403);
        }
        
-        $tokens = $this->tokenRepository->forUser(auth()->user()->getAuthIdentifier());
+        $tokens = $this->tokenRepository->forUser(Auth::user()->getAuthIdentifier());
        $token_values = $tokens->load('client')->filter(function ($token) {
            return $token->client->personal_access_client && ! $token->revoked;
        })->values();
@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Models\Actionlog;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;

 class ReportsController extends Controller
 {
@@ -15,8 +14,9 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return View
     */
-    public function index(Request $request) : JsonResponse | array
+    public function index(Request $request)
    {
        $this->authorize('reports.view');

@@ -9,22 +9,26 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ldap;
 use App\Models\Setting;
+use Mail;
+use App\Notifications\SlackTest;
 use App\Notifications\MailTest;
+use GuzzleHttp\Client;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Validator; 
+use App\Http\Requests\SlackSettingsRequest;
 use App\Http\Transformers\LoginAttemptsTransformer;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;


 class SettingsController extends Controller
 {


-    public function ldaptest() : JsonResponse
+    public function ldaptest()
    {
        $settings = Setting::getSettings();

@@ -84,7 +88,7 @@ class SettingsController extends Controller

    }

-    public function ldaptestlogin(Request $request) : JsonResponse
+    public function ldaptestlogin(Request $request)
    {

        if (Setting::getSettings()->ldap_enabled != '1') {
@@ -144,8 +148,9 @@ class SettingsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
+     * @return JsonResponse
     */
-    public function ajaxTestEmail() : JsonResponse
+    public function ajaxTestEmail()
    {
        if (!config('app.lock_passwords')) {
            try {
@@ -165,8 +170,9 @@ class SettingsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.0.0]
+     * @return JsonResponse
     */
-    public function purgeBarcodes() : JsonResponse
+    public function purgeBarcodes()
    {
        $file_count = 0;
        $files = Storage::disk('public')->files('barcodes');
@@ -205,8 +211,9 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.0.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return array | JsonResponse
     */
-    public function showLoginAttempts(Request $request) : array
+    public function showLoginAttempts(Request $request)
    {
        $allowed_columns = ['id', 'username', 'remote_ip', 'user_agent', 'successful', 'created_at'];

@@ -226,9 +233,9 @@ class SettingsController extends Controller
     * Lists backup files
     *
     * @author [A. Gianotto]
+     * @return array | JsonResponse
     */
-    public function listBackups() : array
-    {
+    public function listBackups() {
        $settings = Setting::getSettings();
        $path = 'app/backups';
        $backup_files = Storage::files($path);
@@ -269,9 +276,9 @@ class SettingsController extends Controller
     * exhausts memory on larger files.
     *
     * @author [A. Gianotto]
+     * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
     */
-    public function downloadBackup($file) : JsonResponse | BinaryFileResponse
-    {
+    public function downloadBackup($file) {

        $path = storage_path('app/backups');
        
@@ -289,9 +296,9 @@ class SettingsController extends Controller
     *
     * @author [A. Gianotto]
     * @since [v6.3.1]
+     * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
     */
-    public function downloadLatestBackup() : JsonResponse | BinaryFileResponse
-    {
+    public function downloadLatestBackup() {

        $fileData = collect();
        foreach (Storage::files('app/backups') as $file) {
@@ -11,7 +11,7 @@ use App\Models\Asset;
 use App\Models\Statuslabel;
 use Illuminate\Http\Request;
 use App\Http\Transformers\PieChartTransformer;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Arr;

 class StatuslabelsController extends Controller
 {
@@ -20,8 +20,9 @@ class StatuslabelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request) : array
+    public function index(Request $request)
    {
        $this->authorize('view', Statuslabel::class);
        $allowed_columns = ['id', 'name', 'created_at', 'assets_count', 'color', 'notes', 'default_label'];
@@ -71,8 +72,9 @@ class StatuslabelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request) : JsonResponse
+    public function store(Request $request)
    {
        $this->authorize('create', Statuslabel::class);
        $request->except('deployable', 'pending', 'archived');
@@ -106,8 +108,9 @@ class StatuslabelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Statuslabel::class);
        $statuslabel = Statuslabel::findOrFail($id);
@@ -123,8 +126,9 @@ class StatuslabelsController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id) : JsonResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Statuslabel::class);
        $statuslabel = Statuslabel::findOrFail($id);
@@ -159,8 +163,9 @@ class StatuslabelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Statuslabel::class);
        $statuslabel = Statuslabel::findOrFail($id);
@@ -183,8 +188,9 @@ class StatuslabelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
+     * @return array
     */
-    public function getAssetCountByStatuslabel() : array
+    public function getAssetCountByStatuslabel()
    {
        $this->authorize('view', Statuslabel::class);
        $statuslabels = Statuslabel::withCount('assets')->get();
@@ -209,8 +215,9 @@ class StatuslabelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.0.11]
+     * @return array
     */
-    public function getAssetCountByMetaStatus() : array
+    public function getAssetCountByMetaStatus()
    {
        $this->authorize('view', Statuslabel::class);

@@ -238,8 +245,9 @@ class StatuslabelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function assets(Request $request, $id) : array
+    public function assets(Request $request, $id)
    {
        $this->authorize('view', Statuslabel::class);
        $this->authorize('index', Asset::class);
@@ -273,8 +281,9 @@ class StatuslabelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return bool
     */
-    public function checkIfDeployable($id) : string
+    public function checkIfDeployable($id)
    {
        $statuslabel = Statuslabel::findOrFail($id);
        if ($statuslabel->getStatuslabelType() == 'deployable') {
@@ -291,7 +300,7 @@ class StatuslabelsController extends Controller
     * @since [v6.1.1]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $this->authorize('view.selectlists');
@@ -10,7 +10,6 @@ use App\Models\Supplier;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;

 class SuppliersController extends Controller
 {
@@ -21,7 +20,7 @@ class SuppliersController extends Controller
     * @since [v4.0]
     * @return \Illuminate\Http\Response
     */
-    public function index(Request $request): array
+    public function index(Request $request)
    {
        $this->authorize('view', Supplier::class);
        $allowed_columns = ['
@@ -115,8 +114,9 @@ class SuppliersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request) : JsonResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Supplier::class);
        $supplier = new Supplier;
@@ -136,8 +136,9 @@ class SuppliersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function show($id) : array
+    public function show($id)
    {
        $this->authorize('view', Supplier::class);
        $supplier = Supplier::findOrFail($id);
@@ -153,8 +154,9 @@ class SuppliersController extends Controller
     * @since [v4.0]
     * @param  \App\Http\Requests\ImageUploadRequest  $request
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id) : JsonResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        $this->authorize('update', Supplier::class);
        $supplier = Supplier::findOrFail($id);
@@ -174,8 +176,9 @@ class SuppliersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\Response
     */
-    public function destroy($id) : JsonResponse
+    public function destroy($id)
    {
        $this->authorize('delete', Supplier::class);
        $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
@@ -206,7 +209,7 @@ class SuppliersController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {

        $this->authorize('view.selectlists');
@@ -24,7 +24,6 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
 use App\Http\Requests\DeleteUserRequest;
-use Illuminate\Http\JsonResponse;

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

@@ -302,7 +301,7 @@ class UsersController extends Controller
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request) : array
+    public function selectlist(Request $request)
    {
        $users = User::select(
            [
@@ -358,20 +357,21 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
+     * @return array | \Illuminate\Http\JsonResponse
     */
-    public function store(SaveUserRequest $request) : JsonResponse
+    public function store(SaveUserRequest $request)
    {
        $this->authorize('create', User::class);

        $user = new User;
        $user->fill($request->all());
-        $user->created_by = auth()->id();
+        $user->created_by = Auth::user()->id;

        if ($request->has('permissions')) {
            $permissions_array = $request->input('permissions');

            // Strip out the superuser permission if the API user isn't a superadmin
-            if (! auth()->user()->isSuperUser()) {
+            if (! Auth::user()->isSuperUser()) {
                unset($permissions_array['superuser']);
            }
            $user->permissions = $permissions_array;
@@ -404,8 +404,9 @@ class UsersController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int  $id
+     * @return array | \Illuminate\Http\JsonResponse
     */
-    public function show($id) : JsonResponse | array
+    public function show($id)
    {
        $this->authorize('view', User::class);

@@ -426,8 +427,9 @@ class UsersController extends Controller
     * @since [v4.0]
     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function update(SaveUserRequest $request, $id) : JsonResponse
+    public function update(SaveUserRequest $request, $id)
    {
        $this->authorize('update', User::class);

@@ -466,7 +468,7 @@ class UsersController extends Controller
                $permissions_array = $request->input('permissions');

                // Strip out the individual superuser permission if the API user isn't a superadmin
-                if (!auth()->user()->isSuperUser()) {
+                if (!Auth::user()->isSuperUser()) {
                    unset($permissions_array['superuser']);
                }

@@ -484,7 +486,7 @@ class UsersController extends Controller
            if ($user->save()) {

                // Check if the request has groups passed and has a value, AND that the user us a superuser
-                if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
+                if (($request->has('groups')) && (Auth::user()->isSuperUser())) {

                    $validator = Validator::make($request->only('groups'), [
                        'groups.*' => 'integer|exists:permission_groups,id',
@@ -516,8 +518,9 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param  int  $id
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function destroy(DeleteUserRequest $request, $id) : JsonResponse
+    public function destroy(DeleteUserRequest $request, $id)
    {
        $this->authorize('delete', User::class);

@@ -553,8 +556,9 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
     * @param $userId
+     * @return array | \Illuminate\Http\JsonResponse
     */
-    public function assets(Request $request, $id) : JsonResponse | array
+    public function assets(Request $request, $id)
    {
        $this->authorize('view', User::class);
        $this->authorize('view', Asset::class);
@@ -597,9 +601,9 @@ class UsersController extends Controller
     * @since [v6.0.13]
     * @param Request $request
     * @param $id
+     * @return string JSON
     */
-    public function emailAssetList(Request $request, $id) : JsonResponse
-
+    public function emailAssetList(Request $request, $id)
    {
        $this->authorize('update', User::class);

@@ -625,8 +629,9 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
     * @param $userId
+     * @return array | \Illuminate\Http\JsonResponse
     */
-    public function consumables(Request $request, $id) : array
+    public function consumables(Request $request, $id)
    {
        $this->authorize('view', User::class);
        $this->authorize('view', Consumable::class);
@@ -642,8 +647,9 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.6.14]
     * @param $userId
+     * @return array
     */
-    public function accessories($id) : array
+    public function accessories($id)
    {
        $this->authorize('view', User::class);
        $user = User::findOrFail($id);
@@ -660,8 +666,9 @@ class UsersController extends Controller
     * @author [N. Mathar] [<snipe@snipe.net>]
     * @since [v5.0]
     * @param $userId
+     * @return array | \Illuminate\Http\JsonResponse
     */
-    public function licenses($id) : JsonResponse | array
+    public function licenses($id)
    {
        $this->authorize('view', User::class);
        $this->authorize('view', License::class);
@@ -682,8 +689,9 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
     * @param $userId
+     * @return string JSON
     */
-    public function postTwoFactorReset(Request $request) : JsonResponse
+    public function postTwoFactorReset(Request $request)
    {
        $this->authorize('update', User::class);

@@ -702,7 +710,7 @@ class UsersController extends Controller
                $logaction->item_type = User::class;
                $logaction->item_id = $user->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('2FA reset');

                return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
@@ -721,8 +729,9 @@ class UsersController extends Controller
     * @author [Juan Font] [<juanfontalonso@gmail.com>]
     * @since [v4.4.2]
     * @param  \Illuminate\Http\Request  $request
+     * @return array
     */
-    public function getCurrentUserInfo(Request $request) : array
+    public function getCurrentUserInfo(Request $request)
    {
        return (new UsersTransformer)->transformUser($request->user());
    }
@@ -733,8 +742,9 @@ class UsersController extends Controller
     * @author [E. Taylor] [<dev@evantaylor.name>]
     * @param int $userId
     * @since [v6.0.0]
+     * @return \Illuminate\Http\JsonResponse
     */
-    public function restore($userId) : JsonResponse
+    public function restore($userId)
    {
        $this->authorize('delete', User::class);

@@ -752,7 +762,7 @@ class UsersController extends Controller
                $logaction->item_type = User::class;
                $logaction->item_id = $user->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('restore');

                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.restored')), 200);
@@ -2,14 +2,17 @@

 namespace App\Http\Controllers;

+use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use Slack;
+use Str;
+use TCPDF;
+use View;

 /**
 * This controller handles all actions related to Asset Maintenance for
@@ -26,8 +29,9 @@ class AssetMaintenancesController extends Controller
    * @author  Vincent Sposato <vincent.sposato@gmail.com>
    * @version v1.0
    * @since [v1.8]
+    * @return View
    */
-    private static function getInsufficientPermissionsRedirect(): RedirectResponse
+    private static function getInsufficientPermissionsRedirect()
    {
        return redirect()->route('maintenances.index')
          ->with('error', trans('general.insufficient_permissions'));
@@ -42,8 +46,9 @@ class AssetMaintenancesController extends Controller
    * @author  Vincent Sposato <vincent.sposato@gmail.com>
    * @version v1.0
    * @since [v1.8]
+    * @return View
    */
-    public function index() : View
+    public function index()
    {
        $this->authorize('view', Asset::class);
        return view('asset_maintenances/index');
@@ -58,7 +63,7 @@ class AssetMaintenancesController extends Controller
     * @since [v1.8]
     * @return mixed
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('update', Asset::class);
        $asset = null;
@@ -87,8 +92,9 @@ class AssetMaintenancesController extends Controller
    * @author  Vincent Sposato <vincent.sposato@gmail.com>
    * @version v1.0
    * @since [v1.8]
+    * @return mixed
    */
-    public function store(Request $request) : RedirectResponse
+    public function store(Request $request)
    {
        $this->authorize('update', Asset::class);
        // create a new model instance
@@ -138,8 +144,9 @@ class AssetMaintenancesController extends Controller
    * @param int $assetMaintenanceId
    * @version v1.0
    * @since [v1.8]
+    * @return mixed
    */
-    public function edit($assetMaintenanceId = null) : View | RedirectResponse
+    public function edit($assetMaintenanceId = null)
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
@@ -155,9 +162,14 @@ class AssetMaintenancesController extends Controller
            return static::getInsufficientPermissionsRedirect();
        }

-        // Prepare Improvement Type List
-        $assetMaintenanceType = ['' => 'Select an improvement type'] + AssetMaintenance::getImprovementOptions();

+        // Prepare Improvement Type List
+        $assetMaintenanceType = [
+                                    '' => 'Select an improvement type',
+                                ] + AssetMaintenance::getImprovementOptions();
+
+        // Get Supplier List
+        // Render the view
        return view('asset_maintenances/edit')
                   ->with('selectedAsset', null)
                   ->with('assetMaintenanceType', $assetMaintenanceType)
@@ -171,10 +183,11 @@ class AssetMaintenancesController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @param Request $request
     * @param int $assetMaintenanceId
+     * @return mixed
     * @version v1.0
     * @since [v1.8]
     */
-    public function update(Request $request, $assetMaintenanceId = null) : View | RedirectResponse
+    public function update(Request $request, $assetMaintenanceId = null)
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
@@ -242,8 +255,9 @@ class AssetMaintenancesController extends Controller
    * @param int $assetMaintenanceId
    * @version v1.0
    * @since [v1.8]
+    * @return mixed
    */
-    public function destroy($assetMaintenanceId) : RedirectResponse
+    public function destroy($assetMaintenanceId)
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
@@ -270,8 +284,9 @@ class AssetMaintenancesController extends Controller
    * @param int $assetMaintenanceId
    * @version v1.0
    * @since [v1.8]
+    * @return View
    */
-    public function show($assetMaintenanceId) : View | RedirectResponse
+    public function show($assetMaintenanceId)
    {
        $this->authorize('view', Asset::class);

@@ -4,21 +4,19 @@ namespace App\Http\Controllers;

 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Http\Requests\StoreAssetModelRequest;
 use App\Models\Actionlog;
+use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\CustomField;
-use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Log;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
-

 /**
 * This class controls all actions related to asset models for
@@ -35,8 +33,10 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('index', AssetModel::class);

@@ -48,8 +48,10 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', AssetModel::class);

@@ -64,12 +66,16 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(StoreAssetModelRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', AssetModel::class);
+        // Create a new asset model
        $model = new AssetModel;

+        // Save the model data
        $model->eol = $request->input('eol');
        $model->depreciation_id = $request->input('depreciation_id');
        $model->name = $request->input('name');
@@ -87,6 +93,7 @@ class AssetModelsController extends Controller

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

+        // Was it created?
        if ($model->save()) {
            if ($this->shouldAddDefaultValues($request->input())) {
                if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@@ -106,14 +113,18 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $modelId
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($modelId = null) : View | RedirectResponse
+    public function edit($modelId = null)
    {
        $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());
+            $view = View::make('models/edit', compact('item', 'category_type'));
+            $view->with('depreciation_list', Helper::depreciationList());

+            return $view;
        }

        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
@@ -131,11 +142,12 @@ class AssetModelsController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(StoreAssetModelRequest $request, $modelId) : RedirectResponse
+    public function update(ImageUploadRequest $request, $modelId = null)
    {
        $this->authorize('update', AssetModel::class);
-
+        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
+            // Redirect to the models management page
            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
        }

@@ -161,6 +173,9 @@ class AssetModelsController extends Controller
            }
        }

+       
+      
+       
        if ($model->save()) {
            if ($model->wasChanged('eol')) {
                    if ($model->eol > 0) {
@@ -185,8 +200,10 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $modelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($modelId) : RedirectResponse
+    public function destroy($modelId)
    {
        $this->authorize('delete', AssetModel::class);
        // Check if the model exists
@@ -220,8 +237,10 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $id
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function getRestore($id) : RedirectResponse
+    public function getRestore($id)
    {
        $this->authorize('create', AssetModel::class);

@@ -236,7 +255,7 @@ class AssetModelsController extends Controller
                $logaction->item_type = User::class;
                $logaction->item_id = $model->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('restore');


@@ -263,8 +282,10 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $modelId
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($modelId = null) : View | RedirectResponse
+    public function show($modelId = null)
    {
        $this->authorize('view', AssetModel::class);
        $model = AssetModel::withTrashed()->find($modelId);
@@ -282,8 +303,9 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $modelId
+     * @return View
     */
-    public function getClone($modelId = null) : View | RedirectResponse
+    public function getClone($modelId = null)
    {
        $this->authorize('create', AssetModel::class);
        // Check if the model exists
@@ -309,8 +331,9 @@ class AssetModelsController extends Controller
     * @author [B. Wetherington] [<uberbrady@gmail.com>]
     * @since [v2.0]
     * @param int $modelId
+     * @return View
     */
-    public function getCustomFields($modelId) : View
+    public function getCustomFields($modelId)
    {
        return view('models.custom_fields_form')->with('model', AssetModel::find($modelId));
    }
@@ -322,8 +345,9 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.7]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function postBulkEdit(Request $request) : View | RedirectResponse
+    public function postBulkEdit(Request $request)
    {
        $models_raw_array = $request->input('ids');

@@ -365,8 +389,9 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.7]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function postBulkEditSave(Request $request) : RedirectResponse
+    public function postBulkEditSave(Request $request)
    {
        $models_raw_array = $request->input('ids');
        $update_array = [];
@@ -404,8 +429,9 @@ class AssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $modelId
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postBulkDelete(Request $request) : RedirectResponse
+    public function postBulkDelete(Request $request)
    {
        $models_raw_array = $request->input('ids');

@@ -444,8 +470,9 @@ class AssetModelsController extends Controller
     * any default values were entered into the form.
     *
     * @param  array  $input
+     * @return bool
     */
-    private function shouldAddDefaultValues(array $input) : bool
+    private function shouldAddDefaultValues(array $input)
    {
        return ! empty($input['add_default_values'])
            && ! empty($input['default_values'])
@@ -457,8 +484,9 @@ class AssetModelsController extends Controller
     *
     * @param  AssetModel $model
     * @param  array      $defaultValues
+     * @return void
     */
-    private function assignCustomFieldsDefaultValues(AssetModel|SnipeModel $model, array $defaultValues): bool
+    private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool
    {
        $data = array();
        foreach ($defaultValues as $customFieldId => $defaultValue) {
@@ -467,17 +495,17 @@ class AssetModelsController extends Controller
            $data[$customField->db_column] = $defaultValue;
        }

-        $allRules = $model->fieldset->validation_rules();
+        $fieldsets = $model->fieldset->validation_rules();
        $rules = array();

-        foreach ($allRules as $field => $validation) {
+        foreach ($fieldsets as $fieldset => $validation){
            // If the field is marked as required, eliminate the rule so it doesn't interfere with the default values
            // (we are at model level, the rule still applies when creating a new asset using this model)
            $index = array_search('required', $validation);
            if ($index !== false){
                $validation[$index] = 'nullable';
            }
-            $rules[$field] = $validation;
+            $rules[$fieldset] = $validation;
        }

        $validator = Validator::make($data, $rules);
@@ -499,8 +527,9 @@ class AssetModelsController extends Controller
    /**
     * Removes all default values
     *
+     * @return void
     */
-    private function removeCustomFieldsDefaultValues(AssetModel|SnipeModel $model): void
+    private function removeCustomFieldsDefaultValues(AssetModel $model)
    {
        $model->defaultValues()->detach();
    }
@@ -6,11 +6,8 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\AssetModel;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
-use \Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;

 class AssetModelsFilesController extends Controller
 {
@@ -24,7 +21,7 @@ class AssetModelsFilesController extends Controller
     *@since [v1.0]
     * @author [A. Gianotto] [<snipe@snipe.net>]
     */
-    public function store(UploadFileRequest $request, $modelId = null) : RedirectResponse
+    public function store(UploadFileRequest $request, $modelId = null)
    {
        if (! $model = AssetModel::find($modelId)) {
            return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -57,8 +54,10 @@ class AssetModelsFilesController extends Controller
     * @param  int $modelId
     * @param  int $fileId
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($modelId = null, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    public function show($modelId = null, $fileId = null)
    {
        $model = AssetModel::find($modelId);
        // the asset is valid
@@ -102,8 +101,10 @@ class AssetModelsFilesController extends Controller
     * @param  int $modelId
     * @param  int $fileId
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($modelId = null, $fileId = null) : RedirectResponse
+    public function destroy($modelId = null, $fileId = null)
    {
        $model = AssetModel::find($modelId);
        $this->authorize('update', $model);
@@ -11,9 +11,10 @@ use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Log;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;

 class AssetCheckinController extends Controller
 {
@@ -25,9 +26,11 @@ class AssetCheckinController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @param string $backto
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.0]
     */
-    public function create($assetId, $backto = null) : View | RedirectResponse
+    public function create($assetId, $backto = null)
    {
        // Check if the asset exists
        if (is_null($asset = Asset::find($assetId))) {
@@ -57,9 +60,11 @@ class AssetCheckinController extends Controller
     * @param AssetCheckinRequest $request
     * @param int $assetId
     * @param null $backto
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.0]
     */
-    public function store(AssetCheckinRequest $request, $assetId = null, $backto = null) : RedirectResponse
+    public function store(AssetCheckinRequest $request, $assetId = null, $backto = null)
    {
        // Check if the asset exists
        if (is_null($asset = Asset::find($assetId))) {
@@ -82,6 +87,7 @@ class AssetCheckinController extends Controller
        }

        $asset->expected_checkin = null;
+        //$asset->last_checkout = null;
        $asset->last_checkin = now();
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;
@@ -126,12 +132,12 @@ class AssetCheckinController extends Controller
            $acceptance->delete();
        });

-        session()->put('redirect_option', $request->get('redirect_option'));
-
+        Session::put('redirect_option', $request->get('redirect_option'));
+        // Was the asset updated?
        if ($asset->save()) {

-            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
-            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.checkin.success'));
+            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues));
+            return Helper::getRedirectOption($asset, $assetId, 'Assets');
        }
        // Redirect to the asset management page with error
        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());
@@ -9,9 +9,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Models\Asset;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;

 class AssetCheckoutController extends Controller
 {
@@ -24,9 +23,9 @@ class AssetCheckoutController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
-    public function create($assetId) : View | RedirectResponse
+    public function create($assetId)
    {
        // Check if the asset exists
        if (is_null($asset = Asset::with('company')->find(e($assetId)))) {
@@ -54,9 +53,11 @@ class AssetCheckoutController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param AssetCheckoutRequest $request
+     * @param int $assetId
+     * @return \Illuminate\Http\RedirectResponse
     * @since [v1.0]
     */
-    public function store(AssetCheckoutRequest $request, $assetId) : RedirectResponse
+    public function store(AssetCheckoutRequest $request, $assetId)
    {
        try {
            // Check if the asset exists
@@ -71,7 +72,7 @@ class AssetCheckoutController extends Controller
                return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
            }

-            $admin = auth()->user();
+            $admin = Auth::user();

            $target = $this->determineCheckoutTarget();

@@ -109,11 +110,10 @@ class AssetCheckoutController extends Controller
                }
            }

-                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'));
+                return Helper::getRedirectOption($request, $assetId, 'Assets');
            }
            // Redirect to the asset management page with error
            return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
@@ -7,12 +7,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use \Illuminate\Http\Response;
+use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;

 class AssetFilesController extends Controller
 {
@@ -26,7 +22,7 @@ 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, $assetId = null)
    {
        if (! $asset = Asset::find($assetId)) {
            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -58,8 +54,10 @@ class AssetFilesController extends Controller
     * @param  int $assetId
     * @param  int $fileId
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($assetId = null, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
+    public function show($assetId = null, $fileId = null)
    {
        $asset = Asset::find($assetId);
        // the asset is valid
@@ -107,8 +105,10 @@ class AssetFilesController extends Controller
     * @param  int $assetId
     * @param  int $fileId
     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($assetId = null, $fileId = null) : RedirectResponse
+    public function destroy($assetId = null, $fileId = null)
    {
        $asset = Asset::find($assetId);
        $this->authorize('update', $asset);
@@ -131,6 +131,7 @@ class AssetFilesController extends Controller
                ->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'));
    }
 }
@@ -20,16 +20,14 @@ use Illuminate\Support\Facades\Auth;
 use App\View\Label;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use League\Csv\Reader;
-use Illuminate\Http\Response;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\RedirectResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Support\Facades\Redirect;

 /**
 * This class controls all actions related to assets for
@@ -57,8 +55,10 @@ class AssetsController extends Controller
     * @see AssetController::getDatatable() method that generates the JSON response
     * @since [v1.0]
     * @param Request $request
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index(Request $request) : View
+    public function index(Request $request)
    {
        $this->authorize('index', Asset::class);
        $company = Company::find($request->input('company_id'));
@@ -72,12 +72,13 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param Request $request
+     * @return View
     * @internal param int $model_id
     */
-    public function create(Request $request) : View
+    public function create(Request $request)
    {
        $this->authorize('create', Asset::class);
-        $view = view('hardware/edit')
+        $view = View::make('hardware/edit')
            ->with('statuslabel_list', Helper::statusLabelList())
            ->with('item', new Asset)
            ->with('statuslabel_types', Helper::statusTypeList());
@@ -95,8 +96,9 @@ class AssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize(Asset::class);

@@ -196,7 +198,7 @@ class AssetsController extends Controller
                }

                if (isset($target)) {
-                    $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);
+                    $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);
                }

                $success = true;
@@ -204,13 +206,10 @@ class AssetsController extends Controller
            }
        }

-        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
-
-
        if ($success) {
-
-            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)]));
+            Log::debug(e($asset->asset_tag));
+            return redirect()->route('hardware.index')
+                ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset->id), 'id', 'tag' => e($asset->asset_tag)]));
               
      
        }
@@ -218,6 +217,11 @@ class AssetsController extends Controller
        return redirect()->back()->withInput()->withErrors($asset->getErrors());
    }

+    public function getOptionCookie(Request $request){
+        $value = $request->cookie('optional_info');
+        echo $value;
+        return $value;
+     }

    /**
     * Returns a view that presents a form to edit an existing asset.
@@ -225,9 +229,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
-    public function edit($assetId = null) : View | RedirectResponse
+    public function edit($assetId = null)
    {
        if (! $item = Asset::find($assetId)) {
            // Redirect to the asset management page with error
@@ -248,9 +252,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
-    public function show($assetId = null) : View | RedirectResponse
+    public function show($assetId = null)
    {
        $asset = Asset::withTrashed()->find($assetId);
        $this->authorize('view', $asset);
@@ -288,12 +292,12 @@ class AssetsController extends Controller
     * Validate and process asset edit form.
     *
     * @param int $assetId
+     * @return \Illuminate\Http\RedirectResponse|Redirect
     * @since [v1.0]
     * @author [A. Gianotto] [<snipe@snipe.net>]
     */
-    public function update(ImageUploadRequest $request, $assetId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, $assetId = null)
    {
-
        // Check if the asset exists
        if (! $asset = Asset::find($assetId)) {
            // Redirect to the asset management page with error
@@ -336,7 +340,7 @@ class AssetsController extends Controller

        $status = Statuslabel::find($asset->status_id);

-        if ($status && $status->archived) {
+        if($status->archived){
            $asset->assigned_to = null;
        }

@@ -355,26 +359,14 @@ class AssetsController extends Controller
        }

        // Update the asset data
-
+        $asset_tag = $request->input('asset_tags');
        $serial = $request->input('serials');
-        $asset->serial = $request->input('serials');
-
-        if (is_array($request->input('serials'))) {
-            $asset->serial = $serial[1];
-        }
-
        $asset->name = $request->input('name');
+        $asset->serial = $serial[1];
        $asset->company_id = Company::getIdForCurrentUser($request->input('company_id'));
        $asset->model_id = $request->input('model_id');
        $asset->order_number = $request->input('order_number');
-
-        $asset_tags = $request->input('asset_tags');
-        $asset->asset_tag = $request->input('asset_tags');
-
-        if (is_array($request->input('asset_tags'))) {
-            $asset->asset_tag = $asset_tags[1];
-        }
-
+        $asset->asset_tag = $asset_tag[1];
        $asset->notes = $request->input('notes');

        $asset = $request->handleImages($asset);
@@ -386,7 +378,6 @@ class AssetsController extends Controller
        $model = AssetModel::find($request->get('model_id'));
        if (($model) && ($model->fieldset)) {
            foreach ($model->fieldset->fields as $field) {
-
                if ($field->field_encrypted == '1') {
                    if (Gate::allows('admin')) {
                        if (is_array($request->input($field->db_column))) {
@@ -405,10 +396,9 @@ 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()->route('hardware.show', $assetId)
                ->with('success', trans('admin/hardware/message.update.success'));
        }

@@ -421,8 +411,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy($assetId) : RedirectResponse
+    public function destroy($assetId)
    {
        // Check if the asset exists
        if (is_null($asset = Asset::find($assetId))) {
@@ -454,8 +445,9 @@ class AssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getAssetBySerial(Request $request) : RedirectResponse
+    public function getAssetBySerial(Request $request)
    {
        $topsearch = ($request->get('topsearch')=="true");

@@ -473,7 +465,7 @@ class AssetsController extends Controller
     * @since [v3.0]
     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getAssetByTag(Request $request, $tag=null) : RedirectResponse
+    public function getAssetByTag(Request $request, $tag=null)
    {
        $tag = $tag ? $tag : $request->get('assetTag');
        $topsearch = ($request->get('topsearch') == 'true');
@@ -493,8 +485,9 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
+     * @return Response
     */
-    public function getQrCode($assetId = null) : Response | BinaryFileResponse | string | bool
+    public function getQrCode($assetId = null)
    {
        $settings = Setting::getSettings();

@@ -521,7 +514,6 @@ class AssetsController extends Controller

            return 'That asset is invalid';
        }
-        return false;
    }

    /**
@@ -569,7 +561,7 @@ class AssetsController extends Controller
     *
     * @author [L. Swartzendruber] [<logan.swartzendruber@gmail.com>
     * @param int $assetId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function getLabel($assetId = null)
    {
@@ -593,22 +585,28 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
-    public function getClone(Asset $asset)
+    public function getClone($assetId = null)
    {
-        $this->authorize('create', $asset);
-        $cloned = clone $asset;
-        $cloned->id = null;
-        $cloned->asset_tag = '';
-        $cloned->serial = '';
-        $cloned->assigned_to = '';
-        $cloned->deleted_at = '';
+        // Check if the asset exists
+        if (is_null($asset_to_clone = Asset::find($assetId))) {
+            // Redirect to the asset management page
+            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        $this->authorize('create', $asset_to_clone);
+
+        $asset = clone $asset_to_clone;
+        $asset->id = null;
+        $asset->asset_tag = '';
+        $asset->serial = '';
+        $asset->assigned_to = '';

        return view('hardware/edit')
            ->with('statuslabel_list', Helper::statusLabelList())
            ->with('statuslabel_types', Helper::statusTypeList())
-            ->with('item', $cloned);
+            ->with('item', $asset);
    }

    /**
@@ -616,7 +614,7 @@ class AssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function getImportHistory()
    {
@@ -638,7 +636,7 @@ class AssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.3]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function postImportHistory(Request $request)
    {
@@ -732,8 +730,8 @@ class AssetsController extends Controller
                        Actionlog::firstOrCreate([
                            'item_id' => $asset->id,
                            'item_type' => Asset::class,
-                            'user_id' =>  auth()->id(),
-                            'note' => 'Checkout imported by '.auth()->user()->present()->fullName().' from history importer',
+                            'user_id' =>  Auth::user()->id,
+                            'note' => 'Checkout imported by '.Auth::user()->present()->fullName().' from history importer',
                            'target_id' => $item[$asset_tag][$batch_counter]['user_id'],
                            'target_type' => User::class,
                            'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
@@ -760,8 +758,8 @@ class AssetsController extends Controller
                            Actionlog::firstOrCreate([
                                'item_id' => $item[$asset_tag][$batch_counter]['asset_id'],
                                'item_type' => Asset::class,
-                                'user_id' => auth()->id(),
-                                'note' => 'Checkin imported by '.auth()->user()->present()->fullName().' from history importer',
+                                'user_id' => Auth::user()->id,
+                                'note' => 'Checkin imported by '.Auth::user()->present()->fullName().' from history importer',
                                'target_id' => null,
                                'created_at' => $checkin_date,
                                'action_type' => 'checkin',
@@ -798,7 +796,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function getRestore($assetId = null)
    {
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers\Assets;

+use App\Models\Actionlog;
 use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
@@ -11,15 +12,14 @@ use App\Models\Statuslabel;
 use App\Models\Setting;
 use App\View\Label;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Session;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Models\CustomField;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Database\Eloquent\ModelNotFoundException;

 class BulkAssetsController extends Controller
 {
@@ -36,10 +36,12 @@ class BulkAssetsController extends Controller
     * action would make a lot more sense here and make things a lot more clear.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @return View
     * @internal param int $assetId
     * @since [v2.0]
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit(Request $request) : View | RedirectResponse
+    public function edit(Request $request)
    {
        $this->authorize('view', Asset::class);

@@ -92,9 +94,7 @@ class BulkAssetsController extends Controller
        // This handles all of the pivot sorting below (versus the assets.* fields in the allowed_columns array)
        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.id';

-        $assets = Asset::with('assignedTo', 'location', 'model')
-                ->whereIn('assets.id', $asset_ids)
-                ->withTrashed();
+        $assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids);

        $assets = $assets->get();

@@ -194,7 +194,7 @@ class BulkAssetsController extends Controller
     * @internal param array $assets
     * @since [v2.0]
     */
-    public function update(Request $request) : RedirectResponse
+    public function update(Request $request)
    {
        $this->authorize('update', Asset::class);
        $has_errors = 0;
@@ -455,8 +455,9 @@ class BulkAssetsController extends Controller
    /**
     * Adds parameter to update array for an item if it exists in request
     * @param  string $field field name
+     * @return BulkAssetsController Model for Chaining
     */
-    protected function conditionallyAddItem($field) : BulkAssetsController
+    protected function conditionallyAddItem($field)
    {
        if (request()->filled($field)) {
            $this->update_array[$field] = request()->input($field);
@@ -470,10 +471,12 @@ class BulkAssetsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param Request $request
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @internal param array $assets
     * @since [v2.0]
     */
-    public function destroy(Request $request) : RedirectResponse
+    public function destroy(Request $request)
    {
        $this->authorize('delete', Asset::class);

@@ -485,7 +488,12 @@ class BulkAssetsController extends Controller
        if ($request->filled('ids')) {
            $assets = Asset::find($request->get('ids'));
            foreach ($assets as $asset) {
-                $asset->delete();
+                $update_array['deleted_at'] = date('Y-m-d H:i:s');
+                $update_array['assigned_to'] = null;
+
+                DB::table('assets')
+                    ->where('id', $asset->id)
+                    ->update($update_array);
            } // endforeach

            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
@@ -497,23 +505,27 @@ class BulkAssetsController extends Controller

    /**
     * Show Bulk Checkout Page
+     * @return View View to checkout multiple assets
     */
-    public function showCheckout() : View
+    public function showCheckout()
    {
        $this->authorize('checkout', Asset::class);
+        // Filter out assets that are not deployable.
+
        return view('hardware/bulk-checkout');
    }

    /**
     * Process Multiple Checkout Request
+     * @return View
     */
-    public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse | ModelNotFoundException
+    public function storeCheckout(AssetCheckoutRequest $request)
    {

        $this->authorize('checkout', Asset::class);

        try {
-            $admin = auth()->user();
+            $admin = Auth::user();

            $target = $this->determineCheckoutTarget();

@@ -572,19 +584,17 @@ class BulkAssetsController extends Controller
        }
        
    }
-    public function restore(Request $request) : RedirectResponse
-    {
+    public function restore(Request $request) {
        $this->authorize('update', Asset::class);
-        $assetIds = $request->get('ids');
-
-        if (empty($assetIds)) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.restore.nothing_updated'));
+       $assetIds = $request->get('ids');
+      if (empty($assetIds)) {
+          return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.restore.nothing_updated'));
        } else {
            foreach ($assetIds as $key => $assetId) {
-                $asset = Asset::withTrashed()->find($assetId);
-                $asset->restore();
+                    $asset = Asset::withTrashed()->find($assetId);
+                    $asset->restore(); 
            } 
-            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
+        return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
        }
    }
 }
@@ -127,7 +127,7 @@ class LoginController extends Controller
                    $saml->clearData();
                }

-                if ($user = auth()->user()) {
+                if ($user = Auth::user()) {
                    $user->last_login = \Carbon::now();
                    $user->saveQuietly();
                }
@@ -326,7 +326,7 @@ class LoginController extends Controller
            }
        }

-        if ($user = auth()->user()) {
+        if ($user = Auth::user()) {
            $user->last_login = \Carbon::now();
            $user->activated = 1;
            $user->saveQuietly();
@@ -350,7 +350,7 @@ class LoginController extends Controller
        }

        $settings = Setting::getSettings();
-        $user = auth()->user();
+        $user = Auth::user();

        // We wouldn't normally see this page if 2FA isn't enforced via the
        // \App\Http\Middleware\CheckForTwoFactor middleware AND if a device isn't enrolled,
@@ -398,7 +398,7 @@ class LoginController extends Controller
            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
        }

-        $user = auth()->user();
+        $user = Auth::user();

        // Check whether there is a device enrolled.
        // This *should* be handled via the \App\Http\Middleware\CheckForTwoFactor middleware
@@ -427,7 +427,7 @@ class LoginController extends Controller
            return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
        }

-        $user = auth()->user();
+        $user = Auth::user();
        $secret = $request->input('two_factor_secret');

        if (Google2FA::verifyKey($user->two_factor_secret, $secret)) {
@@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Helpers\Helper;
 use App\Models\AssetModel;
 use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Redirect;

 class BulkAssetModelsController extends Controller
 {
@@ -16,8 +16,9 @@ class BulkAssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.7]
     * @param Request $request
+     * @return \Illuminate\Contracts\View\View
     */
-    public function edit(Request $request) : View | RedirectResponse
+    public function edit(Request $request)
    {
        $models_raw_array = $request->input('ids');

@@ -60,8 +61,9 @@ class BulkAssetModelsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.7]
     * @param Request $request
+     * @return \Illuminate\Contracts\View\View
     */
-    public function update(Request $request): View | RedirectResponse
+    public function update(Request $request)
    {
        $this->authorize('update', AssetModel::class);
      
@@ -103,8 +105,9 @@ class BulkAssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy(Request $request) : RedirectResponse
+    public function destroy(Request $request)
    {
        $this->authorize('delete', AssetModel::class);
      
@@ -4,11 +4,10 @@ namespace App\Http\Controllers;

 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Category;
+use App\Models\Category as Category;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Str;

 /**
 * This class controls all actions related to Categories for
@@ -26,8 +25,10 @@ class CategoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see CategoriesController::getDatatable() method that generates the JSON response
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        // Show the page
        $this->authorize('view', Category::class);
@@ -41,8 +42,10 @@ class CategoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see CategoriesController::store() method that stores the data
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        // Show the page
        $this->authorize('create', Category::class);
@@ -58,8 +61,10 @@ class CategoriesController extends Controller
     * @see CategoriesController::create() method that makes the form.
     * @since [v1.0]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Category::class);
        $category = new Category();
@@ -86,8 +91,10 @@ class CategoriesController extends Controller
     * @see CategoriesController::postEdit() method saves the data
     * @param int $categoryId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($categoryId = null) : RedirectResponse | View
+    public function edit($categoryId = null)
    {
        $this->authorize('update', Category::class);
        if (is_null($item = Category::find($categoryId))) {
@@ -105,31 +112,23 @@ class CategoriesController extends Controller
     * @see CategoriesController::getEdit() method that makes the form.
     * @param ImageUploadRequest $request
     * @param int $categoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $categoryId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, $categoryId = null)
    {
        $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'));
+            return redirect()->to('admin/categories')->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))) {
-            $request->validate(['category_type' => 'in:'.$category->category_type]);
-        }
-        
        $category->category_type = $request->input('category_type', $category->category_type);
-
-        $category->fill($request->all());
-
        $category->eula_text = $request->input('eula_text');
        $category->use_default_eula = $request->input('use_default_eula', '0');
        $category->require_acceptance = $request->input('require_acceptance', '0');
@@ -151,8 +150,10 @@ class CategoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param int $categoryId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($categoryId) : RedirectResponse
+    public function destroy($categoryId)
    {
        $this->authorize('delete', Category::class);
        // Check if the category exists
@@ -177,9 +178,11 @@ class CategoriesController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see CategoriesController::getDataView() method that generates the JSON response
     * @param $id
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.8]
     */
-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $this->authorize('view', Category::class);
        if ($category = Category::find($id)) {
@@ -11,8 +11,9 @@ trait CheckInOutRequest
 {
    /**
     * Find target for checkout
+     * @return SnipeModel        Target asset is being checked out to.
     */
-    protected function determineCheckoutTarget() : ?SnipeModel
+    protected function determineCheckoutTarget()
    {
        // This item is checked out to a location
        switch (request('checkout_to_type')) {
@@ -33,7 +34,7 @@ trait CheckInOutRequest
     * @param  SnipeModel $target Target with location
     * @return Asset        Asset being updated
     */
-    protected function updateAssetLocation($asset, $target) : Asset
+    protected function updateAssetLocation($asset, $target)
    {
        switch (request('checkout_to_type')) {
            case 'location':
@@ -7,8 +7,6 @@ use App\Models\Company;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;

 /**
 * This controller handles all actions related to Companies for
@@ -23,8 +21,10 @@ final class CompaniesController extends Controller
     *
     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('view', Company::class);

@@ -36,8 +36,10 @@ final class CompaniesController extends Controller
     *
     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Company::class);

@@ -50,8 +52,10 @@ final class CompaniesController extends Controller
     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
     * @since [v1.8]
     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Company::class);

@@ -77,8 +81,10 @@ final class CompaniesController extends Controller
     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
     * @since [v1.8]
     * @param int $companyId
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($companyId) : View | RedirectResponse
+    public function edit($companyId)
    {
        if (is_null($item = Company::find($companyId))) {
            return redirect()->route('companies.index')
@@ -97,8 +103,10 @@ final class CompaniesController extends Controller
     * @since [v1.8]
     * @param ImageUploadRequest $request
     * @param int $companyId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(ImageUploadRequest $request, $companyId) : RedirectResponse
+    public function update(ImageUploadRequest $request, $companyId)
    {
        if (is_null($company = Company::find($companyId))) {
            return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
@@ -127,8 +135,10 @@ final class CompaniesController extends Controller
     * @author [Abdullah Alansari] [<ahimta@gmail.com>]
     * @since [v1.8]
     * @param int $companyId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($companyId) : RedirectResponse
+    public function destroy($companyId)
    {
        if (is_null($company = Company::find($companyId))) {
            return redirect()->route('companies.index')
@@ -155,7 +165,7 @@ final class CompaniesController extends Controller
            ->with('success', trans('admin/companies/message.delete.success'));
    }

-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $this->authorize('view', Company::class);

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Components;

 use App\Events\CheckoutableCheckedIn;
 use App\Events\ComponentCheckedIn;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Component;
@@ -96,11 +95,13 @@ class ComponentCheckinController extends Controller

            $asset = Asset::find($component_assets->asset_id);

-            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
+            event(new CheckoutableCheckedIn($component, $asset, Auth::user(), $request->input('note'), Carbon::now()));
+            if ($backto == 'asset'){
+                return redirect()->route('hardware.show', $asset->id)->with('success',
+                    trans('admin/components/message.checkin.success'));
+            }

-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-
-            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success',
+            return redirect()->route('components.index')->with('success',
                trans('admin/components/message.checkin.success'));
        }

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Components;

 use App\Events\CheckoutableCheckedOut;
 use App\Events\ComponentCheckedOut;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Component;
@@ -94,27 +93,22 @@ class ComponentCheckoutController extends Controller
                ->withInput();
        }

-        // Check if the asset exists
+        // Check if the user exists
        $asset = Asset::find($request->input('asset_id'));

        // Update the component data
        $component->asset_id = $request->input('asset_id');
        $component->assets()->attach($component->id, [
            'component_id' => $component->id,
-            'user_id' => auth()->user()->id,
+            'user_id' => Auth::user(),
            'created_at' => date('Y-m-d H:i:s'),
            'assigned_qty' => $request->input('assigned_qty'),
            'asset_id' => $request->input('asset_id'),
            'note' => $request->input('note'),
        ]);

-        event(new CheckoutableCheckedOut($component, $asset, auth()->user(), $request->input('note')));
+        event(new CheckoutableCheckedOut($component, $asset, Auth::user(), $request->input('note')));

-        $request->request->add(['checkout_to_type' => 'asset']);
-        $request->request->add(['assigned_asset' => $asset->id]);
-
-        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
-
-        return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.checkout.success'));
+        return redirect()->route('components.index')->with('success', trans('admin/components/message.checkout.success'));
    }
 }
@@ -86,10 +86,8 @@ class ComponentsController extends Controller

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

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($component->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.create.success'));
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -162,10 +160,8 @@ class ComponentsController extends Controller

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

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($component->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.update.success'));
+            return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));
        }

        return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -3,13 +3,13 @@
 namespace App\Http\Controllers\Consumables;

 use App\Events\CheckoutableCheckedOut;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;

 class ConsumableCheckoutController extends Controller
 {
@@ -20,11 +20,13 @@ class ConsumableCheckoutController extends Controller
     * @see ConsumableCheckoutController::store() method that stores the data.
     * @since [v1.0]
     * @param int $id
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id) : View | RedirectResponse
+    public function create($id)
    {

-        if ($consumable = Consumable::find($id)) {
+        if ($consumable = Consumable::with('users')->find($id)) {

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

@@ -34,7 +36,7 @@ class ConsumableCheckoutController extends Controller
                // Make sure there is at least one available to checkout
                if ($consumable->numRemaining() <= 0){
                    return redirect()->route('consumables.index')
-                        ->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => 1, 'remaining' => $consumable->numRemaining()]));
+                        ->with('error', trans('admin/consumables/message.checkout.unavailable'));
                }

                // Return the checkout view
@@ -77,10 +79,10 @@ class ConsumableCheckoutController extends Controller

        // Make sure there is at least one available to checkout
        if ($consumable->numRemaining() <= 0 || $quantity > $consumable->numRemaining()) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => $quantity, 'remaining' => $consumable->numRemaining() ]));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable'));
        }

-        $admin_user = auth()->user();
+        $admin_user = Auth::user();
        $assigned_to = e($request->input('assigned_to'));

        // Check if the user exists
@@ -100,15 +102,9 @@ class ConsumableCheckoutController extends Controller
            'note' => $request->input('note'),
        ]);
        }
-        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));
-
-        $request->request->add(['checkout_to_type' => 'user']);
-        $request->request->add(['assigned_user' => $user->id]);
-
-        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
-
+        event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));

        // Redirect to the new consumable page
-        return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.checkout.success'));
+        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success'));
    }
 }
@@ -8,10 +8,8 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Consumable;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
-use App\Http\Requests\StoreConsumableRequest;

 /**
 * This controller handles all actions related to Consumables for
@@ -64,7 +62,7 @@ class ConsumablesController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(StoreConsumableRequest $request)
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Consumable::class);
        $consumable = new Consumable();
@@ -87,10 +85,8 @@ class ConsumablesController extends Controller

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

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($consumable->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.create.success'));
+            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -103,8 +99,10 @@ class ConsumablesController extends Controller
     * @param  int $consumableId
     * @see ConsumablesController::postEdit() method that stores the form data.
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($consumableId = null) : View | RedirectResponse
+    public function edit($consumableId = null)
    {
        if ($item = Consumable::find($consumableId)) {
            $this->authorize($item);
@@ -126,7 +124,7 @@ 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(ImageUploadRequest $request, $consumableId = null)
    {
        if (is_null($consumable = Consumable::find($consumableId))) {
            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
@@ -162,10 +160,8 @@ class ConsumablesController extends Controller

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

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($consumable->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.update.success'));
+            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.update.success'));
        }

        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -186,7 +182,6 @@ class ConsumablesController extends Controller
            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
        }
        $this->authorize($consumable);
-
        $consumable->delete();
        // Redirect to the locations management page
        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.delete.success'));
@@ -204,7 +199,7 @@ class ConsumablesController extends Controller
     */
    public function show($consumableId = null)
    {
-        $consumable = Consumable::withCount('users as users_consumables')->find($consumableId);
+        $consumable = Consumable::find($consumableId);
        $this->authorize($consumable);
        if (isset($consumable->id)) {
            return view('consumables/view', compact('consumable'));
@@ -213,16 +208,4 @@ class ConsumablesController extends Controller
        return redirect()->route('consumables.index')
            ->with('error', trans('admin/consumables/message.does_not_exist'));
    }
-
-    public function clone(Consumable $consumable) : View
-    {
-        $this->authorize('create', $consumable);
-        $consumable_to_close = $consumable;
-        $consumable = clone $consumable_to_close;
-        $consumable->id = null;
-        $consumable->image = null;
-        $consumable->user_id = null;
-
-        return view('consumables/edit')->with('item', $consumable);
-    }
 }
@@ -35,6 +35,6 @@ abstract class Controller extends BaseController
    public function __construct()
    {
        view()->share('signedIn', Auth::check());
-        view()->share('user', auth()->user());
+        view()->share('user', Auth::user());
    }
 }
@@ -8,8 +8,6 @@ use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;

 /**
 * This controller handles all actions related to Custom Asset Fields for
@@ -27,8 +25,10 @@ class CustomFieldsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('view', CustomField::class);

@@ -45,8 +45,10 @@ class CustomFieldsController extends Controller
     * @see CustomFieldsController::storeField()
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.1.5]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show() : RedirectResponse
+    public function show()
    {
        return redirect()->route('fields.index');
    }
@@ -58,8 +60,10 @@ class CustomFieldsController extends Controller
     * @see CustomFieldsController::storeField()
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create(Request $request) : View
+    public function create(Request $request)
    {
        $this->authorize('create', CustomField::class);
        $fieldsets = CustomFieldset::get();
@@ -78,8 +82,10 @@ class CustomFieldsController extends Controller
     * @see CustomFieldsController::createField()
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(CustomFieldRequest $request) : RedirectResponse
+    public function store(CustomFieldRequest $request)
    {
        $this->authorize('create', CustomField::class);

@@ -138,8 +144,10 @@ class CustomFieldsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function deleteFieldFromFieldset($field_id, $fieldset_id) : RedirectResponse
+    public function deleteFieldFromFieldset($field_id, $fieldset_id)
    {
        $field = CustomField::find($field_id);

@@ -168,8 +176,10 @@ class CustomFieldsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($field_id) : RedirectResponse
+    public function destroy($field_id)
    {
        if ($field = CustomField::find($field_id)) {
            $this->authorize('delete', $field);
@@ -192,8 +202,10 @@ class CustomFieldsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int $id
     * @since [v4.0]
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit(Request $request, $id) : View | RedirectResponse
+    public function edit(Request $request, $id)
    {
        if ($field = CustomField::find($id)) {

@@ -229,7 +241,7 @@ 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, $id)
    {
        $field = CustomField::find($id);

@@ -6,9 +6,10 @@ use App\Models\AssetModel;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Redirect;

 /**
 * This controller handles all actions related to Custom Asset Fields for
@@ -22,7 +23,7 @@ use \Illuminate\Contracts\View\View;
 class CustomFieldsetsController extends Controller
 {

-    public function index() : RedirectResponse
+    public function index() 
    {
        return redirect()->route("fields.index")
        ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
@@ -33,9 +34,11 @@ class CustomFieldsetsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @param int $id
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.8]
     */
-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $cfset = CustomFieldset::with('fields')
            ->where('id', '=', $id)->orderBy('id', 'ASC')->first();
@@ -67,8 +70,10 @@ class CustomFieldsetsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', CustomField::class);

@@ -84,13 +89,13 @@ class CustomFieldsetsController extends Controller
     * @return \Illuminate\Http\RedirectResponse
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(Request $request) : RedirectResponse
+    public function store(Request $request)
    {
        $this->authorize('create', CustomField::class);

        $fieldset = new CustomFieldset([
                'name' => $request->get('name'),
-                'user_id' => auth()->id(),
+                'user_id' => Auth::user()->id,
        ]);

        $validator = Validator::make($request->all(), $fieldset->rules);
@@ -121,8 +126,10 @@ class CustomFieldsetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int  $id
     * @since [v6.0.14]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($id) : View | RedirectResponse
+    public function edit($id)
    {
        $this->authorize('create', CustomField::class);

@@ -140,8 +147,10 @@ class CustomFieldsetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param  int  $id
     * @since [v6.0.14]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(Request $request, $id) : RedirectResponse
+    public function update(Request $request, $id)
    {
        $this->authorize('create', CustomField::class);

@@ -166,8 +175,10 @@ class CustomFieldsetsController extends Controller
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @param  int $id
     * @since [v1.8]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($id) : RedirectResponse
+    public function destroy($id)
    {
        $fieldset = CustomFieldset::find($id);

@@ -192,8 +203,9 @@ class CustomFieldsetsController extends Controller
     *
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
+     * @return View
     */
-    public function associate(Request $request, $id) : RedirectResponse
+    public function associate(Request $request, $id)
    {
        $set = CustomFieldset::find($id);

@@ -211,7 +223,7 @@ class CustomFieldsetsController extends Controller
            return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success'));
        }

-        return redirect()->route('fieldsets.show', [$id])->with('error', trans('admin/custom_fields/message.field.none_selected'));
+        return redirect()->route('fieldsets.show', [$id])->with('error', 'No field selected.');
    }

    /**
@@ -220,7 +232,7 @@ class CustomFieldsetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.0]
     */
-    public function makeFieldRequired($fieldset_id, $field_id) : RedirectResponse
+    public function makeFieldRequired($fieldset_id, $field_id)
    {
        $this->authorize('update', CustomField::class);
        $field = CustomField::findOrFail($field_id);
@@ -238,7 +250,7 @@ class CustomFieldsetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.0]
     */
-    public function makeFieldOptional($fieldset_id, $field_id) : RedirectResponse
+    public function makeFieldOptional($fieldset_id, $field_id)
    {
        $this->authorize('update', CustomField::class);
        $field = CustomField::findOrFail($field_id);
@@ -2,9 +2,8 @@

 namespace App\Http\Controllers;

+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;


 /**
@@ -22,11 +21,12 @@ class DashboardController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return View
     */
-    public function index() : View | RedirectResponse
+    public function index()
    {
        // Show the page
-        if (auth()->user()->hasAccess('admin')) {
+        if (Auth::user()->hasAccess('admin')) {
            $asset_stats = null;

            $counts['asset'] = \App\Models\Asset::count();
@@ -34,7 +34,7 @@ class DashboardController extends Controller
            $counts['license'] = \App\Models\License::assetcount();
            $counts['consumable'] = \App\Models\Consumable::count();
            $counts['component'] = \App\Models\Component::count();
-            $counts['user'] = \App\Models\Company::scopeCompanyables(auth()->user())->count();
+            $counts['user'] = \App\Models\Company::scopeCompanyables(Auth::user())->count();
            $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable'];

            if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
@@ -4,10 +4,8 @@ namespace App\Http\Controllers;

 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Department;
-use App\Models\Company;
 use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;

@@ -27,8 +25,10 @@ class DepartmentsController extends Controller
     * @see AssetController::getDatatable() method that generates the JSON response
     * @since [v4.0]
     * @param Request $request
+     * @return \Illuminate\Support\Facades\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index(Request $request) : View
+    public function index(Request $request)
    {
        $this->authorize('index', Department::class);
        $company = null;
@@ -45,13 +45,15 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Department::class);
        $department = new Department;
        $department->fill($request->all());
-        $department->user_id = auth()->id();
+        $department->user_id = Auth::user()->id;
        $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);
@@ -71,8 +73,10 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $id
     * @since [v4.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $department = Department::find($id);

@@ -91,8 +95,10 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see DepartmentsController::postCreate() method that validates and stores the data
     * @since [v4.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Department::class);

@@ -105,8 +111,10 @@ class DepartmentsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $locationId
     * @since [v4.0]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($id) : RedirectResponse
+    public function destroy($id)
    {
        if (is_null($department = Department::find($id))) {
            return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.not_found'));
@@ -137,8 +145,10 @@ class DepartmentsController extends Controller
     * @see LocationsController::postCreate() method that validates and stores
     * @param int $departmentId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($departmentId = null) : View | RedirectResponse
+    public function edit($departmentId = null)
    {
        if (is_null($item = Department::find($departmentId))) {
            return redirect()->back()->with('error', trans('admin/locations/message.does_not_exist'));
@@ -149,15 +159,7 @@ class DepartmentsController extends Controller
        return view('departments/edit', compact('item'));
    }

-    /**
-     * Save updated Department information.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @see LocationsController::postCreate() method that validates and stores
-     * @param int $departmentId
-     * @since [v1.0]
-     */
-    public function update(ImageUploadRequest $request, $id) : RedirectResponse
+    public function update(ImageUploadRequest $request, $id)
    {
        if (is_null($department = Department::find($id))) {
            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
@@ -5,8 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Depreciation;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+
 /**
 * This controller handles all actions related to Depreciations for
 * the Snipe-IT Asset Management application.
@@ -22,10 +21,14 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @see DepreciationsController::getDatatable() method that generates the JSON response
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('view', Depreciation::class);
+
+        // Show the page
        return view('depreciations/index');
    }

@@ -35,8 +38,10 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @see DepreciationsController::postCreate()
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Depreciation::class);

@@ -51,8 +56,10 @@ class DepreciationsController extends Controller
     * @see DepreciationsController::postCreate()
     * @since [v1.0]
     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(Request $request) : RedirectResponse
+    public function store(Request $request)
    {
        $this->authorize('create', Depreciation::class);

@@ -80,8 +87,10 @@ class DepreciationsController extends Controller
     * @see DepreciationsController::postEdit()
     * @param int $depreciationId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($depreciationId = null) : RedirectResponse | View
+    public function edit($depreciationId = null)
    {
        // Check if the depreciation exists
        if (is_null($item = Depreciation::find($depreciationId))) {
@@ -101,9 +110,11 @@ class DepreciationsController extends Controller
     * @see DepreciationsController::getEdit()
     * @param Request $request
     * @param int $depreciationId
+     * @return \Illuminate\Http\RedirectResponse
     * @since [v1.0]
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(Request $request, $depreciationId = null) : RedirectResponse
+    public function update(Request $request, $depreciationId = null)
    {
        // Check if the depreciation exists
        if (is_null($depreciation = Depreciation::find($depreciationId))) {
@@ -135,8 +146,10 @@ class DepreciationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @since [v1.0]
     * @param int $depreciationId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($depreciationId) : RedirectResponse
+    public function destroy($depreciationId)
    {
        // Check if the depreciation exists
        if (is_null($depreciation = Depreciation::withCount('models as models_count')->find($depreciationId))) {
@@ -162,8 +175,10 @@ class DepreciationsController extends Controller
     * @see DepreciationsController::postEdit()
     * @param int $depreciationId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        if (is_null($depreciation = Depreciation::find($id))) {
            // Redirect to the blogs management page
@@ -2,7 +2,7 @@

 namespace App\Http\Controllers;

-use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Facades\Socialite;
@@ -30,7 +30,7 @@ class GoogleAuthController extends Controller
        return Socialite::driver('google')->redirect();
    }

-    public function handleGoogleCallback() : RedirectResponse
+    public function handleGoogleCallback()
    {
        try {
            $socialUser = Socialite::driver('google')->user();
@@ -5,8 +5,7 @@ namespace App\Http\Controllers;
 use App\Helpers\Helper;
 use App\Models\Group;
 use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;

 /**
 * This controller handles all actions related to User Groups for
@@ -23,9 +22,11 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @see GroupsController::getDatatable() method that generates the JSON response
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function index(): View
+    public function index()
    {
+        // Show the page
        return view('groups/index');
    }

@@ -35,8 +36,9 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @see GroupsController::postCreate()
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function create(Request $request) : View
+    public function create(Request $request)
    {
        $group = new Group;
        // Get all the available permissions
@@ -54,14 +56,15 @@ class GroupsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net]
     * @see GroupsController::getCreate()
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function store(Request $request) : RedirectResponse
+    public function store(Request $request)
    {
        // create a new group instance
        $group = new Group();
        $group->name = $request->input('name');
        $group->permissions = json_encode($request->input('permission'));
-        $group->created_by = auth()->id();
+        $group->created_by = Auth::user()->id;

        if ($group->save()) {
            return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
@@ -77,8 +80,9 @@ class GroupsController extends Controller
     * @see GroupsController::postEdit()
     * @param int $id
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function edit($id) : View | RedirectResponse
+    public function edit($id)
    {
        $group = Group::find($id);

@@ -100,8 +104,9 @@ class GroupsController extends Controller
     * @see GroupsController::getEdit()
     * @param int $id
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function update(Request $request, $id = null) : RedirectResponse
+    public function update(Request $request, $id = null)
    {
        if (! $group = Group::find($id)) {
            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
@@ -127,8 +132,10 @@ class GroupsController extends Controller
     * @see GroupsController::getEdit()
     * @param int $id
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
     */
-    public function destroy($id) : RedirectResponse
+    public function destroy($id)
    {
        if (! config('app.lock_passwords')) {
            if (! $group = Group::find($id)) {
@@ -147,9 +154,10 @@ class GroupsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param $id
+     * @return \Illuminate\Contracts\View\View
     * @since [v4.0.11]
     */
-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $group = Group::find($id);

@@ -5,13 +5,10 @@ namespace App\Http\Controllers;
 use Illuminate\Routing\Controller as BaseController;

 /**
- * This controller provide the health route  for
+ * This controller provide the healthz route  for
 * the Snipe-IT Asset Management application.
 *
- * @version   v1.0
- *
- * @return \Illuminate\Http\JsonResponse
-
+ * @version    v1.0
 */
 class HealthController extends BaseController
 {
@@ -33,7 +33,7 @@ class CheckoutKitController extends Controller
     * Show Bulk Checkout Page
     *
     * @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
-     * @return \Illuminate\Contracts\View\View View to checkout
+     * @return View View to checkout
     */
    public function showCheckout($kit_id)
    {
@@ -73,7 +73,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @since [v1.0]
     * @param int $kit_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function edit($kit_id = null)
    {
@@ -150,7 +150,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @since [v1.0]
     * @param int $modelId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function show($kit_id = null)
    {
@@ -162,7 +162,7 @@ class PredefinedKitsController extends Controller
     *
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function editModel($kit_id, $model_id)
    {
@@ -184,7 +184,7 @@ class PredefinedKitsController extends Controller
     *
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $modelId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function updateModel(Request $request, $kit_id, $model_id)
    {
@@ -214,7 +214,7 @@ class PredefinedKitsController extends Controller
     *
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $modelId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function detachModel($kit_id, $model_id)
    {
@@ -237,7 +237,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $license_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function editLicense($kit_id, $license_id)
    {
@@ -262,7 +262,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $license_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function updateLicense(Request $request, $kit_id, $license_id)
    {
@@ -293,7 +293,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $license_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function detachLicense($kit_id, $license_id)
    {
@@ -316,7 +316,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $accessoryId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function editAccessory($kit_id, $accessory_id)
    {
@@ -341,7 +341,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $accessory_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function updateAccessory(Request $request, $kit_id, $accessory_id)
    {
@@ -371,7 +371,7 @@ class PredefinedKitsController extends Controller
     *
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $accessory_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function detachAccessory($kit_id, $accessory_id)
    {
@@ -394,7 +394,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $consumable_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function editConsumable($kit_id, $consumable_id)
    {
@@ -419,7 +419,7 @@ class PredefinedKitsController extends Controller
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $kit_id
     * @param int $consumableId
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function updateConsumable(Request $request, $kit_id, $consumable_id)
    {
@@ -449,7 +449,7 @@ class PredefinedKitsController extends Controller
     *
     * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
     * @param int $consumable_id
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function detachConsumable($kit_id, $consumable_id)
    {
@@ -14,6 +14,8 @@ use App\Models\Setting;
 use App\Models\Supplier;
 use App\Models\User;
 use App\View\Label as LabelView;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;

 class LabelsController extends Controller
 {
@@ -21,6 +23,7 @@ class LabelsController extends Controller
     * Returns the Label view with test data
     *
     * @param string $labelName
+     * @return \Illuminate\Contracts\View\View
     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
     */
    public function show(string $labelName)
@@ -93,5 +96,6 @@ class LabelsController extends Controller
            ->with('bulkedit', false)
            ->with('count', 0);

+        return redirect()->route('home')->with('error', trans('admin/labels/message.does_not_exist'));
    }
 }
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Licenses;

 use App\Events\CheckoutableCheckedIn;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -101,15 +100,15 @@ class LicenseCheckinController extends Controller
        $licenseSeat->asset_id = null;
        $licenseSeat->notes = $request->input('notes');

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
-
        // Was the asset updated?
        if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $request->input('notes')));
+            event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('notes')));

+            if ($backTo == 'user') {
+                return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
+            }

-            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkin.success'));
+            return redirect()->route('licenses.show', $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success'));
        }

        // Redirect to the license page with error
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Licenses;

 use App\Events\CheckoutableCheckedOut;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
 use App\Models\Accessory;
@@ -82,27 +81,10 @@ class LicenseCheckoutController extends Controller
        

        $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
-
-        if ($request->filled('asset_id')) {
-
-            $checkoutTarget = $this->checkoutToAsset($licenseSeat);
-            $request->request->add(['assigned_asset' => $checkoutTarget->id]);
-            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'asset']);
-
-        } elseif ($request->filled('assigned_to')) {
-            $checkoutTarget = $this->checkoutToUser($licenseSeat);
-            $request->request->add(['assigned_user' => $checkoutTarget->id]);
-            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'user']);
+        if ($this->$checkoutMethod($licenseSeat)) {
+            return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success'));
        }

-
-
-        if ($checkoutTarget) {
-            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkout.success'));
-        }
-
-
-
        return redirect()->route('licenses.index')->with('error', trans('Something went wrong handling this checkout.'));
    }

@@ -112,14 +94,14 @@ class LicenseCheckoutController extends Controller

        if (! $licenseSeat) {
            if ($seatId) {
-                throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.unavailable')));
+                throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'));
            }
            
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats')));
+            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'There are no available seats for this license.'));
        }

        if (! $licenseSeat->license->is($license)) {
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.mismatch')));
+            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'));
        }

        return $licenseSeat;
@@ -137,8 +119,9 @@ class LicenseCheckoutController extends Controller
            $licenseSeat->assigned_to = $target->assigned_to;
        }
        if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));
-            return $target;
+            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
+
+            return true;
        }

        return false;
@@ -153,8 +136,9 @@ class LicenseCheckoutController extends Controller
        $licenseSeat->assigned_to = request('assigned_to');

        if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));
-            return $target;
+            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
+
+            return true;
        }

        return false;
@@ -102,10 +102,8 @@ class LicensesController extends Controller
        $license->user_id           = Auth::id();
        $license->min_amt           = $request->input('min_amt');

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($license->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.create.success'));
+            return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -182,10 +180,8 @@ class LicensesController extends Controller
        $license->category_id       = $request->input('category_id');
        $license->min_amt           = $request->input('min_amt');

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($license->save()) {
-            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.update.success'));
+            return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success'));
        }
        // If we can't adjust the number of seats, the error is flashed to the session by the event handler in License.php
        return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -6,11 +6,11 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Asset;
 use App\Models\Location;
 use App\Models\User;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+
 /**
 * This controller handles all actions related to Locations for
 * the Snipe-IT Asset Management application.
@@ -26,8 +26,10 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see LocationsController::getDatatable() method that generates the JSON response
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        // Grab all the locations
        $this->authorize('view', Location::class);
@@ -41,8 +43,10 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see LocationsController::postCreate() method that validates and stores the data
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Location::class);

@@ -58,8 +62,10 @@ class LocationsController extends Controller
     * @see LocationsController::getCreate() method that makes the form
     * @since [v1.0]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Location::class);
        $location = new Location();
@@ -74,7 +80,7 @@ class LocationsController extends Controller
        $location->zip = $request->input('zip');
        $location->ldap_ou = $request->input('ldap_ou');
        $location->manager_id = $request->input('manager_id');
-        $location->user_id = auth()->id();
+        $location->user_id = Auth::id();
        $location->phone = request('phone');
        $location->fax = request('fax');

@@ -94,8 +100,10 @@ class LocationsController extends Controller
     * @see LocationsController::postCreate() method that validates and stores
     * @param int $locationId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($locationId = null) : View | RedirectResponse
+    public function edit($locationId = null)
    {
        $this->authorize('update', Location::class);
        // Check if the location exists
@@ -113,9 +121,11 @@ class LocationsController extends Controller
     * @see LocationsController::getEdit() method that makes the form view
     * @param ImageUploadRequest $request
     * @param int $locationId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @since [v1.0]
     */
-    public function update(ImageUploadRequest $request, $locationId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, $locationId = null)
    {
        $this->authorize('update', Location::class);
        // Check if the location exists
@@ -153,8 +163,10 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $locationId
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($locationId) : RedirectResponse
+    public function destroy($locationId)
    {
        $this->authorize('delete', Location::class);
        if (is_null($location = Location::find($locationId))) {
@@ -190,8 +202,9 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $id
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function show($id = null) : View | RedirectResponse
+    public function show($id = null)
    {
        $location = Location::find($id);

@@ -202,7 +215,7 @@ class LocationsController extends Controller
        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
    }

-    public function print_assigned($id) : View | RedirectResponse
+    public function print_assigned($id)
    {

        if ($location = Location::where('id', $id)->first()) {
@@ -227,8 +240,9 @@ class LocationsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $locationId
     * @since [v6.0.14]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getClone($locationId = null) : View | RedirectResponse
+    public function getClone($locationId = null)
    {
        $this->authorize('create', Location::class);

@@ -249,7 +263,7 @@ class LocationsController extends Controller
    }


-    public function print_all_assigned($id) : View | RedirectResponse
+    public function print_all_assigned($id)
    {
        if ($location = Location::where('id', $id)->first()) {
            $parent = Location::where('id', $location->parent_id)->first();
@@ -268,8 +282,9 @@ class LocationsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.3.1]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function postBulkDelete(Request $request) : View | RedirectResponse
+    public function postBulkDelete(Request $request)
    {
        $locations_raw_array = $request->input('ids');

@@ -300,10 +315,9 @@ class LocationsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.3.1]
-
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postBulkDeleteStore(Request $request) : RedirectResponse
-    {
+    public function postBulkDeleteStore(Request $request) {
        $locations_raw_array = $request->input('ids');

        if ((is_array($locations_raw_array)) && (count($locations_raw_array) > 0)) {
@@ -2,15 +2,17 @@

 namespace App\Http\Controllers;

+use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
+use App\Models\Asset;
 use App\Models\Manufacturer;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
+use Redirect;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;

 /**
 * This controller handles all actions related to Manufacturers for
@@ -27,10 +29,13 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see Api\ManufacturersController::index() method that generates the JSON response
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('index', Manufacturer::class);
+
        return view('manufacturers/index');
    }

@@ -40,8 +45,10 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see ManufacturersController::store()
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Manufacturer::class);

@@ -55,8 +62,10 @@ class ManufacturersController extends Controller
     * @see ManufacturersController::create()
     * @since [v1.0]
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Manufacturer::class);
        $manufacturer = new Manufacturer;
@@ -83,8 +92,10 @@ class ManufacturersController extends Controller
     * @see ManufacturersController::update()
     * @param int $manufacturerId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($manufacturerId = null) : View | RedirectResponse
+    public function edit($manufacturerId = null)
    {
        // Handles manufacturer checks and permissions.
        $this->authorize('update', Manufacturer::class);
@@ -105,9 +116,11 @@ class ManufacturersController extends Controller
     * @see ManufacturersController::getEdit()
     * @param Request $request
     * @param int $manufacturerId
+     * @return \Illuminate\Http\RedirectResponse
     * @since [v1.0]
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(ImageUploadRequest $request, $manufacturerId = null) : RedirectResponse
+    public function update(ImageUploadRequest $request, $manufacturerId = null)
    {
        $this->authorize('update', Manufacturer::class);
        // Check if the manufacturer exists
@@ -144,8 +157,10 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $manufacturerId
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($manufacturerId) : RedirectResponse
+    public function destroy($manufacturerId)
    {
        $this->authorize('delete', Manufacturer::class);
        if (is_null($manufacturer = Manufacturer::withTrashed()->withCount('models as models_count')->find($manufacturerId))) {
@@ -182,8 +197,10 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $manufacturerId
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($manufacturerId = null) : View | RedirectResponse
+    public function show($manufacturerId = null)
    {
        $this->authorize('view', Manufacturer::class);
        $manufacturer = Manufacturer::find($manufacturerId);
@@ -203,8 +220,10 @@ class ManufacturersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.1.15]
     * @param int $manufacturers_id
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function restore($id) : RedirectResponse
+    public function restore($id)
    {
        $this->authorize('delete', Manufacturer::class);

@@ -219,7 +238,7 @@ class ManufacturersController extends Controller
                $logaction->item_type = Manufacturer::class;
                $logaction->item_id = $manufacturer->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('restore');

                // Redirect them to the deleted page if there are more, otherwise the section index
@@ -15,7 +15,7 @@ class ModalController extends Controller
     * @version    v5.3.7-pre
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @author [A. Gianotto] [<snipe@snipe.net]
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     */
    public function show ($type, $itemId = null) {

@@ -10,8 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+
 /**
 * This controller handles all actions related to User Profiles for
 * the Snipe-IT Asset Management application.
@@ -25,11 +24,12 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
     */
-    public function getIndex() : View
+    public function getIndex()
    {
        $this->authorize('self.profile');
-        $user = auth()->user();
+        $user = Auth::user();
        return view('account/profile', compact('user'));
    }

@@ -38,11 +38,12 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postIndex(ImageUploadRequest $request) : RedirectResponse
+    public function postIndex(ImageUploadRequest $request)
    {
        $this->authorize('self.profile');
-        $user = auth()->user();
+        $user = Auth::user();
        $user->first_name = $request->input('first_name');
        $user->last_name = $request->input('last_name');
        $user->website = $request->input('website');
@@ -83,7 +84,7 @@ class ProfileController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     */
-    public function api(): View
+    public function api(): \Illuminate\Contracts\View\View
    {
        // Make sure the self.api permission has been granted
        if (!Gate::allows('self.api')) {
@@ -96,23 +97,27 @@ class ProfileController extends Controller
    /**
     * User change email page.
     *
+     * @return View
     */
-    public function password() : View
+    public function password()
    {
-        $user = auth()->user();
+        $user = Auth::user();
+        
        return view('account/change-password', compact('user'));
    }

    /**
     * Users change password form processing page.
+     *
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function passwordSave(Request $request) : RedirectResponse
+    public function passwordSave(Request $request)
    {
        if (config('app.lock_passwords')) {
            return redirect()->route('account.password.index')->with('error', trans('admin/users/table.lock_passwords'));
        }

-        $user = auth()->user();
+        $user = Auth::user();
        if ($user->ldap_import == '1') {
            return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap'));
        }
@@ -173,8 +178,9 @@ class ProfileController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return View
     */
-    public function getMenuState(Request $request) : void
+    public function getMenuState(Request $request)
    {
        if ($request->input('state') == 'open') {
            $request->session()->put('menu_state', 'open');
@@ -189,13 +195,14 @@ class ProfileController extends Controller
     *
     * @author A. Gianotto
     * @since [v6.0.12]
+     * @return Illuminate\View\View
     */
-    public function printInventory() : View
+    public function printInventory()
    {
-        $show_user = auth()->user();
+        $show_user = Auth::user();

        return view('users/print')
-            ->with('assets', auth()->user()->assets)
+            ->with('assets', Auth::user()->assets)
            ->with('licenses', $show_user->licenses()->get())
            ->with('accessories', $show_user->accessories()->get())
            ->with('consumables', $show_user->consumables()->get())
@@ -208,11 +215,12 @@ class ProfileController extends Controller
     *
     * @author A. Gianotto
     * @since [v6.0.12]
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function emailAssetList() : RedirectResponse
+    public function emailAssetList()
    {

-        if (!$user = User::find(auth()->id())) {
+        if (!$user = User::find(Auth::user()->id)) {
            return redirect()->back()
                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
        }
@@ -6,8 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Category;
 use App\Models\AssetMaintenance;
 use App\Models\CheckoutAcceptance;
 use App\Models\CustomField;
@@ -16,16 +14,17 @@ use App\Models\License;
 use App\Models\Setting;
 use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Notification;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use League\Csv\EscapeFormula;
 use App\Http\Requests\CustomAssetReportRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Http\RedirectResponse;
+

 /**
 * This controller handles all actions related to Reports for
@@ -48,9 +47,9 @@ class ReportsController extends Controller
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
-    * @return \Illuminate\Contracts\View\View
+    * @return View
    */
-    public function getAccessoryReport() : View
+    public function getAccessoryReport()
    {
        $this->authorize('reports.view');

@@ -66,7 +65,7 @@ class ReportsController extends Controller
    * @since [v1.0]
    * @return \Illuminate\Http\Response
    */
-    public function exportAccessoryReport() : Response
+    public function exportAccessoryReport()
    {
        $this->authorize('reports.view');
        $accessories = Accessory::orderBy('created_at', 'DESC')->get();
@@ -93,7 +92,7 @@ class ReportsController extends Controller
        }

        $csv = implode("\n", $rows);
-        $response = response()->make($csv, 200);
+        $response = Response::make($csv, 200);
        $response->header('Content-Type', 'text/csv');
        $response->header('Content-disposition', 'attachment;filename=report.csv');

@@ -105,8 +104,9 @@ class ReportsController extends Controller
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
+    * @return View
    */
-    public function getDeprecationReport() : View
+    public function getDeprecationReport()
    {
        $this->authorize('reports.view');
        $depreciations = Depreciation::get();
@@ -119,8 +119,9 @@ class ReportsController extends Controller
    * @deprecated Server-side exports have been replaced by datatables export since v2.
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
+    * @return \Illuminate\Http\Response
    */
-    public function exportDeprecationReport() : Response
+    public function exportDeprecationReport()
    {
        $this->authorize('reports.view');
        // Grab all the assets
@@ -196,10 +197,12 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
+     * @return View
     */
-    public function audit() : View
+    public function audit()
    {
        $this->authorize('reports.view');
+
        return view('reports/audit');
    }

@@ -209,8 +212,9 @@ class ReportsController extends Controller
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
+    * @return View
    */
-    public function getActivityReport() : View
+    public function getActivityReport()
    {
        $this->authorize('reports.view');

@@ -222,8 +226,9 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v5.0.7]
+     * @return \Illuminate\Http\Response
     */
-    public function postActivityReport(Request $request) : StreamedResponse
+    public function postActivityReport(Request $request)
    {
        ini_set('max_execution_time', 12000);
        $this->authorize('reports.view');
@@ -323,8 +328,9 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
+     * @return View
     */
-    public function getLicenseReport() : View
+    public function getLicenseReport()
    {
        $this->authorize('reports.view');
        $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
@@ -340,8 +346,9 @@ class ReportsController extends Controller
    * @deprecated Server-side exports have been replaced by datatables export since v2.
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @since [v1.0]
+    * @return \Illuminate\Http\Response
    */
-    public function exportLicenseReport() : Response
+    public function exportLicenseReport()
    {
        $this->authorize('reports.view');
        $licenses = License::orderBy('created_at', 'DESC')->get();
@@ -378,7 +385,7 @@ class ReportsController extends Controller


        $csv      = implode("\n", $rows);
-        $response = response()->make($csv, 200);
+        $response = Response::make($csv, 200);
        $response->header('Content-Type', 'text/csv');
        $response->header('Content-disposition', 'attachment;filename=report.csv');

@@ -391,8 +398,9 @@ class ReportsController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @see ReportsController::postCustomReport() method that generates the CSV
    * @since [v1.0]
+    * @return \Illuminate\Http\Response
    */
-    public function getCustomReport() : View
+    public function getCustomReport()
    {
        $this->authorize('reports.view');
        $customfields = CustomField::get();
@@ -406,8 +414,9 @@ class ReportsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see ReportsController::getCustomReport() method that generates form view
     * @since [v1.0]
+     * @return \Illuminate\Http\Response
     */
-    public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
+    public function postCustom(CustomAssetReportRequest $request)
    {
        ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes
        $this->authorize('reports.view');
@@ -672,15 +681,15 @@ class ReportsController extends Controller
            }

            if (($request->filled('created_start')) && ($request->filled('created_end'))) {
-                $created_start = Carbon::parse($request->input('created_start'))->startOfDay();
-                $created_end = Carbon::parse($request->input('created_end'))->endOfDay();
+                $created_start = \Carbon::parse($request->input('created_start'))->startOfDay();
+                $created_end = \Carbon::parse($request->input('created_end'))->endOfDay();

                $assets->whereBetween('assets.created_at', [$created_start, $created_end]);
            }

            if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
-                $checkout_start = Carbon::parse($request->input('checkout_date_start'))->startOfDay();
-                $checkout_end = Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();
+                $checkout_start = \Carbon::parse($request->input('checkout_date_start'))->startOfDay();
+                $checkout_end = \Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();

                $actionlogassets = Actionlog::where('action_type','=', 'checkout')
                                              ->where('item_type', 'LIKE', '%Asset%',)
@@ -691,9 +700,9 @@ class ReportsController extends Controller
            }

            if (($request->filled('checkin_date_start'))) {
-                $checkin_start = Carbon::parse($request->input('checkin_date_start'))->startOfDay();
+                $checkin_start = \Carbon::parse($request->input('checkin_date_start'))->startOfDay();
                        // use today's date is `checkin_date_end` is not provided
-                $checkin_end = Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();
+                $checkin_end = \Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();

                $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end ]);
            }
@@ -704,8 +713,8 @@ class ReportsController extends Controller
            }

            if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {
-                    $last_audit_start = Carbon::parse($request->input('last_audit_start'))->startOfDay();
-                    $last_audit_end = Carbon::parse($request->input('last_audit_end'))->endOfDay();
+                    $last_audit_start = \Carbon::parse($request->input('last_audit_start'))->startOfDay();
+                    $last_audit_end = \Carbon::parse($request->input('last_audit_end'))->endOfDay();

                    $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);
            }
@@ -1006,10 +1015,11 @@ class ReportsController extends Controller
    /**
     * getImprovementsReport
     *
+     * @return View
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function getAssetMaintenancesReport() : View
+    public function getAssetMaintenancesReport()
    {
        $this->authorize('reports.view');

@@ -1019,10 +1029,11 @@ class ReportsController extends Controller
    /**
     * exportImprovementsReport
     *
+     * @return \Illuminate\Http\Response
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function exportAssetMaintenancesReport() : Response
+    public function exportAssetMaintenancesReport()
    {
        $this->authorize('reports.view');
        // Grab all the improvements
@@ -1069,7 +1080,7 @@ class ReportsController extends Controller

        // spit out a csv
        $csv      = implode("\n", $rows);
-        $response = response()->make($csv, 200);
+        $response = Response::make($csv, 200);
        $response->header('Content-Type', 'text/csv');
        $response->header('Content-disposition', 'attachment;filename=report.csv');

@@ -1079,10 +1090,13 @@ class ReportsController extends Controller
    /**
     * getAssetAcceptanceReport
     *
+     * @return mixed
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function getAssetAcceptanceReport($deleted = false) : View
+    public function getAssetAcceptanceReport($deleted = false)
    {
        $this->authorize('reports.view');
        $showDeleted = $deleted == 'deleted';
@@ -1118,9 +1132,11 @@ class ReportsController extends Controller
     * sentAssetAcceptanceReminder
     *
     * @param integer|null $acceptanceId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @version v1.0
     */
-    public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
+    public function sentAssetAcceptanceReminder(Request $request)
    {
        $this->authorize('reports.view');

@@ -1174,9 +1190,11 @@ class ReportsController extends Controller
     * sentAssetAcceptanceReminder
     *
     * @param integer|null $acceptanceId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @version v1.0
     */
-    public function deleteAssetAcceptance($acceptanceId = null) : RedirectResponse
+    public function deleteAssetAcceptance($acceptanceId = null)
    {
        $this->authorize('reports.view');

@@ -1195,10 +1213,11 @@ class ReportsController extends Controller
    /**
     * Exports the AssetAcceptance report to CSV
     *
+     * @return \Illuminate\Http\Response
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function postAssetAcceptanceReport($deleted = false) : Response
+    public function postAssetAcceptanceReport($deleted = false)
    {
        $this->authorize('reports.view');
        $showDeleted = $deleted == 'deleted';
@@ -1249,7 +1268,7 @@ class ReportsController extends Controller

        // spit out a csv
        $csv      = implode("\n", $rows);
-        $response = response()->make($csv, 200);
+        $response = Response::make($csv, 200);
        $response->header('Content-Type', 'text/csv');
        $response->header('Content-disposition', 'attachment;filename=report.csv');

@@ -1265,7 +1284,7 @@ class ReportsController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance) : View
+    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
    {
        $this->authorize('reports.view');
        $assets = Asset::deployed()
@@ -1285,11 +1304,11 @@ class ReportsController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance) : array
+    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance)
    {
        $this->authorize('reports.view');

-        return array_pluck(AssetModel::inCategory($assetCategoriesRequiringAcceptance)
+        return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
                                 ->select('id')
                                 ->get()
                                 ->toArray(), 'id');
@@ -1302,7 +1321,7 @@ class ReportsController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    protected function getCategoriesThatRequireAcceptance() : array
+    protected function getCategoriesThatRequireAcceptance()
    {
        $this->authorize('reports.view');

@@ -1315,10 +1334,11 @@ class ReportsController extends Controller
    /**
     * getAssetsCheckedOutRequiringAcceptance
     *
+     * @return array
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    protected function getAssetsCheckedOutRequiringAcceptance() : array
+    protected function getAssetsCheckedOutRequiringAcceptance()
    {
        $this->authorize('reports.view');

@@ -14,13 +14,12 @@ use App\Models\Asset;
 use App\Models\User;
 use App\Notifications\FirstAdminNotification;
 use App\Notifications\MailTest;
+use Illuminate\Http\Client\HttpClientException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rule;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\JsonResponse;
-use \Illuminate\Contracts\View\View;
+use Redirect;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
@@ -31,7 +30,6 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Validator;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;

 /**
 * This controller handles all actions related to Settings for
@@ -49,9 +47,9 @@ class SettingsController extends Controller
     *
     * @since [v3.0]
     *
-     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\Response
+     * @return View
     */
-    public function getSetupIndex() : View
+    public function getSetupIndex()
    {
        $start_settings['php_version_min'] = false;

@@ -125,14 +123,14 @@ class SettingsController extends Controller
     * @return bool This method will return true when exceptions (such as curl exception) is thrown.
     * Check the log files to see more details about the exception.
     */
-    protected function dotEnvFileIsExposed() : bool
+    protected function dotEnvFileIsExposed()
    {
        try {
-            return Http::withoutVerifying()->timeout(10)
+            return Http::timeout(10)
                ->accept('*/*')
                ->get(URL::to('.env'))
                ->successful();
-        } catch (\Exception $e) {
+        } catch (HttpClientException $e) {
            Log::debug($e->getMessage());
            return true;
        }
@@ -155,12 +153,13 @@ class SettingsController extends Controller
     * Save the first admin user from Setup.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v3.0]
     *
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postSaveFirstAdmin(SetupUserRequest $request) : RedirectResponse
+    public function postSaveFirstAdmin(SetupUserRequest $request)
    {
-
        $user = new User();
        $user->first_name = $data['first_name'] = $request->input('first_name');
        $user->last_name = $request->input('last_name');
@@ -215,8 +214,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v3.0]
+     *
+     * @return View
     */
-    public function getSetupUser() : View
+    public function getSetupUser()
    {
        return view('setup/user')
            ->with('step', 3)
@@ -229,8 +230,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v3.0]
+     *
+     * @return View
     */
-    public function getSetupDone() : View
+    public function getSetupDone()
    {
        return view('setup/done')
            ->with('step', 4)
@@ -244,8 +247,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v3.0]
+     *
+     * @return View
     */
-    public function getSetupMigrate() : View
+    public function getSetupMigrate()
    {
        Artisan::call('migrate', ['--force' => true]);
        if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
@@ -265,8 +270,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function index() : View
+    public function index()
    {
        $settings = Setting::getSettings();

@@ -279,9 +286,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getEdit() : View
-
+    public function getEdit()
    {
        $setting = Setting::getSettings();

@@ -294,8 +302,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getSettings() : View
+    public function getSettings()
    {
        $setting = Setting::getSettings();

@@ -308,9 +318,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postSettings(Request $request) : RedirectResponse
-
+    public function postSettings(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -364,8 +375,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getBranding() : View
+    public function getBranding()
    {
        $setting = Setting::getSettings();

@@ -378,8 +391,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
     */
-    public function postBranding(ImageUploadRequest $request) : RedirectResponse
+    public function postBranding(ImageUploadRequest $request)
    {
        // Something has gone horribly wrong - no settings record exists!
        if (is_null($setting = Setting::getSettings())) {
@@ -413,7 +428,10 @@ class SettingsController extends Controller
            $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');

            if ($request->input('clear_logo') == '1') {
-                $setting = $request->deleteExistingImage($setting, '', 'logo');
+
+                if (($setting->logo) && (Storage::exists($setting->logo))) {
+                    Storage::disk('public')->delete($setting->logo);
+                }
                $setting->logo = null;
                $setting->brand = 1;
            }
@@ -421,38 +439,43 @@ class SettingsController extends Controller
            // Email logo upload
            $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
            if ($request->input('clear_email_logo') == '1') {
-                $setting = $request->deleteExistingImage($setting, '', 'email_logo');
+
+                if (($setting->email_logo) && (Storage::exists($setting->email_logo))) {
+                    Storage::disk('public')->delete($setting->email_logo);
+                }
                $setting->email_logo = null;
+                // If they are uploading an image, validate it and upload it
            }

             // Label logo upload
            $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
-
            if ($request->input('clear_label_logo') == '1') {
-                $setting = $request->deleteExistingImage($setting, '', 'label_logo');
+
+                if (($setting->label_logo) && (Storage::exists($setting->label_logo))) {
+                    Storage::disk('public')->delete($setting->label_logo);
+                }
                $setting->label_logo = null;
            }

            // Favicon upload
            $setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');
            if ('1' == $request->input('clear_favicon')) {
-                $setting = $request->deleteExistingImage($setting, '', 'favicon');
+
+                if (($setting->favicon) && (Storage::exists($setting->favicon))) {
+                    Storage::disk('public')->delete($setting->favicon);
+                }
                $setting->favicon = null;
            }

            // Default avatar upload
            $setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');
-            if ($request->input('clear_default_avatar') == '1')  {
-                // Don't delete the file, just update the field if this is the default
-                if ($setting->default_avatar!='default.png') {
-                    $setting = $request->deleteExistingImage($setting, 'avatars', 'default_avatar');
+            if ($request->input('clear_default_avatar') == '1') {
+
+                if (($setting->default_avatar) && (Storage::exists('avatars/'.$setting->default_avatar))) {
+                    Storage::disk('public')->delete('avatars/'.$setting->default_avatar);
                }
                $setting->default_avatar = null;
            }
-
-            if ($request->input('restore_default_avatar') == '1')  {
-                $setting->default_avatar = 'default.png';
-            }
        }

        if ($setting->save()) {
@@ -470,8 +493,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getSecurity() : View
+    public function getSecurity()
    {
        $setting = Setting::getSettings();

@@ -484,8 +509,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postSecurity(Request $request) : RedirectResponse
+    public function postSecurity(Request $request)
    {
        $this->validate($request, [
            'pwd_secure_complexity' => 'array',
@@ -540,8 +567,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getLocalization() : View
+    public function getLocalization()
    {
        $setting = Setting::getSettings();

@@ -554,8 +583,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postLocalization(Request $request) : RedirectResponse
+    public function postLocalization(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -584,8 +615,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getAlerts() : View
+    public function getAlerts()
    {
        $setting = Setting::getSettings();

@@ -596,9 +629,12 @@ class SettingsController extends Controller
     * Return a form to allow a super admin to update settings.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postAlerts(Request $request) : RedirectResponse
+    public function postAlerts(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -652,8 +688,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getSlack() : View
+    public function getSlack()
    {
        $setting = Setting::getSettings();

@@ -666,8 +704,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getAssetTags() : View
+    public function getAssetTags()
    {
        $setting = Setting::getSettings();

@@ -680,8 +720,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postAssetTags(Request $request) : RedirectResponse
+    public function postAssetTags(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -706,8 +748,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function getBarcodes() : View
+    public function getBarcodes()
    {
        $setting = Setting::getSettings();
        $is_gd_installed = extension_loaded('gd');
@@ -721,8 +765,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.0]
+     *
+     * @return View
     */
-    public function postBarcodes(Request $request) : RedirectResponse
+    public function postBarcodes(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -748,8 +794,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function getPhpInfo() : View | RedirectResponse
+    public function getPhpInfo()
    {
        if (config('app.debug') === true) {
            return view('settings.phpinfo');
@@ -763,9 +811,12 @@ class SettingsController extends Controller
     * Return a form to allow a super admin to update settings.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function getLabels() : View
+    public function getLabels()
    {
        return view('settings.labels')
            ->with('setting', Setting::getSettings())
@@ -776,9 +827,12 @@ class SettingsController extends Controller
     * Saves settings from form.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function postLabels(Request $request) : RedirectResponse
+    public function postLabels(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -852,8 +906,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function getLdapSettings() : View
+    public function getLdapSettings()
    {
        $setting = Setting::getSettings();
        $groups = Group::pluck('name', 'id');
@@ -883,9 +939,12 @@ class SettingsController extends Controller
     * Saves settings from form.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function postLdapSettings(Request $request) : RedirectResponse
+    public function postLdapSettings(Request $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -939,11 +998,15 @@ class SettingsController extends Controller
     * Return a form to allow a super admin to update settings.
     *
     * @author Johnson Yi <jyi.dev@outlook.com>
+     *
     * @since v5.0.0
+     *
+     * @return View
     */
-    public function getSamlSettings() : View
+    public function getSamlSettings()
    {
        $setting = Setting::getSettings();
+
        return view('settings.saml', compact('setting'));
    }

@@ -951,9 +1014,12 @@ class SettingsController extends Controller
     * Saves settings from form.
     *
     * @author Johnson Yi <jyi.dev@outlook.com>
+     *
     * @since v5.0.0
+     *
+     * @return View
     */
-    public function postSamlSettings(SettingsSamlRequest $request) : RedirectResponse
+    public function postSamlSettings(SettingsSamlRequest $request)
    {
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -982,13 +1048,10 @@ class SettingsController extends Controller

        return redirect()->back()->withInput()->withErrors($setting->getErrors());
    }
-
-    /**
-     * Do we need this? Can we not just call getSettings() directly?
-     */
-    public static function getPDFBranding() : Setting
+    public static function getPDFBranding()
    {
-        $pdf_branding = Setting::getSettings();
+        $pdf_branding= Setting::getSettings();
+
        return $pdf_branding;
    }

@@ -998,8 +1061,9 @@ class SettingsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.1.1]
+     * @return View
     */
-    public function getGoogleLoginSettings() : View
+    public function getGoogleLoginSettings()
    {
        $setting = Setting::getSettings();
        return view('settings.google', compact('setting'));
@@ -1010,8 +1074,9 @@ class SettingsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v6.1.1]
+     * @return View
     */
-    public function postGoogleLoginSettings(Request $request) : RedirectResponse
+    public function postGoogleLoginSettings(Request $request)
    {
        if (!config('app.lock_passwords')) {
            $setting = Setting::getSettings();
@@ -1038,8 +1103,10 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v1.8]
+     *
+     * @return View
     */
-    public function getBackups() : View
+    public function getBackups()
    {
        $settings = Setting::getSettings();
        $path = 'app/backups';
@@ -1075,9 +1142,12 @@ class SettingsController extends Controller
     * Process the backup.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v1.8]
+     *
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function postBackups() : RedirectResponse
+    public function postBackups()
    {
        if (! config('app.lock_passwords')) {
            Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H-i-s')]);
@@ -1106,9 +1176,12 @@ class SettingsController extends Controller
     * Download the backup file.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v1.8]
+     *
+     * @return Storage
     */
-    public function downloadFile($filename = null) : RedirectResponse | BinaryFileResponse
+    public function downloadFile($filename = null)
    {
        $path = 'app/backups';

@@ -1129,9 +1202,12 @@ class SettingsController extends Controller
     * Delete the backup file.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v1.8]
+     *
+     * @return View
     */
-    public function deleteFile($filename = null) : RedirectResponse
+    public function deleteFile($filename = null)
    {
        if (config('app.allow_backup_delete')=='true') {

@@ -1155,7 +1231,7 @@ class SettingsController extends Controller
        }

        // Hell to the no
-        Log::warning('User ID '.auth()->id().' is attempting to delete backup file '.$filename.' and is not authorized to.');
+        Log::warning('User ID '.Auth::user()->id.' is attempting to delete backup file '.$filename.' and is not authorized to.');
        return redirect()->route('settings.backups.index')->with('error', trans('general.backup_delete_not_allowed'));
    }

@@ -1164,11 +1240,13 @@ class SettingsController extends Controller
     * Uploads a backup file
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v6.0]
+     *
+     * @return \Illuminate\Http\RedirectResponse
     */

-    public function postUploadBackup(Request $request) : RedirectResponse
-    {
+    public function postUploadBackup(Request $request) {

        if (! config('app.lock_passwords')) {
            if (!$request->hasFile('file')) {
@@ -1200,9 +1278,12 @@ class SettingsController extends Controller
     * Restore the backup file.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v6.0]
+     *
+     * @return View
     */
-    public function postRestore($filename = null) : RedirectResponse
+    public function postRestore($filename = null)
    {

        if (! config('app.lock_passwords')) {
@@ -1211,7 +1292,7 @@ class SettingsController extends Controller
            if (Storage::exists($path.'/'.$filename)) {

                // grab the user's info so we can make sure they exist in the system
-                $user = User::find(auth()->id());
+                $user = User::find(Auth::user()->id);

                // TODO: run a backup

@@ -1255,7 +1336,7 @@ class SettingsController extends Controller
                DB::table('users')->update(['remember_token' => null]);
                Auth::logout();

-                return redirect()->route('login')->with('success', trans('admin/settings/message.restore.success'));
+                return redirect()->route('login')->with('success', 'Your system has been restored. Please login again.');
            } else {
                return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
            }
@@ -1270,11 +1351,13 @@ class SettingsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function getPurge() : View | RedirectResponse
+    public function getPurge()
    {

-        Log::warning('User '.auth()->user()->username.' (ID: '.auth()->id().') is attempting a PURGE');
+        Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');

        if (config('app.allow_purge')=='true') {
            return view('settings.purge-form');
@@ -1287,11 +1370,14 @@ class SettingsController extends Controller
     * Purges soft-deletes.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v3.0]
+     *
+     * @return View
     */
-    public function postPurge(Request $request) : RedirectResponse
+    public function postPurge(Request $request)
    {
-        Log::warning('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting a PURGE');
+        Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');

        if (config('app.allow_purge')=='true') {
            Log::debug('Purging is not allowed via the .env');
@@ -1300,7 +1386,7 @@ class SettingsController extends Controller

                if ($request->input('confirm_purge')=='DELETE') {

-                    Log::warning('User ID ' . auth()->id() . ' initiated a PURGE!');
+                    Log::warning('User ID ' . Auth::user()->id . ' initiated a PURGE!');
                    // Run a backup immediately before processing
                    Artisan::call('backup:run');
                    Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);
@@ -1318,7 +1404,7 @@ class SettingsController extends Controller
            }
        }

-        Log::error('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting to purge deleted data and is not authorized to.');
+        Log::error('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting to purge deleted data and is not authorized to.');


        // Nope.
@@ -1333,9 +1419,12 @@ class SettingsController extends Controller
     * in the routes file if you want to be able to cache the routes.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v4.0]
+     *
+     * @return View
     */
-    public function api() : View
+    public function api()
    {
        return view('settings.api');
    }
@@ -1344,9 +1433,12 @@ class SettingsController extends Controller
     * Test the email configuration.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     *
     * @since [v3.0]
+     *
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function ajaxTestEmail() : JsonResponse
+    public function ajaxTestEmail()
    {
        try {
            (new User())->forceFill([
@@ -1354,20 +1446,13 @@ class SettingsController extends Controller
                'email' => config('mail.from.address'),
            ])->notify(new MailTest());

-            return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent')));
+            return response()->json(Helper::formatStandardApiResponse('success', null, 'Maiol sent!'));
        } catch (\Exception $e) {
            return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
        }
    }

-
-
-    /**
-     * Get login attempts view
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     */
-    public function getLoginAttempts() : View
+    public function getLoginAttempts()
    {
        return view('settings.logins');
    }
@@ -6,8 +6,6 @@ use App\Helpers\Helper;
 use App\Models\Statuslabel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;

 /**
 * This controller handles all actions related to Status Labels for
@@ -19,14 +17,18 @@ class StatuslabelsController extends Controller
 {
    /**
     * Show a list of all the statuslabels.
+     *
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
        $this->authorize('view', Statuslabel::class);
+
        return view('statuslabels.index');
    }

-    public function show($id) : View | RedirectResponse
+    public function show($id)
    {
        $this->authorize('view', Statuslabel::class);
        if ($statuslabel = Statuslabel::find($id)) {
@@ -39,8 +41,10 @@ class StatuslabelsController extends Controller
    /**
     * Statuslabel create.
     *
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        // Show the page
        $this->authorize('create', Statuslabel::class);
@@ -54,8 +58,10 @@ class StatuslabelsController extends Controller
     * Statuslabel create form processing.
     *
     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(Request $request) : RedirectResponse
+    public function store(Request $request)
    {
        $this->authorize('create', Statuslabel::class);
        // create a new model instance
@@ -90,8 +96,10 @@ class StatuslabelsController extends Controller
     * Statuslabel update.
     *
     * @param  int $statuslabelId
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($statuslabelId = null) : View | RedirectResponse
+    public function edit($statuslabelId = null)
    {
        $this->authorize('update', Statuslabel::class);
        // Check if the Statuslabel exists
@@ -111,8 +119,10 @@ class StatuslabelsController extends Controller
     * Statuslabel update form processing page.
     *
     * @param  int $statuslabelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update(Request $request, $statuslabelId = null) : RedirectResponse
+    public function update(Request $request, $statuslabelId = null)
    {
        $this->authorize('update', Statuslabel::class);
        // Check if the Statuslabel exists
@@ -149,8 +159,10 @@ class StatuslabelsController extends Controller
     * Delete the given Statuslabel.
     *
     * @param  int $statuslabelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($statuslabelId) : RedirectResponse
+    public function destroy($statuslabelId)
    {
        $this->authorize('delete', Statuslabel::class);
        // Check if the Statuslabel exists
@@ -5,8 +5,6 @@ namespace App\Http\Controllers;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Supplier;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;

 /**
 * This controller handles all actions related to Suppliers for
@@ -22,19 +20,25 @@ class SuppliersController extends Controller
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function index() : View
+    public function index()
    {
+        // Grab all the suppliers
        $this->authorize('view', Supplier::class);
+
+        // Show the page
        return view('suppliers/index');
    }

    /**
     * Supplier create.
     *
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create() : View
+    public function create()
    {
        $this->authorize('create', Supplier::class);
+
        return view('suppliers/edit')->with('item', new Supplier);
    }

@@ -42,8 +46,10 @@ class SuppliersController extends Controller
     * Supplier create form processing.
     *
     * @param ImageUploadRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Supplier::class);
        // Create a new supplier
@@ -76,8 +82,10 @@ class SuppliersController extends Controller
     * Supplier update.
     *
     * @param  int $supplierId
+     * @return \Illuminate\Contracts\View\View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function edit($supplierId = null) : View | RedirectResponse
+    public function edit($supplierId = null)
    {
        $this->authorize('update', Supplier::class);
        // Check if the supplier exists
@@ -94,12 +102,15 @@ class SuppliersController extends Controller
     * Supplier update form processing page.
     *
     * @param  int $supplierId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function update($supplierId, ImageUploadRequest $request) : RedirectResponse
+    public function update($supplierId, ImageUploadRequest $request)
    {
        $this->authorize('update', Supplier::class);
-
+        // Check if the supplier exists
        if (is_null($supplier = Supplier::find($supplierId))) {
+            // Redirect to the supplier  page
            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
        }

@@ -130,8 +141,10 @@ class SuppliersController extends Controller
     * Delete the given supplier.
     *
     * @param  int $supplierId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function destroy($supplierId) : RedirectResponse
+    public function destroy($supplierId)
    {
        $this->authorize('delete', Supplier::class);
        if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) {
@@ -161,9 +174,10 @@ class SuppliersController extends Controller
     *  Get the asset information to present to the supplier view page
     *
     * @param null $supplierId
+     * @return \Illuminate\Contracts\View\View
     * @internal param int $assetId
     */
-    public function show($supplierId = null) : View | RedirectResponse
+    public function show($supplierId = null)
    {
        $this->authorize('view', Supplier::class);
        $supplier = Supplier::find($supplierId);
@@ -102,7 +102,7 @@ class BulkUsersController extends Controller
        // Remove the user from any updates.
        $user_raw_array = array_diff($user_raw_array, [Auth::id()]);
        $manager_conflict = false;
-        $users = User::whereIn('id', $user_raw_array)->where('id', '!=', auth()->id())->get();
+        $users = User::whereIn('id', $user_raw_array)->where('id', '!=', Auth::user()->id)->get();

        $return_array = [
            'success' => trans('admin/users/message.success.update_bulk'),
@@ -318,7 +318,7 @@ class BulkUsersController extends Controller
        // Get the users
        $merge_into_user = User::find($request->input('merge_into_id'));
        $users_to_merge = User::whereIn('id', $user_ids_to_merge)->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')->get();
-        $admin = User::find(auth()->id());
+        $admin = User::find(Auth::user()->id);

        // Walk users
        foreach ($users_to_merge as $user_to_merge) {
@@ -117,7 +117,7 @@ class UsersController extends Controller
        $user->zip = $request->input('zip', null);
        $user->remote = $request->input('remote', 0);
        $user->website = $request->input('website', null);
-        $user->created_by = auth()->id();
+        $user->created_by = Auth::user()->id;
        $user->start_date = $request->input('start_date', null);
        $user->end_date = $request->input('end_date', null);
        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
@@ -125,7 +125,7 @@ class UsersController extends Controller
        // Strip out the superuser permission if the user isn't a superadmin
        $permissions_array = $request->input('permission');

-        if (! auth()->user()->isSuperUser()) {
+        if (! Auth::user()->isSuperUser()) {
            unset($permissions_array['superuser']);
        }
        $user->permissions = json_encode($permissions_array);
@@ -133,8 +133,6 @@ class UsersController extends Controller
        // we have to invoke the
        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');

-        session()->put(['redirect_option' => $request->get('redirect_option')]);
-
        if ($user->save()) {
            if ($request->filled('groups')) {
                $user->groups()->sync($request->input('groups'));
@@ -154,7 +152,7 @@ class UsersController extends Controller
                $user->notify(new WelcomeNotification($data));
            }

-            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))->with('success', trans('admin/users/message.success.create'));
+            return redirect()->route('users.index')->with('success', trans('admin/users/message.success.create'));
        }

        return redirect()->back()->withInput()->withErrors($user->getErrors());
@@ -178,7 +176,7 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param $permissions
-     * @return \Illuminate\Contracts\View\View
+     * @return View
     * @internal param int $id
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
@@ -248,7 +246,7 @@ class UsersController extends Controller
            }

            // Only save groups if the user is a superuser
-            if (auth()->user()->isSuperUser()) {
+            if (Auth::user()->isSuperUser()) {
                $user->groups()->sync($request->input('groups'));
            }

@@ -302,7 +300,7 @@ class UsersController extends Controller


            // Strip out the superuser permission if the user isn't a superadmin
-            if (! auth()->user()->isSuperUser()) {
+            if (! Auth::user()->isSuperUser()) {
                unset($permissions_array['superuser']);
                $permissions_array['superuser'] = $orig_superuser;
            }
@@ -311,11 +309,10 @@ class UsersController extends Controller

            // Handle uploaded avatar
            app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
-            session()->put(['redirect_option' => $request->get('redirect_option')]);

            if ($user->save()) {
                // Redirect to the user page
-                return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
+                return redirect()->route('users.index')
                    ->with('success', trans('admin/users/message.success.update'));
            }

@@ -382,7 +379,7 @@ class UsersController extends Controller
                $logaction->item_type = User::class;
                $logaction->item_id = $user->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->user_id = Auth::user()->id;
                $logaction->logaction('restore');

                // Redirect them to the deleted page if there are more, otherwise the section index
@@ -8,11 +8,11 @@ use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
+use App\Models\CustomField;
 use App\Notifications\RequestAssetCancelation;
 use App\Notifications\RequestAssetNotification;
 use Illuminate\Http\Request;
-use Illuminate\Http\RedirectResponse;
-use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;

 /**
 * This controller handles all actions related to the ability for users
@@ -25,8 +25,9 @@ class ViewAssetsController extends Controller
    /**
     * Redirect to the profile page.
     *
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getIndex() : View | RedirectResponse
+    public function getIndex()
    {
        $user = User::with(
            'assets',
@@ -35,7 +36,7 @@ class ViewAssetsController extends Controller
            'consumables',
            'accessories',
            'licenses',
-        )->find(auth()->id());
+        )->find(Auth::user()->id);

        $field_array = array();

@@ -71,8 +72,9 @@ class ViewAssetsController extends Controller

    /**
     * Returns view of requestable items for a user.
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
-    public function getRequestableIndex() : View
+    public function getRequestableIndex()
    {
        $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
@@ -80,7 +82,7 @@ class ViewAssetsController extends Controller
        return view('account/requestable-assets', compact('assets', 'models'));
    }

-    public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null) : RedirectResponse
+    public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null)
    {
        $item = null;
        $fullItemType = 'App\\Models\\'.studly_case($itemType);
@@ -90,7 +92,7 @@ class ViewAssetsController extends Controller
        }
        $item = call_user_func([$fullItemType, 'find'], $itemId);

-        $user = auth()->user();
+        $user = Auth::user();

        $logaction = new Actionlog();
        $logaction->item_id = $data['asset_id'] = $item->id;
@@ -100,15 +102,14 @@ class ViewAssetsController extends Controller
        if ($user->location_id) {
            $logaction->location_id = $user->location_id;
        }
-
-        $logaction->target_id = $data['user_id'] = auth()->id();
+        $logaction->target_id = $data['user_id'] = Auth::user()->id;
        $logaction->target_type = User::class;

        $data['item_quantity'] = $request->has('request-quantity') ? e($request->input('request-quantity')) : 1;
        $data['requested_by'] = $user->present()->fullName();
        $data['item'] = $item;
        $data['item_type'] = $itemType;
-        $data['target'] = auth()->user();
+        $data['target'] = Auth::user();

        if ($fullItemType == Asset::class) {
            $data['item_url'] = route('hardware.show', $item->id);
@@ -142,10 +143,11 @@ class ViewAssetsController extends Controller
    /**
     * Process a specific requested asset
     * @param null $assetId
+     * @return \Illuminate\Http\RedirectResponse
     */
-    public function getRequestAsset($assetId = null) : RedirectResponse
+    public function getRequestAsset($assetId = null)
    {
-        $user = auth()->user();
+        $user = Auth::user();

        // Check if the asset exists and is requestable
        if (is_null($asset = Asset::RequestableAssets()->find($assetId))) {
@@ -158,7 +160,7 @@ class ViewAssetsController extends Controller
        }

        $data['item'] = $asset;
-        $data['target'] = auth()->user();
+        $data['target'] = Auth::user();
        $data['item_quantity'] = 1;
        $settings = Setting::getSettings();

@@ -170,11 +172,11 @@ class ViewAssetsController extends Controller
        if ($user->location_id) {
            $logaction->location_id = $user->location_id;
        }
-        $logaction->target_id = $data['user_id'] = auth()->id();
+        $logaction->target_id = $data['user_id'] = Auth::user()->id;
        $logaction->target_type = User::class;

        // If it's already requested, cancel the request.
-        if ($asset->isRequestedBy(auth()->user())) {
+        if ($asset->isRequestedBy(Auth::user())) {
            $asset->cancelRequest();
            $asset->decrement('requests_counter', 1);

@@ -193,7 +195,7 @@ class ViewAssetsController extends Controller
        return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
    }

-    public function getRequestedAssets() : View
+    public function getRequestedAssets()
    {
        return view('account/requested');
    }
@@ -43,12 +43,10 @@ class Kernel extends HttpKernel
            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
            \App\Http\Middleware\AssetCountForSidebar::class,
            \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
        ],

        'api' => [
            'auth:api',
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
        ],
    ];

@@ -18,7 +18,7 @@ class CheckForDebug
    {
        view()->share('debug_in_production', false);

-        if (((Auth::check() && (auth()->user()->isSuperUser()))) && (app()->environment() == 'production') && (config('app.warn_debug') === true) && (config('app.debug') === true)) {
+        if (((Auth::check() && (Auth::user()->isSuperUser()))) && (app()->environment() == 'production') && (config('app.warn_debug') === true) && (config('app.debug') === true)) {
            view()->share('debug_in_production', true);
        }

@@ -38,17 +38,17 @@ class CheckForTwoFactor
        if ($settings = Setting::getSettings()) {
            if (Auth::check() && ($settings->two_factor_enabled != '')) {
                // This user is already 2fa-authed
-                if ($request->session()->get('2fa_authed')==auth()->id()) {
+                if ($request->session()->get('2fa_authed')==Auth::user()->id) {
                    return $next($request);
                }

                // Two-factor is optional and the user has NOT opted in, let them through
-                if (($settings->two_factor_enabled == '1') && (auth()->user()->two_factor_optin != '1')) {
+                if (($settings->two_factor_enabled == '1') && (Auth::user()->two_factor_optin != '1')) {
                    return $next($request);
                }

                // Otherwise make sure they're enrolled and show them the 2FA code screen
-                if ((auth()->user()->two_factor_secret != '') && (auth()->user()->two_factor_enrolled == '1')) {
+                if ((Auth::user()->two_factor_secret != '') && (Auth::user()->two_factor_enrolled == '1')) {
                    return redirect()->route('two-factor')->with('info', trans('auth/message.two_factor.enter_two_factor_code'));
                }

@@ -45,7 +45,7 @@ class CheckLocale

        }
        
-        app()->setLocale(Helper::mapLegacyLocale($language));
+        \App::setLocale(Helper::mapLegacyLocale($language));
        return $next($request);
    }
 }
@@ -26,6 +26,6 @@ class CheckPermissions

        return response()->view('layouts/basic', [
            'content' => view('errors/403'),
-        ], 403);
+        ]);
    }
 }
@@ -20,5 +20,5 @@ class EncryptCookies extends BaseEncrypter
     *
     * @var bool
     */
-    protected static $serialize = false;
+    protected static $serialize = true;
 }
@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\Accessory;
-use Illuminate\Support\Facades\Gate;
-
-class AccessoryCheckoutRequest extends ImageUploadRequest
-{
-
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return Gate::allows('checkout', new Accessory);
-    }
-
-    public function prepareForValidation(): void
-    {
-
-        if ($this->accessory) {
-
-            $this->diff = ($this->accessory->numRemaining() - $this->checkout_qty);
-            $this->merge([
-                'checkout_qty' => $this->checkout_qty ?? 1,
-                'number_remaining_after_checkout' =>  (int) ($this->accessory->numRemaining() - $this->checkout_qty),
-                'number_currently_remaining' =>  (int) $this->accessory->numRemaining(),
-                'checkout_difference' =>  (int) $this->diff,
-            ]);
-
-            \Log::debug('---------------------------------------------');
-        }
-
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-
-        return array_merge(
-            [
-                'assigned_to'  => [
-                    'required',
-                    'integer',
-                    'exists:users,id,deleted_at,NULL',
-                    'not_array'
-                ],
-
-                'number_remaining_after_checkout' => [
-                    'min:0',
-                    'required',
-                    'integer',
-                ],
-
-                'checkout_qty' => [
-                    'integer',
-                    'lte:number_currently_remaining',
-                    'min:1',
-                ],
-            ],
-        );
-    }
-
-    public function messages(): array
-    {
-        $messages = [
-            'checkout_qty.lte' => trans_choice('admin/accessories/message.checkout.checkout_qty.lte', $this->number_currently_remaining, [
-                'number_currently_remaining' => $this->number_currently_remaining,
-                'checkout_qty' => $this->checkout_qty,
-            ]),
-        ];
-        return $messages;
-    }
-}
@@ -29,7 +29,7 @@ class DeleteUserRequest extends FormRequest
        if ($user_to_delete) {
            $this->merge([
                'user' => request()->route('user'),
-                'admin_id' => auth()->id(),
+                'admin_id' => Auth::user()->id,
                'managed_users' => $user_to_delete->managesUsers()->count(),
                'managed_locations' => $user_to_delete->managedLocations()->count(),
                'assigned_assets' => $user_to_delete->assets()->count(),
@@ -48,7 +48,7 @@ class DeleteUserRequest extends FormRequest
    public function rules(): array
    {
        return [
-            'user' =>  Rule::notIn([auth()->id()]),
+            'user' =>  Rule::notIn([auth()->user()->id]),
            'managed_users' =>  Rule::in([0]),
            'managed_locations' => Rule::in([0]),
            'assigned_assets' => Rule::in([0]),
@@ -10,7 +10,6 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Exception\NotReadableException;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;

 class ImageUploadRequest extends Request
 {
@@ -124,7 +123,7 @@ class ImageUploadRequest extends Request

                    } catch(NotReadableException $e) {
                        Log::debug($e);
-                        $validator = Validator::make([], []);
+                        $validator = \Validator::make([], []);
                        $validator->errors()->add($form_fieldname, trans('general.unaccepted_image_type', ['mimetype' => $image->getClientMimeType()]));

                        throw new \Illuminate\Validation\ValidationException($validator);
@@ -136,28 +135,28 @@ class ImageUploadRequest extends Request
                }

                 // Remove Current image if exists
-                $item = $this->deleteExistingImage($item, $path, $db_fieldname);
+                if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) {
+                    try {
+                         Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname});
+                    } catch (\Exception $e) {
+                        Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?');
+                    }
+                }
+
                $item->{$db_fieldname} = $file_name;
            }


        // If the user isn't uploading anything new but wants to delete their old image, do so
        } elseif ($this->input('image_delete') == '1') {
-            $item = $this->deleteExistingImage($item, $path, $db_fieldname);
-        }
-
-        return $item;
-    }
-
-    public function deleteExistingImage($item, $path = null, $db_fieldname = 'image') {
-
-        if ($item->{$db_fieldname}!='') {
+            Log::debug('Deleting image');
            try {
                Storage::disk('public')->delete($path.'/'.$item->{$db_fieldname});
-                $item->{$db_fieldname} = null;
+                    $item->{$db_fieldname} = null;
            } catch (\Exception $e) {
                Log::debug($e);
            }
+
        }

        return $item;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	3ae16ff8ca	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json	2024-07-08 15:53:42 +01:00
snipe	2e2f59b290	Updated production assets Signed-off-by: snipe <snipe@snipe.net>	2024-07-08 15:29:36 +01:00
snipe	c16db436d3	Merge remote-tracking branch 'origin/develop'	2024-07-08 13:21:38 +01:00
snipe	8eb68d3901	Merge remote-tracking branch 'origin/develop'	2024-07-04 17:10:43 +01:00
snipe	fc7809192d	Merge remote-tracking branch 'origin/develop'	2024-07-03 23:20:24 +01:00
snipe	27bc16604b	Add @Galaxy102 as a contributor	2024-07-02 09:48:32 +01:00
snipe	86ae4a3513	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2024-07-02 09:37:40 +01:00
snipe	e502968707	Prod assets Signed-off-by: snipe <snipe@snipe.net>	2024-07-01 10:00:28 +01:00
snipe	12dcac4994	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2024-07-01 10:00:15 +01:00
snipe	1837da4508	Merge branch 'develop'	2024-06-26 13:46:40 +01:00
snipe	e1a6b441d7	Merge remote-tracking branch 'origin/develop'	2024-06-26 12:53:18 +01:00
snipe	23c1d664fe	Prod assets Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 22:07:01 +01:00
snipe	c891342fdb	Bumoed version Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 22:06:52 +01:00