Clean up the fieldset experience for custom fields for users

Upgraded composer due to lockfile conflicts

.all-contributorsrc

@@ -2961,42 +2961,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "Singrity",
-      "name": "Bogdan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/58479551?v=4",
-      "profile": "http://@singrity",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mmanjos",
-      "name": "mmanjos",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3483684?v=4",
-      "profile": "https://github.com/mmanjos",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Azooz2014",
-      "name": "Abdelaziz Faki",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7429229?v=4",
-      "profile": "https://azooz2014.github.io/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "bilias",
-      "name": "bilias",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47315739?v=4",
-      "profile": "https://github.com/bilias",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

.chipperci.yml

@@ -0,0 +1,44 @@
+version: 1
+
+environment:
+  php: 8.0
+  node: 12
+
+services:
+  - mysql: 5.7
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+  pull_request:
+    branches: .*
+
+pipeline:
+  - name: Setup
+    cmd: |
+      cp -v .env.testing.example .env
+      cp -v .env.testing.example .env.testing
+      composer install --no-interaction --prefer-dist --optimize-autoloader
+
+  - name: Generate Key
+    cmd: |
+      php artisan key:generate --force
+
+  - name: Passport Keys
+    cmd: |
+      php artisan passport:keys
+
+  - name: Run Migrations
+    cmd: |
+      php artisan migrate --force
+
+  - name: PHPUnit Unit Tests
+    cmd: |
+      php artisan test --testsuite Unit
+
+  - name: PHPUnit Feature Tests
+    cmd: |
+      php artisan test --testsuite Feature

.env.docker

@@ -159,7 +159,6 @@ LOG_CHANNEL=stderr
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
-APP_FORCE_TLS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600

.env.example

@@ -127,17 +127,6 @@ PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
-
-# --------------------------------------------
-# OPTIONAL: Digital Ocean Spaces File Settings
-# --------------------------------------------
-DIGITALOCEAN_SPACES_KEY=null
-DIGITALOCEAN_SPACES_SECRET=null
-DIGITALOCEAN_SPACES_ENDPOINT=https://region.digitaloceanspaces.com
-DIGITALOCEAN_SPACES_REGION=null
-DIGITALOCEAN_SPACES_BUCKET=null
-
-
 # --------------------------------------------
 # OPTIONAL: PRIVATE S3 Settings
 # --------------------------------------------

.github/autolabeler.yml

@@ -18,5 +18,5 @@ importer: ["/app/Importer/*","/app/Http/Livewire/Importer.php", "resources/views
 cli / artisan: ["/app/Console/*"]
 LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
 docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
-tests: ["/tests/*", "/database/factories/*", "/stubs"]
+tests: ["/tests/*", "/stubs"]
 config: .github

.github/dependabot.yml

@@ -2,6 +2,5 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "develop"
     schedule:
       interval: "weekly"

.github/workflows/SA-codeql.yml

@@ -26,7 +26,7 @@ jobs:
         language: [ 'javascript' ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3.3.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/codacy-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3.3.0
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI

.github/workflows/crowdin-upload.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Crowdin push
         uses: crowdin/github-action@v1

.github/workflows/docker-alpine.yml

@@ -32,7 +32,6 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=tag,suffix=-alpine
-        type=semver,pattern=v{{major}}-latest-alpine 
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.
@@ -42,17 +41,17 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3.3.0
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -64,7 +63,7 @@ jobs:
       # Get Metadata for docker_build step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
         id: meta_build
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: snipe/snipe-it
           tags: ${{ env.IMAGE_TAGS }}
@@ -73,7 +72,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'snipe-it' image
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile.alpine

.github/workflows/docker.yml

@@ -32,7 +32,6 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=tag
-        type=semver,pattern=v{{major}}-latest 
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.
@@ -42,17 +41,17 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3.3.0
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -64,7 +63,7 @@ jobs:
       # Get Metadata for docker_build step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
         id: meta_build
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: snipe/snipe-it
           tags: ${{ env.IMAGE_TAGS }}
@@ -73,7 +72,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'snipe-it' image
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile

.github/workflows/tests.yml

@@ -37,7 +37,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Get Composer Cache Directory
         id: composer-cache

.nvmrc

@@ -1 +1 @@
-v12.22.1
+v18.16.0

README.md

@@ -1,5 +1,5 @@
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-330-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
+[![All Contributors](https://img.shields.io/badge/all_contributors-326-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -145,8 +145,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") | [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [<img src="https://avatars.githubusercontent.com/u/658865?v=4" width="110px;"/><br /><sub>Andrew Savinykh</sub>](https://github.com/AndrewSav)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [<img src="https://avatars.githubusercontent.com/u/1155067?v=4" width="110px;"/><br /><sub>Tadayuki Onishi</sub>](https://kenchan0130.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [<img src="https://avatars.githubusercontent.com/u/112496896?v=4" width="110px;"/><br /><sub>Florian</sub>](https://github.com/floschoepfer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/7305753?v=4" width="110px;"/><br /><sub>Spencer Long</sub>](http://spencerlong.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") | [<img src="https://avatars.githubusercontent.com/u/1141514?v=4" width="110px;"/><br /><sub>Marcus Moore</sub>](https://github.com/marcusmoore)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [<img src="https://avatars.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://github.com/Mezzle)<br /> | [<img src="https://avatars.githubusercontent.com/u/5731963?v=4" width="110px;"/><br /><sub>dboth</sub>](http://dboth.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [<img src="https://avatars.githubusercontent.com/u/87536651?v=4" width="110px;"/><br /><sub>Zachary Fleck</sub>](https://github.com/zacharyfleck)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [<img src="https://avatars.githubusercontent.com/u/74609912?v=4" width="110px;"/><br /><sub>VIKAAS-A</sub>](https://github.com/vikaas-cyper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [<img src="https://avatars.githubusercontent.com/u/88882041?v=4" width="110px;"/><br /><sub>Abdul Kareem</sub>](https://github.com/ak-piracha)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") |
-| [<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/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") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/LdapSync.php

@@ -18,7 +18,7 @@ class LdapSync extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=*} {--base_dn=} {--filter=} {--summary} {--json_summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--filter=} {--summary} {--json_summary}';
 
     /**
      * The console command description.
@@ -83,16 +83,7 @@ class LdapSync extends Command
         $summary = [];
 
         try {
-            if ( $this->option('location_id') != '') {
-
-                foreach($this->option('location_id') as $location_id){
-                    $location_ou= Location::where('id', '=', $location_id)->value('ldap_ou');
-                    $search_base = $location_ou;
-                    Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
-                 }
-            }
-
-            else if ($this->option('base_dn') != '') {
+            if ($this->option('base_dn') != '') {
                 $search_base = $this->option('base_dn');
                 Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
             } else {
@@ -115,21 +106,17 @@ class LdapSync extends Command
 
         /* Determine which location to assign users to by default. */
         $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
-            if ($this->option('location') != '') {
-                if ($location = Location::where('name', '=', $this->option('location'))->first()) {
-                    Log::debug('Location name ' . $this->option('location') . ' passed');
-                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
-                }
 
-            } elseif ($this->option('location_id') != '') {
-                foreach($this->option('location_id') as $location_id) {
-                if ($location = Location::where('id', '=', $location_id)->first()) {
-                    Log::debug('Location ID ' . $location_id . ' passed');
-                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
-                }
-
-            }
+        if ($this->option('location') != '') {
+            $location = Location::where('name', '=', $this->option('location'))->first();
+            Log::debug('Location name '.$this->option('location').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
+        } elseif ($this->option('location_id') != '') {
+            $location = Location::where('id', '=', $this->option('location_id'))->first();
+            Log::debug('Location ID '.$this->option('location_id').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
         }
+
         if (! isset($location)) {
             Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }
@@ -193,6 +180,10 @@ class LdapSync extends Command
             }
         }
 
+        /* Create user account entries in Snipe-IT */
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
+        $pass = bcrypt($tmp_pass);
+
         $manager_cache = [];
 
         if($ldap_default_group != null) {
@@ -238,7 +229,7 @@ class LdapSync extends Command
                 } else {
                     // Creating a new user.
                     $user = new User;
-                    $user->password = $user->noPassword();
+                    $user->password = $pass;
                     $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';
                 }

app/Console/Commands/RotateAppKey.php

@@ -7,7 +7,6 @@ use App\Models\CustomField;
 use App\Models\Setting;
 use Artisan;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Encryption\Encrypter;
 
 class RotateAppKey extends Command
@@ -17,17 +16,14 @@ class RotateAppKey extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:rotate-key
-                            {previous_key? : The previous key to rotate from} 
-                            {--emergency : Emergency mode - rotate from .env APP_KEY to newly-generated one, modifying .env} 
-                            {--force : Skip interactive confirmation}';
+    protected $signature = 'snipeit:rotate-key';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Rotates APP_KEY to a new value, optionally taking the previous key as an argument';
+    protected $description = 'Command description';
 
     /**
      * Create a new command instance.
@@ -46,42 +42,26 @@ class RotateAppKey extends Command
      */
     public function handle()
     {
-        //make sure they specify only exactly one of --emergency, or a filename. Not neither, and not both.
-        if ( (!$this->option('emergency') && !$this->argument('previous_key')) || ( $this->option('emergency') && $this->argument('previous_key'))) {
-            $this->error("Specify only one of --emergency, or an app key value, in order to rotate keys");
-            return 1;
-        }
-        if ( $this->option('emergency') ) {
-            $msg = "\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ";
-        } else {
-            $msg = "\n****************************************************\nTHIS WILL DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND RE-ENCRYPT THEM WITH YOUR\nAPP_KEY.\n\nThere is NO undo. \n\nMake SURE you have a database backup BEFORE running this command. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup? ";
-        }
-        if ($this->option('force') || $this->confirm($msg)) {
+        if ($this->confirm("\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ")) {
 
             // Get the existing app_key and ciphers
             // We put them in a variable since we clear the cache partway through here.
-            if ($this->option('emergency')) {
-                $old_app_key = config('app.key');
-                $cipher = config('app.cipher');
+            $old_app_key = config('app.key');
+            $cipher = config('app.cipher');
 
-                // Generate a new one
-                Artisan::call('key:generate', ['--show' => true]);
-                $new_app_key = trim(Artisan::output());
+            // Generate a new one
+            Artisan::call('key:generate', ['--show' => true]);
+            $new_app_key = Artisan::output();
 
-                // Clear the config cache
-                Artisan::call('config:clear');
+            // Clear the config cache
+            Artisan::call('config:clear');
 
-                // Write the new app key to the .env file
-                $this->writeNewEnvironmentFileWith($new_app_key);
-            } elseif ($this->argument('previous_key')) {
-                $old_app_key = $this->argument('previous_key');
-                $cipher = config('app.cipher'); // just a guess?
-                $new_app_key = config('app.key');
-            }
+            $this->warn('Your app cipher is: '.$cipher);
+            $this->warn('Your old APP_KEY is: '.$old_app_key);
+            $this->warn('Your new APP_KEY is: '.$new_app_key);
 
-            $this->warn('Your app cipher is: ' . $cipher);
-            $this->warn('Your old APP_KEY is: ' . $old_app_key);
-            $this->warn('Your new APP_KEY is: ' . $new_app_key);
+            // Write the new app key to the .env file
+            $this->writeNewEnvironmentFileWith($new_app_key);
 
             // Manually create an old encrypter instance using the old app key
             // and also create a new encrypter instance so we can re-crypt the field
@@ -95,16 +75,8 @@ class RotateAppKey extends Command
                 $assets = Asset::whereNotNull($field->db_column)->get();
 
                 foreach ($assets as $asset) {
-                    try {
-                        $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column});
-                        $this->line('DECRYPTED: ' . $field->db_column);
-                    } catch (DecryptException $e) {
-                        $this->line('Could not decrypt '. $field->db_column.' using "old key" - skipping...');
-                        continue;
-                    } catch (\Exception $e) {
-                        $this->error("Error decrypting ".$field->db_column.", reason: ".$e->getMessage().". Aborting key rotation");
-                        throw $e;
-                    }
+                    $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column});
+                    $this->line('DECRYPTED: '.$field->db_column);
                     $asset->{$field->db_column} = $newEncrypter->encrypt($asset->{$field->db_column});
                     $this->line('ENCRYPTED: '.$field->db_column);
                     $asset->save();
@@ -114,14 +86,10 @@ class RotateAppKey extends Command
             // Handle the LDAP password if one is provided
             $setting = Setting::first();
             if ($setting->ldap_pword != '') {
-                try {
-                    $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword);
-                    $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword);
-                    $setting->save();
-                    $this->warn('LDAP password has been re-encrypted.');
-                } catch(DecryptException $e) {
-                    $this->warn("Unable to decrypt old LDAP password; skipping");
-                }
+                $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword);
+                $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword);
+                $setting->save();
+                $this->warn('LDAP password has been re-encrypted.');
             }
         } else {
             $this->info('This operation has been canceled. No changes have been made.');
@@ -138,7 +106,7 @@ class RotateAppKey extends Command
     {
         file_put_contents($this->laravel->environmentFilePath(), preg_replace(
             $this->keyReplacementPattern(),
-            'APP_KEY="'.$key.'"',
+            'APP_KEY='.$key,
             file_get_contents($this->laravel->environmentFilePath())
         ));
     }
@@ -150,7 +118,7 @@ class RotateAppKey extends Command
      */
     protected function keyReplacementPattern()
     {
-        $escaped = '="?'.preg_quote($this->laravel['config']['app.key'], '/').'"?';
+        $escaped = preg_quote('='.$this->laravel['config']['app.key'], '/');
 
         return "/^APP_KEY{$escaped}/m";
     }

app/Exceptions/Handler.php

@@ -150,11 +150,6 @@ class Handler extends ExceptionHandler
         return redirect()->guest('login');
     }
 
-    protected function invalidJson($request, ValidationException $exception)
-    {
-        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors()), 200);
-    }
-
 
     /** 
      * A list of the inputs that are never flashed for validation exceptions.

app/Helpers/CustomFieldHelper.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Helpers;
+
+use Illuminate\Support\Facades\Gate;
+
+/*********************
+ * These two helper methods are more designed for being re-used with the new HasCustomFields Trait
+ *
+ * The 'transform' method is designed for BlahTransformer things that need to return custom field values.
+ *
+ * The 'present' method is designed for when you're trying to generate fieldlists for use in Bootstrap tables
+ *  - typically the 'dataTableLayout' method
+ *
+ *********************/
+class CustomFieldHelper {
+
+    static function transform($fieldset, $item) {
+        if ($fieldset && ($fieldset->fields->count() > 0)) {
+            $fields_array = [];
+
+            foreach ($fieldset->fields as $field) {
+                if ($field->isFieldDecryptable($item->{$field->db_column})) {
+                    $decrypted = Helper::gracefulDecrypt($field, $item->{$field->db_column});
+                    $value = (Gate::allows('assets.view.encrypted_custom_fields')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
+
+                    if ($field->format == 'DATE'){
+                        if (Gate::allows('assets.view.encrypted_custom_fields')){
+                            $value = Helper::getFormattedDateObject($value, 'date', false);
+                        } else {
+                            $value = strtoupper(trans('admin/custom_fields/general.encrypted'));
+                        }
+                    }
+
+                    $fields_array[$field->name] = [
+                        'field' => e($field->db_column),
+                        'value' => e($value),
+                        'field_format' => $field->format,
+                        'element' => $field->element,
+                    ];
+
+                } else {
+                    $value = $item->{$field->db_column};
+
+                    if (($field->format == 'DATE') && (!is_null($value)) && ($value!='')){
+                        $value = Helper::getFormattedDateObject($value, 'date', false);
+                    }
+
+                    $fields_array[$field->name] = [
+                        'field' => e($field->db_column),
+                        'value' => e($value),
+                        'field_format' => $field->format,
+                        'element' => $field->element,
+                    ];
+                }
+
+                return $fields_array;
+            }
+        } else {
+            return new \stdClass; // HACK to force generation of empty object instead of empty list
+        }
+    }
+
+    static function present($field) {
+        return [
+            'field' => 'custom_fields.'.$field->db_column,
+            'searchable' => true,
+            'sortable' => true,
+            'switchable' => true,
+            'title' => $field->name,
+            'formatter'=> 'customFieldsFormatter',
+            'escape' => true,
+            'class' => ($field->field_encrypted == '1') ? 'css-padlock' : '',
+            'visible' => ($field->show_in_listview == '1') ? true : false,
+        ];
+    }
+}

app/Helpers/Helper.php

@@ -73,14 +73,10 @@ class Helper
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.3]
-     * @return string
+     * @return array
      */
-    public static function defaultChartColors(int $index = 0)
+    public static function defaultChartColors($index = 0)
     {
-        if ($index < 0) {
-            $index = 0;
-        }
-
         $colors = [
             '#008941',
             '#FF4A46',
@@ -353,19 +349,7 @@ class Helper
         $total_colors = count($colors);
 
         if ($index >= $total_colors) {
-
-            \Log::error('Status label count is '.$index.' and exceeds the allowed count of 266.');
-            //patch fix for array key overflow (color count starts at 1, array starts at 0)
-            $index = $index - $total_colors - 1;
-
-            //constraints to keep result in 0-265 range. This should never be needed, but if something happens
-            //to create this many status labels and it DOES happen, this will keep it from failing at least.
-            if($index < 0) {
-                $index = 0;
-            }
-            elseif($index >($total_colors - 1)) {
-                $index = $total_colors - 1;
-            }
+            $index = $index - $total_colors;
         }
 
         return $colors[$index];
@@ -591,6 +575,17 @@ class Helper
         return  $customfields;
     }
 
+    /**
+     * Get all of the different types of custom fields there are
+     * TODO - how to make this more general? Or more useful? or more dynamic?
+     * idea - key of classname, *value* of trans? (thus having to make this a method, which is fine)
+     */
+    static $itemtypes_having_custom_fields = [
+        0 => \App\Models\Asset::class,
+        1 => \App\Models\User::class,
+        // 2 => \App\Models\Accessory::class
+    ];
+
     /**
      * Get the list of custom field formats in an array to make a dropdown menu
      *

app/Http/Controllers/Accessories/AccessoriesFilesController.php

@@ -146,8 +146,9 @@ class AccessoriesFilesController extends Controller
             $this->authorize('view', $accessory);
             $this->authorize('accessories.files', $accessory);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) {
-                return redirect()->route('accessories.index')->with('error',  trans('admin/users/message.log_record_not_found'));
+            if (! $log = Actionlog::find($fileId)) {
+                return response('No matching record for that asset/file', 500)
+                    ->header('Content-Type', 'text/plain');
             }
 
             $file = 'private_uploads/accessories/'.$log->filename;

app/Http/Controllers/Accessories/AccessoryCheckoutController.php

@@ -18,36 +18,31 @@ class AccessoryCheckoutController extends Controller
      * Return the form to checkout an Accessory to a user.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $id
+     * @param  int $accessoryId
      * @return View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($accessoryId)
     {
-
-        if ($accessory = Accessory::withCount('users as users_count')->find($id)) {
-
-            $this->authorize('checkout', $accessory);
-
-            if ($accessory->category) {
-                // 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'));
-                }
-
-                // Return the checkout view
-                return view('accessories/checkout', compact('accessory'));
-            }
-
-            // Invalid category
-            return redirect()->route('accessories.edit', ['accessory' => $accessory->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.accessory')]));
-
+        // 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.not_found'));
         }
 
-        // Not found
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        // 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'));
+        }
+        
+        if ($accessory->category) {
+            $this->authorize('checkout', $accessory);
 
+            // Get the dropdown of users and then pass it to the checkout view
+            return view('accessories/checkout', compact('accessory'));
+        }
+
+        return redirect()->back()->with('error', 'The category type for this accessory is not valid. Edit the accessory and select a valid accessory category.');
     }
 
     /**

app/Http/Controllers/Api/AssetModelsController.php

@@ -46,7 +46,6 @@ class AssetModelsController extends Controller
                 'requestable',
                 'assets_count',
                 'category',
-                'fieldset',
             ];
 
         $assetmodels = AssetModel::select([
@@ -66,7 +65,7 @@ class AssetModelsController extends Controller
             'models.deleted_at',
             'models.updated_at',
          ])
-            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues')
+            ->with('category', 'depreciation', 'manufacturer')
             ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
@@ -95,9 +94,6 @@ class AssetModelsController extends Controller
             case 'category':
                 $assetmodels->OrderCategory($order);
                 break;
-            case 'fieldset':
-                $assetmodels->OrderFieldset($order);
-                break;
             default:
                 $assetmodels->orderBy($sort, $order);
                 break;

app/Http/Controllers/Api/AssetsController.php

@@ -33,7 +33,6 @@ use TCPDF;
 use Validator;
 use Route;
 
-
 /**
  * This class controls all actions related to assets for
  * the Snipe-IT Asset Management application.
@@ -49,7 +48,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function index(Request $request, $audit = null) 
     {
@@ -111,7 +110,7 @@ class AssetsController extends Controller
             $filter = json_decode($request->input('filter'), true);
         }
 
-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
+        $all_custom_fields = CustomField::where('type', Asset::class); //used as a 'cache' of custom fields throughout this page load
         foreach ($all_custom_fields as $field) {
             $allowed_columns[] = $field->db_column_name();
         }
@@ -296,7 +295,7 @@ class AssetsController extends Controller
         }
 
         if ($request->filled('order_number')) {
-            $assets->where('assets.order_number', '=', strval($request->get('order_number')));
+            $assets->where('assets.order_number', '=', $request->get('order_number'));
         }
 
         // This is kinda gross, but we need to do this because the Bootstrap Tables
@@ -347,7 +346,7 @@ class AssetsController extends Controller
 
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $total = $assets->count();
@@ -444,7 +443,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function show(Request $request, $id)
     {
@@ -475,7 +474,7 @@ 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)
     {
@@ -531,12 +530,12 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param \App\Http\Requests\ImageUploadRequest $request
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function store(ImageUploadRequest $request)
     {
         $this->authorize('create', Asset::class);
-        
+
         $asset = new Asset();
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
@@ -546,7 +545,8 @@ class AssetsController extends Controller
         $asset->model_id                = $request->get('model_id');
         $asset->order_number            = $request->get('order_number');
         $asset->notes                   = $request->get('notes');
-        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset());
+        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset()); //yup, problem :/
+        // NO IT IS NOT!!! This is never firing; we SHOW the asset_tag you're going to get, so it *will* be filled in!
         $asset->user_id                 = Auth::id();
         $asset->archived                = '0';
         $asset->physical                = '1';
@@ -573,42 +573,8 @@ class AssetsController extends Controller
 
         $asset = $request->handleImages($asset);
 
-        // Update custom fields in the database.
-        // Validation for these fields is handled through the AssetRequest form request
-        $model = AssetModel::find($request->get('model_id'));
+        $asset->customFill($request, Auth::user(), true);
 
-        if (($model) && ($model->fieldset)) {
-            foreach ($model->fieldset->fields as $field) {
-
-                // Set the field value based on what was sent in the request
-                $field_val = $request->input($field->db_column, null);
-
-                // If input value is null, use custom field's default value
-                if ($field_val == null) {
-                    \Log::debug('Field value for '.$field->db_column.' is null');
-                    $field_val = $field->defaultValue($request->get('model_id'));
-                    \Log::debug('Use the default fieldset value of '.$field->defaultValue($request->get('model_id')));
-                }
-
-                // if the field is set to encrypted, make sure we encrypt the value
-                if ($field->field_encrypted == '1') {
-                    \Log::debug('This model field is encrypted in this fieldset.');
-
-                    if (Gate::allows('admin')) {
-
-                        // If input value is null, use custom field's default value
-                        if (($field_val == null) && ($request->has('model_id') != '')) {
-                            $field_val = \Crypt::encrypt($field->defaultValue($request->get('model_id')));
-                        } else {
-                            $field_val = \Crypt::encrypt($request->input($field->db_column));
-                        }
-                    }
-                }
-
-
-                $asset->{$field->db_column} = $field_val;
-            }
-        }
 
         if ($asset->save()) {
             if ($request->get('assigned_user')) {
@@ -639,7 +605,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param \App\Http\Requests\ImageUploadRequest $request
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function update(ImageUploadRequest $request, $id)
     {
@@ -666,24 +632,9 @@ class AssetsController extends Controller
                 $request->offsetSet('image', $request->offsetGet('image_source'));
             }     
 
-            $asset = $request->handleImages($asset);
-            $model = AssetModel::find($asset->model_id);
+            $asset = $request->handleImages($asset); 
             
-            // Update custom fields
-            if (($model) && (isset($model->fieldset))) {
-                foreach ($model->fieldset->fields as $field) {
-                    if ($request->has($field->db_column)) {
-                        if ($field->field_encrypted == '1') {
-                            if (Gate::allows('admin')) {
-                                $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
-                            }
-                        } else {
-                            $asset->{$field->db_column} = $request->input($field->db_column);
-                        }
-                    }
-                }
-            }
-
+            $asset->customFill($request,Auth::user());
 
             if ($asset->save()) {
                 if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
@@ -721,7 +672,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function destroy($id)
     {
@@ -750,28 +701,38 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v5.1.18]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function restore(Request $request, $assetId = null)
     {
+        // Get asset information
+        $asset = Asset::withTrashed()->find($assetId);
+        $this->authorize('delete', $asset);
 
-        if ($asset = Asset::withTrashed()->find($assetId)) {
-            $this->authorize('delete', $asset);
+        if (isset($asset->id)) {
 
-            if ($asset->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.asset')])), 200);
+            if ($asset->deleted_at=='') {
+               $message = 'Asset was not deleted. No data was changed.';
+
+            } else {
+
+                $message = trans('admin/hardware/message.restore.success');
+                // Restore the asset
+                Asset::withTrashed()->where('id', $assetId)->restore();
+
+                $logaction = new Actionlog();
+                $logaction->item_type = Asset::class;
+                $logaction->item_id = $asset->id;
+                $logaction->created_at =  date("Y-m-d H:i:s");
+                $logaction->user_id = Auth::user()->id;
+                $logaction->logaction('restored');
             }
 
-            if ($asset->restore()) {
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/hardware/message.restore.success')), 200);
-            }
+            return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset, $request), $message));
+        
 
-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.asset'), 'error' => $asset->getErrors()->first()])), 200);
         }
-
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-
     }
 
     /**
@@ -780,7 +741,7 @@ class AssetsController extends Controller
      * @author [N. Butler]
      * @param string $tag
      * @since [v6.0.5]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function checkoutByTag(AssetCheckoutRequest $request, $tag)
     {
@@ -796,7 +757,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function checkout(AssetCheckoutRequest $request, $asset_id)
     {
@@ -880,7 +841,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function checkin(Request $request, $asset_id)
     {
@@ -936,7 +897,7 @@ class AssetsController extends Controller
      *
      * @author [A. Janes] [<ajanes@adagiohealth.org>]
      * @since [v6.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function checkinByTag(Request $request, $tag = null)
     {
@@ -962,7 +923,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $id
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function audit(Request $request)
 
@@ -1023,54 +984,24 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function requestable(Request $request)
     {
         $this->authorize('viewRequestable', Asset::class);
 
-        $allowed_columns = [
-            'name',
-            'asset_tag',
-            'serial',
-            'model_number',
-            'image',
-            'purchase_cost',
-            'expected_checkin',
-        ];
-
-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-
-        foreach ($all_custom_fields as $field) {
-            $allowed_columns[] = $field->db_column_name();
-        }
-
         $assets = Asset::select('assets.*')
-            ->with('location', 'assetstatus', 'assetlog', 'company','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier', 'requests')
+            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
+                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')
             ->requestableAssets();
 
-
-
-
+        $offset = request('offset', 0);
+        $limit = $request->input('limit', 50);
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         if ($request->filled('search')) {
             $assets->TextSearch($request->input('search'));
         }
 
-        // Search custom fields by column name
-        foreach ($all_custom_fields as $field) {
-            if ($request->filled($field->db_column_name())) {
-                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
-            }
-        }
-
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort_override = str_replace('custom_fields.', '', $request->input('sort'));
-
-        // This handles all the pivot sorting (versus the assets.* fields
-        // in the allowed_columns array)
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
-
         switch ($request->input('sort')) {
             case 'model':
                 $assets->OrderModels($order);
@@ -1078,19 +1009,17 @@ class AssetsController extends Controller
             case 'model_number':
                 $assets->OrderModelNumber($order);
                 break;
-            case 'location':
-                $assets->OrderLocation($order);
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
                 break;
             default:
-                $assets->orderBy($column_sort, $order);
+                $assets->orderBy('assets.created_at', $order);
                 break;
         }
 
-
-        // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
-        $limit = app('api_limit_value');
-
         $total = $assets->count();
         $assets = $assets->skip($offset)->take($limit)->get();
 

app/Http/Controllers/Api/CategoriesController.php

@@ -92,7 +92,7 @@ class CategoriesController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $categories->count()) ? $categories->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $categories->count()) ? $categories->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/CompaniesController.php

@@ -56,7 +56,7 @@ class CompaniesController extends Controller
 
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
 

app/Http/Controllers/Api/ComponentsController.php

@@ -77,7 +77,7 @@ class ComponentsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $components->count()) ? $components->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $components->count()) ? $components->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -263,7 +263,7 @@ class ComponentsController extends Controller
         }
 
         // Make sure there is at least one available to checkout
-        if ($component->numRemaining() < $request->get('assigned_qty')) {
+        if ($component->numRemaining() <= $request->get('assigned_qty')) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->get('assigned_qty')])));
         }
 

app/Http/Controllers/Api/ConsumablesController.php

@@ -86,7 +86,7 @@ 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');
+        $offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : abs($request->input('offset'));
         $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'];
@@ -263,14 +263,9 @@ class ConsumablesController extends Controller
         // Make sure there is at least one available to checkout
         if ($consumable->numRemaining() <= 0) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable')));
+            \Log::debug('No enough remaining');
         }
 
-        // Make sure there is a valid category
-        if (!$consumable->category){
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.invalid_item_category_single', ['type' => trans('general.consumable')])));
-        }
-
-
         // Check if the user exists - @TODO:  this should probably be handled via validation, not here??
         if (!$user = User::find($request->input('assigned_to'))) {
             // Return error message

app/Http/Controllers/Api/CustomFieldsetsController.php

@@ -35,7 +35,7 @@ class CustomFieldsetsController extends Controller
     public function index()
     {
         $this->authorize('index', CustomField::class);
-        $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
+        $fieldsets = CustomFieldset::withCount('fields as fields_count')->get();
 
         return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
     }
@@ -125,7 +125,7 @@ class CustomFieldsetsController extends Controller
         $this->authorize('delete', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
 
-        $modelsCount = $fieldset->models->count();
+        $modelsCount = $fieldset->customizables()->count();
         $fieldsCount = $fieldset->fields->count();
 
         if (($modelsCount > 0) || ($fieldsCount > 0)) {

app/Http/Controllers/Api/DepartmentsController.php

@@ -27,7 +27,7 @@ class DepartmentsController extends Controller
         $this->authorize('view', Department::class);
         $allowed_columns = ['id', 'name', 'image', 'users_count'];
 
-        $departments = Department::select(
+        $departments = Company::scopeCompanyables(Department::select(
             'departments.id',
             'departments.name',
             'departments.phone',
@@ -37,8 +37,8 @@ class DepartmentsController extends Controller
             'departments.manager_id',
             'departments.created_at',
             'departments.updated_at',
-            'departments.image'
-        )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
+            'departments.image'),
+             "company_id", "departments")->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $departments = $departments->TextSearch($request->input('search'));
@@ -61,7 +61,7 @@ class DepartmentsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $departments->count()) ? $departments->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $departments->count()) ? $departments->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/DepreciationsController.php

@@ -29,7 +29,7 @@ class DepreciationsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/GroupsController.php

@@ -36,7 +36,7 @@ class GroupsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $groups->count()) ? $groups->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $groups->count()) ? $groups->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -63,7 +63,7 @@ class GroupsController extends Controller
         $group = new Group;
 
         $group->name = $request->input('name');
-        $group->permissions = json_encode($request->input('permissions')); // Todo - some JSON validation stuff here
+        $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
 
         if ($group->save()) {
             return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.create.success')));

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -41,7 +41,7 @@ class LicenseSeatsController extends Controller
             $total = $seats->count();
 
             // Make sure the offset and limit are actually integers and do not exceed system limits
-            $offset = ($request->input('offset') > $seats->count()) ? $seats->count() : app('api_offset_value');
+            $offset = ($request->input('offset') > $seats->count()) ? $seats->count() : abs($request->input('offset'));
 
             if ($offset >= $total ){
                 $offset = 0;

app/Http/Controllers/Api/LicensesController.php

@@ -95,7 +95,7 @@ class LicensesController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/LocationsController.php

@@ -81,7 +81,7 @@ class LocationsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $locations->count()) ? $locations->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $locations->count()) ? $locations->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/ManufacturersController.php

@@ -6,11 +6,9 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ManufacturersTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-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;
 
 class ManufacturersController extends Controller
@@ -64,7 +62,7 @@ class ManufacturersController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -161,44 +159,6 @@ class ManufacturersController extends Controller
 
     }
 
-    /**
-     * Restore a given Manufacturer (mark as un-deleted)
-     *
-     * @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)
-    {
-        $this->authorize('delete', Manufacturer::class);
-
-        if ($manufacturer = Manufacturer::withTrashed()->find($id)) {
-
-            if ($manufacturer->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.manufacturer')])), 200);
-            }
-
-            if ($manufacturer->restore()) {
-
-                $logaction = new Actionlog();
-                $logaction->item_type = Manufacturer::class;
-                $logaction->item_id = $manufacturer->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/manufacturers/message.restore.success')), 200);
-            }
-
-            // Check validation to make sure we're not restoring an item with the same unique attributes as a non-deleted one
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.manufacturer'), 'error' => $manufacturer->getErrors()->first()])), 200);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.does_not_exist')));
-    }
-
     /**
      * Gets a paginated collection for the select2 menus
      *

app/Http/Controllers/Api/PredefinedKitsController.php

@@ -30,7 +30,7 @@ class PredefinedKitsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $kits->count()) ? $kits->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $kits->count()) ? $kits->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'desc' ? 'desc' : 'asc';

app/Http/Controllers/Api/ProfileController.php

@@ -11,7 +11,6 @@ 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 DB;
 
 class ProfileController extends Controller
@@ -49,23 +48,14 @@ class ProfileController extends Controller
     {
         $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get();
 
-        $results = array();
-        $show_field = array();
-        $showable_fields = array();
+        $results = [];
         $results['total'] = $checkoutRequests->count();
 
-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-        foreach ($all_custom_fields as $field) {
-            if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
-                $showable_fields[] = $field->db_column_name();
-            }
-        }
-
         foreach ($checkoutRequests as $checkoutRequest) {
 
             // Make sure the asset and request still exist
             if ($checkoutRequest && $checkoutRequest->itemRequested()) {
-                $assets = [
+                $results['rows'][] = [
                     'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
                     'name' => e($checkoutRequest->itemRequested()->present()->name()),
                     'type' => e($checkoutRequest->itemType()),
@@ -74,16 +64,7 @@ class ProfileController extends Controller
                     'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
                     'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
                 ];
-
-                foreach ($showable_fields as $showable_field_name) {
-                    $show_field['custom_fields.'.$showable_field_name] =  $checkoutRequest->itemRequested()->{$showable_field_name};
-                }
-
-                // Merge the plain asset data and the custom fields data
-                $results['rows'][] = array_merge($assets, $show_field);
             }
-
-
         }
 
         return $results;

app/Http/Controllers/Api/ReportsController.php

@@ -56,7 +56,7 @@ class ReportsController extends Controller
 
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $actionlogs->count()) ? $actionlogs->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $actionlogs->count()) ? $actionlogs->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

app/Http/Controllers/Api/StatuslabelsController.php

@@ -52,7 +52,7 @@ class StatuslabelsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $statuslabels->count()) ? $statuslabels->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $statuslabels->count()) ? $statuslabels->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/SuppliersController.php

@@ -94,7 +94,7 @@ class SuppliersController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $suppliers->count()) ? $suppliers->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $suppliers->count()) ? $suppliers->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/UsersController.php

@@ -11,9 +11,9 @@ use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\UsersTransformer;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
+use App\Models\CustomField;
 use App\Models\License;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
@@ -37,7 +37,7 @@ class UsersController extends Controller
     {
         $this->authorize('view', User::class);
 
-        $users = User::select([
+        $allowed_columns = [
             'users.activated',
             'users.created_by',
             'users.address',
@@ -74,7 +74,12 @@ class UsersController extends Controller
             'users.vip',
             'users.autoassign_licenses',
 
-        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
+        ];
+
+        foreach(CustomField::where('type', User::class)->get() as $field) {
+            $allowed_columns[] = $field->db_column_name();
+        }
+        $users = User::select()->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
             ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
 
 
@@ -193,7 +198,7 @@ class UsersController extends Controller
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $users->count()) ? $users->count() : app('api_offset_value');
+        $offset = ($request->input('offset') > $users->count()) ? $users->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
 
 
@@ -364,15 +369,13 @@ class UsersController extends Controller
             $user->permissions = $permissions_array;
         }
 
-        // 
-        if ($request->filled('password')) {
-            $user->password = bcrypt($request->get('password'));
-        } else {
-            $user->password = $user->noPassword();
-        }
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 40);
+        $user->password = bcrypt($request->get('password', $tmp_pass));
 
         app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
-        
+
+        $user->customFill($request,Auth::user());
+
         if ($user->save()) {
             if ($request->filled('groups')) {
                 $user->groups()->sync($request->input('groups'));
@@ -463,7 +466,9 @@ class UsersController extends Controller
 
         
         app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
-          
+
+        $user->customFill($request,Auth::user());
+
         if ($user->save()) {
 
             // Sync group memberships:
@@ -689,31 +694,17 @@ class UsersController extends Controller
      */
     public function restore($userId = null)
     {
+        // Get asset information
+        $user = User::withTrashed()->find($userId);
+        $this->authorize('delete', $user);
+        if (isset($user->id)) {
+            // Restore the user
+            User::withTrashed()->where('id', $userId)->restore();
 
-        if ($user = User::withTrashed()->find($userId)) {
-            $this->authorize('delete', $user);
-
-            if ($user->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.user')])), 200);
-            }
-
-            if ($user->restore()) {
-
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $user->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/users/message.restore.success')), 200);
-            }
-
-            // Check validation to make sure we're not restoring a user with the same username as an existing user
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.user'), 'error' => $user->getErrors()->first()])), 200);
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.restored')));
         }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')), 200);
-
+        
+        $id = $userId;
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))), 200);
     }
 }

app/Http/Controllers/AssetModelsController.php

@@ -4,12 +4,9 @@ namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\User;
+use App\Models\DefaultValuesForCustomFields;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Validator;
@@ -164,7 +161,7 @@ class AssetModelsController extends Controller
         $model->notes = $request->input('notes');
         $model->requestable = $request->input('requestable', '0');
 
-        $this->removeCustomFieldsDefaultValues($model);
+        DefaultValuesForCustomFields::forPivot($model, Asset::class)->delete();
 
         if ($request->input('fieldset_id') == '') {
             $model->fieldset_id = null;
@@ -177,20 +174,8 @@ class AssetModelsController extends Controller
                 }
             }
         }
-       
-      
-       
+
         if ($model->save()) {
-            if ($model->wasChanged('eol')) {
-                    if ($model->eol > 0) {
-                        $newEol = $model->eol; 
-                        $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
-                            ->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL ' . $newEol . ' MONTH)')]);
-                        } elseif ($model->eol == 0) {
-    						$model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
-    							->update(['asset_eol_date' => DB::raw('null')]);
-					}
-                }
             return redirect()->route('models.index')->with('success', trans('admin/models/message.update.success'));
         }
 
@@ -212,7 +197,7 @@ class AssetModelsController extends Controller
         $this->authorize('delete', AssetModel::class);
         // Check if the model exists
         if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
         }
 
         if ($model->assets()->count() > 0) {
@@ -240,42 +225,22 @@ class AssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @param int $id
+     * @param int $modelId
      * @return Redirect
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getRestore($id)
+    public function getRestore($modelId = null)
     {
         $this->authorize('create', AssetModel::class);
+        // Get user information
+        $model = AssetModel::withTrashed()->find($modelId);
 
-        if ($model = AssetModel::withTrashed()->find($id)) {
+        if (isset($model->id)) {
+            $model->restore();
 
-            if ($model->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.asset_model')]));
-            }
-
-            if ($model->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $model->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_models = AssetModel::onlyTrashed()->count();
-                if ($deleted_models > 0) {
-                    return redirect()->back()->with('success', trans('admin/models/message.restore.success'));
-                }
-                return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success'));
-            }
-
-            // Check validation
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.asset_model'), 'error' => $model->getErrors()->first()]));
+            return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success'));
         }
-
-        return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+        return redirect()->back()->with('error', trans('admin/models/message.not_found'));
 
     }
 
@@ -487,7 +452,7 @@ class AssetModelsController extends Controller
     }
 
     /**
-     * Adds default values to a model (as long as they are truthy)
+     * Adds default values to a model (as long as they are truthy) (does this mean I cannot set a default value of 0?)
      *
      * @param  AssetModel $model
      * @param  array      $defaultValues
@@ -522,22 +487,12 @@ class AssetModelsController extends Controller
         }
 
         foreach ($defaultValues as $customFieldId => $defaultValue) {
-            if(is_array($defaultValue)){
-                $model->defaultValues()->attach($customFieldId, ['default_value' => implode(', ', $defaultValue)]);
-            }elseif ($defaultValue) {
-                $model->defaultValues()->attach($customFieldId, ['default_value' => $defaultValue]);
+            if(is_array($defaultValue)) {
+                $defaultValue = implode(', ', $defaultValue);
             }
+            DefaultValuesForCustomFields::updateOrCreate(['custom_field_id' => $customFieldId,'item_pivot_id' => $model->id], ['default_value' => $defaultValue]);
         }
         return true;
     }
 
-    /**
-     * Removes all default values
-     *
-     * @return void
-     */
-    private function removeCustomFieldsDefaultValues(AssetModel $model)
-    {
-        $model->defaultValues()->detach();
-    }
 }

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -91,8 +91,7 @@ class AssetCheckoutController extends Controller
 
             $settings = \App\Models\Setting::getSettings();
 
-            // We have to check whether $target->company_id is null here since locations don't have a company yet
-            if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
+            if ($settings->full_multiple_companies_support){
                 if ($target->company_id != $asset->company_id){
                     return redirect()->to("hardware/$assetId/checkout")->with('error', trans('general.error_user_company'));
                 }

app/Http/Controllers/Assets/AssetFilesController.php

@@ -86,7 +86,7 @@ class AssetFilesController extends Controller
         if (isset($asset->id)) {
             $this->authorize('view', $asset);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                 return response('No matching record for that asset/file', 500)
                     ->header('Content-Type', 'text/plain');
             }

app/Http/Controllers/Assets/AssetsController.php

@@ -6,8 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
-use App\Models\Manufacturer;
-use Illuminate\Support\Facades\Log;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\CheckoutRequest;
@@ -16,18 +14,26 @@ use App\Models\Location;
 use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use App\View\Label;
+use Auth;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\View;
+use DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Cookie;
+use Input;
+use Intervention\Image\Facades\Image;
 use League\Csv\Reader;
-use Illuminate\Support\Facades\Redirect;
+use League\Csv\Statement;
+use Paginator;
+use Redirect;
+use Response;
+use Slack;
+use Str;
+use TCPDF;
+use View;
 
 /**
  * This class controls all actions related to assets for
@@ -138,7 +144,7 @@ class AssetsController extends Controller
             $asset->warranty_months         = request('warranty_months', null);
             $asset->purchase_cost           = request('purchase_cost');
             $asset->purchase_date           = request('purchase_date', null);
-            $asset->asset_eol_date          = request('asset_eol_date', null);
+            $asset->asset_eol_date          = request('asset_eol_date', $asset->present()->eol_date());
             $asset->assigned_to             = request('assigned_to', null);
             $asset->supplier_id             = request('supplier_id', null);
             $asset->requestable             = request('requestable', 0);
@@ -158,29 +164,7 @@ class AssetsController extends Controller
                 $asset = $request->handleImages($asset);
             }
 
-            // Update custom fields in the database.
-            // Validation for these fields is handled through the AssetRequest form request
-            $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))) {
-                                $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
-                            } else {
-                                $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
-                            }
-                        }
-                    } else {
-                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
-                        } else {
-                            $asset->{$field->db_column} = $request->input($field->db_column);
-                        }
-                    }
-                }
-            }
+            $asset->customFill($request, Auth::user()); // Update custom fields in the database.
 
             // Validate the asset before saving
             if ($asset->isValid() && $asset->save()) {
@@ -205,9 +189,12 @@ class AssetsController extends Controller
         }
 
         if ($success) {
-            \Log::debug(e($asset->asset_tag));
+            // Redirect to the asset listing page
+            $minutes = 518400;
+            // dd( $_POST['options']);
+            // Cookie::queue(Cookie::make('optional_info', json_decode($_POST['options']), $minutes));
             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)]));
+                ->with('success', trans('admin/hardware/message.create.success'));
                
       
         }
@@ -289,10 +276,10 @@ 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>]
+     * @param int $assetId
+     * @since [v1.0]
+     * @return Redirect
      */
     public function update(ImageUploadRequest $request, $assetId = null)
     {
@@ -306,27 +293,9 @@ class AssetsController extends Controller
         $asset->status_id = $request->input('status_id', null);
         $asset->warranty_months = $request->input('warranty_months', null);
         $asset->purchase_cost = $request->input('purchase_cost', null);
-        $asset->purchase_date = $request->input('purchase_date', null); 
-        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) {
-            $asset->purchase_date = $request->input('purchase_date', null); 
-            $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
-            $asset->eol_explicit = false;
-        } elseif ($request->filled('asset_eol_date')) {
-           $asset->asset_eol_date = $request->input('asset_eol_date', null);
-           $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date);
-           if($asset->model->eol) {
-               if($months != $asset->model->eol > 0) {
-                   $asset->eol_explicit = true;
-               } else {
-                   $asset->eol_explicit = false;
-               }
-           } else {
-               $asset->eol_explicit = true;
-           }
-        } elseif (!$request->filled('asset_eol_date') && (($asset->model->eol) == 0)) {
-           $asset->asset_eol_date = null;
-		   $asset->eol_explicit = false;
-        }
+        $asset->asset_eol_date  = request('asset_eol_date', null);
+
+        $asset->purchase_date = $request->input('purchase_date', null);
         $asset->supplier_id = $request->input('supplier_id', null);
         $asset->expected_checkin = $request->input('expected_checkin', null);
 
@@ -351,7 +320,7 @@ class AssetsController extends Controller
                 unlink(public_path().'/uploads/assets/'.$asset->image);
                 $asset->image = '';
             } catch (\Exception $e) {
-                Log::info($e);
+                \Log::info($e);
             }
         }
 
@@ -379,9 +348,9 @@ class AssetsController extends Controller
                 if ($field->field_encrypted == '1') {
                     if (Gate::allows('admin')) {
                         if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                            $asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                         } else {
-                            $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                            $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
                         }
                     }
                 } else {
@@ -429,7 +398,7 @@ class AssetsController extends Controller
             try {
                 Storage::disk('public')->delete('assets'.'/'.$asset->image);
             } catch (\Exception $e) {
-                Log::debug($e);
+                \Log::debug($e);
             }
         }
 
@@ -544,7 +513,7 @@ class AssetsController extends Controller
 
                     return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
                 } catch (\Exception $e) {
-                    Log::debug('The barcode format is invalid.');
+                    \Log::debug('The barcode format is invalid.');
 
                     return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
                 }
@@ -796,24 +765,21 @@ class AssetsController extends Controller
      */
     public function getRestore($assetId = null)
     {
-        if ($asset = Asset::withTrashed()->find($assetId)) {
-            $this->authorize('delete', $asset);
+        // Get asset information
+        $asset = Asset::withTrashed()->find($assetId);
+        $this->authorize('delete', $asset);
+        if (isset($asset->id)) {
+            // Restore the asset
+            Asset::withTrashed()->where('id', $assetId)->restore();
 
-            if ($asset->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.asset')]));
-            }
+            $logaction = new Actionlog();
+            $logaction->item_type = Asset::class;
+            $logaction->item_id = $asset->id;
+            $logaction->created_at = date('Y-m-d H:i:s');
+            $logaction->user_id = Auth::user()->id;
+            $logaction->logaction('restored');
 
-            if ($asset->restore()) {
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_assets = Asset::onlyTrashed()->count();
-                if ($deleted_assets > 0) {
-                    return redirect()->back()->with('success', trans('admin/hardware/message.restore.success'));
-                }
-                return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
-            }
-
-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.asset'), 'error' => $asset->getErrors()->first()]));
+            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
         }
 
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -868,7 +834,7 @@ class AssetsController extends Controller
             'next_audit_date' => 'date|nullable',
         ];
 
-        $validator = Validator::make($request->all(), $rules);
+        $validator = \Validator::make($request->all(), $rules);
 
         if ($validator->fails()) {
             return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
@@ -885,7 +851,7 @@ class AssetsController extends Controller
         // Check to see if they checked the box to update the physical location,
         // not just note it in the audit notes
         if ($request->input('update_location') == '1') {
-            Log::debug('update location in audit');
+            \Log::debug('update location in audit');
             $asset->location_id = $request->input('location_id');
         }
 

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -7,8 +7,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Statuslabel;
 use App\Models\Setting;
 use App\View\Label;
 use Illuminate\Http\Request;
@@ -25,13 +23,6 @@ class BulkAssetsController extends Controller
     /**
      * Display the bulk edit page.
      *
-     * This method is super weird because it's kinda of like a controller within a controller.
-     * It's main function is to determine what the bulk action in, and then return a view with
-     * the information that view needs, be it bulk delete, bulk edit, restore, etc.
-     *
-     * This is something that made sense at the time, but sort of doesn't make sense now. A JS front-end to determine form
-     * 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
@@ -41,10 +32,7 @@ class BulkAssetsController extends Controller
     public function edit(Request $request)
     {
         $this->authorize('view', Asset::class);
-
-        /**
-         * No asset IDs were passed
-         */
+      
         if (! $request->filled('ids')) {
             return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
         }
@@ -53,52 +41,59 @@ class BulkAssetsController extends Controller
         $bulk_back_url = request()->headers->get('referer');
         session(['bulk_back_url' => $bulk_back_url]);
 
+        $asset_ids = array_values(array_unique($request->input('ids')));
+       
+        //custom fields logic
+        $asset_custom_field = Asset::with(['model.fieldset.fields', 'model'])->whereIn('id', $asset_ids)->whereHas('model', function ($query) {
+            return $query->where('fieldset_id', '!=', null);
+        })->get();
 
-        $asset_ids = $request->input('ids');
-        $assets = Asset::with('assignedTo', 'location', 'model')->find($asset_ids);
-
-        $models = $assets->unique('model_id');
+        $models = $asset_custom_field->unique('model_id');  
         $modelNames = [];
         foreach($models as $model) {
             $modelNames[] = $model->model->name;
-        }
+        } 
 
         if ($request->filled('bulk_actions')) {
-
-
             switch ($request->input('bulk_actions')) {
                 case 'labels':
                     $this->authorize('view', Asset::class);
+                    $assets_found = Asset::find($asset_ids);
+                    
+                    if ($assets_found->isEmpty()){
+                        return redirect()->back();
+                    }
 
                     return (new Label)
-                        ->with('assets', $assets)
+                        ->with('assets', $assets_found)
                         ->with('settings', Setting::getSettings())
                         ->with('bulkedit', true)
                         ->with('count', 0);
 
                 case 'delete':
                     $this->authorize('delete', Asset::class);
-                    $assets->each(function ($assets) {
-                        $this->authorize('delete', $assets);
+                    $assets = Asset::with('assignedTo', 'location')->find($asset_ids);
+                    $assets->each(function ($asset) {
+                        $this->authorize('delete', $asset);
                     });
 
                     return view('hardware/bulk-delete')->with('assets', $assets);
                    
                 case 'restore':
                     $this->authorize('update', Asset::class);
-                    $assets = Asset::withTrashed()->find($asset_ids);
+                    $assets = Asset::withTrashed()->find($asset_ids); 
                     $assets->each(function ($asset) {
                         $this->authorize('delete', $asset);
                     });
+
                     return view('hardware/bulk-restore')->with('assets', $assets);
 
                 case 'edit':
                     $this->authorize('update', Asset::class);
-
                     return view('hardware/bulk')
                         ->with('assets', $asset_ids)
                         ->with('statuslabel_list', Helper::statusLabelList())
-                        ->with('models', $models->pluck(['model']))
+                        ->with('models', $models->pluck(['model'])) 
                         ->with('modelNames', $modelNames);
             }
         }
@@ -117,36 +112,30 @@ class BulkAssetsController extends Controller
     public function update(Request $request)
     {
         $this->authorize('update', Asset::class);
-        $has_errors = 0;
-        $error_array = array();
+        $error_bag = [];
 
         // Get the back url from the session and then destroy the session
         $bulk_back_url = route('hardware.index');
-
         if ($request->session()->has('bulk_back_url')) {
             $bulk_back_url = $request->session()->pull('bulk_back_url');
         }
 
-       $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
 
+      $custom_field_columns = CustomField::all()->pluck('db_column')->toArray(); 
      
-        if (! $request->filled('ids') || count($request->input('ids')) == 0) {
+        if(Session::exists('ids')) {
+            $assets = Session::get('ids'); 
+        } elseif (! $request->filled('ids') || count($request->input('ids')) <= 0) {
             return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
         }
-
-
-        $assets = Asset::whereIn('id', array_keys($request->input('ids')))->get();
-
-
-
-        /**
-         * If ANY of these are filled, prepare to update the values on the assets.
-         *
-         * Additional checks will be needed for some of them to make sure the values
-         * make sense (for example, changing the status ID to something incompatible with
-         * its checkout status.
-         */
-
+         
+        $assets = array_keys($request->input('ids'));
+        
+       if ($request->anyFilled($custom_field_columns)) {
+           $custom_fields_present = true;
+         } else {
+           $custom_fields_present = false;
+         }
         if (($request->filled('purchase_date'))
             || ($request->filled('expected_checkin'))
             || ($request->filled('purchase_cost'))
@@ -165,32 +154,23 @@ class BulkAssetsController extends Controller
             || ($request->anyFilled($custom_field_columns))
 
         ) {
-            // Let's loop through those assets and build an update array
-            foreach ($assets as $asset) {
+            foreach ($assets as $assetId) {
 
                 $this->update_array = [];
 
-                /**
-                 * Leave out model_id and status here because we do math on that later. We have to do some extra
-                 * validation and checks on those two.
-                 *
-                 * It's tempting to make these match the request check above, but some of these values require
-                 * extra work to make sure the data makes sense.
-                 */
                 $this->conditionallyAddItem('purchase_date')
                     ->conditionallyAddItem('expected_checkin')
+                    ->conditionallyAddItem('model_id')
                     ->conditionallyAddItem('order_number')
                     ->conditionallyAddItem('requestable')
+                    ->conditionallyAddItem('status_id')
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
                     ->conditionallyAddItem('next_audit_date');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
-                   }
+                   } 
 
-                /**
-                 * Blank out fields that were requested to be blanked out via checkbox
-                 */
                 if ($request->input('null_purchase_date')=='1') {
                     $this->update_array['purchase_date'] = null;
                 }
@@ -214,150 +194,69 @@ class BulkAssetsController extends Controller
                     }
                 }
 
-                /**
-                 * We're trying to change the model ID - we need to do some extra checks here to make sure
-                 * the custom field values work for the custom fieldset rules around this asset. Uniqueness
-                 * and requiredness across the fieldset is particularly important, since those are
-                 * fieldset-specific attributes.
-                 */
-                if ($request->filled('model_id')) {
-                    $this->update_array['model_id'] = AssetModel::find($request->input('model_id'))->id;
-                }
-
-                /**
-                 * We're trying to change the status ID - we need to do some extra checks here to
-                 * make sure the status label type is one that makes sense for the state of the asset,
-                 * for example, we shouldn't be able to make an asset archived if it's currently assigned
-                 * to someone/something.
-                 */
-                if ($request->filled('status_id')) {
-                    $updated_status = Statuslabel::find($request->input('status_id'));
-
-                    // We cannot assign a non-deployable status type if the asset is already assigned.
-                    // This could probably be added to a form request.
-                    // If the asset isn't assigned, we don't care what the status is.
-                    // Otherwise we need to make sure the status type is still a deployable one.
-                    if (
-                        ($asset->assigned_to == '')
-                        || ($updated_status->deployable == '1') && ($asset->assetstatus->deployable == '1')
-                    ) {
-                        $this->update_array['status_id'] = $updated_status->id;
-                    }
-
-                }
-
-                /**
-                 * We're changing the location ID - figure out which location we should apply
-                 * this change to:
-                 *
-                 * 0 - RTD location only
-                 * 1 - location ID and RTD location ID
-                 * 2 - location ID only
-                 *
-                 * Note: this is kinda dumb and we should just use human-readable values IMHO. - snipe
-                 */
                 if ($request->filled('rtd_location_id')) {
-
-                    if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '0')) {
-                        $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
-                    }
-
+                    $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
                     if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '1')) {
                         $this->update_array['location_id'] = $request->input('rtd_location_id');
-                        $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
                     }
-
-                    if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '2')) {
-                        $this->update_array['location_id'] = $request->input('rtd_location_id');
-                    }
-
                 }
 
-
-                /**
-                 * ------------------------------------------------------------------------------
-                 * ANYTHING that happens past this foreach
-                 * WILL NOT BE logged in the edit log_meta data
-                 *  ------------------------------------------------------------------------------
-                 */
                 $changed = [];
+                $assetCollection = Asset::where('id' ,$assetId)->get();
 
                 foreach ($this->update_array as $key => $value) {
-
-                    if ($this->update_array[$key] != $asset->{$key}) {
-                        $changed[$key]['old'] = $asset->{$key};
+                    if ($this->update_array[$key] != $assetCollection->toArray()[0][$key]) {
+                        $changed[$key]['old'] = $assetCollection->toArray()[0][$key];
                         $changed[$key]['new'] = $this->update_array[$key];
                     }
-
                 }
 
-                /**
-                 * Start all the custom fields shenanigans
-                 */
-
-                // Does the model have a fieldset?
-                if ($asset->model->fieldset) {
-                    foreach ($asset->model->fieldset->fields as $field) {
-
-                        if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
-                            $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
-
-                            /*
-                             * Check if the decrypted existing value is different from one we just submitted
-                             * and if not, pull it out of the object since it shouldn't really be updating at all.
-                             * If we don't do this, it will try to re-encrypt it, and the same value encrypted two
-                             * different times will have different values, so it will *look* like it was updated
-                             * but it wasn't.
-                             */
-                            if ($decrypted_old != $this->update_array[$field->db_column]) {
-                                $asset->{$field->db_column} = \Crypt::encrypt($this->update_array[$field->db_column]);
-                            } else {
-                                /*
-                                 * Remove the encrypted custom field from the update_array, since nothing changed
-                                 */
-                                unset($this->update_array[$field->db_column]);
-                                unset($asset->{$field->db_column});
-                            }
-
-                            /*
-                             * These custom fields aren't encrypted, just carry on as usual
-                             */
-                        } else {
-
-                            if ((array_key_exists($field->db_column, $this->update_array)) && ($asset->{$field->db_column} != $this->update_array[$field->db_column])) {
-
-                                // Check if this is an array, and if so, flatten it
-                                if (is_array($this->update_array[$field->db_column])) {
-                                    $asset->{$field->db_column} = implode(', ', $this->update_array[$field->db_column]);
-                                } else {
-                                    $asset->{$field->db_column} = $this->update_array[$field->db_column];
-                                }
-                            }
-                        }
-
-                    } // endforeach
+                $logAction = new Actionlog();
+                $logAction->item_type = Asset::class;
+                $logAction->item_id = $assetId;
+                $logAction->created_at =  date("Y-m-d H:i:s");
+                $logAction->user_id = Auth::id();
+                $logAction->log_meta = json_encode($changed);
+                $logAction->logaction('update');
+ 
+                if($custom_fields_present) { 
+                    $asset = Asset::find($assetId); 
+                    $assetCustomFields = $asset->model()->first()->fieldset; 
+                    if($assetCustomFields && $assetCustomFields->fields) {
+                            foreach ($assetCustomFields->fields as $field) { 
+                                if (array_key_exists($field->db_column, $this->update_array)) {
+                                        $asset->{$field->db_column} = $this->update_array[$field->db_column]; 
+                                        $saved = $asset->save();    
+                                        if(!$saved) {
+                                            $error_bag[] = $asset->getErrors();
+                                        }
+                                        continue; 
+                                } else { 
+                                        $array = $this->update_array; 
+                                        array_except($array, $field->db_column); 
+                                        $asset->save($array); 
+                                    }     
+                                    if (!$asset->save()) {
+                                        $error_bag[] = $asset->getErrors();
+                                } 
+                    } 
                 }
-
-
-                // Check if it passes validation, and then try to save
-                if (!$asset->update($this->update_array)) {
-
-                    // Build the error array
-                    foreach ($asset->getErrors()->toArray() as $key => $message) {
-                        for ($x = 0; $x < count($message); $x++) {
-                            $error_array[$key][] = trans('general.asset') . ' ' . $asset->id . ': ' . $message[$x];
-                            $has_errors++;
-                        }
+                } else {
+                    Asset::find($assetId)->update($this->update_array);
+                } 
+            } 
+            if(!empty($error_bag)) {
+                $errors = [];
+               //find the customfield name from the name of the messagebag items 
+                foreach ($error_bag as $key => $bag) {
+                  foreach($bag->keys() as $key => $value) {
+                        CustomField::where('db_column', $value)->get()->map(function($item) use (&$errors) {
+                            $errors[] = $item->name; 
+                        });
                     }
-
-                }  // end if saved
-
-            } // end asset foreach
-
-            if ($has_errors > 0) {
-                return redirect($bulk_back_url)->with('bulk_asset_errors', $error_array);
-            }
-
+                }
+                return redirect($bulk_back_url)->with('bulk_errors', array_unique($errors));
+              }
             return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
         }
         // no values given, nothing to update

app/Http/Controllers/Auth/LoginController.php

@@ -56,6 +56,7 @@ class LoginController extends Controller
         parent::__construct();
         $this->middleware('guest', ['except' => ['logout', 'postTwoFactorAuth', 'getTwoFactorAuth', 'getTwoFactorEnroll']]);
         Session::put('backUrl', \URL::previous());
+        // $this->ldap = $ldap;
         $this->saml = $saml;
     }
 
@@ -81,6 +82,7 @@ class LoginController extends Controller
         }
 
         if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
             return view('errors.403');
         }
 
@@ -121,7 +123,7 @@ class LoginController extends Controller
 
                 if ($user = Auth::user()) {
                     $user->last_login = \Carbon::now();
-                    $user->saveQuietly();
+                    $user->save();
                 }
                 
             } catch (\Exception $e) {
@@ -189,15 +191,13 @@ class LoginController extends Controller
 
              $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);
 
-            $user->password = $user->noPassword();
             if (Setting::getSettings()->ldap_pw_sync=='1') {
                 $user->password = bcrypt($request->input('password'));
             }
-
             $user->email = $ldap_attr['email'];
             $user->first_name = $ldap_attr['firstname'];
             $user->last_name = $ldap_attr['lastname']; //FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc.
-            $user->saveQuietly();
+            $user->save();
         } // End if(!user)
         return $user;
     }
@@ -317,7 +317,7 @@ class LoginController extends Controller
         if ($user = Auth::user()) {
             $user->last_login = \Carbon::now();
             $user->activated = 1;
-            $user->saveQuietly();
+            $user->save();
         }
         // Redirect to the users page
         return redirect()->intended()->with('success', trans('auth/message.signin.success'));
@@ -369,7 +369,7 @@ class LoginController extends Controller
                 [-2, -2, -2, -2]
             );
 
-        $user->saveQuietly(); // make sure to save *AFTER* displaying the barcode, or else we might save a two_factor_secret that we never actually displayed to the user if the barcode fails
+        $user->save(); // make sure to save *AFTER* displaying the barcode, or else we might save a two_factor_secret that we never actually displayed to the user if the barcode fails
 
         return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj);
     }
@@ -424,7 +424,7 @@ class LoginController extends Controller
 
         if (Google2FA::verifyKey($user->two_factor_secret, $secret)) {
             $user->two_factor_enrolled = 1;
-            $user->saveQuietly();
+            $user->save();
             $request->session()->put('2fa_authed', $user->id);
 
             return redirect()->route('home')->with('success', 'You are logged in!');

app/Http/Controllers/Components/ComponentCheckinController.php

@@ -56,11 +56,10 @@ class ComponentCheckinController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(Request $request, $component_asset_id, $backto = null)
+    public function store(Request $request, $component_asset_id)
     {
         if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
             if (is_null($component = Component::find($component_assets->component_id))) {
-
                 return redirect()->route('components.index')->with('error',
                     trans('admin/components/message.not_found'));
             }
@@ -96,10 +95,6 @@ class ComponentCheckinController extends Controller
             $asset = Asset::find($component_assets->asset_id);
 
             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'));
-            }
 
             return redirect()->route('components.index')->with('success',
                 trans('admin/components/message.checkin.success'));

app/Http/Controllers/Components/ComponentCheckoutController.php

@@ -20,38 +20,25 @@ class ComponentCheckoutController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see ComponentCheckoutController::store() method that stores the data.
      * @since [v3.0]
-     * @param int $id
+     * @param int $componentId
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($componentId)
     {
+        // Check if the component exists
+        if (is_null($component = Component::find($componentId))) {
+            // Redirect to the component management page with error
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
+        }
+        $this->authorize('checkout', $component);
 
-        if ($component = Component::find($id)) {
-
-            $this->authorize('checkout', $component);
-
-            // Make sure the category is valid
-            if ($component->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($component->numRemaining() <= 0){
-                    return redirect()->route('components.index')
-                        ->with('error', trans('admin/components/message.checkout.unavailable'));
-                }
-
-                // Return the checkout view
-                return view('components/checkout', compact('component'));
-            }
-
-            // Invalid category
-            return redirect()->route('components.edit', ['component' => $component->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.component')]));
+        // Make sure there is at least one available to checkout
+        if ($component->numRemaining() <= 0){
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.checkout.unavailable'));
         }
 
-        // Not found
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
-
+        return view('components/checkout', compact('component'));
     }
 
     /**

app/Http/Controllers/Components/ComponentsFilesController.php

@@ -142,7 +142,7 @@ class ComponentsFilesController extends Controller
             $this->authorize('view', $component);
             $this->authorize('components.files', $component);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                 return response('No matching record for that asset/file', 500)
                     ->header('Content-Type', 'text/plain');
             }

app/Http/Controllers/Consumables/ConsumableCheckoutController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Consumables;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Http\Controllers\Controller;
-use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -19,38 +18,25 @@ class ConsumableCheckoutController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see ConsumableCheckoutController::store() method that stores the data.
      * @since [v1.0]
-     * @param int $id
+     * @param int $consumableId
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($consumableId)
     {
 
-        if ($consumable = Consumable::with('users')->find($id)) {
-
-            $this->authorize('checkout', $consumable);
-
-            // Make sure the category is valid
-            if ($consumable->category) {
-
-                // 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'));
-                }
-
-                // Return the checkout view
-                return view('consumables/checkout', compact('consumable'));
-            }
-
-            // Invalid category
-            return redirect()->route('consumables.edit', ['consumable' => $consumable->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.consumable')]));
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
         }
 
-        // Not found
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
+        // 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'));
+        }
 
+        $this->authorize('checkout', $consumable);
+
+        return view('consumables/checkout', compact('consumable'));
     }
 
     /**

app/Http/Controllers/Consumables/ConsumablesFilesController.php

@@ -140,7 +140,7 @@ class ConsumablesFilesController extends Controller
             $this->authorize('view', $consumable);
             $this->authorize('consumables.files', $consumable);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                 return response('No matching record for that asset/file', 500)
                     ->header('Content-Type', 'text/plain');
             }

app/Http/Controllers/CustomFieldsController.php

@@ -6,10 +6,12 @@ use App\Helpers\Helper;
 use App\Http\Requests\CustomFieldRequest;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
+use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Redirect;
 
+
 /**
  * This controller handles all actions related to Custom Asset Fields for
  * the Snipe-IT Asset Management application.
@@ -21,6 +23,7 @@ use Redirect;
  */
 class CustomFieldsController extends Controller
 {
+
     /**
      * Returns a view with a listing of custom fields.
      *
@@ -29,12 +32,16 @@ class CustomFieldsController extends Controller
      * @return \Illuminate\Support\Facades\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index(Request $request)
     {
         $this->authorize('view', CustomField::class);
+        if ( $request->input('tab') == 1 ) {
+            // Users section, make sure to auto-create the first fieldset if so
+            CustomFieldset::firstOrCreate(['type' => Helper::$itemtypes_having_custom_fields[1]], ['name' => 'default']);
+        }
 
-        $fieldsets = CustomFieldset::with('fields', 'models')->get();
-        $fields = CustomField::with('fieldset')->get();
+        $fieldsets = CustomFieldset::with('fields')->where("type", Helper::$itemtypes_having_custom_fields[$request->get('tab',0)])->get(); //cannot eager-load 'customizable' because it's not a relation
+        $fields = CustomField::with('fieldset')->where("type", Helper::$itemtypes_having_custom_fields[$request->get('tab',0)])->get();
 
         return view('custom_fields.index')->with('custom_fieldsets', $fieldsets)->with('custom_fields', $fields);
     }
@@ -67,7 +74,7 @@ class CustomFieldsController extends Controller
     public function create(Request $request)
     {
         $this->authorize('create', CustomField::class);
-        $fieldsets = CustomFieldset::get();
+        $fieldsets = CustomFieldset::where('type', Helper::$itemtypes_having_custom_fields[$request->get('tab')])->get();
 
         return view('custom_fields.fields.edit', [
             'predefinedFormats' => Helper::predefined_formats(),
@@ -110,9 +117,10 @@ class CustomFieldsController extends Controller
             "display_in_user_view" => $display_in_user_view,
             "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0),
             "show_in_listview" => $request->get("show_in_listview", 0),
-            "show_in_requestable_list" => $request->get("show_in_requestable_list", 0),
-            "user_id" => Auth::id()
+            "user_id" => Auth::id(),
         ]);
+        // not mass-assignable; must be manual
+        $field->type = Helper::$itemtypes_having_custom_fields[$request->get('tab')];
 
 
         if ($request->filled('custom_format')) {
@@ -125,14 +133,17 @@ class CustomFieldsController extends Controller
 
             // Sync fields with fieldsets
             $fieldset_array = $request->input('associate_fieldsets');
-            if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
+            if ($request->get('tab') == 1 ) {
+                $fieldset_array = [CustomFieldset::firstOrCreate(['type' => User::class],['name' => 'default'])->id => true];
+            }
+            if (($request->has('associate_fieldsets') || $request->get('tab') == 1) && (is_array($fieldset_array))) {
                 $field->fieldset()->sync(array_keys($fieldset_array));
             } else {
                 $field->fieldset()->sync([]);
             }
 
 
-            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.create.success'));
+            return redirect()->route('fields.index',['tab' => $request->get('tab',0)])->with('success', trans('admin/custom_fields/message.field.create.success'));
         }
 
         return redirect()->back()->with('selected_fieldsets', $request->input('associate_fieldsets'))->withInput()
@@ -185,12 +196,17 @@ class CustomFieldsController extends Controller
         if ($field = CustomField::find($field_id)) {
             $this->authorize('delete', $field);
 
+            if ($field->type == User::class) {
+                $field->fieldset()->detach(); // remove from 'default' group (and others, if they exist in the future!)
+            }
             if (($field->fieldset) && ($field->fieldset->count() > 0)) {
                 return redirect()->back()->withErrors(['message' => 'Field is in-use']);
             }
+            $type = $field->type;
             $field->delete();
-            return redirect()->route("fields.index")
-                ->with("success", trans('admin/custom_fields/message.field.delete.success'));
+            return redirect()->route('fields.index',['tab' => array_search($type, Helper::$itemtypes_having_custom_fields)])
+
+                ->with('success', trans('admin/custom_fields/message.field.delete.success'));
         }
 
         return redirect()->back()->withErrors(['message' => 'Field does not exist']);
@@ -268,7 +284,6 @@ class CustomFieldsController extends Controller
         $field->display_in_user_view = $display_in_user_view;
         $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
         $field->show_in_listview = $request->get("show_in_listview", 0);
-        $field->show_in_requestable_list = $request->get("show_in_requestable_list", 0);
 
         if ($request->get('format') == 'CUSTOM REGEX') {
             $field->format = e($request->get('custom_format'));
@@ -291,7 +306,7 @@ class CustomFieldsController extends Controller
                 $field->fieldset()->sync([]);
             }
 
-            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.update.success'));
+            return redirect()->route('fields.index',['tab' => $request->get('tab',0)])->with('success', trans('admin/custom_fields/message.field.update.success'));
         }
 
         return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.update.error'));

app/Http/Controllers/CustomFieldsetsController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Helpers\Helper;
 use App\Models\AssetModel;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
@@ -38,7 +39,7 @@ class CustomFieldsetsController extends Controller
      * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.8]
      */
-    public function show($id)
+    public function show( $id)
     {
         $cfset = CustomFieldset::with('fields')
             ->where('id', '=', $id)->orderBy('id', 'ASC')->first();
@@ -46,7 +47,7 @@ class CustomFieldsetsController extends Controller
         $this->authorize('view', $cfset);
 
         if ($cfset) {
-            $custom_fields_list = ['' => 'Add New Field to Fieldset'] + CustomField::pluck('name', 'id')->toArray();
+            $custom_fields_list = ['' => 'Add New Field to Fieldset'] + CustomField::where('type', $cfset->type)->pluck('name', 'id')->toArray();
 
             $maxid = 0;
             foreach ($cfset->fields as $field) {
@@ -96,6 +97,8 @@ class CustomFieldsetsController extends Controller
         $fieldset = new CustomFieldset([
                 'name' => $request->get('name'),
                 'user_id' => Auth::user()->id,
+                'type' => Helper::$itemtypes_having_custom_fields[$request->get('tab')]
+//                'sub' =>
         ]);
 
         $validator = Validator::make($request->all(), $fieldset->rules);

app/Http/Controllers/LabelsController.php

@@ -7,10 +7,8 @@ use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\Company;
 use App\Models\Labels\Label;
-use App\Models\Location;
 use App\Models\Manufacturer;
 use App\Models\Setting;
-use App\Models\Supplier;
 use App\Models\User;
 use App\View\Label as LabelView;
 use Illuminate\Support\Facades\Storage;
@@ -33,22 +31,20 @@ class LabelsController extends Controller
 
         $exampleAsset->id = 999999;
         $exampleAsset->name = 'JEN-867-5309';
-        $exampleAsset->asset_tag = '100001';
+        $exampleAsset->asset_tag = 'TCA-00001';
         $exampleAsset->serial = 'SN9876543210';
-        $exampleAsset->asset_eol_date = '2025-01-01';
-        $exampleAsset->order_number = '12345';
-        $exampleAsset->purchase_date = '2023-01-01';
-        $exampleAsset->status_id = 1;
 
-        $exampleAsset->company = new Company([
-            'name' => 'Test Company Limited',
-            'phone' => '1-555-555-5555',
-            'email' => 'company@example.com',
-        ]);
+        $exampleAsset->company = new Company();
+        $exampleAsset->company->id = 999999;
+        $exampleAsset->company->name = 'Test Company Limited';
+        $exampleAsset->company->image = 'company-image-test.png';
 
-        $exampleAsset->setRelation('assignedTo', new User(['first_name' => 'Luke', 'last_name' => 'Skywalker']));
-        $exampleAsset->defaultLoc = new Location(['name' => 'Building 1', 'phone' => '1-555-555-5555']);
-        $exampleAsset->location = new Location(['name' => 'Building 2', 'phone' => '1-555-555-5555']);
+        $exampleAsset->assignedto = new User();
+        $exampleAsset->assignedto->id = 999999;
+        $exampleAsset->assignedto->first_name = 'Test';
+        $exampleAsset->assignedto->last_name = 'Person';
+        $exampleAsset->assignedto->username = 'Test.Person';
+        $exampleAsset->assignedto->employee_num = '0123456789';
 
         $exampleAsset->model = new AssetModel();
         $exampleAsset->model->id = 999999;
@@ -57,10 +53,6 @@ class LabelsController extends Controller
         $exampleAsset->model->manufacturer = new Manufacturer();
         $exampleAsset->model->manufacturer->id = 999999;
         $exampleAsset->model->manufacturer->name = 'Test Manufacturing Inc.';
-        $exampleAsset->model->manufacturer->support_email = 'support@test.com';
-        $exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';
-        $exampleAsset->model->manufacturer->support_url = 'https://example.com';
-        $exampleAsset->supplier = new Supplier(['name' => 'Test Company Limited']);
         $exampleAsset->model->category = new Category();
         $exampleAsset->model->category->id = 999999;
         $exampleAsset->model->category->name = 'Test Category';

app/Http/Controllers/Licenses/LicenseCheckinController.php

@@ -76,7 +76,7 @@ class LicenseCheckinController extends Controller
 
         // Declare the rules for the form validation
         $rules = [
-            'notes'   => 'string|nullable',
+            'note'   => 'string|nullable',
         ];
 
         // Create a new validator instance from our validation rules
@@ -97,11 +97,10 @@ class LicenseCheckinController extends Controller
         // Update the asset data
         $licenseSeat->assigned_to = null;
         $licenseSeat->asset_id = null;
-        $licenseSeat->notes = $request->input('notes');
 
         // 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('note')));
 
             if ($backTo == 'user') {
                 return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
@@ -129,13 +128,6 @@ class LicenseCheckinController extends Controller
         $license = License::findOrFail($licenseId);
         $this->authorize('checkin', $license);
 
-        if (! $license->reassignable) {
-            // Not allowed to checkin
-            Session::flash('error', 'License not reassignable.');
-
-            return redirect()->back()->withInput();
-        }
-
         $licenseSeatsByUser = LicenseSeat::where('license_id', '=', $licenseId)
             ->whereNotNull('assigned_to')
             ->with('user')

app/Http/Controllers/Licenses/LicenseCheckoutController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Licenses;
 use App\Events\CheckoutableCheckedOut;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
-use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -22,35 +21,23 @@ class LicenseCheckoutController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @param $id
+     * @param $licenseId
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($licenseId)
     {
-
-        if ($license = License::find($id)) {
+        // Check that the license is valid
+        if ($license = License::find($licenseId)) {
 
             $this->authorize('checkout', $license);
-
-            if ($license->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($license->availCount()->count() < 1){
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
-                }
-
-                // Return the checkout view
-                return view('licenses/checkout', compact('license'));
+            // If the license is valid, check that there is an available seat
+            if ($license->avail_seats_count < 1) {
+                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
             }
-
-            // Invalid category
-            return redirect()->route('licenses.edit', ['license' => $license->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
-
+            return view('licenses/checkout', compact('license'));
         }
 
-        // Not found
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
 
 
@@ -76,7 +63,6 @@ class LicenseCheckoutController extends Controller
 
         $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
         $licenseSeat->user_id = Auth::id();
-        $licenseSeat->notes = $request->input('notes');
         
 
         $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
@@ -118,7 +104,7 @@ class LicenseCheckoutController extends Controller
             $licenseSeat->assigned_to = $target->assigned_to;
         }
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note')));
 
             return true;
         }
@@ -135,7 +121,7 @@ class LicenseCheckoutController extends Controller
         $licenseSeat->assigned_to = request('assigned_to');
 
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note')));
 
             return true;
         }

app/Http/Controllers/Licenses/LicenseFilesController.php

@@ -137,7 +137,7 @@ class LicenseFilesController extends Controller
             $this->authorize('view', $license);
             $this->authorize('licenses.files', $license);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                 return response('No matching record for that asset/file', 500)
                     ->header('Content-Type', 'text/plain');
             }

app/Http/Controllers/ManufacturersController.php

@@ -2,12 +2,8 @@
 
 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;
@@ -222,37 +218,22 @@ class ManufacturersController extends Controller
      * @return Redirect
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function restore($id)
+    public function restore($manufacturers_id)
     {
-        $this->authorize('delete', Manufacturer::class);
+        $this->authorize('create', Manufacturer::class);
+        $manufacturer = Manufacturer::onlyTrashed()->where('id', $manufacturers_id)->first();
 
-        if ($manufacturer = Manufacturer::withTrashed()->find($id)) {
-
-            if ($manufacturer->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.manufacturer')]));
-            }
+        if ($manufacturer) {
 
+            // Not sure why this is necessary - it shouldn't fail validation here, but it fails without this, so....
+            $manufacturer->setValidating(false);
             if ($manufacturer->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = Manufacturer::class;
-                $logaction->item_id = $manufacturer->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_manufacturers = Manufacturer::onlyTrashed()->count();
-                if ($deleted_manufacturers > 0) {
-                    return redirect()->back()->with('success', trans('admin/manufacturers/message.success.restored'));
-                }
                 return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success'));
             }
 
-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.manufacturer'), 'error' => $manufacturer->getErrors()->first()]));
+            return redirect()->back()->with('error', 'Could not restore.');
         }
 
-        return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-
+        return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist'));
     }
 }

app/Http/Controllers/ProfileController.php

@@ -134,7 +134,6 @@ class ProfileController extends Controller
         ];
 
         $validator = \Validator::make($request->all(), $rules);
-
         $validator->after(function ($validator) use ($request, $user) {
             if (! Hash::check($request->input('current_password'), $user->password)) {
                 $validator->errors()->add('current_password', trans('validation.custom.hashed_pass'));
@@ -160,14 +159,12 @@ class ProfileController extends Controller
         });
 
         if (! $validator->fails()) {
-
             $user->password = Hash::make($request->input('password'));
-            // We have to use saveQuietly here because for some reason this method was calling the User Oserver twice :(
-            $user->saveQuietly();
-            
+            $user->save();
+
             // Log the user out of other devices
             Auth::logoutOtherDevices($request->input('password'));
-            return redirect()->route('account')->with('success', trans('passwords.password_change'));
+            return redirect()->route('account.password.index')->with('success', 'Password updated!');
 
         }
         return redirect()->back()->withInput()->withErrors($validator);

app/Http/Controllers/ReportsController.php

@@ -23,7 +23,6 @@ use Input;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use League\Csv\EscapeFormula;
-use App\Http\Requests\CustomAssetReportRequest;
 
 
 /**
@@ -247,9 +246,6 @@ class ReportsController extends Controller
                 trans('general.action'),
                 trans('general.type'),
                 trans('general.item'),
-                trans('general.license_serial'),
-                trans('general.model_name'),
-                trans('general.model_no'),
                 'To',
                 trans('general.notes'),
                 'Changed',
@@ -292,9 +288,6 @@ class ReportsController extends Controller
                         $actionlog->present()->actionType(),
                         e($actionlog->itemType()),
                         ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
-                        ($actionlog->item->serial) ? $actionlog->item->serial : null,
-                        ($actionlog->item->model) ? htmlspecialchars($actionlog->item->model->name, ENT_NOQUOTES) : null,
-                        ($actionlog->item->model) ? $actionlog->item->model->model_number : null,
                         $target_name,
                         ($actionlog->note) ? e($actionlog->note) : '',
                         $actionlog->log_meta,
@@ -410,12 +403,11 @@ class ReportsController extends Controller
      * @since [v1.0]
      * @return \Illuminate\Http\Response
      */
-    public function postCustom(CustomAssetReportRequest $request)
+    public function postCustom(Request $request)
     {
         ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes
         $this->authorize('reports.view');
 
-
         \Debugbar::disable();
         $customfields = CustomField::get();
         $response = new StreamedResponse(function () use ($customfields, $request) {
@@ -534,30 +526,6 @@ class ReportsController extends Controller
                 $header[] = trans('admin/users/table.title');
             }
 
-            if ($request->filled('phone')) {
-                $header[] = trans('admin/users/table.phone');
-            }
-
-            if ($request->filled('user_address')) {
-                $header[] = trans('admin/reports/general.custom_export.user_address');
-            }
-
-            if ($request->filled('user_city')) {
-                $header[] = trans('admin/reports/general.custom_export.user_city');
-            }
-
-            if ($request->filled('user_state')) {
-                $header[] = trans('admin/reports/general.custom_export.user_state');
-            }
-
-            if ($request->filled('user_country')) {
-                $header[] = trans('admin/reports/general.custom_export.user_country');
-            }
-
-            if ($request->filled('user_zip')) {
-                $header[] = trans('admin/reports/general.custom_export.user_zip');
-            }
-
             if ($request->filled('status')) {
                 $header[] = trans('general.status');
             }
@@ -677,7 +645,7 @@ 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();
-
+                
                 $assets->whereBetween('assets.created_at', [$created_start, $created_end]);
             }
             if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
@@ -688,22 +656,22 @@ class ReportsController extends Controller
             }
 
             if (($request->filled('checkin_date_start'))) {
-                    $assets->whereBetween('last_checkin', [
-                        Carbon::parse($request->input('checkin_date_start'))->startOfDay(),
-                        // use today's date is `checkin_date_end` is not provided
-                        Carbon::parse($request->input('checkin_date_end', now()))->endOfDay(),
-                    ]);
+                $assets->whereBetween('last_checkin', [
+                    Carbon::parse($request->input('checkin_date_start'))->startOfDay(),
+                    // use today's date is `checkin_date_end` is not provided
+                    Carbon::parse($request->input('checkin_date_end', now()))->endOfDay(),
+                ]);
             }
 
             if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
-                    $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
+                $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
             }
 
             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]);
+                $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);
             }
 
             if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
@@ -774,7 +742,7 @@ class ReportsController extends Controller
                     }
 
                     if ($request->filled('eol')) {
-                            $row[] = ($asset->asset_eol_date) ? $asset->asset_eol_date : '';
+                        $row[] = ($asset->purchase_date != '') ? $asset->present()->eol_date() : '';
                     }
 
                     if ($request->filled('order')) {
@@ -858,54 +826,6 @@ class ReportsController extends Controller
                         }
                     }
 
-                    if ($request->filled('phone')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->phone : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_address')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->address : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_city')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->city : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_state')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->state : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_country')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->country : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_zip')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->zip : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
                     if ($request->filled('status')) {
                         $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
                     }
@@ -1123,34 +1043,27 @@ class ReportsController extends Controller
      * @throws \Illuminate\Auth\Access\AuthorizationException
      * @version v1.0
      */
-    public function sentAssetAcceptanceReminder(Request $request)
+    public function sentAssetAcceptanceReminder($acceptanceId = null)
     {
         $this->authorize('reports.view');
 
-        if (!$acceptance = CheckoutAcceptance::pending()->find($request->input('acceptance_id'))) {
-            \Log::debug('No pending acceptances');
+        if (!$acceptance = CheckoutAcceptance::pending()->find($acceptanceId)) {
             // Redirect to the unaccepted assets report page with error
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
         }
-
         $assetItem = $acceptance->checkoutable;
 
-        \Log::debug(print_r($assetItem, true));
-
         if (is_null($acceptance->created_at)){
-            \Log::debug('No acceptance created_at');
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
         } else {
             $logItem_res = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get();
-
             if ($logItem_res->isEmpty()){
-                \Log::debug('Acceptance date mismatch');
                 return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
             }
             $logItem = $logItem_res[0];
         }
 
-        if (!$assetItem->assignedTo->locale){
+        if(!$assetItem->assignedTo->locale){
             Notification::locale(Setting::getSettings()->locale)->send(
                 $assetItem->assignedTo,
                 new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)

app/Http/Controllers/SettingsController.php

@@ -7,7 +7,6 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
-use App\Models\CustomField;
 use App\Models\Group;
 use App\Models\Setting;
 use App\Models\Asset;
@@ -27,7 +26,7 @@ use Response;
 use App\Http\Requests\SlackSettingsRequest;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Validator;
+use Validator;
 
 /**
  * This controller handles all actions related to Settings for
@@ -810,10 +809,9 @@ class SettingsController extends Controller
      */
     public function getLabels()
     {
-        return view('settings.labels', [
-            'setting' => Setting::getSettings(),
-            'customFields' => CustomField::all(),
-        ]);
+        $setting = Setting::getSettings();
+
+        return view('settings.labels', compact('setting'));
     }
 
     /**
@@ -1250,11 +1248,13 @@ class SettingsController extends Controller
             if (!$request->hasFile('file')) {
                 return redirect()->route('settings.backups.index')->with('error', 'No file uploaded');
             } else {
-
                 $max_file_size = Helper::file_upload_max_size();
-                $validator = Validator::make($request->all(), [
+
+                $rules = [
                     'file' => 'required|mimes:zip|max:'.$max_file_size,
-                ]);
+                ];
+
+                $validator = \Validator::make($request->all(), $rules);
 
                 if ($validator->passes()) {
 
@@ -1265,7 +1265,7 @@ class SettingsController extends Controller
                         return redirect()->route('settings.backups.index')->with('success', 'File uploaded');
                 }
 
-                return redirect()->route('settings.backups.index')->withErrors($validator);
+                return redirect()->route('settings.backups.index')->withErrors($request->getErrors());
 
             }
 

app/Http/Controllers/Users/BulkUsersController.php

@@ -125,26 +125,10 @@ class BulkUsersController extends Controller
             ];
         }
 
-        /**
-         * Check to see if the user wants to actually blank out the values vs skip them
-         */
         if ($request->input('null_location_id')=='1') {
             $this->update_array['location_id'] = null;
         }
 
-        if ($request->input('null_department_id')=='1') {
-            $this->update_array['department_id'] = null;
-        }
-
-        if ($request->input('null_manager_id')=='1') {
-            $this->update_array['manager_id'] = null;
-        }
-
-        if ($request->input('null_company_id')=='1') {
-            $this->update_array['company_id'] = null;
-        }
-
-        
         if (! $manager_conflict) {
             $this->conditionallyAddItem('manager_id');
         }

app/Http/Controllers/Users/LDAPImportController.php

@@ -49,19 +49,15 @@ class LDAPImportController extends Controller
     {
         $this->authorize('update', User::class);
         // Call Artisan LDAP import command.
-
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]);
+        $location_id = $request->input('location_id');
+        Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);
 
         // Collect and parse JSON summary.
         $ldap_results_json = Artisan::output();
         $ldap_results = json_decode($ldap_results_json, true);
-        if (!$ldap_results) {
-            return redirect()->back()->withInput()->with('error', trans('general.no_results'));
-        }
 
         // Direct user to appropriate status page.
         if ($ldap_results['error']) {
-
             return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);
         }
 

app/Http/Controllers/Users/UserFilesController.php

@@ -136,11 +136,6 @@ class UserFilesController extends Controller
      */
     public function show($userId = null, $fileId = null)
     {
-
-        if (empty($fileId)) {
-            return redirect()->route('users.show')->with('error', 'Invalid file request');
-        }
-
         $user = User::find($userId);
 
         // the license is valid
@@ -148,20 +143,18 @@ class UserFilesController extends Controller
 
             $this->authorize('view', $user);
 
-            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
+            $log = Actionlog::find($fileId);
 
-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download('private_uploads/users/'.$log->filename, $log->filename, $headers);
-                }
-
-                return Storage::download('private_uploads/users/'.$log->filename);
+            // Display the file inline
+            if (request('inline') == 'true') {
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+                return Storage::download('private_uploads/users/'.$log->filename, $log->filename, $headers);
             }
 
-            return redirect()->route('users.index')->with('error',  trans('admin/users/message.log_record_not_found'));
+            return Storage::download('private_uploads/users/'.$log->filename);
+
         }
 
         // Redirect to the user management page if the user doesn't exist

app/Http/Controllers/Users/UsersController.php

@@ -7,10 +7,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Controllers\UserNotFoundException;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SaveUserRequest;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Group;
+use App\Models\Ldap;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
@@ -133,6 +133,9 @@ class UsersController extends Controller
         // we have to invoke the
         app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
+        \Log::info("About to call customFill, in the 'store' controller!!!");
+        $user->customFill($request, Auth::user());
+
         if ($user->save()) {
             if ($request->filled('groups')) {
                 $user->groups()->sync($request->input('groups'));
@@ -300,6 +303,8 @@ class UsersController extends Controller
         // Handle uploaded avatar
         app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
+        \Log::debug("calling custom fill from the UPDATE method!");
+        $user->customFill($request, Auth::user());
         //\Log::debug(print_r($user, true));
 
         // Was the user updated?
@@ -385,35 +390,18 @@ class UsersController extends Controller
      */
     public function getRestore($id = null)
     {
-        if ($user = User::withTrashed()->find($id)) {
-            $this->authorize('delete', $user);
-
-            if ($user->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.user')]));
-            }
-
-            if ($user->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $user->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_users = User::onlyTrashed()->count();
-                if ($deleted_users > 0) {
-                    return redirect()->back()->with('success', trans('admin/users/message.success.restored'));
-                }
-                return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored'));
-
-            }
-
-            // Check validation to make sure we're not restoring a user with the same username as an existing user
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.user'), 'error' => $user->getErrors()->first()]));
+        $this->authorize('update', User::class);
+        // Get user information
+        if (! User::onlyTrashed()->find($id)) {
+            return redirect()->route('users.index')->with('error', trans('admin/users/messages.user_not_found'));
         }
 
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.does_not_exist'));
+        // Restore the user
+        if (User::withTrashed()->where('id', $id)->restore()) {
+            return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored'));
+        }
+
+        return redirect()->route('users.index')->with('error', 'User could not be restored.');
     }
 
     /**

app/Http/Kernel.php

@@ -18,13 +18,12 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \Fideloper\Proxy\TrustProxies::class,
         \App\Http\Middleware\CheckForSetup::class,
         \App\Http\Middleware\CheckForDebug::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\SecurityHeaders::class,
         \App\Http\Middleware\PreventBackHistory::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
 
     ];
 

app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Livewire;
 
+use App\Models\Asset;
+use App\Models\DefaultValuesForCustomFields;
 use Livewire\Component;
 
 use App\Models\CustomFieldset;
@@ -30,7 +32,7 @@ class CustomFieldSetDefaultValuesForModel extends Component
             $this->fields = CustomFieldset::find($this->fieldset_id)->fields;
         } 
 
-        $this->add_default_values = ($this->model->defaultValues->count() > 0);
+        $this->add_default_values = (DefaultValuesForCustomFields::forPivot($this->model, Asset::class)->count() > 0);
     }
 
     public function updatedFieldsetId()

app/Http/Livewire/Importer.php

@@ -100,7 +100,7 @@ class Importer extends Component
         if ($type == "asset") {
             // add Custom Fields after a horizontal line
             $results['-'] = "———" . trans('admin/custom_fields/general.custom_fields') . "———’";
-            foreach (CustomField::orderBy('name')->get() as $field) {
+            foreach (CustomField::where('type', \App\Models\Asset::class)->orderBy('name')->get() as $field) { // TODO - generalize?
                 $results[$field->db_column_name()] = $field->name;
             }
         }
@@ -275,7 +275,6 @@ class Importer extends Component
             'license_email' => trans('admin/licenses/form.to_email'),
             'license_name' => trans('admin/licenses/form.to_name'),
             'purchase_order' => trans('admin/licenses/form.purchase_order'),
-            'order_number' => trans('general.order_number'),
             'reassignable' => trans('admin/licenses/form.reassignable'),
             'seats' => trans('admin/licenses/form.seats'),
             'notes' => trans('general.notes'),
@@ -485,17 +484,8 @@ class Importer extends Component
 
     public function selectFile($id)
     {
-        $this->clearMessage();
 
         $this->activeFile = Import::find($id);
-
-        if (!$this->activeFile) {
-            $this->message = trans('admin/hardware/message.import.file_missing');
-            $this->message_type = 'danger';
-
-            return;
-        }
-
         $this->field_map = null;
         foreach($this->activeFile->header_row as $element) {
             if(isset($this->activeFile->field_map[$element])) {
@@ -530,12 +520,6 @@ class Importer extends Component
         }
     }
 
-    public function clearMessage()
-    {
-        $this->message = null;
-        $this->message_type = null;
-    }
-
     public function render()
     {
         $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.

app/Http/Livewire/SlackSettingsForm.php

@@ -12,7 +12,7 @@ class SlackSettingsForm extends Component
     public $webhook_endpoint;
     public $webhook_channel;
     public $webhook_botname;
-    public $isDisabled ='disabled' ;
+    public $isDisabled ='' ;
     public $webhook_name;
     public $webhook_link;
     public $webhook_placeholder;
@@ -22,17 +22,11 @@ class SlackSettingsForm extends Component
 
     public Setting $setting;
 
-    public $webhook_endpoint_rules;
-
-
     protected $rules = [
-        'webhook_endpoint'                      => 'required_with:webhook_channel|starts_with:http://,https://,ftp://,irc://,https://hooks.slack.com/services/|url|nullable',
+        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services|nullable',
         'webhook_channel'                       => 'required_with:webhook_endpoint|starts_with:#|nullable',
         'webhook_botname'                       => 'string|nullable',
     ];
-    public $messages = [
-        'webhook_endpoint.starts_with'          => 'your webhook endpoint should begin with http://, https:// or other protocol.',
-    ];
 
     public function mount() {
         $this->webhook_text= [
@@ -61,7 +55,9 @@ class SlackSettingsForm extends Component
         $this->webhook_botname = $this->setting->webhook_botname;
         $this->webhook_options = $this->setting->webhook_selected;
 
-
+        if($this->setting->webhook_selected == 'general'){
+            $this->isDisabled='';
+        }
         if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
             $this->isDisabled= '';
         }
@@ -69,8 +65,9 @@ class SlackSettingsForm extends Component
     }
     public function updated($field) {
 
+        if($this->webhook_selected != 'general') {
             $this->validateOnly($field, $this->rules);
-
+        }
     }
 
     public function updatedWebhookSelected() {
@@ -85,6 +82,7 @@ class SlackSettingsForm extends Component
     }
 
     private function isButtonDisabled() {
+        if($this->webhook_selected == 'slack') {
             if (empty($this->webhook_endpoint)) {
                 $this->isDisabled = 'disabled';
                 $this->save_button = trans('admin/settings/general.webhook_presave');
@@ -93,6 +91,8 @@ class SlackSettingsForm extends Component
                 $this->isDisabled = 'disabled';
                 $this->save_button = trans('admin/settings/general.webhook_presave');
             }
+        }
+
     }
 
     public function render()
@@ -108,7 +108,6 @@ class SlackSettingsForm extends Component
             'defaults' => [
                 'exceptions' => false,
             ],
-            'allow_redirects' => false,
         ]);
 
         $payload = json_encode(
@@ -117,23 +116,18 @@ class SlackSettingsForm extends Component
                 'text'       => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
                 'username'    => e($this->webhook_botname),
                 'icon_emoji' => ':heart:',
-
             ]);
 
         try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload]);
 
-            if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
-                return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
-            }
+            $webhook->post($this->webhook_endpoint, ['body' => $payload]);
             $this->isDisabled='';
             $this->save_button = trans('general.save');
-            return session()->flash('success' , trans('admin/settings/message.webhook.success', ['webhook_name' => $this->webhook_name]));
+            return session()->flash('success' , 'Your '.$this->webhook_name.' Integration works!');
 
         } catch (\Exception $e) {
 
-            $this->isDisabled='disabled';
-            $this->save_button = trans('admin/settings/general.webhook_presave');
+            $this->isDisabled= 'disabled';
             return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name]));
         }
 
@@ -164,7 +158,9 @@ class SlackSettingsForm extends Component
         if (Helper::isDemoMode()) {
             session()->flash('error',trans('general.feature_disabled'));
         } else {
-            $this->validate($this->rules);
+            if ($this->webhook_selected != 'general') {
+                $this->validate($this->rules);
+            }
 
             $this->setting->webhook_selected = $this->webhook_selected;
             $this->setting->webhook_endpoint = $this->webhook_endpoint;

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -10,7 +10,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Requests/CustomAssetReportRequest.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-class CustomAssetReportRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'purchase_start'        => 'date|date_format:Y-m-d|nullable',
-            'purchase_end'          => 'date|date_format:Y-m-d|nullable',
-            'created_start'         => 'date|date_format:Y-m-d|nullable',
-            'created_end'           => 'date|date_format:Y-m-d|nullable',
-            'checkout_date_start'   => 'date|date_format:Y-m-d|nullable',
-            'checkout_date_end'     => 'date|date_format:Y-m-d|nullable',
-            'expected_checkin_start'      => 'date|date_format:Y-m-d|nullable',
-            'expected_checkin_end'        => 'date|date_format:Y-m-d|nullable',
-            'checkin_date_start'      => 'date|date_format:Y-m-d|nullable',
-            'checkin_date_end'        => 'date|date_format:Y-m-d|nullable',
-            'last_audit_start'      => 'date|date_format:Y-m-d|nullable',
-            'last_audit_end'        => 'date|date_format:Y-m-d|nullable',
-            'next_audit_start'      => 'date|date_format:Y-m-d|nullable',
-            'next_audit_end'        => 'date|date_format:Y-m-d|nullable',
-        ];
-    }
-
-    public function response(array $errors)
-    {
-        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
-    }
-}

app/Http/Requests/CustomFieldRequest.php

@@ -34,12 +34,14 @@ class CustomFieldRequest extends FormRequest
             case 'POST':
             {
                 $rules['name'] = 'required|unique:custom_fields';
+                $rules['tab'] = 'required';
                 break;
             }
 
             // Save all fields
             case 'PUT':
                 $rules['name'] = 'required';
+                $rules['tab'] = 'required';
                 break;
 
             // Save only what's passed

app/Http/Requests/StoreAssetRequest.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\Asset;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
-
-class StoreAssetRequest extends ImageUploadRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        return Gate::allows('create', new Asset);
-    }
-
-    public function prepareForValidation(): void
-    {
-        //
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $rules = array_merge(
-            (new Asset)->getRules(),
-            parent::rules(),
-        );
-
-        return $rules;
-    }
-}

app/Http/Traits/UniqueSerialTrait.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Traits;
+
+use App\Models\Setting;
+
+trait UniqueSerialTrait
+{
+    /**
+     * Prepare a unique_ids rule, adding a model identifier if required.
+     *
+     * @param array  $parameters
+     * @param string $field
+     *
+     * @return string
+     */
+    protected function prepareUniqueSerialRule($parameters, $field)
+    {
+        if ($settings = Setting::getSettings()) {
+            if ($settings->unique_serial == '1') {
+                return 'unique_undeleted:'.$this->table.','.$this->getKey();
+            }
+        }
+    }
+}

app/Http/Transformers/ActionlogsTransformer.php

@@ -3,7 +3,6 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\CustomField;
 use App\Models\Setting;
 use App\Models\Company;
@@ -11,9 +10,6 @@ use App\Models\Supplier;
 use App\Models\Location;
 use App\Models\AssetModel;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Gate;
 
 class ActionlogsTransformer
 {
@@ -47,10 +43,9 @@ class ActionlogsTransformer
     public function transformActionlog (Actionlog $actionlog, $settings = null)
     {
         $icon = $actionlog->present()->icon();
-        $custom_fields = CustomField::all();
-
+        $custom_field = CustomField::all();
         if ($actionlog->filename!='') {
-            $icon =  Helper::filetype_icon($actionlog->filename);
+            $icon =  e(\App\Helpers\Helper::filetype_icon($actionlog->filename));
         }
 
         // This is necessary since we can't escape special characters within a JSON object
@@ -60,63 +55,17 @@ class ActionlogsTransformer
             $clean_meta = [];
 
             if ($meta_array) {
-
                 foreach ($meta_array as $fieldname => $fieldata) {
-
-                    $clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old);
-                    $clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);
-
-                    // this is a custom field
-                    if (str_starts_with($fieldname, '_snipeit_')) {
-                        
-                        foreach ($custom_fields as $custom_field) {
-
-                            if ($custom_field->db_column == $fieldname) {
-
-                                if ($custom_field->field_encrypted == '1')  {
-
-                                    // Unset these fields. We need to decrypt them, since even if the decrypted value
-                                    // didn't change, their value in the DB will, so we have to compare the unencrypted version
-                                    // to see if the values actually did change
-                                    unset($clean_meta[$fieldname]);
-                                    unset($clean_meta[$fieldname]);
-
-                                    $enc_old = '';
-                                    $enc_new = '';
-
-                                    try  {
-                                        $enc_old = \Crypt::decryptString($this->clean_field($fieldata->old));
-                                    } catch (\Exception $e) {
-                                        \Log::debug('Could not decrypt field - maybe the key changed?');
-                                    }
-
-                                    try {
-                                        $enc_new = \Crypt::decryptString($this->clean_field($fieldata->new));
-                                    } catch (\Exception $e) {
-                                        \Log::debug('Could not decrypt field - maybe the key changed?');
-                                    }
-
-                                    if ($enc_old != $enc_new) {
-                                        \Log::debug('custom fields do not match');
-                                        $clean_meta[$fieldname]['old'] = "************";
-                                        $clean_meta[$fieldname]['new'] = "************";
-
-                                        // Display the changes if the user is an admin or superadmin
-                                        if (Gate::allows('admin')) {
-                                            $clean_meta[$fieldname]['old'] = ($enc_old) ? unserialize($enc_old): '';
-                                            $clean_meta[$fieldname]['new'] = ($enc_new) ? unserialize($enc_new): '';
-                                        }
-
-                                    }
-
-
-                                }
-
-                            }
-
+                    if( str_starts_with($fieldname, '_snipeit_')){
+                        if( $custom_field->where('db_column', '=', $fieldname)->where('field_encrypted', true)){
+                            $clean_meta[$fieldname]['old'] = "encrypted";
+                            $clean_meta[$fieldname]['new'] = "encrypted";
                         }
                     }
-
+                     else {
+                        $clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old);
+                        $clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);
+                    }
                 }
 
             }
@@ -216,42 +165,24 @@ class ActionlogsTransformer
 
 
         if(array_key_exists('rtd_location_id',$clean_meta)) {
-
-            $oldRtd = $location->find($clean_meta['rtd_location_id']['old']);
-            $oldRtdName = $oldRtd ? e($oldRtd->name) : trans('general.deleted');
-
-            $newRtd = $location->find($clean_meta['rtd_location_id']['new']);
-            $newRtdName = $newRtd ? e($newRtd->name) : trans('general.deleted');
-
-            $clean_meta['rtd_location_id']['old'] = $clean_meta['rtd_location_id']['old'] ? "[id: ".$clean_meta['rtd_location_id']['old']."] ". $oldRtdName : '';
-            $clean_meta['rtd_location_id']['new'] = $clean_meta['rtd_location_id']['new'] ? "[id: ".$clean_meta['rtd_location_id']['new']."] ". $newRtdName : '';
+            $clean_meta['rtd_location_id']['old'] = $clean_meta['rtd_location_id']['old'] ? "[id: ".$clean_meta['rtd_location_id']['old']."] ". $location->find($clean_meta['rtd_location_id']['old'])->name : trans('general.unassigned');
+            $clean_meta['rtd_location_id']['new'] = $clean_meta['rtd_location_id']['new'] ? "[id: ".$clean_meta['rtd_location_id']['new']."] ". $location->find($clean_meta['rtd_location_id']['new'])->name : trans('general.unassigned');
             $clean_meta['Default Location'] = $clean_meta['rtd_location_id'];
             unset($clean_meta['rtd_location_id']);
         }
-
-
-        if (array_key_exists('location_id', $clean_meta)) {
-
-            $oldLocation = $location->find($clean_meta['location_id']['old']);
-            $oldLocationName = $oldLocation ? e($oldLocation->name) : trans('general.deleted');
-
-            $newLocation = $location->find($clean_meta['location_id']['new']);
-            $newLocationName = $newLocation ? e($newLocation->name) : trans('general.deleted');
-
-
-            $clean_meta['location_id']['old'] = $clean_meta['location_id']['old'] ? "[id: ".$clean_meta['location_id']['old']."] ". $oldLocationName : '';
-            $clean_meta['location_id']['new'] = $clean_meta['location_id']['new'] ? "[id: ".$clean_meta['location_id']['new']."] ". $newLocationName : '';
+        if(array_key_exists('location_id', $clean_meta)) {
+            $clean_meta['location_id']['old'] = $clean_meta['location_id']['old'] ? "[id: ".$clean_meta['location_id']['old']."] ".$location->find($clean_meta['location_id']['old'])->name : trans('general.unassigned');
+            $clean_meta['location_id']['new'] = $clean_meta['location_id']['new'] ? "[id: ".$clean_meta['location_id']['new']."] ".$location->find($clean_meta['location_id']['new'])->name : trans('general.unassigned');
             $clean_meta['Current Location'] = $clean_meta['location_id'];
             unset($clean_meta['location_id']);
         }
-
         if(array_key_exists('model_id', $clean_meta)) {
 
             $oldModel = $model->find($clean_meta['model_id']['old']);
-            $oldModelName = $oldModel ? e($oldModel->name) : trans('admin/models/message.deleted');
+            $oldModelName = $oldModel->name ?? trans('admin/models/message.deleted');
 
             $newModel = $model->find($clean_meta['model_id']['new']);
-            $newModelName = $newModel ? e($newModel->name) : trans('admin/models/message.deleted');
+            $newModelName = $newModel->name ?? trans('admin/models/message.deleted');
 
             $clean_meta['model_id']['old'] = "[id: ".$clean_meta['model_id']['old']."] ".$oldModelName;
             $clean_meta['model_id']['new'] = "[id: ".$clean_meta['model_id']['new']."] ".$newModelName; /** model is required at asset creation */
@@ -262,10 +193,10 @@ class ActionlogsTransformer
         if(array_key_exists('company_id', $clean_meta)) {
 
             $oldCompany = $company->find($clean_meta['company_id']['old']);
-            $oldCompanyName = $oldCompany ? e($oldCompany->name) : trans('admin/company/message.deleted');
+            $oldCompanyName = $oldCompany->name ?? trans('admin/companies/message.deleted');
 
             $newCompany = $company->find($clean_meta['company_id']['new']);
-            $newCompanyName = $newCompany ? e($newCompany->name) : trans('admin/company/message.deleted');
+            $newCompanyName = $newCompany->name ?? trans('admin/companies/message.deleted');
 
             $clean_meta['company_id']['old'] = $clean_meta['company_id']['old'] ? "[id: ".$clean_meta['company_id']['old']."] ". $oldCompanyName : trans('general.unassigned');
             $clean_meta['company_id']['new'] = $clean_meta['company_id']['new'] ? "[id: ".$clean_meta['company_id']['new']."] ". $newCompanyName : trans('general.unassigned');
@@ -275,10 +206,10 @@ class ActionlogsTransformer
         if(array_key_exists('supplier_id', $clean_meta)) {
 
             $oldSupplier = $supplier->find($clean_meta['supplier_id']['old']);
-            $oldSupplierName = $oldSupplier ? e($oldSupplier->name) : trans('admin/suppliers/message.deleted');
+            $oldSupplierName = $oldSupplier->name ?? trans('admin/suppliers/message.deleted');
 
             $newSupplier = $supplier->find($clean_meta['supplier_id']['new']);
-            $newSupplierName = $newSupplier ? e($newSupplier->name) : trans('admin/suppliers/message.deleted');
+            $newSupplierName = $newSupplier->name ?? trans('admin/suppliers/message.deleted');
 
             $clean_meta['supplier_id']['old'] = $clean_meta['supplier_id']['old'] ? "[id: ".$clean_meta['supplier_id']['old']."] ". $oldSupplierName : trans('general.unassigned');
             $clean_meta['supplier_id']['new'] = $clean_meta['supplier_id']['new'] ? "[id: ".$clean_meta['supplier_id']['new']."] ". $newSupplierName : trans('general.unassigned');

app/Http/Transformers/AssetModelsTransformer.php

@@ -73,7 +73,7 @@ class AssetModelsTransformer
 
         $permissions_array['available_actions'] = [
             'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')),
-            'delete' => $assetmodel->isDeletable(),
+            'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->assets_count == 0)),
             'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at == '')),
             'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at != '')),
         ];

app/Http/Transformers/AssetsTransformer.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Transformers;
 
+use App\Helpers\CustomFieldHelper;
 use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
-use Carbon\Carbon;
-use Auth;
+
 
 class AssetsTransformer
 {
@@ -39,7 +39,7 @@ class AssetsTransformer
             'byod' => ($asset->byod ? true : false),
 
             'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
-            'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date).' months' : null,
+            'eol' => (($asset->model) && ($asset->model->eol != '')) ? $asset->model->eol : null,
             'asset_eol_date' => ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date') : null,
             'status_label' => ($asset->assetstatus) ? [
                 'id' => (int) $asset->assetstatus->id,
@@ -97,49 +97,7 @@ class AssetsTransformer
         ];
 
 
-        if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) {
-            $fields_array = [];
-
-            foreach ($asset->model->fieldset->fields as $field) {
-                if ($field->isFieldDecryptable($asset->{$field->db_column})) {
-                    $decrypted = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
-                    $value = (Gate::allows('assets.view.encrypted_custom_fields')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
-
-                    if ($field->format == 'DATE'){
-                        if (Gate::allows('assets.view.encrypted_custom_fields')){
-                            $value = Helper::getFormattedDateObject($value, 'date', false);
-                        } else {
-                           $value = strtoupper(trans('admin/custom_fields/general.encrypted'));
-                        }
-                    }
-
-                    $fields_array[$field->name] = [
-                            'field' => e($field->db_column),
-                            'value' => e($value),
-                            'field_format' => $field->format,
-                            'element' => $field->element,
-                        ];
-
-                } else {
-                    $value = $asset->{$field->db_column};
-
-                    if (($field->format == 'DATE') && (!is_null($value)) && ($value!='')){
-                        $value = Helper::getFormattedDateObject($value, 'date', false);
-                    }
-                    
-                    $fields_array[$field->name] = [
-                        'field' => e($field->db_column),
-                        'value' => e($value),
-                        'field_format' => $field->format,
-                        'element' => $field->element,
-                    ];
-                }
-
-                $array['custom_fields'] = $fields_array;
-            }
-        } else {
-            $array['custom_fields'] = new \stdClass; // HACK to force generation of empty object instead of empty list
-        }
+        $array['custom_fields'] = CustomFieldHelper::transform($asset->model->fieldset,$asset);
 
         $permissions_array['available_actions'] = [
             'checkout'      => ($asset->deleted_at=='' && Gate::allows('checkout', Asset::class)) ? true : false,
@@ -147,7 +105,7 @@ class AssetsTransformer
             'clone'         => Gate::allows('create', Asset::class) ? true : false,
             'restore'       => ($asset->deleted_at!='' && Gate::allows('create', Asset::class)) ? true : false,
             'update'        => ($asset->deleted_at=='' && Gate::allows('update', Asset::class)) ? true : false,
-            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class) && ($asset->deleted_at == '')) ? true : false,
+            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class)) ? true : false,
         ];      
 
 
@@ -232,29 +190,6 @@ class AssetsTransformer
             'assigned_to_self' => ($asset->assigned_to == \Auth::user()->id),
         ];
 
-        if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) {
-            $fields_array = [];
-
-            foreach ($asset->model->fieldset->fields as $field) {
-
-                // Only display this if it's allowed via the custom field setting
-                if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
-
-                    $value = $asset->{$field->db_column};
-                    if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) {
-                        $value = Helper::getFormattedDateObject($value, 'date', false);
-                    }
-
-                    $fields_array[$field->db_column] = e($value);
-                }
-
-                $array['custom_fields'] = $fields_array;
-            }
-        } else {
-            $array['custom_fields'] = new \stdClass; // HACK to force generation of empty object instead of empty list
-        }
-
-
         $permissions_array['available_actions'] = [
             'cancel' => ($asset->isRequestedBy(\Auth::user())) ? true : false,
             'request' => ($asset->isRequestedBy(\Auth::user())) ? false : true,

app/Http/Transformers/CustomFieldsetsTransformer.php

@@ -3,6 +3,8 @@
 namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
+use App\Models\Asset;
+use App\Models\AssetModel;
 use App\Models\CustomFieldset;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -21,8 +23,13 @@ class CustomFieldsetsTransformer
     public function transformCustomFieldset(CustomFieldset $fieldset)
     {
         $fields = $fieldset->fields;
-        $models = $fieldset->models;
+        $models = [];
         $modelsArray = [];
+        if ($fieldset->type == Asset::class) {
+            \Log::debug("Item pivot id is: ".$fieldset->item_pivot_id);
+            $models = AssetModel::where('fieldset_id', $fieldset->id)->get();
+            \Log::debug("And the models object count is: ".$models->count());
+        }
 
         foreach ($models as $model) {
             $modelsArray[] = [
@@ -30,15 +37,21 @@ class CustomFieldsetsTransformer
               'name' => e($model->name),
             ];
         }
+        \Log::debug("Models array is: ".print_r($modelsArray,true));
 
         $array = [
             'id' => (int) $fieldset->id,
             'name' => e($fieldset->name),
             'fields' => (new CustomFieldsTransformer)->transformCustomFields($fields, $fieldset->fields_count),
-            'models' => (new DatatablesTransformer)->transformDatatables($modelsArray, $fieldset->models_count),
+            'customizables' => (new DatatablesTransformer)->transformDatatables($fieldset->customizables(),count($fieldset->customizables())),
             'created_at' => Helper::getFormattedDateObject($fieldset->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($fieldset->updated_at, 'datetime'),
+            'type' => $fieldset->type,
         ];
+        if ($fieldset->type == Asset::class) {
+            // TODO - removeme - legacy column just for Assets?
+            $array['models'] = (new DatatablesTransformer)->transformDatatables($modelsArray, count($modelsArray));
+        }
 
         return $array;
     }

app/Http/Transformers/LicenseSeatsTransformer.php

@@ -45,7 +45,6 @@ class LicenseSeatsTransformer
                 'name'=> e($seat->location()->name),
             ] : null,
             'reassignable' => (bool) $seat->license->reassignable,
-            'notes' => e($seat->notes),
             'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')),
         ];
 

app/Http/Transformers/UsersTransformer.php

@@ -2,7 +2,10 @@
 
 namespace App\Http\Transformers;
 
+use App\Helpers\CustomFieldHelper;
 use App\Helpers\Helper;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
 use App\Models\User;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
@@ -77,9 +80,11 @@ class UsersTransformer
                 'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null,
             ];
 
+        $array['custom_fields'] = CustomFieldHelper::transform(CustomFieldset::where('type',User::class)->first(), $user);
+
         $permissions_array['available_actions'] = [
             'update' => (Gate::allows('update', User::class) && ($user->deleted_at == '')),
-            'delete' => $user->isDeletable(),
+            'delete' => (Gate::allows('delete', User::class) && ($user->assets_count == 0) && ($user->licenses_count == 0) && ($user->accessories_count == 0)),
             'clone' => (Gate::allows('create', User::class) && ($user->deleted_at == '')),
             'restore' => (Gate::allows('create', User::class) && ($user->deleted_at != '')),
         ];

app/Importer/AccessoryImporter.php

@@ -34,7 +34,7 @@ class AccessoryImporter extends ItemImporter
             }
 
             $this->log('Updating Accessory');
-            $this->item['model_number'] = trim($this->findCsvMatch($row, "model_number"));
+            $this->item['model_number'] = $this->findCsvMatch($row, "model_number");
             $accessory->update($this->sanitizeItemForUpdating($accessory));
             $accessory->save();
 

app/Importer/AssetImporter.php

@@ -3,12 +3,7 @@
 namespace App\Importer;
 
 use App\Models\Asset;
-use App\Models\AssetModel;
 use App\Models\Statuslabel;
-use App\Models\User;
-use App\Events\CheckoutableCheckedIn;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
 
 class AssetImporter extends ItemImporter
 {
@@ -28,19 +23,20 @@ class AssetImporter extends ItemImporter
         // ItemImporter handles the general fetching.
         parent::handle($row);
 
+        // FIXME : YUP!!!!! This shit needs to go (?) Yeah?
         if ($this->customFields) {
             foreach ($this->customFields as $customField) {
-                $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);
+                $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField); // TODO/FIXME - this might require a new 'mode' on customFill()?
 
                 if ($customFieldValue) {
-                    if ($customField->field_encrypted == 1) {
+                    if ($customField->field_encrypted == 1) { // FIXME - repeated code.
                         $this->item['custom_fields'][$customField->db_column_name()] = \Crypt::encrypt($customFieldValue);
                         $this->log('Custom Field '.$customField->name.': '.\Crypt::encrypt($customFieldValue));
                     } else {
                         $this->item['custom_fields'][$customField->db_column_name()] = $customFieldValue;
                         $this->log('Custom Field '.$customField->name.': '.$customFieldValue);
                     }
-                } else {
+                } else { // FIXME - think this through? Do we want to blank this? Is that how other stuff works?
                     // Clear out previous data.
                     $this->item['custom_fields'][$customField->db_column_name()] = null;
                 }
@@ -68,7 +64,6 @@ class AssetImporter extends ItemImporter
             $asset_tag = Asset::autoincrement_asset();
         }
 
-
         $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
         if ($asset) {
             if (! $this->updating) {
@@ -83,13 +78,13 @@ class AssetImporter extends ItemImporter
             $this->log('No Matching Asset, Creating a new one');
             $asset = new Asset;
         }
-        $this->item['notes'] = trim($this->findCsvMatch($row, 'asset_notes'));
-        $this->item['image'] = trim($this->findCsvMatch($row, 'image'));
-        $this->item['requestable'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'))) == 1) ? '1' : 0;
+        $this->item['notes'] = $this->findCsvMatch($row, 'asset_notes');
+        $this->item['image'] = $this->findCsvMatch($row, 'image');
+        $this->item['requestable'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable')) == 1) ? '1' : 0;
         $asset->requestable = $this->item['requestable'];
-        $this->item['warranty_months'] = intval(trim($this->findCsvMatch($row, 'warranty_months')));
+        $this->item['warranty_months'] = intval($this->findCsvMatch($row, 'warranty_months'));
         $this->item['model_id'] = $this->createOrFetchAssetModel($row);
-        $this->item['byod'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'byod'))) == 1) ? '1' : 0;
+        $this->item['byod'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'byod')) == 1) ? '1' : 0;
 
 
         // If no status ID is found
@@ -122,7 +117,12 @@ class AssetImporter extends ItemImporter
         if (isset($this->item['next_audit_date'])) {
             $item['next_audit_date'] = $this->item['next_audit_date'];
         }
-       
+
+        $item['asset_eol_date'] = null;
+        if (isset($this->item['asset_eol_date'])) {
+            $item['asset_eol_date'] = $this->item['asset_eol_date'];
+        }
+
         if ($editingAsset) {
             $asset->update($item);
         } else {
@@ -135,22 +135,16 @@ class AssetImporter extends ItemImporter
                 $asset->{$custom_field} = $val;
             }
         }
-       
-        if ($asset->save()) {
 
+
+        if ($asset->save()) {
             $asset->logCreate(trans('general.importer.import_note'));
             $this->log('Asset '.$this->item['name'].' with serial number '.$this->item['serial'].' was created');
 
             // If we have a target to checkout to, lets do so.
             //-- user_id is a property of the abstract class Importer, which this class inherits from and it's setted by
             //-- the class that needs to use it (command importer or GUI importer inside the project).
-            if (isset($target) && ($target !== false)) {
-                if (!is_null($asset->assigned_to)){
-                    if ($asset->assigned_to != $target->id){
-                        event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), Auth::user(), $asset->notes, date('Y-m-d H:i:s')));
-                    }
-                }
-
+            if (isset($target)) {
                 $asset->fresh()->checkOut($target, $this->user_id, date('Y-m-d H:i:s'), null, $asset->notes, $asset->name);
             }
 

app/Importer/ComponentImporter.php

@@ -28,8 +28,8 @@ class ComponentImporter extends ItemImporter
     {
         $component = null;
         $this->log('Creating Component');
-        $component = Component::where('name', trim($this->item['name']))
-                        ->where('serial', trim($this->item['serial']))
+        $component = Component::where('name', $this->item['name'])
+                        ->where('serial', $this->item['serial'])
                         ->first();
 
         if ($component) {

app/Importer/ConsumableImporter.php

@@ -26,7 +26,7 @@ class ConsumableImporter extends ItemImporter
      */
     public function createConsumableIfNotExists($row)
     {
-        $consumable = Consumable::where('name', trim($this->item['name']))->first();
+        $consumable = Consumable::where('name', $this->item['name'])->first();
         if ($consumable) {
             if (! $this->updating) {
                 $this->log('A matching Consumable '.$this->item['name'].' already exists.  ');
@@ -41,9 +41,9 @@ class ConsumableImporter extends ItemImporter
         }
         $this->log('No matching consumable, creating one');
         $consumable = new Consumable();
-        $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
-        $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_number'));
-        $this->item['min_amt'] = trim($this->findCsvMatch($row, "min_amt"));
+        $this->item['model_number'] = $this->findCsvMatch($row, 'model_number');
+        $this->item['item_no'] = $this->findCsvMatch($row, 'item_number');
+        $this->item['min_amt'] = $this->findCsvMatch($row, "min_amt");
         $consumable->fill($this->sanitizeItemForStoring($consumable));
         //FIXME: this disables model validation.  Need to find a way to avoid double-logs without breaking everything.
         $consumable->unsetEventDispatcher();

app/Importer/Importer.php

@@ -19,76 +19,22 @@ abstract class Importer
      * Id of User performing import
      * @var
      */
-    
     protected $user_id;
     /**
      * Are we updating items in the import
      * @var bool
      */
-
     protected $updating;
-
     /**
      * Default Map of item fields->csv names
      *
-     * This has been moved into app/Http/Livewire/Importer.php to be more granular.
-     * This private variable is ONLY used for the cli-importer.
+     * This has been moved into Livewire/Importer.php to be more granular.
+     * @todo - remove references to this property since we don't use it anymore.
      *
-     * @todo - find a way to make this less duplicative
      * @var array
      */
     private $defaultFieldMap = [
-        'asset_tag' => 'asset tag',
-        'activated' => 'activated',
-        'category' => 'category',
-        'checkout_class' => 'checkout type', // Supports Location or User for assets.  Using checkout_class instead of checkout_type because type exists on asset already.
-        'checkout_location' => 'checkout location',
-        'company' => 'company',
-        'item_name' => 'item name',
-        'item_number' => 'item number',
-        'image' => 'image',
-        'expiration_date' => 'expiration date',
-        'location' => 'location',
-        'notes' => 'notes',
-        'license_email' => 'licensed to email',
-        'license_name' => 'licensed to name',
-        'maintained' => 'maintained',
-        'manufacturer' => 'manufacturer',
-        'asset_model' => 'model name',
-        'model_number' => 'model number',
-        'order_number' => 'order number',
-        'purchase_cost' => 'purchase cost',
-        'purchase_date' => 'purchase date',
-        'purchase_order' => 'purchase order',
-        'qty' => 'quantity',
-        'reassignable' => 'reassignable',
-        'requestable' => 'requestable',
-        'seats' => 'seats',
-        'serial' => 'serial number',
-        'status' => 'status',
-        'supplier' => 'supplier',
-        'termination_date' => 'termination date',
-        'warranty_months' => 'warranty',
-        'full_name' => 'full name',
-        'email' => 'email',
-        'username' => 'username',
-        'address' => 'address',
-        'address2' => 'address2',
-        'city' => 'city',
-        'state' => 'state',
-        'country' => 'country',
-        'zip' => 'zip',
-        'jobtitle' => 'job title',
-        'employee_num' => 'employee number',
-        'phone_number' => 'phone number',
-        'first_name' => 'first name',
-        'last_name' => 'last name',
-        'department' => 'department',
-        'manager_name' => 'manager full name',
-        'manager_username' => 'manager username',
-        'min_amt' => 'minimum quantity',
-        'remote' => 'remote',
-        'vip' => 'vip',
+
     ];
     /**
      * Map of item fields->csv names
@@ -174,7 +120,7 @@ abstract class Importer
      * @author Daniel Meltzer
      * @since  5.0
      */
-    protected function populateCustomFields($headerRow)
+    protected function populateCustomFields($headerRow) // FIXME - what in the actual fuck is this.
     {
         // Stolen From https://adamwathan.me/2016/07/14/customizing-keys-when-mapping-collections/
         // This 'inverts' the fields such that we have a collection of fields indexed by name.
@@ -335,11 +281,9 @@ abstract class Importer
             $user_array['email'] = User::generateEmailFromFullName($user_array['full_name']);
         }
 
-        // Get some variables for $user_formatted_array in case we need them later
-        $user_formatted_array = User::generateFormattedNameFromFullName($user_array['full_name'], Setting::getSettings()->username_format);
-
         if (empty($user_array['first_name'])) {
             // Get some fields for first name and last name based off of full name
+            $user_formatted_array = User::generateFormattedNameFromFullName($user_array['full_name'], Setting::getSettings()->username_format);
             $user_array['first_name'] = $user_formatted_array['first_name'];
             $user_array['last_name'] = $user_formatted_array['last_name'];
         }

app/Importer/ItemImporter.php

@@ -10,8 +10,6 @@ use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
-use Carbon\CarbonImmutable;
-use Illuminate\Support\Facades\Log;
 
 class ItemImporter extends Importer
 {
@@ -90,14 +88,8 @@ class ItemImporter extends Importer
         }
 
         $this->item['asset_eol_date'] = null;
-            if($this->findCsvMatch($row, 'asset_eol_date') != '') {
-                $csvMatch = $this->findCsvMatch($row, 'asset_eol_date');
-                try {
-                    $this->item['asset_eol_date'] = CarbonImmutable::parse($csvMatch)->format('Y-m-d');
-                } catch (\Exception $e) {
-                    Log::info($e->getMessage());
-                    $this->log('Unable to parse date: '.$csvMatch);
-                }
+        if ($this->findCsvMatch($row, 'asset_eol_date') != '') {
+            $this->item['asset_eol_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'asset_eol_date')));
         }
 
         $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
@@ -372,7 +364,7 @@ class ItemImporter extends Importer
         if (empty($asset_statuslabel_name)) {
             return null;
         }
-       $status = Statuslabel::where(['name' => trim($asset_statuslabel_name)])->first();
+        $status = Statuslabel::where(['name' => $asset_statuslabel_name])->first();
 
         if ($status) {
             $this->log('A matching Status '.$asset_statuslabel_name.' already exists');
@@ -381,7 +373,7 @@ class ItemImporter extends Importer
         }
         $this->log('Creating a new status');
         $status = new Statuslabel();
-        $status->name = trim($asset_statuslabel_name);
+        $status->name = $asset_statuslabel_name;
 
         $status->deployable = 1;
         $status->pending = 0;
@@ -420,7 +412,7 @@ class ItemImporter extends Importer
 
         //Otherwise create a manufacturer.
         $manufacturer = new Manufacturer();
-        $manufacturer->name = trim($item_manufacturer);
+        $manufacturer->name = $item_manufacturer;
         $manufacturer->user_id = $this->user_id;
 
         if ($manufacturer->save()) {

app/Importer/LicenseImporter.php

@@ -55,19 +55,18 @@ class LicenseImporter extends ItemImporter
             $this->log('No Matching License, Creating a new one');
             $license = new License;
         }
-        $asset_tag = $this->item['asset_tag'] = trim($this->findCsvMatch($row, 'asset_tag')); // used for checkout out to an asset.
+        $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset.
 
         $this->item["expiration_date"] = null;
         if ($this->findCsvMatch($row, "expiration_date")!='') {
-            $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime(trim($this->findCsvMatch($row, "expiration_date"))));
+            $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "expiration_date")));
         }
-        $this->item['license_email'] = trim($this->findCsvMatch($row, 'license_email'));
-        $this->item['license_name'] = trim($this->findCsvMatch($row, 'license_name'));
-        $this->item['maintained'] = trim($this->findCsvMatch($row, 'maintained'));
-        $this->item['purchase_order'] = trim($this->findCsvMatch($row, 'purchase_order'));
-        $this->item['order_number'] = trim($this->findCsvMatch($row, 'order_number'));
-        $this->item['reassignable'] = trim($this->findCsvMatch($row, 'reassignable'));
-        $this->item['manufacturer'] = $this->createOrFetchManufacturer(trim($this->findCsvMatch($row, 'manufacturer')));
+        $this->item['license_email'] = $this->findCsvMatch($row, 'license_email');
+        $this->item['license_name'] = $this->findCsvMatch($row, 'license_name');
+        $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
+        $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
+        $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
+        $this->item['manufacturer'] = $this->createOrFetchManufacturer($this->findCsvMatch($row, 'manufacturer'));
 
         if($this->item['reassignable'] == "")
         {

app/Importer/LocationImporter.php

@@ -53,21 +53,21 @@ class LocationImporter extends ItemImporter
         }
 
         // Pull the records from the CSV to determine their values
-        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
-        $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
-        $this->item['address2'] = trim($this->findCsvMatch($row, 'address2'));
-        $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
-        $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
-        $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
-        $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
-        $this->item['currency'] = trim($this->findCsvMatch($row, 'currency'));
-        $this->item['ldap_ou'] = trim($this->findCsvMatch($row, 'ldap_ou'));
-        $this->item['manager'] = trim($this->findCsvMatch($row, 'manager'));
-        $this->item['manager_username'] = trim($this->findCsvMatch($row, 'manager_username'));
+        $this->item['name'] = $this->findCsvMatch($row, 'name');
+        $this->item['address'] = $this->findCsvMatch($row, 'address');
+        $this->item['address2'] = $this->findCsvMatch($row, 'address2');
+        $this->item['city'] = $this->findCsvMatch($row, 'city');
+        $this->item['state'] = $this->findCsvMatch($row, 'state');
+        $this->item['country'] = $this->findCsvMatch($row, 'country');
+        $this->item['zip'] = $this->findCsvMatch($row, 'zip');
+        $this->item['currency'] = $this->findCsvMatch($row, 'currency');
+        $this->item['ldap_ou'] = $this->findCsvMatch($row, 'ldap_ou');
+        $this->item['manager'] = $this->findCsvMatch($row, 'manager');
+        $this->item['manager_username'] = $this->findCsvMatch($row, 'manager_username');
         $this->item['user_id'] = \Auth::user()->id;
 
         if ($this->findCsvMatch($row, 'parent_location')) {
-            $this->item['parent_id'] = $this->createOrFetchLocation(trim($this->findCsvMatch($row, 'parent_location')));
+            $this->item['parent_id'] = $this->createOrFetchLocation($this->findCsvMatch($row, 'parent_location'));
         }
 
         if (!empty($this->item['manager'])) {

app/Importer/UserImporter.php

@@ -42,32 +42,32 @@ class UserImporter extends ItemImporter
     public function createUserIfNotExists(array $row)
     {
         // Pull the records from the CSV to determine their values
-        $this->item['id'] = trim($this->findCsvMatch($row, 'id'));
-        $this->item['username'] = trim($this->findCsvMatch($row, 'username'));
-        $this->item['first_name'] = trim($this->findCsvMatch($row, 'first_name'));
-        $this->item['last_name'] = trim($this->findCsvMatch($row, 'last_name'));
-        $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
-        $this->item['gravatar'] = trim($this->findCsvMatch($row, 'gravatar'));
-        $this->item['phone'] = trim($this->findCsvMatch($row, 'phone_number'));
-        $this->item['website'] = trim($this->findCsvMatch($row, 'website'));
-        $this->item['jobtitle'] = trim($this->findCsvMatch($row, 'jobtitle'));
-        $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
-        $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
-        $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
-        $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
-        $this->item['start_date'] = trim($this->findCsvMatch($row, 'start_date'));
-        $this->item['end_date'] = trim($this->findCsvMatch($row, 'end_date'));
-        $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
-        $this->item['activated'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'activated'))) == 1) ? '1' : 0;
-        $this->item['employee_num'] = trim($this->findCsvMatch($row, 'employee_num'));
-        $this->item['department_id'] = trim($this->createOrFetchDepartment(trim($this->findCsvMatch($row, 'department'))));
-        $this->item['manager_id'] = $this->fetchManager(trim($this->findCsvMatch($row, 'manager_first_name')), trim($this->findCsvMatch($row, 'manager_last_name')));
-        $this->item['remote'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'remote'))) == 1 ) ? '1' : 0;
-        $this->item['vip'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'vip'))) ==1 ) ? '1' : 0;
-        $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'autoassign_licenses'))) ==1 ) ? '1' : 0;
+        $this->item['id'] = $this->findCsvMatch($row, 'id');
+        $this->item['username'] = $this->findCsvMatch($row, 'username');
+        $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
+        $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
+        $this->item['email'] = $this->findCsvMatch($row, 'email');
+        $this->item['gravatar'] = $this->findCsvMatch($row, 'gravatar');
+        $this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
+        $this->item['website'] = $this->findCsvMatch($row, 'website');
+        $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
+        $this->item['address'] = $this->findCsvMatch($row, 'address');
+        $this->item['city'] = $this->findCsvMatch($row, 'city');
+        $this->item['state'] = $this->findCsvMatch($row, 'state');
+        $this->item['country'] = $this->findCsvMatch($row, 'country');
+        $this->item['start_date'] = $this->findCsvMatch($row, 'start_date');
+        $this->item['end_date'] = $this->findCsvMatch($row, 'end_date');
+        $this->item['zip'] = $this->findCsvMatch($row, 'zip');
+        $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
+        $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
+        $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department'));
+        $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name'));
+        $this->item['remote'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'remote')) ==1 ) ? '1' : 0;
+        $this->item['vip'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'vip')) ==1 ) ? '1' : 0;
+        $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'autoassign_licenses')) ==1 ) ? '1' : 0;
 
 
-        $user_department = trim($this->findCsvMatch($row, 'department'));
+        $user_department = $this->findCsvMatch($row, 'department');
         if ($this->shouldUpdateField($user_department)) {
             $this->item['department_id'] = $this->createOrFetchDepartment($user_department);
         }

app/Listeners/CheckoutableListener.php

@@ -18,7 +18,6 @@ use App\Notifications\CheckoutAccessoryNotification;
 use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CheckoutConsumableNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
-use GuzzleHttp\Exception\ClientException;
 use Illuminate\Support\Facades\Notification;
 use Exception;
 use Log;
@@ -42,9 +41,14 @@ class CheckoutableListener
         /**
          * Make a checkout acceptance and attach it in the notification
          */
-        $acceptance = $this->getCheckoutAcceptance($event);
+        $acceptance = $this->getCheckoutAcceptance($event);       
 
         try {
+            if ($this->shouldSendWebhookNotification()) {
+                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                    ->notify($this->getCheckoutNotification($event));
+            }
+
             if (! $event->checkedOutTo->locale) {
                 Notification::locale(Setting::getSettings()->locale)->send(
                     $this->getNotifiables($event),
@@ -56,15 +60,8 @@ class CheckoutableListener
                     $this->getCheckoutNotification($event, $acceptance)
                 );
             }
-
-            if ($this->shouldSendWebhookNotification()) {
-                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
-                    ->notify($this->getCheckoutNotification($event));
-            }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkout notification: " . $e->getMessage());
         } catch (Exception $e) {
-            Log::error("Exception caught during checkout notification: " . $e->getMessage());
+            Log::error("Exception caught during checkout notification: ".$e->getMessage());
         }
     }
 
@@ -82,19 +79,22 @@ class CheckoutableListener
         /**
          * Send the appropriate notification
          */
-        if ($event->checkedOutTo && $event->checkoutable){
-            $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
-                                            ->where('assigned_to_id', $event->checkedOutTo->id)
-                                            ->get();
+        $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
+                                        ->where('assigned_to_id', $event->checkedOutTo->id)
+                                        ->get();
 
-            foreach($acceptances as $acceptance){
-                if($acceptance->isPending()){
-                    $acceptance->delete();
-                }
+        foreach($acceptances as $acceptance){
+            if($acceptance->isPending()){
+                $acceptance->delete();
             }
         }
 
         try {
+            if ($this->shouldSendWebhookNotification()) {
+                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                    ->notify($this->getCheckinNotification($event));
+            }
+
             // Use default locale
             if (! $event->checkedOutTo->locale) {
                 Notification::locale(Setting::getSettings()->locale)->send(
@@ -107,15 +107,8 @@ class CheckoutableListener
                     $this->getCheckinNotification($event)
                 );
             }
-
-            if ($this->shouldSendWebhookNotification()) {
-                Notification::route('slack', Setting::getSettings()->webhook_endpoint)
-                    ->notify($this->getCheckinNotification($event));
-            }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkout notification: " . $e->getMessage());
         } catch (Exception $e) {
-            Log::error("Exception caught during checkin notification: " . $e->getMessage());
+            Log::error("Exception caught during checkin notification: ".$e->getMessage());
         }
     }      
 
@@ -149,11 +142,9 @@ class CheckoutableListener
         $notifiables = collect();
 
         /**
-         * Notify who checked out the item as long as the model can route notifications
+         * Notify the user who checked out the item
          */
-        if (method_exists($event->checkedOutTo, 'routeNotificationFor')) {
-            $notifiables->push($event->checkedOutTo);
-        }
+        $notifiables->push($event->checkedOutTo);
 
         /**
          * Notify Admin users if the settings is activated

app/Listeners/LogListener.php

@@ -69,6 +69,7 @@ class LogListener
             $logaction->item()->associate($event->acceptance->checkoutable->license);
         }
 
+        \Log::debug('New onCheckoutAccepted Listener fired. logaction: '.print_r($logaction, true));
         $logaction->save();
     }
 

app/Models/Asset.php

@@ -6,8 +6,11 @@ use App\Events\AssetCheckedOut;
 use App\Events\CheckoutableCheckedOut;
 use App\Exceptions\CheckoutNotAllowed;
 use App\Helpers\Helper;
+use App\Http\Traits\UniqueSerialTrait;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
+use App\Models\Traits\Customizable;
+use App\Models\Traits\HasCustomFields;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use AssetPresenter;
@@ -17,6 +20,7 @@ use DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
 
@@ -31,14 +35,25 @@ class Asset extends Depreciable
     protected $presenter = \App\Presenters\AssetPresenter::class;
 
     use CompanyableTrait;
-    use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait;
+    use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait;
 
     public const LOCATION = 'location';
     public const ASSET = 'asset';
     public const USER = 'user';
 
-    use Acceptable;
+    use Acceptable, HasCustomFields;
 
+    public function getFieldsetKey(): object|int|null {
+        return $this->model;
+    }
+
+    public static function getFieldsetUsers(int $fieldset_id): array {
+        $models = [];
+        foreach(AssetModel::where("fieldset_id",$fieldset_id)->get() as $model) {
+            $models[route('models.show', $model->id)] = $model->name.(($model->model_number) ? ' ('.$model->model_number.')' : '');
+        }
+        return $models;
+    }
     /**
      * Run after the checkout acceptance was declined by the user
      * 
@@ -71,7 +86,6 @@ class Asset extends Depreciable
 
     protected $casts = [
         'purchase_date' => 'date',
-        'eol_explicit' => 'boolean',
         'last_checkout' => 'datetime',
         'last_checkin' => 'datetime',
         'expected_checkin' => 'date',
@@ -90,7 +104,7 @@ class Asset extends Depreciable
 
     protected $rules = [
         'name'            => 'max:255|nullable',
-        'model_id'        => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
+        'model_id'        => 'required|integer|exists:models,id,deleted_at,NULL',
         'status_id'       => 'required|integer|exists:status_labels,id',
         'company_id'      => 'integer|nullable',
         'warranty_months' => 'numeric|nullable|digits_between:0,240',
@@ -99,17 +113,15 @@ class Asset extends Depreciable
         'expected_checkin' => 'date|nullable',
         'location_id'     => 'exists:locations,id|nullable',
         'rtd_location_id' => 'exists:locations,id|nullable',
-        'asset_tag'       => 'required|min:1|max:255|unique_undeleted:assets,asset_tag|not_array',
+        'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
         'purchase_date'   => 'date|date_format:Y-m-d|nullable',
-        'serial'          => 'unique_undeleted:assets,serial|nullable',
+        'serial'          => 'unique_serial|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',
         'supplier_id'     => 'exists:suppliers,id|nullable',
-        'asset_eol_date'  => 'date|nullable',
-        'eol_explicit'    => 'boolean|nullable',
+        'asset_eol_date'  => 'date|max:10|min:10|nullable',
         'byod'            => 'boolean',
     ];
 
-
   /**
    * The attributes that are mass assignable.
    *
@@ -138,10 +150,8 @@ class Asset extends Depreciable
         'expected_checkin',
         'byod',
         'asset_eol_date',
-        'eol_explicit', 
         'last_audit_date',
         'next_audit_date',
-        'asset_eol_date',
     ];
 
     use Searchable;
@@ -192,40 +202,6 @@ class Asset extends Depreciable
         $this->attributes['expected_checkin'] = $value;
     }
 
-    /**
-     * This handles the custom field validation for assets
-     *
-     * @var array
-     */
-    public function save(array $params = [])
-    {
-        if ($this->model_id != '') {
-            $model = AssetModel::find($this->model_id);
-
-            if (($model) && ($model->fieldset)) {
-
-                foreach ($model->fieldset->fields as $field){
-                    if($field->format == 'BOOLEAN'){
-                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                    }
-                }
-
-                $this->rules += $model->fieldset->validation_rules();
-
-                if ($this->model->fieldset){
-                    foreach ($this->model->fieldset->fields as $field){
-                        if($field->format == 'BOOLEAN'){
-                            $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                        }
-                    }
-                }
-            }
-        }
-
-        return parent::save($params);
-    }
-
-
     public function getDisplayNameAttribute()
     {
         return $this->present()->name();
@@ -266,7 +242,7 @@ class Asset extends Depreciable
 
     /**
      * Determines if an asset is available for checkout.
-     * This checks to see if it's checked out to an invalid (deleted) user
+     * This checks to see if the it's checked out to an invalid (deleted) user
      * OR if the assigned_to and deleted_at fields on the asset are empty AND
      * that the status is deployable
      *
@@ -753,7 +729,7 @@ class Asset extends Depreciable
     }
 
     /**
-     * Establishes the asset -> license seats relationship
+     * Establishes the asset -> status relationship
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
@@ -789,6 +765,7 @@ class Asset extends Depreciable
     }
 
 
+
     /**
      * Get the next autoincremented asset tag
      *
@@ -921,27 +898,6 @@ class Asset extends Depreciable
         return $cost;
     }
 
-    /**
-     * -----------------------------------------------
-     * BEGIN MUTATORS
-     * -----------------------------------------------
-     **/
-
-    /**
-     * This sets the requestable to a boolean 0 or 1. This accounts for forms or API calls that
-     * explicitly pass the requestable field but it has a null or empty value.
-     *
-     * This will also correctly parse a 1/0 if "true"/"false" is passed.
-     *
-     * @param $value
-     * @return void
-     */
-    public function setRequestableAttribute($value)
-    {
-        $this->attributes['requestable'] = (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
     /**
     * -----------------------------------------------
     * BEGIN QUERY SCOPES
@@ -972,7 +928,6 @@ class Asset extends Depreciable
                 ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
-                ->orWhere('assets_users.employee_num', 'LIKE', '%'.$term.'%')
                 ->orWhereMultipleColumns([
                     'assets_users.first_name',
                     'assets_users.last_name',
@@ -1548,7 +1503,7 @@ class Asset extends Depreciable
              *
              * In short, this set of statements tells the query builder to ONLY query against an
              * actual field that's being passed if it doesn't meet known relational fields. This
-             * allows us to query custom fields directly in the assetsv table
+             * allows us to query custom fields directly in the assets table
              * (regardless of their name) and *skip* any fields that we already know can only be
              * searched through relational searches that we do earlier in this method.
              *

app/Models/AssetModel.php

@@ -6,7 +6,6 @@ use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
 
@@ -151,6 +150,7 @@ class AssetModel extends SnipeModel
      */
     public function fieldset()
     {
+        // this is actually OK - we don't *need* to do this, but it's okay to make references from Model to fieldset
         return $this->belongsTo(\App\Models\CustomFieldset::class, 'fieldset_id');
     }
    
@@ -159,18 +159,6 @@ class AssetModel extends SnipeModel
        return $this->fieldset()->first()->fields(); 
     }
 
-    /**
-     * Establishes the model -> custom field default values relationship
-     *
-     * @author hannah tinkler
-     * @since [v4.3]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function defaultValues()
-    {
-        return $this->belongsToMany(\App\Models\CustomField::class, 'models_custom_fields')->withPivot('default_value');
-    }
-
     /**
      * Gets the full url for the image
      *
@@ -189,21 +177,6 @@ class AssetModel extends SnipeModel
         return false;
     }
 
-
-    /**
-     * Checks if the model is deletable
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v6.3.4]
-     * @return bool
-     */
-    public function isDeletable()
-    {
-        return Gate::allows('delete', $this)
-            && ($this->assets_count == 0)
-            && ($this->deleted_at == '');
-    }
-
     /**
      * Get uploads for this model
      *
@@ -307,9 +280,4 @@ class AssetModel extends SnipeModel
     {
         return $query->leftJoin('categories', 'models.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
     }
-
-    public function scopeOrderFieldset($query, $order)
-    {
-        return $query->leftJoin('custom_fieldsets', 'models.fieldset_id', '=', 'custom_fieldsets.id')->orderBy('custom_fieldsets.name', $order);
-    }
 }

app/Models/Category.php

@@ -100,8 +100,7 @@ class Category extends SnipeModel
     {
 
         return Gate::allows('delete', $this)
-                && ($this->itemCount() == 0)
-                && ($this->deleted_at == '');
+                && ($this->itemCount() == 0);
     }
 
     /**
@@ -248,26 +247,6 @@ class Category extends SnipeModel
         }
     }
 
-    /**
-     * -----------------------------------------------
-     * BEGIN MUTATORS
-     * -----------------------------------------------
-     **/
-
-    /**
-     * This sets the checkin_value to a boolean 0 or 1. This accounts for forms or API calls that
-     * explicitly pass the checkin_email field but it has a null or empty value.
-     *
-     * This will also correctly parse a 1/0 if "true"/"false" is passed.
-     *
-     * @param $value
-     * @return void
-     */
-    public function setCheckinEmailAttribute($value)
-    {
-        $this->attributes['checkin_email'] = (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
     /**
      * -----------------------------------------------
      * BEGIN QUERY SCOPES

app/Models/CustomField.php

@@ -16,7 +16,7 @@ class CustomField extends Model
         UniqueUndeletedTrait;
 
     /**
-     * Custom field predfined formats
+     * Custom field predefined formats
      *
      * @var array
      */
@@ -53,12 +53,7 @@ class CustomField extends Model
         'field_encrypted' => 'nullable|boolean',
         'auto_add_to_fieldsets' => 'boolean',
         'show_in_listview' => 'boolean',
-        'show_in_requestable_list' => 'boolean',
-        'show_in_email' => 'boolean',
-    ];
-
-    protected $casts = [
-        'show_in_requestable_list'  => 'boolean',
+        'type' => 'required'
     ];
 
     /**
@@ -78,20 +73,8 @@ class CustomField extends Model
         'display_in_user_view',
         'auto_add_to_fieldsets',
         'show_in_listview',
-        'show_in_email',
-        'show_in_requestable_list',
-    ];
 
-    /**
-     * This is confusing, since it's actually the custom fields table that
-     * we're usually modifying, but since we alter the assets table, we have to
-     * say that here, otherwise the new fields get added onto the custom fields
-     * table instead of the assets table.
-     *
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
-     * @since [v3.0]
-     */
-    public static $table_name = 'assets';
+    ];
 
     /**
      * Convert the custom field's name property to a db-safe string.
@@ -99,13 +82,13 @@ class CustomField extends Model
      * We could probably have used str_slug() here but not sure what it would
      * do with previously existing values. - @snipe
      *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.4]
      * @return string
+     * @since [v3.4]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      */
     public static function name_to_db_name($name)
     {
-        return '_snipeit_'.preg_replace('/[^a-zA-Z0-9]/', '_', strtolower($name));
+        return '_snipeit_' . preg_replace('/[^a-zA-Z0-9]/', '_', strtolower($name));
     }
 
     /**
@@ -116,23 +99,22 @@ class CustomField extends Model
      * if they have changed, so we handle that here so that we don't have to remember
      * to do it in the controllers.
      *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.4]
      * @return bool
+     * @since [v3.4]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      */
     public static function boot()
     {
         parent::boot();
         self::created(function ($custom_field) {
-
             // Column already exists on the assets table - nothing to do here.
             // This *shouldn't* happen in the wild.
-            if (Schema::hasColumn(self::$table_name, $custom_field->db_column)) {
+            if (Schema::hasColumn($custom_field->getTableName(), $custom_field->db_column)) {
                 return false;
             }
 
             // Update the column name in the assets table
-            Schema::table(self::$table_name, function ($table) use ($custom_field) {
+            Schema::table($custom_field->getTableName(), function ($table) use ($custom_field) {
                 $table->text($custom_field->convertUnicodeDbSlug())->nullable();
             });
 
@@ -145,7 +127,7 @@ class CustomField extends Model
 
             // Column already exists on the assets table - nothing to do here.
             if ($custom_field->isDirty('name')) {
-                if (Schema::hasColumn(self::$table_name, $custom_field->convertUnicodeDbSlug())) {
+                if (Schema::hasColumn($custom_field->getTableName(), $custom_field->convertUnicodeDbSlug())) {
                     return true;
                 }
 
@@ -155,7 +137,7 @@ class CustomField extends Model
                 $platform->registerDoctrineTypeMapping('enum', 'string');
 
                 // Rename the field if the name has changed
-                Schema::table(self::$table_name, function ($table) use ($custom_field) {
+                Schema::table($custom_field->getTableName(), function ($table) use ($custom_field) {
                     $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal('name')), $custom_field->convertUnicodeDbSlug());
                 });
 
@@ -171,12 +153,19 @@ class CustomField extends Model
 
         // Drop the assets column if we've deleted it from custom fields
         self::deleting(function ($custom_field) {
-            return Schema::table(self::$table_name, function ($table) use ($custom_field) {
+            return Schema::table($custom_field->getTableName(), function ($table) use ($custom_field) {
                 $table->dropColumn($custom_field->db_column);
             });
         });
     }
 
+    public function getTableName()
+    {
+        $type = $this->type;
+        $instance = new $type();
+        return $instance->getTable();
+    }
+
     /**
      * Establishes the customfield -> fieldset relationship
      *
@@ -207,31 +196,23 @@ class CustomField extends Model
     }
 
     /**
-     * Establishes the customfield -> default values relationship
-     *
-     * @author Hannah Tinkler
-     * @since [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function defaultValues()
-    {
-        return $this->belongsToMany(\App\Models\AssetModel::class, 'models_custom_fields')->withPivot('default_value');
-    }
-
-    /**
-     * Returns the default value for a given model using the defaultValues
+     * Returns the default value for a given 'item' using the defaultValues
      * relationship
      *
      * @param  int $modelId
      * @return string
      */
-    public function defaultValue($modelId)
+    public function defaultValue($pivot_id)
     {
-        return $this->defaultValues->filter(function ($item) use ($modelId) {
-            return $item->pivot->asset_model_id == $modelId;
-        })->map(function ($item) {
-            return $item->pivot->default_value;
-        })->first();
+        /*
+           below, you might think you need to add:
+
+           where('type', $this->type),
+
+           but the type can be inferred from by the custom_field itself (which also has a type)
+           can't use forPivot() here because we don't have an object yet. (TODO?)
+        */
+        DefaultValuesForCustomFields::where('item_pivot_id', $pivot_id)->where('custom_field_id',$this->id)->first()?->default_value; //TODO - php8-only operator!
     }
 
     /**
@@ -250,6 +231,8 @@ class CustomField extends Model
     /**
      * Gets the DB column name.
      *
+     * @todo figure out if this is still needed? I don't know WTF it's for.
+     *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
      * @return string

app/Models/CustomFieldset.php

@@ -20,6 +20,7 @@ class CustomFieldset extends Model
      */
     public $rules = [
         'name' => 'required|unique:custom_fieldsets',
+        ''
     ];
 
     /**
@@ -48,11 +49,13 @@ class CustomFieldset extends Model
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @return \Illuminate\Database\Eloquent\Collection
      */
-    public function models()
+    public function customizables() // TODO - I don't like this name, but I can't think of anything better
     {
-        return $this->hasMany(\App\Models\AssetModel::class, 'fieldset_id');
+        $customizable_class_name = $this->type; //TODO - copypasta from Customizable trait?
+        \Log::debug("Customizable Class name is: ".$customizable_class_name);
+        return $customizable_class_name::getFieldsetUsers($this->id);
     }
 
     /**
@@ -77,6 +80,7 @@ class CustomFieldset extends Model
      */
     public function validation_rules()
     {
+        \Log::debug("CALLING validation_rules FOR customfiledsets!");
         $rules = [];
         foreach ($this->fields as $field) {
             $rule = [];
@@ -90,10 +94,13 @@ class CustomFieldset extends Model
                     $rule[] = 'unique_undeleted';
             }
 
-            array_push($rule, $field->attributes['format']);
+            \Log::debug("Field Format for".$field->name." is: ".$field->format);
+            if($field->format == 'DATE') { //we do a weird mutator thing, it's confusing - but, yes, it's all-caps
+                $rule[] = 'date_format:Y-m-d';
+            } else {
+                array_push($rule, $field->attributes['format']);
+            }
             $rules[$field->db_column_name()] = $rule;
-            //add not_array to rules for all fields
-            $rules[$field->db_column_name()][] = 'not_array';
         }
 
         return $rules;

app/Models/DefaultValuesForCustomFields.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
+use Watson\Validating\ValidatingTrait;
+
+class DefaultValuesForCustomFields extends Model
+{
+    use HasFactory, ValidatingTrait;
+
+    protected $rules = [
+        'type' => 'required'
+    ];
+
+    public $timestamps = false;
+
+    public function field() {
+        return $this->belongsTo('custom_fields');
+    }
+
+    // There is, effectively, another 'relation' here, but it's weirdly polymorphic
+    // and impossible to represent in Laravel.
+    // we have a 'type', and we have an 'item_pivot_id' -
+    // For example, in Assets the 'type' would be App\Models\Asset, and the 'item_pivot_id' would be a model_id
+    // I can't come up with any way to represent this in Laravel/Eloquent
+
+    // TODO: might be getting overly-fancy here; maybe just want to do an ID? Instead of an Eloquent Model?
+    public function scopeForPivot(Builder $query, Model $item, string $class) {
+        return $query->where('item_pivot_id', $item->id)->where('type', $class);
+    }
+}

app/Models/Department.php

@@ -9,7 +9,6 @@ use Watson\Validating\ValidatingTrait;
 
 class Department extends SnipeModel
 {
-    use CompanyableTrait;
     use HasFactory;
 
     /**

app/Models/Labels/Field.php

@@ -21,8 +21,6 @@ class Field {
 
     public static function makeArray(Field $field, Asset $asset) {
         return $field->getOptions()
-            // filter out any FieldOptions that are accidentally null
-            ->filter()
             ->map(fn($option) => $option->toArray($asset))
             ->filter(fn($result) => $result['value'] != null);
     }
@@ -38,4 +36,4 @@ class Field {
             ->map(fn($optionString) => FieldOption::fromString($optionString));
         return $field;
     }
-}
+}