Additional tweaks for recursion

Signed-off-by: snipe <snipe@snipe.net>

.all-contributorsrc

@@ -3206,8 +3206,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/3755203?v=4",
       "profile": "https://github.com/swift2512",
       "contributions": [
-        "bug",
-        "code"
+        "bug"
       ]
     },
     {
@@ -4190,78 +4189,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "mckaygerhard",
-      "name": "Герхард PICCORO Lenz McKAY ",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1571724?v=4",
-      "profile": "https://github-readme-stats.vercel.app/api?username=mckaygerhard",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "FlorestanII",
-      "name": "Johannes Pollitt",
-      "avatar_url": "https://avatars.githubusercontent.com/u/15015119?v=4",
-      "profile": "https://github.com/FlorestanII",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "strobelm",
-      "name": "Michael Strobel",
-      "avatar_url": "https://avatars.githubusercontent.com/u/14185442?v=4",
-      "profile": "https://strobelm.de",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "nickwest",
-      "name": "Nicky West",
-      "avatar_url": "https://avatars.githubusercontent.com/u/634790?v=4",
-      "profile": "http://nickwest.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "akaspeh1",
-      "name": "akaspeh1",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1347327?v=4",
-      "profile": "https://github.com/akaspeh1",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "smarsching",
-      "name": "Sebastian Marsching",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2880129?v=4",
-      "profile": "http://sebastian.marsching.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mohammad-ahmadi1",
-      "name": "Mo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/40658372?v=4",
-      "profile": "https://github.com/mohammad-ahmadi1",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "MarvelousAnything",
-      "name": "Owen V. Hayes",
-      "avatar_url": "https://avatars.githubusercontent.com/u/20994684?v=4",
-      "profile": "https://github.com/MarvelousAnything",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

.env.docker

@@ -28,7 +28,6 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # --------------------------------------------
 DB_CONNECTION=mysql
 DB_HOST=db
-DB_SOCKET=null
 DB_PORT='3306'
 DB_DATABASE=snipeit
 DB_USERNAME=snipeit
@@ -169,7 +168,6 @@ AWS_DEFAULT_REGION=null
 LOGIN_MAX_ATTEMPTS=5
 LOGIN_LOCKOUT_DURATION=60
 RESET_PASSWORD_LINK_EXPIRES=900
-INVITE_PASSWORD_LINK_EXPIRES=1500
 
 # --------------------------------------------
 # OPTIONAL: MISC

.env.example

@@ -24,7 +24,6 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # --------------------------------------------
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_SOCKET=null
 DB_PORT=3306
 DB_DATABASE=null
 DB_USERNAME=null
@@ -175,7 +174,6 @@ LOGIN_AUTOCOMPLETE=false
 RESET_PASSWORD_LINK_EXPIRES=15
 PASSWORD_CONFIRM_TIMEOUT=10800
 PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
-INVITE_PASSWORD_LINK_EXPIRES=1500
 
 # --------------------------------------------
 # OPTIONAL: MISC
@@ -190,21 +188,14 @@ APP_ALLOW_INSECURE_HOSTS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
-BACKUP_TIME_LIMIT=600
 IMPORT_TIME_LIMIT=600
 IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000
+REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
 LIVEWIRE_URL_PREFIX=null
 
-
-# --------------------------------------------
-# OPTIONAL: SAML SETTINGS
-# --------------------------------------------
-REQUIRE_SAML=false
-SAML_KEY_SIZE=2048
-
 # --------------------------------------------
 # OPTIONAL: HASHING
 # --------------------------------------------

.github/ISSUE_TEMPLATE/Bug-Report.yml

@@ -1,163 +0,0 @@
-name: Bug Report
-description: File a bug report.
-title: "[Bug]: "
-projects: ["grokability/snipe-it"]
-type: bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report! Most issues are documented in the [Snipe-IT repository's issues](https://github.com/grokability/snipe-it/issues) or in the official [Common Issues section of the Documentation](https://snipe-it.readme.io/docs/common-issues#/) and are due to the following:
-        
-        - `.env` misconfiguration
-        - [Server Permissions](https://snipe-it.readme.io/docs/debugging-permissions#/)
-        - [Database Migrations](https://snipe-it.readme.io/docs/database-issues#run-migrations)
-        
-        Please make sure you've checked these resources before submitting a new issue. If you find an existing issue, please add your context to it instead of opening a new issue. If your issue is more of a question, consider [opening a new discussion](https://github.com/grokability/snipe-it/discussions) or [pop by our Discord](https://discord.gg/yZFtShAcKk) instead of creating an issue.
-        
-        **Please write your bug report in English.** You can use tools like [DeepL](https://www.deepl.com) or [Google Translate](https://translate.google.com/) to translate if necessary. 
-        
-        **If you choose to upload screenshots or videos (which we always encourage), please make sure they do not contain any sensitive information.**
-  - type: input
-    id: version
-    attributes:
-      label: Snipe-IT Version
-      description: What version of Snipe-IT are you seeing this issue on? You can find the version number in the footer of any page in Snipe-IT.
-      placeholder: ex. v8.3.2 - build 19577 (master)
-    validations:
-      required: true
-  - type: input
-    id: php-version
-    attributes:
-      label: PHP Version
-      description: What version of PHP are you running? You can find the version of PHP your webserver is running in the `Admin Settings` section in the footer, and the cli version by running `php -v` via command line .
-      placeholder: ex. v8.3.1 (web), PHP 8.4.12 (cli)
-    validations:
-      required: true
-  - type: input
-    id: composer-version
-    attributes:
-      label: Composer Version
-      description: What version of composer are you running? You can find the version number by running `composer --version`.
-      placeholder: ex. 2.8.10
-    validations:
-      required: true
-  - type: input
-    id: db-version
-    attributes:
-      label: MySQL/MariaDB version
-      description: What database are you using, and what version?
-      placeholder: ex. MySQL 5.7
-    validations:
-      required: true
-  - type: dropdown
-    id: install-method
-    attributes:
-      label: How did you install Snipe-IT?
-      options:
-        - Git install
-        - Manual install (downloading zip/tar.gz)
-        - Docker
-        - install.sh
-        - Hosted by Grokability
-        - Other
-        - Not sure
-    validations:
-      required: true
-  - type: dropdown
-    id: upgrade-or-fresh
-    attributes:
-      label: Is this a fresh install or an upgrade?
-      options:
-        - Fresh install
-        - Upgrade
-        - NA
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see! (Be nice!)
-    validations:
-      required: true
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: What browsers are you seeing the problem on?
-      multiple: true
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Other
-  - type: dropdown
-    id: on-demo
-    attributes:
-      label: Can you reproduce this on the public demo?
-      description: You can check this at https://demo.snipeitapp.com.
-      options:
-        - 'Yes'
-        - 'No'
-        - N/A
-    validations:
-      required: true
-  - type: dropdown
-    id: fmcs
-    attributes:
-      label: Do you have full multiple company support enabled?
-      description: You can check this in your Snipe-IT installation at `Admin Settings > General Settings > Scoping`.
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-  - type: dropdown
-    id: fmcs-location
-    attributes:
-      label: If you have full multiple company support enabled, do you have location scoping to company enabled?
-      description: You can check this in your Snipe-IT installation at `Admin Settings > General Settings > Scoping`.
-      options:
-        - 'Yes'
-        - 'No'
-        - I do not have full multiple company support enabled
-    validations:
-      required: true
-  - type: textarea
-    id: server-logs
-    attributes:
-      label: Application log output
-      description: Please copy and paste any relevant log output from `storage/logs/laravel.log`. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: textarea
-    id: browser-logs
-    attributes:
-      label: Browser console output
-      description: Please copy and paste any relevant log output from your browser console. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: checkboxes
-    id: common-issues
-    attributes:
-      label: Common Issues
-      description: Please make sure you have done the following before submitting your issue.
-      options:
-        - label: I have searched this repo for existing issues related to my issue (including closed issues)
-          required: true
-        - label: My APP_URL is set correctly in my .env file (including http or https and no trailing slash)
-          required: true
-        - label: I have searched the official Snipe-IT documentation and have checked the Common Issues documentation (where applicable)
-          required: true
-        - label: I have run database migrations (where applicable).
-          required: true
-        - label: I have attached screenshots and/or videos of the issue (where applicable)
-          required: true
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/grokability/snipe-it/blob/master/CODE_OF_CONDUCT.md).
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

.github/ISSUE_TEMPLATE/Feature-Request.yml

@@ -1,38 +0,0 @@
-name: Feature Request
-description: Request a new feature.
-title: "[Feature]: "
-projects: ["grokability/snipe-it"]
-type: feature
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request! Please make sure to search the existing issues in this repository to see if your feature has already been requested, and feel free to add your context to any existing requests.
-        
-        **Please write your issue in English.** You can use tools like [DeepL](https://www.deepl.com) or [Google Translate](https://translate.google.com/) to translate if necessary. 
-        
-         **If you choose to upload screenshots or videos (which we always encourage), please make sure they do not contain any sensitive information.**
-  - type: input
-    id: version
-    attributes:
-      label: Snipe-IT Version
-      description: What version of Snipe-IT are you currently running? You can find the version number in the footer of any page in Snipe-IT.
-      placeholder: ex. v8.3.1 - build 19577 (master)
-    validations:
-      required: true
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: How can we help?
-      description: Let us know in detail what feature you'd like to see added. While we can't promise to implement every feature request, we do read every one and take them into consideration when planning future releases.
-      placeholder: Tell us what you'd like to see in Snipe-IT! (Be nice!)
-    validations:
-      required: true
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/grokability/snipe-it/blob/master/CODE_OF_CONDUCT.md).
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

.github/workflows/SA-codeql.yml

@@ -26,14 +26,14 @@ jobs:
         language: [ 'javascript' ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3

.github/workflows/codacy-analysis.yml

@@ -32,11 +32,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.7
+        uses: codacy/codacy-analysis-cli-action@v4.4.5
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -52,6 +52,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v4
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif

.github/workflows/crowdin-upload.yml

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

.github/workflows/docker-alpine.yml

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

.github/workflows/docker-ubuntu.yml

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

.github/workflows/dockerhub-description.yml

@@ -11,7 +11,7 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Docker Hub Description
         uses: grokability/dockerhub-description@7ea9d275c7cdbe2b676a093a0308c50665e3b8b4

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
       #  pull-requests: write
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         with:
           debug-only: true
           ascending: true

.github/workflows/tests-mysql.yml

@@ -37,7 +37,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -76,16 +76,4 @@ jobs:
           DB_DATABASE: snipeit
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_USERNAME: root
-          LOG_CHANNEL: single
-          LOG_LEVEL: debug
         run: php artisan test
-
-      - name: Upload Laravel logs as artifacts
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
-          path: |
-            storage/logs/*.log
-          if-no-files-found: ignore
-          retention-days: 7

.github/workflows/tests-postgres.yml

@@ -34,7 +34,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -75,16 +75,4 @@ jobs:
           DB_PORT: ${{ job.services.postgresql.ports[5432] }}
           DB_USERNAME: snipeit
           DB_PASSWORD: password
-          LOG_CHANNEL: single
-          LOG_LEVEL: debug
         run: php artisan test
-
-      - name: Upload Laravel logs as artifacts
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
-          path: |
-            storage/logs/*.log
-          if-no-files-found: ignore
-          retention-days: 7

.github/workflows/tests-sqlite.yml

@@ -25,7 +25,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -61,16 +61,4 @@ jobs:
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         env:
           DB_CONNECTION: sqlite
-          LOG_CHANNEL: single
-          LOG_LEVEL: debug
         run: php artisan test
-
-      - name: Upload Laravel logs as artifacts
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
-          path: |
-            storage/logs/*.log
-          if-no-files-found: ignore
-          retention-days: 7

CONTRIBUTORS.md

@@ -52,7 +52,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") | [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") [💻](https://github.com/snipe/snipe-it/commits?author=swift2512 "Code") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") | [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") | [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/25596663?v=4" width="110px;"/><br /><sub>aHVzY2g</sub>](https://github.com/aHVzY2g)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aHVzY2g "Code") | [<img src="https://avatars.githubusercontent.com/u/13408130?v=4" width="110px;"/><br /><sub>林博仁 Buo-ren Lin</sub>](https://brlin.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brlin-tw "Code") | [<img src="https://avatars.githubusercontent.com/u/18550946?v=4" width="110px;"/><br /><sub>Adugna Gizaw</sub>](https://orbalia.pythonanywhere.com/)<br />[🌍](#translation-addex12 "Translation") | [<img src="https://avatars.githubusercontent.com/u/760989?v=4" width="110px;"/><br /><sub>Jesse Ostrander</sub>](https://github.com/jostrander)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jostrander "Code") | [<img src="https://avatars.githubusercontent.com/u/31522486?v=4" width="110px;"/><br /><sub>James M</sub>](https://github.com/azmcnutt)<br />[💻](https://github.com/snipe/snipe-it/commits?author=azmcnutt "Code") | [<img src="https://avatars.githubusercontent.com/u/5183146?v=4" width="110px;"/><br /><sub>Fiala06</sub>](https://github.com/Fiala06)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Fiala06 "Code") | [<img src="https://avatars.githubusercontent.com/u/28693782?v=4" width="110px;"/><br /><sub>Nathan Taylor</sub>](https://github.com/ntaylor-86)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntaylor-86 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/16699443?v=4" width="110px;"/><br /><sub>fvollmer</sub>](https://github.com/fvollmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fvollmer "Code") | [<img src="https://avatars.githubusercontent.com/u/109086466?v=4" width="110px;"/><br /><sub>36864</sub>](https://github.com/36864)<br />[💻](https://github.com/snipe/snipe-it/commits?author=36864 "Code") | [<img src="https://avatars.githubusercontent.com/u/365751?v=4" width="110px;"/><br /><sub>Daniel O'Connor</sub>](http://clockwerx.blogspot.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CloCkWeRX "Code") | [<img src="https://avatars.githubusercontent.com/u/102852568?v=4" width="110px;"/><br /><sub>BeatSpark</sub>](https://github.com/BeatSpark)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BeatSpark "Code") | [<img src="https://avatars.githubusercontent.com/u/59203607?v=4" width="110px;"/><br /><sub>mrdahbi</sub>](https://github.com/mrdahbi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrdahbi "Code") | [<img src="https://avatars.githubusercontent.com/u/6661332?v=4" width="110px;"/><br /><sub>Fabian Schmid</sub>](http://sr.solutions)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chfsx "Code") | [<img src="https://avatars.githubusercontent.com/u/1288116?v=4" width="110px;"/><br /><sub>Chris Olin</sub>](https://www.chrisolin.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=realchrisolin "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/3803132?v=4" width="110px;"/><br /><sub>Dan</sub>](https://github.com/mnemonicly)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mnemonicly "Code") | [<img src="https://avatars.githubusercontent.com/u/43917728?v=4" width="110px;"/><br /><sub>Nebel</sub>](https://github.com/NebelKreis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NebelKreis "Code") | [<img src="https://avatars.githubusercontent.com/u/132433803?v=4" width="110px;"/><br /><sub>test1337ahp</sub>](https://github.com/test1337ahp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=test1337ahp "Code") | [<img src="https://avatars.githubusercontent.com/u/1916566?v=4" width="110px;"/><br /><sub>Jonathon Reinhart</sub>](https://github.com/JonathonReinhart)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JonathonReinhart "Code") | [<img src="https://avatars.githubusercontent.com/u/484742?v=4" width="110px;"/><br /><sub>aranar-pro</sub>](https://github.com/aranar-pro)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aranar-pro "Code") | [<img src="https://avatars.githubusercontent.com/u/27019397?v=4" width="110px;"/><br /><sub>Phil</sub>](https://github.com/phil-flip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phil-flip "Code") | [<img src="https://avatars.githubusercontent.com/u/6473460?v=4" width="110px;"/><br /><sub>Steffy Fort</sub>](https://fe80.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fe80 "Code") |
@@ -68,8 +68,6 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | [<img src="https://avatars.githubusercontent.com/u/58696401?v=4" width="110px;"/><br /><sub>Lukas Kraic</sub>](https://github.com/lukaskraic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukaskraic "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") | [<img src="https://avatars.githubusercontent.com/u/2880129?v=4" width="110px;"/><br /><sub>Sebastian Marsching</sub>](http://sebastian.marsching.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smarsching "Code") | [<img src="https://avatars.githubusercontent.com/u/40658372?v=4" width="110px;"/><br /><sub>Mo</sub>](https://github.com/mohammad-ahmadi1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mohammad-ahmadi1 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/20994684?v=4" width="110px;"/><br /><sub>Owen V. Hayes</sub>](https://github.com/MarvelousAnything)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MarvelousAnything "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Actions/Categories/DestroyCategoryAction.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Actions\Categories;
-
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssetModels;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
-use App\Models\Category;
-use Illuminate\Support\Facades\Storage;
-
-class DestroyCategoryAction
-{
-    /**
-     * @throws ItemStillHasAssets
-     * @throws ItemStillHasAssetModels
-     * @throws ItemStillHasComponents
-     * @throws ItemStillHasAccessories
-     * @throws ItemStillHasLicenses
-     * @throws ItemStillHasConsumables
-     */
-    static function run(Category $category): bool
-    {
-        $category->loadCount([
-            'assets as assets_count',
-            'accessories as accessories_count',
-            'consumables as consumables_count',
-            'components as components_count',
-            'licenses as licenses_count',
-            'models as models_count'
-        ]);
-
-        if ($category->assets_count > 0) {
-            throw new ItemStillHasAssets($category);
-        }
-        if ($category->accessories_count > 0) {
-            throw new ItemStillHasAccessories($category);
-        }
-        if ($category->consumables_count > 0) {
-            throw new ItemStillHasConsumables($category);
-        }
-        if ($category->components_count > 0) {
-            throw new ItemStillHasComponents($category);
-        }
-        if ($category->licenses_count > 0) {
-            throw new ItemStillHasLicenses($category);
-        }
-        if ($category->models_count > 0) {
-            throw new ItemStillHasAssetModels($category);
-        }
-
-        Storage::disk('public')->delete('categories'.'/'.$category->image);
-        $category->delete();
-
-        return true;
-    }
-}

app/Actions/Manufacturers/DeleteManufacturerAction.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Actions\Manufacturers;
-
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
-use App\Models\Manufacturer;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-
-class DeleteManufacturerAction
-{
-    /**
-     * @throws ItemStillHasAssets
-     * @throws ItemStillHasComponents
-     * @throws ItemStillHasAccessories
-     * @throws ItemStillHasLicenses
-     * @throws ItemStillHasConsumables
-     */
-    static function run(Manufacturer $manufacturer): bool
-    {
-        $manufacturer->loadCount([
-            'assets as assets_count',
-            'accessories as accessories_count',
-            'consumables as consumables_count',
-            'components as components_count',
-            'licenses as licenses_count',
-        ]);
-
-        if ($manufacturer->assets_count > 0) {
-            throw new ItemStillHasAssets($manufacturer);
-        }
-        if ($manufacturer->accessories_count > 0) {
-            throw new ItemStillHasAccessories($manufacturer);
-        }
-        if ($manufacturer->consumables_count > 0) {
-            throw new ItemStillHasConsumables($manufacturer);
-        }
-        if ($manufacturer->components_count > 0) {
-            throw new ItemStillHasComponents($manufacturer);
-        }
-        if ($manufacturer->licenses_count > 0) {
-            throw new ItemStillHasLicenses($manufacturer);
-        }
-
-        if ($manufacturer->image) {
-            try {
-                Storage::disk('public')->delete('manufacturers/'.$manufacturer->image);
-            } catch (\Exception $e) {
-                Log::info($e);
-            }
-        }
-
-        $manufacturer->delete();
-        //dd($manufacturer);
-
-        return true;
-    }
-
-}

app/Actions/Suppliers/DestroySupplierAction.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Actions\Suppliers;
-
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Models\Supplier;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasMaintenances;
-use App\Exceptions\ItemStillHasLicenses;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-
-class DestroySupplierAction
-{
-    /**
-     *
-     * @throws ItemStillHasLicenses
-     * @throws ItemStillHasAssets
-     * @throws ItemStillHasMaintenances
-     * @throws ItemStillHasAccessories
-     * @throws ItemStillHasConsumables
-     * @throws ItemStillHasComponents
-     */
-    static function run(Supplier $supplier): bool
-    {
-        $supplier->loadCount([
-            'maintenances as maintenances_count',
-            'assets as assets_count',
-            'licenses as licenses_count',
-            'accessories as accessories_count',
-            'consumables as consumables_count',
-            'components as components_count',
-        ]);
-        if ($supplier->assets_count > 0) {
-            throw new ItemStillHasAssets($supplier);
-        }
-
-        if ($supplier->maintenances_count > 0) {
-            throw new ItemStillHasMaintenances($supplier);
-        }
-
-        if ($supplier->licenses_count > 0) {
-            throw new ItemStillHasLicenses($supplier);
-        }
-
-        if ($supplier->accessories_count > 0) {
-            throw new ItemStillHasAccessories($supplier);
-        }
-
-        if ($supplier->consumables_count > 0) {
-            throw new ItemStillHasConsumables($supplier);
-        }
-
-        if ($supplier->components_count > 0) {
-            throw new ItemStillHasComponents($supplier);
-        }
-
-        if ($supplier->image) {
-            try {
-                Storage::disk('public')->delete('suppliers/'.$supplier->image);
-            } catch (\Exception $e) {
-                Log::info($e->getMessage());
-            }
-        }
-
-        $supplier->delete();
-
-        return true;
-    }
-}

app/Console/Commands/CleanIncorrectCheckoutAcceptances.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CheckoutAcceptance;
-use App\Models\LicenseSeat;
-use App\Models\User;
-use Illuminate\Console\Command;
-
-class CleanIncorrectCheckoutAcceptances extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:clean-checkout-acceptances';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = "Delete checkout acceptances for checkouts to non-users";
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $deletions = 0;
-        $skips = 0;
-
-        // This walks *every* checkoutacceptance. That's gnarly. But necessary
-        $this->withProgressBar(CheckoutAcceptance::all(), function ($checkoutAcceptance) use (&$deletions, &$skips) {
-            $item = $checkoutAcceptance->checkoutable;
-            $checkout_to_id = $checkoutAcceptance->assigned_to_id;
-            if(is_null($item)) {
-                $this->info("'Checkoutable' Item is null, going to next record");
-                return; //'false' allegedly breaks execution entirely, so 'true' maybe doesn't? hrm. just straight return maybe?
-            }
-            if(get_class($item) == LicenseSeat::class) {
-                $item = $item->license;
-            }
-            foreach($item->assetlog()->where('action_type','checkout')->get() as $assetlog) {
-                if ($assetlog->target_id == $checkout_to_id && $assetlog->target_type != User::class) {
-                    //We have a checkout-to an ID for a non-User, which matches to an ID in the checkout_acceptances table
-
-                    //now, let's compare the _times_ - are they close?
-                    //I'm picking `created_at` over `action_date` because I'm more interested in when the actionlogs
-                    //were _created_, not when they were alleged to have happened - those created_at times need to be within 'X' seconds of
-                    //each other (currently 5)
-                    if ($assetlog->created_at->diffInSeconds($checkoutAcceptance->created_at, true) <= 5) { //we're allowing for five _ish_ seconds of slop
-                        $deletions++;
-                        $checkoutAcceptance->forceDelete(); // HARD delete this record; it should have never been
-                        return;
-                    } else {
-                        //$this->info("The two records are too far apart");
-                    }
-                } else {
-                    //$this->info("No match! checkout to id: " . $checkout_to_id." target_id: ".$assetlog->target_id." target_type: ".$assetlog->target_type);
-                }
-            }
-            $skips++;
-        });
-        $this->error("Final deletion count: $deletions, and skip count: $skips");
-    }
-}

app/Console/Commands/CleanOldCheckoutRequests.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CheckoutRequest;
-use Illuminate\Console\Command;
-
-class CleanOldCheckoutRequests extends Command
-{
-    private int $deletions = 0;
-    private int $skips = 0;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:clean-old-checkout-requests';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Removes checkout requests that reference deleted assets or users.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $requests = CheckoutRequest::with([
-            'user' => function ($query) {
-                $query->withTrashed();
-            },
-            'requestedItem' => function ($query) {
-                $query->withTrashed();
-            },
-        ])->get();
-
-        $this->info("Processing {$requests->count()} checkout requests");
-
-        $this->withProgressBar($requests, function ($request) {
-            if ($this->shouldForceDelete($request)) {
-                $request->forceDelete();
-                $this->deletions++;
-                return;
-            }
-
-            if ($this->shouldSoftDelete($request)) {
-                $request->delete();
-                $this->deletions++;
-                return;
-            }
-
-            $this->skips++;
-        });
-
-        $this->info("Final deletion count: $this->deletions, and skip count: $this->skips");
-
-        return 0;
-    }
-
-    private function shouldForceDelete(CheckoutRequest $request)
-    {
-        // check if the requestable or user relationship is null
-        return !$request->requestable || !$request->user;
-    }
-
-    private function shouldSoftDelete(CheckoutRequest $request)
-    {
-        return $request->requestable->trashed() || $request->user->trashed();
-    }
-}

app/Console/Commands/LdapSync.php

@@ -55,8 +55,6 @@ class LdapSync extends Command
         ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
         ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
 
-
-        // Map the LDAP attributes to the Snipe-IT user fields.
         $ldap_map = [
             "username" => Setting::getSettings()->ldap_username_field,
             "last_name" => Setting::getSettings()->ldap_lname_field,
@@ -65,17 +63,11 @@ class LdapSync extends Command
             "emp_num" => Setting::getSettings()->ldap_emp_num,
             "email" => Setting::getSettings()->ldap_email,
             "phone" => Setting::getSettings()->ldap_phone_field,
-            "mobile" => Setting::getSettings()->ldap_mobile,
             "jobtitle" => Setting::getSettings()->ldap_jobtitle,
-            "address" => Setting::getSettings()->ldap_address,
-            "city" => Setting::getSettings()->ldap_city,
-            "state" => Setting::getSettings()->ldap_state,
-            "zip" => Setting::getSettings()->ldap_zip,
             "country" => Setting::getSettings()->ldap_country,
             "location" => Setting::getSettings()->ldap_location,
             "dept" => Setting::getSettings()->ldap_dept,
             "manager" => Setting::getSettings()->ldap_manager,
-            "display_name" => Setting::getSettings()->ldap_display_name,
         ];
 
         $ldap_default_group = Setting::getSettings()->ldap_default_group;
@@ -190,7 +182,7 @@ class LdapSync extends Command
             // Inject location information fields
             for ($i = 0; $i < $results['count']; $i++) {
                 $results[$i]['ldap_location_override'] = false;
-                $results[$i]['location_id'] = null;
+                $results[$i]['location_id'] = 0;
             }
 
             // Grab subsets based on location-specific DNs, and overwrite location for these users.
@@ -242,11 +234,9 @@ class LdapSync extends Command
         }
 
 
-        // Assign the mapped LDAP attributes for each user to the Snipe-IT user fields
         for ($i = 0; $i < $results['count']; $i++) {
             $item = [];
             $item['username'] = $results[$i][$ldap_map["username"]][0] ?? '';
-            $item['display_name'] = $results[$i][$ldap_map["display_name"]][0] ?? '';
             $item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? '';
             $item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? '';
             $item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? '';
@@ -254,13 +244,8 @@ class LdapSync extends Command
             $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
             $item['location_id'] = $results[$i]['location_id'] ?? '';
             $item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? '';
-            $item['mobile'] = $results[$i][$ldap_map["mobile"]][0] ?? '';
             $item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? '';
-            $item['address'] = $results[$i][$ldap_map["address"]][0] ?? '';
-            $item['city'] = $results[$i][$ldap_map["city"]][0] ?? '';
-            $item['state'] = $results[$i][$ldap_map["state"]][0] ?? '';
             $item['country'] = $results[$i][$ldap_map["country"]][0] ?? '';
-            $item['zip'] = $results[$i][$ldap_map["zip"]][0] ?? '';
             $item['department'] = $results[$i][$ldap_map["dept"]][0] ?? '';
             $item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? '';
             $item['location'] = $results[$i][$ldap_map["location"]][0] ?? '';
@@ -293,9 +278,6 @@ class LdapSync extends Command
             if($ldap_map["username"]  != null){
                 $user->username = $item['username'];
             }
-            if($ldap_map["display_name"]  != null){
-                $user->display_name = $item['display_name'];
-            }
             if($ldap_map["last_name"] != null){
                 $user->last_name = $item['lastname'];
             }
@@ -311,27 +293,12 @@ class LdapSync extends Command
             if($ldap_map["phone"] != null){
                 $user->phone = $item['telephone'];
             }
-            if($ldap_map["mobile"] != null){
-                $user->mobile = $item['mobile'];
-            }
             if($ldap_map["jobtitle"] != null){
                 $user->jobtitle = $item['jobtitle'];
             }
-            if($ldap_map["address"] != null){
-                $user->address = $item['address'];
-            }
-            if($ldap_map["city"] != null){
-                $user->city = $item['city'];
-            }
-            if($ldap_map["state"] != null){
-                $user->state = $item['state'];
-            }
             if($ldap_map["country"] != null){
                 $user->country = $item['country'];
             }
-            if($ldap_map["zip"] != null){
-                $user->zip = $item['zip'];
-            }
             if($ldap_map["dept"]  != null){
                 $user->department_id = $department->id;
             }

app/Console/Commands/LdapTroubleshooter.php

@@ -6,7 +6,6 @@ use Illuminate\Console\Command;
 use App\Models\Setting;
 use Exception;
 use Illuminate\Support\Facades\Crypt;
-use App\Models\Ldap;
 
 /**
  * Check if a given ip is in a network
@@ -161,15 +160,7 @@ class LdapTroubleshooter extends Command
             $output[] = "-x";
             $output[] = "-b ".escapeshellarg($settings->ldap_basedn);
             $output[] = "-D ".escapeshellarg($settings->ldap_uname);
-
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-
-            $output[] = "-w ". escapeshellarg($w);
+            $output[] = "-w ".escapeshellarg(Crypt::Decrypt($settings->ldap_pword));
             $output[] = escapeshellarg(parenthesized_filter($settings->ldap_filter));
             if($settings->ldap_tls) {
                 $this->line("# adding STARTTLS option");
@@ -180,23 +171,6 @@ class LdapTroubleshooter extends Command
             $this->line(implode(" \\\n",$output));
             exit(0);
         }
-
-        //PHP Version check for warning
-        $php_version = phpversion();
-        list($major, $minor, $patch) = explode('.', $php_version);
-        if (
-            $major < 8 ||
-            ($major == 8 && $minor < 3) ||
-            ($major == 8 && $minor == 3 && $patch < 21) ||
-            ($major == 8 && $minor == 4 && $patch < 7)
-        ) {
-            $this->warn("PHP Version: $php_version WARNING - Versions before 8.3.21 or 8.4.7 will return INCONSISTENT results!");
-            if (!$this->confirm("Are you sure you wish to continue?")) {
-                $this->warn("ABORTING");
-                exit(-1);
-            }
-        }
-
         if(!$this->option('force')) {
             $confirmation = $this->confirm('WARNING: This command will make several attempts to connect to your LDAP server. Are you sure this is ok?');
             if(!$confirmation) {
@@ -205,7 +179,7 @@ class LdapTroubleshooter extends Command
             }
         }
         //$this->line(print_r($settings,true));
-        $this->line("STAGE 1: Checking settings");
+        $this->info("STAGE 1: Checking settings");
         if(!$settings->ldap_enabled) {
             $this->error("WARNING: Snipe-IT's LDAP setting is not turned on. (That may be OK if you're still trying to figure out settings)");
         }
@@ -236,40 +210,32 @@ class LdapTroubleshooter extends Command
             $this->info("Determined LDAP hostname to be: ".$parsed['host']);
         }
 
+        $this->info("Performing DNS lookup of: ".$parsed['host']);
+        $ips = dns_get_record($parsed['host']);
         $raw_ips = [];
 
-        if (inet_pton($parsed['host']) !== false) {
-            $this->line($parsed['host'] . " already looks like an address; skipping DNS lookup");
-            $raw_ips[] = $parsed['host'];
-        } else {
-            $this->line("Performing DNS lookup of: " . $parsed['host']);
-            $ips = dns_get_record($parsed['host']);
+        //$this->info("Host IP is: ".print_r($ips,true));
 
-            //$this->info("Host IP is: ".print_r($ips,true));
-
-            if (!$ips || count($ips) == 0) {
-                $this->error("ERROR: DNS lookup of host: " . $parsed['host'] . " has failed. ABORTING.");
-                exit(-1);
-            }
-            $this->debugout("IP's? " . print_r($ips, true));
-            foreach ($ips as $ip) {
-                if (!isset($ip['ip'])) {
-                    continue;
-                }
-                $raw_ips[] = $ip['ip'];
-            }
+        if(!$ips || count($ips) == 0) {
+            $this->error("ERROR: DNS lookup of host: ".$parsed['host']." has failed. ABORTING.");
+            exit(-1);
         }
-        foreach ($raw_ips as $ip) {
-            if ($ip == "127.0.0.1") {
+        $this->debugout("IP's? ".print_r($ips,true));
+        foreach($ips as $ip) {
+            if(!isset($ip['ip'])) {
+                continue;
+            }
+            $raw_ips[]=$ip['ip'];
+            if($ip['ip'] == "127.0.0.1") {
                 $this->error("WARNING: Using the localhost IP as the LDAP server. This is usually wrong");
             }
-            if (ip_in_range($ip, '10.0.0.0/8') || ip_in_range($ip, '192.168.0.0/16') || ip_in_range($ip, '172.16.0.0/12')) {
+            if(ip_in_range($ip['ip'],'10.0.0.0/8') || ip_in_range($ip['ip'],'192.168.0.0/16') || ip_in_range($ip['ip'], '172.16.0.0/12')) {
                 $this->error("WARNING: Using an RFC1918 Private address for LDAP server. This may be correct, but it can be a problem if your Snipe-IT instance is not hosted on your private network");
             }
         }
 
-        $this->line("STAGE 2: Checking basic network connectivity");
-        $ports = [636, 389];
+        $this->info("STAGE 2: Checking basic network connectivity");
+        $ports = [389,636];
         if(@$parsed['port'] && !in_array($parsed['port'],$ports)) {
             $ports[] = $parsed['port'];
         }
@@ -280,7 +246,7 @@ class LdapTroubleshooter extends Command
             $errstr = '';
             $timeout = 30.0;
             $result = '';
-            $this->line("Attempting to connect to port: " . $port . " - may take up to $timeout seconds");
+            $this->info("Attempting to connect to port: ".$port." - may take up to $timeout seconds");
             try {
                 $result = fsockopen($parsed['host'], $port, $errno, $errstr, 30.0);
             } catch(Exception $e) {
@@ -299,9 +265,9 @@ class LdapTroubleshooter extends Command
             exit(-1);
         }
 
-        $this->line("STAGE 3: Determine encryption algorithm, if any");
+        $this->info("STAGE 3: Determine encryption algorithm, if any");
 
-        $ldap_urls = []; // [url, cert-check?, start_tls?]
+        $ldap_urls = [];
         $pretty_ldap_urls = [];
         foreach($open_ports as $port) {
             $this->line("Trying TLS first for port $port");
@@ -309,46 +275,35 @@ class LdapTroubleshooter extends Command
             if($this->test_anonymous_bind($ldap_url)) {
                 $this->info("Anonymous bind succesful to $ldap_url!");
                 $ldap_urls[] = [ $ldap_url, true, false ];
-                $pretty_ldap_urls[] = [$ldap_url, "enabled", "n/a (no)"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
                 continue; // TODO - lots of copypasta in these if(test_anonymous_bind()) routines...
             } else {
                 $this->error("WARNING: Failed to bind to $ldap_url - trying without certificate checks.");
             }
 
             if($this->test_anonymous_bind($ldap_url, false)) {
-                $this->info("Anonymous bind successful to $ldap_url with certificate-checks disabled");
-                $ldap_urls[] = [$ldap_url, false, false];
-                $pretty_ldap_urls[] = [$ldap_url, "DISABLED", "n/a (no)"];
+                $this->info("Anonymous bind succesful to $ldap_url with certifcate-checks disabled");
+                $ldap_urls[] = [ $ldap_url, false, false ]; 
+                $pretty_ldap_urls[] = [ $ldap_url, "no", "no" ]; 
                 continue;
             } else {
                 $this->error("WARNING: Failed to bind to $ldap_url with certificate checks disabled. Trying unencrypted with STARTTLS");
             }
 
-            // now switching to ldap:// URL's from ldaps://
             $ldap_url = "ldap://".$parsed['host'].":$port";
-
             if($this->test_anonymous_bind($ldap_url, true, true)) {
                 $this->info("Plain connection to $ldap_url with STARTTLS succesful!");
                 $ldap_urls[] = [ $ldap_url, true, true ];
-                $pretty_ldap_urls[] = [$ldap_url, "enabled", "STARTTLS ENABLED"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "YES" ];
                 continue;
             } else {
-                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled. Trying without certificate checks.");
-            }
-
-            if ($this->test_anonymous_bind($ldap_url, false, true)) {
-                $this->info("Plain connection to $ldap_url with STARTTLS and cert checks *disabled* successful!");
-                $ldap_urls[] = [$ldap_url, false, true];
-                $pretty_ldap_urls[] = [$ldap_url, "DISABLED", "STARTTLS ENABLED"];
-                continue;
-            } else {
-                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled, and cert checks disabled. Trying without STARTTLS");
+                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled. Trying without STARTTLS");
             }
 
             if($this->test_anonymous_bind($ldap_url)) {
                 $this->info("Plain connection to $ldap_url succesful!");
                 $ldap_urls[] = [ $ldap_url, true, false ];
-                $pretty_ldap_urls[] = [$ldap_url, "n/a", "starttls disabled"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
                 continue;
             } else {
                 $this->error("WARNING: Failed to bind to $ldap_url. Giving up on port $port");
@@ -358,29 +313,23 @@ class LdapTroubleshooter extends Command
         $this->debugout(print_r($ldap_urls,true));
 
         if(count($ldap_urls) > 0 ) {
-            $this->debugout("Found working LDAP URL's: ");
+            $this->info("Found working LDAP URL's: ");
             foreach($ldap_urls as $ldap_url) { // TODO maybe do this as a $this->table() instead?
-                $this->debugout("LDAP URL: " . $ldap_url[0]);
-                $this->debugout($ldap_url[0] . ($ldap_url[1] ? " certificate checks enabled" : " certificate checks disabled") . ($ldap_url[2] ? " STARTTLS Enabled " : " STARTTLS Disabled"));
+                $this->info("LDAP URL: ".$ldap_url[0]);
+                $this->info($ldap_url[0]. ($ldap_url[1] ? " certificate checks enabled" : " certificate checks disabled"). ($ldap_url[2] ? " STARTTLS Enabled ": " STARTTLS Disabled"));
             }
-            $this->table(["URL", "Cert Checks?", "STARTTLS?"], $pretty_ldap_urls);
+            $this->table(["URL", "Cert Checks Enabled?", "STARTTLS Enabled?"],$pretty_ldap_urls);
         } else {
             $this->error("ERROR - no valid LDAP URL's available - ABORTING");
             exit(1);
         }
 
-        $this->line("STAGE 4: Test Administrative Bind for LDAP Sync");
+        $this->info("STAGE 4: Test Administrative Bind for LDAP Sync");
         foreach($ldap_urls AS $ldap_url) {
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-            $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $settings->ldap_uname, $w);
+            $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $settings->ldap_uname, Crypt::decrypt($settings->ldap_pword));
         }
 
-        $this->line("STAGE 5: Test BaseDN");
+        $this->info("STAGE 5: Test BaseDN");
         //grab all LDAP_ constants and fill up a reversed array mapping from weird LDAP dotted-strings to (Constant Name)
         $all_defined_constants = get_defined_constants();
         $ldap_constants = [];
@@ -392,23 +341,16 @@ class LdapTroubleshooter extends Command
         $this->debugout("LDAP constants are: ".print_r($ldap_constants,true));
 
         foreach($ldap_urls AS $ldap_url) {
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-
-            if($this->test_informational_bind($ldap_url[0],$ldap_url[1],$ldap_url[2],$settings->ldap_uname,$w,$settings)) {
+            if($this->test_informational_bind($ldap_url[0],$ldap_url[1],$ldap_url[2],$settings->ldap_uname,Crypt::decrypt($settings->ldap_pword),$settings)) {
                 $this->info("Success getting informational bind!");
             } else {
                 $this->error("Unable to get information from bind.");
             }
         }
 
-        $this->line("STAGE 6: Test LDAP Login to Snipe-IT");
+        $this->info("STAGE 6: Test LDAP Login to Snipe-IT");
         foreach($ldap_urls AS $ldap_url) {
-            $this->line("Starting auth to " . $ldap_url[0]);
+            $this->info("Starting auth to ".$ldap_url[0]);
             while(true) {
                 $with_tls = $ldap_url[1] ? "with": "without";
                 $with_startssl = $ldap_url[2] ? "using": "not using";
@@ -417,12 +359,7 @@ class LdapTroubleshooter extends Command
                 }
                 $username = $this->ask("Username");
                 $password = $this->secret("Password");
-                $results = $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $username, $password); // FIXME - should do some other stuff here, maybe with the concatenating or something? maybe? and/or should put up some results?
-                if ($results) {
-                    $this->info("Success authenticating with " . $username);
-                } else {
-                    $this->error("Unable to authenticate with " . $username);
-                }
+                $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $username, $password); // FIXME - should do some other stuff here, maybe with the concatenating or something? maybe? and/or should put up some results?
             }
         }
 
@@ -431,17 +368,14 @@ class LdapTroubleshooter extends Command
 
     public function connect_to_ldap($ldap_url, $check_cert, $start_tls) 
     {
-        if ($check_cert) {
-            $this->line("we *ARE* checking certs");
-            Ldap::ignoreCertificates(false);
-
-        } else {
-            $this->line("we are IGNORING certs");
-            Ldap::ignoreCertificates(true);
-        }
         $lconn = ldap_connect($ldap_url);
         ldap_set_option($lconn, LDAP_OPT_PROTOCOL_VERSION, 3); // should we 'test' different protocol versions here? Does anyone even use anything other than LDAPv3?
                                                              // no - it's formally deprecated: https://tools.ietf.org/html/rfc3494
+        if(!$check_cert) {
+            putenv('LDAPTLS_REQCERT=never'); // This is horrible; is this *really* the only way to do it?
+        } else {
+            putenv('LDAPTLS_REQCERT'); // have to very explicitly and manually *UN* set the env var here to ensure it works
+        }
         if($this->settings->ldap_client_tls_cert && $this->settings->ldap_client_tls_key) {
             // client-side TLS certificate support for LDAP (Google Secure LDAP)
             putenv('LDAPTLS_CERT=storage/ldap_client_tls.cert');
@@ -470,10 +404,9 @@ class LdapTroubleshooter extends Command
         return $this->timed_boolean_execute(function () use ($ldap_url, $check_cert , $start_tls) {
             try {
                 $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
-                $this->line("Attempting to bind now, this can take a while if we mess it up");
+                $this->info("gonna try to bind now, this can take a while if we mess it up");
                 $bind_results = ldap_bind($lconn);
-                $this->line("Bind results are: " . $bind_results . " which translate into boolean: " . (bool)$bind_results);
-                ldap_close($lconn);
+                $this->info("Bind results are: ".$bind_results." which translate into boolean: ".(bool)$bind_results);
                 return (bool)$bind_results;
             } catch (Exception $e) {
                 $this->error("WARNING: Exception caught during bind - ".$e->getMessage());
@@ -488,7 +421,6 @@ class LdapTroubleshooter extends Command
             try {
                 $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
                 $bind_results = ldap_bind($lconn, $username, $password);
-                ldap_close($lconn);
                 if(!$bind_results) {
                     $this->error("WARNING: Failed to bind to $ldap_url as $username");
                     return false;
@@ -514,62 +446,22 @@ class LdapTroubleshooter extends Command
                     return false;
                 }
                 $this->info("SUCCESS - Able to bind to $ldap_url as $username");
-                $cleaned_results = [];
-                try {
-                    // This _may_ only work for Active Directory?
-                    $result = ldap_read($conn, '', '(objectClass=*)'/* , ['supportedControl']*/);
-                    $results = ldap_get_entries($conn, $result);
-                    $cleaned_results = $this->ldap_results_cleaner($results);
-                    //$this->line(print_r($cleaned_results,true));
-                    $default_naming_contexts = $cleaned_results[0]['namingcontexts'];
-                    $this->info("Default Naming Contexts:");
-                    $this->info(implode(", ", $default_naming_contexts));
-                    //okay, great - now how do we display those results? I have no idea.
-                } catch (\Exception $e) {
-                    $this->error("Unable to get base naming contexts - here's what we *did* get:");
-                    $this->line(print_r($cleaned_results, true));
-                }
+                $result = ldap_read($conn, '', '(objectClass=*)'/* , ['supportedControl']*/);
+                $results = ldap_get_entries($conn, $result);
+                $cleaned_results = $this->ldap_results_cleaner($results);
+                $this->line(print_r($cleaned_results,true));
+                //okay, great - now how do we display those results? I have no idea.
                 // I don't see why this throws an Exception for Google LDAP, but I guess we ought to try and catch it?
-                $this->debugout("I guess we're trying to do the ldap search here, but sometimes it takes too long?");
+                $this->comment("I guess we're trying to do the ldap search here, but sometimes it takes too long?");
                 $this->debugout("Base DN is: ".$settings->ldap_basedn." and filter is: ".parenthesized_filter($settings->ldap_filter));
                 $search_results = ldap_search($conn, $settings->ldap_basedn, parenthesized_filter($settings->ldap_filter));
-                $entries = ldap_get_entries($conn, $search_results);
                 $this->info("Printing first 10 results: ");
-                $pretty_data = array_slice($this->ldap_results_cleaner($entries), 0, 10);
-                //print_r($data);
-                $headers = [];
-                foreach ($pretty_data as $row) {
-                    //populate headers
-                    foreach ($row as $key => $value) {
-                        //skip objectsid and objectguid because it junks up output
-                        if ($key == "objectsid" || $key == "objectguid") {
-                            continue;
-                        }
-                        if (!in_array($key, $headers)) {
-                            $headers[] = $key;
-                        }
-                    }
+                for($i=0;$i<10;$i++) {
+                    $this->info($search_results[$i]);
                 }
-                $table = [];
-                //repeat again to populate table
-                foreach ($pretty_data as $row) {
-                    $newrow = [];
-                    foreach ($headers as $header) {
-                        if (is_array(@$row[$header])) {
-                            $newrow[] = "[" . implode(", ", $row[$header]) . "]";
-                        } else {
-                            $newrow[] = @$row[$header];
-                        }
-                    }
-                    $table[] = $newrow;
-                }
-
-                $this->table($headers, $table);
             } catch (\Exception $e) {
                 $this->error("WARNING: Exception caught during Authed bind to $username - ".$e->getMessage());
                 return false;
-            } finally {
-                ldap_close($conn);
             }
         });
     }
@@ -585,7 +477,7 @@ class LdapTroubleshooter extends Command
     {
         if(!(function_exists('pcntl_sigtimedwait') && function_exists('posix_getpid') && function_exists('pcntl_fork') && function_exists('posix_kill') && function_exists('pcntl_wifsignaled'))) {
             // POSIX functions needed for forking aren't present, just run the function inline (ignoring timeout)
-            $this->line('WARNING: Unable to execute POSIX fork() commands, timeout may not be respected');
+            $this->info('WARNING: Unable to execute POSIX fork() commands, timeout may not be respected');
             return $function();
         } else {
             $parent_pid = posix_getpid();
@@ -622,6 +514,4 @@ class LdapTroubleshooter extends Command
         }
 
     }
-
-
 }

app/Console/Commands/MoveUploadsToNewDisk.php

@@ -96,7 +96,7 @@ class MoveUploadsToNewDisk extends Command
         $private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*");
         $private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*");
         $private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*");
-        $private_uploads['assetmodels'] = glob('storage/private_uploads/models'."/*.*");
+        $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*");
         $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
         $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
         $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");

app/Console/Commands/ObjectImportCommand.php

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

app/Console/Commands/PaveIt.php

@@ -4,7 +4,7 @@ namespace App\Console\Commands;
 
 use App\Models\Asset;
 use App\Models\CustomField;
-use Illuminate\Support\Facades\Schema;
+use Schema;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;
 
@@ -59,9 +59,6 @@ class PaveIt extends Command
             'migrations',
             'settings',
             'users',
-            'telescope_entries',
-            'telescope_entries_tags',
-            'telescope_monitoring',
         ];
 
         // We only need to find out what these are so we can nuke these columns on the assets table.
@@ -69,8 +66,8 @@ class PaveIt extends Command
         foreach ($custom_fields as $custom_field) {
             $this->info('DROP the '.$custom_field->db_column.' column from assets as well.');
 
-            if (Schema::hasColumn('assets', $custom_field->db_column)) {
-                Schema::table('assets', function ($table) use ($custom_field) {
+            if (\Schema::hasColumn('assets', $custom_field->db_column)) {
+                \Schema::table('assets', function ($table) use ($custom_field) {
                     $table->dropColumn($custom_field->db_column);
                 });
             }
@@ -87,8 +84,8 @@ class PaveIt extends Command
         }
 
         // Leave in the demo oauth keys so we don't have to reset them every day in the demos
-        DB::statement('delete from oauth_clients WHERE id > 2');
-        DB::statement('delete from oauth_access_tokens WHERE user_id > 2');
+        \DB::statement('delete from oauth_clients WHERE id > 2');
+        \DB::statement('delete from oauth_access_tokens WHERE id > 2');
     
     }
 }

app/Console/Commands/Purge.php

@@ -62,19 +62,19 @@ class Purge extends Command
             $assetcount = $assets->count();
             $this->info($assets->count().' assets purged.');
             $asset_assoc = 0;
-            $maintenances = 0;
+            $asset_maintenances = 0;
 
             foreach ($assets as $asset) {
-                $this->info('- Asset "'.$asset->display_name.'" deleted.');
+                $this->info('- Asset "'.$asset->present()->name().'" deleted.');
                 $asset_assoc += $asset->assetlog()->count();
                 $asset->assetlog()->forceDelete();
-                $maintenances += $asset->maintenances()->count();
-                $asset->maintenances()->forceDelete();
+                $asset_maintenances += $asset->assetmaintenances()->count();
+                $asset->assetmaintenances()->forceDelete();
                 $asset->forceDelete();
             }
 
             $this->info($asset_assoc.' corresponding log records purged.');
-            $this->info($maintenances.' corresponding maintenance records purged.');
+            $this->info($asset_maintenances.' corresponding maintenance records purged.');
 
             $locations = Location::whereNotNull('deleted_at')->withTrashed()->get();
             $this->info($locations->count().' locations purged.');

app/Console/Commands/RemoveInvalidUploadDeleteActionLogItems.php

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

app/Console/Commands/RestoreFromBackup.php

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

app/Console/Commands/SendAcceptanceReminder.php

@@ -3,18 +3,13 @@
 namespace App\Console\Commands;
 
 use App\Mail\UnacceptedAssetReminderMail;
-use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CurrentInventory;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Facades\Mail;
 
 class SendAcceptanceReminder extends Command
@@ -31,7 +26,7 @@ class SendAcceptanceReminder extends Command
      *
      * @var string
      */
-    protected $description = 'This will resend users with unaccepted items a reminder to accept or decline them.';
+    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
 
     /**
      * Create a new command instance.
@@ -50,30 +45,19 @@ class SendAcceptanceReminder extends Command
      */
     public function handle()
     {
-        $pending = CheckoutAcceptance::query()
-            ->with([
-                'checkoutable' => function (MorphTo $morph) {
-                    $morph->morphWith([
-                        Asset::class       => ['model.category', 'assignedTo', 'adminuser', 'company', 'checkouts'],
-                        Accessory::class   => ['category', 'company', 'checkouts'],
-                        LicenseSeat::class => ['user', 'license', 'checkouts'],
-                        Component::class   => ['assignedTo', 'company', 'checkouts'],
-                        Consumable::class  => ['company', 'checkouts'],
-                    ]);
-                },
-                'assignedTo',
-            ])
-            ->whereHasMorph(
-                'checkoutable',
-                [Asset::class, Accessory::class, LicenseSeat::class, Component::class, Consumable::class],
-                fn ($q) => $q->whereNull('accepted_at')
-                    ->whereNull('declined_at')
-            )
-            ->pending()
-            ->get();
+        $pending = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')
+                                                ->whereHas('checkoutable', function($query) {
+                                                    $query->where('accepted_at', null)
+                                                          ->where('declined_at', null);
+                                                })
+                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.adminuser'])
+                                                ->get();
 
         $count = 0;
         $unacceptedAssetGroups = $pending
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            })
             ->map(function($acceptance) {
                 return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
             })
@@ -93,7 +77,7 @@ class SendAcceptanceReminder extends Command
             if(!$email){
                 $no_email_list[] = [
                     'id' => $acceptance->assignedTo?->id,
-                    'name' => $acceptance->assignedTo?->display_name,
+                    'name' => $acceptance->assignedTo?->present()->fullName(),
                 ];
             } else {
                 $count++;

app/Console/Commands/SendExpirationAlerts.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands;
 
-use App\Helpers\Helper;
 use App\Mail\ExpiringAssetsMail;
 use App\Mail\ExpiringLicenseMail;
 use App\Models\Asset;
@@ -53,73 +52,19 @@ class SendExpirationAlerts extends Command
                 ->filter(fn($item) => !empty($item))
                 ->all();
             // Expiring Assets
-            $assets = Asset::getExpiringWarrantyOrEol($alert_interval);
+            $assets = Asset::getExpiringWarrantee($alert_interval);
 
             if ($assets->count() > 0) {
-
+                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $alert_interval]));
                 Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));
-
-                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('admin/hardware/form.tag'),
-                        trans('admin/hardware/form.model'),
-                        trans('general.model_no'),
-                        trans('general.purchase_date'),
-                        trans('admin/hardware/form.eol_rate'),
-                        trans('admin/hardware/form.eol_date'),
-                        trans('admin/hardware/form.warranty_expires'),
-                    ],
-                    $assets->map(fn($item) =>
-                    [
-                        trans('general.id')  => $item->id,
-                        trans('admin/hardware/form.tag') => $item->asset_tag,
-                        trans('admin/hardware/form.model') => $item->model->name,
-                        trans('general.model_no') => $item->model->model_number,
-                        trans('general.purchase_date') => $item->purchase_date_formatted,
-                        trans('admin/hardware/form.eol_rate')  => $item->model->eol,
-                        trans('admin/hardware/form.eol_date') => $item->eol_date ? $item->eol_formatted_date .' ('.$item->eol_diff_for_humans.')' : '',
-                        trans('admin/hardware/form.warranty_expires') => $item->warranty_expires ? $item->warranty_expires_formatted_date .' ('.$item->warranty_expires_diff_for_humans.')' : '',
-                   ])
-                   );
             }
 
             // Expiring licenses
-            $licenses = License::query()->ExpiringLicenses($alert_interval)
-                ->with('manufacturer','category')
-                ->orderBy('expiration_date', 'ASC')
-                ->orderBy('termination_date', 'ASC')
-                ->get();
+            $licenses = License::getExpiringLicenses($alert_interval);
             if ($licenses->count() > 0) {
+                $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $alert_interval]));
                 Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));
-
-                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('general.name'),
-                        trans('general.purchase_date'),
-                        trans('admin/licenses/form.expiration'),
-                        trans('mail.expires'),
-                        trans('admin/licenses/form.termination_date'),
-                        trans('mail.terminates')],
-                    $licenses->map(fn($item) => [
-                        trans('general.id') => $item->id,
-                        trans('general.name') => $item->name,
-                        trans('general.purchase_date') => $item->purchase_date_formatted,
-                        trans('admin/licenses/form.expiration') => $item->expires_formatted_date,
-                        trans('mail.expires') => $item->expires_formatted_date ? $item->expires_diff_for_humans : '',
-                        trans('admin/licenses/form.termination_date') => $item->terminates_formatted_date,
-                        trans('mail.terminates') => $item->terminates_diff_for_humans
-                    ])
-                );
             }
-
-            // Send a message even if the count is 0
-            $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $alert_interval]));
-            $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $alert_interval]));
-
-
-
         } else {
             if ($settings->alert_email == '') {
                 $this->error('Could not send email. No alert email configured in settings');

app/Console/Commands/SendInventoryAlerts.php

@@ -52,9 +52,7 @@ class SendInventoryAlerts extends Command
                     return new AlertRecipient($item);
                 });
 
-                Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
-            } else {
-                $this->info('No low inventory items found. No mail sent.');
+                \Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
             }
         } else {
             if ($settings->alert_email == '') {

app/Console/Commands/SendUpcomingAuditReport.php

@@ -16,7 +16,7 @@ class SendUpcomingAuditReport extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:upcoming-audits {--with-output : Display the results in a table in your console in addition to sending the email}';
+    protected $signature = 'snipeit:upcoming-audits';
 
     /**
      * The console command description.
@@ -47,69 +47,21 @@ class SendUpcomingAuditReport extends Command
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval);
 
-        $assets_query = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->with('supplier');
-        $asset_count = $assets_query->count();
-        $this->info(number_format($asset_count) . ' assets must be audited on or before ' . $interval_date);
-        if (!$this->option('with-output')) {
-            $this->info('Run this command with the --with-output option to see the full list in the console.');
-        }
+        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
+        $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');
 
 
-        if ($asset_count > 0) {
-
-            $assets_for_email = $assets_query->limit(30)->get();
-
+        if ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
             // Send a rollup to the admin, if settings dictate
-            if ($settings->alert_email != '') {
-
-                $recipients = collect(explode(',', $settings->alert_email))
-                    ->map(fn($item) => trim($item))
-                    ->filter(fn($item) => !empty($item))
-                    ->all();
-
-                Mail::to($recipients)->send(new SendUpcomingAuditMail($assets_for_email, $settings->audit_warning_days, $asset_count));
-                $this->info('Audit notification sent to: ' . $settings->alert_email);
-
-            } else {
-                $this->info('There is no admin alert email set so no email will be sent.');
-            }
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item))
+                ->filter(fn($item) => !empty($item))
+                ->all();
 
 
-
-            if ($this->option('with-output')) {
-
-
-                // Get the full list if the user wants output in the console
-                $assets_for_output = $assets_query->limit(null)->get();
-
-                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('general.name'),
-                        trans('general.last_audit'),
-                        trans('general.next_audit_date'),
-                        trans('mail.Days'),
-                        trans('mail.supplier'),
-                        trans('mail.assigned_to'),
-
-                    ],
-                    $assets_for_output->map(fn($item) => [
-                        trans('general.id') => $item->id,
-                        trans('general.name') => $item->display_name,
-                        trans('general.last_audit') => $item->last_audit_formatted_date,
-                        trans('general.next_audit_date') => $item->next_audit_formatted_date,
-                        trans('mail.Days') => round($item->next_audit_diff_in_days),
-                        trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
-                        trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
-                    ])
-                );
-            }
-
-        } else {
-            $this->info('There are no assets due for audit in the next ' . $interval . ' days.');
+            $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
+            Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));
         }
 
-
-
     }
 }

app/Console/Commands/SystemBackup.php

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

app/Enums/ActionType.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Enums;
-enum ActionType: string
-{
-    // General
-    case Create = 'create';
-    case Update = 'update';
-    case Delete = 'delete';
-    case Restore = 'restore';
-
-    // Assets/Accessories/Components/Licenses/Consumables
-    case Checkout = 'checkout';
-    case CheckinFrom = 'checkin from';
-    case Requested = 'requested';
-    case RequestCanceled = 'request canceled';
-    case Accepted = 'accepted';
-    case Declined = 'declined';
-    case Audit = 'audit';
-    case NoteAdded = 'note added';
-
-    // Users
-    case TwoFactorReset = '2FA reset';
-    case Merged = 'merged';
-
-    // Licenses
-    case DeleteSeats = 'delete seats';
-    case AddSeats = 'add seats';
-
-    // File Uploads
-    case Uploaded = 'uploaded';
-    case UploadDeleted = 'upload deleted';
-}

app/Exceptions/Handler.php

@@ -116,35 +116,18 @@ class Handler extends ExceptionHandler
                         return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                     default:
                         return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), $statusCode);
+
                 }
-
             }
-
-            // This handles API validation exceptions that happen at the Form Request level, so they
-            // never even get to the controller where we normally  nicely format JSON responses
-            if ($e instanceof ValidationException) {
-                $response = $this->invalidJson($request, $e);
-                return response()->json(Helper::formatStandardApiResponse('error', null,  $e->errors()), 200);
-            }
-
         }
 
 
         // This is traaaaash but it handles models that are not found while using route model binding :(
         // The only alternative is to set that at *each* route, which is crazypants
         if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
-            $ids = method_exists($e, 'getIds') ? $e->getIds() : [];
-
-            if (in_array('bulkedit', $ids, true)) {
-            $error_array = session()->get('bulk_asset_errors');
-                return redirect()
-                    ->route('hardware.index')
-                    ->withErrors($error_array, 'bulk_asset_errors')
-                    ->withInput();
-            }
 
             // This gets the MVC model name from the exception and formats in a way that's less fugly
-            $model_name = trim(strtolower(implode(" ", preg_split('/(?=[A-Z])/', last(explode('\\', $e->getModel()))))));
+            $model_name = strtolower(implode(" ", preg_split('/(?=[A-Z])/', last(explode('\\', $e->getModel())))));
             $route = str_plural(strtolower(last(explode('\\', $e->getModel())))).'.index';
 
             // Sigh.
@@ -160,7 +143,9 @@ class Handler extends ExceptionHandler
                 $route = 'maintenances.index';
             } elseif ($route === 'licenseseats.index') {
                 $route = 'licenses.index';
-            } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
+            } elseif ($route === 'customfields.index') {
+                $route = 'fields.index';
+            } elseif ($route === 'customfieldsets.index') {
                 $route = 'fields.index';
             }
 

app/Exceptions/ItemStillHasAccessories.php

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

app/Exceptions/ItemStillHasAssetModels.php

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

app/Exceptions/ItemStillHasAssets.php

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

app/Exceptions/ItemStillHasChildren.php

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

app/Exceptions/ItemStillHasComponents.php

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

app/Exceptions/ItemStillHasConsumables.php

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

app/Exceptions/ItemStillHasLicenses.php

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

app/Exceptions/ItemStillHasMaintenances.php

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

app/Helpers/Helper.php

@@ -13,7 +13,6 @@ use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\License;
 use App\Models\Location;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
@@ -95,7 +94,7 @@ class Helper
         $Parsedown->setSafeMode(true);
 
         if ($str) {
-            return $Parsedown->text(strip_tags($str));
+            return $Parsedown->text($str);
         }
     }
 
@@ -105,7 +104,7 @@ class Helper
         $Parsedown->setSafeMode(true);
 
         if ($str) {
-            return $Parsedown->line(strip_tags($str));
+            return $Parsedown->line($str);
         }
     }
 
@@ -435,34 +434,6 @@ class Helper
         return $colors[$index];
     }
 
-    /**
-     * Check if a string has any RTL characters
-     * @param $value
-     * @return bool
-     */
-    public static function hasRtl($string) {
-        $rtlChar = '/[\x{0590}-\x{083F}]|[\x{08A0}-\x{08FF}]|[\x{FB1D}-\x{FDFF}]|[\x{FE70}-\x{FEFF}]/u';
-        return preg_match($rtlChar, $string) != 0;
-    }
-
-    // is chinese, japanese or korean language
-    public static function isCjk($string) {
-        return Helper::isChinese($string) || Helper::isJapanese($string) || Helper::isKorean($string);
-    }
-
-    public static function isChinese($string) {
-        return preg_match("/\p{Han}+/u", $string);
-    }
-
-    public static function isJapanese($string) {
-        return preg_match('/[\x{4E00}-\x{9FBF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}]/u', $string);
-    }
-
-    public static function isKorean($string) {
-        return preg_match('/[\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]/u', $string);
-    }
-
-
     /**
      * Increases or decreases the brightness of a color by a percentage of the current brightness.
      *
@@ -905,48 +876,6 @@ class Helper
         return false;
     }
 
-    /**
-     * Check if the file is a video, so we can show a preview
-     *
-     * @param File $file
-     * @return string | Boolean
-     * @author [B. Wetherington] [<bwetherington@grokability.com>]
-     * @since [v8.1.18]
-     */
-    public static function checkUploadIsVideo($file)
-    {
-        $finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
-        $filetype = @finfo_file($finfo, $file);
-        finfo_close($finfo);
-
-        if (($filetype == 'video/mp4') || ($filetype == 'video/quicktime') || ($filetype == 'video/mpeg') || ($filetype == 'video/ogg') || ($filetype == 'video/webm') || ($filetype == 'video/x-msvide')) {
-            return $filetype;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the file is audio, so we can show a preview
-     *
-     * @param File $file
-     * @return string | Boolean
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.0]
-     */
-    public static function checkUploadIsAudio($file)
-    {
-        $finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
-        $filetype = @finfo_file($finfo, $file);
-        finfo_close($finfo);
-
-        if (($filetype == 'audio/mpeg') || ($filetype == 'audio/ogg')) {
-            return $filetype;
-        }
-
-        return false;
-    }
-
     /**
      * Walks through the permissions in the permissions config file and determines if
      * permissions are granted based on a $selected_arr array.
@@ -1225,42 +1154,22 @@ class Helper
             'webp'   => 'far fa-image',
             'avif'   => 'far fa-image',
             'svg' => 'fas fa-vector-square',
-
             // word
             'doc'   => 'far fa-file-word',
             'docx'   => 'far fa-file-word',
-
             // Excel
             'xls'   => 'far fa-file-excel',
             'xlsx'   => 'far fa-file-excel',
-            'ods'   => 'far fa-file-excel',
-
-            // Presentation
-            'ppt'   => 'far fa-file-powerpoint',
-            'odp'   => 'far fa-file-powerpoint',
-
             // archive
             'zip'   => 'fas fa-file-archive',
             'rar'   => 'fas fa-file-archive',
-
             //Text
-            'odt'   => 'far fa-file-alt',
             'txt'   => 'far fa-file-alt',
             'rtf'   => 'far fa-file-alt',
             'xml'   => 'fas fa-code',
-
             // Misc
             'pdf'   => 'far fa-file-pdf',
             'lic'   => 'far fa-save',
-
-            // video
-            'mov'   => 'fa-solid fa-video',
-            'mp4'   => 'fa-solid fa-video',
-
-            // audio
-            'ogg'   => 'fa-solid fa-file-audio',
-            'mp3'   => 'fa-solid fa-file-audio',
-            'wav'   => 'fa-solid fa-file-audio',
         ];
 
         if ($extension && array_key_exists($extension, $allowedExtensionMap)) {
@@ -1571,59 +1480,68 @@ class Helper
     }
 
 
-    static public function getRedirectOption($request, $id, $table, $item_id = null) : RedirectResponse
+    static public function getRedirectOption($request, $id, $table, $item_id = null)
     {
 
-        $redirect_option = Session::get('redirect_option') ?? $request->redirect_option;
-        $checkout_to_type = Session::get('checkout_to_type') ?? null;
+        $redirect_option = Session::get('redirect_option');
+        $checkout_to_type = Session::get('checkout_to_type');
         $checkedInFrom = Session::get('checkedInFrom');
         $other_redirect = Session::get('other_redirect');
-        $backUrl = Session::pull('back_url', route('home'));
-
-       // return to previous page
-        if ($redirect_option === 'back') {
-            return redirect()->to($backUrl);
-        }
 
         // return to index
         if ($redirect_option == 'index') {
-            return match ($table) {
-                'Assets' => redirect()->route('hardware.index'),
-                'Users' => redirect()->route('users.index'),
-                'Licenses' => redirect()->route('licenses.index'),
-                'Accessories' => redirect()->route('accessories.index'),
-                'Components' => redirect()->route('components.index'),
-                'Consumables' => redirect()->route('consumables.index'),
-            };
+            switch ($table) {
+                case "Assets":
+                    return route('hardware.index');
+                case "Users":
+                    return route('users.index');
+                case "Licenses":
+                    return route('licenses.index');
+                case "Accessories":
+                    return route('accessories.index');
+                case "Components":
+                    return route('components.index');
+                case "Consumables":
+                    return route('consumables.index');
+            }
         }
 
         // return to thing being assigned
         if ($redirect_option == 'item') {
-            return match ($table) {
-                'Assets'      => redirect()->route('hardware.show', $id ?? $item_id),
-                'Users'       => redirect()->route('users.show', $id ?? $item_id),
-                'Licenses'    => redirect()->route('licenses.show', $id ?? $item_id),
-                'Accessories' => redirect()->route('accessories.show', $id ?? $item_id),
-                'Components'  => redirect()->route('components.show', $id ?? $item_id),
-                'Consumables' => redirect()->route('consumables.show', $id ?? $item_id),
-            };
+            switch ($table) {
+                case "Assets":
+                    return route('hardware.show', $id ?? $item_id);
+                case "Users":
+                    return route('users.show', $id ?? $item_id);
+                case "Licenses":
+                    return route('licenses.show', $id ?? $item_id);
+                case "Accessories":
+                    return route('accessories.show', $id ?? $item_id);
+                case "Components":
+                    return route('components.show', $id ?? $item_id);
+                case "Consumables":
+                    return route('consumables.show', $id ?? $item_id);
+            }
         }
 
         // return to assignment target
         if ($redirect_option == 'target') {
-            return match ($checkout_to_type) {
-                'user'     => redirect()->route('users.show', $request->assigned_user ?? $checkedInFrom),
-                'location' => redirect()->route('locations.show', $request->assigned_location ?? $checkedInFrom),
-                'asset'    => redirect()->route('hardware.show', $request->assigned_asset ?? $checkedInFrom),
-            };
+            switch ($checkout_to_type) {
+                case 'user':
+                    return route('users.show', $request->assigned_user ?? $checkedInFrom);
+                case 'location':
+                    return route('locations.show', $request->assigned_location ?? $checkedInFrom);
+                case 'asset':
+                    return route('hardware.show', $request->assigned_asset ?? $checkedInFrom);
+            }
         }
 
         // return to somewhere else
         if ($redirect_option == 'other_redirect') {
-            return match ($other_redirect) {
-                'audit' => redirect()->route('assets.audit.due'),
-                'model' => redirect()->route('models.show', $request->model_id),
-            };
+            switch ($other_redirect) {
+                case 'audit':
+                    return route('assets.audit.due');
+            }
 
         }
 
@@ -1734,5 +1652,5 @@ class Helper
             }
         }
         return $mismatched;
-    }
+    }        
 }

app/Helpers/IconHelper.php

@@ -16,7 +16,6 @@ class IconHelper
             case 'clone':
                 return 'far fa-clone';
             case 'delete':
-            case 'upload deleted':
                 return 'fas fa-trash';
             case 'create':
                 return 'fa-solid fa-plus';
@@ -40,14 +39,10 @@ class IconHelper
                 return 'fa-solid fa-trash-arrow-up';
             case 'external-link':
                 return 'fa fa-external-link';
-            case 'link':
-                return 'fa fa-link';
             case 'email':
                 return 'fa-regular fa-envelope';
             case 'phone':
                 return 'fa-solid fa-phone';
-            case 'mobile':
-                return 'fas fa-mobile-screen-button';
             case 'long-arrow-right':
                 return 'fas fa-long-arrow-alt-right';
             case 'download':
@@ -156,7 +151,6 @@ class IconHelper
             case 'location':
                 return 'fas fa-map-marker-alt';
             case 'superadmin':
-            case 'admin':
                 return 'fas fa-crown';
             case 'print':
                 return 'fa-solid fa-print';
@@ -197,12 +191,6 @@ class IconHelper
             case 'note':
             case 'notes':
                 return 'fas fa-sticky-note';
-            case 'tip':
-                return 'fa-solid fa-lightbulb';
-            case 'highlight':
-                return 'fa-solid fa-highlighter';
-            case 'inherit':
-                return 'fa-solid fa-layer-group';
         }
     }
 }

app/Helpers/StorageHelper.php

@@ -16,84 +16,38 @@ class StorageHelper
             $disk = config('filesystems.default');
         }
         switch (config("filesystems.disks.$disk.driver")) {
-        case 'local':
-            return response()->download(Storage::disk($disk)->path($filename)); //works for PRIVATE or public?!
+            case 'local':
+                return response()->download(Storage::disk($disk)->path($filename)); //works for PRIVATE or public?!
 
-        case 's3':
-            return redirect()->away(Storage::disk($disk)->temporaryUrl($filename, now()->addMinutes(5))); //works for private or public, I guess?
+            case 's3':
+                return redirect()->away(Storage::disk($disk)->temporaryUrl($filename, now()->addMinutes(5))); //works for private or public, I guess?
 
-        default:
-            return Storage::disk($disk)->download($filename);
+            default:
+                return Storage::disk($disk)->download($filename);
         }
     }
 
-    public static function getMediaType($file_with_path) {
-
-        // Get the file extension and determine the media type
-        if (Storage::exists($file_with_path)) {
-            $fileinfo = pathinfo($file_with_path);
-            $extension = strtolower($fileinfo['extension']);
-            switch ($extension) {
-                case 'avif':
-                case 'jpg':
-                case 'png':
-                case 'gif':
-                case 'svg':
-                case 'webp':
-                    return 'image';
-                case 'pdf':
-                    return 'pdf';
-                case 'mp3':
-                case 'wav':
-                case 'ogg':
-                    return 'audio';
-                case 'mp4':
-                case 'webm':
-                case 'mov':
-                    return 'video';
-                case 'doc':
-                case 'docx':
-                    return 'document';
-                case 'txt':
-                    return 'text';
-                case 'xls':
-                case 'xlsx':
-                case 'ods':
-                    return 'spreadsheet';
-                default:
-                    return $extension; // Default for unknown types
-            }
-        }
-        return null;
-    }
 
     /**
      * This determines the file types that should be allowed inline and checks their fileinfo extension
      * to determine that they are safe to display inline.
      *
      * @author <A. Gianotto> [<snipe@snipe.net]>
-     * @since  v7.0.14
-     * @param  $file_with_path
+     * @since v7.0.14
+     * @param $file_with_path
      * @return bool
      */
-    public static function allowSafeInline($file_with_path)
-    {
+    public static function allowSafeInline($file_with_path) {
 
         $allowed_inline = [
-            'avif',
-            'gif',
-            'gif',
-            'jpg',
-            'mov',
-            'mp3',
-            'mp4',
-            'ogg',
             'pdf',
-            'png',
             'svg',
-            'wav',
-            'webm',
+            'jpg',
+            'gif',
+            'svg',
+            'avif',
             'webp',
+            'png',
         ];
 
 
@@ -105,24 +59,10 @@ class StorageHelper
 
     }
 
-    public static function getFiletype($file_with_path)
-    {
-
-        // The file exists and is allowed to be displayed inline
-        if (Storage::exists($file_with_path)) {
-            return pathinfo($file_with_path, PATHINFO_EXTENSION);
-        }
-
-        return null;
-
-    }
-
-
     /**
      * Decide whether to show the file inline or download it.
      */
-    public static function showOrDownloadFile($file, $filename)
-    {
+    public static function showOrDownloadFile($file, $filename) {
 
         $headers = [];
 

app/Http/Controllers/Accessories/AccessoriesController.php

@@ -77,30 +77,13 @@ class AccessoriesController extends Controller
         $accessory->supplier_id             = request('supplier_id');
         $accessory->notes                   = request('notes');
 
-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = Accessory::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'accessories/'.$new_image_name;
-                Storage::disk('public')->copy('accessories/'.$cloned_model_img->image, $new_image);
-                $accessory->image = $new_image_name;
-            }
-
-        } else {
-            $accessory = $request->handleImages($accessory);
-        }
-
-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
+        $accessory = $request->handleImages($accessory);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
         // Was the accessory created?
         if ($accessory->save()) {
             // Redirect to the new accessory  page
-            return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                ->with('success', trans('admin/accessories/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($accessory->getErrors());
@@ -130,12 +113,11 @@ class AccessoriesController extends Controller
 
         $this->authorize('create', Accessory::class);
         $cloned = clone $accessory;
-        $accessory_to_clone = $accessory;
         $cloned->id = null;
         $cloned->deleted_at = '';
+        $cloned->location_id = null;
 
         return view('accessories/edit')
-            ->with('cloned_model', $accessory_to_clone)
             ->with('item', $cloned);
         
     }
@@ -182,15 +164,10 @@ class AccessoriesController extends Controller
 
             $accessory = $request->handleImages($accessory);
 
-            if($request->get('redirect_option') === 'back'){
-                session()->put(['redirect_option' => 'index']);
-            } else {
-                session()->put(['redirect_option' => $request->get('redirect_option')]);
-            }
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
 
             if ($accessory->save()) {
-                return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                    ->with('success', trans('admin/accessories/message.update.success'));
+                return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.update.success'));
             }
         } else {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));

app/Http/Controllers/Accessories/AccessoriesFilesController.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Http\Controllers\Accessories;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Accessory;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Log;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class AccessoriesFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a accessory.
+     *
+     * @param UploadFileRequest $request
+     * @param int $accessoryId
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $accessoryId = null) : RedirectResponse
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $accessory = Accessory::find($accessoryId);
+
+        if (isset($accessory->id)) {
+            $this->authorize('accessories.files', $accessory);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/accessories')) {
+                    Storage::makeDirectory('private_uploads/accessories', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+
+                    $file_name = $request->handleFile('private_uploads/accessories/', 'accessory-'.$accessory->id, $file);
+                    //Log the upload to the log
+                    $accessory->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
+    }
+
+    /**
+     * Deletes the selected accessory file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $accessoryId
+     * @param int $fileId
+     */
+    public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
+    {
+        if ($accessory = Accessory::find($accessoryId)) {
+            $this->authorize('update', $accessory);
+
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
+                }
+
+            }
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
+        }
+
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $accessoryId
+     * @param int $fileId
+     */
+    public function show($accessoryId = null, $fileId = null) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse
+    {
+
+
+        // the accessory is valid
+        if ($accessory = Accessory::find($accessoryId)) {
+            $this->authorize('view', $accessory);
+            $this->authorize('accessories.files', $accessory);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) {
+                $file = 'private_uploads/accessories/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.file_not_found'));
+                }
+            }
+
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
+    }
+}

app/Http/Controllers/Accessories/AccessoryCheckinController.php

@@ -78,8 +78,7 @@ class AccessoryCheckinController extends Controller
 
             session()->put(['redirect_option' => $request->get('redirect_option')]);
 
-            return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                ->with('success', trans('admin/accessories/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.checkin.success'));
         }
         // Redirect to the accessory management page with error
         return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));

app/Http/Controllers/Accessories/AccessoryCheckoutController.php

@@ -71,7 +71,6 @@ class AccessoryCheckoutController extends Controller
         $this->authorize('checkout', $accessory);
 
         $target = $this->determineCheckoutTarget();
-        session()->put(['checkout_to_type' => $target]);
         
         $accessory->checkout_qty = $request->input('checkout_qty', 1);
         
@@ -98,7 +97,7 @@ class AccessoryCheckoutController extends Controller
 
 
         // Redirect to the new accessory page
-        return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
+        return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))
             ->with('success', trans('admin/accessories/message.checkout.success'));
     }
 }

app/Http/Controllers/Account/AcceptanceController.php

@@ -7,24 +7,30 @@ use App\Events\CheckoutDeclined;
 use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Http\Controllers\Controller;
-use App\Mail\CheckoutAcceptanceResponseMail;
+use App\Models\Actionlog;
+use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\Contracts\Acceptable;
 use App\Models\Setting;
 use App\Models\User;
+use App\Models\AssetModel;
+use App\Models\Accessory;
+use App\Models\License;
+use App\Models\Component;
+use App\Models\Consumable;
 use App\Notifications\AcceptanceAssetAcceptedNotification;
-use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
 use App\Notifications\AcceptanceAssetDeclinedNotification;
-use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use App\Http\Controllers\SettingsController;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Carbon\Carbon;
 use \Illuminate\Contracts\View\View;
 use \Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
-use App\Helpers\Helper;
 
 class AcceptanceController extends Controller
 {
@@ -75,10 +81,6 @@ class AcceptanceController extends Controller
     public function store(Request $request, $id) : RedirectResponse
     {
         $acceptance = CheckoutAcceptance::find($id);
-        $assigned_user = User::find($acceptance->assigned_to_id);
-        $settings = Setting::getSettings();
-        $sig_filename='';
-
 
         if (is_null($acceptance)) {
             return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -101,95 +103,145 @@ class AcceptanceController extends Controller
         }
 
         /**
-         * Check for the signature directory
+         * Get the signature and save it
          */
         if (! Storage::exists('private_uploads/signatures')) {
             Storage::makeDirectory('private_uploads/signatures', 775);
         }
 
-        /**
-         * Check for the eula-pdfs directory
-         */
-        if (! Storage::exists('private_uploads/eula-pdfs')) {
-            Storage::makeDirectory('private_uploads/eula-pdfs', 775);
-        }
+
 
         $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
-
-        // If signatures are required, make sure we have one
-        if (Setting::getSettings()->require_accept_signature == '1') {
-
-            // The item was accepted, check for a signature
-            if ($request->filled('signature_output')) {
-                $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
-                $data_uri = $request->input('signature_output');
-                $encoded_image = explode(',', $data_uri);
-                $decoded_image = base64_decode($encoded_image[1]);
-                Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
-
-                // No image data is present, kick them back.
-                // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
-            } else {
-                return redirect()->back()->with('error', trans('general.shitty_browser'));
-            }
-        }
-
-
-        // Convert PDF logo to base64 for TCPDF
-        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
-        $encoded_logo = null;
-        if ($settings->acceptance_pdf_logo) {
-            $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));
-        }
-
-        // Get the data array ready for the notifications and PDF generation
-        $data = [
-            'item_tag' => $item->asset_tag,
-            'item_name' => $item->name, // this handles licenses seats, which don't have a 'name' field
-            'item_model' => $item->model?->name,
-            'item_serial' => $item->serial,
-            'item_status' => $item->assetstatus?->name,
-            'eula' => $item->getEula(),
-            'note' => $request->input('note'),
-            'check_out_date' => Helper::getFormattedDateObject($acceptance->created_at, 'datetime', false),
-            'accepted_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
-            'declined_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
-            'assigned_to' => $assigned_user->display_name,
-            'email' => $assigned_user->email,
-            'employee_num' => $assigned_user->employee_num,
-            'site_name' => $settings->site_name,
-            'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
-            'logo' => ($encoded_logo) ?? null,
-            'date_settings' => $settings->date_display_format,
-            'qty' => $acceptance->qty ?? 1,
-        ];
+        $display_model = '';
+        $pdf_view_route = '';
+        $pdf_filename = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf';
+        $sig_filename='';
 
         if ($request->input('asset_acceptance') == 'accepted') {
 
+            /**
+             * Check for the eula-pdfs directory
+             */
+            if (! Storage::exists('private_uploads/eula-pdfs')) {
+                Storage::makeDirectory('private_uploads/eula-pdfs', 775);
+            }
 
-            $pdf_filename = 'accepted-'.$acceptance->checkoutable_id.'-'.$acceptance->display_checkoutable_type.'-eula-'.date('Y-m-d-h-i-s').'.pdf';
+            if (Setting::getSettings()->require_accept_signature == '1') {
+                
+                // Check if the signature directory exists, if not create it
+                if (!Storage::exists('private_uploads/signatures')) {
+                    Storage::makeDirectory('private_uploads/signatures', 775);
+                }
 
-            // Generate the PDF content
-            $pdf_content = $acceptance->generateAcceptancePdf($data, $acceptance);
-            Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf_content);
+                // The item was accepted, check for a signature
+                if ($request->filled('signature_output')) {
+                    $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
+                    $data_uri = $request->input('signature_output');
+                    $encoded_image = explode(',', $data_uri);
+                    $decoded_image = base64_decode($encoded_image[1]);
+                    Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
 
-            // Log the acceptance
-            $acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));
-
-            // Send the PDF to the signing user
-            if (($request->input('send_copy') == '1') && ($assigned_user->email !='')) {
-
-                // Add the attachment for the signing user into the $data array
-                $data['file'] = $pdf_filename;
-                try {
-                    $assigned_user->notify((new AcceptanceAssetAcceptedToUserNotification($data))->locale($assigned_user->locale));
-                } catch (\Exception $e) {
-                    Log::warning($e);
+                    // No image data is present, kick them back.
+                    // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
+                } else {
+                    return redirect()->back()->with('error', trans('general.shitty_browser'));
                 }
             }
+
+            // this is horrible
+            switch($acceptance->checkoutable_type){
+                case 'App\Models\Asset':
+                        $pdf_view_route ='account.accept.accept-asset-eula';
+                        $asset_model = AssetModel::find($item->model_id);
+                        if (!$asset_model) {
+                            return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+                        }
+                        $display_model = $asset_model->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                break;
+
+                case 'App\Models\Accessory':
+                        $pdf_view_route ='account.accept.accept-accessory-eula';
+                        $accessory = Accessory::find($item->id);
+                        $display_model = $accessory->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                break;
+
+                case 'App\Models\LicenseSeat':
+                        $pdf_view_route ='account.accept.accept-license-eula';
+                        $license = License::find($item->license_id);
+                        $display_model = $license->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                break;
+
+                case 'App\Models\Component':
+                        $pdf_view_route ='account.accept.accept-component-eula';
+                        $component = Component::find($item->id);
+                        $display_model = $component->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                break;
+
+                case 'App\Models\Consumable':
+                        $pdf_view_route ='account.accept.accept-consumable-eula';
+                        $consumable = Consumable::find($item->id);
+                        $display_model = $consumable->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                break;
+            }
+//            if ($acceptance->checkoutable_type == 'App\Models\Asset') {
+//                $pdf_view_route ='account.accept.accept-asset-eula';
+//                $asset_model = AssetModel::find($item->model_id);
+//                $display_model = $asset_model->name;
+//                $assigned_to = User::find($item->assigned_to)->present()->fullName;
+//
+//            } elseif ($acceptance->checkoutable_type== 'App\Models\Accessory') {
+//                $pdf_view_route ='account.accept.accept-accessory-eula';
+//                $accessory = Accessory::find($item->id);
+//                $display_model = $accessory->name;
+//                $assigned_to = User::find($item->assignedTo);
+//
+//            }
+
+            /**
+             * Gather the data for the PDF. We fire this whether there is a signature required or not,
+             * since we want the moment-in-time proof of what the EULA was when they accepted it.
+             */
+            $branding_settings = SettingsController::getPDFBranding();
+
+            $path_logo = "";
+
+            // Check for the PDF logo path and use that, otherwise use the regular logo path
+            if (!is_null($branding_settings->acceptance_pdf_logo)) {
+                $path_logo = public_path() . '/uploads/' . $branding_settings->acceptance_pdf_logo;
+            } elseif (!is_null($branding_settings->logo)) {
+                $path_logo = public_path() . '/uploads/' . $branding_settings->logo;
+            }
+            
+            $data = [
+                'item_tag' => $item->asset_tag,
+                'item_model' => $display_model,
+                'item_serial' => $item->serial,
+                'item_status' => $item->assetstatus?->name,
+                'eula' => $item->getEula(),
+                'note' => $request->input('note'),
+                'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
+                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'),
+                'assigned_to' => $assigned_to,
+                'company_name' => $branding_settings->site_name,
+                'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
+                'logo' => $path_logo,
+                'date_settings' => $branding_settings->date_display_format,
+            ];
+
+            if ($pdf_view_route!='') {
+                Log::debug($pdf_filename.' is the filename, and the route was specified.');
+                $pdf = Pdf::loadView($pdf_view_route, $data);
+                Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output());
+            }
+
+            $acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));
             try {
-                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
+                $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
             } catch (\Exception $e) {
                 Log::warning($e);
             }
@@ -197,43 +249,97 @@ class AcceptanceController extends Controller
 
             $return_msg = trans('admin/users/message.accepted');
 
-        // Item was declined
         } else {
 
-            for ($i = 0; $i < ($acceptance->qty ?? 1); $i++) {
-                $acceptance->decline($sig_filename, $request->input('note'));
+            /**
+             * Check for the eula-pdfs directory
+             */
+            if (! Storage::exists('private_uploads/eula-pdfs')) {
+                Storage::makeDirectory('private_uploads/eula-pdfs', 775);
             }
 
+            if (Setting::getSettings()->require_accept_signature == '1') {
+                
+                // Check if the signature directory exists, if not create it
+                if (!Storage::exists('private_uploads/signatures')) {
+                    Storage::makeDirectory('private_uploads/signatures', 775);
+                }
+
+                // The item was accepted, check for a signature
+                if ($request->filled('signature_output')) {
+                    $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
+                    $data_uri = $request->input('signature_output');
+                    $encoded_image = explode(',', $data_uri);
+                    $decoded_image = base64_decode($encoded_image[1]);
+                    Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
+
+                    // No image data is present, kick them back.
+                    // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
+                } else {
+                    return redirect()->back()->with('error', trans('general.shitty_browser'));
+                }
+            }
+            
+            // Format the data to send the declined notification
+            $branding_settings = SettingsController::getPDFBranding();
+
+            // This is the most horriblest
+            switch($acceptance->checkoutable_type){
+                case 'App\Models\Asset':
+                    $asset_model = AssetModel::find($item->model_id);
+                    $display_model = $asset_model->name;
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                    break;
+
+                case 'App\Models\Accessory':
+                    $accessory = Accessory::find($item->id);
+                    $display_model = $accessory->name;
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                    break;
+
+                case 'App\Models\LicenseSeat':
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                    break;
+
+                case 'App\Models\Component':
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                    break;
+
+                case 'App\Models\Consumable':
+                    $consumable = Consumable::find($item->id);
+                    $display_model = $consumable->name;
+                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
+                    break;
+            }
+
+            $data = [
+                'item_tag' => $item->asset_tag,
+                'item_model' => $display_model,
+                'item_serial' => $item->serial,
+                'item_status' => $item->assetstatus?->name,
+                'note' => $request->input('note'),
+                'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
+                'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
+                'assigned_to' => $assigned_to,
+                'company_name' => $branding_settings->site_name,
+                'date_settings' => $branding_settings->date_display_format,
+            ];
+
+            if ($pdf_view_route!='') {
+                Log::debug($pdf_filename.' is the filename, and the route was specified.');
+                $pdf = Pdf::loadView($pdf_view_route, $data);
+                Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output());
+            }
+
+            $acceptance->decline($sig_filename, $request->input('note'));
             $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
-            Log::debug('New event acceptance.');
             event(new CheckoutDeclined($acceptance));
             $return_msg = trans('admin/users/message.declined');
         }
 
 
-        // Send an email notification if one is requested
-        if ($acceptance->alert_on_response_id) {
-            try {
-                $recipient = User::find($acceptance->alert_on_response_id);
-
-                if ($recipient) {
-                    Log::debug('Attempting to send email acceptance.');
-                    Mail::to($recipient)->send(new CheckoutAcceptanceResponseMail(
-                        $acceptance,
-                        $recipient,
-                        $request->input('asset_acceptance') === 'accepted',
-                    ));
-                    Log::debug('Send email notification sucess on checkout acceptance response.');
-                }
-            } catch (Exception $e) {
-                Log::error($e->getMessage());
-                Log::warning($e);
-            }
-        }
         return redirect()->to('account/accept')->with('success', $return_msg);
 
     }
 
-
-
 }

app/Http/Controllers/ActionlogController.php

@@ -3,13 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
-use App\Models\Actionlog;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use \Illuminate\Http\Response;
-
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class ActionlogController extends Controller
 {
     public function displaySig($filename) : RedirectResponse | Response | bool
@@ -41,29 +39,17 @@ class ActionlogController extends Controller
 
     public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
     {
+        $this->authorize('view', \App\Models\Asset::class);
 
-        if ($actionlog = Actionlog::where('filename', $filename)->with('user')->with('target')->firstOrFail()) {
-
-            $this->authorize('view', $actionlog->target);
-            $this->authorize('view', $actionlog->user);
-
-
-            if (config('filesystems.default') == 's3_private') {
-                return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/' . $filename, now()->addMinutes(5)));
-            }
-
-            if (Storage::exists('private_uploads/eula-pdfs/' . $filename)) {
-
-                if (request()->input('inline') == 'true') {
-                    return response()->file(config('app.private_uploads') . '/eula-pdfs/' . $filename);
-                }
-
-                return response()->download(config('app.private_uploads') . '/eula-pdfs/' . $filename);
-            }
-
-            return redirect()->back()->with('error', trans('general.file_does_not_exist'));
+        if (config('filesystems.default') == 's3_private') {
+            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
         }
 
-        return redirect()->back()->with('error', trans('general.record_not_found'));
+        if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
+            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
+        }
+
+        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
+
     }
 }

app/Http/Controllers/Api/AccessoriesController.php

@@ -54,15 +54,6 @@ class AccessoriesController extends Controller
                 'notes',
                 'checkouts_count',
                 'qty',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'category',
-                'supplier',
-                'manufacturer',
             ];
 
 
@@ -70,23 +61,10 @@ class AccessoriesController extends Controller
             ->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')
             ->withCount('checkouts as checkouts_count');
 
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
+        if ($request->filled('search')) {
+            $accessories = $accessories->TextSearch($request->input('search'));
         }
 
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $accessories->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $accessories->TextSearch($request->input('search'));
-        }
-
-
         if ($request->filled('company_id')) {
             $accessories->where('accessories.company_id', '=', $request->input('company_id'));
         }
@@ -310,42 +288,32 @@ class AccessoriesController extends Controller
                 'note' => $request->input('note'),
             ]);
 
-
             $accessory_checkout->created_by = auth()->id();
             $accessory_checkout->save();
-
-            $payload = [
-                'accessory_id' => $accessory->id,
-                'assigned_to' => $target->id,
-                'assigned_type' => $target::class,
-                'note' => $request->input('note'),
-                'created_by' => auth()->id(),
-                'pivot' => $accessory_checkout->id,
-            ];
         }
 
         // Set this value to be able to pass the qty through to the event
         event(new CheckoutableCheckedOut($accessory, $target, auth()->user(), $request->input('note')));
 
-        return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/accessories/message.checkout.success')));
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
 
     }
 
     /**
      * Check in the item so that it can be checked out again to someone else
      *
+     * @uses Accessory::checkin_email() to determine if an email can and should be sent
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param Request $request
      * @param int $accessoryUserId
      * @param string $backto
-     * @return JsonResponse
-     * @uses Accessory::checkin_email() to determine if an email can and should be sent
-     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @return \Illuminate\Http\RedirectResponse
      * @internal param int $accessoryId
      */
     public function checkin(Request $request, $accessoryUserId = null)
     {
         if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryUserId))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist', ['id' => $accessoryUserId])));
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
         }
 
         $accessory = Accessory::find($accessory_checkout->accessory_id);
@@ -359,14 +327,7 @@ class AccessoriesController extends Controller
                 $user = User::find($accessory_checkout->assigned_to);
             }
 
-            $payload = [
-                'accessory_id' => $accessory->id,
-                'note' => $request->input('note'),
-                'created_by' => auth()->id(),
-                'pivot' => $accessory_checkout->id,
-            ];
-
-            return response()->json(Helper::formatStandardApiResponse('success', $payload,  trans('admin/accessories/message.checkin.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.checkin.success')));
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkin.error')));

app/Http/Controllers/Api/AssetFilesController.php

@@ -0,0 +1,200 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\StorageHelper;
+use App\Http\Transformers\UploadedFilesTransformer;
+use Illuminate\Support\Facades\Storage;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\Asset;
+use App\Models\Actionlog;
+use App\Http\Requests\UploadFileRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Request;
+
+
+/**
+ * This class controls file related actions related
+ * to assets for the Snipe-IT Asset Management application.
+ *
+ * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
+ *
+ * @version    v1.0
+ * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+ */
+class AssetFilesController extends Controller
+{
+    /**
+     * Accepts a POST to upload a file to the server.
+     *
+     * @param \App\Http\Requests\UploadFileRequest $request
+     * @param int $assetId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function store(UploadFileRequest $request, $assetId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $asset = Asset::find($assetId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
+        }
+
+        // Make sure we are allowed to update this asset
+        $this->authorize('update', $asset);
+
+	    if ($request->hasFile('file')) {
+            // If the file storage directory doesn't exist; create it
+            if (! Storage::exists('private_uploads/assets')) {
+                Storage::makeDirectory('private_uploads/assets', 775);
+            }
+
+            // Loop over the attached files and add them to the asset
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
+                
+                $asset->logUpload($file_name, e($request->get('notes')));
+            }
+
+            // All done - report success
+            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.upload.success')));
+        }
+
+        // We only reach here if no files were included in the POST, so tell the user this
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.upload.nofiles')), 500);
+    }
+
+    /**
+     * List the files for an asset.
+     *
+     * @param  int $assetId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function list(Asset $asset, Request $request) : JsonResponse | array
+    {
+
+        $this->authorize('view', $asset);
+
+        $allowed_columns =
+            [
+                'id',
+                'filename',
+                'eol',
+                'notes',
+                'created_at',
+                'updated_at',
+            ];
+
+        $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')->where('item_type', '=', Asset::class)->where('item_id', '=', $asset->id);
+
+        if ($request->filled('search')) {
+            $files = $files->TextSearch($request->input('search'));
+        }
+
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $files->count()) ? $files->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $files = $files->orderBy($sort, $order);
+
+        $files = $files->skip($offset)->take($limit)->get();
+        return (new UploadedFilesTransformer())->transformFiles($files, $files->count());
+
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @param  int $assetId
+     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function show(Asset $asset, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    {
+
+        // the asset is valid
+        if (isset($asset->id)) {
+            $this->authorize('view', $asset);
+
+            // Check that the file being requested exists for the asset
+            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.no_match', ['id' => $fileId])), 404);
+            }
+
+	    // Form the full filename with path
+            $file = 'private_uploads/assets/'.$log->filename;
+            Log::debug('Checking for '.$file);
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            // Check the file actually exists on the filesystem
+            if (! Storage::exists($file)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.does_not_exist', ['id' => $fileId])), 404);
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+
+        // Send back an error message
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.error', ['id' => $fileId])), 500);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function destroy(Asset $asset, $fileId = null) : JsonResponse
+    {
+
+        $rel_path = 'private_uploads/assets';
+
+        // the asset is valid
+        if (isset($asset->id)) {
+            $this->authorize('update', $asset);
+
+            // Check for the file
+            $log = Actionlog::find($fileId);
+
+                if ($log) {
+                        // Check the file actually exists, and delete it
+                        if (Storage::exists($rel_path.'/'.$log->filename)) {
+                            Storage::delete($rel_path.'/'.$log->filename);
+                }
+
+		        // Delete the record of the file
+                $log->delete();
+
+                // All deleting done - notify the user of success
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.deletefile.success')), 200);
+            }
+
+            // The file doesn't seem to really exist, so report an error
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.deletefile.error')), 500);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.deletefile.error')), 500);
+    }
+}

app/Http/Controllers/Api/AssetMaintenancesController.php

@@ -4,11 +4,11 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ImageUploadRequest;
-use App\Http\Transformers\MaintenancesTransformer;
+use App\Http\Transformers\AssetMaintenancesTransformer;
 use App\Models\Asset;
-use App\Models\Maintenance;
+use App\Models\AssetMaintenance;
 use App\Models\Company;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -18,13 +18,13 @@ use Illuminate\Http\JsonResponse;
  *
  * @version    v2.0
  */
-class MaintenancesController extends Controller
+class AssetMaintenancesController extends Controller
 {
 
     /**
      *  Generates the JSON response for asset maintenances listing view.
      *
-     * @see MaintenancesController::getIndex() method that generates view
+     * @see AssetMaintenancesController::getIndex() method that generates view
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      * @since [v1.8]
@@ -33,7 +33,7 @@ class MaintenancesController extends Controller
     {
         $this->authorize('view', Asset::class);
 
-        $maintenances = Maintenance::select('maintenances.*')
+        $maintenances = AssetMaintenance::select('asset_maintenances.*')
             ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company',  'asset.assetstatus', 'adminuser');
 
         if ($request->filled('search')) {
@@ -45,15 +45,11 @@ class MaintenancesController extends Controller
         }
 
         if ($request->filled('supplier_id')) {
-            $maintenances->where('maintenances.supplier_id', '=', $request->input('supplier_id'));
+            $maintenances->where('asset_maintenances.supplier_id', '=', $request->input('supplier_id'));
         }
 
         if ($request->filled('created_by')) {
-            $maintenances->where('maintenances.created_by', '=', $request->input('created_by'));
-        }
-
-        if ($request->filled('url')) {
-            $maintenances->where('maintenances.url', '=', $request->input('url'));
+            $maintenances->where('asset_maintenances.created_by', '=', $request->input('created_by'));
         }
 
         if ($request->filled('asset_maintenance_type')) {
@@ -67,7 +63,7 @@ class MaintenancesController extends Controller
 
         $allowed_columns = [
                                 'id',
-                                'name',
+                                'title',
                                 'asset_maintenance_time',
                                 'asset_maintenance_type',
                                 'cost',
@@ -79,7 +75,6 @@ class MaintenancesController extends Controller
                                 'serial',
                                 'created_by',
                                 'supplier',
-                                'location',
                                 'is_warranty',
                                 'status_label',
                             ];
@@ -103,9 +98,6 @@ class MaintenancesController extends Controller
             case 'serial':
                 $maintenances = $maintenances->OrderByAssetSerial($order);
                 break;
-            case 'location':
-                $maintenances = $maintenances->OrderLocationName($order);
-                break;
             case 'status_label':
                 $maintenances = $maintenances->OrderStatusName($order);
                 break;
@@ -116,7 +108,7 @@ class MaintenancesController extends Controller
 
         $total = $maintenances->count();
         $maintenances = $maintenances->skip($offset)->take($limit)->get();
-        return (new MaintenancesTransformer())->transformMaintenances($maintenances, $total);
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total);
 
 
     }
@@ -125,23 +117,22 @@ class MaintenancesController extends Controller
     /**
      *  Validates and stores the new asset maintenance
      *
-     * @see MaintenancesController::getCreate() method for the form
+     * @see AssetMaintenancesController::getCreate() method for the form
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      * @since [v1.8]
      */
-    public function store(ImageUploadRequest $request) : JsonResponse | array
+    public function store(Request $request) : JsonResponse | array
     {
         $this->authorize('update', Asset::class);
-
         // create a new model instance
-        $maintenance = new Maintenance();
+        $maintenance = new AssetMaintenance();
         $maintenance->fill($request->all());
         $maintenance->created_by = auth()->id();
-        $maintenance = $request->handleImages($maintenance);
+
         // Was the asset maintenance created?
         if ($maintenance->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.create.success')));
 
         }
 
@@ -162,11 +153,11 @@ class MaintenancesController extends Controller
     {
         $this->authorize('update', Asset::class);
 
-        if ($maintenance = Maintenance::with('asset')->find($id)) {
+        if ($maintenance = AssetMaintenance::with('asset')->find($id)) {
 
             // Can this user manage this asset?
             if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')])));
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')])));
             }
 
             // The asset this miantenance is attached to is not valid or has been deleted
@@ -177,13 +168,13 @@ class MaintenancesController extends Controller
             $maintenance->fill($request->all());
 
             if ($maintenance->save()) {
-                return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.edit.success')));
+                return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.edit.success')));
             }
 
             return response()->json(Helper::formatStandardApiResponse('error', null, $maintenance->getErrors()));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id])));
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id])));
 
     }
 
@@ -191,20 +182,20 @@ class MaintenancesController extends Controller
      *  Delete an asset maintenance
      *
      * @author  A. Gianotto <snipe@snipe.net>
-     * @param int $maintenanceId
+     * @param int $assetMaintenanceId
      * @version v1.0
      * @since [v4.0]
      */
-    public function destroy($maintenanceId) : JsonResponse | array
+    public function destroy($assetMaintenanceId) : JsonResponse | array
     {
         $this->authorize('update', Asset::class);
         // Check if the asset maintenance exists
 
-        $maintenance = Maintenance::findOrFail($maintenanceId);
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
 
-        $maintenance->delete();
+        $assetMaintenance->delete();
 
-        return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.delete.success')));
+        return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success')));
 
 
     }
@@ -213,19 +204,19 @@ class MaintenancesController extends Controller
      *  View an asset maintenance
      *
      * @author  A. Gianotto <snipe@snipe.net>
-     * @param int $maintenanceId
+     * @param int $assetMaintenanceId
      * @version v1.0
      * @since [v4.0]
      */
-    public function show($maintenanceId) : JsonResponse | array
+    public function show($assetMaintenanceId) : JsonResponse | array
     {
         $this->authorize('view', Asset::class);
-        $maintenance = Maintenance::findOrFail($maintenanceId);
-        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+        if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
         }
 
-        return (new MaintenancesTransformer())->transformMaintenance($maintenance);
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance);
 
     }
 }

app/Http/Controllers/Api/AssetModelFilesController.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\StorageHelper;
+use Illuminate\Support\Facades\Storage;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\AssetModel;
+use App\Models\Actionlog;
+use App\Http\Requests\UploadFileRequest;
+use App\Http\Transformers\AssetModelsTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+
+/**
+ * This class controls file related actions related
+ * to assets for the Snipe-IT Asset Management application.
+ *
+ * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
+ *
+ * @version    v1.0
+ * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+ */
+class AssetModelFilesController extends Controller
+{
+    /**
+     * Accepts a POST to upload a file to the server.
+     *
+     * @param \App\Http\Requests\UploadFileRequest $request
+     * @param int $assetModelId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function store(UploadFileRequest $request, $assetModelId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // Make sure we are allowed to update this asset
+        $this->authorize('update', $assetModel);
+
+            if ($request->hasFile('file')) {
+            // If the file storage directory doesn't exist; create it
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            // Loop over the attached files and add them to the asset
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$assetModel->id, $file);
+                
+                $assetModel->logUpload($file_name, e($request->get('notes')));
+            }
+
+            // All done - report success
+            return response()->json(Helper::formatStandardApiResponse('success', $assetModel, trans('admin/models/message.upload.success')));
+        }
+
+        // We only reach here if no files were included in the POST, so tell the user this
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.upload.nofiles')), 500);
+    }
+
+    /**
+     * List the files for an asset.
+     *
+     * @param  int $assetmodel
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function list($assetmodel_id) : JsonResponse | array
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetmodel_id)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
+            $this->authorize('view', $assetmodel);
+            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function show($assetModelId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('view', $assetModel);
+
+            // Check that the file being requested exists for the asset
+            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $assetModel->id)->find($fileId)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.no_match', ['id' => $fileId])), 404);
+            }
+
+            // Form the full filename with path
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+            Log::debug('Checking for '.$file);
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            // Check the file actually exists on the filesystem
+            if (! Storage::exists($file)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.does_not_exist', ['id' => $fileId])), 404);
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+
+        // Send back an error message
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error', ['id' => $fileId])), 500);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function destroy($assetModelId = null, $fileId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        $rel_path = 'private_uploads/assetmodels';
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('update', $assetModel);
+
+            // Check for the file
+            $log = Actionlog::find($fileId);
+            if ($log) {
+                // Check the file actually exists, and delete it
+                if (Storage::exists($rel_path.'/'.$log->filename)) {
+                    Storage::delete($rel_path.'/'.$log->filename);
+                }
+                // Delete the record of the file
+                $log->delete();
+
+                // All deleting done - notify the user of success
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.deletefile.success')), 200);
+            }
+
+            // The file doesn't seem to really exist, so report an error
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+    }
+}

app/Http/Controllers/Api/AssetModelsController.php

@@ -46,20 +46,10 @@ class AssetModelsController extends Controller
                 'manufacturer',
                 'requestable',
                 'assets_count',
-                'assets_assigned_count',
-                'assets_archived_count',
-                'remaining',
                 'category',
                 'fieldset',
                 'deleted_at',
                 'updated_at',
-                'require_serial',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'manufacturer',
-                'category',
             ];
 
         $assetmodels = AssetModel::select([
@@ -79,31 +69,9 @@ class AssetModelsController extends Controller
             'models.fieldset_id',
             'models.deleted_at',
             'models.updated_at',
-            'models.require_serial'
          ])
             ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
-            ->withCount('assets as assets_count')
-            ->withCount('availableAssets as remaining')
-            ->withCount('assignedAssets as assets_assigned_count')
-            ->withCount('archivedAssets as assets_archived_count');
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $assetmodels->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $assetmodels->TextSearch($request->input('search'));
-        }
-
+            ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
             $assetmodels->onlyTrashed();
@@ -186,7 +154,7 @@ class AssetModelsController extends Controller
         $assetmodel = $request->handleImages($assetmodel);
 
         if ($assetmodel->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));
 
@@ -239,7 +207,7 @@ class AssetModelsController extends Controller
         $assetmodel = AssetModel::findOrFail($id);
         $assetmodel->fill($request->all());
         $assetmodel = $request->handleImages($assetmodel);
-
+        
         /**
          * Allow custom_fieldset_id to override and populate fieldset_id.
          * This is stupid, but required for legacy API support.
@@ -254,7 +222,7 @@ class AssetModelsController extends Controller
 
 
         if ($assetmodel->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.update.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.update.success')));
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));

app/Http/Controllers/Api/AssetsController.php

@@ -6,7 +6,6 @@ use App\Events\CheckoutableCheckedIn;
 use App\Http\Requests\StoreAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
-use App\Http\Transformers\ComponentsTransformer;
 use App\Models\AccessoryCheckout;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
@@ -116,39 +115,17 @@ class AssetsController extends Controller
             'asset_eol_date',
             'requestable',
             'jobtitle',
-            // These are *relationships* so we wouldn't normally include them in this array,
-            // since they would normally create a `column not found` error,
-            // BUT we account for them in the ordering switch down at the end of this method
-            // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-            'company',
-            'model',
-            'location',
-            'rtd_location',
-            'category',
-            'status_label',
-            'manufacturer',
-            'supplier',
-            'jobtitle',
-            'assigned_to',
-            'created_by',
-
         ];
 
-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-
-        foreach ($all_custom_fields as $field) {
-            $allowed_columns[] = $field->db_column_name();
-        }
-
         $filter = [];
 
         if ($request->filled('filter')) {
             $filter = json_decode($request->input('filter'), true);
+        }
 
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
+        $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.*')
@@ -164,7 +141,6 @@ class AssetsController extends Controller
                 'model.category',
                 'model.manufacturer',
                 'model.fieldset',
-                'model.depreciation',
                 'supplier'
             ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
@@ -183,7 +159,7 @@ class AssetsController extends Controller
         // Search custom fields by column name
         foreach ($all_custom_fields as $field) {
             if ($request->filled($field->db_column_name()) && $field->db_column_name()) {
-                $assets->where('assets.'.$field->db_column_name(), '=', $request->input($field->db_column_name()));
+                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
             }
         }
 
@@ -628,7 +604,7 @@ class AssetsController extends Controller
             $asset->use_text = $asset->present()->fullName;
 
             if (($asset->checkedOutToUser()) && ($asset->assigned)) {
-                $asset->use_text .= ' → ' . $asset->assigned->display_name;
+                $asset->use_text .= ' → ' . $asset->assigned->getFullNameAttribute();
             }
 
 
@@ -1308,19 +1284,9 @@ class AssetsController extends Controller
 
     public function assignedAssets(Request $request, Asset $asset) : JsonResponse | array
     {
-        $this->authorize('view', Asset::class);
-        $this->authorize('view', $asset);
 
-        $query = Asset::where([
-            'assigned_to' => $asset->id,
-            'assigned_type' => Asset::class,
-        ]);
-
-        $total = $query->count();
-
-        $assets = $query->applyOffsetAndLimit($total)->get();
-
-        return (new AssetsTransformer)->transformAssets($assets, $total);
+        return [];
+        // to do
     }
 
     public function assignedAccessories(Request $request, Asset $asset) : JsonResponse | array
@@ -1340,18 +1306,6 @@ class AssetsController extends Controller
         return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
     }
 
-    public function assignedComponents(Request $request, Asset $asset): JsonResponse|array
-    {
-        $this->authorize('view', Asset::class);
-        $this->authorize('view', $asset);
-
-        $asset->loadCount('components');
-        $total = $asset->components_count;
-
-        $components = $asset->load(['components' => fn($query) => $query->applyOffsetAndLimit($total)])->components;
-
-        return (new ComponentsTransformer)->transformComponents($components, $total);
-    }
 
     /**
      * Generate asset labels by tag

app/Http/Controllers/Api/CategoriesController.php

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Actions\Categories\DestroyCategoryAction;
-use App\Exceptions\ItemStillHasChildren;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\CategoriesTransformer;
@@ -40,8 +38,6 @@ class CategoriesController extends Controller
             'consumables_count',
             'components_count',
             'licenses_count',
-            'created_at',
-            'updated_at',
             'image',
             'notes',
         ];
@@ -63,23 +59,6 @@ class CategoriesController extends Controller
             ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count');
 
 
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $categories->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $categories->TextSearch($request->input('search'));
-        }
-
         /*
          * This checks to see if we should override the Admin Setting to show archived assets in list.
          * We don't currently use it within the Snipe-IT GUI, but will be useful for API integrations where they
@@ -93,6 +72,10 @@ class CategoriesController extends Controller
             $categories = $categories->withCount('showableAssets as assets_count');
         }
 
+        if ($request->filled('search')) {
+            $categories = $categories->TextSearch($request->input('search'));
+        }
+
         if ($request->filled('name')) {
             $categories->where('name', '=', $request->input('name'));
         }
@@ -226,21 +209,17 @@ class CategoriesController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Category $category): JsonResponse
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Category::class);
-        try {
-            DestroyCategoryAction::run(category: $category);
-        } catch (ItemStillHasChildren $e) {
+        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($id);
+
+        if (! $category->isDeletable()) {
             return response()->json(
-                Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['asset_type' => $category->category_type]))
-            );
-        } catch (\Exception $e) {
-            report($e);
-            return response()->json(
-                Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))
+                Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type]))
             );
         }
+        $category->delete();
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success')));
     }

app/Http/Controllers/Api/CompaniesController.php

@@ -43,10 +43,7 @@ class CompaniesController extends Controller
 
         $companies = Company::withCount(['assets as assets_count'  => function ($query) {
             $query->AssetsForShow();
-        }])
-            ->with('adminuser')
-            ->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
-
+        }])->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
 
         if ($request->filled('search')) {
             $companies->TextSearch($request->input('search'));
@@ -122,7 +119,6 @@ class CompaniesController extends Controller
     {
         $this->authorize('view', Company::class);
         $company = Company::findOrFail($id);
-        $this->authorize('view', $company);
         return (new CompaniesTransformer)->transformCompany($company);
 
     }
@@ -140,7 +136,6 @@ class CompaniesController extends Controller
     {
         $this->authorize('update', Company::class);
         $company = Company::findOrFail($id);
-        $this->authorize('update', $company);
         $company->fill($request->all());
         $company = $request->handleImages($company);
 
@@ -193,7 +188,6 @@ class CompaniesController extends Controller
             'companies.image',
         ]);
 
-
         if ($request->filled('search')) {
             $companies = $companies->where('companies.name', 'LIKE', '%'.$request->get('search').'%');
         }

app/Http/Controllers/Api/ComponentsController.php

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

app/Http/Controllers/Api/ConsumablesController.php

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

app/Http/Controllers/Api/DepartmentsController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreDepartmentRequest;
 use App\Http\Transformers\DepartmentsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Department;
@@ -27,19 +26,18 @@ class DepartmentsController extends Controller
         $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];
 
         $departments = Department::select(
-            [
-                'departments.id',
-                'departments.name',
-                'departments.phone',
-                'departments.fax',
-                'departments.location_id',
-                'departments.company_id',
-                'departments.manager_id',
-                'departments.created_at',
-                'departments.updated_at',
-                'departments.image',
-                'departments.notes'
-            ])->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
+            'departments.id',
+            'departments.name',
+            'departments.phone',
+            'departments.fax',
+            'departments.location_id',
+            'departments.company_id',
+            'departments.manager_id',
+            'departments.created_at',
+            'departments.updated_at',
+            'departments.image',
+            'departments.notes',
+        )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $departments = $departments->TextSearch($request->input('search'));
@@ -96,17 +94,18 @@ class DepartmentsController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      */
-    public function store(StoreDepartmentRequest $request): JsonResponse
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
+        $this->authorize('create', Department::class);
         $department = new Department;
-        $department->fill($request->validated());
+        $department->fill($request->all());
         $department = $request->handleImages($department);
 
         $department->created_by = auth()->id();
         $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
 
         if ($department->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.create.success')));
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));
 
@@ -122,7 +121,7 @@ class DepartmentsController extends Controller
     public function show($id) : array
     {
         $this->authorize('view', Department::class);
-        $department = Department::withCount('users as users_count')->findOrFail($id);
+        $department = Department::findOrFail($id);
         return (new DepartmentsTransformer)->transformDepartment($department);
     }
 
@@ -142,7 +141,7 @@ class DepartmentsController extends Controller
         $department = $request->handleImages($department);
 
         if ($department->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer)->transformDepartment($department), trans('admin/departments/message.update.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.update.success')));
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));

app/Http/Controllers/Api/GroupsController.php

@@ -24,7 +24,7 @@ class GroupsController extends Controller
 
         $this->authorize('view', Group::class);
 
-        $groups = Group::select(['id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by'])->with('adminuser')->withCount('users as users_count');
+        $groups = Group::select('id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $groups = $groups->TextSearch($request->input('search'));
@@ -50,7 +50,6 @@ class GroupsController extends Controller
                     'id',
                     'name',
                     'created_at',
-                    'updated_at',
                     'users_count',
                 ];
 

app/Http/Controllers/Api/ImportController.php

@@ -69,7 +69,7 @@ class ImportController extends Controller
                 if (function_exists('iconv')) {
                     $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?
                     $encoding = $detector->getEncoding($file_contents);
-                    \Log::debug("Discovered encoding: $encoding in uploaded CSV");
+                    \Log::warning("Discovered encoding: $encoding in uploaded CSV");
                     $reader = null;
                     if (strcasecmp($encoding, 'UTF-8') != 0) {
                         $transliterated = false;
@@ -103,7 +103,7 @@ class ImportController extends Controller
                 $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
 
                 try {
-                    $import->header_row = $reader->nth(0);
+                    $import->header_row = $reader->fetchOne(0);
                 } catch (JsonEncodingException $e) {
                     return response()->json(
                         Helper::formatStandardApiResponse(
@@ -136,7 +136,7 @@ class ImportController extends Controller
 
                 try {
                     // Grab the first row to display via ajax as the user picks fields
-                    $import->first_row = $reader->nth(1);
+                    $import->first_row = $reader->fetchOne(1);
                 } catch (JsonEncodingException $e) {
                     return response()->json(
                         Helper::formatStandardApiResponse(
@@ -195,7 +195,7 @@ class ImportController extends Controller
         // Run a backup immediately before processing
         if ($request->get('run-backup')) {
             Log::debug('Backup manually requested via importer');
-            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H-i-s')]);
+            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]);
         } else {
             Log::debug('NO BACKUP requested via importer');
         }

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -26,24 +26,13 @@ class LicenseSeatsController extends Controller
         if ($license = License::find($licenseId)) {
             $this->authorize('view', $license);
 
-            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department',  'user.company', 'asset.company')
+            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department')
                 ->where('license_seats.license_id', $licenseId);
 
-            if ($request->input('status') == 'available') {
-                $seats->whereNull('license_seats.assigned_to')->whereNull('license_seats.asset_id');
-            }
-
-            if ($request->input('status') == 'assigned') {
-                $seats->ByAssigned();
-            }
-
-
             $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
-            if ($request->input('sort') == 'assigned_user.department') {
+            if ($request->input('sort') == 'department') {
                 $seats->OrderDepartments($order);
-            } elseif ($request->input('sort') == 'assigned_user.company') {
-                    $seats->OrderCompany($order);
             } else {
                 $seats->orderBy('updated_at', $order);
             }
@@ -85,7 +74,7 @@ class LicenseSeatsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
         }
         // 2. does the seat belong to the specified license?
-        if (! $licenseSeat = $licenseSeat->license()->first() || $licenseSeat->id != intval($licenseId)) {
+        if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
         }
 
@@ -130,9 +119,7 @@ class LicenseSeatsController extends Controller
             // nothing to update
             return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
         }
-        if( $touched && $licenseSeat->unreassignable_seat) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.checkout.unavailable')));
-        }
+
         // the logging functions expect only one "target". if both asset and user are present in the request,
         // we simply let assets take precedence over users...
         if ($licenseSeat->isDirty('assigned_to')) {
@@ -149,11 +136,7 @@ class LicenseSeatsController extends Controller
         if ($licenseSeat->save()) {
 
             if ($is_checkin) {
-                if(!$licenseSeat->license->reassignable){
-                    $licenseSeat->unreassignable_seat = true;
-                    $licenseSeat->save();
-                }
-                $licenseSeat->logCheckin($target, $licenseSeat->notes);
+                $licenseSeat->logCheckin($target, $request->input('notes'));
 
                 return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
             }

app/Http/Controllers/Api/LicensesController.php

@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\License;
-use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
@@ -26,15 +25,6 @@ class LicensesController extends Controller
         $this->authorize('view', License::class);
 
         $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
-        $settings = Setting::getSettings();
-
-        if ($request->input('status')=='inactive') {
-            $licenses->ExpiredLicenses();
-        } elseif ($request->input('status')=='expiring') {
-            $licenses->ExpiringLicenses($settings->alert_interval);
-        } else {
-            $licenses->ActiveLicenses();
-        }
 
         if ($request->filled('company_id')) {
             $licenses->where('licenses.company_id', '=', $request->input('company_id'));
@@ -104,8 +94,6 @@ class LicensesController extends Controller
             $licenses->onlyTrashed();
         }
 
-
-
         // 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');
         $limit = app('api_limit_value');

app/Http/Controllers/Api/LocationsController.php

@@ -37,14 +37,10 @@ class LocationsController extends Controller
             'address',
             'address2',
             'assets_count',
-            'assigned_assets_count',
-            'rtd_assets_count',
-            'accessories_count',
+            'assets_count',
             'assigned_accessories_count',
-            'components_count',
-            'consumables_count',
-            'users_count',
-            'children_count',
+            'assigned_assets_count',
+            'assigned_assets_count',
             'city',
             'country',
             'created_at',
@@ -58,6 +54,7 @@ class LocationsController extends Controller
             'rtd_assets_count',
             'state',
             'updated_at',
+            'users_count',
             'zip',
             'notes',
             ];
@@ -82,9 +79,8 @@ class LocationsController extends Controller
             'locations.currency',
             'locations.company_id',
             'locations.notes',
-            'locations.created_by',
-            'locations.deleted_at',
         ])
+            ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
             ->withCount('assignedAccessories as assigned_accessories_count')
@@ -92,8 +88,6 @@ class LocationsController extends Controller
             ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('children as children_count')
             ->withCount('users as users_count')
-            ->withCount('consumables as consumables_count')
-            ->withCount('components as components_count')
             ->with('adminuser');
 
         // Only scope locations if the setting is enabled
@@ -137,14 +131,6 @@ class LocationsController extends Controller
             $locations->where('locations.company_id', '=', $request->input('company_id'));
         }
 
-        if ($request->filled('parent_id')) {
-            $locations->where('locations.parent_id', '=', $request->input('parent_id'));
-        }
-
-        if ($request->input('status') == 'deleted') {
-            $locations->onlyTrashed();
-        }
-
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $locations->count()) ? $locations->count() : app('api_offset_value');
         $limit = app('api_limit_value');
@@ -238,13 +224,8 @@ class LocationsController extends Controller
             ])
             ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
-            ->withCount('assignedAccessories as assigned_accessories_count')
-            ->withCount('accessories as accessories_count')
             ->withCount('rtd_assets as rtd_assets_count')
-            ->withCount('children as children_count')
             ->withCount('users as users_count')
-            ->withCount('consumables as consumables_count')
-            ->withCount('components as components_count')
             ->findOrFail($id);
 
         return (new LocationsTransformer)->transformLocation($location);
@@ -339,15 +320,11 @@ class LocationsController extends Controller
     {
         $this->authorize('delete', Location::class);
         $location = Location::withCount('assignedAssets as assigned_assets_count')
-            ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
-            ->withCount('assignedAccessories as assigned_accessories_count')
-            ->withCount('accessories as accessories_count')
             ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('children as children_count')
             ->withCount('users as users_count')
-            ->withCount('consumables as consumables_count')
-            ->withCount('components as components_count')
+            ->withCount('accessories as accessories_count')
             ->findOrFail($id);
 
         if (! $location->isDeletable()) {

app/Http/Controllers/Api/ManufacturersController.php

@@ -2,13 +2,6 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Actions\Manufacturers\DeleteManufacturerAction;
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasChildren;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ManufacturersTransformer;
@@ -191,19 +184,19 @@ class ManufacturersController extends Controller
      * @since [v4.0]
      * @param  int  $id
      */
-    public function destroy(Manufacturer $manufacturer): JsonResponse
+    public function destroy($id) : JsonResponse
     {
+        $this->authorize('delete', Manufacturer::class);
+        $manufacturer = Manufacturer::findOrFail($id);
         $this->authorize('delete', $manufacturer);
-        try {
-            DeleteManufacturerAction::run($manufacturer);
-        } catch (ItemStillHasChildren $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')])));
-        } catch (\Exception $e) {
-            report($e);
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
+
+        if ($manufacturer->isDeletable()) {
+            $manufacturer->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success')));
+        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.assoc_users')));
+
     }
 
     /**

app/Http/Controllers/Api/NotesController.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Models\Actionlog;
-use App\Models\Asset;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-/**
- * This class controls all API actions related to notes for
- * the Snipe-IT Asset Management application.
- */
-class NotesController extends Controller
-{
-    /**
-     * Retrieve a list of manual notes (action logs) for a given asset.
-     *
-     * Checks authorization to view assets, attempts to find the asset by ID,
-     * and fetches related action log entries of type 'note added', including
-     * user information for each note. Returns a JSON response with the notes or errors.
-     *
-     * @param  \Illuminate\Http\Request  $request  The incoming HTTP request.
-     * @param  Asset  $asset  The ID of the asset whose notes to retrieve.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function index(Asset $asset): JsonResponse
-    {
-        $this->authorize('view', $asset);
-
-        // Get the manual notes for the asset
-        $notes = ActionLog::with('user:id,username')
-            ->where('item_type', Asset::class)
-            ->where('item_id', $asset->id)
-            ->where('action_type', 'note added')
-            ->orderBy('created_at', 'desc')
-            ->get(['id', 'created_at', 'note', 'created_by', 'item_id', 'item_type', 'action_type', 'target_id', 'target_type']);
-
-        $notesArray = $notes->map(function ($note) {
-            return [
-                'id' => $note->id,
-                'created_at' => $note->created_at,
-                'note' => $note->note,
-                'created_by' => $note->created_by,
-                'username' => $note->user?->username, // adding the username
-                'item_id' => $note->item_id,
-                'item_type' => $note->item_type,
-                'action_type' => $note->action_type,
-            ];
-        });
-
-        // Return a success response
-        return response()->json(Helper::formatStandardApiResponse('success', ['notes' => $notesArray, 'asset_id' => $asset->id]));
-    }
-    
-    /**
-     * Store a manual note on a specified asset and log the action.
-     *
-     * Checks authorization for updating assets, validates the presence of the 'note',
-     * attempts to find the asset by ID, and creates a new ActionLog entry if successful.
-     * Returns JSON responses indicating success or failure with appropriate HTTP status codes.
-     *
-     * @param  \Illuminate\Http\Request  $request  The incoming HTTP request containing the 'note'.
-     * @param  Asset  $asset  The ID of the asset to attach the note to.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function store(Request $request, Asset $asset): JsonResponse
-    {
-        $this->authorize('update', $asset);
-
-        if ($request->input('note', '') == '') {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.required', ['attribute' => 'note'])), 422);
-        }
-
-        // Create the note
-        $logaction = new ActionLog();
-        $logaction->item_type = get_class($asset);
-        $logaction->created_by = Auth::id();
-        $logaction->item_id = $asset->id;
-        $logaction->note = $request->input('note', '');
-
-        if ($logaction->logaction('note added')) {
-            // Return a success response
-            return response()->json(Helper::formatStandardApiResponse('success', ['note' => $logaction->note, 'item_id' => $asset->id], trans('general.note_added')));
-        }
-
-        // Return an error response if something went wrong
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Something went wrong'), 500);
-    }
-}

app/Http/Controllers/Api/ProfileController.php

@@ -4,19 +4,15 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\ProfileTransformer;
 use App\Models\CheckoutRequest;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
 use App\Models\CustomField;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ProfileController extends Controller
 {
@@ -69,7 +65,7 @@ class ProfileController extends Controller
             if ($checkoutRequest && $checkoutRequest->itemRequested()) {
                 $assets = [
                     'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
-                    'name' => e($checkoutRequest->itemRequested()->display_name),
+                    'name' => e($checkoutRequest->itemRequested()->present()->name()),
                     'type' => e($checkoutRequest->itemType()),
                     'qty' => (int) $checkoutRequest->quantity,
                     'location' => ($checkoutRequest->location()) ? e($checkoutRequest->location()->name) : null,
@@ -171,22 +167,6 @@ class ProfileController extends Controller
 
     }
 
-    /**
-     * Display the EULAs accepted by the user.
-     *
-     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
-     *  @return \Illuminate\Http\JsonResponse
-     *@since [v8.1.16]
-     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
-     */
-    public function eulas(ProfileTransformer $transformer)
-    {
-        // Only return this user's EULAs
-        $eulas = auth()->user()->eulas;
-        return response()->json(
-            $transformer->transformFiles($eulas, $eulas->count())
-        );
-    }
 
 
 }

app/Http/Controllers/Api/SettingsController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
+use App\Helpers\StorageHelper;
 use App\Http\Transformers\DatatablesTransformer;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -50,22 +51,10 @@ class SettingsController extends Controller
                 })->slice(0, 10)->map(function ($item) use ($settings) {
                     return (object) [
                         'username'        => $item[$settings['ldap_username_field']][0] ?? null,
-                        'display_name'    => $item[$settings['ldap_display_name']][0] ?? null,
                         'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
                         'lastname'        => $item[$settings['ldap_lname_field']][0] ?? null,
                         'firstname'       => $item[$settings['ldap_fname_field']][0] ?? null,
                         'email'           => $item[$settings['ldap_email']][0] ?? null,
-                        'phone'           => $item[$settings['ldap_phone_field']][0] ?? null,
-                        'mobile'          => $item[$settings['ldap_mobile']][0] ?? null,
-                        'jobtitle'        => $item[$settings['ldap_jobtitle']][0] ?? null,
-                        'department'      => $item[$settings['ldap_department']][0] ?? null,
-                        'manager'         => $item[$settings['ldap_manager']][0] ?? null,
-                        'address'         => $item[$settings['ldap_address']][0] ?? null,
-                        'city'            => $item[$settings['ldap_city']][0] ?? null,
-                        'state'           => $item[$settings['ldap_state']][0] ?? null,
-                        'zip'             => $item[$settings['ldap_zip']][0] ?? null,
-                        'country'         => $item[$settings['ldap_country']][0] ?? null,
-                        'location'        => $item[$settings['ldap_location']][0] ?? null,
                     ];
                 });
                 if ($users->count() > 0) {
@@ -89,7 +78,7 @@ class SettingsController extends Controller
             }
         } catch (\Exception $e) {
             Log::debug('Connection failed but we cannot debug it any further on our end.');
-            return response()->json(['message' => $e->getMessage()], 400);
+            return response()->json(['message' => $e->getMessage()], 500);
         }
 
 
@@ -161,11 +150,8 @@ class SettingsController extends Controller
         if (!config('app.lock_passwords')) {
             try {
                 Notification::send(Setting::first(), new MailTest());
-                Log::debug('Attempting to sending to '.config('mail.reply_to.address'));
                 return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
             } catch (\Exception $e) {
-                Log::error('Mail sent error using '.config('mail.reply_to.address') .': '. $e->getMessage());
-                Log::debug($e);
                 return response()->json(['message' => $e->getMessage()], 500);
             }
         }
@@ -329,4 +315,4 @@ class SettingsController extends Controller
     }
 
 
-}
+}

app/Http/Controllers/Api/SuppliersController.php

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

app/Http/Controllers/Api/UploadedFilesController.php

@@ -1,220 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Helpers\StorageHelper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\UploadFileRequest;
-use App\Http\Transformers\UploadedFilesTransformer;
-use App\Models\Actionlog;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-
-class UploadedFilesController extends Controller
-{
-
-
-    /**
-     * List files for an object
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to list files for
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function index(Request $request, $object_type, $id) : JsonResponse | array
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::withTrashed()->find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-        // Columns allowed for sorting
-        $allowed_columns =
-            [
-                'id',
-                'filename',
-                'action_type',
-                'action_date',
-                'note',
-                'created_at',
-            ];
-
-
-        $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
-            ->with('adminuser');
-
-        $offset = ($request->input('offset') > $uploads->count()) ? $uploads->count() : abs($request->input('offset'));
-        $limit = app('api_limit_value');
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-
-        // Text search on action_logs fields
-        // We could use the normal Actionlogs text scope, but it's a very heavy query since it's searching across all relations
-        // and we generally won't need that here
-        if ($request->filled('search')) {
-
-            $uploads->where(
-                function ($query) use ($request) {
-                    $query->where('filename', 'LIKE', '%' . $request->input('search') . '%')
-                        ->orWhere('note', 'LIKE', '%' . $request->input('search') . '%');
-                }
-            );
-        }
-
-        $total = $uploads->count();
-        $uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->get();
-
-        return (new UploadedFilesTransformer())->transformFiles($uploads, $total);
-    }
-
-
-    /**
-     * Accepts a POST to upload a file to the server.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to store so we can check permisisons
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function store(UploadFileRequest $request, $object_type, $id) : JsonResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::withTrashed()->find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-        // If the file storage directory doesn't exist, create it
-        if (! Storage::exists(self::$map_storage_path[$object_type])) {
-            Storage::makeDirectory(self::$map_storage_path[$object_type], 775);
-        }
-
-
-        if ($request->hasFile('file')) {
-            // Loop over the attached files and add them to the object
-            foreach ($request->file('file') as $file) {
-                $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file);
-                $files[] = $file_name;
-                $object->logUpload($file_name, $request->get('notes'));
-            }
-
-            $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')
-                ->where('item_type', '=', self::$map_object_type[$object_type])
-                ->where('item_id', '=', $id)->whereIn('filename', $files)
-                ->get();
-
-            return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer())->transformFiles($files, count($files)), trans_choice('general.file_upload_status.upload.success',  count($files))));
-        }
-
-        // No files were submitted
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.nofiles')));
-    }
-
-
-
-    /**
-     * Check for permissions and display the file.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to delete from the action_logs table
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function show($object_type, $id, $file_id) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
-    {
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::withTrashed()->find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-
-        // Check that the file being requested exists for the object
-        if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)
-        ) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_id')), 200);
-        }
-
-
-        if (! Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.file_not_found'), 200));
-        }
-
-        if (request('inline') == 'true') {
-            $headers = [
-                'Content-Disposition' => 'inline',
-            ];
-            return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers);
-        }
-
-        return StorageHelper::downloader(self::$map_storage_path[$object_type].'/'.$log->filename);
-
-    }
-
-    /**
-     * Delete the associated file
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to delete from the action_logs table
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function destroy($object_type, $id, $file_id) : JsonResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::withTrashed()->find($id);
-        $this->authorize('update', self::$map_object_type[$object_type]);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-
-        // Check for the file
-        $log = Actionlog::query()
-            ->where('id', $file_id)
-            ->where('action_type', 'uploaded')
-            ->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)
-            ->first();
-
-        if ($log) {
-            // Check the file actually exists, and delete it
-            if (Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {
-                Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);
-            }
-            // Delete the record of the file
-            if ($log->logUploadDelete($object, $log->filename)) {
-                return response()->json(Helper::formatStandardApiResponse('success', null, trans_choice('general.file_upload_status.delete.success', 1)), 200);
-            }
-
-
-        }
-
-        // The file doesn't seem to really exist, so report an error
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);
-
-    }
-}

app/Http/Controllers/Api/UsersController.php

@@ -20,12 +20,9 @@ use App\Models\Consumable;
 use App\Models\License;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
-use App\Notifications\WelcomeNotification;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
@@ -65,14 +62,12 @@ class UsersController extends Controller
             'users.jobtitle',
             'users.last_login',
             'users.last_name',
-            'users.display_name',
             'users.locale',
             'users.location_id',
             'users.manager_id',
             'users.notes',
             'users.permissions',
             'users.phone',
-            'users.mobile',
             'users.state',
             'users.two_factor_enrolled',
             'users.two_factor_optin',
@@ -86,12 +81,7 @@ class UsersController extends Controller
             'users.autoassign_licenses',
             'users.website',
 
-        ])->with('manager')
-            ->with('groups')
-            ->with('userloc')
-            ->with('company')
-            ->with('department')
-            ->with('createdBy')
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations', 'eulas')
             ->withCount([
                 'assets as assets_count' => function(Builder $query) {
                     $query->withoutTrashed();
@@ -103,101 +93,19 @@ class UsersController extends Controller
                 'managedLocations as manages_locations_count'
             ]);
 
-        $allowed_columns =
-            [
-                'last_name',
-                'first_name',
-                'display_name',
-                'email',
-                'jobtitle',
-                'username',
-                'employee_num',
-                'groups',
-                'activated',
-                'created_at',
-                'updated_at',
-                'two_factor_enrolled',
-                'two_factor_optin',
-                'last_login',
-                'assets_count',
-                'licenses_count',
-                'consumables_count',
-                'accessories_count',
-                'manages_users_count',
-                'manages_locations_count',
-                'phone',
-                'mobile',
-                'address',
-                'city',
-                'state',
-                'country',
-                'zip',
-                'id',
-                'ldap_import',
-                'two_factor_optin',
-                'two_factor_enrolled',
-                'remote',
-                'vip',
-                'start_date',
-                'end_date',
-                'autoassign_licenses',
-                'website',
-                'locale',
-                'notes',
-                'employee_num',
 
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'department',
-                'manager',
-                'created_by',
-
-            ];
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $users->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $users->TextSearch($request->input('search'));
+        if ($request->filled('search') != '') {
+            $users = $users->TextSearch($request->input('search'));
         }
 
         if ($request->filled('activated')) {
             $users = $users->where('users.activated', '=', $request->input('activated'));
         }
 
-        if ($request->input('admins') == 'true') {
-            $users = $users->OnlyAdminsAndSuperAdmins();
-        }
-
-        if ($request->input('superadmins') == 'true') {
-            $users = $users->OnlySuperAdmins();
-        }
-
         if ($request->filled('company_id')) {
             $users = $users->where('users.company_id', '=', $request->input('company_id'));
         }
 
-        if ($request->filled('phone')) {
-            $users = $users->where('users.phone', '=', $request->input('phone'));
-        }
-
-        if ($request->filled('mobile')) {
-            $users = $users->where('users.mobile', '=', $request->input('mobile'));
-        }
-
         if ($request->filled('location_id')) {
             $users = $users->where('users.location_id', '=', $request->input('location_id'));
         }
@@ -222,10 +130,6 @@ class UsersController extends Controller
             $users = $users->where('users.last_name', '=', $request->input('last_name'));
         }
 
-        if ($request->filled('display_name')) {
-            $users = $users->where('users.display_name', '=', $request->input('display_name'));
-        }
-
         if ($request->filled('employee_num')) {
             $users = $users->where('users.employee_num', '=', $request->input('employee_num'));
         }
@@ -352,6 +256,47 @@ class UsersController extends Controller
                 $users->orderBy('first_name', $order);
                 break;
             default:
+                $allowed_columns =
+                    [
+                        'last_name',
+                        'first_name',
+                        'email',
+                        'jobtitle',
+                        'username',
+                        'employee_num',
+                        'groups',
+                        'activated',
+                        'created_at',
+                        'updated_at',
+                        'two_factor_enrolled',
+                        'two_factor_optin',
+                        'last_login',
+                        'assets_count',
+                        'licenses_count',
+                        'consumables_count',
+                        'accessories_count',
+                        'manages_users_count',
+                        'manages_locations_count',
+                        'phone',
+                        'address',
+                        'city',
+                        'state',
+                        'country',
+                        'zip',
+                        'id',
+                        'ldap_import',
+                        'two_factor_optin',
+                        'two_factor_enrolled',
+                        'remote',
+                        'vip',
+                        'start_date',
+                        'end_date',
+                        'autoassign_licenses',
+                        'website',
+                        'locale',
+                        'notes',
+                    ];
+
                 $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'first_name';
                 $users = $users->orderBy($sort, $order);
                 break;
@@ -385,28 +330,35 @@ class UsersController extends Controller
                 'users.employee_num',
                 'users.first_name',
                 'users.last_name',
-                'users.display_name',
                 'users.gravatar',
                 'users.avatar',
                 'users.email',
             ]
             )->where('show_in_list', '=', '1');
 
+        if (($request->filled('subordinates')) && (!auth()->user()->isSuperUser())) {
+            // Regular manager sees only their subordinates + self
+            $users = auth()->user()->allSubordinates();
+        }
+
         if ($request->filled('search')) {
             $users = $users->where(function ($query) use ($request) {
                 $query->SimpleNameSearch($request->get('search'))
                     ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
-                    ->orWhere('display_name', 'LIKE', '%'.$request->get('search').'%')
                     ->orWhere('email', 'LIKE', '%'.$request->get('search').'%')
                     ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
             });
         }
 
-        $users = $users->orderBy('display_name', 'asc')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
+        $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
         $users = $users->paginate(50);
 
         foreach ($users as $user) {
-            $name_str = $user->display_name;
+            $name_str = '';
+            if ($user->last_name != '') {
+                $name_str .= $user->last_name.', ';
+            }
+            $name_str .= $user->first_name;
 
             if ($user->username != '') {
                 $name_str .= ' ('.$user->username.')';
@@ -458,20 +410,9 @@ class UsersController extends Controller
             $user->password = $user->noPassword();
         }
 
-        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
         
         if ($user->save()) {
-
-            if (($user->activated == '1') && ($user->email != '') && ($request->input('send_welcome') == '1')) {
-
-                try {
-                    $user->notify(new WelcomeNotification($user));
-                } catch (\Exception $e) {
-                    Log::warning('Could not send welcome notification for user: ' . $e->getMessage());
-                }
-
-            }
-
             if ($request->filled('groups')) {
                 $user->groups()->sync($request->input('groups'));
             } else {
@@ -539,29 +480,8 @@ class UsersController extends Controller
                 return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
             }
 
-            // check for permissions related fields and pull them out if the current user cannot edit them
-            if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
-
-                if ($request->filled('password')) {
-                    $user->password = bcrypt($request->input('password'));
-                }
-
-                if ($request->filled('username')) {
-                    $user->username = $request->input('username');
-                }
-
-                if ($request->filled('display_name')) {
-                    $user->display_name = $request->input('display_name');
-                }
-
-                if ($request->filled('email')) {
-                    $user->email = $request->input('email');
-                }
-
-                if ($request->filled('activated')) {
-                    $user->activated = $request->input('activated');
-                }
-
+            if ($request->filled('password')) {
+                $user->password = bcrypt($request->input('password'));
             }
 
             // We need to use has()  instead of filled()
@@ -583,7 +503,7 @@ class UsersController extends Controller
                 Asset::where('assigned_type', User::class)
                     ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
             }
-            app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+            app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
 
             if ($user->save()) {
                 // Check if the request has groups passed and has a value, AND that the user us a superuser
@@ -762,6 +682,7 @@ class UsersController extends Controller
         $this->authorize('view', License::class);
         
         if ($user = User::where('id', $id)->withTrashed()->first()) {
+            $this->authorize('update', $user);
             $licenses = $user->licenses()->get();
             return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
         }
@@ -832,7 +753,7 @@ class UsersController extends Controller
      */
     public function eulas(User $user, ActionlogsTransformer $transformer)
     {
-        $this->authorize('view', User::class);
+        $this->authorize('view', Asset::class);
 
         $eulas = $user->eulas;
         return response()->json(
@@ -876,37 +797,4 @@ class UsersController extends Controller
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')), 200);
 
     }
-
-
-    /**
-     * Run the LDAP sync command to import users from LDAP via API.
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since 8.2.2
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function syncLdapUsers(Request $request)
-    {
-        $this->authorize('update', User::class);
-        // Call Artisan LDAP import command.
-
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('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 response()->json(Helper::formatStandardApiResponse('error', null,trans('general.no_results')), 200);
-        }
-
-        // Direct user to appropriate status page.
-        if ($ldap_results['error']) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $ldap_results['error_message']), 200);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('success', null, $ldap_results['summary']), 200);
-
-    }
 }

app/Http/Controllers/AssetMaintenancesController.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\ImageUploadRequest;
 use App\Models\Asset;
-use App\Models\Maintenance;
+use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
@@ -18,23 +17,29 @@ use \Illuminate\Http\RedirectResponse;
  *
  * @version    v2.0
  */
-class MaintenancesController extends Controller
+class AssetMaintenancesController extends Controller
 {
 
     /**
     *  Returns a view that invokes the ajax tables which actually contains
-    * the content for the asset maintenances listing.
+    * the content for the asset maintenances listing, which is generated in getDatatable.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @see AssetMaintenancesController::getDatatable() method that generates the JSON response
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
     */
     public function index() : View
     {
         $this->authorize('view', Asset::class);
-        return view('maintenances.index');
+        return view('asset_maintenances/index');
     }
 
     /**
      *  Returns a form view to create a new asset maintenance.
      *
-     * @see MaintenancesController::postCreate() method that stores the data
+     * @see AssetMaintenancesController::postCreate() method that stores the data
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      * @since [v1.8]
@@ -50,21 +55,21 @@ class MaintenancesController extends Controller
             $asset->asset_id = $asset->id;
         }
         
-        return view('maintenances/edit')
-                   ->with('maintenanceType', Maintenance::getImprovementOptions())
+        return view('asset_maintenances/edit')
+                   ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
                    ->with('asset', $asset)
-                   ->with('item', new Maintenance);
+                   ->with('item', new AssetMaintenance);
     }
 
     /**
     *  Validates and stores the new asset maintenance
     *
-    * @see MaintenancesController::getCreate() method for the form
+    * @see AssetMaintenancesController::getCreate() method for the form
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
     */
-    public function store(ImageUploadRequest $request) : RedirectResponse
+    public function store(Request $request) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
 
@@ -73,74 +78,72 @@ class MaintenancesController extends Controller
         // Loop through the selected assets
         foreach ($assets as $asset) {
 
-            $maintenance = new Maintenance();
-            $maintenance->supplier_id = $request->input('supplier_id');
-            $maintenance->is_warranty = $request->input('is_warranty');
-            $maintenance->cost = $request->input('cost');
-            $maintenance->notes = $request->input('notes');
-            $maintenance->url = $request->input('url');
+            $assetMaintenance = new AssetMaintenance();
+            $assetMaintenance->supplier_id = $request->input('supplier_id');
+            $assetMaintenance->is_warranty = $request->input('is_warranty');
+            $assetMaintenance->cost = $request->input('cost');
+            $assetMaintenance->notes = $request->input('notes');
 
             // Save the asset maintenance data
-            $maintenance->asset_id = $asset->id;
-            $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-            $maintenance->name = $request->input('name');
-            $maintenance->start_date = $request->input('start_date');
-            $maintenance->completion_date = $request->input('completion_date');
-            $maintenance->created_by = auth()->id();
+            $assetMaintenance->asset_id = $asset->id;
+            $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+            $assetMaintenance->title = $request->input('title');
+            $assetMaintenance->start_date = $request->input('start_date');
+            $assetMaintenance->completion_date = $request->input('completion_date');
+            $assetMaintenance->created_by = auth()->id();
 
-            if (($maintenance->completion_date !== null)
-                && ($maintenance->start_date !== '')
-                && ($maintenance->start_date !== '0000-00-00')
+            if (($assetMaintenance->completion_date !== null)
+                && ($assetMaintenance->start_date !== '')
+                && ($assetMaintenance->start_date !== '0000-00-00')
             ) {
-                $startDate = Carbon::parse($maintenance->start_date);
-                $completionDate = Carbon::parse($maintenance->completion_date);
-                $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
+                $startDate = Carbon::parse($assetMaintenance->start_date);
+                $completionDate = Carbon::parse($assetMaintenance->completion_date);
+                $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
             }
 
-            $maintenance = $request->handleImages($maintenance);
 
             // Was the asset maintenance created?
-            if (!$maintenance->save()) {
-                return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
+            if (!$assetMaintenance->save()) {
+                return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
             }
         }
 
         return redirect()->route('maintenances.index')
-            ->with('success', trans('admin/maintenances/message.create.success'));
+            ->with('success', trans('admin/asset_maintenances/message.create.success'));
 
     }
 
     /**
     *  Returns a form view to edit a selected asset maintenance.
     *
-    * @see MaintenancesController::postEdit() method that stores the data
+    * @see AssetMaintenancesController::postEdit() method that stores the data
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
     */
-    public function edit(Maintenance $maintenance) : View | RedirectResponse
+    public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
         $this->authorize('update', $maintenance->asset);
 
-        return view('maintenances/edit')
+        return view('asset_maintenances/edit')
             ->with('selected_assets', $maintenance->asset->pluck('id')->toArray())
             ->with('asset_ids', request()->input('asset_ids', []))
-            ->with('maintenanceType', Maintenance::getImprovementOptions())
+            ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
             ->with('item', $maintenance);
     }
 
     /**
      *  Validates and stores an update to an asset maintenance
      *
-     * @see MaintenancesController::postEdit() method that stores the data
+     * @see AssetMaintenancesController::postEdit() method that stores the data
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @param Request $request
-     * @param int $maintenanceId
+     * @param int $assetMaintenanceId
      * @version v1.0
      * @since [v1.8]
      */
-    public function update(ImageUploadRequest $request, Maintenance $maintenance) : View | RedirectResponse
+    public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
         $this->authorize('update', $maintenance->asset);
@@ -150,10 +153,9 @@ class MaintenancesController extends Controller
         $maintenance->cost =  $request->input('cost');
         $maintenance->notes = $request->input('notes');
         $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $maintenance->name = $request->input('name');
+        $maintenance->title = $request->input('title');
         $maintenance->start_date = $request->input('start_date');
         $maintenance->completion_date = $request->input('completion_date');
-        $maintenance->url = $request->input('url');
 
 
         // Todo - put this in a getter/setter?
@@ -174,11 +176,10 @@ class MaintenancesController extends Controller
             $completionDate = Carbon::parse($maintenance->completion_date);
             $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
         }
-        $maintenance = $request->handleImages($maintenance);
 
         if ($maintenance->save()) {
             return redirect()->route('maintenances.index')
-                            ->with('success', trans('admin/maintenances/message.edit.success'));
+                            ->with('success', trans('admin/asset_maintenances/message.edit.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
@@ -188,11 +189,11 @@ class MaintenancesController extends Controller
     *  Delete an asset maintenance
     *
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $maintenanceId
+    * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
     */
-    public function destroy(Maintenance $maintenance) : RedirectResponse
+    public function destroy(AssetMaintenance $maintenance) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
         $this->authorize('update', $maintenance->asset);
@@ -200,19 +201,19 @@ class MaintenancesController extends Controller
         $maintenance->delete();
         // Redirect to the asset_maintenance management page
         return redirect()->route('maintenances.index')
-                       ->with('success', trans('admin/maintenances/message.delete.success'));
+                       ->with('success', trans('admin/asset_maintenances/message.delete.success'));
     }
 
     /**
     *  View an asset maintenance
     *
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $maintenanceId
+    * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
     */
-    public function show(Maintenance $maintenance) : View | RedirectResponse
+    public function show(AssetMaintenance $maintenance) : View | RedirectResponse
     {
-        return view('maintenances.view')->with('maintenance', $maintenance);
+        return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
     }
 }

app/Http/Controllers/AssetModelsController.php

@@ -82,26 +82,12 @@ class AssetModelsController extends Controller
         $model->notes = $request->input('notes');
         $model->created_by = auth()->id();
         $model->requestable = $request->has('requestable');
-        $model->require_serial = $request->input('require_serial', 0);
 
         if ($request->input('fieldset_id') != '') {
             $model->fieldset_id = $request->input('fieldset_id');
         }
 
-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = AssetModel::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'models/'.$new_image_name;
-                Storage::disk('public')->copy('models/'.$cloned_model_img->image, $new_image);
-                $model->image = $new_image_name;
-            }
-
-        } else {
-            $model = $request->handleImages($model);
-        }
-
-
+        $model = $request->handleImages($model);
 
         if ($model->save()) {
             if ($this->shouldAddDefaultValues($request->input())) {
@@ -156,7 +142,7 @@ class AssetModelsController extends Controller
         $model->category_id = $request->input('category_id');
         $model->notes = $request->input('notes');
         $model->requestable = $request->input('requestable', '0');
-        $model->require_serial = $request->input('require_serial', 0);
+
         $model->fieldset_id = $request->input('fieldset_id');
 
         if ($model->save()) {
@@ -285,7 +271,7 @@ class AssetModelsController extends Controller
             ->with('depreciation_list', Helper::depreciationList())
             ->with('item', $model)
             ->with('model_id', $model->id)
-            ->with('cloned_model', $cloned_model);
+            ->with('clone_model', $cloned_model);
     }
 
 

app/Http/Controllers/AssetModelsFilesController.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\StorageHelper;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\AssetModel;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class AssetModelsFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @param UploadFileRequest $request
+     * @param int $modelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@since [v1.0]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function store(UploadFileRequest $request, $modelId = null) : RedirectResponse
+    {
+        if (! $model = AssetModel::find($modelId)) {
+            return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $model);
+
+        if ($request->hasFile('file')) {
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+
+                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file);
+
+                $model->logUpload($file_name, $request->get('notes'));
+            }
+
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function show(AssetModel $model, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    {
+
+            $this->authorize('view', $model);
+
+            if (! $log = Actionlog::find($fileId)) {
+                return response('No matching record for that model/file', 500)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+
+            if (! Storage::exists($file)) {
+                return response('File '.$file.' not found on server', 404)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function destroy(AssetModel $model, $fileId = null) : RedirectResponse
+    {
+        $rel_path = 'private_uploads/assetmodels';
+        $this->authorize('update', $model);
+        $log = Actionlog::find($fileId);
+        if ($log) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
+            }
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+
+    }
+}

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -153,8 +153,7 @@ class AssetCheckinController extends Controller
         if ($asset->save()) {
 
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
-            return Helper::getRedirectOption($request, $asset->id, 'Assets')
-                ->with('success', trans('admin/hardware/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.checkin.success'));
         }
         // Redirect to the asset management page with error
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -65,8 +65,6 @@ class AssetCheckoutController extends Controller
      */
     public function store(AssetCheckoutRequest $request, $assetId) : RedirectResponse
     {
-
-
         try {
             // Check if the asset exists
             if (! $asset = Asset::find($assetId)) {
@@ -83,7 +81,6 @@ class AssetCheckoutController extends Controller
             $admin = auth()->user();
 
             $target = $this->determineCheckoutTarget();
-            session()->put(['checkout_to_type' => $target]);
 
             $asset = $this->updateAssetLocation($asset, $target);
 
@@ -126,7 +123,7 @@ class AssetCheckoutController extends Controller
             session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
             if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->get('note'), $request->get('name'))) {
-                return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                     ->with('success', trans('admin/hardware/message.checkout.success'));
             }
             // Redirect to the asset management page with error

app/Http/Controllers/Assets/AssetFilesController.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Http\Controllers\Assets;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use \Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class AssetFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @param UploadFileRequest $request
+     * @param int $assetId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@since [v1.0]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function store(UploadFileRequest $request, Asset $asset) : RedirectResponse
+    {
+
+        $this->authorize('update', $asset);
+
+        if ($request->hasFile('file')) {
+            if (! Storage::exists('private_uploads/assets')) {
+                Storage::makeDirectory('private_uploads/assets', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
+                
+                $asset->logUpload($file_name, $request->get('notes'));
+            }
+
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
+        }
+
+        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function show(Asset $asset, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
+    {
+
+        $this->authorize('view', $asset);
+
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+            $file = 'private_uploads/assets/'.$log->filename;
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            try {
+                 return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found'));
+            }
+
+        }
+
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+
+
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function destroy(Asset $asset, $fileId = null) : RedirectResponse
+    {
+        $this->authorize('update', $asset);
+        $rel_path = 'private_uploads/assets';
+
+        if ($log = Actionlog::find($fileId)) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
+            }
+            $log->delete();
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+    }
+
+}

app/Http/Controllers/Assets/AssetsController.php

@@ -110,35 +110,17 @@ class AssetsController extends Controller
         // This is only necessary on create, not update, since bulk editing is handled
         // differently
         $asset_tags = $request->input('asset_tags');
-        $model = AssetModel::find($request->input('model_id'));
-        $serial_errors = [];
-        $serials = $request->input('serials');
 
         $settings = Setting::getSettings();
 
-        //Validate required serial based on model setting
-        for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
-            if ($model && $model->require_serial === 1 && empty($serials[$a])) {
-                $serial_errors["serials.$a"] = trans('admin/hardware/form.serial_required', ['number' => $a]);
-            }
-
-        }
-
-        if (!empty($serial_errors)) {
-            return redirect()->back()
-                ->withInput()
-                ->withErrors($serial_errors);
-        }
-
-        $asset = null;
-        $companyId = Company::getIdForCurrentUser($request->input('company_id'));
         $successes = [];
         $failures = [];
+        $serials = $request->input('serials');
+        $asset = null;
 
-        for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
+        for ($a = 1; $a <= count($asset_tags); $a++) {
             $asset = new Asset();
-
-            $asset->model()->associate($model);
+            $asset->model()->associate(AssetModel::find($request->input('model_id')));
             $asset->name = $request->input('name');
 
             // Check for a corresponding serial
@@ -150,7 +132,7 @@ class AssetsController extends Controller
                 $asset->asset_tag = $asset_tags[$a];
             }
 
-            $asset->company_id              = $companyId;
+            $asset->company_id              = Company::getIdForCurrentUser($request->input('company_id'));
             $asset->model_id                = $request->input('model_id');
             $asset->order_number            = $request->input('order_number');
             $asset->notes                   = $request->input('notes');
@@ -175,21 +157,14 @@ class AssetsController extends Controller
                 $asset->location_id = $request->input('rtd_location_id', null);
             }
 
-            if ($request->has('use_cloned_image')) {
-                $cloned_model_img = Asset::select('image')->find($request->input('clone_image_from_id'));
-                if ($cloned_model_img) {
-                    $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                    $new_image = 'assets/'.$new_image_name;
-                    Storage::disk('public')->copy('assets/'.$cloned_model_img->image, $new_image);
-                    $asset->image = $new_image_name;
-                }
-
-            } else {
+            // Create the image (if one was chosen.)
+            if ($request->has('image')) {
                 $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) {
@@ -251,32 +226,25 @@ class AssetsController extends Controller
                 $failures[] = join(",", $asset->getErrors()->all());
             }
         }
-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-
-        session()->put(['checkout_to_type' => $request->get('checkout_to_type'),
-                       'other_redirect' =>  'model' ]);
 
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
 
         if ($successes) {
             if ($failures) {
                 //some succeeded, some failed
-                return Helper::getRedirectOption($request, $asset->id, 'Assets') //FIXME - not tested
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets')) //FIXME - not tested
                 ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]))
                     ->with('warning', trans_choice('admin/hardware/message.create.partial_failure', $failures, ['failures' => join("; ", $failures)]));
             } else {
                 if (count($successes) == 1) {
                     //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed
                     //and re-translated
-                    return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                         ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));
                 } else {
                     //multi-success
-                    return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                         ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]));
                 }
             }
@@ -297,7 +265,6 @@ class AssetsController extends Controller
     public function edit(Asset $asset) : View | RedirectResponse
     {
         $this->authorize($asset);
-        session()->put('back_url', url()->previous());
         return view('hardware/edit')
             ->with('item', $asset)
             ->with('statuslabel_list', Helper::statusLabelList())
@@ -363,7 +330,7 @@ class AssetsController extends Controller
         $asset->purchase_cost = $request->input('purchase_cost', null);
         $asset->purchase_date = $request->input('purchase_date', null);
         $asset->next_audit_date = $request->input('next_audit_date', null);
-        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model?->eol > 0)) {
+        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) {
             $asset->purchase_date = $request->input('purchase_date', null); 
             $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
             $asset->eol_explicit = false;
@@ -379,7 +346,7 @@ class AssetsController extends Controller
            } else {
                $asset->eol_explicit = true;
            }
-        } elseif (!$request->filled('asset_eol_date') && (($asset->model?->eol) == 0)) {
+        } elseif (!$request->filled('asset_eol_date') && (($asset->model->eol) == 0)) {
            $asset->asset_eol_date = null;
 		   $asset->eol_explicit = false;
         }
@@ -398,7 +365,6 @@ class AssetsController extends Controller
             $asset->assigned_to = null;
             $asset->assigned_type = null;
             $asset->accepted = null;
-            $asset->last_checkin = now();
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
         }
 
@@ -442,9 +408,6 @@ class AssetsController extends Controller
         $model = AssetModel::find($request->get('model_id'));
         if (($model) && ($model->fieldset)) {
             foreach ($model->fieldset->fields as $field) {
-                if ($field->element == 'checkbox' && !$request->has($field->db_column)) {
-                    $asset->{$field->db_column} = null;
-                }
                 if ($request->has($field->db_column)) {
                     if ($field->field_encrypted == '1') {
                         if (Gate::allows('assets.view.encrypted_custom_fields')) {
@@ -464,22 +427,11 @@ class AssetsController extends Controller
                 }
             }
         }
-        session()->put([
-            'redirect_option' => $request->get('redirect_option'),
-            'checkout_to_type' => $request->get('checkout_to_type'),
-            'other_redirect' => $request->get('redirect_option') === 'other_redirect' ? 'model' : null,
-        ]);
 
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
-        //Validate required serial based on model setting
-        if ($model && $model->require_serial === 1 && empty($serial[1])) {
-            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
-                ->with('warning', trans('admin/hardware/form.serial_required_post_model_update', [
-                    'asset_model' => $model->name
-                ]));
-        }
         if ($asset->save()) {
-            return Helper::getRedirectOption($request, $asset->id, 'Assets')
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                 ->with('success', trans('admin/hardware/message.update.success'));
         }
 
@@ -684,9 +636,8 @@ class AssetsController extends Controller
      */
     public function getClone(Asset $asset)
     {
-        $this->authorize('create', Asset::class);
+        $this->authorize('create', $asset);
         $cloned = clone $asset;
-        $cloned_model = $asset;
         $cloned->id = null;
         $cloned->asset_tag = '';
         $cloned->serial = '';
@@ -696,7 +647,6 @@ class AssetsController extends Controller
         return view('hardware/edit')
             ->with('statuslabel_list', Helper::statusLabelList())
             ->with('statuslabel_types', Helper::statusTypeList())
-            ->with('cloned_model', $cloned_model)
             ->with('item', $cloned);
     }
 
@@ -822,7 +772,7 @@ class AssetsController extends Controller
                             'item_id' => $asset->id,
                             'item_type' => Asset::class,
                             'created_by' =>  auth()->id(),
-                            'note' => 'Checkout imported by '.auth()->user()->display_name.' from history importer',
+                            'note' => 'Checkout imported by '.auth()->user()->present()->fullName().' from history importer',
                             'target_id' => $item[$asset_tag][$batch_counter]['user_id'],
                             'target_type' => User::class,
                             'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
@@ -850,7 +800,7 @@ class AssetsController extends Controller
                                 'item_id' => $item[$asset_tag][$batch_counter]['asset_id'],
                                 'item_type' => Asset::class,
                                 'created_by' => auth()->id(),
-                                'note' => 'Checkin imported by '.auth()->user()->display_name.' from history importer',
+                                'note' => 'Checkin imported by '.auth()->user()->present()->fullName().' from history importer',
                                 'target_id' => null,
                                 'created_at' => $checkin_date,
                                 'action_type' => 'checkin',
@@ -1046,7 +996,7 @@ class AssetsController extends Controller
             }
 
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);
-            return Helper::getRedirectOption($request, $asset->id, 'Assets')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.audit.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($asset->getErrors());

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -112,47 +112,11 @@ class BulkAssetsController extends Controller
         // This handles all of the pivot sorting below (versus the assets.* fields in the allowed_columns array)
         $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.id';
 
-        $query = Asset::with('assignedTo', 'location', 'model')
+        $assets = Asset::with('assignedTo', 'location', 'model')
                 ->whereIn('assets.id', $asset_ids)
                 ->withTrashed();
 
-
-        switch ($sort_override) {
-            case 'model':
-                $query->OrderModels($order);
-                break;
-            case 'model_number':
-                $query->OrderModelNumber($order);
-                break;
-            case 'category':
-                $query->OrderCategory($order);
-                break;
-            case 'manufacturer':
-                $query->OrderManufacturer($order);
-                break;
-            case 'company':
-                $query->OrderCompany($order);
-                break;
-            case 'location':
-                $query->OrderLocation($order);
-                break;
-            case 'rtd_location':
-                $query->OrderRtdLocation($order);
-                break;
-            case 'status_label':
-                $query->OrderStatus($order);
-                break;
-            case 'supplier':
-                $query->OrderSupplier($order);
-                break;
-            case 'assigned_to':
-                $query->OrderAssigned($order);
-                break;
-            default:
-                $query->orderBy($column_sort, $order);
-                break;
-        }
-        $assets = $query->get();
+        $assets = $assets->get();
 
         if ($assets->isEmpty()) {
             Log::debug('No assets were found for the provided IDs', ['ids' => $asset_ids]);
@@ -161,9 +125,8 @@ class BulkAssetsController extends Controller
 
         $models = $assets->unique('model_id');
         $modelNames = [];
-
         foreach($models as $model) {
-            $modelNames[] = $model->model?->name;
+            $modelNames[] = $model->model->name;
         }
 
         if ($request->filled('bulk_actions')) {
@@ -197,6 +160,7 @@ class BulkAssetsController extends Controller
 
                 case 'edit':
                     $this->authorize('update', Asset::class);
+
                     return view('hardware/bulk')
                         ->with('assets', $asset_ids)
                         ->with('statuslabel_list', Helper::statusLabelList())
@@ -205,7 +169,40 @@ class BulkAssetsController extends Controller
             }
         }
 
-
+        switch ($sort_override) {
+            case 'model':
+                $assets->OrderModels($order);
+                break;
+            case 'model_number':
+                $assets->OrderModelNumber($order);
+                break;
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
+                break;
+            case 'company':
+                $assets->OrderCompany($order);
+                break;
+            case 'location':
+                $assets->OrderLocation($order);
+            case 'rtd_location':
+                $assets->OrderRtdLocation($order);
+                break;
+            case 'status_label':
+                $assets->OrderStatus($order);
+                break;
+            case 'supplier':
+                $assets->OrderSupplier($order);
+                break;
+            case 'assigned_to':
+                $assets->OrderAssigned($order);
+                break;
+            default:
+                $assets->orderBy($column_sort, $order);
+                break;
+        }
 
         return redirect()->back()->with('error', 'No action selected');
     }
@@ -224,8 +221,11 @@ class BulkAssetsController extends Controller
         $error_array = array();
 
         // Get the back url from the session and then destroy the session
+        $bulk_back_url = route('hardware.index');
 
-        $bulk_back_url = $request->session()->pull('bulk_back_url', url()->previous());
+        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();
 
@@ -240,6 +240,10 @@ class BulkAssetsController extends Controller
             $custom_fields_to_null[str_replace('null', '', $key)] = $value;
         }
 
+
+
+
+
      
         if (! $request->filled('ids') || count($request->input('ids')) == 0) {
             return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -270,7 +274,6 @@ class BulkAssetsController extends Controller
             || ($request->filled('company_id'))
             || ($request->filled('status_id'))
             || ($request->filled('model_id'))
-            || ($request->filled('notes'))
             || ($request->filled('next_audit_date'))
             || ($request->filled('asset_eol_date'))
             || ($request->filled('null_name'))
@@ -278,7 +281,6 @@ class BulkAssetsController extends Controller
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
             || ($request->filled('null_asset_eol_date'))
-            || ($request->filled('null_notes'))
             || ($request->anyFilled($custom_field_columns))
             || ($request->anyFilled(array_keys($null_custom_fields_inputs)))
 
@@ -303,8 +305,7 @@ class BulkAssetsController extends Controller
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
                     ->conditionallyAddItem('next_audit_date')
-                    ->conditionallyAddItem('asset_eol_date')
-                    ->conditionallyAddItem('notes');
+                    ->conditionallyAddItem('asset_eol_date');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
@@ -361,10 +362,6 @@ class BulkAssetsController extends Controller
                     }
                 }
 
-                if ($request->input('null_notes')=='1') {
-                    $this->update_array['notes'] = null;
-                }
-
 
 
                 if ($request->filled('purchase_cost')) {
@@ -467,7 +464,7 @@ class BulkAssetsController extends Controller
                  */
 
                 // Does the model have a fieldset?
-                if ($asset->model?->fieldset) {
+                if ($asset->model->fieldset) {
                     foreach ($asset->model->fieldset->fields as $field) {
 
                         // null custom fields
@@ -537,13 +534,7 @@ class BulkAssetsController extends Controller
             } // end asset foreach
 
             if ($has_errors > 0) {
-                session()->put('bulkedit_ids', $request->input('ids'));
-                session()->put('bulk_asset_errors',$error_array);
-
-                return redirect()
-                    ->route('hardware.index')
-                    ->with('bulk_asset_errors', $error_array)
-                    ->withInput();
+                return redirect($bulk_back_url)->with('bulk_asset_errors', $error_array);
             }
 
             return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
@@ -618,25 +609,9 @@ class BulkAssetsController extends Controller
     {
         $this->authorize('checkout', Asset::class);
 
-        $alreadyAssigned = collect();
-
-        if (old('selected_assets') && is_array(old('selected_assets'))) {
-            $assets = Asset::findMany(old('selected_assets'));
-
-            [$assignable, $alreadyAssigned] = $assets->partition(function (Asset $asset) {
-                return !$asset->assigned_to;
-            });
-
-            session()->flashInput(['selected_assets' => $assignable->pluck('id')->values()->toArray()]);
-        }
-
         $do_not_change = ['' => trans('general.do_not_change')];
         $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
-
-        return view('hardware/bulk-checkout', [
-            'statusLabel_list' => $status_label_list,
-            'removed_assets' => $alreadyAssigned,
-        ]);
+        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
     }
 
     /**
@@ -650,7 +625,6 @@ class BulkAssetsController extends Controller
             $admin = auth()->user();
 
             $target = $this->determineCheckoutTarget();
-            session()->put(['checkout_to_type' => $target]);
 
             if (! is_array($request->get('selected_assets'))) {
                 return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
@@ -660,30 +634,6 @@ class BulkAssetsController extends Controller
 
             $assets = Asset::findOrFail($asset_ids);
 
-            // Prevent checking out assets that are already checked out
-            if ($assets->pluck('assigned_to')->unique()->filter()->isNotEmpty()) {
-                // re-add the asset ids so the assets select is re-populated
-                $request->session()->flashInput(['selected_assets' => $asset_ids]);
-
-                return redirect(route('hardware.bulkcheckout.show'))
-                    ->with('error', trans('general.error_assets_already_checked_out'));
-            }
-
-            // Prevent checking out assets across companies if FMCS enabled
-            if (Setting::getSettings()->full_multiple_companies_support && $target->company_id) {
-                $company_ids = $assets->pluck('company_id')->unique();
-
-                // if there is more than one unique company id or the singular company id does not match
-                // then the checkout is invalid
-                if ($company_ids->count() > 1 || $company_ids->first() != $target->company_id) {
-                    // re-add the asset ids so the assets select is re-populated
-                    $request->session()->flashInput(['selected_assets' => $asset_ids]);
-
-                    return redirect(route('hardware.bulkcheckout.show'))
-                        ->with('error', trans('general.error_user_company_multiple'));
-                }
-            }
-
             if (request('checkout_to_type') == 'asset') {
                 foreach ($asset_ids as $asset_id) {
                     if ($target->id == $asset_id) {
@@ -776,33 +726,4 @@ class BulkAssetsController extends Controller
          }
         return false;
     }
-
-    public function bulkEditForm(): View|RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-
-        $asset_ids = session()->pull('bulkedit_ids', []);
-
-        if (empty($asset_ids)) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.update.no_assets_selected'));
-        }
-
-        $assets = Asset::with('model')->withTrashed()->whereIn('id', $asset_ids)->get();
-
-        if ($assets->isEmpty()) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.update.assets_do_not_exist_or_are_invalid'));
-        }
-
-        $models = $assets->unique('model_id');
-        $modelNames = [];
-        foreach ($models as $model) {
-            $modelNames[] = $model->model->name;
-        }
-
-        return view('hardware/bulk')
-            ->with('assets', $asset_ids)
-            ->with('statuslabel_list', Helper::statusLabelList())
-            ->with('models', $models->pluck(['model']))
-            ->with('modelNames', $modelNames);
-    }
 }

app/Http/Controllers/BulkAssetModelsController.php

@@ -92,9 +92,7 @@ class BulkAssetModelsController extends Controller
             $update_array['min_amt'] = $request->input('min_amt');
         }
 
-        if ($request->filled('require_serial')) {
-            $update_array['require_serial'] = $request->input('require_serial');
-        }
+
 
         if (count($update_array) > 0) {
             AssetModel::whereIn('id', $models_raw_array)->update($update_array);

app/Http/Controllers/BulkCategoriesController.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Actions\Categories\DestroyCategoryAction;
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssetModels;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
-use App\Models\Category;
-use Illuminate\Http\Request;
-
-class BulkCategoriesController extends Controller
-{
-    public function destroy(Request $request)
-    {
-        $this->authorize('delete', Category::class);
-
-        $errors = [];
-        $success_count = 0;
-
-        foreach ($request->ids as $id) {
-            $category = Category::find($id);
-            if (is_null($category)) {
-                $errors[] = trans('admin/categories/message.does_not_exist');
-                continue;
-            }
-            try {
-                DestroyCategoryAction::run(category: $category);
-                $success_count++;
-            } catch (ItemStillHasAccessories $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
-            } catch (ItemStillHasAssetModels) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_asset_models_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
-            } catch (ItemStillHasAssets) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
-            } catch (ItemStillHasComponents) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
-            } catch (ItemStillHasConsumables) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
-            } catch (ItemStillHasLicenses) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);;
-            } catch (\Exception $e) {
-                report($e);
-                $errors[] = trans('general.something_went_wrong');
-            }
-        }
-        if (count($errors) > 0) {
-            if ($success_count > 0) {
-                return redirect()->route('categories.index')->with('success', trans_choice('admin/categories/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
-            }
-            return redirect()->route('categories.index')->with('multi_error_messages', $errors);
-        } else {
-            return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.bulk_success'));
-        }
-    }
-}

app/Http/Controllers/BulkManufacturersController.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Actions\Manufacturers\DeleteManufacturerAction;
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssetModels;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasChildren;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
-use App\Models\Manufacturer;
-use Illuminate\Http\Request;
-
-class BulkManufacturersController extends Controller
-{
-    public function destroy(Request $request)
-    {
-        $this->authorize('delete', Manufacturer::class);
-
-        $errors = [];
-        $success_count = 0;
-        foreach ($request->ids as $id) {
-            $manufacturer = Manufacturer::find($id);
-            if (is_null($manufacturer)) {
-                $errors[] = trans('admin/manufacturers/message.does_not_exist');
-                continue;
-            }
-            try {
-                DeleteManufacturerAction::run(manufacturer: $manufacturer);
-                $success_count++;
-            } catch (ItemStillHasAssets $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
-            } catch (ItemStillHasAccessories $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_accessories_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
-            } catch (ItemStillHasConsumables $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
-            } catch (ItemStillHasComponents $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
-            } catch (ItemStillHasLicenses $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);;
-            } catch (\Exception $e) {
-                report($e);
-                $errors[] = trans('general.something_went_wrong');
-            }
-        }
-        if (count($errors) > 0) {
-            if ($success_count > 0) {
-                return redirect()->route('manufacturers.index')->with('success', trans_choice('admin/manufacturers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
-            }
-            return redirect()->route('manufacturers.index')->with('multi_error_messages', $errors);
-        } else {
-            return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.bulk_success'));
-        }
-    }
-}

app/Http/Controllers/BulkSuppliersController.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Actions\Suppliers\DestroySupplierAction;
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasMaintenances;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasLicenses;
-use App\Models\Supplier;
-use Illuminate\Http\Request;
-
-class BulkSuppliersController extends Controller
-{
-    public function destroy(Request $request)
-    {
-        $this->authorize('delete', Supplier::class);
-
-        $errors = [];
-        $success_count = 0;
-
-        foreach ($request->ids as $id) {
-            $supplier = Supplier::find($id);
-            if (is_null($supplier)) {
-                $errors[] = trans('admin/suppliers/message.delete.not_found');
-                continue;
-            }
-            try {
-                DestroySupplierAction::run(supplier: $supplier);
-            } catch (ItemStillHasAssets $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_assets', ['asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (ItemStillHasMaintenances $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (ItemStillHasLicenses $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (ItemStillHasAccessories $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_accessories', ['accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (ItemStillHasConsumables $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_consumables', ['consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (ItemStillHasComponents $e) {
-                $errors[] = trans('general.bulk_delete_associations.assoc_components', ['components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier'), 'item_name' => $supplier->name]);
-            } catch (\Exception $e) {
-                report($e);
-                $errors[] = trans('general.something_went_wrong');
-            }
-        }
-        if (count($errors) > 0) {
-            if ($success_count > 0) {
-                return redirect()->route('suppliers.index')->with('success', trans_choice('admin/suppliers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
-            }
-            return redirect()->route('suppliers.index')->with('multi_error_messages', $errors);
-        } else {
-            return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.bulk_success'));
-        }
-    }
-}

app/Http/Controllers/CategoriesController.php

@@ -2,14 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\Categories\DestroyCategoryAction;
-use App\Exceptions\ItemStillHasAccessories;
-use App\Exceptions\ItemStillHasAssetModels;
-use App\Exceptions\ItemStillHasAssets;
-use App\Exceptions\ItemStillHasChildren;
-use App\Exceptions\ItemStillHasComponents;
-use App\Exceptions\ItemStillHasConsumables;
-use App\Exceptions\ItemStillHasLicenses;
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Category;
@@ -76,7 +68,6 @@ class CategoriesController extends Controller
         $category->eula_text = $request->input('eula_text');
         $category->use_default_eula = $request->input('use_default_eula', '0');
         $category->require_acceptance = $request->input('require_acceptance', '0');
-        $category->alert_on_response = $request->input('alert_on_response', '0');
         $category->checkin_email = $request->input('checkin_email', '0');
         $category->notes = $request->input('notes');
         $category->created_by = auth()->id();
@@ -130,7 +121,6 @@ class CategoriesController extends Controller
         $category->eula_text = $request->input('eula_text');
         $category->use_default_eula = $request->input('use_default_eula', '0');
         $category->require_acceptance = $request->input('require_acceptance', '0');
-        $category->alert_on_response = $request->input('alert_on_response', '0');
         $category->checkin_email = $request->input('checkin_email', '0');
         $category->notes = $request->input('notes');
 
@@ -151,18 +141,20 @@ class CategoriesController extends Controller
      * @since [v1.0]
      * @param int $categoryId
      */
-    public function destroy(Category $category): RedirectResponse
+    public function destroy($categoryId) : RedirectResponse
     {
         $this->authorize('delete', Category::class);
-        try {
-            DestroyCategoryAction::run($category);
-        } catch (ItemStillHasChildren $e) {
-            return redirect()->route('categories.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.category')]));
-        } catch (\Exception $e) {
-            report($e);
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.delete.error'));
+        // Check if the category exists
+        if (is_null($category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($categoryId))) {
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
         }
 
+        if (! $category->isDeletable()) {
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=> $category->category_type]));
+        }
+
+        Storage::disk('public')->delete('categories'.'/'.$category->image);
+        $category->delete();
         return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
     }
 

app/Http/Controllers/CompaniesController.php

@@ -123,13 +123,11 @@ final class CompaniesController extends Controller
      */
     public function destroy($companyId) : RedirectResponse
     {
-
         if (is_null($company = Company::find($companyId))) {
             return redirect()->route('companies.index')
                 ->with('error', trans('admin/companies/message.not_found'));
         }
 
-
         $this->authorize('delete', $company);
         if (! $company->isDeletable()) {
             return redirect()->route('companies.index')

app/Http/Controllers/Components/ComponentCheckinController.php

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

app/Http/Controllers/Components/ComponentCheckoutController.php

@@ -102,15 +102,13 @@ class ComponentCheckoutController extends Controller
             return redirect()->route('components.checkout.show', $componentId)->with('error', trans('general.error_user_company'));
         }
 
-        $component->checkout_qty = $request->input('assigned_qty');
-
         // Update the component data
         $component->asset_id = $request->input('asset_id');
         $component->assets()->attach($component->id, [
             'component_id' => $component->id,
             'created_by' => auth()->user()->id,
             'created_at' => date('Y-m-d H:i:s'),
-            'assigned_qty' => $component->checkout_qty,
+            'assigned_qty' => $request->input('assigned_qty'),
             'asset_id' => $request->input('asset_id'),
             'note' => $request->input('note'),
         ]);
@@ -122,7 +120,6 @@ class ComponentCheckoutController extends Controller
 
         session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
-        return Helper::getRedirectOption($request, $component->id, 'Components')
-            ->with('success', trans('admin/components/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.checkout.success'));
     }
 }

app/Http/Controllers/Components/ComponentsController.php

@@ -88,16 +88,10 @@ class ComponentsController extends Controller
 
         $component = $request->handleImages($component);
 
-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
 
         if ($component->save()) {
-            return Helper::getRedirectOption($request, $component->id, 'Components')
-                ->with('success', trans('admin/components/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -117,7 +111,6 @@ class ComponentsController extends Controller
     {
 
             $this->authorize('update', $component);
-            session()->put('back_url', url()->previous());
             return view('components/edit')
                 ->with('item', $component)
                 ->with('category_type', 'component');
@@ -171,8 +164,7 @@ class ComponentsController extends Controller
         session()->put(['redirect_option' => $request->get('redirect_option')]);
 
         if ($component->save()) {
-            return Helper::getRedirectOption($request, $component->id, 'Components')
-                ->with('success', trans('admin/components/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.update.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($component->getErrors());

app/Http/Controllers/Components/ComponentsFilesController.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Controllers\Components;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Component;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Log;
+
+class ComponentsFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a component.
+     *
+     * @param UploadFileRequest $request
+     * @param int $componentId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $componentId = null)
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $component = Component::find($componentId);
+
+        if (isset($component->id)) {
+            $this->authorize('update', $component);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/components')) {
+                    Storage::makeDirectory('private_uploads/components', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+                    $file_name = $request->handleFile('private_uploads/components/','component-'.$component->id, $file);
+
+                    //Log the upload to the log
+                    $component->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('components.index')
+            ->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Deletes the selected component file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $componentId
+     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($componentId = null, $fileId = null)
+    {
+        $component = Component::find($componentId);
+
+        // the asset is valid
+        if (isset($component->id)) {
+            $this->authorize('update', $component);
+            $log = Actionlog::find($fileId);
+
+            // Remove the file if one exists
+            if (Storage::exists('components/'.$log->filename)) {
+                try {
+                    Storage::delete('components/'.$log->filename);
+                } catch (\Exception $e) {
+                    Log::debug($e);
+                }
+            }
+
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')
+                ->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        // Redirect to the licence management page
+        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $componentId
+     * @param int $fileId
+     * @return \Symfony\Component\HttpFoundation\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($componentId = null, $fileId = null)
+    {
+        Log::debug('Private filesystem is: '.config('filesystems.default'));
+
+
+        // the component is valid
+        if ($component = Component::find($componentId)) {
+            $this->authorize('view', $component);
+            $this->authorize('components.files', $component);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
+
+                $file = 'private_uploads/components/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.file_not_found'));
+                }
+            }
+            return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
+    }
+}

app/Http/Controllers/Consumables/ConsumableCheckoutController.php

@@ -111,7 +111,6 @@ class ConsumableCheckoutController extends Controller
 
 
         // Redirect to the new consumable page
-        return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-            ->with('success', trans('admin/consumables/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.checkout.success'));
     }
 }

app/Http/Controllers/Consumables/ConsumablesController.php

@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Consumable;
-use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
@@ -81,33 +81,16 @@ class ConsumablesController extends Controller
         $consumable->purchase_date          = $request->input('purchase_date');
         $consumable->purchase_cost          = $request->input('purchase_cost');
         $consumable->qty                    = $request->input('qty');
-        $consumable->created_by             = auth()->id();
+        $consumable->created_by                = auth()->id();
         $consumable->notes                  = $request->input('notes');
 
 
-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = Consumable::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'consumables/'.$new_image_name;
-                Storage::disk('public')->copy('consumables/'.$cloned_model_img->image, $new_image);
-                $consumable->image = $new_image_name;
-            }
-
-        } else {
-            $consumable = $request->handleImages($consumable);
-        }
-
-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
+        $consumable = $request->handleImages($consumable);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
 
         if ($consumable->save()) {
-            return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-                ->with('success', trans('admin/consumables/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -124,7 +107,6 @@ class ConsumablesController extends Controller
     public function edit(Consumable $consumable) : View | RedirectResponse
     {
             $this->authorize($consumable);
-            session()->put('back_url', url()->previous());
             return view('consumables/edit')
                 ->with('item', $consumable)
                 ->with('category_type', 'consumable');
@@ -178,8 +160,7 @@ class ConsumablesController extends Controller
         session()->put(['redirect_option' => $request->get('redirect_option')]);
 
         if ($consumable->save()) {
-            return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-                ->with('success', trans('admin/consumables/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.update.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -229,10 +210,9 @@ class ConsumablesController extends Controller
         $consumable_to_close = $consumable;
         $consumable = clone $consumable_to_close;
         $consumable->id = null;
+        $consumable->image = null;
         $consumable->created_by = null;
 
-        return view('consumables/edit')
-            ->with('cloned_model', $consumable_to_close)
-            ->with('item', $consumable);
+        return view('consumables/edit')->with('item', $consumable);
     }
 }

app/Http/Controllers/Consumables/ConsumablesFilesController.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Http\Controllers\Consumables;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Consumable;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Consumable\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Log;
+class ConsumablesFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a consumable.
+     *
+     * @param UploadFileRequest $request
+     * @param int $consumableId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $consumableId = null)
+    {
+        if (config('app.lock_passwords')) {
+            return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $consumable = Consumable::find($consumableId);
+
+        if (isset($consumable->id)) {
+            $this->authorize('update', $consumable);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/consumables')) {
+                    Storage::makeDirectory('private_uploads/consumables', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+                    $file_name = $request->handleFile('private_uploads/consumables/','consumable-'.$consumable->id, $file);
+
+                    //Log the upload to the log
+                    $consumable->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('consumables.index')
+            ->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Deletes the selected consumable file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $consumableId
+     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($consumableId = null, $fileId = null)
+    {
+        $consumable = Consumable::find($consumableId);
+
+        // the asset is valid
+        if (isset($consumable->id)) {
+            $this->authorize('update', $consumable);
+            $log = Actionlog::find($fileId);
+
+            // Remove the file if one exists
+            if (Storage::exists('consumables/'.$log->filename)) {
+                try {
+                    Storage::delete('consumables/'.$log->filename);
+                } catch (\Exception $e) {
+                    Log::debug($e);
+                }
+            }
+
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')
+                ->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        // Redirect to the licence management page
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $consumableId
+     * @param int $fileId
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($consumableId = null, $fileId = null)
+    {
+        $consumable = Consumable::find($consumableId);
+
+        // the consumable is valid
+        if (isset($consumable->id)) {
+            $this->authorize('view', $consumable);
+            $this->authorize('consumables.files', $consumable);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
+                $file = 'private_uploads/consumables/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.file_not_found'));
+                }
+            }
+            // The log record doesn't exist somehow
+            return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
+    }
+}

app/Http/Controllers/Controller.php

@@ -22,16 +22,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Accessory;
-use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\License;
-use App\Models\Location;
-use App\Models\Maintenance;
-use App\Models\Supplier;
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -42,51 +32,6 @@ abstract class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
-    static $map_object_type = [
-        'accessories' => Accessory::class,
-        'maintenances' => Maintenance::class,
-        'assets' => Asset::class,
-        'audits' => Asset::class,
-        'components' => Component::class,
-        'consumables' => Consumable::class,
-        'hardware' => Asset::class,
-        'licenses' => License::class,
-        'locations' => Location::class,
-        'models' => AssetModel::class,
-        'suppliers' => Supplier::class,
-        'users' => User::class,
-    ];
-
-    static $map_storage_path = [
-        'accessories' => 'private_uploads/accessories/',
-        'maintenances' => 'private_uploads/maintenances/',
-        'assets' => 'private_uploads/assets/',
-        'audits' => 'private_uploads/audits/',
-        'components' => 'private_uploads/components/',
-        'consumables' => 'private_uploads/consumables/',
-        'hardware' => 'private_uploads/assets/',
-        'licenses' => 'private_uploads/licenses/',
-        'locations' => 'private_uploads/locations/',
-        'models' => 'private_uploads/models/',
-        'suppliers' => 'private_uploads/suppliers/',
-        'users' => 'private_uploads/users/',
-    ];
-
-    static $map_file_prefix= [
-        'accessories' => 'accessory',
-        'maintenances' => 'maintenance',
-        'assets' => 'asset',
-        'audits' => 'audits',
-        'components' => 'component',
-        'consumables' => 'consumable',
-        'hardware' => 'asset',
-        'licenses' => 'license',
-        'locations' => 'location',
-        'models' => 'model',
-        'suppliers' => 'supplier',
-        'users' => 'user',
-    ];
-
     public function __construct()
     {
         view()->share('signedIn', Auth::check());

app/Http/Controllers/CustomFieldsController.php

@@ -144,9 +144,10 @@ class CustomFieldsController extends Controller
      */
     public function deleteFieldFromFieldset($field_id, $fieldset_id) : RedirectResponse
     {
-        $this->authorize('update', CustomField::class);
         $field = CustomField::find($field_id);
 
+        $this->authorize('update', $field);
+
         // Check that the field exists - this is mostly related to the demo, where we 
         // rewrite the data every x minutes, so it's possible someone might be disassociating 
         // a field from a fieldset just as we're wiping the database
@@ -156,12 +157,11 @@ class CustomFieldsController extends Controller
             return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])
                 ->with('success', trans('admin/custom_fields/message.field.delete.success'));
             } else {
-                return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'))
-                    ->withInput();
+                return redirect()->back()->withErrors(['message' => "Field is in use and cannot be deleted."]);
             }
         }
 
-        return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'));
+        return redirect()->back()->withErrors(['message' => "Error deleting field from fieldset"]);
 
        
     }
@@ -172,16 +172,20 @@ class CustomFieldsController extends Controller
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
      */
-    public function destroy(CustomField $field) : RedirectResponse
+    public function destroy($field_id) : RedirectResponse
     {
-        $this->authorize('delete', CustomField::class);
+        if ($field = CustomField::find($field_id)) {
+            $this->authorize('delete', $field);
 
-        if (($field->fieldset) && ($field->fieldset->count() > 0)) {
-            return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.in_use'));
+            if (($field->fieldset) && ($field->fieldset->count() > 0)) {
+                return redirect()->back()->withErrors(['message' => 'Field is in-use']);
+            }
+            $field->delete();
+            return redirect()->route("fields.index")
+                ->with("success", trans('admin/custom_fields/message.field.delete.success'));
         }
-        $field->delete();
-        return redirect()->route("fields.index")
-            ->with("success", trans('admin/custom_fields/message.field.delete.success'));
+
+        return redirect()->back()->withErrors(['message' => 'Field does not exist']);
     }
 
 
@@ -194,7 +198,7 @@ class CustomFieldsController extends Controller
      */
     public function edit(Request $request, CustomField $field) : View | RedirectResponse
     {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', $field);
         $fieldsets = CustomFieldset::get();
         $customFormat = '';
         if ((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
@@ -224,7 +228,7 @@ class CustomFieldsController extends Controller
      */
     public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
     {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', $field);
         $show_in_email = $request->get("show_in_email", 0);
         $display_in_user_view = $request->get("display_in_user_view", 0);
 
@@ -261,6 +265,7 @@ class CustomFieldsController extends Controller
 
         if ($field->save()) {
 
+
             // Sync fields with fieldsets
             $fieldset_array = $request->input('associate_fieldsets');
             if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {

app/Http/Controllers/GroupsController.php

@@ -43,12 +43,9 @@ class GroupsController extends Controller
         $permissions = config('permissions');
         $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
         $selectedPermissions = $request->old('permissions', $groupPermissions);
-        $users = \App\Models\User::orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
+
         // Show the page
-        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))
-            ->with('group', $group)
-            ->with('associated_users', [])
-            ->with('unselected_users', $users);
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
     }
 
     /**
@@ -63,23 +60,11 @@ class GroupsController extends Controller
         // create a new group instance
         $group = new Group();
         $group->name = $request->input('name');
-
-        if ($request->filled('permission')) {
-            $group->permissions = json_encode($request->array('permission'));
-        } else {
-            $group->permissions = null;
-        }
-
         $group->permissions = json_encode($request->input('permission'));
         $group->created_by = auth()->id();
         $group->notes = $request->input('notes');
 
         if ($group->save()) {
-
-            if ($request->filled('users_to_sync')) {
-                $associated_users = explode(',',$request->input('users_to_sync'));
-                $group->users()->sync($associated_users);
-            }
             return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
         }
 
@@ -103,12 +88,7 @@ class GroupsController extends Controller
             $groupPermissions = [];
         }
         $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-        $associated_users = $group->users()->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-
-        // Get the unselected users
-        $unselected_users = \App\Models\User::whereNotIn('id', $associated_users->pluck('id')->toArray())->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-
-        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'))->with('associated_users', $associated_users)->with('unselected_users', $unselected_users);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
     }
 
     /**
@@ -122,24 +102,11 @@ class GroupsController extends Controller
     public function update(Request $request, Group $group) : RedirectResponse
     {
         $group->name = $request->input('name');
-
-        if ($request->filled('permission')) {
-            $group->permissions = json_encode($request->array('permission'));
-        } else {
-            $group->permissions = null;
-        }
-
+        $group->permissions = json_encode($request->input('permission'));
         $group->notes = $request->input('notes');
 
-
         if (! config('app.lock_passwords')) {
             if ($group->save()) {
-
-                if ($request->filled('users_to_sync')) {
-                    $associated_users = explode(',',$request->input('users_to_sync'));
-                    $group->users()->sync($associated_users);
-                }
-
                 return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.update'));
             }