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

Remove radio buttons - they don’t work correctly yet
Revert custom field name text box for now
2025-09-29 13:29:00 +01:00 · 2025-09-29 12:43:19 +01:00 · 2025-09-29 10:42:40 +01:00 · 2025-09-25 13:22:52 +01:00 · 2025-09-24 17:08:00 +01:00 · 2025-09-24 16:58:35 +01:00
2712 changed files with 61250 additions and 127677 deletions
@@ -4235,33 +4235,6 @@
      "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"
-      ]
    }
  ]
 }
@@ -137,8 +137,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -149,8 +147,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -144,8 +144,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -156,8 +154,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -40,26 +40,12 @@ DB_SANITIZE_BY_DEFAULT=false
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
 # --------------------------------------------
-# Enable SSL connection to database (true/false)
 DB_SSL=false
-
-# Set to true for cloud databases like AWS RDS, Azure Database, Google Cloud SQL
-# Set to false for self-hosted databases with client certificates
 DB_SSL_IS_PAAS=false
-
-# Required when DB_SSL_IS_PAAS=false (client certificate authentication)
 DB_SSL_KEY_PATH=null
 DB_SSL_CERT_PATH=null
-
-# Path to CA certificate bundle (required for SSL connections)
-# For AWS RDS, download from: https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem
 DB_SSL_CA_PATH=null
-
-# SSL cipher (optional, leave null for default)
 DB_SSL_CIPHER=null
-
-# Verify server certificate (true/false, defaults to false if not set)
-# Set to false for development or when using self-signed certificates
 DB_SSL_VERIFY_SERVER=null

 # --------------------------------------------
@@ -157,8 +143,6 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
-PUBLIC_AWS_ENDPOINT=null
-PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -169,8 +153,6 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
-PRIVATE_AWS_ENDPOINT=null
-PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null

 # --------------------------------------------
@@ -208,14 +190,13 @@ 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
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
 LIVEWIRE_URL_PREFIX=null
-MAX_UNPAGINATED=5000
+

 # --------------------------------------------
 # OPTIONAL: SAML SETTINGS
@@ -23,23 +23,7 @@ body:
    attributes:
      label: Snipe-IT Version
      description: What version of Snipe-IT are you seeing this issue on? You can find the version number in the footer of any page in Snipe-IT.
-      placeholder: ex. v8.3.2 - build 19577 (master)
-    validations:
-      required: true
-  - type: input
-    id: php-version
-    attributes:
-      label: PHP Version
-      description: What version of PHP are you running? You can find the version of PHP your webserver is running in the `Admin Settings` section in the footer, and the cli version by running `php -v` via command line .
-      placeholder: ex. v8.3.1 (web), PHP 8.4.12 (cli)
-    validations:
-      required: true
-  - type: input
-    id: composer-version
-    attributes:
-      label: Composer Version
-      description: What version of composer are you running? You can find the version number by running `composer --version`.
-      placeholder: ex. 2.8.10
+      placeholder: ex. v8.3.1 - build 19577 (master)
    validations:
      required: true
  - type: input
@@ -64,16 +48,6 @@ body:
        - Not sure
    validations:
      required: true
-  - type: dropdown
-    id: upgrade-or-fresh
-    attributes:
-      label: Is this a fresh install or an upgrade?
-      options:
-        - Fresh install
-        - Upgrade
-        - NA
-    validations:
-      required: true
  - type: textarea
    id: what-happened
    attributes:
@@ -160,4 +134,4 @@ body:
      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/grokability/snipe-it/blob/master/CODE_OF_CONDUCT.md).
      options:
        - label: I agree to follow this project's Code of Conduct
-          required: true
+          required: true
@@ -1,11 +1,10 @@
-frontend: ["*.js", "*.css", "*.scss", "*.less", "*.blade.*", "resources/views/livewire/*","resources/views/layouts/default.blade.php"]
+frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*", "resources/views/livewire/*"]
 skins: ["*.js", "*.css", "*.scss", "*.less"]
 css: ["*.css","*.scss", "*.less"]
 javascript: ["*.js", "package.json", "package.lock"]
 backend: ["/app/*", "composer.json", "composer.lock"]
-translations: ["/resources/lang/*"]
+translations: ["/resources/lang"]
 livewire: ["/app/Http/Livewire/*", "resources/views/livewire/*"]
-blade-components: ["resources/views/blade/*"]
 backups: ["*backup*"]
 restore: ["*restore*"]
 saml: ["*saml*"]
@@ -17,7 +16,7 @@ api: ["/app/Http/Controllers/Api/*"]
 notifications: ["/app/Notifications/*"]
 importer: ["/app/Importer/*","/app/Http/Livewire/Importer.php", "resources/views/livewire/importer.php"]
 cli / artisan: ["/app/Console/*"]
-LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php", "/resources/views/users/ldap.blade.php","/resources/views/settings/ldap.blade.php"]
+LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
 docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
 tests: ["/tests/*", "/database/factories/*", "/stubs"]
 config: .github
@@ -26,14 +26,14 @@ jobs:
        language: [ 'javascript' ]
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5

    # 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
@@ -32,7 +32,7 @@ jobs:
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
@@ -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
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

      - name: Crowdin push
        uses: crowdin/github-action@v2
@@ -42,7 +42,7 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5

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

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
@@ -11,7 +11,7 @@ jobs:
  dockerHubDescription:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Docker Hub Description
        uses: grokability/dockerhub-description@7ea9d275c7cdbe2b676a093a0308c50665e3b8b4
@@ -37,13 +37,13 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
        run: |
          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
          key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -82,7 +82,7 @@ jobs:

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

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
        run: |
          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
          key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -81,7 +81,7 @@ jobs:

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

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5

      - name: Get Composer Cache Directory
        id: composer-cache
        run: |
          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
          key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -67,7 +67,7 @@ jobs:

      - name: Upload Laravel logs as artifacts
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
        with:
          name: laravel-logs-php-${{ matrix.php-version }}-run-${{ github.run_attempt }}
          path: |
@@ -68,8 +68,7 @@ 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") |
+| [<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") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -1,35 +1,35 @@
-FROM alpine:3.23
+FROM alpine:3.19
 # Apache + PHP
 RUN  apk add --no-cache \
        apache2 \
-        php84 \
-        php84-common \
-        php84-apache2 \
-        php84-curl \
-        php84-ldap \
-        php84-mysqli \
-        php84-gd \
-        php84-xml \
-        php84-mbstring \
-        php84-zip \
-        php84-ctype \
-        php84-tokenizer \
-        php84-pdo_mysql \
-        php84-openssl \
-        php84-bcmath \
-        php84-phar \
-        php84-json \
-        php84-iconv \
-        php84-fileinfo \
-        php84-simplexml \
-        php84-session \
-        php84-dom \
-        php84-xmlwriter \
-        php84-xmlreader \
-        php84-sodium \
-        php84-redis \
-        php84-pecl-memcached \
-        php84-exif \
+        php82 \
+        php82-common \
+        php82-apache2 \
+        php82-curl \
+        php82-ldap \
+        php82-mysqli \
+        php82-gd \
+        php82-xml \
+        php82-mbstring \
+        php82-zip \
+        php82-ctype \
+        php82-tokenizer \
+        php82-pdo_mysql \
+        php82-openssl \
+        php82-bcmath \
+        php82-phar \
+        php82-json \
+        php82-iconv \
+        php82-fileinfo \
+        php82-simplexml \
+        php82-session \
+        php82-dom \
+        php82-xmlwriter \
+        php82-xmlreader \
+        php82-sodium \
+        php82-redis \
+        php82-pecl-memcached \
+        php82-exif \
        curl \
        wget \
        vim \
@@ -42,7 +42,7 @@ COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
 # Where apache's PID lives
 RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2

-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php84/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php82/php.ini
 COPY  docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf

 # Enable mod_rewrite
@@ -78,14 +78,11 @@ Since the release of the JSON REST API, several third-party developers have been

 #### Libraries & Modules

- [SnipeScheduler](https://github.com/JSY-Ben/SnipeScheduler) by [@JSY-Ben](https://github.com/JSY-Ben) - An Asset Reservation/Checkout System for Snipe-IT
- [Snipe-IT MCP Server](https://github.com/jameshgordy/snipeit-mcp) by [@jameshgordy](https://github.com/jameshgordy) - A Model Context Protocol (MCP) server for managing Snipe-IT inventory systems
 - [SnipeSharp - .NET module in C#](https://github.com/barrycarey/SnipeSharp) by [@barrycarey](https://github.com/barrycarey)
 - [SnipeitPS](https://github.com/snazy2000/SnipeitPS) by [@snazy2000](https://github.com/snazy2000) - Powershell API Wrapper for Snipe-it
 - [jamf2snipe](https://github.com/grokability/jamf2snipe) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
 - [jamf-snipe-rename](https://macblog.org/jamf-snipe-rename/) - Python script to rename computers in Jamf from Snipe-IT
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
- [Rudder2Snipe](https://github.com/norbertoaquino/rudder2snipe) by [@norbertoaquino](https://github.com/norbertoaquino) - Rudder.io integration for Snipe-IT
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
 - [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-IT.
@@ -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;
-    }
-}
@@ -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;
-    }
-
-}
@@ -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;
-    }
-}
@@ -245,26 +245,26 @@ 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] ?? null;
-            $item['display_name'] = $results[$i][$ldap_map["display_name"]][0] ?? null;
-            $item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? null;
-            $item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? null;
-            $item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? null;
-            $item['email'] = $results[$i][$ldap_map["email"]][0] ?? null;
-            $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? null;
-            $item['location_id'] = $results[$i]['location_id'] ?? null;
-            $item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? null;
-            $item['mobile'] = $results[$i][$ldap_map["mobile"]][0] ?? null;
-            $item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? null;
-            $item['address'] = $results[$i][$ldap_map["address"]][0] ?? null;
-            $item['city'] = $results[$i][$ldap_map["city"]][0] ?? null;
-            $item['state'] = $results[$i][$ldap_map["state"]][0] ?? null;
-            $item['country'] = $results[$i][$ldap_map["country"]][0] ?? null;
-            $item['zip'] = $results[$i][$ldap_map["zip"]][0] ?? null;
-            $item['department'] = $results[$i][$ldap_map["dept"]][0] ?? null;
-            $item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? null;
-            $item['location'] = $results[$i][$ldap_map["location"]][0] ?? null;
-            $location = $default_location; //initially, set '$location' to the default_location (which may just be null)
+            $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] ?? '';
+            $item['email'] = $results[$i][$ldap_map["email"]][0] ?? '';
+            $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] ?? '';
+            $location = $default_location; //initially, set '$location' to the default_location (which may just be `null`)

            // ONLY if you are using the "ldap_location" option *AND* you have an actual result
            if ($ldap_map["location"] && $item['location']) {
@@ -317,21 +317,9 @@ class LdapSync extends Command
            if($ldap_map["jobtitle"] != null){
                $user->jobtitle = $item['jobtitle'];
            }
-            if($ldap_map["address"] != null){
-                $user->address = $item['address'];
-            }
-            if($ldap_map["city"] != null){
-                $user->city = $item['city'];
-            }
-            if($ldap_map["state"] != null){
-                $user->state = $item['state'];
-            }
            if($ldap_map["country"] != null){
                $user->country = $item['country'];
            }
-            if($ldap_map["zip"] != null){
-                $user->zip = $item['zip'];
-            }
            if($ldap_map["dept"]  != null){
                $user->department_id = $department->id;
            }
@@ -464,7 +452,6 @@ class LdapSync extends Command
            $errors = '';

            if ($user->save()) {
-                $item['id'] = $user->id;
                $item['note'] = $item['createorupdate'];
                $item['status'] = 'success';
                if ($item['createorupdate'] === 'created' && $ldap_default_group) {
@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Enums\ActionType;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class MigrateLicenseSeatQuantitiesInActionLogs extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:migrate-license-seat-quantities-in-action-logs
-                            {--no-interaction: Do not ask any interactive question}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Updates quantity field in action_logs table for license seats that were added or deleted.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $query = DB::table('action_logs')
-            ->whereIn('action_type', [
-                ActionType::AddSeats->value,
-                ActionType::DeleteSeats->value,
-            ])
-            ->where('quantity', '=', 1)
-            ->orderBy('id');
-
-        $count = $query->count();
-
-        if ($count === 0) {
-            $this->info('Nothing to update');
-
-            return 0;
-        }
-
-        $this->info("{$count} logs to update");
-
-        if ($this->option('no-interaction') || $this->confirm('Update quantities in the action log?')) {
-            $query->chunk(50, function ($logs) {
-                $logs->each(function ($log) {
-                    $quantityFromNote = Str::between($log->note, "ed ", " seats");
-
-                    if (!is_numeric($quantityFromNote)) {
-                        $this->error('Could not parse quantity from ID: {id}', ['id' => $log->id]);
-                    }
-
-                    if ($log->quantity !== (int) $quantityFromNote) {
-                        $this->info(vsprintf('Updating id: %s to quantity %s', [
-                            'id' => $log->id,
-                            'new_quantity' => $quantityFromNote,
-                        ]));
-
-                        DB::table('action_logs')->where('id', $log->id)->update(['quantity' => (int) $quantityFromNote]);
-                    }
-                });
-            });
-        }
-
-        return 0;
-    }
-}
@@ -113,7 +113,7 @@ class MoveUploadsToNewDisk extends Command
                    $filename = basename($private_upload[$x]);

                    try {
-                        Storage::put($private_type . '/' . $filename, file_get_contents($private_upload[$x]));
+                        Storage::put($private_type . '/' . $filename, file_get_contents($private_upload[$i]));
                        $new_url = Storage::url($private_type . '/' . $filename, $filename);
                        $this->info($type_count . '. PRIVATE: ' . $filename . ' was copied to ' . $new_url);
                    } catch (\Exception $e) {
@@ -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
@@ -33,11 +35,6 @@ class ObjectImportCommand extends Command
     */
    protected ProgressIndicator $progressIndicator;

-    /**
-     * Logger instance with configurable log path
-     */
-    protected $logger;
-
    /**
     * Create a new command instance.
     *
@@ -55,13 +52,10 @@ 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');
-        $class = ucfirst($this->option('item-type'));
+        $class = title_case($this->option('item-type'));
        $classString = "App\\Importer\\{$class}Importer";
        $importer = new $classString($filename);
        $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
@@ -70,11 +64,9 @@ class ObjectImportCommand extends Command
                 ->setShouldNotify($this->option('send-welcome'))
                 ->setUsernameFormat($this->option('username_format'));

-        $this->logger = Log::build([
-            'driver' => 'single',
-            'path' => $this->option('logfile'),
-          ]);
-
+        // This $logFile/useFiles() bit is currently broken, so commenting it out for now
+        // $logFile = $this->option('logfile');
+        // Log::useFiles($logFile);
        $this->progressIndicator->start('======= Importing Items from '.$filename.' =========');

        $importer->import();
@@ -106,10 +98,10 @@ class ObjectImportCommand extends Command
    public function log($string, $level = 'info')
    {
        if ($level === 'warning') {
-            $this->logger->warning($string);
+            Log::warning($string);
            $this->comment($string);
        } else {
-            $this->logger->Info($string);
+            Log::Info($string);
            if ($this->option('verbose')) {
                $this->comment($string);
            }
@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CheckoutAcceptance;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-
-class PurgeEulaPDFs extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:purge-eula-pdfs  
-                            {--older-than-days= : The number of days we should delete before } 
-                            {--force : Skip the interactive yes/no prompt for confirmation}
-                            {--dryrun : Show the records that would be deleted but don\'t update the database or delete files from disk}
-                            {--with-output : Display the results in a table in your console}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This purges signature files and EULAs from the system if they are older than the date passed with --older-than-days=.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-
-        $before = $this->option('older-than-days');
-
-        if (($before=='') || (!is_numeric($before))) {
-            return $this->error('ERROR: You must pass a valid number for --older-than-days (example: snipeit:purge-eula-pdfs --older-than-days=365.)');
-        }
-
-        $interval_date = Carbon::now()->subDays($before);
-        $signature_path = 'private_uploads/signatures/';
-        $eula_path = 'private_uploads/eula-pdfs/';
-
-        if (!Storage::exists($eula_path)) {
-            $this->fail('The storage directory "'.$eula_path.'" does not exist. No EULA files will be deleted.');
-        }
-
-        if (!Storage::exists($signature_path)) {
-            $this->fail('The storage directory "'.$signature_path.'" does not exist. No signature files will be deleted.');
-        }
-
-
-        if ($this->option('dryrun')) {
-            $this->info('This script is being run with the --dryrun option. No files or records will be deleted.');
-
-        }
-        $acceptances = CheckoutAcceptance::HasFiles()->where('updated_at','<', $interval_date)->with('assignedTo')->get();
-
-        if (!$this->option('force')) {
-            if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE SIGNATURES AND EULA PDF FILES SINCE $interval_date. \nThere is NO undo! \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) {
-            }
-        }
-
-
-
-        if ($acceptances->count() == 0) {
-            return $this->warn('There are no item acceptances with signatures or EULA PDFs from before '.$interval_date);
-        }
-
-        $this->info(number_format($acceptances->count()) . ' EULA PDFs from before '.$interval_date.' will be purged');
-
-        if (!$this->option('with-output')) {
-            $this->info('Run this command with the --with-output option to see the full list in the console.');
-        } else {
-            $this->table(
-                [
-                    trans('general.user'),
-                    trans('general.type'),
-                    trans('general.item'),
-                    trans('general.category'),
-                    trans('general.accepted_date'),
-                    trans('general.declined_date'),
-                    trans('general.signature'),
-                    trans('general.filename'),
-
-                ],
-                $acceptances->map(fn($acceptance) => [
-                    trans('general.user') => $acceptance->assignedTo->display_name,
-                    trans('general.type') => $acceptance->display_checkoutable_type,
-                    trans('general.item') => $acceptance->checkoutable_type::find($acceptance->checkoutable_id)->display_name,
-                    trans('general.category') => $acceptance->checkoutable_category_name,
-                    trans('general.accepted_date') => $acceptance->accepted_at,
-                    trans('general.declined_date') => $acceptance->declined_at,
-                    trans('general.signature') => $acceptance->signature_filename,
-                    trans('general.filename') => $acceptance->stored_eula_file,
-                ])
-            );
-        }
-
-
-
-        foreach ($acceptances as $acceptance) {
-
-            $signature_file = $signature_path.$acceptance->signature_filename;
-            $eula_file = $eula_path.$acceptance->stored_eula_file;
-
-            if (Storage::exists($signature_file)) {
-                if (!$this->option('dryrun')) {
-                    Storage::delete($signature_file);
-                }
-            } else {
-                $this->error('The file "'. $signature_file.'" does not exist.');
-            }
-
-
-            if (Storage::exists($eula_file)) {
-                if (!$this->option('dryrun')) {
-                    Storage::delete($eula_file);
-                }
-            } else {
-                $this->error('The file "'.$eula_file.'" does not exist.');
-            }
-
-            if (!$this->option('dryrun')) {
-                $acceptance->delete();
-            }
-        }
-
-    }
-}
@@ -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;
-    }
-}
@@ -49,15 +49,14 @@ class ResetDemoSettings extends Command
        $settings->logo = 'snipe-logo.png';
        $settings->alert_email = 'service@snipe-it.io';
        $settings->login_note = 'Use `admin` / `password` to login to the demo.';
-        $settings->header_color = '#3c8dbc';
-        $settings->link_dark_color = '#5fa4cc';
-        $settings->link_light_color = '#296282;';
+        $settings->header_color = null;
        $settings->label2_2d_type = 'QRCODE';
        $settings->default_currency = 'USD';
        $settings->brand = 2;
        $settings->ldap_enabled = 0;
        $settings->full_multiple_companies_support = 0;
        $settings->label2_1d_type = 'C128';
+        $settings->skin = '';
        $settings->email_domain = 'snipeitapp.com';
        $settings->email_format = 'filastname';
        $settings->username_format = 'filastname';
@@ -81,8 +80,6 @@ class ResetDemoSettings extends Command

        if ($user = User::where('username', '=', 'admin')->first()) {
            $user->locale = 'en-US';
-            $user->enable_confetti = 1;
-            $user->enable_sounds = 1;
            $user->save();
        }

@@ -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;
@@ -52,7 +51,7 @@ class SQLStreamer {
            /* we *could* have made the ^INSERT INTO blah VALUES$ turn on the capturing state, and closed it with
               a ^(blahblah);$ but it's cleaner to not have to manage the state machine. We're just going to
               assume that (blahblah), or (blahblah); are values for INSERT and are always acceptable. */
-            "<^/\*![0-9]{5} SET NAMES '?[a-zA-Z0-9_-]+'? \*/;$>" => false, //using weird delimiters (<,>) for readability. allow quoted or unquoted charsets
+            "<^/\*!40101 SET NAMES '?[a-zA-Z0-9_-]+'? \*/;$>"                                   => false, //using weird delimiters (<,>) for readability. allow quoted or unquoted charsets
            "<^/\*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' \*/;$>" => false, //same, now handle zero-values
        ];

@@ -243,10 +242,9 @@ class RestoreFromBackup extends Command

        $private_dirs = [
            'storage/private_uploads/accessories',
-            'storage/private_uploads/assetmodels' => 'storage/private_uploads/models', //this was changed from assetmodels => models Aug 10 2025
-            'storage/private_uploads/asset_maintenances' => 'storage/private_uploads/maintenances', //this was changed from asset_maintenances => maintenances Aug 10 2025
-            'storage/private_uploads/maintenances', //but let 'maintenances' take precedence
-            'storage/private_uploads/models', //and let 'models' take precedence
+            'storage/private_uploads/assetmodels',
+            'storage/private_uploads/maintenances',
+            'storage/private_uploads/models',
            'storage/private_uploads/assets', // these are asset _files_, not the pictures.
            'storage/private_uploads/audits',
            'storage/private_uploads/components',
@@ -264,7 +262,7 @@ class RestoreFromBackup extends Command
        ];
        $public_dirs = [
            'public/uploads/accessories',
-            // 'public/uploads/assetmodels' => 'public/uploads/models', //according to git, this was _never_ a thing... (see below)
+            'public/uploads/assetmodels',
            'public/uploads/maintenances',
            'public/uploads/assets', // these are asset _pictures_, not asset files
            'public/uploads/avatars',
@@ -275,7 +273,7 @@ class RestoreFromBackup extends Command
            'public/uploads/departments',
            'public/uploads/locations',
            'public/uploads/manufacturers',
-            'public/uploads/models', // ...it's been this way for 9 years (as of late 2025)
+            'public/uploads/models',
            'public/uploads/suppliers',
        ];

@@ -288,6 +286,8 @@ class RestoreFromBackup extends Command
            'public/uploads/favicon-uploaded.*',
        ];

+        $all_files = $private_dirs + $public_dirs;
+
        $sqlfiles = [];
        $sqlfile_indices = [];

@@ -295,20 +295,6 @@ class RestoreFromBackup extends Command
        $boring_files = [];
        $unsafe_files = [];

-        $good_extensions = config('filesystems.allowed_upload_extensions_array');
-
-        $private_extensions = array_merge($good_extensions, ["csv", "key"]); //add csv, and 'key'
-        $public_extensions = array_diff($good_extensions, ["xml"]); //remove xml
-
-        $sanitizer = new Sanitizer();
-
-        /**
-         * TODO: I _hate_ the "continue 3" thing we keep doing here
-         * I think a better approach might be to have the "each file" stuff be in a method on this class, and the
-         * boring_files and interesting_files be properties on it that we fill out. Then, in that method, we could
-         * just do a 'return' once the file is actually handled (yay or nay). We could also start to break out some of
-         * the _other_ things that we do into their own methods too? But I don't care about that as much.
-         */
        for ($i = 0; $i < $za->numFiles; $i++) {
            $stat_results = $za->statIndex($i);
            // echo "index: $i\n";
@@ -323,7 +309,7 @@ class RestoreFromBackup extends Command
            // skip macOS resource fork files (?!?!?!)
            if (strpos($raw_path, '__MACOSX') !== false && strpos($raw_path, '._') !== false) {
                //print "SKIPPING macOS Resource fork file: $raw_path\n";
-                // $boring_files[] = $raw_path; //stop adding this to the boring files list; it's just confusing
+                $boring_files[] = $raw_path;
                continue;
            }
            if (@pathinfo($raw_path, PATHINFO_EXTENSION) == 'sql') {
@@ -332,70 +318,44 @@ class RestoreFromBackup extends Command
                $sqlfile_indices[] = $i;
                continue;
            }
-            if ($raw_path[-1] == '/') {
-                //last character is '/' - this is a directory, and we don't need it, and we don't need to warn about it
-                continue;
-            }
-            if (in_array(basename($raw_path), [".gitkeep", ".gitignore", ".DS_Store"])) {
-                //skip these boring files silently without reporting on them; they're stupid
-                continue;
-            }
-            $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));

-            foreach (['public' => $public_dirs, 'private' => $private_dirs] as $purpose => $dirs) {
-                $allowed_extensions = match ($purpose) {
-                    'public' => $public_extensions,
-                    'private' => $private_extensions,
-                };
-                foreach ($dirs as $dir => $destdir) {
-                    if (is_int($dir)) {
-                        $dir = $destdir;
-                    }
-                    $last_pos = strrpos($raw_path, $dir . '/');
-                    if ($last_pos !== false) {
-                        //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                        //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path?
-                        //the CSV bit, below, is because we store CSV files as "blahcsv" - without an extension
-                        if (!in_array($extension, $allowed_extensions) && !($dir == "storage/private_uploads/imports" && substr($raw_path, -3) == "csv" && $extension == "")) {
-                            $unsafe_files[] = $raw_path;
-                            Log::debug($raw_path . ' from directory ' . $dir . ' is being skipped');
-                        } else {
-                            if ($dir != $destdir) {
-                                Log::debug("Getting ready to save file $raw_path to new directory $destdir");
-                            }
-                            $interesting_files[$raw_path] = ['dest' => $destdir, 'index' => $i];
-                        }
-                        continue 3;
+            foreach (array_merge($private_dirs, $public_dirs) as $dir) {
+                $last_pos = strrpos($raw_path, $dir . '/');
+                if ($last_pos !== false) {
+                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
+                    //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path?
+                    $interesting_files[$raw_path] = ['dest' => $dir, 'index' => $i];
+                    continue 2;
+                    if ($last_pos + strlen($dir) + 1 == strlen($raw_path)) {
+                        // we don't care about that; we just want files with the appropriate prefix
+                        //print("FOUND THE EXACT DIRECTORY: $dir AT: $raw_path!!!\n");
                    }
                }
            }

-            foreach (['public' => $public_files, 'private' => $private_files] as $purpose => $files) {
-                $allowed_extensions = match ($purpose) {
-                    'public' => $public_extensions,
-                    'private' => $private_extensions,
-                };
-                foreach ($files as $file) {
-                    $has_wildcard = (strpos($file, '*') !== false);
-                    if ($has_wildcard) {
-                        $file = substr($file, 0, -1); //trim last character (which should be the wildcard)
+            $good_extensions = config('filesystems.allowed_upload_extensions_array');
+
+            foreach (array_merge($private_files, $public_files) as $file) {
+                $has_wildcard = (strpos($file, '*') !== false);
+                if ($has_wildcard) {
+                    $file = substr($file, 0, -1); //trim last character (which should be the wildcard)
+                }
+                $last_pos = strrpos($raw_path, $file); // no trailing slash!
+                if ($last_pos !== false) {
+                    $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
+                    if (!in_array($extension, $good_extensions)) {
+                        // gathering potentially unsafe files here to return at exit
+                        $unsafe_files[] = $raw_path;
+                        Log::debug('Potentially unsafe file '.$raw_path.' is being skipped');
+                        $boring_files[] = $raw_path;
+                        continue 2;
                    }
-                    $last_pos = strrpos($raw_path, $file); // no trailing slash!
-                    if ($last_pos !== false) {
-                        if (!in_array($extension, $allowed_extensions)) {
-                            // gathering potentially unsafe files here to return at exit
-                            $unsafe_files[] = $raw_path;
-                            Log::debug('Potentially unsafe file ' . $raw_path . ' is being skipped');
-                            $boring_files[] = $raw_path;
-                            continue 3;
-                        }
-                        //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                        //no wildcards found in $file, process 'normally'
-                        if ($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it.
-                            // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though.
-                            $interesting_files[$raw_path] = ['dest' => dirname($file), 'index' => $i];
-                            continue 3;
-                        }
+                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
+                    //no wildcards found in $file, process 'normally'
+                    if ($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it.
+                        // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though.
+                        $interesting_files[$raw_path] = ['dest' => dirname($file), 'index' => $i];
+                        continue 2;
                    }
                }
            }
@@ -532,25 +492,18 @@ class RestoreFromBackup extends Command
        }
        foreach ($interesting_files as $pretty_file_name => $file_details) {
            $ugly_file_name = $za->statIndex($file_details['index'])['name'];
-            $migrated_file_name = $file_details['dest'] . '/' . basename($pretty_file_name);
-            if (strcasecmp(substr($pretty_file_name, -4), ".svg") === 0) {
-                $svg_contents = $za->getFromIndex($file_details['index']);
-                $cleaned_svg = $sanitizer->sanitize($svg_contents);
-                file_put_contents($migrated_file_name, $cleaned_svg);
-            } else {
-                $fp = $za->getStream($ugly_file_name);
-                //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
-                if (!is_dir($file_details['dest'])) {
-                    mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
-                }
-                $migrated_file = fopen($migrated_file_name, 'w');
-                while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
-                    fwrite($migrated_file, $buffer);
-                }
-                fclose($migrated_file);
-                fclose($fp);
-                //$this->info("Wrote $ugly_file_name to $pretty_file_name");
+            $fp = $za->getStream($ugly_file_name);
+            //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
+            if (!is_dir($file_details['dest'])) {
+                mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
            }
+            $migrated_file = fopen($file_details['dest'].'/'.basename($pretty_file_name), 'w');
+            while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
+                fwrite($migrated_file, $buffer);
+            }
+            fclose($migrated_file);
+            fclose($fp);
+            //$this->info("Wrote $ugly_file_name to $pretty_file_name");
            if ($bar) {
                $bar->advance();
            }
@@ -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];
            })
@@ -9,8 +9,6 @@ use App\Notifications\ExpectedCheckinAdminNotification;
 use App\Notifications\ExpectedCheckinNotification;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Notification;
-use App\Helpers\Helper;

 class SendExpectedCheckinAlerts extends Command
 {
@@ -19,7 +17,7 @@ class SendExpectedCheckinAlerts extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:expected-checkin {--with-output : Display the results in a table in your console in addition to sending the email}';
+    protected $name = 'snipeit:expected-checkin';

    /**
     * The console command description.
@@ -44,47 +42,19 @@ class SendExpectedCheckinAlerts extends Command
    public function handle()
    {
        $settings = Setting::getSettings();
-        $interval = $settings->due_checkin_days ?? 0;
+        $interval = $settings->audit_warning_days ?? 0;
        $today = Carbon::now();
        $interval_date = $today->copy()->addDays($interval);
-        $count = 0;
-
-        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')->DueOrOverdueForCheckin($settings)->orderBy('assets.expected_checkin', 'desc')->get();

-        $this->info($assets->count().' assets must be checked on or before '.Helper::getFormattedDateObject($interval_date, 'date', false));
+        $this->info($assets->count().' assets must be checked in on or before '.$interval_date.' is deadline');


        foreach ($assets as $asset) {
            if ($asset->assignedTo && (isset($asset->assignedTo->email)) && ($asset->assignedTo->email!='') && $asset->checkedOutToUser()) {
+                $this->info('Sending User ExpectedCheckinNotification to: '.$asset->assignedTo->email);
                $asset->assignedTo->notify((new ExpectedCheckinNotification($asset)));
-                $count++;
-            }
-        }
-
-        if ($this->option('with-output')) {
-            if (($assets) && ($assets->count() > 0) && ($settings->alert_email != '')) {
-                $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.expected_checkin'),
-                    ],
-                    $assets->map(fn($assets) => [
-                        trans('general.id') => $assets->id,
-                        trans('admin/hardware/form.tag') => $assets->asset_tag,
-                        trans('admin/hardware/form.model') => $assets->model->name,
-                        trans('general.model_no') => $assets->model->model_number,
-                        trans('general.purchase_date') => $assets->purchase_date_formatted,
-                        trans('admin/hardware/form.eol_date') => $assets->expected_checkin_formattedDate ? $assets->expected_checkin_formattedDate . ' (' . $assets->expected_checkin_diff_for_humans . ')' : '',
-                    ])
-                );
            }
        }

@@ -93,11 +63,10 @@ class SendExpectedCheckinAlerts extends Command
            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item) {
                return new AlertRecipient($item);
            });
-            Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));
+
+            $this->info('Sending Admin ExpectedCheckinNotification to: '.$settings->alert_email);
+            \Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));

        }
-        
-        $this->info('Sent checkin reminders to to '.$count.' users.');
-
    }
 }
@@ -14,11 +14,11 @@ use Illuminate\Support\Facades\Mail;
 class SendExpirationAlerts extends Command
 {
    /**
-     * The name and signature of the console command.
- *
+     * The console command name.
+     *
     * @var string
     */
-    protected $signature = 'snipeit:expiring-alerts {--expired-licenses}';
+    protected $name = 'snipeit:expiring-alerts';

    /**
     * The console command description.
@@ -55,64 +55,24 @@ class SendExpirationAlerts extends Command
            // Expiring Assets
            $assets = Asset::getExpiringWarrantyOrEol($alert_interval);

-            $assets->load(['assignedTo', 'supplier']);
-
            if ($assets->count() > 0) {

                Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));

                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('admin/hardware/form.tag'),
-                        trans('admin/hardware/form.model'),
-                        trans('general.model_no'),
-                        trans('general.purchase_date'),
-                        trans('admin/hardware/form.eol_rate'),
-                        trans('admin/hardware/form.eol_date'),
-                        trans('admin/hardware/form.warranty_expires'),
-                    ],
-                    $assets->map(fn($item) =>
-                    [
-                        trans('general.id')  => $item->id,
-                        trans('admin/hardware/form.tag') => $item->asset_tag,
-                        trans('admin/hardware/form.model') => $item->model->name,
-                        trans('general.model_no') => $item->model->model_number,
-                        trans('general.purchase_date') => $item->purchase_date_formatted,
-                        trans('admin/hardware/form.eol_rate')  => $item->model->eol,
-                        trans('admin/hardware/form.eol_date') => $item->eol_date ? $item->eol_formatted_date .' ('.$item->eol_diff_for_humans.')' : '',
-                        trans('admin/hardware/form.warranty_expires') => $item->warranty_expires ? $item->warranty_expires_formatted_date .' ('.$item->warranty_expires_diff_for_humans.')' : '',
-                   ])
-                   );
+                    ['ID', 'Tag', 'Model', 'Model Number', 'EOL', 'EOL Months', 'Warranty Expires', 'Warranty Months'],
+                    $assets->map(fn($item) => ['ID' => $item->id, 'Tag' => $item->asset_tag, 'Model' => $item->model->name, 'Model Number' => $item->model->model_number, 'EOL' => $item->asset_eol_date, 'EOL Months' => $item->model->eol,  'Warranty Expires' => $item->warranty_expires,  'Warranty Months' => $item->warranty_months])
+                );
            }

            // Expiring licenses
-            $licenses = License::query()->ExpiringLicenses($alert_interval, $this->option('expired-licenses'))
-                ->with('manufacturer','category')
-                ->orderBy('expiration_date', 'ASC')
-                ->orderBy('termination_date', 'ASC')
-                ->get();
+            $licenses = License::getExpiringLicenses($alert_interval);
            if ($licenses->count() > 0) {
                Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));

                $this->table(
-                    [
-                        trans('general.id'),
-                        trans('general.name'),
-                        trans('general.purchase_date'),
-                        trans('admin/licenses/form.expiration'),
-                        trans('mail.expires'),
-                        trans('admin/licenses/form.termination_date'),
-                        trans('mail.terminates')],
-                    $licenses->map(fn($item) => [
-                        trans('general.id') => $item->id,
-                        trans('general.name') => $item->name,
-                        trans('general.purchase_date') => $item->purchase_date_formatted,
-                        trans('admin/licenses/form.expiration') => $item->expires_formatted_date,
-                        trans('mail.expires') => $item->expires_formatted_date ? $item->expires_diff_for_humans : '',
-                        trans('admin/licenses/form.termination_date') => $item->terminates_formatted_date,
-                        trans('mail.terminates') => $item->terminates_diff_for_humans
-                    ])
+                    ['ID', 'Name', 'Expires', 'Termination Date'],
+                    $licenses->map(fn($item) => ['ID' => $item->id, 'Name' => $item->name, 'Expires' => $item->expiration_date, 'Termination Date' => $item->termination_date])
                );
            }

@@ -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 == '') {
@@ -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));
        }

-
-
    }
 }
@@ -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');

@@ -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';
-}
@@ -15,20 +15,18 @@ class CheckoutableCheckedOut
    public $checkedOutBy;
    public $note;
    public $originalValues;
-    public int $quantity;

    /**
     * Create a new event instance.
     *
     * @return void
     */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note, $originalValues = [], $quantity = 1)
+    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note, $originalValues = [])
    {
        $this->checkoutable = $checkoutable;
        $this->checkedOutTo = $checkedOutTo;
        $this->checkedOutBy = $checkedOutBy;
        $this->note = $note;
        $this->originalValues = $originalValues;
-        $this->quantity = $quantity;
    }
 }
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\User;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
-
-class CheckoutablesCheckedOutInBulk
-{
-    use Dispatchable, SerializesModels;
-
-    public function __construct(
-        public Collection $assets,
-        public Model $target,
-        public User $admin,
-        public string $checkout_at,
-        public string $expected_checkin,
-        public string $note,
-    ) {
-    }
-}
@@ -162,8 +162,6 @@ class Handler extends ExceptionHandler
                $route = 'licenses.index';
            } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
                $route = 'fields.index';
-            } elseif ($route == 'actionlogs.index') {
-                $route = 'home';
            }

            return redirect()
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAccessories extends ItemStillHasChildren
-{
-    //
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAssetModels extends ItemStillHasChildren
-{
-    //
-}
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasAssets extends ItemStillHasChildren
-{
-}
@@ -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()
-    //
-    //}
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasComponents extends ItemStillHasChildren
-{
-    //
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasConsumables extends ItemStillHasChildren
-{
-    //
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasLicenses extends ItemStillHasChildren
-{
-    //
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ItemStillHasMaintenances extends ItemStillHasChildren
-{
-    //
-}
@@ -2,7 +2,6 @@

 namespace App\Helpers;
 use App\Models\Accessory;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Component;
@@ -14,7 +13,6 @@ use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\License;
 use App\Models\Location;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
@@ -775,18 +773,18 @@ class Helper
    public static function checkLowInventory()
    {
        $alert_threshold = \App\Models\Setting::getSettings()->alert_threshold;
-        $consumables = Consumable::withCount('consumableAssignments as consumables_users_count')->whereNotNull('min_amt')->get();
+        $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
        $accessories = Accessory::withCount('checkouts as checkouts_count')->whereNotNull('min_amt')->get();
-        $components = Component::withCount('assets as sum_unconstrained_assets')->whereNotNull('min_amt')->get();
-        $asset_models = AssetModel::where('min_amt', '>', 0)->withCount(['availableAssets', 'assets'])->get();
-        $licenses = License::withCount('availCount as licenses_available')->where('min_amt', '>', 0)->get();
+        $components = Component::whereNotNull('min_amt')->get();
+        $asset_models = AssetModel::where('min_amt', '>', 0)->get();
+        $licenses = License::where('min_amt', '>', 0)->get();

        $items_array = [];
        $all_count = 0;

        foreach ($consumables as $consumable) {
            $avail = $consumable->numRemaining();
-            if ($avail <= ($consumable->min_amt) + $alert_threshold) {
+            if ($avail < ($consumable->min_amt) + $alert_threshold) {
                if ($consumable->qty > 0) {
                    $percent = number_format((($avail / $consumable->qty) * 100), 0);
                } else {
@@ -805,7 +803,7 @@ class Helper

        foreach ($accessories as $accessory) {
            $avail = $accessory->qty - $accessory->checkouts_count;
-            if ($avail <= ($accessory->min_amt) + $alert_threshold) {
+            if ($avail < ($accessory->min_amt) + $alert_threshold) {
                if ($accessory->qty > 0) {
                    $percent = number_format((($avail / $accessory->qty) * 100), 0);
                } else {
@@ -824,7 +822,7 @@ class Helper

        foreach ($components as $component) {
            $avail = $component->numRemaining();
-            if ($avail <= ($component->min_amt) + $alert_threshold) {
+            if ($avail < ($component->min_amt) + $alert_threshold) {
                if ($component->qty > 0) {
                    $percent = number_format((($avail / $component->qty) * 100), 0);
                } else {
@@ -844,10 +842,10 @@ class Helper
        foreach ($asset_models as $asset_model){

            $asset = new Asset();
-            $total_owned = $asset_model->assets_count; //requires the withCount() clause in the initial query!
-            $avail = $asset_model->available_assets_count; //requires the withCount() clause in the initial query!
+            $total_owned = $asset->where('model_id', '=', $asset_model->id)->count();
+            $avail = $asset->where('model_id', '=', $asset_model->id)->whereNull('assigned_to')->count();

-            if ($avail <= ($asset_model->min_amt) + $alert_threshold) {
+            if ($avail < ($asset_model->min_amt) + $alert_threshold) {
                if ($avail > 0) {
                    $percent = number_format((($avail / $total_owned) * 100), 0);
                } else {
@@ -865,7 +863,7 @@ class Helper

        foreach ($licenses as $license){
            $avail = $license->remaincount();
-            if ($avail <= ($license->min_amt) + $alert_threshold) {
+            if ($avail < ($license->min_amt) + $alert_threshold) {
                if ($avail > 0) {
                    $percent = number_format((($avail / $license->min_amt) * 100), 0);
                } else {
@@ -1386,24 +1384,49 @@ class Helper
     * @return string[]
     */
    public static function SettingUrls(){
-        $settings=[
-            '#',
-            'fields*',
-            'statuslabels*',
-            'models*',
-            'categories*',
-            'manufacturers*',
-            'suppliers*',
-            'departments*',
-            'locations*',
-            'companies*',
-            'depreciations*'
-        ];
+        $settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index'];

        return $settings;
        }


+    /**
+     * Generic helper (largely used by livewire right now) that returns the font-awesome icon
+     * for the object type.
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since 6.1.0
+     *
+     * @return string
+     */
+    public static function iconTypeByItem($item) {
+
+        switch ($item) {
+            case 'asset':
+                return 'fas fa-barcode';
+            case 'accessory':
+                return 'fas fa-keyboard';
+            case 'component':
+                return 'fas fa-hdd';
+            case 'consumable':
+                return 'fas fa-tint';
+            case 'license':
+                return 'far fa-save';
+            case 'location':
+                return 'fas fa-map-marker-alt';
+            case 'user':
+                return 'fas fa-user';
+            case 'supplier':
+                return 'fa-solid fa-store';
+            case 'manufacturer':
+                return 'fa-solid fa-building';
+            case 'category':
+                return 'fa-solid fa-table-columns';
+        }
+
+    }
+
+
     /*
     * This is a shorter way to see if the app is in demo mode.
     *
@@ -1547,6 +1570,7 @@ class Helper
            ]) ? 'rtl' : 'ltr';
    }

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

@@ -1711,83 +1735,4 @@ class Helper
        }
        return $mismatched;
    }
-    static public function labelFieldLayoutScaling(
-        $pdf,
-        iterable|\Closure $fields,
-        float $currentX,
-        float $usableWidth,
-        float $usableHeight,
-        float $baseLabelSize,
-        float $baseFieldSize,
-        float $baseFieldMargin,
-        ?string $title            = null,
-        float $baseTitleSize      = 0.0,
-        float $baseTitleMargin    = 0.0,
-        float $baseLabelPadding = 1.5,
-        float $baseGap          = 1.5,
-        float $maxScale         = 1.8,
-        string $labelFont       = 'freesans',
-
-    )  : array
-    {
-        $fieldCount = count($fields);
-        $perFieldHeight = max($baseLabelSize, $baseFieldSize) + $baseFieldMargin;
-        $baseFieldsHeight = $fieldCount * $perFieldHeight;
-
-        $hasTitle = is_string($title) && trim($title) !== '';
-        $baseTitleHeight = $hasTitle ? ($baseTitleSize + $baseTitleMargin) : 0.0;
-        $baseTotalHeight = $baseTitleHeight + $baseFieldsHeight;
-        $scale = 1.0;
-        if ($baseTotalHeight > 0 && $usableHeight > 0) {
-            $scale = $usableHeight / $baseTotalHeight;
-        }
-
-        $scale = min($scale, $maxScale);
-
-        $labelSize = $baseLabelSize;
-        $fieldSize = $baseFieldSize * $scale;
-        $fieldMargin = $baseFieldMargin * $scale;
-
-        $rowAdvance = max($labelSize, $fieldSize) + $fieldMargin;
-        $titleSize   = $hasTitle ? ($baseTitleSize   * $scale) : 0.0;
-        $titleMargin = $hasTitle ? ($baseTitleMargin * $scale) : 0.0;
-        $titleAdvance = $hasTitle ? ($titleSize + $titleMargin) : 0.0;
-
-        $pdf->SetFont($labelFont, '', $baseLabelSize);
-
-        $maxLabelWidthPerUnit = 0;
-        foreach ($fields as $field) {
-            $rawLabel = $field['label'] ?? null;
-
-            // If no label, do not include it in label-column sizing
-            if (!is_string($rawLabel) || trim($rawLabel) === '') {
-                continue;
-            }
-            $label = rtrim($field['label'], ':') . ':';
-            $width = $pdf->GetStringWidth($label);
-            $maxLabelWidthPerUnit = max($maxLabelWidthPerUnit, $width / $baseLabelSize);
-        }
-
-        $labelPadding = $baseLabelPadding * $scale;
-        $gap = $baseGap * $scale;
-
-        $labelWidth = ($maxLabelWidthPerUnit * $labelSize) + $labelPadding;
-        $valueX = $currentX + $labelWidth + $gap;
-        $valueWidth = $usableWidth - $labelWidth - $gap;
-
-        return compact(
-            'scale',
-            'hasTitle',
-            'titleSize',
-            'titleMargin',
-            'titleAdvance',
-            'labelSize',
-            'fieldSize',
-            'fieldMargin',
-            'rowAdvance',
-            'labelWidth',
-            'valueX',
-            'valueWidth'
-        );
-    }
 }
@@ -12,7 +12,6 @@ class IconHelper
            case 'checkin':
                return 'fa-solid fa-rotate-right';
            case 'edit':
-            case 'update':
                return 'fas fa-pencil-alt';
            case 'clone':
                return 'far fa-clone';
@@ -37,20 +36,14 @@ class IconHelper
                return 'fa-solid fa-user';
            case 'users':
                return 'fas fa-users';
-            case 'supplier':
-                return 'fa-solid fa-store';
            case 'restore':
                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 'fax':
-                return 'fa-solid fa-fax';
            case 'mobile':
                return 'fas fa-mobile-screen-button';
            case 'long-arrow-right':
@@ -58,7 +51,7 @@ class IconHelper
            case 'download':
                return 'fas fa-download';
            case 'checkmark':
-                return 'fas fa-check';
+                return 'fas fa-check icon-white';
            case 'x':
                return 'fas fa-times';
            case 'logout':
@@ -90,11 +83,8 @@ class IconHelper
            case 'licenses':
            case 'license':
                return 'far fa-save';
-            case 'requests':
            case 'requestable':
-            case 'request':
-            case 'requested':
-                return 'fa-solid fa-bell-concierge';
+                return 'fas fa-laptop';
            case 'reports':
                return 'fas fa-chart-bar';
            case 'heart':
@@ -137,12 +127,9 @@ class IconHelper
                return 'fa-regular fa-clipboard';
            case 'paperclip':
                return 'fas fa-paperclip';
-            case 'contact-card':
-                return 'fa-regular fa-id-card';
            case 'files':
                return 'fa-regular fa-file';
            case 'more-info':
-            case 'support':
                return 'far fa-life-ring';
            case 'calendar':
                return 'fas fa-calendar';
@@ -153,7 +140,7 @@ class IconHelper
            case 'more-files':
                return 'fa-solid fa-laptop-file';
            case 'maintenances':
-                return 'fa-solid fa-screwdriver-wrench';
+                return 'fas fa-wrench';
            case 'seats':
                return 'far fa-list-alt';
            case 'globe-us':
@@ -208,60 +195,6 @@ class IconHelper
            case 'note':
            case 'notes':
                return 'fas fa-sticky-note';
-            case 'tip':
-                return 'fa-solid fa-lightbulb';
-            case 'highlight':
-                return 'fa-solid fa-highlighter';
-            case 'manager':
-                return 'fa-solid fa-building-user';
-            case 'company':
-                return 'fa-regular fa-building';
-            case 'parent':
-                return 'fa-solid fa-building-flag';
-            case 'number':
-                return 'fa-solid fa-hashtag';
-            case 'depreciation':
-                return 'fa-solid fa-arrows-down-to-line';
-            case 'depreciation-calendar':
-            case 'expiration':
-            case 'terminates':
-                return 'fa-regular fa-calendar-xmark';
-            case 'manufacturer':
-                return 'fa-solid fa-industry';
-            case 'fieldset' :
-                return 'fa-regular fa-rectangle-list';
-            case 'deleted-date':
-                return 'fa-solid fa-calendar-xmark';
-            case 'eol':
-                return 'fa-regular fa-calendar-days';
-            case 'category':
-                return 'fa-solid fa-icons';
-            case 'cost':
-                return 'fa-solid fa-money-bills';
-            case 'available':
-                return 'fa-solid fa-box';
-            case 'checkedout':
-                return 'fa-solid fa-box-open';
-            case 'purchase_order':
-                return 'fa-solid fa-file-invoice-dollar';
-            case 'order':
-                return 'fa-solid fa-file-invoice';
-            case 'checkout-all':
-                return 'fa-solid fa-arrows-down-to-people';
-            case 'square-right':
-                return 'fa-regular fa-square-caret-right';
-            case 'square-left':
-                return 'fa-regular fa-square-caret-left';
-            case 'square':
-                return 'fa-solid fa-square';
-            case 'models':
-            case 'model':
-                return 'fa-solid fa-boxes-stacked';
-            case 'min-qty':
-                return 'fa-solid fa-chart-pie';
-
-
-
        }
    }
 }
@@ -90,10 +90,10 @@ class AccessoriesController extends Controller
            $accessory = $request->handleImages($accessory);
        }

-        if($request->input('redirect_option') === 'back'){
+        if($request->get('redirect_option') === 'back'){
            session()->put(['redirect_option' => 'index']);
        } else {
-            session()->put(['redirect_option' => $request->input('redirect_option')]);
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
        }

        // Was the accessory created?
@@ -182,11 +182,7 @@ class AccessoriesController extends Controller

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

-            if($request->input('redirect_option') === 'back'){
-                session()->put(['redirect_option' => 'index']);
-            } else {
-                session()->put(['redirect_option' => $request->input('redirect_option')]);
-            }
+            session()->put(['redirect_option' => $request->get('redirect_option')]);

            if ($accessory->save()) {
                return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
@@ -76,7 +76,7 @@ class AccessoryCheckinController extends Controller
        if ($accessory_checkout->delete()) {
            event(new CheckoutableCheckedIn($accessory, $accessory_checkout->assignedTo, auth()->user(), $request->input('note'), $checkin_at));

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

            return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
                ->with('success', trans('admin/accessories/message.checkin.success'));
@@ -67,7 +67,7 @@ class AccessoryCheckoutController extends Controller
     */
    public function store(AccessoryCheckoutRequest $request, Accessory $accessory) : RedirectResponse
    {
-
+        
        $this->authorize('checkout', $accessory);

        $target = $this->determineCheckoutTarget();
@@ -89,19 +89,12 @@ class AccessoryCheckoutController extends Controller
            $accessory_checkout->save();
        }

-        event(new CheckoutableCheckedOut(
-            $accessory,
-            $target,
-            auth()->user(),
-            $request->input('note'),
-            [],
-            $accessory->checkout_qty,
-        ));
+        event(new CheckoutableCheckedOut($accessory,  $target, auth()->user(), $request->input('note')));

        $request->request->add(['checkout_to_type' => request('checkout_to_type')]);
        $request->request->add(['assigned_to' => $target->id]);

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


        // Redirect to the new accessory page
@@ -13,9 +13,9 @@ use App\Models\Company;
 use App\Models\Contracts\Acceptable;
 use App\Models\Setting;
 use App\Models\User;
-use App\Notifications\AcceptanceItemAcceptedNotification;
-use App\Notifications\AcceptanceItemAcceptedToUserNotification;
-use App\Notifications\AcceptanceItemDeclinedNotification;
+use App\Notifications\AcceptanceAssetAcceptedNotification;
+use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
+use App\Notifications\AcceptanceAssetDeclinedNotification;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -74,16 +74,17 @@ class AcceptanceController extends Controller
     */
    public function store(Request $request, $id) : RedirectResponse
    {
-
-        if (!$acceptance = CheckoutAcceptance::find($id)) {
-            return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-        
+        $acceptance = CheckoutAcceptance::find($id);
        $assigned_user = User::find($acceptance->assigned_to_id);
        $settings = Setting::getSettings();
+        $path_logo = '';
        $sig_filename='';


+        if (is_null($acceptance)) {
+            return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
        if (! $acceptance->isPending()) {
            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
        }
@@ -116,6 +117,8 @@ class AcceptanceController extends Controller

        $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);

+
+
        // If signatures are required, make sure we have one
        if (Setting::getSettings()->require_accept_signature == '1') {

@@ -135,17 +138,10 @@ class AcceptanceController extends Controller
        }


-        // Convert PDF logo to base64 for TCPDF
-        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
-        $encoded_logo = null;
-        if (($settings->acceptance_pdf_logo) && (Storage::disk('public')->exists($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->display_name, // this handles licenses seats, which don't have a 'name' field
+            '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,
@@ -155,16 +151,16 @@ class AcceptanceController extends Controller
            'accepted_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
            'declined_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),
            'assigned_to' => $assigned_user->display_name,
-            'email' => $assigned_user->email,
-            'employee_num' => $assigned_user->employee_num,
            'site_name' => $settings->site_name,
            'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
-            'logo' => ($encoded_logo) ?? null,
+            'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
+            'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,
            'date_settings' => $settings->date_display_format,
+            'admin' => auth()->user()->present()?->fullName,
            'qty' => $acceptance->qty ?? 1,
        ];

+
        if ($request->input('asset_acceptance') == 'accepted') {


@@ -183,13 +179,13 @@ class AcceptanceController extends Controller
                // Add the attachment for the signing user into the $data array
                $data['file'] = $pdf_filename;
                try {
-                    $assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));
+                    $assigned_user->notify((new AcceptanceAssetAcceptedToUserNotification($data))->locale($assigned_user->locale));
                } catch (\Exception $e) {
                    Log::warning($e);
                }
            }
            try {
-                $acceptance->notify((new AcceptanceItemAcceptedNotification($data))->locale(Setting::getSettings()->locale));
+                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
            } catch (\Exception $e) {
                Log::warning($e);
            }
@@ -204,7 +200,7 @@ class AcceptanceController extends Controller
                $acceptance->decline($sig_filename, $request->input('note'));
            }

-            $acceptance->notify(new AcceptanceItemDeclinedNotification($data));
+            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
            Log::debug('New event acceptance.');
            event(new CheckoutDeclined($acceptance));
            $return_msg = trans('admin/users/message.declined');
@@ -216,7 +212,7 @@ class AcceptanceController extends Controller
            try {
                $recipient = User::find($acceptance->alert_on_response_id);

-                if ($recipient?->email) {
+                if ($recipient) {
                    Log::debug('Attempting to send email acceptance.');
                    Mail::to($recipient)->send(new CheckoutAcceptanceResponseMail(
                        $acceptance,
@@ -53,17 +53,7 @@ class AccessoriesController extends Controller
                'company_id',
                'notes',
                'checkouts_count',
-                'order_number',
                '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',
            ];


@@ -71,31 +61,14 @@ 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'));
        }

-        if ($request->filled('order_number')) {
-            $accessories->where('accessories.order_number', '=', $request->input('order_number'));
-        }
-
        if ($request->filled('category_id')) {
            $accessories->where('category_id', '=', $request->input('category_id'));
        }
@@ -330,14 +303,7 @@ class AccessoriesController extends Controller
        }

        // Set this value to be able to pass the qty through to the event
-        event(new CheckoutableCheckedOut(
-            $accessory,
-            $target,
-            auth()->user(),
-            $request->input('note'),
-            [],
-            $accessory->checkout_qty,
-        ));
+        event(new CheckoutableCheckedOut($accessory, $target, auth()->user(), $request->input('note')));

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

@@ -401,7 +367,7 @@ class AccessoriesController extends Controller
        ]);

        if ($request->filled('search')) {
-            $accessories = $accessories->where('accessories.name', 'LIKE', '%'.$request->input('search').'%');
+            $accessories = $accessories->where('accessories.name', 'LIKE', '%'.$request->get('search').'%');
        }

        $accessories = $accessories->orderBy('name', 'ASC')->paginate(50);
@@ -46,20 +46,11 @@ class AssetModelsController extends Controller
                'manufacturer',
                'requestable',
                'assets_count',
-                'assets_assigned_count',
-                'assets_archived_count',
-                'remaining',
                'category',
                'fieldset',
                'deleted_at',
                'updated_at',
                'require_serial',
-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'manufacturer',
-                'category',
            ];

        $assetmodels = AssetModel::select([
@@ -82,28 +73,7 @@ class AssetModelsController extends Controller
            'models.require_serial'
         ])
            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
-            ->withCount('assets as assets_count')
-            ->withCount('availableAssets as remaining')
-            ->withCount('assignedAssets as assets_assigned_count')
-            ->withCount('archivedAssets as assets_archived_count');
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
-
-        }
-
-        if ((! is_null($filter)) && (count($filter)) > 0) {
-            $assetmodels->ByFilter($filter);
-        } elseif ($request->filled('search')) {
-            $assetmodels->TextSearch($request->input('search'));
-        }
-
+            ->withCount('assets as assets_count');

        if ($request->input('status')=='deleted') {
            $assetmodels->onlyTrashed();
@@ -249,7 +219,7 @@ class AssetModelsController extends Controller
         * it, but I'll be damned if I can think of one. - snipe
         */
        if ($request->filled('custom_fieldset_id')) {
-            $assetmodel->fieldset_id = $request->input('custom_fieldset_id');
+            $assetmodel->fieldset_id = $request->get('custom_fieldset_id');
        }


@@ -3,39 +3,36 @@
 namespace App\Http\Controllers\Api;

 use App\Events\CheckoutableCheckedIn;
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetCheckoutRequest;
-use App\Http\Requests\FilterRequest;
 use App\Http\Requests\StoreAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
+use App\Models\AccessoryCheckout;
+use App\Models\CheckoutAcceptance;
+use App\Models\LicenseSeat;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Gate;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\AssetCheckoutRequest;
 use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\ComponentsTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\AccessoryCheckout;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\License;
-use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use App\View\Label;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
+use App\View\Label;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;

@@ -58,7 +55,7 @@ class AssetsController extends Controller
     * @param int $assetId
     * @since [v4.0]
     */
-    public function index(FilterRequest $request, $action = null, $upcoming_status = null) : JsonResponse | array
+    public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array
    {


@@ -118,22 +115,6 @@ class AssetsController extends Controller
            'asset_eol_date',
            'requestable',
            'jobtitle',
-            // These are *relationships* so we wouldn't normally include them in this array,
-            // since they would normally create a `column not found` error,
-            // BUT we account for them in the ordering switch down at the end of this method
-            // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-            'company',
-            'model',
-            'location',
-            'rtd_location',
-            'category',
-            'status_label',
-            'manufacturer',
-            'supplier',
-            'jobtitle',
-            'assigned_to',
-            'created_by',
-
        ];

        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
@@ -150,19 +131,9 @@ class AssetsController extends Controller
            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
                return in_array($key, $allowed_columns);
            }, ARRAY_FILTER_USE_KEY);
-
        }

        $assets = Asset::select('assets.*')
-//            ->addSelect([
-//                'first_checkout_at' => Actionlog::query()
-//                    ->select('created_at')
-//                    ->whereColumn('item_id', 'assets.id')
-//                    ->where('item_type', Asset::class)
-//                    ->where('action_type', 'checkout')
-//                    ->orderBy('created_at')
-//                    ->limit(1),
-//            ])
            ->with(
                'model',
                'location',
@@ -194,7 +165,7 @@ class AssetsController extends Controller
        // Search custom fields by column name
        foreach ($all_custom_fields as $field) {
            if ($request->filled($field->db_column_name()) && $field->db_column_name()) {
-                $assets->where('assets.'.$field->db_column_name(), '=', $request->input($field->db_column_name()));
+                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
            }
        }

@@ -387,7 +358,7 @@ class AssetsController extends Controller
        }

        if ($request->filled('order_number')) {
-            $assets->where('assets.order_number', '=', strval($request->input('order_number')));
+            $assets->where('assets.order_number', '=', strval($request->get('order_number')));
        }

        // This is kinda gross, but we need to do this because the Bootstrap Tables
@@ -664,7 +635,7 @@ class AssetsController extends Controller
    public function store(StoreAssetRequest $request): JsonResponse
    {
        $asset = new Asset();
-        $asset->model()->associate(AssetModel::find((int) $request->input('model_id')));
+        $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));

        $asset->fill($request->validated());
        $asset->created_by    = auth()->id();
@@ -693,8 +664,8 @@ class AssetsController extends Controller
                // If input value is null, use custom field's default value
                if ($field_val == null) {
                    Log::debug('Field value for ' . $field->db_column . ' is null');
-                    $field_val = $field->defaultValue($request->input('model_id'));
-                    Log::debug('Use the default fieldset value of ' . $field->defaultValue($request->input('model_id')));
+                    $field_val = $field->defaultValue($request->get('model_id'));
+                    Log::debug('Use the default fieldset value of ' . $field->defaultValue($request->get('model_id')));
                }

                // if the field is set to encrypted, make sure we encrypt the value
@@ -705,7 +676,7 @@ class AssetsController extends Controller

                        // If input value is null, use custom field's default value
                        if (($field_val == null) && ($request->has('model_id') != '')) {
-                            $field_val = Crypt::encrypt($field->defaultValue($request->input('model_id')));
+                            $field_val = Crypt::encrypt($field->defaultValue($request->get('model_id')));
                        } else {
                            $field_val = Crypt::encrypt($request->input($field->db_column));
                        }
@@ -723,15 +694,15 @@ class AssetsController extends Controller
        }

        if ($asset->save()) {
-            if ($request->input('assigned_user')) {
+            if ($request->get('assigned_user')) {
                $target = User::find(request('assigned_user'));
-            } elseif ($request->input('assigned_asset')) {
+            } elseif ($request->get('assigned_asset')) {
                $target = Asset::find(request('assigned_asset'));
-            } elseif ($request->input('assigned_location')) {
+            } elseif ($request->get('assigned_location')) {
                $target = Location::find(request('assigned_location'));
            }
            if (isset($target)) {
-                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->input('name')));
+                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
            }

            if ($asset->image) {
@@ -808,22 +779,19 @@ class AssetsController extends Controller
            }
        }
        if ($asset->save()) {
-            if (($request->filled('assigned_user')) && ($target = User::find($request->input('assigned_user')))) {
+            if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
                $location = $target->location_id;
-            } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->input('assigned_asset')))) {
+            } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
                $location = $target->location_id;

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

            if (isset($target)) {
-                // Using `->has` preserves the asset name if the name parameter was not included in request.
-                $asset_name = request()->has('name') ? request('name') : $asset->name;
-
-                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', $asset_name, $location);
+                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
            }

            if ($asset->image) {
@@ -967,7 +935,7 @@ class AssetsController extends Controller
        }

        if ($request->filled('status_id')) {
-            $asset->status_id = $request->input('status_id');
+            $asset->status_id = $request->get('status_id');
        }

        if (! isset($target)) {
@@ -1047,7 +1015,7 @@ class AssetsController extends Controller
        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at') . ' ' . date('H:i:s') : date('Y-m-d H:i:s');
        $originalValues = $asset->getRawOriginal();

-        if (($request->filled('checkin_at')) && ($request->input('checkin_at') != date('Y-m-d'))) {
+        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
            $originalValues['action_date'] = $checkin_at;
        }

@@ -1148,9 +1116,7 @@ class AssetsController extends Controller
            $payload = [
                'id' => $asset->id,
                'asset_tag' => $asset->asset_tag,
-                'note' => e($request->input('note')),
-                'status_label' => e($asset->assetstatus->display_name),
-                'status_type' => $asset->assetstatus->getStatuslabelType(),
+                'note' => $request->input('note'),
                'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
            ];

@@ -1158,7 +1124,7 @@ class AssetsController extends Controller
            /**
             * Update custom fields in the database.
             * Validation for these fields is handled through the AssetRequest form request
-             * $model = AssetModel::find($request->input('model_id'));
+             * $model = AssetModel::find($request->get('model_id'));
            */
            if (($asset->model) && ($asset->model->fieldset)) {
                $payload['custom_fields'] = [];
@@ -1356,18 +1322,6 @@ class AssetsController extends Controller
        return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
    }

-    public function assignedComponents(Request $request, Asset $asset): JsonResponse|array
-    {
-        $this->authorize('view', Asset::class);
-        $this->authorize('view', $asset);
-
-        $asset->loadCount('components');
-        $total = $asset->components_count;
-
-        $components = $asset->load(['components' => fn($query) => $query->applyOffsetAndLimit($total)])->components;
-
-        return (new ComponentsTransformer)->transformComponents($components, $total);
-    }

    /**
     * Generate asset labels by tag
@@ -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;
@@ -43,7 +41,6 @@ class CategoriesController extends Controller
            'created_at',
            'updated_at',
            'image',
-            'tag_color',
            'notes',
        ];

@@ -58,30 +55,12 @@ class CategoriesController extends Controller
            'require_acceptance',
            'checkin_email',
            'image',
-            'tag_color',
            'notes',
            ])
            ->with('adminuser')
            ->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
@@ -95,6 +74,10 @@ class CategoriesController extends Controller
            $categories = $categories->withCount('showableAssets as assets_count');
        }

+        if ($request->filled('search')) {
+            $categories = $categories->TextSearch($request->input('search'));
+        }
+
        if ($request->filled('name')) {
            $categories->where('name', '=', $request->input('name'));
        }
@@ -228,21 +211,17 @@ class CategoriesController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function destroy(Category $category): JsonResponse
+    public function destroy($id) : JsonResponse
    {
        $this->authorize('delete', Category::class);
-        try {
-            DestroyCategoryAction::run(category: $category);
-        } catch (ItemStillHasChildren $e) {
+        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($id);
+
+        if (! $category->isDeletable()) {
            return response()->json(
-                Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['asset_type' => $category->category_type]))
-            );
-        } catch (\Exception $e) {
-            report($e);
-            return response()->json(
-                Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))
+                Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type]))
            );
        }
+        $category->delete();

        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success')));
    }
@@ -265,7 +244,7 @@ class CategoriesController extends Controller
        ]);

        if ($request->filled('search')) {
-            $categories = $categories->where('name', 'LIKE', '%'.$request->input('search').'%');
+            $categories = $categories->where('name', 'LIKE', '%'.$request->get('search').'%');
        }

        $categories = $categories->where('category_type', $category_type)->orderBy('name', 'ASC')->paginate(50);
@@ -38,7 +38,6 @@ class CompaniesController extends Controller
            'accessories_count',
            'consumables_count',
            'components_count',
-            'tag_color',
            'notes',
        ];

@@ -65,11 +64,6 @@ class CompaniesController extends Controller
            $companies->where('created_by', '=', $request->input('created_by'));
        }

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

        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');
@@ -197,12 +191,11 @@ class CompaniesController extends Controller
            'companies.name',
            'companies.email',
            'companies.image',
-            'companies.tag_color',
        ]);


        if ($request->filled('search')) {
-            $companies = $companies->where('companies.name', 'LIKE', '%'.$request->input('search').'%');
+            $companies = $companies->where('companies.name', 'LIKE', '%'.$request->get('search').'%');
        }

        $companies = $companies->orderBy('name', 'ASC')->paginate(50);
@@ -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', 'supplier', 'adminuser', 'manufacturer')
-            ->withSum('unconstrainedAssets as sum_unconstrained_assets', '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);
+            ->with('company', 'location', 'category', 'assets', 'supplier', 'adminuser', 'manufacturer', 'uncontrainedAssets')
+            ->withSum('uncontrainedAssets', 'components_assets.assigned_qty');

+        if ($request->filled('search')) {
+            $components = $components->TextSearch($request->input('search'));
        }

-        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'));
        }
@@ -87,10 +63,6 @@ class ComponentsController extends Controller
            $components->where('components.company_id', '=', $request->input('company_id'));
        }

-        if ($request->filled('order_number')) {
-            $components->where('components.order_number', '=', $request->input('order_number'));
-        }
-
        if ($request->filled('category_id')) {
            $components->where('category_id', '=', $request->input('category_id'));
        }
@@ -116,8 +88,7 @@ class ComponentsController extends Controller
        }

        // Make sure the offset and limit are actually integers and do not exceed system limits
-        $components_count = $components->count();
-        $offset = ($request->input('offset') > $components_count) ? $components_count : app('api_offset_value');
+        $offset = ($request->input('offset') > $components->count()) ? $components->count() : app('api_offset_value');
        $limit = app('api_limit_value');

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -148,7 +119,7 @@ class ComponentsController extends Controller
                break;
        }

-        $total = $components_count;
+        $total = $components->count();
        $components = $components->skip($offset)->take($limit)->get();

        return (new ComponentsTransformer)->transformComponents($components, $total);
@@ -307,11 +278,11 @@ class ComponentsController extends Controller
        }

        // Make sure there is at least one available to checkout
-        if ($component->numRemaining() < $request->input('assigned_qty')) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->input('assigned_qty')])));
+        if ($component->numRemaining() < $request->get('assigned_qty')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->get('assigned_qty')])));
        }

-        if ($component->numRemaining() >= $request->input('assigned_qty')) {
+        if ($component->numRemaining() >= $request->get('assigned_qty')) {

            $asset = Asset::find($request->input('assigned_to'));
            $component->assigned_to = $request->input('assigned_to');
@@ -319,18 +290,18 @@ class ComponentsController extends Controller
            $component->assets()->attach($component->id, [
                'component_id' => $component->id,
                'created_at' => Carbon::now(),
-                'assigned_qty' => $request->input('assigned_qty', 1),
+                'assigned_qty' => $request->get('assigned_qty', 1),
                'created_by' => auth()->id(),
-                'asset_id' => $request->input('assigned_to'),
-                'note' => $request->input('note'),
+                'asset_id' => $request->get('assigned_to'),
+                'note' => $request->get('note'),
            ]);

-            $component->logCheckout($request->input('note'), $asset, null, [], $request->get('assigned_qty', 1));
+            $component->logCheckout($request->input('note'), $asset);

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

-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->input('assigned_qty')])));
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.checkout.unavailable', ['remaining' => $component->numRemaining(), 'requested' => $request->get('assigned_qty')])));
    }

    /**
@@ -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'));
        }
@@ -86,10 +43,6 @@ class ConsumablesController extends Controller
            $consumables->where('consumables.company_id', '=', $request->input('company_id'));
        }

-        if ($request->filled('order_number')) {
-            $consumables->where('consumables.order_number', '=', $request->input('order_number'));
-        }
-
        if ($request->filled('category_id')) {
            $consumables->where('category_id', '=', $request->input('category_id'));
        }
@@ -143,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;
@@ -330,14 +302,8 @@ class ConsumablesController extends Controller
            );
        }

-        event(new CheckoutableCheckedOut(
-            $consumable,
-            $user,
-            auth()->user(),
-            $request->input('note'),
-            [],
-            $consumable->checkout_qty,
-        ));
+
+        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));

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

@@ -356,7 +322,7 @@ class ConsumablesController extends Controller
        ]);

        if ($request->filled('search')) {
-            $consumables = $consumables->where('consumables.name', 'LIKE', '%'.$request->input('search').'%');
+            $consumables = $consumables->where('consumables.name', 'LIKE', '%'.$request->get('search').'%');
        }

        $consumables = $consumables->orderBy('name', 'ASC')->paginate(50);
@@ -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;
@@ -24,23 +23,21 @@ class DepartmentsController extends Controller
    public function index(Request $request) : JsonResponse | array
    {
        $this->authorize('view', Department::class);
-        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes', 'tag_color'];
+        $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.tag_color',
-                'departments.notes'
-            ])->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'));
@@ -62,10 +59,6 @@ class DepartmentsController extends Controller
            $departments->where('location_id', '=', $request->input('location_id'));
        }

-        if ($request->filled('tag_color')) {
-            $departments->where('tag_color', '=', $request->input('departments.tag_color'));
-        }
-
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $departments->count()) ? $departments->count() : app('api_offset_value');
        $limit = app('api_limit_value');
@@ -101,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()));

@@ -127,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);
    }

@@ -147,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()));
@@ -191,11 +185,10 @@ class DepartmentsController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
-            $departments = $departments->where('name', 'LIKE', '%'.$request->input('search').'%');
+            $departments = $departments->where('name', 'LIKE', '%'.$request->get('search').'%');
        }

        $departments = $departments->orderBy('name', 'ASC')->paginate(50);
@@ -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',
                ];

@@ -15,7 +15,6 @@ use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 use League\Csv\Reader;
 use Onnov\DetectEncoding\EncodingDetector;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
@@ -150,9 +149,7 @@ class ImportController extends Controller
                }

                $date = date('Y-m-d-his');
-
-                $fixed_filename = Str::of($file->getClientOriginalName())->basename('.csv').'.csv';
-
+                $fixed_filename = str_slug($file->getClientOriginalName());
                try {
                    $file->move($path, $date.'-'.$fixed_filename);
                } catch (FileException $exception) {
@@ -196,7 +193,7 @@ class ImportController extends Controller
        $this->authorize('import');

        // Run a backup immediately before processing
-        if ($request->input('run-backup')) {
+        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')]);
        } else {
@@ -212,49 +209,38 @@ class ImportController extends Controller

        $errors = $request->import($import);
        $redirectTo = 'hardware.index';
-        switch ($request->input('import-type')) {
+        switch ($request->get('import-type')) {
            case 'asset':
-                $model_perms = 'App\Models\Asset';
                $redirectTo = 'hardware.index';
                break;
            case 'assetModel':
-                $model_perms = 'App\Models\AssetModel';
                $redirectTo = 'models.index';
                break;
            case 'accessory':
-                $model_perms = 'App\Models\Accessory';
                $redirectTo = 'accessories.index';
                break;
            case 'consumable':
-                $model_perms = 'App\Models\Consumable';
                $redirectTo = 'consumables.index';
                break;
            case 'component':
-                $model_perms = 'App\Models\Component';
                $redirectTo = 'components.index';
                break;
            case 'license':
-                $model_perms = 'App\Models\License';
                $redirectTo = 'licenses.index';
                break;
            case 'user':
-                $model_perms = 'App\Models\User';
                $redirectTo = 'users.index';
                break;
            case 'location':
-                $model_perms = 'App\Models\Location';
                $redirectTo = 'locations.index';
                break;
            case 'supplier':
-                $model_perms = 'App\Models\Supplier';
                $redirectTo = 'suppliers.index';
                break;
            case 'manufacturer':
-                $model_perms = 'App\Models\Manufacturer';
                $redirectTo = 'manufacturers.index';
                break;
            case 'category':
-                $model_perms = 'App\Models\Category';
                $redirectTo = 'categories.index';
                break;
        }
@@ -265,11 +251,7 @@ class ImportController extends Controller
        //Flash message before the redirect
        Session::flash('success', trans('admin/hardware/message.import.success'));

-        if (auth()->user()->can('view', $model_perms)) {
-            return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route($redirectTo)]));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route('imports.index')]));
+        return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route($redirectTo)]));
    }

    /**
@@ -279,16 +261,9 @@ class ImportController extends Controller
     */
    public function destroy($import_id) : JsonResponse
    {
-        $this->authorize('import');
+        $this->authorize('create', Asset::class);

        if ($import = Import::find($import_id)) {
-
-
-            if ((auth()->user()->id != $import->created_by) && (!auth()->user()->isSuperUser())) {
-                return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
-            }
-
-
            try {
                // Try to delete the file
                Storage::delete('imports/'.$import->file_path);
@@ -305,6 +280,4 @@ class ImportController extends Controller
        }
        return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
    }
-
-
 }
@@ -24,7 +24,7 @@ class LabelsController extends Controller
        $labels = Label::find();

        if ($request->filled('search')) {
-            $search = $request->input('search');
+            $search = $request->get('search');
            $labels = $labels->filter(function ($label, $index) use ($search) {
                return stripos($label->getName(), $search) !== false;
            });
@@ -32,11 +32,11 @@ class LabelsController extends Controller

        $total = $labels->count();

-        $offset = $request->input('offset', 0);
+        $offset = $request->get('offset', 0);
        $offset = ($offset > $total) ? $total : $offset;

        $maxLimit = config('app.max_results');
-        $limit = $request->input('limit', $maxLimit);
+        $limit = $request->get('limit', $maxLimit);
        $limit = ($limit > $maxLimit) ? $maxLimit : $limit;
        
        $labels = $labels->skip($offset)->take($limit);
@@ -26,11 +26,11 @@ 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');
+                $seats->whereNull('license_seats.assigned_to');
            }

            if ($request->input('status') == 'assigned') {
@@ -40,10 +40,8 @@ class LicenseSeatsController extends Controller

            $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);
            }
@@ -79,14 +77,17 @@ class LicenseSeatsController extends Controller
    {

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

-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat ID or license not found or the seat does not belong to this license'));
-
-
+        return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
    }

    /**
@@ -98,103 +99,66 @@ class LicenseSeatsController extends Controller
     */
    public function update(Request $request, $licenseId, $seatId) : JsonResponse | array
    {
-        $validated = $this->validate($request, [
-            'assigned_to' => [
-                'sometimes',
-                'int',
-                'nullable',
-                'prohibits:asset_id',
-                // must be a valid user or null to unassign
-                function ($attribute, $value, $fail) {
-                    if (!is_null($value) && !User::where('id', $value)->whereNull('deleted_at')->exists()) {
-                        $fail('The selected assigned_to is invalid.');
-                    }
-                },
-            ],
-            'asset_id' => [
-                'sometimes',
-                'int',
-                'nullable',
-                'prohibits:assigned_to',
-                // must be a valid asset or null to unassign
-                function ($attribute, $value, $fail) {
-                    if (!is_null($value) && !Asset::where('id', $value)->whereNull('deleted_at')->exists()) {
-                        $fail('The selected asset_id is invalid.');
-                    }
-                },
-            ],
-            'notes' => 'sometimes|string|nullable',
-        ]);
-
        $this->authorize('checkout', License::class);

-        $licenseSeat = LicenseSeat::with(['license', 'asset', 'user'])->find($seatId);

-        if (!$licenseSeat) {
+        if (! $licenseSeat = LicenseSeat::find($seatId)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
        }

-        $license = $licenseSeat->license;
+        $license = $licenseSeat->license()->first();
        if (!$license || $license->id != intval($licenseId)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
        }

-        $oldUser = $licenseSeat->user;
-        $oldAsset = $licenseSeat->asset;
+        $oldUser = $licenseSeat->user()->first();
+        $oldAsset = $licenseSeat->asset()->first();

        // attempt to update the license seat
-        $licenseSeat->fill($validated);
+        $licenseSeat->fill($request->all());
+        $licenseSeat->created_by = auth()->id();

        // check if this update is a checkin operation
        // 1. are relevant fields touched at all?
-        $assignmentTouched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
-        $anythingTouched = $licenseSeat->isDirty();
+        $touched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
+        // 2. are they cleared? if yes then this is a checkin operation
+        $is_checkin = ($touched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null);

-        if (! $anythingTouched) {
-            return response()->json(
-                Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))
-            );
+        if (! $touched) {
+            // nothing to update
+            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
        }
-        if( $assignmentTouched && $licenseSeat->unreassignable_seat) {
+        if( $touched && $licenseSeat->unreassignable_seat) {
            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.checkout.unavailable')));
        }
-
-        // 2. are they cleared? if yes then this is a checkin operation
-        $is_checkin = ($assignmentTouched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null);
-        $target = null;
-
        // 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')) {
            $target = $is_checkin ? $oldUser : User::find($licenseSeat->assigned_to);
        }
-
        if ($licenseSeat->isDirty('asset_id')) {
            $target = $is_checkin ? $oldAsset : Asset::find($licenseSeat->asset_id);
        }

-        if ($assignmentTouched && is_null($target)){
-            // if both asset_id and assigned_to are null then we are "checking-in"
-            // a related model that does not exist (possible purged or bad data).
-            if (!is_null($request->input('asset_id')) || !is_null($request->input('assigned_to'))) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
-            }
+        if (is_null($target)){
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
        }

        if ($licenseSeat->save()) {
-            if($assignmentTouched) {
-                if ($is_checkin) {
-                    if (!$licenseSeat->license->reassignable) {
-                        $licenseSeat->unreassignable_seat = true;
-                        $licenseSeat->save();
-                    }
-                    // todo: skip if target is null?
-                    $licenseSeat->logCheckin($target, $licenseSeat->notes);
-                } else {
-                    // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
-                    $licenseSeat->logCheckout($request->input('notes'), $target);
+
+            if ($is_checkin) {
+                if(!$licenseSeat->license->reassignable){
+                    $licenseSeat->unreassignable_seat = true;
+                    $licenseSeat->save();
                }
+                $licenseSeat->logCheckin($target, $licenseSeat->notes);
+
+                return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
            }
+
+            // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
+            $licenseSeat->logCheckout($request->input('notes'), $target);
+
            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
        }

@@ -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,13 +25,10 @@ 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);
-        } elseif ($request->input('status')=='active') {
+        } else {
            $licenses->ActiveLicenses();
        }

@@ -265,7 +261,7 @@ class LicensesController extends Controller
        ]);

        if ($request->filled('search')) {
-            $licenses = $licenses->where('licenses.name', 'LIKE', '%'.$request->input('search').'%');
+            $licenses = $licenses->where('licenses.name', 'LIKE', '%'.$request->get('search').'%');
        }

        $licenses = $licenses->orderBy('name', 'ASC')->paginate(50);
@@ -59,7 +59,6 @@ class LocationsController extends Controller
            'state',
            'updated_at',
            'zip',
-            'tag_color',
            'notes',
            ];

@@ -82,8 +81,6 @@ class LocationsController extends Controller
            'locations.ldap_ou',
            'locations.currency',
            'locations.company_id',
-            'locations.tag_color',
-            'locations.tag_color',
            'locations.notes',
            'locations.created_by',
            'locations.deleted_at',
@@ -148,10 +145,6 @@ class LocationsController extends Controller
            $locations->onlyTrashed();
        }

-        if ($request->filled('tag_color')) {
-            $locations->where('tag_color', '=', $request->input('locations.tag_color'));
-        }
-
        // 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');
@@ -200,7 +193,7 @@ class LocationsController extends Controller

        // Only scope location if the setting is enabled
        if (Setting::getSettings()->scope_locations_fmcs) {
-            $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+            $location->company_id = Company::getIdForCurrentUser($request->get('company_id'));
            // check if parent is set and has a different company
            if ($location->parent_id && Location::find($location->parent_id)->company_id != $location->company_id) {
                response()->json(Helper::formatStandardApiResponse('error', null, 'different company than parent'));
@@ -242,7 +235,6 @@ class LocationsController extends Controller
                'locations.currency',
                'locations.company_id',
                'locations.notes',
-                'locations.tag_color',
            ])
            ->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
@@ -278,13 +270,13 @@ class LocationsController extends Controller
        if ($request->filled('company_id')) {
            // Only scope location if the setting is enabled
            if (Setting::getSettings()->scope_locations_fmcs) {
-                $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+                $location->company_id = Company::getIdForCurrentUser($request->get('company_id'));
                // check if there are related objects with different company
                if (Helper::test_locations_fmcs(false, $id, $location->company_id)) {
                    return response()->json(Helper::formatStandardApiResponse('error', null, 'error scoped locations'));
                }                
            } else {
-                $location->company_id = $request->input('company_id');
+                $location->company_id = $request->get('company_id');
            }
        }

@@ -410,7 +402,6 @@ class LocationsController extends Controller
            'locations.name',
            'locations.parent_id',
            'locations.image',
-            'locations.tag_color',
        ]);

        // Only scope locations if the setting is enabled
@@ -52,10 +52,6 @@ class MaintenancesController extends Controller
            $maintenances->where('maintenances.created_by', '=', $request->input('created_by'));
        }

-        if ($request->filled('url')) {
-            $maintenances->where('maintenances.url', '=', $request->input('url'));
-        }
-
        if ($request->filled('asset_maintenance_type')) {
            $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
        }
@@ -82,8 +78,6 @@ class MaintenancesController extends Controller
                                'location',
                                'is_warranty',
                                'status_label',
-                                'model',
-                                'model_number',
                            ];

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -102,12 +96,6 @@ class MaintenancesController extends Controller
            case 'asset_name':
                $maintenances = $maintenances->OrderByAssetName($order);
                break;
-            case 'model':
-                $maintenances = $maintenances->OrderByAssetModelName($order);
-                break;
-            case 'model_number':
-                $maintenances = $maintenances->OrderByAssetModelNumber($order);
-                break;
            case 'serial':
                $maintenances = $maintenances->OrderByAssetSerial($order);
                break;
@@ -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;
@@ -47,7 +40,6 @@ class ManufacturersController extends Controller
            'consumables_count',
            'components_count',
            'licenses_count',
-            'tag_color',
            'notes',
        ];

@@ -64,7 +56,6 @@ class ManufacturersController extends Controller
                'updated_at',
                'image',
                'deleted_at',
-                'tag_color',
                'notes',
            ])
            ->with('adminuser')
@@ -78,16 +69,10 @@ class ManufacturersController extends Controller
            $manufacturers->onlyTrashed();
        }

-        if ($request->input('status') == 'deleted') {
-            $manufacturers->onlyTrashed();
-        }
-
        if ($request->filled('search')) {
            $manufacturers = $manufacturers->TextSearch($request->input('search'));
        }

-
-
        if ($request->filled('name')) {
            $manufacturers->where('name', '=', $request->input('name'));
        }
@@ -112,10 +97,6 @@ class ManufacturersController extends Controller
            $manufacturers->where('support_email', '=', $request->input('support_email'));
        }

-        if ($request->filled('tag_color')) {
-            $manufacturers->where('tag_color', '=', $request->input('manufacturers.tag_color'));
-        }
-
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : app('api_offset_value');
        $limit = app('api_limit_value');
@@ -203,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')));
+
    }

    /**
@@ -270,11 +251,10 @@ class ManufacturersController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
-            $manufacturers = $manufacturers->where('name', 'LIKE', '%'.$request->input('search').'%');
+            $manufacturers = $manufacturers->where('name', 'LIKE', '%'.$request->get('search').'%');
        }

        $manufacturers = $manufacturers->orderBy('name', 'ASC')->paginate(50);
@@ -145,7 +145,7 @@ class PredefinedKitsController extends Controller
        ]);

        if ($request->filled('search')) {
-            $kits = $kits->where('name', 'LIKE', '%'.$request->input('search').'%');
+            $kits = $kits->where('name', 'LIKE', '%'.$request->get('search').'%');
        }

        $kits = $kits->orderBy('name', 'ASC')->paginate(50);
@@ -184,7 +184,7 @@ class PredefinedKitsController extends Controller
            $quantity = 1;
        }

-        $license_id = $request->input('license');
+        $license_id = $request->get('license');
        $relation = $kit->licenses();
        if ($relation->find($license_id)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => trans('admin/kits/general.license_error')]));
@@ -254,7 +254,7 @@ class PredefinedKitsController extends Controller

        $kit = PredefinedKit::findOrFail($kit_id);

-        $model_id = $request->input('model');
+        $model_id = $request->get('model');
        $quantity = $request->input('quantity', 1);
        if ($quantity < 1) {
            $quantity = 1;
@@ -332,7 +332,7 @@ class PredefinedKitsController extends Controller
            $quantity = 1;
        }

-        $consumable_id = $request->input('consumable');
+        $consumable_id = $request->get('consumable');
        $relation = $kit->consumables();
        if ($relation->find($consumable_id)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => trans('admin/kits/general.consumable_error')]));
@@ -406,7 +406,7 @@ class PredefinedKitsController extends Controller
            $quantity = 1;
        }

-        $accessory_id = $request->input('accessory');
+        $accessory_id = $request->get('accessory');
        $relation = $kit->accessories();
        if ($relation->find($accessory_id)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => trans('admin/kits/general.accessory_error')]));
@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ProfileTransformer;
 use App\Models\CheckoutRequest;
-use App\Models\Setting;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
@@ -15,7 +14,6 @@ use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
 use App\Models\CustomField;
-use App\Models\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -181,24 +179,14 @@ class ProfileController extends Controller
     *@since [v8.1.16]
     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
     */
-    public function eulas(ProfileTransformer $transformer, Request $request)
+    public function eulas(ProfileTransformer $transformer)
    {
-
-        if (($request->filled('user_id')) && ($request->input( 'user_id') != 0)) {
-
-            $eula_user = User::find($request->input('user_id'));
-
-            if (($eula_user) && (Setting::getSettings()->manager_view_enabled) && (auth()->user()->isManagerOf($eula_user))) {
-                $eulas = $eula_user->eulas;
-            } else {
-                return response()->json(Helper:: formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')));
-            }
-        } else {
-            $eulas = auth()->user()->eulas;
-        }
-
-       return response()->json($transformer->transformFiles($eulas, $eulas->count()));
-
+        // Only return this user's EULAs
+        $eulas = auth()->user()->eulas;
+        return response()->json(
+            $transformer->transformFiles($eulas, $eulas->count())
+        );
    }

+
 }
@@ -226,7 +226,7 @@ class SettingsController extends Controller

        $login_attempts = DB::table('login_attempts');
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'created_at';

        $total = $login_attempts->count();
        $login_attempts->orderBy($sort, $order);
@@ -324,7 +324,7 @@ class StatuslabelsController extends Controller
        $statuslabels = Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('deployable', 'desc');

        if ($request->filled('search')) {
-            $statuslabels = $statuslabels->where('name', 'LIKE', '%'.$request->input('search').'%');
+            $statuslabels = $statuslabels->where('name', 'LIKE', '%'.$request->get('search').'%');
        }

        if ($request->filled('deployable')) {
@@ -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;
@@ -50,13 +43,12 @@ class SuppliersController extends Controller
            'accessories_count',
            'components_count',
            'consumables_count',
-            'tag_color',
            'url',
            'notes',
        ];
        
        $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip', 'tag_color'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip'])
                    ->withCount('assets as assets_count')
                    ->withCount('licenses as licenses_count')
                    ->withCount('accessories as accessories_count')
@@ -199,40 +191,27 @@ class SuppliersController extends Controller
     * @since [v4.0]
     * @param  int  $id
     */
-    public function destroy(Supplier $supplier): JsonResponse
+    public function destroy($id) : JsonResponse
    {
+        $this->authorize('delete', Supplier::class);
+        $supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
        $this->authorize('delete', $supplier);
-        try {
-            DestroySupplierAction::run(supplier: $supplier);
-        } catch (ItemStillHasAssets $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_assets', [
-                'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (ItemStillHasMaintenances $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_maintenances', [
-                'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (ItemStillHasLicenses $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_licenses', [
-                'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (ItemStillHasAccessories $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_accessories', [
-                'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (ItemStillHasConsumables $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_consumables', [
-                'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (ItemStillHasComponents $e) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_components', [
-                'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier')
-            ])));
-        } catch (\Exception $e) {
-            report($e);
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
+
+
+        if ($supplier->assets_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
        }

+        if ($supplier->maintenances_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count])));
+        }
+
+        if ($supplier->licenses_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])));
+        }
+
+        $supplier->delete();
+
        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/suppliers/message.delete.success')));
    }

@@ -252,11 +231,10 @@ class SuppliersController extends Controller
            'id',
            'name',
            'image',
-            'tag_color',
        ]);

        if ($request->filled('search')) {
-            $suppliers = $suppliers->where('suppliers.name', 'LIKE', '%'.$request->input('search').'%');
+            $suppliers = $suppliers->where('suppliers.name', 'LIKE', '%'.$request->get('search').'%');
        }

        $suppliers = $suppliers->orderBy('name', 'ASC')->paginate(50);
@@ -110,18 +110,15 @@ class UploadedFilesController extends Controller
            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->input('notes'));
+                $object->logUpload($file_name, $request->get('notes'));
            }

-            if (isset($files)) {
-                $file_results = 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($file_results, count($file_results)), trans_choice('general.file_upload_status.upload.success',  count($files))));
-            }
+            $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
@@ -188,7 +185,7 @@ class UploadedFilesController extends Controller

        // 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', $object);
+        $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')));
@@ -196,12 +193,8 @@ class UploadedFilesController extends Controller


        // Check for the file
-        $log = Actionlog::query()
-            ->where('id', $file_id)
-            ->where('action_type', 'uploaded')
-            ->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)
-            ->first();
+        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
+            ->where('item_id', $object->id)->first();

        if ($log) {
            // Check the file actually exists, and delete it
@@ -220,4 +213,4 @@ class UploadedFilesController extends Controller
        return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);

    }
-}
+}
@@ -31,7 +31,6 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
 use App\Http\Requests\DeleteUserRequest;
 use Illuminate\Http\JsonResponse;
-use App\Http\Requests\FilterRequest;

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

@@ -104,80 +103,9 @@ class UsersController extends Controller
                'managedLocations as manages_locations_count'
            ]);

-        $allowed_columns =
-            [
-                'last_name',
-                'first_name',
-                'display_name',
-                'email',
-                'jobtitle',
-                'username',
-                'employee_num',
-                'groups',
-                'activated',
-                'created_at',
-                'updated_at',
-                'two_factor_enrolled',
-                'two_factor_optin',
-                'last_login',
-                'assets_count',
-                'licenses_count',
-                'consumables_count',
-                'accessories_count',
-                'manages_users_count',
-                'manages_locations_count',
-                'phone',
-                'mobile',
-                'address',
-                'city',
-                'state',
-                'country',
-                'zip',
-                'id',
-                'ldap_import',
-                'two_factor_optin',
-                'two_factor_enrolled',
-                'remote',
-                'vip',
-                'start_date',
-                'end_date',
-                'autoassign_licenses',
-                'website',
-                'locale',
-                'notes',
-                'employee_num',

-                // These are *relationships* so we wouldn't normally include them in this array,
-                // since they would normally create a `column not found` error,
-                // BUT we account for them in the ordering switch down at the end of this method
-                // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
-                'company',
-                'location',
-                'department',
-                'manager',
-                'created_by',
-
-            ];
-
-        $filter = [];
-
-        if ($request->filled('filter')) {
-            $filter = json_decode($request->input('filter'), true);
-
-            if (is_null($filter)) {
-                $filter = [];
-            }
-
-            $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')) {
@@ -253,7 +181,7 @@ class UsersController extends Controller
        }

        if ($request->filled('group_id')) {
-            $users = $users->ByGroup($request->input('group_id'));
+            $users = $users->ByGroup($request->get('group_id'));
        }

        if ($request->filled('department_id')) {
@@ -358,6 +286,49 @@ class UsersController extends Controller
                $users->orderBy('first_name', $order);
                break;
            default:
+                $allowed_columns =
+                    [
+                        'last_name',
+                        'first_name',
+                        'display_name',
+                        'email',
+                        'jobtitle',
+                        'username',
+                        'employee_num',
+                        'groups',
+                        'activated',
+                        'created_at',
+                        'updated_at',
+                        'two_factor_enrolled',
+                        'two_factor_optin',
+                        'last_login',
+                        'assets_count',
+                        'licenses_count',
+                        'consumables_count',
+                        'accessories_count',
+                        'manages_users_count',
+                        'manages_locations_count',
+                        'phone',
+                        'mobile',
+                        'address',
+                        'city',
+                        'state',
+                        'country',
+                        'zip',
+                        'id',
+                        'ldap_import',
+                        'two_factor_optin',
+                        'two_factor_enrolled',
+                        'remote',
+                        'vip',
+                        'start_date',
+                        'end_date',
+                        'autoassign_licenses',
+                        'website',
+                        'locale',
+                        'notes',
+                    ];
+
                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'first_name';
                $users = $users->orderBy($sort, $order);
                break;
@@ -400,11 +371,11 @@ class UsersController extends Controller

        if ($request->filled('search')) {
            $users = $users->where(function ($query) use ($request) {
-                $query->SimpleNameSearch($request->input('search'))
-                    ->orWhere('username', 'LIKE', '%'.$request->input('search').'%')
-                    ->orWhere('display_name', 'LIKE', '%'.$request->input('search').'%')
-                    ->orWhere('email', 'LIKE', '%'.$request->input('search').'%')
-                    ->orWhere('employee_num', 'LIKE', '%'.$request->input('search').'%');
+                $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').'%');
            });
        }

@@ -450,24 +421,16 @@ class UsersController extends Controller
        if ($request->has('permissions')) {
            $permissions_array = $request->input('permissions');

+            // Strip out the superuser permission if the API user isn't a superadmin
            if (! auth()->user()->isSuperUser()) {
-                if ((is_array($permissions_array)) && (array_key_exists('superuser', $permissions_array))) {
-                    unset($permissions_array['superuser']);
-                }
+                unset($permissions_array['superuser']);
            }
-
-            if (!auth()->user()->isAdmin()) {
-                if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {
-                    unset($permissions_array['admin']);
-                }
-            }
-
            $user->permissions = $permissions_array;
        }

        // 
        if ($request->filled('password')) {
-            $user->password = bcrypt($request->input('password'));
+            $user->password = bcrypt($request->get('password'));
        } else {
            $user->password = $user->noPassword();
        }
@@ -486,22 +449,12 @@ class UsersController extends Controller

            }

-
-            if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
-
-                $validator = Validator::make($request->only('groups'), [
-                    'groups.*' => 'integer|exists:permission_groups,id',
-                ]);
-
-                if ($validator->fails()) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
-                }
-
-                // Sync the groups since the user is a superuser and the groups pass validation
+            if ($request->filled('groups')) {
                $user->groups()->sync($request->input('groups'));
+            } else {
+                $user->groups()->sync([]);
            }

-
            return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.create')));
        }

@@ -538,121 +491,95 @@ class UsersController extends Controller
     */
    public function update(SaveUserRequest $request, User $user): JsonResponse
    {
-        $this->authorize('update', $user);
+        $this->authorize('update', User::class);

-        /**
-         * This is a janky hack to prevent people from changing admin demo user data on the public demo.
-         * The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
-         *  Thanks, jerks. You are why we can't have nice things. - snipe
-         *
-         */
+            $this->authorize('update', $user);
+
+            /**
+             * This is a janky hack to prevent people from changing admin demo user data on the public demo.
+             * The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
+             *  Thanks, jerks. You are why we can't have nice things. - snipe
+             *
+             */

        if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.'));
-        }
-
-        // Pull out sensitive fields that require extra permission
-        $user->fill($request->except(['password', 'username', 'email', 'activated', 'permissions', 'activation_code', 'remember_token', 'two_factor_secret', 'two_factor_enrolled', 'two_factor_optin']));
-
-
-        if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
-
-            if ($request->filled('password')) {
-                $user->password = bcrypt($request->input('password'));
+                return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.'));
            }

-            if ($request->filled('username')) {
-                $user->username = $request->input('username');
+            $user->fill($request->all());
+
+            if ($request->filled('company_id')) {
+                $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
            }

-            if ($request->filled('email')) {
-                $user->email = $request->input('email');
+            if ($user->id == $request->input('manager_id')) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
            }

-            if ($request->filled('activated')) {
-                $user->activated = $request->input('activated');
+            // 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');
+                }
+
            }

            // We need to use has()  instead of filled()
            // here because we need to overwrite permissions
            // if someone needs to null them out
-
            if ($request->has('permissions')) {
-
                $permissions_array = $request->input('permissions');
-                $orig_permissions_array = $user->decodePermissions();
-

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

-                // Strip out the individual admin permission if the API user isn't an admin
-                if ((!auth()->user()->isAdmin()) && (!auth()->user()->isSuperUser())) {
-
-                    if (is_array($orig_permissions_array)) {
-                        if (array_key_exists('admin', $orig_permissions_array)) {
-                            $permissions_array['admin'] = $orig_permissions_array['admin'];
-                        }
-                    }
-                }
-
-                // This is going to update the whole thing, not just what was passed
                $user->permissions = $permissions_array;
            }

-        }
-
-
-        if ($request->filled('display_name')) {
-            $user->display_name = $request->input('display_name');
-        }
-
-        if ($request->filled('company_id')) {
-            $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
-        }
-
-        if ($user->id == $request->input('manager_id')) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
-        }
-
-
-
-
-        if ($request->has('location_id')) {
-            // Update the location of any assets checked out to this user
-            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');
-
-        if ($user->save()) {
-            // Check if the request has groups passed and has a value, AND that the user us a superuser
-            if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
-
-                $validator = Validator::make($request->only('groups'), [
-                    'groups.*' => 'integer|exists:permission_groups,id',
-                ]);
-
-                if ($validator->fails()) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
-                }
-
-                // Sync the groups since the user is a superuser and the groups pass validation
-                $user->groups()->sync($request->input('groups'));
+            if($request->has('location_id')) {
+                // Update the location of any assets checked out to this user
+                Asset::where('assigned_type', User::class)
+                    ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
            }
-            return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
+            app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+
+            if ($user->save()) {
+                // Check if the request has groups passed and has a value, AND that the user us a superuser
+                if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
+
+                    $validator = Validator::make($request->only('groups'), [
+                        'groups.*' => 'integer|exists:permission_groups,id',
+                    ]);
+
+                    if ($validator->fails()) {
+                        return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
+                    }
+
+                    // Sync the groups since the user is a superuser and the groups pass validation
+                    $user->groups()->sync($request->input('groups'));
+                }
+                return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
+            }
+            return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
    }

    /**
@@ -670,27 +597,21 @@ class UsersController extends Controller

            $this->authorize('delete', $user);

-            if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
+            if ($user->delete()) {

-                if ($user->delete()) {
-
-                    // Remove the user's avatar if they have one
-                    // @todo This should be done on purge, not here
-//                    if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
-//                        try {
-//                            Storage::disk('public')->delete('avatars/' . $user->avatar);
-//                        } catch (\Exception $e) {
-//                            Log::debug($e);
-//                        }
-//                    }
-
-                    return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.delete')));
+                // Remove the user's avatar if they have one
+                if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
+                    try {
+                        Storage::disk('public')->delete('avatars/' . $user->avatar);
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                    }
                }

-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete')));
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.delete')));
            }

-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.cannot_delete')));
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete')));

        }

@@ -839,7 +760,7 @@ class UsersController extends Controller

        if ($request->filled('id')) {
            try {
-                $user = User::find($request->input('id'));
+                $user = User::find($request->get('id'));
                $this->authorize('update', $user);
                $user->two_factor_secret = null;
                $user->two_factor_enrolled = 0;
@@ -98,10 +98,10 @@ class AssetCheckinController extends Controller
        $asset->expected_checkin = null;
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;
-        $asset->name = $request->input('name');
+        $asset->name = $request->get('name');

        if ($request->filled('status_id')) {
-            $asset->status_id = e($request->input('status_id'));
+            $asset->status_id = e($request->get('status_id'));
        }

        // Add any custom fields that should be included in the checkout
@@ -112,11 +112,11 @@ class AssetCheckinController extends Controller
        $asset->location_id = $asset->rtd_location_id;

        if ($request->filled('location_id')) {
-            Log::debug('NEW Location ID: '.$request->input('location_id'));
-            $asset->location_id = $request->input('location_id');
+            Log::debug('NEW Location ID: '.$request->get('location_id'));
+            $asset->location_id = $request->get('location_id');

-            if ($request->input('update_default_location') == 0){
-                $asset->rtd_location_id = $request->input('location_id');
+            if ($request->get('update_default_location') == 0){
+                $asset->rtd_location_id = $request->get('location_id');
            }
        }

@@ -124,9 +124,9 @@ class AssetCheckinController extends Controller

        // Handle last checkin date
        $checkin_at = date('Y-m-d H:i:s');
-        if (($request->filled('checkin_at')) && ($request->input('checkin_at') != date('Y-m-d'))) {
+        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
            $originalValues['action_date'] = $checkin_at;
-            $checkin_at = $request->input('checkin_at');
+            $checkin_at = $request->get('checkin_at');

        }
        $asset->last_checkin = $checkin_at;
@@ -145,7 +145,7 @@ class AssetCheckinController extends Controller
            $acceptance->delete();
        });

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

        // Add any custom fields that should be included in the checkout
        $asset->customFieldsForCheckinCheckout('display_checkin');
@@ -88,17 +88,17 @@ class AssetCheckoutController extends Controller
            $asset = $this->updateAssetLocation($asset, $target);

            $checkout_at = date('Y-m-d H:i:s');
-            if (($request->filled('checkout_at')) && ($request->input('checkout_at') != date('Y-m-d'))) {
-                $checkout_at = $request->input('checkout_at');
+            if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) {
+                $checkout_at = $request->get('checkout_at');
            }

            $expected_checkin = '';
            if ($request->filled('expected_checkin')) {
-                $expected_checkin = $request->input('expected_checkin');
+                $expected_checkin = $request->get('expected_checkin');
            }

            if ($request->filled('status_id')) {
-                $asset->status_id = $request->input('status_id');
+                $asset->status_id = $request->get('status_id');
            }


@@ -123,9 +123,9 @@ class AssetCheckoutController extends Controller
                }
            }

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

-            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->input('note'), $request->input('name'))) {
+            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->get('note'), $request->get('name'))) {
                return Helper::getRedirectOption($request, $asset->id, 'Assets')
                    ->with('success', trans('admin/hardware/message.checkout.success'));
            }
@@ -6,7 +6,6 @@ use App\Events\CheckoutableCheckedIn;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
-use App\Http\Requests\CreateMultipleAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
 use App\Models\Actionlog;
 use App\Http\Requests\UploadFileRequest;
@@ -99,7 +98,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     */
-    public function store(CreateMultipleAssetRequest $request): RedirectResponse
+    public function store(ImageUploadRequest $request) : RedirectResponse
    {
        $this->authorize(Asset::class);

@@ -136,143 +135,129 @@ class AssetsController extends Controller
        $successes = [];
        $failures = [];

-        try {
-            DB::beginTransaction();
-            for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
-                $asset = new Asset();
+        for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
+            $asset = new Asset();

-                $asset->model()->associate($model);
-                $asset->name = $request->input('name');
+            $asset->model()->associate($model);
+            $asset->name = $request->input('name');

-                // Check for a corresponding serial
-                if (($serials) && (array_key_exists($a, $serials))) {
-                    $asset->serial = $serials[$a];
+            // Check for a corresponding serial
+            if (($serials) && (array_key_exists($a, $serials))) {
+                $asset->serial = $serials[$a];
+            }
+
+            if (($asset_tags) && (array_key_exists($a, $asset_tags))) {
+                $asset->asset_tag = $asset_tags[$a];
+            }
+
+            $asset->company_id              = $companyId;
+            $asset->model_id                = $request->input('model_id');
+            $asset->order_number            = $request->input('order_number');
+            $asset->notes                   = $request->input('notes');
+            $asset->created_by              = auth()->id();
+            $asset->status_id               = request('status_id');
+            $asset->warranty_months         = request('warranty_months', null);
+            $asset->purchase_cost           = request('purchase_cost');
+            $asset->purchase_date           = request('purchase_date', null);
+            $asset->asset_eol_date          = request('asset_eol_date', null);
+            $asset->assigned_to             = request('assigned_to', null);
+            $asset->supplier_id             = request('supplier_id', null);
+            $asset->requestable             = request('requestable', 0);
+            $asset->rtd_location_id         = request('rtd_location_id', null);
+            $asset->byod                    = request('byod', 0);
+
+            if (! empty($settings->audit_interval)) {
+                $asset->next_audit_date = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();
+            }
+
+            // Set location_id to rtd_location_id ONLY if the asset isn't being checked out
+            if (!request('assigned_user') && !request('assigned_asset') && !request('assigned_location')) {
+                $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;
                }

-                if (($asset_tags) && (array_key_exists($a, $asset_tags))) {
-                    $asset->asset_tag = $asset_tags[$a];
-                }
+            } else {
+                $asset = $request->handleImages($asset);
+            }

-                $asset->company_id = $companyId;
-                $asset->model_id = $request->input('model_id');
-                $asset->order_number = $request->input('order_number');
-                $asset->notes = $request->input('notes');
-                $asset->created_by = auth()->id();
-                $asset->status_id = request('status_id');
-                $asset->warranty_months = request('warranty_months', null);
-                $asset->purchase_cost = request('purchase_cost');
-                $asset->purchase_date = request('purchase_date', null);
-                $asset->asset_eol_date = request('asset_eol_date', null);
-                $asset->assigned_to = request('assigned_to', null);
-                $asset->supplier_id = request('supplier_id', null);
-                $asset->requestable = request('requestable', 0);
-                $asset->rtd_location_id = request('rtd_location_id', null);
-                $asset->byod = request('byod', 0);
+            // Update custom fields in the database.
+            // Validation for these fields is handled through the AssetRequest form request

-                if (!empty($settings->audit_interval)) {
-                    $asset->next_audit_date = Carbon::now()->addMonths((int)$settings->audit_interval)->toDateString();
-                }
-
-                // Set location_id to rtd_location_id ONLY if the asset isn't being checked out
-                if (!request('assigned_user') && !request('assigned_asset') && !request('assigned_location')) {
-                    $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 {
-                    $asset = $request->handleImages($asset);
-                }
-
-                // Update custom fields in the database.
-                // Validation for these fields is handled through the AssetRequest form request
-
-                if (($model) && ($model->fieldset)) {
-                    foreach ($model->fieldset->fields as $field) {
-                        if ($field->field_encrypted == '1') {
-                            if (Gate::allows('assets.view.encrypted_custom_fields')) {
-                                if (is_array($request->input($field->db_column))) {
-                                    $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
-                                } else {
-                                    $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
-                                }
-                            }
-                        } else {
+            if (($model) && ($model->fieldset)) {
+                foreach ($model->fieldset->fields as $field) {
+                    if ($field->field_encrypted == '1') {
+                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
                            if (is_array($request->input($field->db_column))) {
-                                $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                                $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                            } else {
-                                $asset->{$field->db_column} = $request->input($field->db_column);
+                                $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
                            }
                        }
-                    }
-                }
-
-                // Validate the asset before saving
-                // Note - it can be tempting to instead want to call saveOrFail(), to automatically throw when an object
-                // is invalid (and can't save). But this won't work, because Custom Fields _overrides_ the save() method
-                // to inject the Custom Field Rules into the $rules property right before invoking the _real_ save.
-                // so, instead, we have to catch failures on the 'else' clause and throw there.
-                if ($asset->isValid() && $asset->save()) {
-                    $target = null;
-                    $location = null;
-
-                    if ($userId = request('assigned_user')) {
-                        $target = User::find($userId);
-
-                        if (!$target) {
-                            return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
+                    } else {
+                        if (is_array($request->input($field->db_column))) {
+                            $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                        } else {
+                            $asset->{$field->db_column} = $request->input($field->db_column);
                        }
-                        $location = $target->location_id;
-
-                    } elseif ($assetId = request('assigned_asset')) {
-                        $target = Asset::find($assetId);
-
-                        if (!$target) {
-                            return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
-                        }
-                        $location = $target->location_id;
-
-                    } elseif ($locationId = request('assigned_location')) {
-                        $target = Location::find($locationId);
-
-                        if (!$target) {
-                            return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
-                        }
-                        $location = $target->id;
                    }
-
-                    if (isset($target)) {
-                        $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->input('name'), $location);
-                    }
-
-                    $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
-
-                } else {
-                    $asset->throwValidationException(); // we have to do this for the reason listed above - can't use saveOrFail()
-                    $failures[] = join(",", $asset->getErrors()->all()); //TODO - this can probably go away soon
                }
            }
-        } catch (\Throwable $e) {
-            \Log::debug("Caught exception in multi-create - rolling back: " . $e->getMessage());
-            DB::rollBack();
-            throw $e;
-        }
-        DB::commit();

-        if($request->input('redirect_option') === 'back'){
+            // Validate the asset before saving
+            if ($asset->isValid() && $asset->save()) {
+                $target = null;
+                $location = null;
+
+                if ($userId = request('assigned_user')) {
+                    $target = User::find($userId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
+                    }
+                    $location = $target->location_id;
+
+                } elseif ($assetId = request('assigned_asset')) {
+                    $target = Asset::find($assetId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
+                    }
+                    $location = $target->location_id;
+
+                } elseif ($locationId = request('assigned_location')) {
+                    $target = Location::find($locationId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
+                    }
+                    $location = $target->id;
+                }
+
+                if (isset($target)) {
+                    $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
+                }
+
+                $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
+
+            } else {
+                $failures[] = join(",", $asset->getErrors()->all());
+            }
+        }
+        if($request->get('redirect_option') === 'back'){
            session()->put(['redirect_option' => 'index']);
        } else {
-            session()->put(['redirect_option' => $request->input('redirect_option')]);
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
        }

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


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

@@ -454,7 +438,7 @@ class AssetsController extends Controller
        // Update custom fields in the database.
        // FIXME: No idea why this is returning a Builder error on db_column_name.
        // Need to investigate and fix. Using static method for now.
-        $model = AssetModel::find($request->input('model_id'));
+        $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)) {
@@ -480,9 +464,9 @@ class AssetsController extends Controller
            }
        }
        session()->put([
-            'redirect_option' => $request->input('redirect_option'),
-            'checkout_to_type' => $request->input('checkout_to_type'),
-            'other_redirect' => $request->input('redirect_option') === 'other_redirect' ? 'model' : null,
+            'redirect_option' => $request->get('redirect_option'),
+            'checkout_to_type' => $request->get('checkout_to_type'),
+            'other_redirect' => $request->get('redirect_option') === 'other_redirect' ? 'model' : null,
        ]);


@@ -552,9 +536,9 @@ class AssetsController extends Controller
     */
    public function getAssetBySerial(Request $request) : RedirectResponse
    {
-        $topsearch = ($request->input('topsearch')=="true");
+        $topsearch = ($request->get('topsearch')=="true");

-        if (!$asset = Asset::where('serial', '=', $request->input('serial'))->first()) {
+        if (!$asset = Asset::where('serial', '=', $request->get('serial'))->first()) {
            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
        }
        $this->authorize('view', $asset);
@@ -570,8 +554,8 @@ class AssetsController extends Controller
     */
    public function getAssetByTag(Request $request, $tag=null) : RedirectResponse
    {
-        $tag = $tag ? $tag : $request->input('assetTag');
-        $topsearch = ($request->input('topsearch') == 'true');
+        $tag = $tag ? $tag : $request->get('assetTag');
+        $topsearch = ($request->get('topsearch') == 'true');

        // Search for an exact and unique asset tag match
        $assets = Asset::where('asset_tag', '=', $tag);
@@ -682,8 +666,8 @@ class AssetsController extends Controller
            return (new Label())
                ->with('assets', collect([ $asset ]))
                ->with('settings', Setting::getSettings())
-                ->with('template', request()->input('template'))
-                ->with('offset', request()->input('offset'))
+                ->with('template', request()->get('template'))
+                ->with('offset', request()->get('offset'))
                ->with('bulkedit', false)
                ->with('count', 0);
        }
@@ -982,7 +966,7 @@ class AssetsController extends Controller

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

-        session()->put('redirect_option', $request->input('redirect_option'));
+        session()->put('redirect_option', $request->get('redirect_option'));
        session()->put('other_redirect', 'audit');


@@ -2,7 +2,6 @@

 namespace App\Http\Controllers\Assets;

-use App\Events\CheckoutablesCheckedOutInBulk;
 use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
@@ -13,7 +12,6 @@ use App\Models\Setting;
 use App\View\Label;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
@@ -165,7 +163,7 @@ class BulkAssetsController extends Controller
        $modelNames = [];

        foreach($models as $model) {
-            $modelNames[] = $model->model?->name;
+            $modelNames[] = $model->model->name;
        }

        if ($request->filled('bulk_actions')) {
@@ -242,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'));
@@ -272,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'))
@@ -469,7 +470,7 @@ class BulkAssetsController extends Controller
                 */

                // Does the model have a fieldset?
-                if ($asset->model?->fieldset) {
+                if ($asset->model->fieldset) {
                    foreach ($asset->model->fieldset->fields as $field) {

                        // null custom fields
@@ -590,7 +591,7 @@ class BulkAssetsController extends Controller
        if ($request->session()->has('bulk_back_url')) {
            $bulk_back_url = $request->session()->pull('bulk_back_url');
        }
-        $assetIds = $request->input('ids');
+        $assetIds = $request->get('ids');

        if(empty($assetIds)) {
            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
@@ -620,25 +621,9 @@ class BulkAssetsController extends Controller
    {
        $this->authorize('checkout', Asset::class);

-        $alreadyAssigned = collect();
-
-        if (old('selected_assets') && is_array(old('selected_assets'))) {
-            $assets = Asset::findMany(old('selected_assets'));
-
-            [$assignable, $alreadyAssigned] = $assets->partition(function (Asset $asset) {
-                return !$asset->assigned_to;
-            });
-
-            session()->flashInput(['selected_assets' => $assignable->pluck('id')->values()->toArray()]);
-        }
-
        $do_not_change = ['' => trans('general.do_not_change')];
        $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
-
-        return view('hardware/bulk-checkout', [
-            'statusLabel_list' => $status_label_list,
-            'removed_assets' => $alreadyAssigned,
-        ]);
+        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
    }

    /**
@@ -646,8 +631,6 @@ class BulkAssetsController extends Controller
     */
    public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse | ModelNotFoundException
    {
-        Context::add('action', 'bulk_asset_checkout');
-
        $this->authorize('checkout', Asset::class);

        try {
@@ -656,11 +639,11 @@ class BulkAssetsController extends Controller
            $target = $this->determineCheckoutTarget();
            session()->put(['checkout_to_type' => $target]);

-            if (! is_array($request->input('selected_assets'))) {
+            if (! is_array($request->get('selected_assets'))) {
                return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
            }

-            $asset_ids = array_filter($request->input('selected_assets'));
+            $asset_ids = array_filter($request->get('selected_assets'));

            $assets = Asset::findOrFail($asset_ids);

@@ -673,21 +656,6 @@ class BulkAssetsController extends Controller
                    ->with('error', trans('general.error_assets_already_checked_out'));
            }

-            // Prevent checking out assets across companies if FMCS enabled
-            if (Setting::getSettings()->full_multiple_companies_support && $target->company_id) {
-                $company_ids = $assets->pluck('company_id')->unique();
-
-                // if there is more than one unique company id or the singular company id does not match
-                // then the checkout is invalid
-                if ($company_ids->count() > 1 || $company_ids->first() != $target->company_id) {
-                    // re-add the asset ids so the assets select is re-populated
-                    $request->session()->flashInput(['selected_assets' => $asset_ids]);
-
-                    return redirect(route('hardware.bulkcheckout.show'))
-                        ->with('error', trans('general.error_user_company_multiple'));
-                }
-            }
-
            if (request('checkout_to_type') == 'asset') {
                foreach ($asset_ids as $asset_id) {
                    if ($target->id == $asset_id) {
@@ -696,14 +664,14 @@ class BulkAssetsController extends Controller
                }
            }
            $checkout_at = date('Y-m-d H:i:s');
-            if (($request->filled('checkout_at')) && ($request->input('checkout_at') != date('Y-m-d'))) {
-                $checkout_at = $request->input('checkout_at');
+            if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) {
+                $checkout_at = $request->get('checkout_at');
            }

            $expected_checkin = '';

            if ($request->filled('expected_checkin')) {
-                $expected_checkin = $request->input('expected_checkin');
+                $expected_checkin = $request->get('expected_checkin');
            }

            $errors = [];
@@ -713,10 +681,10 @@ class BulkAssetsController extends Controller

                    // See if there is a status label passed
                    if ($request->filled('status_id')) {
-                        $asset->status_id = $request->input('status_id');
+                        $asset->status_id = $request->get('status_id');
                    }

-                    $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->input('note')), $asset->name, null);
+                    $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);

                    //TODO - I think this logic is duplicated in the checkOut method?
                    if ($target->location_id != '') {
@@ -734,15 +702,6 @@ class BulkAssetsController extends Controller
            });

            if (! $errors) {
-                CheckoutablesCheckedOutInBulk::dispatch(
-                    $assets,
-                    $target,
-                    $admin,
-                    $checkout_at,
-                    $expected_checkin,
-                    e($request->get('note')),
-                );
-
                // Redirect to the new asset page
                return redirect()->to('hardware')->with('success', trans_choice('admin/hardware/message.multi-checkout.success', $asset_ids));
            }
@@ -756,7 +715,7 @@ class BulkAssetsController extends Controller
    public function restore(Request $request) : RedirectResponse
    {
        $this->authorize('update', Asset::class);
-        $assetIds = $request->input('ids');
+        $assetIds = $request->get('ids');

        if (empty($assetIds)) {
            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.restore.nothing_updated'));
@@ -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'));
-        }
-    }
-}
@@ -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'));
-        }
-    }
-}
@@ -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'));
-        }
-    }
-}
@@ -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;
@@ -78,7 +70,6 @@ class CategoriesController extends Controller
        $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->tag_color  = $request->input('tag_color');
        $category->notes = $request->input('notes');
        $category->created_by = auth()->id();

@@ -133,7 +124,6 @@ class CategoriesController extends Controller
        $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->tag_color  = $request->input('tag_color');
        $category->notes = $request->input('notes');

        $category = $request->handleImages($category);
@@ -153,18 +143,20 @@ class CategoriesController extends Controller
     * @since [v1.0]
     * @param int $categoryId
     */
-    public function destroy(Category $category): RedirectResponse
+    public function destroy($categoryId) : RedirectResponse
    {
        $this->authorize('delete', Category::class);
-        try {
-            DestroyCategoryAction::run($category);
-        } catch (ItemStillHasChildren $e) {
-            return redirect()->route('categories.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.category')]));
-        } catch (\Exception $e) {
-            report($e);
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.delete.error'));
+        // Check if the category exists
+        if (is_null($category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($categoryId))) {
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
        }

+        if (! $category->isDeletable()) {
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=> $category->category_type]));
+        }
+
+        Storage::disk('public')->delete('categories'.'/'.$category->image);
+        $category->delete();
        return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
    }

@@ -60,7 +60,6 @@ final class CompaniesController extends Controller
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
-        $company->tag_color = $request->input('tag_color');
        $company->notes = $request->input('notes');
        $company->created_by = auth()->id();

@@ -103,7 +102,6 @@ final class CompaniesController extends Controller
        $company->phone = $request->input('phone');
        $company->fax = $request->input('fax');
        $company->email = $request->input('email');
-        $company->tag_color = $request->input('tag_color');
        $company->notes = $request->input('notes');

        $company = $request->handleImages($company);
@@ -98,7 +98,7 @@ class ComponentCheckinController extends Controller

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

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

            return Helper::getRedirectOption($request, $component->id, 'Components')
                ->with('success', trans('admin/components/message.checkin.success'));
@@ -80,8 +80,8 @@ class ComponentCheckoutController extends Controller
        $max_to_checkout = $component->numRemaining();

        // Make sure there are at least the requested number of components available to checkout
-        if ($max_to_checkout < $request->input('assigned_qty')) {
-            return redirect()->back()->withInput()->with('error', trans('admin/components/message.checkout.unavailable', ['remaining' => $max_to_checkout, 'requested' => $request->input('assigned_qty')]));
+        if ($max_to_checkout < $request->get('assigned_qty')) {
+            return redirect()->back()->withInput()->with('error', trans('admin/components/message.checkout.unavailable', ['remaining' => $max_to_checkout, 'requested' => $request->get('assigned_qty')]));
        }

        $validator = Validator::make($request->all(), [
@@ -115,19 +115,12 @@ class ComponentCheckoutController extends Controller
            'note' => $request->input('note'),
        ]);

-        event(new CheckoutableCheckedOut(
-            $component,
-            $asset,
-            auth()->user(),
-            $request->input('note'),
-            [],
-            $component->checkout_qty,
-        ));
+        event(new CheckoutableCheckedOut($component, $asset, auth()->user(), $request->input('note')));

        $request->request->add(['checkout_to_type' => 'asset']);
        $request->request->add(['assigned_asset' => $asset->id]);

-        session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);
+        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'));
@@ -7,8 +7,8 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Component;
 use App\Helpers\Helper;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
@@ -88,10 +88,10 @@ class ComponentsController extends Controller

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

-        if($request->input('redirect_option') === 'back'){
+        if($request->get('redirect_option') === 'back'){
            session()->put(['redirect_option' => 'index']);
        } else {
-            session()->put(['redirect_option' => $request->input('redirect_option')]);
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
        }


@@ -168,7 +168,7 @@ class ComponentsController extends Controller

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

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

        if ($component->save()) {
            return Helper::getRedirectOption($request, $component->id, 'Components')
@@ -226,20 +226,6 @@ class ComponentsController extends Controller
    public function show(Component $component)
    {
            $this->authorize('view', $component);
-            return view('components/view', compact('component'))->with('snipe_component', $component);
-    }
-
-    public function getClone(Component $component) : View | RedirectResponse
-    {
-        $this->authorize('create', Component::class);
-
-        $cloned_component = clone $component;
-        $cloned_component->id = null;
-        $cloned_component->deleted_at = null;
-
-        // Show the page
-        return view('components/edit')
-            ->with('item', $cloned_component)
-            ->with('component', $cloned_component);
+            return view('components/view', compact('component'));
    }
 }
@@ -102,20 +102,12 @@ class ConsumableCheckoutController extends Controller
        }

        $consumable->checkout_qty = $quantity;
-
-        event(new CheckoutableCheckedOut(
-            $consumable,
-            $user,
-            auth()->user(),
-            $request->input('note'),
-            [],
-            $consumable->checkout_qty,
-        ));
+        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));

        $request->request->add(['checkout_to_type' => 'user']);
        $request->request->add(['assigned_user' => $user->id]);

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


        // Redirect to the new consumable page
@@ -98,10 +98,10 @@ class ConsumablesController extends Controller
            $consumable = $request->handleImages($consumable);
        }

-        if($request->input('redirect_option') === 'back'){
+        if($request->get('redirect_option') === 'back'){
            session()->put(['redirect_option' => 'index']);
        } else {
-            session()->put(['redirect_option' => $request->input('redirect_option')]);
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
        }


@@ -175,7 +175,7 @@ class ConsumablesController extends Controller

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

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

        if ($consumable->save()) {
            return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
@@ -30,31 +30,27 @@ 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 App\Traits\DisablesDebugbar;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Auth;

 abstract class Controller extends BaseController
 {
-    use AuthorizesRequests, DisablesDebugbar, DispatchesJobs, ValidatesRequests;
+    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,
    ];

@@ -62,14 +58,12 @@ abstract class Controller extends BaseController
        'accessories' => 'private_uploads/accessories/',
        'maintenances' => 'private_uploads/maintenances/',
        'assets' => 'private_uploads/assets/',
-        'audits' => 'private_uploads/audits/',
        'components' => 'private_uploads/components/',
        'consumables' => 'private_uploads/consumables/',
        'hardware' => 'private_uploads/assets/',
        'licenses' => 'private_uploads/licenses/',
        'locations' => 'private_uploads/locations/',
        'models' => 'private_uploads/models/',
-        'suppliers' => 'private_uploads/suppliers/',
        'users' => 'private_uploads/users/',
    ];

@@ -77,14 +71,12 @@ abstract class Controller extends BaseController
        'accessories' => 'accessory',
        'maintenances' => 'maintenance',
        'assets' => 'asset',
-        'audits' => 'audits',
        'components' => 'component',
        'consumables' => 'consumable',
        'hardware' => 'asset',
        'licenses' => 'license',
        'locations' => 'location',
        'models' => 'model',
-        'suppliers' => 'supplier',
        'users' => 'user',
    ];

@@ -112,9 +112,9 @@ class CustomFieldsController extends Controller


        if ($request->filled('custom_format')) {
-            $field->format = $request->input('custom_format');
+            $field->format = $request->get('custom_format');
        } else {
-            $field->format = $request->input('format');
+            $field->format = $request->get('format');
        }

        if ($field->save()) {
@@ -225,34 +225,34 @@ class CustomFieldsController extends Controller
    public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
    {
        $this->authorize('update', CustomField::class);
-        $show_in_email = $request->input("show_in_email", 0);
-        $display_in_user_view = $request->input("display_in_user_view", 0);
+        $show_in_email = $request->get("show_in_email", 0);
+        $display_in_user_view = $request->get("display_in_user_view", 0);

        // Override the display settings if the field is encrypted
-        if ($request->input("field_encrypted") == '1') {
+        if ($request->get("field_encrypted") == '1') {
            $show_in_email = '0';
            $display_in_user_view = '0';
        }
        
-        $field->name          = trim($request->input("name"));
-        $field->element       = $request->input("element");
-        $field->field_values  = $request->input("field_values");
+        $field->name          = trim($request->get("name"));
+        $field->element       = $request->get("element");
+        $field->field_values  = $request->get("field_values");
        $field->created_by       = auth()->id();
-        $field->help_text     = $request->input("help_text");
+        $field->help_text     = $request->get("help_text");
        $field->show_in_email = $show_in_email;
-        $field->is_unique     = $request->input("is_unique", 0);
+        $field->is_unique     = $request->get("is_unique", 0);
        $field->display_in_user_view = $display_in_user_view;
-        $field->auto_add_to_fieldsets = $request->input("auto_add_to_fieldsets", 0);
-        $field->show_in_listview = $request->input("show_in_listview", 0);
-        $field->show_in_requestable_list = $request->input("show_in_requestable_list", 0);
-        $field->display_checkin = $request->input("display_checkin", 0);
-        $field->display_checkout = $request->input("display_checkout", 0);
-        $field->display_audit = $request->input("display_audit", 0);
+        $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
+        $field->show_in_listview = $request->get("show_in_listview", 0);
+        $field->show_in_requestable_list = $request->get("show_in_requestable_list", 0);
+        $field->display_checkin = $request->get("display_checkin", 0);
+        $field->display_checkout = $request->get("display_checkout", 0);
+        $field->display_audit = $request->get("display_audit", 0);

-        if ($request->input('format') == 'CUSTOM REGEX') {
-            $field->format = $request->input('custom_format');
+        if ($request->get('format') == 'CUSTOM REGEX') {
+            $field->format = $request->get('custom_format');
        } else {
-            $field->format = $request->input('format');
+            $field->format = $request->get('format');
        }

        if ($field->element == 'checkbox' || $field->element == 'radio'){
@@ -74,7 +74,7 @@ class CustomFieldsetsController extends Controller
    {
        $this->authorize('create', CustomField::class);

-        return view('custom_fields.fieldsets.view')->with('custom_fieldset', new CustomFieldset());
+        return view('custom_fields.fieldsets.edit')->with('item', new CustomFieldset());
    }

    /**
@@ -91,7 +91,7 @@ class CustomFieldsetsController extends Controller
        $this->authorize('create', CustomField::class);

        $fieldset = new CustomFieldset([
-                'name' => $request->input('name'),
+                'name' => $request->get('name'),
                'created_by' => auth()->id(),
        ]);

@@ -127,7 +127,7 @@ class CustomFieldsetsController extends Controller
    public function edit(CustomFieldset $fieldset) : View | RedirectResponse
    {
        $this->authorize('create', CustomField::class);
-        return view('custom_fields.fieldsets.view')->with('custom_fieldset', $fieldset);
+        return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
    }

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

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

@@ -7,7 +7,6 @@ use App\Models\Group;
 use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
-use \App\Models\User;

 /**
 * This controller handles all actions related to User Groups for
@@ -44,24 +43,9 @@ class GroupsController extends Controller
        $permissions = config('permissions');
        $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
        $selectedPermissions = $request->old('permissions', $groupPermissions);
-        $users_query = User::query()
-            ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
-            ->where('show_in_list', 1)
-            ->whereNull('deleted_at');
-
-        $users_count = $users_query->count();
-
-        $users = collect();
-        if ($users_count <= config('app.max_unpaginated_records')) {
-            $users = $users_query->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', collect())
-            ->with('unselected_users', $users)
-            ->with('all_users_count', $users_count);
+        return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
    }

    /**
@@ -76,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'));
        }

@@ -115,35 +87,8 @@ class GroupsController extends Controller
        if ((!is_array($groupPermissions)) || (!$groupPermissions)) {
            $groupPermissions = [];
        }
-
        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-
-        $users_query = User::query()
-            ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
-            ->where('show_in_list', 1)
-            ->whereNull('deleted_at');
-
-        $users_count = $users_query->count();
-
-        $associated_users = collect();
-        $unselected_users = collect();
-
-        if ($users_count <= config('app.max_unpaginated_records')) {
-            $associated_users = $group->users()->where('show_in_list', 1)->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
-            // Get the unselected users
-            $unselected_users = User::query()
-                ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
-                ->where('show_in_list', 1)
-                ->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)
-            ->with('all_users_count', $users_count);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
    }

    /**
@@ -157,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->has('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'));
            }

@@ -28,41 +28,23 @@ class HealthController extends BaseController
     */
    public function get()
    {
-
        try {

            if (DB::select('select 2 + 2')) {
-                $db_status = 'ok';
-            } else {
-                $db_status = 'Could not connect to database';
+                return response()->json([
+                    'status' => 'ok',
+                ]);
            }

        } catch (\Exception $e) {
-            $db_status = 'Could not connect to database';
-
-        }
-
-
-        if (is_writable(storage_path('logs'))) {
-            $filesystem_status = 'ok';
-        } else {
-            $filesystem_status = 'Could not write to storage/logs';
-        }
-
-        if (($filesystem_status!='ok') || ($db_status!='ok')) {
+            \Log::error('Could not connect to database');
            return response()->json([
-                'status' =>
-                    [
-                        'database' => $db_status,
-                        'filesystem' => $filesystem_status,
-                    ]
+                'status' => 'database connection failed',
            ], 500);
+
        }


-        return response()->json([
-            'status' => 'ok',
-        ]);

    }
 }
@@ -47,7 +47,7 @@ class CheckoutKitController extends Controller
     */
    public function store(Request $request, $kit_id)
    {
-        $user_id = e($request->input('user_id'));
+        $user_id = e($request->get('user_id'));
        if (is_null($user = User::find($user_id))) {
            return redirect()->back()->with('error', trans('admin/users/message.user_not_found'));
        }
@@ -81,7 +81,7 @@ class LabelsController extends Controller

        $settings = Setting::getSettings();
        if (request()->has('settings')) {
-            $overrides = request()->input('settings');
+            $overrides = request()->get('settings');
            foreach ($overrides as $key => $value) {
                $settings->$key = $value;
            }
@@ -97,8 +97,8 @@ class LicenseCheckinController extends Controller
            $licenseSeat->unreassignable_seat = true;
        }

-        session()->put(['redirect_option' => $request->input('redirect_option')]);
-        if ($request->input('redirect_option') === 'target'){
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if ($request->get('redirect_option') === 'target'){
            session()->put(['checkout_to_type' => 'user']);
        }

@@ -96,13 +96,13 @@ class LicenseCheckoutController extends Controller
            session()->put(['checkout_to_type' => 'asset']);
            $checkoutTarget = $this->checkoutToAsset($licenseSeat);
            $request->request->add(['assigned_asset' => $checkoutTarget->id]);
-            session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => 'asset']);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'asset']);

        } elseif ($request->filled('assigned_to')) {
            session()->put(['checkout_to_type' => 'user']);
            $checkoutTarget = $this->checkoutToUser($licenseSeat);
            $request->request->add(['assigned_user' => $checkoutTarget->id]);
-            session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => 'user']);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'user']);
        }


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	750c376725	Set item to null so it doesn’t get merged automatically	2025-09-29 13:29:00 +01:00
snipe	08630d948f	Remove radio buttons - they don’t work correctly yet	2025-09-29 12:43:19 +01:00
snipe	dc6ee342c5	Revert custom field name text box for now	2025-09-29 10:42:40 +01:00
snipe	eea1922841	Added checkbox and radios	2025-09-25 13:22:52 +01:00
snipe	57824848e9	Update resources/views/blade/form-row.blade.php Co-authored-by: Marcus Moore <mmoore@grokability.com>	2025-09-24 17:08:00 +01:00
snipe	235dcbc7d9	Updated more views	2025-09-24 16:58:35 +01:00
snipe	f0561475cc	Update resources/views/blade/input/text.blade.php Co-authored-by: Marcus Moore <mmoore@grokability.com>	2025-09-24 16:41:56 +01:00
snipe	3b4c51bab6	Use slot instead of label	2025-09-24 14:52:29 +01:00
snipe	150c205615	Added checkboxes to status labels page	2025-09-23 21:37:17 +01:00
snipe	cde22977b0	More checkbox changes	2025-09-23 21:23:03 +01:00
snipe	1c09657631	Handle checkboxes	2025-09-23 20:57:33 +01:00
snipe	02a4268180	Switched more fields to blade compaonents	2025-09-23 19:52:58 +01:00
snipe	f8362f4a45	handled text fields in status labels	2025-09-23 18:44:06 +01:00
snipe	682c1a8fa7	Make required false	2025-09-23 18:43:50 +01:00
snipe	3863e82dcc	Handle text and date fields on license edit	2025-09-23 18:43:39 +01:00
snipe	b766f6e2b5	Made edit screen narrower on wide screens	2025-09-23 18:43:14 +01:00
snipe	a3bad98096	Added date and tooltip components	2025-09-23 18:43:02 +01:00
snipe	33e7425dee	Account for tooltips	2025-09-23 18:42:46 +01:00
snipe	2554b50b38	Updated suppliers	2025-09-23 17:04:49 +01:00
snipe	433a3e11fd	Fixed field type	2025-09-23 17:00:03 +01:00
snipe	c3efdd0c8d	Updated company	2025-09-23 16:59:09 +01:00
snipe	d2e3a13043	Added ability to mark fields as disabled	2025-09-23 16:58:53 +01:00
snipe	c4923fa971	Updated address	2025-09-23 16:53:52 +01:00
snipe	253026de5d	Updated locations edit	2025-09-23 16:51:55 +01:00
snipe	a59914e9f9	Added placeholder back in	2025-09-23 16:38:12 +01:00
snipe	671e79f01b	Sorry, this shouldn’t have been in there :(	2025-09-23 16:35:04 +01:00
snipe	5c716c3f24	Updated notes maxlength	2025-09-23 16:31:20 +01:00
snipe	e138c9307e	Added maxlength default for text	2025-09-23 16:30:18 +01:00
snipe	7c0c3b2bb8	Use shorthand for errors	2025-09-23 16:26:28 +01:00
snipe	514711ddbb	Label blade component	2025-09-23 16:18:00 +01:00
snipe	9023eda66f	Changed class	2025-09-23 14:25:52 +01:00
snipe	8ce3001ef9	First stab	2025-09-23 14:25:40 +01:00